More applying standard dialog styles to confirmation 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/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index df157ad..1e77a38 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -54,9 +54,8 @@
 
 
 <!-- TMPL_IF name="delete_confirm" -->
-       <form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
-<fieldset>
-<legend>Confirm Deletion</legend>
+       <div class="dialog alert">
+<h3>Confirm Deletion</h3>
 <table>
        <tr>
                <th>Category</th>
@@ -68,9 +67,12 @@
        <td><!-- TMPL_VAR name="Tvalue" --></td>
        <td><!-- TMPL_VAR name="Tlib" --></td></tr>
        </table>
+       <form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
                <input type="hidden" name="op" value="delete_confirmed" />
                <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><fieldset class="action"><input type="submit" value="Yes, Delete" /> <a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl">Cancel</a></fieldset></fieldset></form>
+               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><fieldset class="action"><input type="submit" value="Yes, Delete" class="approve" /></form>
+<form action="<!-- TMPL_VAR name=" script_name " -->" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="No, Do Not Delete" class="deny" /></form>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
@@ -83,6 +85,10 @@
 
         $(document).ready(function() {
            yuiToolbar();
+               $('#category').find("input:submit").hide();
+               $('#searchfield').change(function() {
+               $('#category').submit();
+               });
         });
 
        // YUI Toolbar Functions
@@ -110,7 +116,7 @@ the subfield is not entered through a free field, but though a list of authorize
 </span>
 </div>
 <!-- /TMPL_IF -->
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
 <!-- TMPL_IF EXPR="category eq 'Bsort1'" -->
     <p>Bsort1 is an authorised value attached to patrons, that can be used for stats purposes</p>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index f5a404c..7bd3c6c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -99,16 +99,16 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-               <fieldset>
-               <legend>Confirm Deletion of authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</legend>
+               <div class="dialog alert"><h3>Confirm Deletion of authority structure definition for <span class="ex">'<!-- TMPL_VAR NAME="authtypetext" -->' (<!-- TMPL_VAR NAME="authtypecode" -->)</span></h3>
        <!-- TMPL_IF NAME="total" -->
                <p>This record is used <strong><!-- TMPL_VAR NAME="total" --></strong> times</p>
        <!-- /TMPL_IF -->               
-                       <input type="hidden" name="op" value="delete_confirmed" />
+                       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
                        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-                       <fieldset class="action"><input type="submit" value="Yes, Delete" /> <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a></fieldset></fieldset>
+                       <fieldset class="action"><input type="submit" class="approve" value="Yes, Delete" />
                </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="else" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index 0645620..dc34b48 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
