LP#1843637 MARC View Display Issues

This fixes vertical alignment issues in the MARC View table
by removing the deprecated valign tags and moving the inline
CSS to the cat.css file. The text within each table cell should
now align to the top for better readability.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index 0b373e4..5664710 100644 (file)
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -14,12 +14,10 @@
 
 .marcflateditor {
     max-width: 100%;
-    font-family: 'Lucida Console', Monaco, monospace;
 }
 
 .marcfastitemadd, .marctypesource {
     border-bottom: solid thin gray;
-    flex-wrap: wrap;
 }
 
 .marcedit {
@@ -191,6 +189,28 @@ grid[name="-none-"] * label { color: black; }
     word-break: break-word;
 }
 
+.marc_tag_col {
+    text-align: right;
+    vertical-align: top;
+}
+
+.marc_tag_ind1 {
+    vertical-align: top;
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.marc_tag_ind2 {
+    vertical-align: top;
+    border-left: 1px solid #A0A0A0;
+    padding-left: 3px;
+}
+
+.marc_subfields {
+    vertical-align: top;
+    padding-left: 3px;
+}
+
 /*
  * Holdings Editor Styles
  * /
@@ -262,32 +282,5 @@ table.custom-label-table td {
 .cn-template-text {
   height: 12em;
   width: 100%;
-}
-
-.record-merge-container {
-  flex: 1;
-  max-height: 600px;
-  /*
-   * LP1739293 Leaving for reference in case anyone wants to allow the
-   * marc records to occupy more horizontal space and/or put scroll bars
-   * on the individual records instead of a single vertical scroll.
-  min-width: 600px;
-  max-width: 900px;
-  overflow-y: scroll;
-  */
-}
-
-.record-merge-container pre {
-  /* in the merge view, wrap text so it doesn't gobble up 
-   * all of the horizontal space */
-  white-space: pre-wrap;
-}
-
-/* Avoid word wrapping in edit mode and add scrolls for navigation */
-.record-edit-container {
-  flex: 1;
-  overflow-x: scroll;
-  overflow-y: scroll;
-  white-space: nowrap;
-}
+  }
 

diff --git a/Open-ILS/xsl/oilsMARC21slim2HTML.xsl b/Open-ILS/xsl/oilsMARC21slim2HTML.xsl
index 76bffcb..373d010 100644 (file)
--- a/Open-ILS/xsl/oilsMARC21slim2HTML.xsl
+++ b/Open-ILS/xsl/oilsMARC21slim2HTML.xsl
@@ -36,7 +36,7 @@
        <xsl:template match="marc:record">
                <table class='marc_table'>
                        <tr class='marc_tag_row'>
-                               <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
+                               <th class='marc_tag_col' NOWRAP="TRUE">
                                        LDR
                                </th>
                                <td class='marc_tag_data' COLSPAN='3'>
@@ -49,7 +49,7 @@
        
        <xsl:template match="marc:controlfield">
                <tr class='marc_tag_row'>
-                       <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
+                       <th class='marc_tag_col' NOWRAP="TRUE">
                                <xsl:value-of select="@tag"/>
                        </th>
                        <td class='marc_tag_data' COLSPAN='3'>
@@ -60,16 +60,15 @@
        
        <xsl:template match="marc:datafield">
                <tr class='marc_tag_row'>
-                       <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
+                       <th class='marc_tag_col' NOWRAP="TRUE">
                                <xsl:value-of select="@tag"/>
                        </th>
-                       <td class='marc_tag_ind'>
+                       <td class='marc_tag_ind1'>
                                <xsl:value-of select="@ind1"/>
                        </td>
 
-                       <td class='marc_tag_ind' style='border-left: 1px solid #A0A0A0; padding-left: 3px;'>
+                       <td class='marc_tag_ind2'>
                                <xsl:value-of select="@ind2"/>
-                               <span style='color:#FFF'>.</span> 
                        </td>
 
                        <td class='marc_subfields'>