Merge pull request #203 from USGS-WiM/NewPrintLayout

New print layout
USGS-WiM · Oct 11, 2019 · 8a7019f · 8a7019f
2 parents ec36e2e + 505e56c
commit 8a7019f
Show file tree

Hide file tree

Showing 13 changed files with 1,746 additions and 1,059 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -7,7 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <base href="">
         <link rel="icon" type="image/png" href="./favicon.ico"> 
-    <link rel="stylesheet" href="styles.2adf5f76aebbada34161.css"></head>
+        <link rel="stylesheet" href="styles.2adf5f76aebbada34161.css"></head>
 
     <body>
         <div id="cbrs-form-body">
@@ -34,7 +34,7 @@
         dropZone.addEventListener('dragover', function(e) {
             var dropzones = document.getElementsByClassName(dropzoneId);
             for(var i = 0; i < dropzones.length; ++i){
-                dropzones[i].setAttribute("class", dropzoneId + " fullScreenFileDrag");
+                dropzones[i].setAttribute("class", dropzoneId + " dropzone-target");
             }
         });
         dropZone.addEventListener('drop', function(e) {

diff --git a/dist/main-es2015.bc1c83951c12837a8b37.js b/dist/main-es2015.bc1c83951c12837a8b37.js
diff --git a/dist/main-es5.d3b15a5d840f314cf940.js b/dist/main-es5.d3b15a5d840f314cf940.js
diff --git a/dist/styles.909d713de6ce639d101a.css b/dist/styles.909d713de6ce639d101a.css
diff --git a/src/app.component.html b/src/app.component.html
@@ -1,4 +1,3 @@
-<br /><br />
 <span class="app-header">
     CBRS Determinations Management
 </span>

diff --git a/src/index.html b/src/index.html
@@ -34,7 +34,7 @@
         dropZone.addEventListener('dragover', function(e) {
             var dropzones = document.getElementsByClassName(dropzoneId);
             for(var i = 0; i < dropzones.length; ++i){
-                dropzones[i].setAttribute("class", dropzoneId + " fullScreenFileDrag");
+                dropzones[i].setAttribute("class", dropzoneId + " dropzone-target");
             }
         });
         dropZone.addEventListener('drop', function(e) {

diff --git a/src/navbar.component.html b/src/navbar.component.html
@@ -1,5 +1,5 @@
 <nav [hidden]="hideNavbar"  class="hidden-print">
-    <div style="float: left;">
+    <div class="split">
         <a routerLink="/workbench" [queryParams]="{home: true}">Workbench</a>
         <!-- <a href="../../cbrsrequests/">Create Case</a> -->
         <a routerLink="/workbench/new">Create Case</a>
@@ -8,9 +8,14 @@
         <a routerLink="/tags">Tags</a>
         <a routerLink="/users">User Administration</a>
     </div>
-    <div style="float: right;">
-        <b class="nav-user">User: {{ first_name }} {{ last_name }}</b>
-        <a (click)="onLogout()">Logout <i class="fa fa-sign-out"></i></a>
+    <div class="split">
+        <label class="nav-user">
+			<b>User:&nbsp;</b>
+			<span>{{ first_name }} {{ last_name }}</span>
+		</label>
+        <a (click)="onLogout()">
+			<span>Logout <i class="fa fa-sign-out"></i></span>
+		</a>
     </div>
 </nav>
 <div id="cbrs_toast" class="cbrsToast"></div>
diff --git a/src/reports/report-detail.component.html b/src/reports/report-detail.component.html
@@ -1,6 +1,6 @@
 <div [hidden]="!notready" align="center" id="loading-spinner"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw"></i></div>
 <div [hidden]="notready">
-    <button *ngIf="allow_filter" class="filter-cases-btn hidden-print" (click)="toggleFilter()"><i class="fa fa-filter"></i> Filter Cases</button>
+    <button *ngIf="allow_filter" class="btn btn-default filter-cases-btn hidden-print" (click)="toggleFilter()"><i class="fa fa-filter"></i> Filter Cases</button>
     <report-filter *ngIf="allow_filter" [hidden]="hideFilter" (onFilter)="onFilter($event)"></report-filter>
     <div align="center" class="hidden-print">
         <button *ngIf="paginated" type="button" class="btn btn-default reports-export-btn" style="display:inline;" (click)="prevPage()"><i class="fa fa-arrow-left"></i> Prev Page</button>