Fixed broken font loading and float left/right

APTrust · Nov 29, 2023 · ed38954 · ed38954
1 parent 3ba5e80
commit ed38954
Show file tree

Hide file tree

Showing 32 changed files with 54 additions and 54 deletions.
diff --git a/server/views/app_setting/list.html b/server/views/app_setting/list.html
@@ -3,7 +3,7 @@
 {{ template "partials/page_header.html" .}}
 
 <h2>Application Settings</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <a class="btn btn-primary" href="/app_settings/new" role="button">New</a>
 </div>
 <table class="table table-hover">

diff --git a/server/views/bagit_profile/export.html b/server/views/bagit_profile/export.html
@@ -16,7 +16,7 @@
 </div>
 
 <div class="bottom-buttons">
-  <div class="pull-right mr-5">
+  <div class="float-right mr-5">
     <button type="button" class="btn btn-primary mr-5" id="btnCopyToClipboard" onclick="copyToClipboard('#txtJson', '#copied')">Copy to Clipboard</button>
     <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
   </div>

diff --git a/server/views/bagit_profile/form.html b/server/views/bagit_profile/form.html
@@ -95,17 +95,17 @@ <h2>{{ .form.Fields.Name.Value }}</h2>
 {{ template "partials/input_hidden.html" dict "field" .form.Fields.BaseProfileID }}
 
 <div class="bottom-buttons">
-  <div class="pull-left">
+  <div class="float-left">
   {{ if and .form.UserCanDelete .objectExistsInDB  }}
     <button type="button" class="btn btn-danger" onclick="deleteProfile('#DeleteProfile-{{ .form.Fields.ID.Value }}')" role="button">Delete Profile</button>
   {{ end }}
     <a class="btn btn-outline-success" onclick="loadIntoModal('get', 'BagIt Profile', '/profiles/export/{{ .form.Fields.ID.Value }}', '')" role="button">Export Profile</a>
   </div>
 
-  <div class="pull-right">
+  <div class="float-right">
     <button class="btn btn-primary" type="submit" role="button">Save</a>
   </div>
-  <div class="pull-right mr-5">
+  <div class="float-right mr-5">
     <a class="btn btn-secondary" href="/profiles/list" role="button">Cancel</a>
   </div>
 </div>

diff --git a/server/views/bagit_profile/import.html b/server/views/bagit_profile/import.html
@@ -17,10 +17,10 @@
 </div>
 
 <div class="bottom-buttons">
-  <div class="pull-right">
+  <div class="float-right">
     <button type="submit" class="btn btn-primary" type="button" id="btnImport">Import</button>
   </div>
-  <div class="pull-right mr-3">
+  <div class="float-right mr-3">
     <a role="button" class="btn btn-secondary" href="/profiles">Cancel</a>
   </div>
 </div>

diff --git a/server/views/bagit_profile/list.html b/server/views/bagit_profile/list.html
@@ -3,7 +3,7 @@
 {{ template "partials/page_header.html" .}}
 
 <h2>BagIt Profiles</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
     <a class="btn btn-outline-success" href="/profiles/import" role="button">Import Profile</a>
     <a class="btn btn-primary" href="/profiles/new" role="button">New</a>
 </div>

diff --git a/server/views/bagit_profile/new.html b/server/views/bagit_profile/new.html
@@ -9,10 +9,10 @@ <h2>New BagIt Profile</h2>
   {{ template "partials/input_select.html" dict "field" .form.Fields.BaseProfileID }}
 
   <div class="bottom-buttons">
-    <div class="pull-right">
+    <div class="float-right">
       <button type="submit" class="btn btn-primary" role="button">Create</button>
     </div>
-    <div class="pull-right mr-5">
+    <div class="float-right mr-5">
       <a class="btn btn-secondary" href="/profiles/list" role="button">Cancel</a>
     </div>
   </div>

diff --git a/server/views/bagit_profile/new_tag_file.html b/server/views/bagit_profile/new_tag_file.html
@@ -5,10 +5,10 @@
     {{ template "partials/input_text.html" dict "field" .form.Fields.Name }}
 
     <div class="bottom-buttons">
