From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 5 Aug 2013 21:24:13 +0000 (-0400)
Subject: LP1207396 Patron self-registration web form
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5c70f524c927bfd6549f3da1efe8c4a495c7c00a;p=evergreen%2Fequinox.git

LP1207396 Patron self-registration web form

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
index 9d8d48d3c6..55674ab0d6 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
@@ -123,6 +123,8 @@ sub collect_register_validation_settings {
         unless defined $shash->{stgu}{family_name}{require};
     $shash->{stgma}{street1}{require} = 1
         unless defined $shash->{stgma}{street1}{require};
+    $shash->{stgma}{street2}{show} = 1
+        unless defined $shash->{stgma}{street2}{show};
     $shash->{stgma}{city}{require} = 1
         unless defined $shash->{stgma}{city}{require};
     $shash->{stgma}{post_code}{require} = 1
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 6c7adc4536..9a89c6cb52 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1555,3 +1555,9 @@ a.preflib_change {
 #main-content-register td:not(:first-child) {
     padding-left: 20px;
 }
+
+.patron-reg-invalid {
+    font-weight: bold;
+    color: red;
+    padding-right: 10px;
+}
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index 4ecc65592f..7522ec9e0f 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -16,7 +16,6 @@ register_fields = [
     {class => 'stgu',  name = 'first_given_name', label => l('First Name')},
     {class => 'stgu',  name = 'second_given_name', label => l('Middle Name')},
     {class => 'stgu',  name = 'family_name', label => l('Last Name')},
-    {class => 'stgu',  name = 'family_name', label => l('Last Name')},
     {class => 'stgma', name = 'street1', label => l('Street Address')},
     {class => 'stgma', name = 'street2', label => l('Street Address (2)')},
     {class => 'stgma', name = 'city', label => l('City')},
@@ -37,8 +36,8 @@ register_fields = [
 
         [% IF ctx.register.success %]
             <h3>[% |l %]
-            Registration successful!  Please see library staff to 
-            complete your registration.
+            Registration successful!  
+            Please see library staff to complete your registration.
             [% END %]</h3>
 
         [% ELSIF ctx.register.error %]
@@ -90,23 +89,14 @@ FOR field_def IN register_fields;
             type='text' 
             name='[% field_path %]'
             value='[% CGI.param(field_path) | html %]'/>
+        [% IF require %]
+        <span class='patron-reg-invalid'>*</span>
+        [% END %]
     </td>
     <td>
-[%
-    # display wether the field is optional and any example text
-
-    IF example;
-        IF require;
-            l('(Example: [_1])', example);
-        ELSE;
-            l('(Optional, Example: [_1])', example);
-        END;
-    ELSIF !require;
-        l('(Optional)');
-    END;
-%]
-    </td>
-    <td>
+
+    <!-- display errors and example text -->
+
     [% IF invalid_require %]
         <span class='patron-reg-invalid'>
             [% l('This field is required') %]
@@ -116,6 +106,12 @@ FOR field_def IN register_fields;
             [% l('The provided value does not have the correct format') %]
         </span>
     [% END %]
+    [% IF example %]
+        <span class='patron-reg-extra'>
+            [% l('(Example: [_1])', example) %]
+        </span>
+    [% END %]
+
     </td>
 </tr>
 [% END;