[25/40] More work on label export coded and interface. Adding icons for all export...

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 deef877..980d765 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1727,3 +1727,58 @@ span.permissiondesc {
     cursor: pointer;
 }
 
+h1#pdf {
+        background:transparent url(../../img/pdficon_large.gif) no-repeat scroll 0%;
+        border: 0;
+        margin:0.75em .3em 0.75em .7em;
+        padding:0;
+}
+
+h1#pdf a {
+       border:0;
+       cursor:pointer;
+       display:block;
+       height:0px !important;
+       margin:0;
+       overflow:hidden;
+       padding:44px 0 0;
+       text-decoration:none;
+       width:35px;
+}
+
+h1#csv {
+        background:transparent url(../../img/csv_icon.gif) no-repeat scroll 0%;
+        border: 0;
+        margin:0.75em .3em 0.75em .7em;
+        padding:0;
+}
+
+h1#csv a {
+       border:0;
+       cursor:pointer;
+       display:block;
+       height:0px !important;
+       margin:0;
+       overflow:hidden;
+       padding:44px 0 0;
+       text-decoration:none;
+       width:35px;
+}
+
+h1#xml {
+        background:transparent url(../../img/icon_xml.gif) no-repeat scroll 0%;
+        border: 0;
+        margin:0.75em .3em 0.75em .7em;
+        padding:0;
+}
+
+h1#xml a {
+       border:0;
+       cursor:pointer;
+       display:block;
+       height:0px !important;
+       margin:0;
+       overflow:hidden;
+       padding:44px 0 0;
+       text-decoration:none;
+       width:35px;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
index 6ed0e6a..fa9e2fe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
@@ -25,7 +25,7 @@
                     alert("Please select at least one item to delete.");
                     return;     // no item selected
                 }
-                var msg = "Are you sure you want to the selected item(s) from this batch?"
+                var msg = "Are you sure you want to remove the selected item(s) from this batch?"
                 var answer = confirm(msg);
                 if (answer) {
                     window.location = "/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;" + getstr;
@@ -85,11 +85,6 @@
                     if (document.items.action.checked){
                         return(document.items.action.value);
                     }
-                    //var x=document.getElementsByName("action");
-                    //if (x[0].checked) {
-                    //    alert(x[0].value);
-                    //    return(x[0].value);
-                    //};
                 };
                 alert("Please select at least one item.");
                 return (-1);
@@ -141,8 +136,8 @@
                             <div style="margin: 10px 10px 10px 0px;">
                                 <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="add" onclick="Add()" value="Add Item(s)"></span></span>
                                 <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="remove" onclick="Remove()" value="Remove Item(s)"></span></span>
-                                <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="print_item" onclick="Xport('label')" value="Print Item(s)"></span></span>
-                                <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="print_batch" onclick="Xport('batch')" value="Print Batch"></span></span>
+                                <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="export_item" onclick="Xport('label')" value="Export Item(s)"></span></span>
+                                <span class="yui-button yui-link-button"><span class="first-child"><input type="button" id="export_batch" onclick="Xport('batch')" value="Export Batch"></span></span>
                             </div>
                         </div>
                         <!-- TMPL_IF NAME="err" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
index d6bf6b7..d50821c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
@@ -24,15 +24,64 @@
                     <table class="borderless">
                         <!-- TMPL_LOOP NAME="batches" -->
                         <tr>
+                            <!-- TMPL_IF NAME="label_ids" -->
                             <td class="borderless">
-                                <!-- TMPL_IF NAME="label_ids" -->
-                                <a href="/cgi-bin/koha/labels/<!-- TMPL_VAR NAME="create_script" -->?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->&amp;start_label=<!-- TMPL_VAR NAME="start_label" --><!-- TMPL_VAR NAME="label_ids" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.pdf</a>
-                                <!-- TMPL_ELSIF NAME="item_numbers" -->
-                                <a href="/cgi-bin/koha/labels/<!-- TMPL_VAR NAME="create_script" -->?template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->&amp;start_label=<!-- TMPL_VAR NAME="start_label" --><!-- TMPL_VAR NAME="item_numbers" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.pdf</a>
-                                <!-- TMPL_ELSE -->
-                                <a href="/cgi-bin/koha/labels/<!-- TMPL_VAR NAME="create_script" -->?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->&amp;start_label=<!-- TMPL_VAR NAME="start_label" -->">label_batch_<!-- TMPL_VAR NAME="batch_id" -->.pdf</a>
-                                <!-- /TMPL_IF -->
+                                <!-- TMPL_VAR NAME="label_count" --> Single Labels
                             </td>
