template cleanup; localizing strings and mild style tweaks; more to come

diff --git a/Open-ILS/web/templates/default/opac/advanced.tt2 b/Open-ILS/web/templates/default/opac/advanced.tt2
index 6479a53..b9fe4c1 100644 (file)
--- a/Open-ILS/web/templates/default/opac/advanced.tt2
+++ b/Open-ILS/web/templates/default/opac/advanced.tt2
@@ -5,12 +5,9 @@
         [% INCLUDE "default/opac/parts/utils.tt2" %]
         <div id="adv_search_parent">
             <div id="adv_search_tabs">
-                <a href="#" alt="Advanced Search" id="adv_search"
-                    rel="adv_global_search"></a>
-                <a href="#" alt="Numeric Search" id="num_search"
-                    rel="adv_quick_search_sidebar"></a>
-                <a href="#" alt="Expert Search" id="expert_search"
-                    rel="adv_marc_search_sidebar"></a>
+                <a href="#" alt="[% l('Advanced Search') %]" id="adv_search"></a>
+                <a href="#" alt="[% l('Numeric Search') %]" id="num_search"></a>
+                <a href="#" alt="[% l('Expert Search') %]" id="expert_search"></a>
             </div>
         </div>
     </div>

diff --git a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
index f0beef9..9872b85 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
@@ -57,20 +57,19 @@
                             <span>[% l("Item Form") %]</span>
                         </td>
                         <td align='left' class="hide_me">
-                            <select multiple='multiple' size='3'
-                                id='adv_global_item_form'>
+                            <select multiple='multiple' size='3' id='adv_global_item_form'>
                             </select>    
                         </td>
                         <td align='right'>
                             <span>[% l("Item Type") %]</span><br />
                         </td>
                         <td align='left'>
-                            <select multiple='multiple' size='3'
-                                id='adv_global_item_type' class='hide_me'>
+                            <select multiple='multiple' size='3' id='adv_global_item_type' class='hide_me'>
                             </select>    
-                            <select multiple='multiple' size='3'
-                                id='adv_global_item_type_basic'>
+                            <select multiple='multiple' size='3' id='adv_global_item_type_basic'>
                                 <option value=''>[% l("All Formats") %]</option>
+
+                                <!-- These will be replaced w/ SVF.  Leave them hard-coded for now -->
                                 <option value='a'>Book</option>
                                 <option value='i'>Book on cassette</option>
                                 <option value='n'>Book on CD</option>
@@ -105,26 +104,14 @@
                         </td>
                         <td align='right' class="hide_me">
                             <span>[% l("Literary Form") %]</span>
-                            <a id='adv_global_lit_form_link_adv'
-                                class='classic_link adv_adv_link'
-                                href='#'>[% l("Advanced") %]</a>
-
-                            <a id='adv_global_lit_form_link_basic'
-                                class='hide_me classic_link adv_adv_link'
-                                href='#'>[% l("Basic") %]</a>
+                            <a class='classic_link adv_adv_link' href='#'>[% l("Advanced") %]</a>
+                            <a class='hide_me classic_link adv_adv_link' href='#'>[% l("Basic") %]</a>
                         </td>
                         <td align='left' class="hide_me">
-                            <select multiple='multiple' size='3'
-                                id='adv_global_lit_form' class='hide_me'>
-                            </select>    
-                            <select multiple='multiple' size='3'
-                                id='adv_global_lit_form_basic'>
-                                <option value='0 '>
-                                    [% l("Non Fiction") %]
-                                </option>
-                                <option value='1'>
-                                    [% l("Fiction") %]
-                                </option>
+                            <select multiple='multiple' size='3' id='adv_global_lit_form' class='hide_me'> </select>    
+                            <select multiple='multiple' size='3' id='adv_global_lit_form_basic'> 
+                                <option value='0 '>[% l("Non Fiction") %]</option>
+                                <option value='1'>[% l("Fiction") %]</option>
                             </select>    
                         </td>
                         <td align='right'>
@@ -147,11 +134,9 @@
                                 href='#'>[% l("Basic") %]</a>
                         </td>
                         <td align='left' class="hide_me">
-                            <select multiple='multiple' size='3'
-                                id='adv_global_audience' class='hide_me'>
+                            <select multiple='multiple' size='3' id='adv_global_audience' class='hide_me'>
                             </select>
-                            <select multiple='multiple' size='3'
-                                id='adv_global_audience_basic'>
+                            <select multiple='multiple' size='3' id='adv_global_audience_basic'>
                                 <option value='e '>[% l("Adult") %]</option>
                                 <option value='abcdj'>[% l("Juvenile") %]</option>
                                 <option value='fg '>[% l("General") %]</option>
@@ -162,8 +147,7 @@
                             <span>[% l("Bib Level") %]</span>
                         </td>
                         <td align='left' class="hide_me">
-                            <select multiple='multiple' size='3'
-                                id='adv_global_bib_level'>
+                            <select multiple='multiple' size='3' id='adv_global_bib_level'>
                             </select>    
                         </td>
                     </tr>
@@ -173,27 +157,15 @@
                         </td>
                         <td align='left'>
                             <select id='adv_global_pub_date_type'>
-                                    <option value='equals' selected='selected'>
-                                        [% l("Is") %]
-                                    </option>
-                                    <option value='before'>
-                                        [% l("Before") %]
-                                    </option>
-                                    <option value='after'>
-                                        [% l("After") %]
-                                    </option>
-                                    <option value='between'>
-                                        [% l("Between") %]
-                                    </option>
+                                    <option value='equals' selected='selected'>[% l("Is") %] </option>
+                                    <option value='before'>[% l("Before") %]</option>
+                                    <option value='after'>[% l("After") %]</option>
+                                    <option value='between'>[% l("Between") %]</option>
                             </select>    
                             <div style='margin-top:5px;'>
