added the holds list to myopac

some style changes to the checked out list

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1914 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js
index 701b062..b0bb2bd 100644 (file)
--- a/Open-ILS/web/opac/common/js/config.js
+++ b/Open-ILS/web/opac/common/js/config.js
@@ -190,6 +190,7 @@ var FETCH_COPY_STATUSES                     = "open-ils.search:open-ils.search.config.copy_status.
 var FETCH_COPY_COUNTS_SUMMARY  = "open-ils.search:open-ils.search.biblio.copy_counts.summary.retrieve";
 var FETCH_MARC_HTML                            = "open-ils.search:open-ils.search.biblio.record.html";
 var FETCH_CHECKED_OUT                  = "open-ils.circ:open-ils.circ.actor.user.checked_out";
+var FETCH_HOLDS                                        = "open-ils.circ:open-ils.circ.holds.retrieve";
 /* ---------------------------------------------------------------------------- */
 
 

diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js
index f173ee4..a7ade5c 100644 (file)
--- a/Open-ILS/web/opac/common/js/utils.js
+++ b/Open-ILS/web/opac/common/js/utils.js
@@ -1,7 +1,13 @@
+
 function getId(id) {
        return document.getElementById(id);
 }
 
+function swapCSSClass(obj, old, newc ) {
+       removeCSSClass(obj, old );
+       addCSSClass(obj, newc );
+}
+
 
 function addCSSClass(e,c) {
        if(!e || !c) return;
@@ -18,7 +24,7 @@ function addCSSClass(e,c) {
                if(css_class_array[css_class] !=null)
                        string_ip += css_class_array[css_class] + " ";
        }
-       string_ip = string_ip + c;
+       string_ip += c;
        e.className = string_ip;
 }
 
@@ -134,7 +140,7 @@ function text(t) {
 }
 
 function elem(name, attrs, text) {
-    var e = createAppElement(name);
+    var e = document.createElement(name);
     if (attrs) {
         for (key in attrs) {
                          if( key == 'id') e.id = attrs[key];

diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index b5d3ad6..e399730 100644 (file)
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -123,9 +123,27 @@ border-left: 1px solid #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1p
 
 /* ---------------------------------------------------------------------- */
 
-.myopac_link { width: 25%; margin: 3px; padding: 3px; text-align: center; vertical-align: middle; }
+.myopac_link { 
+       width: 20%; margin: 3px; padding: 3px; 
+       text-align: center; vertical-align: middle; 
+       border-bottom: 1px solid #808080; 
+       border-top: 1px solid #808080; }
 
-.myopac_table thead tr td { padding: 2px; font-weight: 600; border: 1px solid #808080;}
-.myopac_table td { padding: 3px; };
+/*
+.myopac_link_active { background: #CCFFFF; border-bottom: 6px solid green;} 
+*/
+
+.myopac_link_active { background: #CCFFFF; border-bottom: none;}
+
+
+/*
+.color_1 { background: #A7EA9D; color: #000000; }
+.color_2 { background: #64EA4F; color: #000000; }
+.color_3 { background: #CCFFFF; color: #000000; }
+*/
+
+.myopac_table thead tr td { padding: 2px; font-weight: 500; border: 1px solid #808080;}
+.myopac_table td { padding: 3px; }
+.myopac_form_pic { width: 20px; height: 20px; }
 
 

diff --git a/Open-ILS/web/opac/skin/default/xml/login.xml b/Open-ILS/web/opac/skin/default/xml/login.xml
index 1236fb8..7d24b4c 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/login.xml
@@ -30,6 +30,7 @@
                                <td><span class='login_text'>Password</span></td>
                                <td><span class='login_text'><input id='login_password' type='password' size='16'> </input></span></td>
                        </tr>
+                       <tr><td><br/></td></tr>
                        <tr>
                                <td><span class='login_text'><a href="javascript:void(0);" id='login_button'> Login </a></span></td>
                                <td><span class='login_text'><a href='javascript:void(0);' id='login_cancel_button'> Cancel </a></span></td>

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac.xml b/Open-ILS/web/opac/skin/default/xml/myopac.xml
index 40b39ad..d3c072a 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac.xml
@@ -35,13 +35,17 @@
                                                        <xi:include href="searchbar.xml"/>
                                                        <xi:include href="statusbar.xml"/>
                                                        <xi:include href="altcanvas.xml"/>
+
                                                        <div id='canvas_main'>
 
-                                                               <table style='width: 70%'>
+                                                               <br/>
+                                                               <table style='width: 100%; text-align: center;'>
                                                                        <tbody>
-                                                                               <tr id='myopac_nav_row' style='border: 1px solid #E0E0E0;'>
+                                                                               <tr id='myopac_nav_row'>
        
-                                                                                       <td class='myopac_link color_3' id='myopac_checked_td' >
+                                                                                       <td width='10%' style='border-right: 1px solid #808080;'></td>
+
+                                                                                       <td class='myopac_link' id='myopac_checked_td' >
                                                                                                <a href='javascript:void(0);' 
                                                                                                        onclick='myOPACChangePage("checked");'> Checked Out</a>
                                                                                        </td>
@@ -60,12 +64,15 @@
                                                                                                <a href='javascript:void(0);' 
                                                                                                        onclick='myOPACChangePage("prefs");'>Account Preferences</a>
                                                                                        </td>
+
+                                                                                       <td width='10%' style='border-left: 1px solid #808080;'></td>
        
                                                                                </tr>
                                                                        </tbody>
                                                                </table>
+
+                                                               <br/>
        
-                                                               <br/><br/>
        
                                                                <div id='myopac_main_div'>
                                                                        <xi:include href="myopac_checked.xml"/>

diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css
index 77a66a0..3923270 100644 (file)
--- a/Open-ILS/web/opac/theme/default/css/colors.css
+++ b/Open-ILS/web/opac/theme/default/css/colors.css
@@ -1,5 +1,5 @@
-body a                 { color: black; }
-body a:visited { color: black; }
+body a                 { color: black; text-decoration: none;}
+body a:visited { color: black; text-decoration: none;}
 body a:hover   { color: red; text-decoration: underline;}
 
 .color_1 { background: #A7EA9D; color: #000000; }