+                            <td class="borderless">
+                                <h1 id="pdf">
+                                    <a href="/cgi-bin/koha/labels/<!-- TMPL_VAR NAME="create_script" -->?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->&amp;start_label=<!-- TMPL_VAR NAME="start_label" --><!-- TMPL_VAR NAME="label_ids" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.pdf</a>
+                                </h1>
+                            </td>
+                            <td class="borderless">
+                                <h1 id="csv">
+                                    <a href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" --><!-- TMPL_VAR NAME="label_ids" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.csv</a>
+                                </h1>
+                            </td>
+                            <td class="borderless">
+                                <h1 id="xml">
+                                    <a href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" --><!-- TMPL_VAR NAME="label_ids" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.xml</a>
+                                </h1>
+                            </td>
+                            <!-- TMPL_ELSIF NAME="item_numbers" -->
+                            <td class="borderless">
+                                <!-- TMPL_VAR NAME="label_count" --> Single Labels
+                            </td>
+                            <td class="borderless">
+                                <h1 id="pdf">
+                                    <a href="/cgi-bin/koha/labels/<!-- TMPL_VAR NAME="create_script" -->?template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->&amp;start_label=<!-- TMPL_VAR NAME="start_label" --><!-- TMPL_VAR NAME="item_numbers" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.pdf</a>
+                                </h1>
+                            </td>
+                            <td class="borderless">
+                                <h1 id="csv">
+                                    <a href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" --><!-- TMPL_VAR NAME="item_numbers" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.csv</a>
+                                </h1>
+                            </td>
+                            <td class="borderless">
+                                <h1 id="xml">
+                                    <a href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" --><!-- TMPL_VAR NAME="item_numbers" -->">label_single_<!-- TMPL_VAR NAME="label_count" -->.xml</a>
+                                </h1>
+                            </td>
+                            <!-- TMPL_ELSE -->
+                            <td class="borderless">
+                                Label Batch Number <!-- TMPL_VAR NAME="batch_id" -->
+                            </td>
+                            <td class="borderless">
+                                <h1 id="pdf">
+                                    <a href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->&amp;start_label=<!-- TMPL_VAR NAME="start_label" -->">label_batch_<!-- TMPL_VAR NAME="batch_id" -->.pdf</a>
+                                </h1>
+                            </td>
+                            <td class="borderless">
+                                <h1 id="csv">
+                                    <a href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->">label_batch_<!-- TMPL_VAR NAME="batch_id" -->.csv</a>
+                                </h1>
+                            </td>
+                            <td class="borderless">
+                                <h1 id="xml">
+                                    <a href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->&amp;template_id=<!-- TMPL_VAR NAME="template_id" -->&amp;layout_id=<!-- TMPL_VAR NAME="layout_id" -->">label_batch_<!-- TMPL_VAR NAME="batch_id" -->.xml</a>
+                                </h1>
+                            </td>
+                            <!-- /TMPL_IF -->
                         </tr>
                         <!-- /TMPL_LOOP -->
                     </table>
@@ -101,18 +150,6 @@
                                 <input type="text" size="5" id="start_label" name="start_label" class="focus" title="Starting label number" value="1"/>
                             </td>
                         </tr>
-                        <tr>
-                            <td class="borderless">
-                                <label for="output_type">Select output format: </label>
-                            </td>
-                            <td class="borderless">
-                                <select name="output_format">
-                                    <!-- TMPL_LOOP NAME="label_output_formats" -->
-                                    <option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="desc"  --></option>
-                                    <!-- /TMPL_LOOP -->
-                                </select>
-                            </td>
-                        </tr>
                     </table>
                 </fieldset>
                 <fieldset class="action">

diff --git a/koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif b/koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
new file mode 100644 (file)
index 0000000..ec17116
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif b/koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
new file mode 100644 (file)
index 0000000..779fc58
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif differ

diff --git a/koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif b/koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
new file mode 100644 (file)
index 0000000..39673df
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif differ