-                                <input id='adv_global_pub_date_1' type='text'
-                                    size='4' maxlength='4'/>
-                                <span id='adv_global_pub_date_2_span'
-                                    class='hide_me'>
-                                    [% l("and") %] <input
-                                        id='adv_global_pub_date_2' type='text'
-                                        size='4' maxlength='4'/>
+                                <input id='adv_global_pub_date_1' type='text' size='4' maxlength='4'/>
+                                <span id='adv_global_pub_date_2_span' class='hide_me'>
+                                    [% l("and") %] <input id='adv_global_pub_date_2' type='text' size='4' maxlength='4'/>
                                 </span>
                             </div>
                         </td>
@@ -263,7 +235,7 @@
     <tr class='border_4_2'>
         <td align="left" colspan='2'>
             <!-- XXX TODO make a real form, and make this a real submitter -->
-        <img src="[% ctx.media_prefix %]/images/search_btn.gif" alt="Search"  style="cursor:pointer;" />
+        <img src="[% ctx.media_prefix %]/images/search_btn.gif" alt="[% l('Search') %]"  style="cursor:pointer;" />
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <!-- XXX TODO make a real form, and make this a real resetter -->
         <a href="javascript:;" style="position: relative; top: -9px;">Reset Form</a>
@@ -296,7 +268,7 @@
             <!-- XXX TODO make a real form, and make a real submitter (quick
             submit, FKA advGenericSearch() -->
             <img src="[% ctx.media_prefix %]/images/search_btn.gif"
-                alt="Search" id="adv_quick_submit" style="cursor:pointer;" />
+                alt="[% l('Search') %]" id="adv_quick_submit" style="cursor:pointer;" />
         </div>
     </div>
 </div>
@@ -320,20 +292,17 @@
             </tr>
             <tr name='crow' class='hide_me'>
                 <td colspan='4' align='center'>
-                    <a href='javascript:void(0);'
-                        class='classic_link'>[% l("close") %]</a>
+                    <a href='javascript:void(0);' class='classic_link'>[% l("close") %]</a>
                 </td>
             </tr>
         </tbody>
     </table>
     <div id='adv_marc_submit' class='adv_quick_search_submit'>
         <a style='margin-right: 4px; position:relative;top:-10px;'
-            class='classic_link'
-            href='javascript:advAddMARC();'>[% l("Add Row") %]</a>
+            class='classic_link' href='javascript:advAddMARC();'>[% l("Add Row") %]</a>
         <!-- XXX TODO make a real form, and make a real submitter (FKA
         advMARCRun()) -->
-        <img alt="Search" src="[% ctx.media_prefix %]/images/search_btn.gif"
-            style="cursor:pointer;" />
+        <img alt="Search" src="[% ctx.media_prefix %]/images/search_btn.gif" style="cursor:pointer;" />
     </div>
 </div>
 <!-- ****************** end: advanced_global.xml ***************************** -->

diff --git a/Open-ILS/web/templates/default/opac/parts/base.tt2 b/Open-ILS/web/templates/default/opac/parts/base.tt2
index c03df65..27652a5 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/base.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/base.tt2
@@ -6,7 +6,7 @@
             href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
         <link rel="stylesheet" type="text/css"
             href="[% ctx.media_prefix %]/css/skin/default/opac/style.css" />
-        <title>Catalog - King County Library - [% ctx.page_title %]</title>
+        <title>[% l('Catalog - King County Library - [_1]', ctx.page_title) %]</title>
         [%# <!-- is this needed? --><link rel="unapi-server"
             type="application/xml" title="unAPI" href="/opac/extras/unapi" />%]
         [% BLOCK html_head; END; # provide a default that can be overridden -%]

diff --git a/Open-ILS/web/templates/default/opac/results.tt2 b/Open-ILS/web/templates/default/opac/results.tt2
index d4351f2..3ff51a7 100644 (file)
--- a/Open-ILS/web/templates/default/opac/results.tt2
+++ b/Open-ILS/web/templates/default/opac/results.tt2
@@ -18,13 +18,13 @@
         <div id="results_header_bar">
             <div id="results_header_inner">
                 <div class="results_header_btns">
-                    <a href="[% ctx.opac_root %]/home"><img alt="Another Search"
+                    <a href="[% ctx.opac_root %]/home"><img alt="[% l('Another Search') %]"
                         src="[% ctx.media_prefix %]/images/another_search.png"
                         onmouseover="this.src='[% ctx.media_prefix %]/images/another_search_hover.png';"
                         onmouseout="this.src='[% ctx.media_prefix %]/images/another_search.png';" /></a>
                 </div>
                 <div class="results_header_btns">
-                    <a href="[% ctx.opac_root %]/advanced"><img alt="Advanced Search"
+                    <a href="[% ctx.opac_root %]/advanced"><img alt="[% l('Advanced Search') %]"
                         src="[% ctx.media_prefix %]/images/adv_search.png"
                         onmouseover="this.src='[% ctx.media_prefix %]/images/adv_search_hover.png';"
                         onmouseout="this.src='[% ctx.media_prefix %]/images/adv_search.png';" /></a>
@@ -48,7 +48,7 @@
                 <div class="results_header_div"></div> -->
                 <input type="checkbox" id="limit_to_available" />
                 <label for="limit_to_available" class="results_header_lbl">
-                    Limit to available items
+                    [% l('Limit to available items') %]
                 </label>
                 <div class="clear-both"></div>
             </div>