projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cec9c86)
Even more applying standard dialog styles to confirmation messages. Also fixing alter...
authorOwen Leonard <oleonard@myacpl.org>
Thu, 20 Dec 2007 02:28:12 +0000 (20:28 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Thu, 20 Dec 2007 13:34:00 +0000 (07:34 -0600)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
admin/stopwords.pl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl patch | blob | history

diff --git a/admin/stopwords.pl b/admin/stopwords.pl
index 3589093..d4d219a 100755 (executable)
--- a/admin/stopwords.pl
+++ b/admin/stopwords.pl
@@ -136,12 +136,12 @@ if ($op eq 'add_form') {
        my $env;
        my ($count,$results)=StringSearch($env,$searchfield,'web');
        my @loop;
-       my $toggle = 'white';
+       my $toggle = 0;
        for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
                my %row = (word => $results->[$i]{'word'},
                           toggle => $toggle);
                push @loop, \%row;
-               $toggle = ($toggle eq 'white') ? '#ffffcc' : 'white' ;
+               $toggle = ($toggle eq 0) ? 1 : 0 ;
        }
        $template->param(loop => \@loop);
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index 4a6c572..ce7ec36 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -74,11 +74,14 @@
 
 
 <!-- TMPL_IF NAME="add_validate" -->
-  <ul id="_informations"><li>Budget Data Recorded, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li></ul>
+  <div class="dialog message">
+  <h3>Budget Data Recorded</h3>
+  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" class="approve" value="OK" /><form></div>
 <!-- /TMPL_IF --> <!-- add_validate -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
-  <ul id="_informations"><li>Budget deleted, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li></ul>
+  <div class="dialog message"><h3>Budget deleted</h3>
+  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" class="approve" value="OK" /><form></div>
 <!-- /TMPL_IF --> <!-- delete_confirmed -->
 
 
@@ -327,8 +330,7 @@
 <!-- /TMPL_IF --> <!-- add_form -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-  <fieldset>
-    <legend>Delete Budget?</legend>
+ <div class="dialog alert"> <h3>Delete Budget?</h3>
 
     <table>
       <tr>
@@ -347,15 +349,12 @@
       </tr>
     </table>
 
-  </fieldset>
 <form action="<!-- TMPL_VAR NAME="action" -->" method="post">
-   <fieldset class="action">
-    <input type="hidden" name="op" value="delete_confirmed" />
-    <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" />
-      <input type="submit" value="Delete this budget" />
-       <a class="cancel" href="/cgi-bin/koha/admin/aqbudget.pl">Cancel</a>
-   </fieldset>
-         </form>
+<input type="hidden" name="op" value="delete_confirmed" />
+<input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" />
+<input type="submit" value="Delete this budget" class="approve" /></form>
+<form action="<!-- TMPL_VAR NAME="action" -->" method="get">
+<input type="submit" class="deny" value="No, Do Not Delete" /></form></div>
 
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index f79de8d..1571a85 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -58,27 +58,33 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
+       <div class="dialog alert"><h3>Delete Subfield <span class="ex">'<!-- TMPL_VAR NAME="tagsubfield" -->'?</span></h3>
     <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
-       <fieldset>
-    <legend>Confirm Deletion of Subfield <em><!-- TMPL_VAR NAME="tagsubfield" -->?</em></legend>
     <table><tr><th scope="row">Subfield:</th> <td><!-- TMPL_VAR NAME="tagsubfield" --></td></tr>
     <tr><th scope="row">Description:</th> <td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr></table>
         <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
         <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
         <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-        <fieldset class="action"><input type="submit" class="cancel" value="Yes, Delete this Subfield" /><a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;tagsubfield=<!-- TMPL_VAR NAME="tagsubfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">Cancel</a></fieldset>
-               </fieldset>
-    </form>
+        <input type="submit" class="approve" value="Yes, Delete this Subfield" />
+               </form>
+               <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="get">
+                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+        <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+        <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        <input type="submit" class="deny" value="No, Do Not Delete" />
+               </form>
+    </form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-    <h3>Data deleted</h3>
+   <div class="dialog message"> <h3>Data deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-        <input type="submit" class="submit" value="OK" />
-    </form>
+        <input type="submit" class="approve" value="OK" />
+    </form></div>
 <!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
index 46a2464..ac5e099 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
@@ -113,26 +113,28 @@ return false;
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
+               <div class="dialog alert">
+               <h3>Confirm Deletion</h3>
                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-<fieldset><legend>Confirm Deletion</legend>
                <table>
                        <tr><th scope="row">Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --> <!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
                </table>
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
         <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-               <fieldset class="action"><input type="submit" value="YES"> <a class="cancel" href="/cgi-bin/koha/admin/auth_tag_structure.pl">Cancel</a> </fieldset>
-</fieldset></form>
+               <input type="submit" value="Yes, Delete" class="approve"></form>
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="submit" class="deny" value="No, Do Not Delete" /></form>
+               </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-    <h3>Data deleted</h3>
+  <div class="dialog message">  <h3>Data deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
     <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
     <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
     <input type="submit" value="OK" class="submit" />
-    </form>
+    </form></div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="authtype_create" -->
 
@@ -210,12 +212,12 @@ return false;
     <!-- /TMPL_LOOP -->
     </table>
 
-        <!-- TMPL_IF NAME="isprevpage" -->
-            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
+        <div class="pages"><!-- TMPL_IF NAME="isprevpage" -->
+            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">&lt;&lt; Previous Page</a>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="nextpage" -->
-            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
-        <!-- /TMPL_IF -->
+            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page &gt;&gt;</a>
+        <!-- /TMPL_IF --></div>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index bc40a56..84868ee 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -121,23 +121,23 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
-<h3>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</h3>
+<div class="dialog alert"><h3>Confirm Deletion of Tag <span class="ex">'<!-- TMPL_VAR NAME="searchfield" -->'</span>?</h3>
     <p>Tag: <!-- TMPL_VAR NAME="searchfield" --></p>
     <p>Description: <!-- TMPL_VAR NAME="liblibrarian" --></p>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
        <input type="hidden" name="op" value="delete_confirmed" />
        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-       <input type="submit" value="Yes, Delete this Tag" /></form>
+       <input type="submit" class="approve" value="Yes, Delete this Tag" /></form>
        
-       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete" /></form>
+       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete" class="deny" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-    <div class="details"><h3>Tag Deleted</h3>
+    <div class="details"><div class="dialog message"><h3>Tag Deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-    <input type="submit" value="Return to MARC Frameworks" />
-    </form>
+    <input type="submit" value="OK" class="approve" />
+    </form></div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="framework_create" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
index 5550ffd..7fb574c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
@@ -94,28 +94,27 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="add_validate" -->
-    Data recorded
+   <div class="dialog message"> <h3>Data recorded</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" />
-    </form>
+        <input type="submit" value="OK" class="approve" />
+    </form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-       <fieldset>
-        <input type="hidden" name="op" value="delete_confirmed" />
+    <div class="dialog alert">
+       <h3>Delete Stop Word <span class="ex">'<!-- TMPL_VAR NAME="searchfield" -->'</span></h3>
+       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+       <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-               <legend>Confirm Deletion of Stop word <em><!-- TMPL_VAR NAME="searchfield" --></em></legend>
-        <input type="submit" value="Yes, Delete" /> <a class="cancel" href="/cgi-bin/koha/admin/stopwords.pl">Cancel</a>
-       </fieldset>
-    </form>
+       <input type="submit" value="Yes, Delete" class="approve" /></form>
+          <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="submit" class="deny" value="No, Do Not Delete" /> </form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
-    Data deleted
+   <div class="dialog message"> <h3>Data deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" />
-    </form>
+        <input type="submit" value="OK" class="approve" />
+    </form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
@@ -150,18 +149,18 @@
                     <th> </th>
             </tr>
             <!-- TMPL_LOOP NAME="loop" -->
-                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+               <!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                     <td><!-- TMPL_VAR NAME="word" --></td>
                     <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->">Delete</a></td>
                 </tr>
             <!-- /TMPL_LOOP -->
     </table>
-            <!-- TMPL_IF NAME="offsetgtzero" -->
+           <div class="pages"> <!-- TMPL_IF NAME="offsetgtzero" -->
                 <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Previous</a>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="ltcount" -->
                 <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>
-            <!-- /TMPL_iF -->
+            <!-- /TMPL_iF --></div>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index e3f69c6..f861fc0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -276,7 +276,7 @@
        <!-- /TMPL_IF -->
        
        <!-- TMPL_IF NAME="delete_confirm" -->
-       <h3>Delete Notice?</h3>
+       <div class="dialog alert"><h3>Delete Notice?</h3>
        <table>
                <tr>
                        <td>
@@ -291,16 +291,17 @@
                        <td><!-- TMPL_VAR NAME="Name" --></td>
                </tr>
        </table>
-                       <p><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed">
+               <form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+               <input type="hidden" name="op" value="delete_confirmed">
                <input type="hidden" name="code" value="<!-- TMPL_VAR NAME="code" -->" />
                <input type="hidden" name="module" value="<!-- TMPL_VAR NAME="module" -->" />
-                               <input type="submit" value="YES" />
+                               <input type="submit" value="Yes, Delete" class="approve" />
                                </form>
 
-                               <form action="<!-- TMPL_VAR NAME="action" -->" method="post">
-                                       <input type="submit" value="NO" />
+                               <form action="<!-- TMPL_VAR NAME="action" -->" method="get">
+                                       <input type="submit" value="No, Do Not Delete" class="deny" />
                                </form>
-                       </p>
+               </div>
 
        <!-- /TMPL_IF -->
        
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git