-        <div class="pull-right">
+        <div class="float-right">
             <button class="btn btn-primary" type="button" onclick="submitNewTagFileForm('#NewTagFileForm')" role="button">Save</a>
         </div>
-        <div class="pull-right mr-5">
+        <div class="float-right mr-5">
             <a class="btn btn-secondary" data-dismiss="modal" role="button">Cancel</a>
         </div>
     </div>

diff --git a/server/views/job/files.html b/server/views/job/files.html
@@ -74,11 +74,11 @@ <h2>Files
 
 <div class="row mt-3 mb-3">
     <div class="col-12">
-        <div class="pull-left">
+        <div class="float-left">
             <button class="btn btn-danger" onclick="confirmForegroundDeletion('Delete this job?', '/jobs/delete/{{ .job.ID }}')" role="button">Delete Job</button>
         </div>
 
-        <div class="pull-right" id="btnJobPackagingDiv">
+        <div class="float-right" id="btnJobPackagingDiv">
             <a class="btn btn-primary" href="/jobs/packaging/{{ .job.ID }}" role="button">Next &gt;&gt;</a>
         </div>
     </div>

diff --git a/server/views/job/list.html b/server/views/job/list.html
@@ -3,7 +3,7 @@
 {{ template "partials/page_header.html" .}}
 
 <h2>Jobs</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <a class="btn btn-primary" href="/jobs/new" role="button">New</a>
 </div>
 <table class="table table-hover">

diff --git a/server/views/job/metadata.html b/server/views/job/metadata.html
@@ -7,10 +7,10 @@ <h2>Bag Metadata</h2>
 
 <div style="height: 50px;">
   <div>
-    <div class="pull-right p-r-3">
+    <div class="float-right p-r-3">
       <button type="button" class="btn btn-primary" id="btnToggleHidden" style="margin-left: 25px;" onclick="toggleTags()">Show All Tags</button>
     </div>
-    <div class="pull-right">
+    <div class="float-right">
       <button role="button" class="btn btn-primary" onclick="loadIntoModal('GET', 'New Tag', '/jobs/add_tag/{{ .job.ID }}')" id="btnAddNewTag">Add New Tag</button>
     </div>
   </div>
@@ -25,7 +25,7 @@ <h2>Bag Metadata</h2>
     <div class="card mb-3">
       <div class="card-header">
         <a data-toggle="collapse" href="#{{ $tagFile.Name }}" aria-expanded="true" aria-controls="{{ $tagFile.Name }}">{{ $tagFile.Name }}</a>
-        <div class="what-is-showing pull-right text-muted">
+        <div class="what-is-showing float-right text-muted">
           <i>Tags with default values are not showing.</i>
         </div>
       </div>
@@ -63,11 +63,11 @@ <h2>Bag Metadata</h2>
 
       <input type="hidden" name="direction" value="next"/>
 
-      <div class="pull-left mb-5" id="btnBackDiv">
+      <div class="float-left mb-5" id="btnBackDiv">
         <button type="submit" onclick="document.forms['{{ .job.ID }}'].direction.value='previous'" class="btn btn-primary" role="button">&lt;&lt; Back</button>
       </div>
 
-      <div class="pull-right mb-5" id="btnNextDiv">
+      <div class="float-right mb-5" id="btnNextDiv">
         <button type="submit" onclick="document.forms['{{ .job.ID }}'].direction.value='next'" class="btn btn-primary" role="button">Next &gt;&gt;</button>
       </div>
 

diff --git a/server/views/job/new_tag.html b/server/views/job/new_tag.html
@@ -14,7 +14,7 @@
     {{ template "partials/input_hidden.html" dict "field" .form.Fields.WasAddedForJob }}
 
     <div class="bottom-buttons">
-      <div class="pull-right">
+      <div class="float-right">
       <button type="button" class="btn btn-primary" onclick="submitNewTagFileForm('#NewTagForm')" role="button">Save</button>
       </div>
     </div>

diff --git a/server/views/job/packaging.html b/server/views/job/packaging.html
@@ -36,11 +36,11 @@ <h2>Packaging</h2>
   <input type="hidden" name="direction" value="next"/>
 
 
