tweaking what goes where

Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html
index 03b135e..a778031 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html
@@ -116,55 +116,7 @@
                 </div>
             </div><!-- end of Col 1, Physical Description Row -->
 
-            <!-- Col 1, General Note Row -->
-            <div *ngIf="summary.display.general_note" class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>General Note:</div>
-                <div class="col-sm-8 bib-details">
-                    <ul>
-                        <li *ngFor="let _note of summary.display.general_note">
-                            {{_note}}
-                        </li>
-                    </ul>
-                </div>
-            </div><!-- end of Col 1, General Note Row -->
-
-            <!-- Col 1, Bibliography Row -->
-            <div *ngIf="summary.display.bibliography" class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Bibliography:</div>
-                <div class="col-sm-8 bib-details">
-                    <ul>
-                        <li *ngFor="let _bibliography of summary.display.bibliography">
-                            {{_bibliography}}
-                        </li>
-                    </ul>
-                </div>
-            </div><!-- end of Col 1, Bibliography Row -->
-
-            <!-- Col 1, TOC Row -->
-            <div *ngIf="summary.display.toc" class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Table of Contents:</div>
-                <div class="col-sm-8 bib-details">
-                    {{summary.display.toc}}
-                </div>
-            </div><!-- end of Col 1, TOC Row -->
-
-            <!-- Col 1, Thesis Row -->
-            <div *ngIf="summary.display.thesis" class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Thesis:</div>
-                <div class="col-sm-8 bib-details">
-                    <ul>
-                        <li *ngFor="let _thesis of summary.display.thesis">
-                            {{_thesis}}
-                        </li>
-                    </ul>
-                </div>
-            </div><!-- end of Col 1, Thesis Row -->
-
-        </div><!-- 1st column -->
-
-        <div class="col-md-4"><!-- 2nd column -->
-
-            <!-- Col 2, ISBN Row -->
+            <!-- Col 1, ISBN Row -->
             <div *ngIf="summary.display.isbn" class="row">
                 <div class="col-sm-4 font-weight-bold bib-details-title" i18n>ISBN:</div>
                 <div class="col-sm-8 bib-details">
@@ -176,7 +128,7 @@
                         </li>
                     </ul>
                 </div>
-            </div><!-- end of Col 2, ISBN Row -->
+            </div><!-- end of Col 1, ISBN Row -->
 
             <!-- Col 1, ISSN Row -->
             <div *ngIf="summary.display.issn" class="row">
@@ -206,64 +158,84 @@
                 </div>
             </div><!-- end of Col 1, UPC Row -->
 
-            <!-- Col 1, Hold and Copy Counts Row -->
-            <div class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Hold and Copy Counts:</div>
+        </div><!-- 1st column -->
+
+        <!-- 2nd column -->
+        <div class="col-md-4">
+
+            <!-- Col 2, Abstract Row -->
+            <div *ngIf="summary.display.abstract" class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Summary:</div>
+                <div class="col-sm-8 bib-details">
+                    {{summary.display.abstract}}
+                </div>
+            </div><!-- end of Col 2, Abstract Row -->
+
+            <!-- Col 2, General Note Row -->
+            <div *ngIf="summary.display.general_note" class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>General Note:</div>
                 <div class="col-sm-8 bib-details">
                     <ul>
-                        <li><span i18n>{{summary.holdCount}} hold requests</span></li>
-                        <li>
-                            <span i18n *ngIf=" summary.isHoldable">Record is holdable.</span>
-                            <span i18n *ngIf="!summary.isHoldable">Record is not holdable.</span>
+                        <li *ngFor="let _note of summary.display.general_note">
+                            {{_note}}
                         </li>
-                        <li *ngFor="let _count of summary.holdingsSummary">
-                            <span i18n>{{_count.available}} of {{_count.count}} copies available at {{orgName(_count.org_unit)}}.</span>
+                    </ul>
+                </div>
+            </div><!-- end of Col 2, General Note Row -->
+
+            <!-- Col 2, Bibliography Row -->
+            <div *ngIf="summary.display.bibliography" class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Bibliography:</div>
+                <div class="col-sm-8 bib-details">
+                    <ul>
+                        <li *ngFor="let _bibliography of summary.display.bibliography">
+                            {{_bibliography}}
                         </li>
                     </ul>
                 </div>
-            </div><!-- end of Col 1, Hold and Copy Counts Row -->
+            </div><!-- end of Col 2, Bibliography Row -->
 
