Merge branch 'bug_8942' into 3.12-master

[koha_ffzg] / koha-tmpl / intranet-tmpl / prog / en / modules / reports / dictionary.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
index 3f913d4..ee40dcf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
@@ -14,7 +14,7 @@
 [% ELSIF ( step_3 ) %] &rsaquo; <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> &rsaquo; <strong>Step 3: Choose columns </strong> 
 [% ELSIF ( step_4 ) %] &rsaquo; <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> &rsaquo; <strong>Step 4: Specify a value </strong> 
 [% ELSIF ( step_5 ) %] &rsaquo; <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> &rsaquo; <strong>Step 5: Confirm definition</strong> 
-[% ELSE %]<strong> Dictionary </strong>[% END %]</div>
+[% ELSE %] &rsaquo; <strong> Dictionary </strong>[% END %]</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -22,7 +22,11 @@
 <div id="yui-main">
 <div class="yui-b">
 [% IF ( start_dictionary ) %]
-[% INCLUDE 'dictionary-toolbar.inc' %]
+    <div id="toolbar">
+        <ul class="toolbar">
+            <li><a id="newdictionary" class="btn btn-small" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="icon-plus"></i> New definition</a></li>
+        </ul>
+    </div>
 [% END %]
 <h1>Dictionary</h1>
 [% IF ( start_dictionary ) %]
@@ -31,9 +35,9 @@
                [% IF ( definitions ) %]
         <h2>Current terms</h2>
                <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
-        <input type="hidden" name="phase" value="View dictionary" />
+        <input type="hidden" name="phase" value="View Dictionary" />
                [% IF ( areas ) %]
-                       Filter by area <select name="areas">
+                       Filter by area <select name="area">
                        <option value="">All</option>
                        [% FOREACH area IN areas %]
                            [% IF ( area.selected ) %]
@@ -100,10 +104,10 @@
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
 <fieldset class="rows">
 <legend>Step 2 of 5: Choose the area</legend>
-<ol><li><input type="hidden" name="phase" value="New term step 3" />
+<ol><li><input type="hidden" name="phase" value="New Term step 3" />
 <input type="hidden" name="definition_name" value="[% definition_name %]" />
 <input type="hidden" name="definition_description" value="[% definition_description %]" />
-<label for="areas">Select table </label><select name="areas" id="areas">
+<label for="area">Select table </label><select name="area" id="area">
 [% FOREACH area IN areas %]     
 <option value="[% area.id %]">[% area.name %]</option>                  
 [% END %]                
@@ -149,7 +153,7 @@
 
 <td style="border: 0;"><select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select>     </td>   </tr></table>     
 
-<input type="hidden" name="phase" value="New term step 4" />
+<input type="hidden" name="phase" value="New Term step 4" />
 </fieldset>
 <fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset>
 </form>
@@ -184,32 +188,14 @@
        <table>
        <tr>
        <td>Start of date range</td>
-       <td><input type="text" size="10" id="[% column.name %]_start_value" name="[% column.name %]_start_value" value="" />      
-       <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;"  />
-       <script type="text/javascript">
-       Calendar.setup({
-       inputField     : "[% column.name %]_start_value",
-       ifFormat       : "[% DHTMLcalendar_dateformat %]",
-       button         : "buttonfrom1",
-       align          : "Tl"
-       });
-       </script>
+    <td><input type="text" size="10" id="from" name="[% column.name %]_start_value" value="" class="datepickerfrom" />
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
        </td>
        </tr>
        <tr>
        <td>End of date range</td>
        <td>
-       <input type="text" size="10" id="[% column.name %]_end_value" name="[% column.name %]_end_value" value="" />      
-       <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonfrom2" style="cursor: pointer;"  />
-       <script type="text/javascript">
-       Calendar.setup({
-       inputField     : "[% column.name %]_end_value",
-       ifFormat       : "[% DHTMLcalendar_dateformat %]",
-       button         : "buttonfrom2",
-       align          : "Tl"
-       });
-       </script>
+    <input type="text" size="10" id="to" name="[% column.name %]_end_value" value="" class="datepickerto" />
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
        </td>
        </tr>
@@ -223,7 +209,7 @@
 
 [% END %]
 </ol>
-<input type="hidden" name="phase" value="New term step 5" />
+<input type="hidden" name="phase" value="New Term step 5" />
 </fieldset>
 <fieldset class="action">
 <input type="submit" name="submit" value="Next" />