-  <div class="pull-left" id="btnBackDiv">
+  <div class="float-left" id="btnBackDiv">
     <button type="submit" onclick="document.forms['{{ .job.ID }}'].direction.value='previous'" class="btn btn-primary" role="button">&lt;&lt; Back</button>
   </div>
 
-  <div class="pull-right" id="btnNextDiv">
+  <div class="float-right" id="btnNextDiv">
     <button type="submit" onclick="document.forms['{{ .job.ID }}'].direction.value='next'" class="btn btn-primary" role="button">Next &gt;&gt;</button>
   </div>
 

diff --git a/server/views/job/run.html b/server/views/job/run.html
@@ -11,13 +11,13 @@ <h2>Review and Run</h2>
 {{ template "partials/job_run.html" . }}
 
 <div class="mt-5">
-  <div class="pull-left" id="btnBackDiv">
+  <div class="float-left" id="btnBackDiv">
     <a class="btn btn-primary" href="/jobs/upload/{{ .job.ID }}" role="button">&lt;&lt; Back</a>
   </div>
 
 
 
-  <div class="pull-right" id="btnNextDiv">
+  <div class="float-right" id="btnNextDiv">
     {{ if not .job.WorkflowID }}
     <button class="btn btn-info mr-5" onclick="postDataInBackground('/workflows/from_job/{{ .job.ID }}')" role="button">Create Workflow</button>
     {{  end }}

diff --git a/server/views/job/uploads.html b/server/views/job/uploads.html
@@ -12,11 +12,11 @@ <h2>Upload Targets</h2>
   <input type="hidden" name="direction" value="next"/>
 
 
-  <div class="pull-left mt-5 mb-5" id="btnBackDiv">
+  <div class="float-left mt-5 mb-5" id="btnBackDiv">
     <button type="submit" onclick="document.forms['{{ .job.ID }}'].direction.value='previous'" class="btn btn-primary" role="button">&lt;&lt; Back</button>
   </div>
 
-  <div class="pull-right mt-5 mb-5" id="btnNextDiv">
+  <div class="float-right mt-5 mb-5" id="btnNextDiv">
     <button type="submit" onclick="document.forms['{{ .job.ID }}'].direction.value='next'" class="btn btn-primary" role="button">Next &gt;&gt;</button>
   </div>
 

diff --git a/server/views/partials/form_buttons.html b/server/views/partials/form_buttons.html
@@ -2,14 +2,14 @@
 
 <div class="bottom-buttons mt-3 mb-5">
     {{ if and .form.UserCanDelete .objectExistsInDB }}
-    <div class="pull-left">
+    <div class="float-left">
       <button type="button" class="btn btn-danger" onclick="confirmDeletion('{{ .form.ObjType }}', '{{ .form.ObjectID }}')" role="button">Delete</button>
     </div>
     {{ end }}
-    <div class="pull-right">
+    <div class="float-right">
       <button class="btn btn-primary" type="submit" role="button">Save</a>
     </div>
-    <div class="pull-right mr-5">
+    <div class="float-right mr-5">
       <button class="btn btn-secondary" type="button" role="button" onclick="history.back()">Cancel</a>
     </div>
   </div>

diff --git a/server/views/partials/page_header.html b/server/views/partials/page_header.html
@@ -8,9 +8,9 @@
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data:;">
     <title>DART</title>
     <!-- link href="/assets/css/bootstrap-yeti.min.css" rel="stylesheet" -->
-    <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/assets/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/assets/fontawesome-free-5.7.0-web/css/fontawesome.min.css" rel="stylesheet">
     <link href="/assets/css/jquery-ui.css" rel="stylesheet">
+    <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
     <link href="/assets/css/dart.css" rel="stylesheet">
     <!-- script src="/assets/js/jquery-3.2.1.min.js" onload="window.$ = window.jQuery = module.exports;"></script -->
     <script src="/assets/js/jquery-3.2.1.min.js" onload="window.$ = window.jQuery;"></script>

