Trivial changes

-Fix (conform) whitespace in IDL
-Fix "county" typo in settings label
-Restore mysteriously absent "Bottom Link 2" :)

Signed-off-by: Dan Wells <dbw2@calvin.edu>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 9dede59..c6b9893 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -8614,9 +8614,9 @@ SELECT  usr,
             <field reporter:label="Complete" name="complete" reporter:datatype="bool"/>
             <field reporter:label="Requesting User" name="requesting_usr" reporter:datatype="link"/>
         </fields>
-               <links>
-                       <link field="requesting_usr" reltype="has_a" key="id" map="" class="au"/>
-               </links>
+        <links>
+            <link field="requesting_usr" reltype="has_a" key="id" map="" class="au"/>
+        </links>
     </class>
 
     <class id="stgc" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="staging::card_stage" oils_persist:tablename="staging.card_stage" reporter:label="Card Stage">
@@ -8637,7 +8637,7 @@ SELECT  usr,
             <field reporter:label="Street (1)" name="street1" reporter:datatype="text"/>
             <field reporter:label="Street (2)" name="street2" reporter:datatype="text"/>
             <field reporter:label="City" name="city" reporter:datatype="text"/>
-                       <field reporter:label="County" name="county"  reporter:datatype="text"/>
+            <field reporter:label="County" name="county"  reporter:datatype="text"/>
             <field reporter:label="State" name="state" reporter:datatype="text"/>
             <field reporter:label="Country" name="country" reporter:datatype="text"/>
             <field reporter:label="Postal Code" name="post_code" reporter:datatype="text"/>
@@ -8653,7 +8653,7 @@ SELECT  usr,
             <field reporter:label="Street (1)" name="street1" reporter:datatype="text"/>
             <field reporter:label="Street (2)" name="street2" reporter:datatype="text"/>
             <field reporter:label="City" name="city" reporter:datatype="text"/>
-                       <field reporter:label="County" name="county"  reporter:datatype="text"/>
+            <field reporter:label="County" name="county"  reporter:datatype="text"/>
             <field reporter:label="State" name="state" reporter:datatype="text"/>
             <field reporter:label="Country" name="country" reporter:datatype="text"/>
             <field reporter:label="Postal Code" name="post_code" reporter:datatype="text"/>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 3fbaad7..923a4bd 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -12086,7 +12086,7 @@ VALUES (
     'bool',
     oils_i18n_gettext(
         'ui.patron.edit.aua.county.require',
-        'Show count field on patron registration',
+        'Show county field on patron registration',
         'coust',
         'label'
     ),

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron-self-reg.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron-self-reg.sql
index a08d957..b14f1ea 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron-self-reg.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.patron-self-reg.sql
@@ -85,7 +85,7 @@ VALUES (
     'bool',
     oils_i18n_gettext(
         'ui.patron.edit.aua.county.require',
-        'Show count field on patron registration',
+        'Show county field on patron registration',
         'coust',
         'label'
     ),

diff --git a/Open-ILS/src/templates/opac/parts/footer.tt2 b/Open-ILS/src/templates/opac/parts/footer.tt2
index cf43f7c..83d63e5 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@ -6,8 +6,9 @@
     <a href="[% mkurl(ctx.opac_root _ '/register') %]">[% 
         l('Request Library Card') %]</a> &nbsp;|&nbsp;
     [% ELSE %]
-    <a href="http://example.com">[% l('Bottom Link 3') %]</a> &nbsp;|&nbsp;
+    <a href="http://example.com">[% l('Bottom Link 2') %]</a> &nbsp;|&nbsp;
     [% END %]
+    <a href="http://example.com">[% l('Bottom Link 3') %]</a> &nbsp;|&nbsp;
     <a href="http://example.com">[% l('Bottom Link 4') %]</a> &nbsp;|&nbsp;
     <a href="http://example.com">[% l('Bottom Link 5') %]</a>
     [% IF ctx.timing %]