More interface changes for circulation: Further tweaking of circ warning dialog,...

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index ba9f073..5c8e0d1 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -489,6 +489,7 @@ if ($borrowerslist) {
     }
     $CGIselectborrower = CGI::scrolling_list(
         -name     => 'borrowernumber',
+               -class     => 'focus',
                -id          => 'borrowernumber',
         -values   => \@values,
         -labels   => \%labels,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 0d61ebb..f69e7e6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -887,7 +887,7 @@ div.first fieldset {
 
 .dialog div.confirm {
   background-color: #fff;
-  background : url(../../img/dialog-bg.gif) repeat-x left 20px !important;
+  background : url(../../img/dialog-bg.gif) repeat-x left 0 !important;
   font: 1em sans-serif;
   border: 1px solid #bcbcbc;
   padding: 4px !important;
@@ -897,5 +897,20 @@ div.first fieldset {
   }
   
  div.confirm input {
-       border : 
+       background-color : #FFF;
+       border : 1px solid #bcbcbc;
+       margin : .4em;
+       padding : .4em .4em .4em 25px;
+ }
+ 
+ div.confirm input.approve {
+       background : #FFF url(../../img/approve.gif) no-repeat 4px center;
+ }
+
+ div.confirm input.deny {
+       background : #FFF url(../../img/deny.gif) no-repeat 4px center;
+ }
+ 
+ div.confirm input:hover {
+       background-color : #ffc;
  }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 75957df..42506f9 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -22,11 +22,20 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;<!-- TMPL_IF NAME="borrowernumber" --> <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- TMPL_ELSE --> <strong>Checkouts</strong><!-- /TMPL_IF --></div>
 
+<!-- TMPL_IF NAME="CGIselectborrower" -->
+<div id="doc" class="yui-t7">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-g">
+<!-- TMPL_ELSE -->
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="borrowernumber" -->
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 <!-- /TMPL_IF -->
@@ -34,7 +43,7 @@
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
 
 <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-<div id="circ_needsconfirmation" class="dialog">
+<div class="yui-g" style="text-align: center"><div id="circ_needsconfirmation" class="dialog">
 <div><div class="confirm">
 <h3>Please Confirm Checkout</h3>
 
@@ -87,15 +96,15 @@
     <input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
     <input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-    <input type="submit" value="Yes, Check Out" accesskey="y" />
+    <input type="submit" class="approve" value="Yes, Check Out" accesskey="y" />
 </form>
 
 <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
     <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-    <input type="submit" value="No, Don't Check Out" accesskey="n" />
+    <input type="submit" class="deny" value="No, Don't Check Out" accesskey="n" />
 </form>
 
-</div></div></div>
+</div></div></div></div>
 
 <!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
 
@@ -112,26 +121,21 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
 
 <!-- TMPL_IF NAME="CGIselectborrower" -->
+<!-- TMPL_INCLUDE NAME="patron-toolbar.inc" -->
+
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform">
-<fieldset id="circ_circulation_selectborrower">
+<fieldset id="circ_circulation_selectborrower" class="brief">
     <legend>Patron selection</legend>
 
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
     <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
 
-    <p>
+<ol>    <li>
     <label for="borrowernumber">Select a patron: </label>
     <!-- TMPL_VAR name="CGIselectborrower" -->
-    </p>
-
-    <p><input type="submit" value="Select" /></p>
-
-    <p>
-    Patron not found?
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" />Add adult</a>
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" />Add child</a>
-    or <a href="/cgi-bin/koha/circ/circulation.pl">try another search</a>
-    </p>
+    </li>
+</ol>
+<p><input type="submit" value="Select" /></p>
 </fieldset>
 </form>
 <!-- TMPL_ELSE --> <!-- CGIselectborrower -->
@@ -761,8 +765,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
 </div>
 </div>
-<div class="yui-b">
+<!-- TMPL_UNLESS NAME="CGIselectborrower" --><div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
+</div><!-- /TMPL_UNLESS -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/img/approve.gif b/koha-tmpl/intranet-tmpl/prog/img/approve.gif
new file mode 100644 (file)
index 0000000..8064cf2
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/approve.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/deny.gif b/koha-tmpl/intranet-tmpl/prog/img/deny.gif
new file mode 100644 (file)
index 0000000..3448395
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/deny.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif
new file mode 100644 (file)
index 0000000..b70cf23
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif differ