diff --git a/server/views/partials/profile_tags.html b/server/views/partials/profile_tags.html
@@ -1,7 +1,7 @@
 {{ define "partials/profile_tags.html" }}
 
 <h2>Tags in {{ .tagFileName }}</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
 
     {{ if (and (ne "bagit.txt" .tagFileName) (ne "bag-info.txt" .tagFileName)) }}
     <button class="btn btn-danger mr-3" type="button" onclick="confirmBackgroundDeletion('Delete this tag file?', '/profiles/delete_tag_file/{{ .bagItProfileID }}', {'tagFile': '{{ .tagFileName }}'})" role="button">Delete File</button>  

diff --git a/server/views/remote_repository/form.html b/server/views/remote_repository/form.html
@@ -6,7 +6,7 @@ <h2>Remote Repository</h2>
 
 
 {{ if .showTestButton }}
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <button class="btn btn-primary" onclick="loadIntoModal('post', 'Connection Test', '/remote_repositories/test/{{ .form.Fields.ID.Value }}', '{{ .form.ObjType }}')" role="button">Test Connection</button>
 </div>
 {{ end }}

diff --git a/server/views/remote_repository/list.html b/server/views/remote_repository/list.html
@@ -3,7 +3,7 @@
 {{ template "partials/page_header.html" .}}
 
 <h2>Remote Repositories</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <a class="btn btn-primary" href="/remote_repositories/new" role="button">New</a>
 </div>
 <table class="table table-hover">

diff --git a/server/views/settings/export.html b/server/views/settings/export.html
@@ -62,16 +62,16 @@ <h2>Export Settings</h2>
   </div>
 
   <div class="bottom-buttons mb-3">
-    <div class="pull-left">
+    <div class="float-left">
       <button type="button" class="btn btn-danger" id="btnDelete" title="Delete these settings.">Delete</button>
     </div>
-    <div class="pull-left ml-3">
+    <div class="float-left ml-3">
       <a role="button" class="btn btn-secondary" href="/settings/export">Cancel</a>
     </div>
-    <div class="pull-right">
+    <div class="float-right">
       <a role="button" class="btn btn-primary" id="btnExport" title="Export these settings to JSON." href="/settings/export/show_json/{{ .settings.ID }}">Export</a>
     </div>
-    <div class="pull-right mr-3">
+    <div class="float-right mr-3">
       <button type="submit" class="btn btn-primary" id="btnSave">Save</a>
     </div>
   </div>

diff --git a/server/views/settings/export_result.html b/server/views/settings/export_result.html
@@ -34,7 +34,7 @@ <h3>Warning</h3>
 </div>
 
 <div class="bottom-buttons">
-  <div class="pull-right mr-5">
+  <div class="float-right mr-5">
     <button type="button" class="btn btn-primary" id="btnCopyToClipboard" onclick="copyToClipboard('#txtJson', '#copied')">Copy to Clipboard</button>
     <a role="button" class="btn btn-secondary" href="/settings/export">Done</a>
   </div>

diff --git a/server/views/settings/import.html b/server/views/settings/import.html
@@ -45,10 +45,10 @@ <h2>Import Settings</h2>
 
 
 <div class="bottom-buttons">
-  <div class="pull-right">
+  <div class="float-right">
     <button class="btn btn-primary" type="submit" id="btnImport">Import</button>
   </div>
-  <div class="pull-right mr-3">
+  <div class="float-right mr-3">
     <a role="button" class="btn btn-secondary" href="#Dashboard/show">Cancel</a>
   </div>
 </div>

diff --git a/server/views/settings/import_questions.html b/server/views/settings/import_questions.html
@@ -15,7 +15,7 @@ <h2>Questions</h2>
 
     <input type="hidden" name="settingsJson" id="settingsJson" value="{{ .settingsJson }}" />
 
-    <div class="pull-right">
+    <div class="float-right">
     <button type="submit" class="btn btn-primary">Submit</a>
     </div>    
 

diff --git a/server/views/settings/import_result.html b/server/views/settings/import_result.html
@@ -30,7 +30,7 @@ <h2>Import Result</h2>
 {{ end }}
 
 
