projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c32e552)
Prettying up holds print/confirm button, correcting markup in transfer slip.
authorOwen Leonard <oleonard@myacpl.org>
Wed, 9 Apr 2008 13:58:09 +0000 (08:58 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Thu, 10 Apr 2008 07:59:27 +0000 (02:59 -0500)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/img/print-confirm.gif [new file with mode: 0644] patch | blob

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 a9a204c..47cd9f7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -26,6 +26,11 @@ form {
        display : inline;
 }
 
+form.confirm {
+       display : block;
+       text-align : center;
+}
+
 h1 {
        font-size : 161.6%;
        font-weight : bold;
@@ -1029,6 +1034,11 @@ div.first fieldset {
        padding: .4em .4em .4em 34px;
 }
 
+.dialog input.print {
+       background : #FFF url(../../img/print-confirm.gif) no-repeat 4px center;
+       padding : .4em .4em .4em 25px;  
+}
+
 .dialog input:hover {
        background-color : #ffc;
  }
@@ -1048,9 +1058,8 @@ div.message {
        width : 55%;
 }
 
-div.message input.approve {
-       display : block;
-       margin: auto;
+div.message ul+h4 {
+       margin-top : .7em;
 }
  
  div.results {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl
index 173d3bb..2ee81cf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tmpl
@@ -2,7 +2,7 @@
 <title>Koha -- Circulation: Transfers</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close-receipt.inc" -->
 </head>
-<body onload="window.print();window.close();">
+<body onload="window.print();">
 <div id="main">
         <!-- TMPL_LOOP NAME="reservedata" -->
 <h5>Date: <!-- TMPL_VAR NAME="pulldate" --></h5>
@@ -21,7 +21,7 @@
     <!-- TMPL_IF NAME="email" --><li><!-- TMPL_VAR NAME="email" --></li> <!-- /TMPL_IF -->
 </ul>
 <br />
-<h3>RESERVED ITEM</h2>
+<h3>RESERVED ITEM</h3>
  <h4><!-- TMPL_VAR Name="title" --></h4>
  <h5><!-- TMPL_VAR NAME="author" --> </h5>
  <p><!-- TMPL_VAR Name="barcode" --></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 105c10f..399223a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Circulation &rsaquo; Check In <!-- TMPL_VAR Name="title" --></title>
 <script>
 function Dopop(link) {
-    var newin=window.open(link,'popup','width=600,height=400,resizable=yes,toolbar=false,top');
+    var newin=window.open(link,'popup','width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
 }
 </script>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -36,13 +36,12 @@ function Dopop(link) {
                <!-- TMPL_IF NAME="wboremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="wboremail" -->"><!-- TMPL_VAR NAME="wboremail" --></a></li><!-- /TMPL_IF -->
         </ul>
   
-    <form method="post" action="returns.pl">
+    <form method="post" action="returns.pl" class="confirm">
             <input type="hidden" name="WT-itemNumber" value="<!-- TMPL_VAR Name="WrongTransferItem" -->" />
             <input type="hidden" name="WT-waitingAt" value="<!-- TMPL_VAR Name="TransferWaitingAt" -->" />
             <input type="hidden" name="WT-From" value="<!-- TMPL_VAR Name="wtransfertFrom" -->" />
         <input type="submit" class="approve" value="Confirm" />
-               <br />
-                       <input type="button" value="Print Slip & Confirm" class="approve" onclick='Dopop("hold-transfer-slip.pl?transfer=1&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip") ; this.form.submit()'; />
+                       <input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip'); this.form.submit();" />
     </form>
     <!-- /TMPL_IF --></div>
 <!-- /TMPL_IF -->
@@ -53,9 +52,8 @@ function Dopop(link) {
     <!-- TMPL_IF Name="waiting" -->
        <!-- waiting -->
 <div class="dialog message">
-        <h3>Hold Found (item is already waiting) </h3>
-               <h4><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h4>
-        <h5>Hold for:</h5>
+        <h3>Hold Found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h3>
+        <h4>Hold for:</h4>
                        <ul>
             <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --></a> (<!-- TMPL_VAR Name="borcnum" -->)</li>
             <li><!-- TMPL_VAR Name="boraddress" --><br />
@@ -64,10 +62,10 @@ function Dopop(link) {
            <!-- TMPL_IF NAME="borphone" --><li> <!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
                   <!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF --></ul>
         </p>
-        <form method="post" action="returns.pl">
+        <form method="post" action="returns.pl" class="confirm">
             <input type="submit" class="approve" value="Confirm" />
-                       <br />
-                       <input type="button" value="Print Slip & Confirm" class="approve" onclick='Dopop("hold-transfer-slip.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip") ; this.form.submit()'; />
+
+                       <input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip'); this.form.submit();" />
             <!-- TMPL_LOOP Name="inputloop" -->
                 <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
                 <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
@@ -84,8 +82,7 @@ function Dopop(link) {
     <!-- TMPL_IF Name="diffbranch" -->
                <!-- diffbranch -->
         <div class="dialog message">
-               <h2>Hold needing transfer found</h2>
-        <h3><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h3>
+               <h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h3>
                 <h4>Hold for: </h4>
                     <ul>
                         <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --></a> (<!-- TMPL_VAR Name="borcnum" -->)</li>
@@ -99,10 +96,9 @@ function Dopop(link) {
                 <h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
             <!-- /TMPL_IF -->
 
-        <form method="post" action="returns.pl">
+        <form method="post" action="returns.pl" class="confirm">
             <input type="submit" class="approve" value="Confirm" />
-                       <br />
-                       <input type="button" value="Print Slip & Confirm" class="submit" onclick='Dopop("hold-transfer-slip.pl?transfer=1&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip") ; this.form.submit()'; />
+                       <input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip'); this.form.submit();" />
             <!-- TMPL_LOOP Name="inputloop" -->
                 <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
                 <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
@@ -166,8 +162,7 @@ function Dopop(link) {
     <!-- TMPL_IF Name="reserved" -->
        <!--  reserved  -->
        <div class="dialog message">
-         <h3>Hold Found:</h3>
-       <h4><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h4>
+         <h3>Hold Found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></h3>
         <h5>Hold for:</h5>
                <ul>
             <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
@@ -184,11 +179,10 @@ function Dopop(link) {
                <!-- TMPL_ELSE -->
                <h4><strong>Hold at</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
         <!-- /TMPL_IF -->
-        <form method="post" action="returns.pl">
+        <form method="post" action="returns.pl" class="confirm">
             <!-- TMPL_IF name="transfertodo" -->
                 <input type="submit" class="approve" value="Confirm hold and transfer" />
-                               <br />
-                       <input type="button" value="Print Slip & Confirm" class="submit" onclick='Dopop("hold-transfer-slip.pl?transfer=1&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip") ; this.form.submit()'; />
+                       <input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;op=slip'); this.form.submit();" />
             <!-- TMPL_ELSE -->
                 <input type="submit" class="approve" value="Confirm hold" />
             <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/img/print-confirm.gif b/koha-tmpl/intranet-tmpl/prog/img/print-confirm.gif
new file mode 100644 (file)
index 0000000..1eac39c
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/print-confirm.gif differ
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git