@@ -111,7 +111,7 @@ function Check(f) {
 <!-- TMPL_IF NAME="delete_confirm" --><div class="dialog alert">
 <h3>Delete framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
     <!-- TMPL_IF NAME="total" -->
-        <strong>This framework is used <!-- TMPL_VAR NAME="total" --> times</strong>.
+       <p> <strong>This framework is used <!-- TMPL_VAR NAME="total" --> times</strong>.</p>
     <!-- /TMPL_IF -->
         <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="approve" value="Yes, Delete this Framework!" />
         </form>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index f9c4fd4..bee599f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -29,11 +29,6 @@
 <script type="text/javascript">
 //<![CDATA[
 
-function DoCancel(f) {
-  f.op.value='';
-  document.Aform.submit();
-}
-
 function CheckSourceForm(f) {
     var ok=1;
     var _alertString="";
@@ -103,13 +98,13 @@ function CheckRuleForm(f) {
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_class_source_form" -->
-  &rsaquo; Confirm deletion of classification source <!-- TMPL_VAR name="class_source" -->
+  &rsaquo; Confirm deletion of classification source <span class="ex">'<!-- TMPL_VAR name="class_source" -->'</span>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_sort_rule_form" -->
-  &rsaquo; Confirm deletion of filing rule <!-- TMPL_VAR name="sort_rule" -->
+  &rsaquo; Confirm deletion of filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_sort_rule_impossible" -->
-  &rsaquo; Cannot delete filing rule <!-- TMPL_VAR name="sort_rule" -->
+  &rsaquo; Cannot delete filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>
 <!-- /TMPL_IF -->
 </div>
 
@@ -223,40 +218,34 @@ function CheckRuleForm(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_class_source_form" -->
-<h2>Confirm deletion of classification source <!-- TMPL_VAR name="class_source" -->?</h2>
+<div class="dialog alert"><h3>Confirm deletion of classification source <span class="ex">'<!-- TMPL_VAR name="class_source" -->'</span>?</h3>
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
   <input type="hidden" name="class_source" value="<!-- TMPL_VAR name="class_source" -->" />
-  <p id="action">
-    <input type="submit" value="Delete classification source" />
-    <input type="button" value="Cancel" onclick="DoCancel(this.form)" />
-  </p>
+  <input type="submit" value="Delete classification source" class="approve" /></form>
+  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" value="No, Do Not Delete" class="deny" />
 </form>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_sort_rule_form" -->
-<h2>Confirm deletion of filing rule <!-- TMPL_VAR name="sort_rule" -->?</h2>
+<div class="dialog alert"><h3>Confirm deletion of filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>?</h3>
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
   <input type="hidden" name="sort_rule" value="<!-- TMPL_VAR name="sort_rule" -->" />
-  <p id="action">
-    <input type="submit" value="Delete filing rule" />
-    <input type="button" value="Cancel" onclick="DoCancel(this.form)" />
-  </p>
+    <input type="submit" value="Delete filing rule" class="approve" />
 </form>
+<form action="<!-- TMPL_VAR name="script_name" -->" method="get">    <input type="submit" value="No, Do Not Delete" class="deny" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_sort_rule_impossible" -->
-<h2>Cannot delete filing rule <!-- TMPL_VAR name="sort_rule" --></h2>
+<div class="dialog message"><h3>Cannot delete filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span></h3>
 <p>The filing rule <!-- TMPL_VAR name="sort_rule" --> is used by at least one classification source.  Please
 remove it from all classification source definitions before trying again.
 </p>
-<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-  <input type="hidden" name="op" value="<!-- TMPL_VAR name="else"-->" />
-  <input type="hidden" name="sort_rule" value="<!-- TMPL_VAR name="sort_rule" -->" />
-  <p id="action">
-    <input type="button" value="Go back" onclick="DoCancel(this.form)" />
-  </p>
+<form action="<!-- TMPL_VAR name="script_name" -->" method="get">
+    <input type="button" value="OK" class="approve" /></form>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="display_lists" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index f341fdd..6ad6e6a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -70,7 +70,7 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange Rates</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->New Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<span class="ex"><!-- TMPL_VAR NAME="searchfield" --></span>'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF --></div>
 
@@ -140,35 +140,34 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-<table><caption>Confirm Deletion of Currency <!-- TMPL_VAR NAME="searchfield" --></caption>
-
+               <!-- TMPL_IF NAME="totalgtzero" -->
+<div class="dialog message">           <h3>Cannot Delete Currencey <span class="ex">'<!-- TMPL_VAR NAME="searchfield" -->'</span></h3>
+                                               <p>This currency is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span>
+                               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                                       <input type="submit" value="OK" class="approve" />
+                               </form></div>
+               <!-- TMPL_ELSE -->
+<div class="dialog alert">             <h3>Confirm Deletion of Currency <span class="ex">'<!-- TMPL_VAR NAME="searchfield" -->'</span></h3>
+<table>
                <tr>
                        <th>Currency</th>
                        <td><!-- TMPL_VAR NAME="searchfield" --></td>
                </tr>
-
-
-        
-               <tr>
+               <tr>
                        <th>Rate</th>
                        <td><!-- TMPL_VAR NAME="rate" --></td>
                </tr>
                </table>
-               <!-- TMPL_IF NAME="totalgtzero" -->
 
-                               <span class="alert">This currency is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span>
-                               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                       <input type="submit" value="OK" />
-                               </form>
-               <!-- TMPL_ELSE -->
+
        <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="submit" value="Delete this Currency" />
+                               <input type="submit" class="approve" value="Delete this Currency" />
                                </form>
                                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                       <input type="submit" value="Do Not Delete" />
-                               </form>
+                                       <input type="submit" class="deny" value="No, Do Not Delete" />
+                               </form></div>
                <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
index ffdf433..aa466fd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
@@ -511,15 +511,14 @@ function CheckRuleForm(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_matching_rule_form" -->
-<h2>Confirm deletion of record matching rule &quot;<!-- TMPL_VAR name="code" -->&quot; (<!-- TMPL_VAR name="description" -->)?</h2>
+<div class="dialog alert"><h3>Confirm deletion of record matching rule <span class="ex">'<!-- TMPL_VAR name="code" -->' (<!-- TMPL_VAR name="description" -->)</span>?</h3>
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
   <input type="hidden" name="matcher_id" value="<!-- TMPL_VAR name="matcher_id" -->" />
-  <p id="action">
-    <input type="submit" value="Delete record matching rule" />
-    <input type="button" value="Cancel" onclick="DoCancel(this.form)" />
-  </p>
-</form>
+    <input type="submit" value="Delete record matching rule" class="approve" /></form>
+       <form action="<!-- TMPL_VAR name="script_name" -->" method="get">
+    <input type="submit" value="No, Do Not Delete" class="deny" />
+</form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="display_list" -->
@@ -542,15 +541,15 @@ function CheckRuleForm(f) {
 
 <h2>Record Matching Rules</h2>
 <!-- TMPL_IF name="added_matching_rule" -->
-<span class="problem">Added record matching rule &quot;<!-- TMPL_VAR name="added_matching_rule" -->&quot;</span>
+<div class="dialog message">Added record matching rule &quot;<!-- TMPL_VAR name="added_matching_rule" -->&quot;</div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="edited_matching_rule" -->
-<span class="problem">Modified record matching rule &quot;<!-- TMPL_VAR name="edited_matching_rule" -->&quot;</span>
+<div class="dialog message">Modified record matching rule &quot;<!-- TMPL_VAR name="edited_matching_rule" -->&quot;</div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="deleted_matching_rule" -->
-<span class="problem">Deleted record matching rule &quot;<!-- TMPL_VAR name="deleted_matching_rule" -->&quot;</span>
+<div class="dialog message">Deleted record matching rule &quot;<!-- TMPL_VAR name="deleted_matching_rule" -->&quot;</div>
 <!-- /TMPL_IF -->
-<table>
+<!-- TMPL_IF NAME="available_matching_rules" --><table>
   <tr>
     <th>#</th>
     <th>Code</th>
@@ -568,7 +567,7 @@ function CheckRuleForm(f) {
     </td>
   </tr>
   <!-- /TMPL_LOOP -->
-</table>
+</table><!-- TMPL_ELSE --><p>There are no saved matching rules.</p><!-- /TMPL_IF -->
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>