TPAC: Bring used CSS definitions over from semiauto.css

Convert ".red" class to ".alert", delete classes that were defined in
semiauto.css as being verified as being in use that are actually no longer
in use, and merge the remainder to style.css. This will avoid one more
HTTP request as well as a huge mess of CSS to have to worry about
carrying around.

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index c6312e3..e3234ea 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -31,7 +31,7 @@
     </div>
     [% END %]
     [% IF ctx.failed_renewals %]
-    <div class="renew-summary red">
+    <div class="renew-summary alert">
         [% l("Failed to renew [_1] item(s)", ctx.failed_renewals) %]
     </div>
     [% END %]

diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 5068474..2398b3c 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -75,11 +75,11 @@
                             <!-- XXX TODO fines aren't really accruing
                                 if circ has hit maxfines. more clarity
                                 here? -->
-                            <span class="red">[% l('(fines accruing)') %]</span>
+                            <span class="alert">[% l('(fines accruing)') %]</span>
                         [%  END %]
                     </td>
                     <td>
-                        <strong class="red">
+                        <strong class="alert">
                             [% money(f.xact.balance_owed) %]
                         </strong>
                     </td>
@@ -147,7 +147,7 @@
                     </td>
                     <td>[% money(f.xact.total_owed) %]</td>
                     <td>[% money(f.xact.total_paid) %]</td>
-                    <td class="red">
+                    <td class="alert">
                         <strong>
                             [% money(f.xact.balance_owed) %]
                         </strong>

diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 87cdfd0..418c7ac 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -11,7 +11,7 @@
                width='100%'>
             <tbody>
                 <tr>
-                    <td width='100%' class='red'>
+                    <td width='100%' class='alert'>
                         [% l("Your account expired on") %]
                         <span id='myopac.expired.date'></span>!
                         [% l("Please see a librarian to renew your account.") %]</td>

diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 36ec79c..c603ada 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -37,7 +37,7 @@
             </div>
         </div>
         [% l('Fines:') %]
-        <span class='[% ctx.user_stats.fines.balance_owed ? "red" : ""%]'>
+        <span class='[% ctx.user_stats.fines.balance_owed ? "alert" : ""%]'>
             [% money(ctx.user_stats.fines.balance_owed) %]
         </span><br />
         [% IF (ctx.fines.grocery.size OR ctx.fines.circulation.size) AND ctx.get_org_setting(ctx.user.home_ou, 'credit.payments.allow') == 1 %]

diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index dbae5b2..3bfb4dc 100644 (file)
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -1,31 +1,5 @@
 /* once done renaming and everything, combine with style.css */
-
-/* Verfied in-use classes --------------------------- */
-.opac-auto-009 { border: 3px solid #E0E0E0; }
-.opac-auto-010 { border-bottom: 1px dotted #ccc; padding-top: 10px; }
-.opac-auto-011 { border-bottom: 1px dotted #ccc; padding-top: 6px; }
-.adv_global_input_container { border-bottom: none; }
-.opac-auto-013 { border-bottom: none; *height: 0px; }
-.opac-auto-015 { border-left: 1px solid #e9ebf3; padding-right: 27px; }
-.adv_global_filter_sort { border: none; width: 100%; }
-.opac-auto-018 { border-top: 1px dotted #ccc; padding-top: 17px; }
-.clear-both { clear: both; }
-.common-no-pad { clear: both; height: 0px; margin: 0px; padding: 0px; }
-.common-full-pad { clear: both; height: 15px; }
-.opac-auto-029 { color: #333; font-weight: bold; font-size: 13px; }
-.opac-auto-030 { color: #545454; }
-.opac-auto-031 { color: #9999FF; padding-left: 10px; font-size: 7pt; font-weight: 300; }
-.red { color: red; }
-.bold-red { color: red; font-weight: bold }
-.pointer { cursor: pointer; }
-/* ------------------------------------------- */
-
-
-.float-left { float: left; }
-.bookbag-share { float: left; padding: 5px 0; }
-.bookbag-controls { float: left; padding: 5px 0px 0px 10px; }
 .left-corner { float: left; width: 163px; height: 30px; background: url('/images/utils-corner-mid.png') repeat-x top; }
-.float-right { float: right; }
 .opac-auto-045 { float: right; margin-right: 17px; }
 .opac-auto-046 { float: right; width: 214px; }
 .opac-auto-047 { float: right; width: 353px; background: #ccc; padding: 10px; margin-top: 7px; }

diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 7c703d6..1494826 100644 (file)
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -200,6 +200,11 @@ span.dash_divider {
        padding-left:0px;
 }
 
+#gold-links-holder {
+    height: 24px;
+    background: #252525;
+}
+
 #util-bar {
        margin-left: 1em;
        padding-left:0px;
@@ -1166,4 +1171,51 @@ table.bookbag-specific {
     border-bottom: 1px solid #666;
     margin-bottom: 2ex;
 }
+.bookbag-share {
+    float: left;
+    padding: 5px 0;
+}
+.bookbag-controls {
+    float: left;
+    padding: 5px 0px 0px 10px;
+}
+
 .save-notes { padding-bottom: 1.5ex; }
+
+/* Moved from semiauto.css */
+.opac-auto-010 {
+    border-bottom: 1px dotted #ccc;
+    padding-top: 10px;
+}
+.opac-auto-011 {
+    border-bottom: 1px dotted #ccc;
+    padding-top: 6px;
+}
+.adv_global_input_container { border-bottom: none; }
+.opac-auto-013 {
+    border-bottom: none;
+    *height: 0px;
+}
+.opac-auto-015 {
+    border-left: 1px solid #e9ebf3;
+    padding-right: 27px;
+}
+.adv_global_filter_sort {
+    border: none;
+    width: 100%;
+}
+.clear-both { clear: both; }
+.common-no-pad {
+    clear: both;
+    height: 0px;
+    margin: 0px;
+    padding: 0px;
+}
+.common-full-pad {
+    clear: both;
+    height: 15px;
+}
+.alert { color: red; }
+.float-left { float: left; }
+.float-right { float: right; }
+