-<div class="pull-right">
+<div class="float-right">
   <a role="button" class="btn btn-primary" href="/dashboard">Done</a>
 </div>
 

diff --git a/server/views/settings/list.html b/server/views/settings/list.html
@@ -3,7 +3,7 @@
 {{ template "partials/page_header.html" .}}
 
 <h2>Settings for Export and Sharing</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <a class="btn btn-primary" href="/settings/export/new" role="button">New</a>
 </div>
 <table class="table table-hover">

diff --git a/server/views/settings/question.html b/server/views/settings/question.html
@@ -20,10 +20,10 @@
 
 
 <div class="bottom-buttons">
-  <div class="pull-left">
+  <div class="float-left">
     <button type="button" class="btn btn-secondary" id="btnCancel" data-dismiss="modal">Cancel</a>
   </div>
-  <div class="pull-right">
+  <div class="float-right">
       <button type="button" class="btn btn-primary" id="btnSaveQuestion" onclick="postDataInBackground('/settings/export/questions/{{ .settings.ID }}', Object.fromEntries(new FormData(document.forms['{{ .form.ObjectID }}'])))">Save</button>
   </div>
 </div>

diff --git a/server/views/storage_service/form.html b/server/views/storage_service/form.html
@@ -5,7 +5,7 @@
 <h2>Storage Service</h2>
 
 {{ if .showTestButton }}
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <button class="btn btn-primary" onclick="loadIntoModal('post', 'Connection Test', '/storage_services/test/{{ .form.Fields.ID.Value }}', '{{ .form.ObjType }}')" role="button">Test Connection</button>
 </div>
 {{ end }}

diff --git a/server/views/storage_service/list.html b/server/views/storage_service/list.html
@@ -3,7 +3,7 @@
 {{ template "partials/page_header.html" .}}
 
 <h2>Storage Services</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <a class="btn btn-primary" href="/storage_services/new" role="button">New</a>
 </div>
 <table class="table table-hover">

diff --git a/server/views/tag_definition/form.html b/server/views/tag_definition/form.html
@@ -30,12 +30,12 @@ <h2>{{ .form.Fields.TagName.Value }}</h2>
 
     <div class="bottom-buttons">
       {{ if eq .form.Fields.IsBuiltIn.Value "false" }} 
-      <div class="pull-left">
+      <div class="float-left">
         <!-- This needs to be a PUT or POST -->
         <a class="btn btn-danger" href="/profiles/delete_tag/{{ .bagItProfileID }}/{{ .form.Fields.ID.Value }}" role="button">Delete</a>
       </div>
       {{ end }}
-      <div class="pull-right">
+      <div class="float-right">
       <button type="button" class="btn btn-primary" role="button" onclick="submitTagDefForm('#{{ .form.Fields.ID.Value }}')">Save</a>
       </div>
     </div>

diff --git a/server/views/workflow/batch.html b/server/views/workflow/batch.html
@@ -18,7 +18,7 @@ <h2>Workflow Batch</h2>
   {{ template "partials/input_file.html" dict "field" .form.Fields.CsvUpload }}
 
   <div class="bottom-buttons">
-    <div class="pull-right">
+    <div class="float-right">
       <button id="runWorkflowBatch" class="btn btn-primary" type="button" role="button">Run</button>
     </div>
   </div>

diff --git a/server/views/workflow/form.html b/server/views/workflow/form.html
@@ -5,7 +5,7 @@
 <h2>Workflow</h2>
 
 <div class="clearfix">
-  <div class="pull-right">
+  <div class="float-right">
     <button class="btn btn-primary mb-3" onclick="loadIntoModal('get', '{{ .form.Fields.Name.Value }}', '/workflows/export/{{ .form.Fields.ID.Value }}')" role="button">Export</button>
   </div>
 </div>

diff --git a/server/views/workflow/list.html b/server/views/workflow/list.html
@@ -4,7 +4,7 @@
 
 
 <h2>Workflows</h2>
-<div class="pull-right mt-1 mb-3">
+<div class="float-right mt-1 mb-3">
   <a class="btn btn-primary" href="/workflows/new" role="button">New</a>
 </div>
 <table class="table table-hover">