-            <!-- Col 1, Formats and Editions Row -->
-            <div class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Formats and Editions:</div>
+            <!-- Col 2, TOC Row -->
+            <div *ngIf="summary.display.toc" class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Table of Contents:</div>
+                <div class="col-sm-8 bib-details">
+                    {{summary.display.toc}}
+                </div>
+            </div><!-- end of Col 2, TOC Row -->
+
+            <!-- Col 2, Thesis Row -->
+            <div *ngIf="summary.display.thesis" class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Thesis:</div>
                 <div class="col-sm-8 bib-details">
                     <ul>
-                        <ng-container *ngIf="summary.staffViewMetabibAttributes.icon_format">
-                            <li *ngFor="let _x of summary.staffViewMetabibAttributes.icon_format | keyvalue">
-                                <a href="/eg2/staff/catalog/search?query=from_metarecord({{summary.staffViewMetabibId}}) icon_format({{_x.key}})">
-                                    {{_x.value.label}}
-                                </a>
-                                    {{_x.value.count}}
-                            </li>
-                        </ng-container>
-                        <ng-container *ngIf="summary.staffViewMetabibAttributes.item_lang">
-                            <li *ngFor="let _x of summary.staffViewMetabibAttributes.item_lang | keyvalue">
-                                <a href="/eg2/staff/catalog/search?query=from_metarecord({{summary.staffViewMetabibId}}) item_lang({{_x.key}})">
-                                    {{_x.value.label}}
-                                </a>
-                                    {{_x.value.count}}
-                            </li>
-                        </ng-container>
-                        <li>
-                            <a href="/eg2/staff/catalog/search?query=from_metarecord({{summary.staffViewMetabibId}})">
-                                <span i18n>View all Formats and Editions</span>
-                            </a>
+                        <li *ngFor="let _thesis of summary.display.thesis">
+                            {{_thesis}}
                         </li>
                     </ul>
                 </div>
-            </div><!-- end of Col 1, Formats and Editions Row -->
+            </div><!-- end of Col 2, Thesis Row -->
 
         </div><!-- 2nd column -->
 
         <div class="col-md-4"><!-- 3rd column -->
 
-            <!-- Col 3, Abstract Row -->
-            <div *ngIf="summary.display.abstract" class="row">
-                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Summary:</div>
+            <!-- Col 3, Hold and Copy Counts Row -->
+            <div class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Hold and Copy Counts:</div>
                 <div class="col-sm-8 bib-details">
-                    {{summary.display.abstract}}
+                    <ul>
+                        <li><span i18n>{{summary.holdCount}} hold requests</span></li>
+                        <li>
+                            <span i18n *ngIf=" summary.isHoldable">Record is holdable.</span>
+                            <span i18n *ngIf="!summary.isHoldable">Record is not holdable.</span>
+                        </li>
+                        <li *ngFor="let _count of summary.holdingsSummary">
+                            <span i18n>{{_count.available}} of {{_count.count}} copies available at {{orgName(_count.org_unit)}}.</span>
+                        </li>
+                    </ul>
                 </div>
-            </div><!-- end of Col 3, Abstract Row -->
+            </div><!-- end of Col 3, Hold and Copy Counts Row -->
+
 
             <!-- Col 3, Subject Row -->
             <div *ngIf="summary.display.subject" class="row">
@@ -349,6 +321,36 @@
                 </div>
             </div><!-- end of Col 3, Genre Row -->
 
+            <!-- Col 3, Formats and Editions Row -->
+            <div class="row">
+                <div class="col-sm-4 font-weight-bold bib-details-title" i18n>Formats and Editions:</div>
+                <div class="col-sm-8 bib-details">
+                    <ul>
+                        <ng-container *ngIf="summary.staffViewMetabibAttributes.icon_format">
+                            <li *ngFor="let _x of summary.staffViewMetabibAttributes.icon_format | keyvalue">
+                                <a href="/eg2/staff/catalog/search?query=from_metarecord({{summary.staffViewMetabibId}}) icon_format({{_x.key}})">
+                                    {{_x.value.label}}
+                                </a>
+                                    {{_x.value.count}}
+                            </li>
+                        </ng-container>
+                        <ng-container *ngIf="summary.staffViewMetabibAttributes.item_lang">
+                            <li *ngFor="let _x of summary.staffViewMetabibAttributes.item_lang | keyvalue">
+                                <a href="/eg2/staff/catalog/search?query=from_metarecord({{summary.staffViewMetabibId}}) item_lang({{_x.key}})">
+                                    {{_x.value.label}}
+                                </a>
+                                    {{_x.value.count}}
+                            </li>
+                        </ng-container>
+                        <li>
+                            <a href="/eg2/staff/catalog/search?query=from_metarecord({{summary.staffViewMetabibId}})">
+                                <span i18n>View all Formats and Editions</span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div><!-- end of Col 3, Formats and Editions Row -->
+
         </div><!-- 3rd column -->
 
     </div><!-- "table" -->