fixed bug in Holds.pm
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 14 Dec 2005 23:17:36 +0000 (23:17 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 14 Dec 2005 23:17:36 +0000 (23:17 +0000)
did a little work toward breaking apart the colors from the opac proper
for easier skinning.. more to do with that

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

Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
Open-ILS/web/opac/common/js/init.js
Open-ILS/web/opac/locale/en-US/common.dtd
Open-ILS/web/opac/skin/default/css/layout.css
Open-ILS/web/opac/skin/default/xml/advanced/advanced_location.xml
Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml
Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
Open-ILS/web/opac/skin/default/xml/page_advanced.xml
Open-ILS/web/opac/theme/default/css/colors.css

index c9abb12..b6b9c9a 100644 (file)
@@ -220,7 +220,7 @@ sub cancel_hold {
        }
 
        $logger->activity( "User " . $user->id . 
-               " canceling hold $holdid for user " . $hold->user );
+               " canceling hold $holdid for user " . $hold->usr );
 
        return $apputils->simplereq(
                'open-ils.storage',
index 236da18..5b3825f 100644 (file)
@@ -14,7 +14,7 @@ try{ attachEvt("common", "unload", cleanRemoteRequests);} catch(e){}
 function init() {
        runEvt('common','init');
        if( getOrigLocation() == 0 ) ORIGLOC = LOCATION;
-       if(!isFrontPage) grabUser();
+       try { if(!isFrontPage) grabUser(); }catch(e){}
        runEvt("common", "run");
        //checkUserSkin();
        G.ui.common.now_searching.appendChild(text(findOrgUnit(getLocation()).name()));
index 639b850..391cb72 100644 (file)
@@ -6,7 +6,7 @@
 <!ENTITY common.subject "Subject">
 <!ENTITY common.series "Series">
 <!ENTITY common.keyword "Keyword">
-<!ENTITY common.type "Type">
+<!ENTITY common.type "Search Type">
 <!ENTITY common.isbn "ISBN">
 <!ENTITY common.format "Format">
 <!ENTITY common.login "Login">
@@ -18,4 +18,5 @@
 <!ENTITY common.username "Username">
 <!ENTITY common.password "Password">
 <!ENTITY common.submit "Submit">
+<!ENTITY common.and "and">
 <!ENTITY common.user_not_found "User not found">
index 9791a09..1e2c0d7 100644 (file)
@@ -32,11 +32,9 @@ table { border-collapse: collapse; }
 .canvas { min-height: 300px; }
 #not_the_canvas {}
 
-#canvas_main { min-height: 300px; border-left: 3px solid #A7EA9D; border-bottom: 3px solid #A7EA9D; 
-       border-top: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px; padding-bottom: 10px; }
+#canvas_main { min-height: 300px; padding-left: 6px; -moz-border-radius: 6px; padding-bottom: 10px; }
+.non_canvas {  min-height: 300px; padding-left: 6px; -moz-border-radius: 6px;}
 
-.non_canvas {  min-height: 300px; border-left: 3px solid #A7EA9D; border-top: 3px solid #A7EA9D; 
-       border-bottom: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px;}
 
 #loading_div { width: 100%;}
 .logo { height: 65px; width: 180px; }
@@ -56,7 +54,7 @@ table { border-collapse: collapse; }
 .sidebar_extra_item { padding: 0px; margin-right: 8px;}
 .side_bar_item { padding-left: 8px; padding-right: 8px; padding-top: 4px; padding-bottom: 4px; margin-right: 8px; }
 
-.sidebar_item_active { background: #A7EA9D; margin-right: 0px; }
+.sidebar_item_active { margin-right: 0px; }
 
 .sidebar_chunk { width: 100%; }
 
@@ -64,11 +62,13 @@ table { border-collapse: collapse; }
 
 #searchbar { margin-top: 18px; width: 100%; }
 #searchbar table tr td {font-weight: bold; font-size: 8pt; }
-#searchbar select, input { border-collapse: collapse; border: solid 1px; font-size: 9pt; }
+#searchbar select, input { border-collapse: collapse; font-size: 9pt; }
 .searchbar_item { margin: 3px; font-size: 9pt; } 
 .searchbar_label_span { font-size: 9pt; }
 #searchbar_table { border-collapse: collapse; }
 
+.search_box_container { width: 240px; padding: 3px; }/* border: 1px solid #A0A0A0;' class='color_2'>*/
+
 
 /* ---------------------------------------------------------------------- */
 #login_box { width: 60%; padding: 5px;}
@@ -116,8 +116,18 @@ table { border-collapse: collapse; }
 .tor_pic { width: 17px; height: 17px; border: none;}
 
 .dim2_border { border: 1px solid #F06000; -moz-border-radius: 3px;}
-.dim2 { filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5; text-decoration: none; }
-.dim { filter:alpha(opacity=10); -moz-opacity:0.1; opacity: 0.1; text-decoration: none; }
+
+.dim2 { 
+       filter:alpha(opacity=50); 
+       -moz-opacity:0.5; 
+       opacity: 0.5; 
+       text-decoration: none; }
+
+.dim { 
+       filter:alpha(opacity=10); 
+       -moz-opacity:0.1; 
+       opacity: 0.1; 
+       text-decoration: none; }
 
 /* ---------------------------------------------------------------------- */
 
index 613ccc6..6cda6a2 100644 (file)
@@ -1,7 +1,7 @@
 <table>
        <tbody>
                <tr>
-                       <td><!--#include virtual="statusbar.xml"--></td>
+                       <td><!--#include virtual="../common/statusbar.xml"--></td>
                        <td><a style='padding-left: 20px;'  href='javascript:void(0);'
                                class='classic_link'>Change search location</a></td>
                </tr>
index 5b7b9c4..c4b340a 100644 (file)
@@ -1,4 +1,4 @@
-<table class='data_grid' width='95%'>
+<table class='data_grid' width='80%'>
        <thead>
                <tr>
                        <td colspan='6'>&opac.advanced.quick.title;</td>
@@ -7,10 +7,12 @@
        <tbody>
                <tr>
                        <td>
-                               <!--
-                               <span>&opac.advanced.marc.tag;: </span>
-                               <input name='advanced.marc.tag' maxlength='3' size='3'> </input>
-                               -->
+                               <span style='padding-right: 10px;'>&opac.advanced.quick.isbn;:</span>
+                               <input type='text' size='10' maxlength='10'> </input>
+                       </td>
+                       <td>
+                               <span style='padding-right: 10px;'>&opac.advanced.quick.issn;:</span>
+                               <input type='text' size='8' maxlength='8'> </input>
                        </td>
                </tr>
        </tbody>
index 132682c..fffc38c 100644 (file)
        </script>
 
 
-       <table class='color_1' width='100%' style='border-collapse: collapse;'>
+       <table class='color_1 color_border1' width='100%' style='border-collapse: collapse;'>
                <tbody>
                        <tr>
 
-                               <td nowrap='nowrap' align='center' 
-                                       style='width: 240px; padding: 3px; border: 1px solid #A0A0A0;' class='color_2'>
+                               <td nowrap='nowrap' align='center'  class='search_box_container color_2'>
+
                                        <input id='search_box' style='width: 190px;' type='text' />
                                        <span style='padding-left: 6px;'>
                                                <input type='button' style='width: 40px;' id='search_submit' value='Go!' />
index 39f5a4d..d648d8e 100644 (file)
        </div>
 
        <div class='advanced_div'>
-               <!--#include virtual="advanced/advanced_quick.xml"-->
+               <!--#include virtual="advanced/advanced_wizard.xml"-->
        </div>
 
+       <hr/>
+
        <div class='advanced_div'>
-               <!--#include virtual="advanced/advanced_wizard.xml"-->
+               <!--#include virtual="advanced/advanced_refined.xml"-->
        </div>
 
        <hr/>
 
        <div class='advanced_div'>
-               <!--#include virtual="advanced/advanced_refined.xml"-->
+               <!--#include virtual="advanced/advanced_quick.xml"-->
        </div>
 
        <hr/>
index f26b637..6d6aaf6 100644 (file)
@@ -6,6 +6,7 @@ body a:hover    { color: red; text-decoration: underline;}
 .color_2 { background: #64EA4F; color: #000000; }
 .color_3 { background: #CCFFFF; color: #000000; }
 .color_4 { background: #E0F0E0; color: #000000; }
+.color_border1 { }
 
 /* ---------------------------------------------------------------------- */
 .sidebar_chunk {}
@@ -27,3 +28,11 @@ body a:hover { color: red; text-decoration: underline;}
 .rdetail_header {  }
 
 
+.sidebar_item_active { background: #A7EA9D; }
+
+#canvas_main { border-left: 3px solid #A7EA9D; border-bottom: 3px solid #A7EA9D; 
+       border-top: 3px solid #A7EA9D;  }
+
+.non_canvas {  border-left: 3px solid #A7EA9D; border-top: 3px solid #A7EA9D; 
+       border-bottom: 3px solid #A7EA9D; }
+