Restructuring branchtransfers.tmpl to use two-column layout for input and messages...

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

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 d9fd732..0bbc5c0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -722,7 +722,7 @@ fieldset.rows .inputnote {
     visibility:visible; /* you propably don't need to change this one */
     display:block;
 }
-#addbiblio a, #addchild a {
+#addbiblio a, #addchild a, #newentry a {
        padding-left : 34px;
        background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif");
        background-position : center left;
@@ -810,4 +810,13 @@ tr.highlight td {
 #circ_circulation_issue div.hint {
        color : #666666;
        margin: .2em 0;
+}
+
+tr.expired td {
+       color : #999999;
+}
+
+span.expired {
+       color : #990000;
+       font-style : italic;
 }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
index c7297db..89174e7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@@ -8,15 +8,13 @@
 
 <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; Transfers</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
 
 
 <!-- TMPL_IF Name="found" -->
-    <h3>Reserve Found</h3>
+   <div class="yui-g"> <h3>Reserve Found</h3>
     <table>
         <caption>
             <!-- TMPL_IF Name="reserved" -->
@@ -87,11 +85,43 @@
                             </form>
                         </td>
                 </tr>
-    </table>
+    </table></div>
 
 <!-- TMPL_ELSE -->
-
-        <h4>Messages</h4>
+       <div class="yui-ge">
+   <div class="yui-u first">     
+    <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
+        <fieldset class="brief">
+            <legend>Transfer</legend>
+            <ol>
+                       <li>
+                <label for="tobranchcd">Destination library: </label>
+                
+                    <select name="tobranchcd" id="tobranchcd">
+                        <!-- TMPL_LOOP Name="branchoptionloop" -->
+                            <option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->>
+                                <!-- TMPL_VAR Name="name" -->
+                            </option>
+                        <!-- /TMPL_LOOP -->
+                    </select>
+                
+            </li>
+            <li>
+                <label for="barcode">Enter barcode: </label>
+                <input name="barcode" id="barcode" size="15" class="focus" /> <input type="submit" value="Submit" />
+            </li>
+                       </ol>
+        </fieldset>
+        <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
+        <!-- TMPL_LOOP Name="trsfitemloop" -->
+            <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+            <input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
+            <input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
+        <!-- /TMPL_LOOP -->
+    </form></div>
+ 
+        
+        <div class="yui-u"><h4>Messages</h4>
                <ul>
                 <!-- TMPL_IF Name="reqmessage" -->
                     <!-- TMPL_IF Name="cancelled" -->
@@ -116,38 +146,12 @@
 <!-- TMPL_VAR Name="name" --> and has been returned.</li>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-                       </ul>
-    <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
-        <table>
-            <caption>Transfer</caption>
-            <tr>
-                <th scope="row">Destination library:</th>
-                <td>
-                    <select name="tobranchcd">
-                        <!-- TMPL_LOOP Name="branchoptionloop" -->
-                            <option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->>
-                                <!-- TMPL_VAR Name="name" -->
-                            </option>
-                        <!-- /TMPL_LOOP -->
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">Enter barcode</th>
-                <td><input name="barcode" size="15" class="focus" /></td>
-            </tr>
-        </table>
-        <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
-        <!-- TMPL_LOOP Name="trsfitemloop" -->
-            <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-            <input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
-            <input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
-        <!-- /TMPL_LOOP -->
-        <input type="submit" value="Do transfer" />
-    </form>
-        
+                       </ul></div><!-- /yui-u -->
+                       </div><!-- /yui-ge -->
+        
     <!-- TMPL_IF Name="trsfitemloop" -->
-        <table>
+        <div class="yui-g">
+               <table>
             <caption>Transfered Items</caption>
             <tr>
                 <th>Bar Code</th>
@@ -167,13 +171,11 @@
                 </tr>
             <!-- /TMPL_LOOP -->
         </table>
+               </div>
     <!-- /TMPL_IF -->
+       
+       
 <!-- /TMPL_IF -->
 
 </div>
-</div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
-</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 65459a9..af83975 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -87,10 +87,6 @@
 No results found
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<script type="text/javascript">
-//set the focus to the input text.    
-document.f.member.focus();
-</script>
 
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index 5209283..a23e3f6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -97,20 +97,20 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                         <th>&nbsp;</th>
                     </tr>
                     <!-- TMPL_LOOP NAME="opac_news" -->
-                        <tr>
+                         <!-- TMPL_IF NAME="expired" -->
+                            <tr class="expired">
+                            <!-- TMPL_ELSE -->
+                            <tr>
+                            <!-- /TMPL_IF -->
                             <td>
                                 <input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idnew" -->" />
                             </td>
                             <td><!-- TMPL_VAR NAME="lang" --></td>
                             <td><!-- TMPL_VAR NAME="number" --></td>
                             <td><!-- TMPL_VAR NAME="newdate" --></td>
-                            <td><!-- TMPL_VAR NAME="expirationdate" --></td>
+                            <td><!-- TMPL_VAR NAME="expirationdate" --> <!-- TMPL_IF NAME="expired" -->(<span class="expired">expired</span>)<!-- /TMPL_IF --></td>
                             <td><!-- TMPL_VAR NAME="title" --></td>
-                            <!-- TMPL_IF NAME="hasexpirated" -->
-                            <td class="hasexpirated">
-                            <!-- TMPL_ELSE -->
-                            <td>
-                            <!-- /TMPL_IF -->
+                           <td>
                                 <!-- TMPL_VAR NAME="new" -->
                             </td>
                             <td><a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a></td>

diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index e81a808..f979fb7 100755 (executable)
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -105,7 +105,7 @@ else {
                #$new->{'expirationdate'}=format_date_in_iso($new->{'expirationdate'});
         my @date = split (/-/,$new->{'expirationdate'});
         if ($date[0]*$date[1]*$date[2]>0 && Date_to_Days( @date ) < Date_to_Days(&Today) ){
-                       $new->{'hasexpirated'} = 1;
+                       $new->{'expired'} = 1;
         }
     }