projects / koha_ffzg / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 e11b598..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
@@ -1,20 +1,20 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Reports &rsaquo; Guided Reports &rsaquo; Dictionary</title>
+<title>Koha &rsaquo; Reports &rsaquo; Guided reports &rsaquo; Dictionary</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style>
 </head>
-<body>
+<body id="rep_dictionary" class="rep">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'circ-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports Wizard</a> 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a>
 [% IF ( new_dictionary ) %] &rsaquo; <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> &rsaquo; <strong>Name the new definition</strong>
 [% ELSIF ( step_2 ) %] &rsaquo; <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> &rsaquo; <strong>Step 2: Choose the area </strong> 
 [% 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,18 +22,22 @@
 <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 ) %]
        <p>Use the dictionary to define custom criteria for reporting.</p>
 
                [% IF ( definitions ) %]
-               <h2>Current Terms</h2>
+        <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 ) %]
@@ -77,33 +81,33 @@
 [% END %]
 
 [% IF ( new_dictionary ) %]
-<h3>Add New Definition</h3>
+<h3>Add new definition</h3>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
 <fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol>
 <li>
-<label for="definition_name">Definition Name:</label>
+<label for="definition_name">Definition name:</label>
 <input type="text" id="definition_name" name="definition_name" />
 </li>
 <li>
-<label for="definition_description">Definition Description:</label>
+<label for="definition_description">Definition description:</label>
 <textarea name="definition_description" id="definition_description" rows="3" cols="20"></textarea>
 </li>
 </ol></fieldset>
-                                                                                                                                                                                                                                         
+
 <fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" />
 <input name="submit" value="Next" type="submit" /></fieldset>
 </form>
 [% END %]
 
 [% IF ( step_2 ) %]
-<h3>Add New Definition</h3>
+<h3>Add new definition</h3>
 <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" />
 <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 %]                
@@ -115,7 +119,7 @@
 [% END %]
 
 [% IF ( step_3 ) %]
-<h3>Add New Definition</h3>
+<h3>Add new definition</h3>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">      
 <fieldset class="rows">
 <legend>Step 3 of 5: Choose columns</legend>
@@ -156,7 +160,7 @@
 [% END %]
 
 [% IF ( step_4 ) %]
-<h3>Add New Definition</h3>
+<h3>Add new definition</h3>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
 <fieldset class="rows">
 <legend>Step 4 of 5: Specify a value</legend>
@@ -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>
@@ -238,7 +224,7 @@
 <input type="hidden" name="definition_description" value="[% definition_description %]" />
 <input type="hidden" name="columnstring" value="[% columnstring %]" />
 
-<h3>Add New Definition</h3>
+<h3>Add new definition</h3>
 
 <fieldset class="rows">
 <legend>Step 5 of 5: Confirm details</legend>
Unnamed repository; edit this file 'description' to name the repository.