Merge lp:~robbyoconnor/sahana-eden/sahana-eden-trunk into lp:sahana-eden

[Robert O'Connor]

Make UI between User registration and User CRUD pages more consistent. Thanks Yuri Stuken!

Made the UIs between the user CRUD pages and the user registration page more consistent. Thanks Yuri Stuken!!

[lp:~robbyoconnor/sahana-eden/sahana-eden-trunk]

1584. By Robert O'Connor on 2010-12-23

back out the impact type change until the User UI update code is merged

[Fran Boon (flavour)]

Some good stuff here.
Main issue is in the Update form:
Admin has to reset the password if making any other changes which is bad.
I fixed this & did a little refactoring including having the default language be pulled from the existing deployment_setting (which I can see hadn't been done before!)

Worth takign a look at my mods to see if helpful :)

Many thanks!
F

review: Needs Fixing

=== modified file 'controllers/admin.py'
--- controllers/admin.py	2010-12-15 00:36:11 +0000
+++ controllers/admin.py	2010-12-23 21:23:11 +0000
@@ -266,6 +266,8 @@
 
     # In Controller to allow registration to work with UUIDs - only manual edits need this setting
     db.auth_user.registration_key.requires = IS_NULL_OR(IS_IN_SET(["disabled", "pending"]))
+    
+    db.auth_user.language.default = "en"
 
     # Pre-processor
     def user_prep(jr):
@@ -288,10 +290,15 @@
     s3xrc.model.configure(table,
         main="first_name",
         # Add users to Person Registry & 'Authenticated' role:
-        create_onaccept = lambda form: auth.shn_register(form))
-
+        create_onaccept = lambda form: auth.shn_register(form),
+        create_onvalidation = lambda form: user_create_onvalidation(form))
     return s3_rest_controller(module, resource)
 
+def user_create_onvalidation (form):
+    if (form.request_vars.has_key("password_two") and \
+        form.request_vars.password != form.request_vars.password_two):
+        form.errors.password = T("Password fields don't match")
+    return True
 
 def user_approve(form):
     "Send an email to user if their account is approved (moved from 'pending' to 'blank'(i.e. enabled))"

=== modified file 'languages/es.py'
--- languages/es.py	2010-12-21 22:27:34 +0000
+++ languages/es.py	2010-12-23 21:23:11 +0000
@@ -420,6 +420,7 @@
 'Adult female': 'Adult female',
 'Adult male': 'Adult male',
 'Adults in prisons': 'Adults in prisons',
+'Advanced': 'Advanced',
 'Advanced Bin Search': 'Búsqueda Avanzada de Repositorio',
 'Advanced Catalog Search': 'Búsqueda Avanzada de Catálogo',
 'Advanced Category Search': 'Búsqueda Avanzada de Categoría',
@@ -711,6 +712,7 @@
 "Can't import tweepy": "Can't import tweepy",
 'Canada': 'Canadá',
 'Cancel': 'Cancel',
+'Cancel Add': 'Cancel Add',
 'Cancelled': 'Cancelled',
 'Candidate Matches for Body %s': 'Candidate Matches for Body %s',
 'Canned Fish': 'Canned Fish',
@@ -1203,6 +1205,7 @@
 'Donors Report': 'Donors Report',
 'Door frame': 'Door frame',
 'Draft': 'Draft',
+'Draft Features': 'Draft Features',
 'Drainage': 'Drainage',
 'Drawing up a Budget for Staff & Equipment across various Locations.': 'La elaboración de un presupuesto para el personal y equipo a través de varios lugares.',
 'Drill Down by Group': 'Drill Down por el Grupo',
@@ -1413,8 +1416,10 @@
 'End date should be after start date': 'End date should be after start date',
 'End of Period': 'End de Period',
 'English': 'Inglés',
+'Enter Coordinates': 'Enter Coordinates',
 'Enter Coordinates:': 'Enter Coordinates:',
 'Enter a GPS Coord': 'Enter a GPS Coord',
+'Enter a GPS Coordinate': 'Enter a GPS Coordinate',
 'Enter a date before': 'Introduzca una fecha antes de',
 'Enter a name for the spreadsheet you are uploading (mandatory).': 'Enter a name for the spreadsheet you are uploading (mandatory).',
 'Enter a new support request.': 'Introduzca una nueva solicitud de soporte.',
@@ -2294,6 +2299,7 @@
 'Load Details': 'Load Detalles',
 'Load Raw File into Grid': 'Load Raw File into Grid',
 'Load the details to help decide which is the best one to keep out of the 2.': 'Load the details to help decide which is the best one to keep out of the 2.',
+'Loading Locations': 'Loading Locations',
 'Loading Locations...': 'Loading Locations...',
 'Local Name': 'Local Name',
 'Local Names': 'Local Names',
@@ -2456,6 +2462,7 @@
 'Military': 'Militar',
 'Minorities participating in coping activities': 'Minorities participating in coping activities',
 'Minutes must be a number between 0 and 60': 'Minutes must be a number between 0 and 60',
+'Minutes must be a number greater than 0 and less than 60': 'Minutes must be a number greater than 0 and less than 60',
 'Minutes must be between 0 and 60': 'Minutos must be between 0 and 60',
 'Minutes per Month': 'Minutos por Mes',
 'Minutes should be a number greater than 0 and less than 60': 'Minutes should be a number greater than 0 and less than 60',
@@ -2738,6 +2745,7 @@
 'No access at all': 'No access at all',
 'No access to this record!': 'No hay acceso a este registro!',
 'No action recommended': 'No action recommended',
+'No calculations made': 'No calculations made',
 'No conflicts logged': 'No conflicts logged',
 'No contact information available': 'No contact information available',
 'No contacts currently registered': 'Aún no hay miembros registrados actualmente',
@@ -3628,6 +3636,7 @@
 'Searching for different groups and individuals': 'La búsqueda de los diferentes grupos e individuos',
 'Secondary Server (Optional)': 'Secondary Server (Optional)',
 'Seconds must be a number between 0 and 60': 'Seconds must be a number between 0 and 60',
+'Seconds must be a number greater than 0 and less than 60': 'Seconds must be a number greater than 0 and less than 60',
 'Seconds must be between 0 and 60': 'Seconds must be between 0 and 60',
 'Section Details': 'Section Detalles',
 'Section deleted': 'Section eliminada',
@@ -3749,6 +3758,7 @@
 'Short Description': 'Short Description',
 'Short Description: ': 'Short Description: ',
 'Show Checklist': 'Lista de verificación Mostrar',
+'Show Map': 'Show Map',
 'Show on map': 'Mostrar en el mapa',
 'Sierra Leone': 'Sierra Leona',
 'Sindhi': 'Sindhi',
@@ -3836,6 +3846,7 @@
 'Special Marine': 'Special Marine',
 'Special needs': 'Necesidades especiales',
 'Specialized Hospital': 'Hospital Especializado',
+'Specific Location': 'Specific Location',
 'Specific locations need to have a parent of level': 'Specific locations need to have a parent of level',
 'Specify a descriptive title for the image.': 'Specify a descriptive title for the image.',
 'Specify the bed type of this unit.': 'Specify the bed type de this unit.',
@@ -4091,6 +4102,7 @@
 'The URL of your web gateway without the post parameters': 'The URL of your web gateway without the post parameters',
 'The URL to access the service.': 'The URL to access the service.',
 'The Unique Identifier (UUID) as assigned to this facility by the government.': 'The Unique Identifier (UUID) as assigned to this facility by the government.',
+'The area is ': 'The area is ',
 'The area was ': 'El área fue',
 'The attribute within the KML which is used for the title of popups.': 'The attribute within the KML which is used for the title of popups.',
 'The attribute(s) within the KML which are used for the body of popups. (Use a space between attributes)': 'The attribute(s) within the KML which are used for the body of popups. (Use a space between attributes)',
@@ -4109,6 +4121,7 @@
 'The language to use for notifications.': 'The language to use for notifications.',
 'The last known location of the missing person before disappearance.': 'The last known location of the missing person before disappearance.',
 'The last known location of the missing person.': 'The last known location of the missing person.',
+'The length is ': 'The length is ',
 'The length was ': 'La longitud se',
 'The list of Item categories are maintained by the Administrators.': 'The list of Item categories are maintained by the Administrators.',
 'The name to be used when calling for or directly addressing the person (optional).': 'The name to be used when calling for or directly addressing the person (optional).',
@@ -4566,6 +4579,7 @@
 'Zoom In: click in the map or use the left mouse button and drag to create a rectangle': 'Acercar: haga clic en el mapa o utiliza el botón izquierdo del ratón y arrastre para crear un rectángulo',
 'Zoom Levels': 'Los niveles de zoom',
 'Zoom Out: click in the map or use the left mouse button and drag to create a rectangle': 'Alejar: haga clic en el mapa o utiliza el botón izquierdo del ratón y arrastre para crear un rectángulo',
+'Zoom to Current Location': 'Zoom to Current Location',
 'Zoom to maximum map extent': 'Zoom para asignar la máxima medida',
 'accepted': 'aceptado',
 'act': 'acto',

=== added file 'views/admin/user_create.html'
--- views/admin/user_create.html	1970-01-01 00:00:00 +0000
+++ views/admin/user_create.html	2010-12-23 21:23:11 +0000
@@ -0,0 +1,3 @@
+{{extend 'layout.html'}}
+{{include 'admin/user_create_form.html'}}
+{{include '_create.html'}}
\ No newline at end of file

=== added file 'views/admin/user_create_form.html'
--- views/admin/user_create_form.html	1970-01-01 00:00:00 +0000
+++ views/admin/user_create_form.html	2010-12-23 21:23:11 +0000
@@ -0,0 +1,35 @@
+{{form.attributes['_id'] = "regform"}}
+{{form[0].insert(-8, TR(
+	TD(
+		LABEL(T("Mobile Phone") + ":")
+	, _class="w2p_fl"), 
+	TD()
+))}}
+{{form[0].insert(-8, TR(
+	TD(
+	 	INPUT(_name="mobile", _id="mobile", _class="string")
+	, _class="w2p_fw"),
+	TD(_class="w2p_fc")
+))}}
+{{form[0].insert(-4, TR(
+	TD(
+		LABEL(T("Verify password") + ":")
+	, _class="w2p_fl"), 
+	TD()
+))}}
+{{form[0].insert(-4, TR(
+	TD(
+	 	INPUT(_name="password_two", _id="password_two", _type="password")
+	, _class="w2p_fw"),
+	TD(_class="w2p_fc")
+))}}
+<script src="/{{=request.application}}/static/scripts/S3/jquery.validate.pack.js" type="text/javascript"></script>
+<script type="text/javascript">
+{{include "auth/validation.js"}}
+</script>
+<script src="/{{=request.application}}/static/scripts/S3/jquery.pstrength-min.1.2.js" type="text/javascript"></script>
+<script type="text/javascript">
+    $(function() {
+        $('.password:last').pstrength();
+    });
+</script>
\ No newline at end of file

=== added file 'views/admin/user_list_create.html'
--- views/admin/user_list_create.html	1970-01-01 00:00:00 +0000
+++ views/admin/user_list_create.html	2010-12-23 21:23:11 +0000
@@ -0,0 +1,3 @@
+{{extend 'layout.html'}}
+{{include 'admin/user_create_form.html'}}
+{{include '_list_create.html'}}
\ No newline at end of file

=== modified file 'views/admin/user_update.html'
--- views/admin/user_update.html	2010-06-04 23:50:19 +0000
+++ views/admin/user_update.html	2010-12-23 21:23:11 +0000
@@ -1,4 +1,5 @@
 {{extend "layout.html"}}
+{{include 'admin/user_create_form.html'}}
 {{include "_update.html"}}
 <p>&nbsp;</p>
 {{try:}}
@@ -6,4 +7,4 @@
 {{except ValueError:}}
  {{id = int(request.args(1))}}
 {{pass}}
-<a class="action-btn" href="{{=URL(r=request, f="groups", args=id)}}">{{=T("Roles")}}</a>
+<a class="action-btn" href="{{=URL(r=request, f="groups", args=id)}}">{{=T("Roles")}}</a>
\ No newline at end of file

=== added file 'views/admin/user_update_form.html'
--- views/admin/user_update_form.html	1970-01-01 00:00:00 +0000
+++ views/admin/user_update_form.html	2010-12-23 21:23:11 +0000
@@ -0,0 +1,36 @@
+{{form.attributes['_id'] = "regform"}}
+{{form[0].insert(-8, TR(
+	TD(
+		LABEL(T("Mobile Phone") + ":")
+	, _class="w2p_fl"), 
+	TD()
+))}}
+{{form[0].insert(-8, TR(
+	TD(
+	 	INPUT(_name="mobile", _id="mobile", _class="string")
+	, _class="w2p_fw"),
+	TD(_class="w2p_fc")
+))}}
+{{form[0].insert(-4, TR(
+	TD(
+		LABEL(T("Verify password") + ":")
+	, _class="w2p_fl"), 
+	TD()
+))}}
+{{form[0].insert(-4, TR(
+	TD(
+	 	INPUT(_name="password_two", _id="password_two", _type="password")
+	, _class="w2p_fw"),
+	TD(_class="w2p_fc")
+))}}
+<script src="/{{=request.application}}/static/scripts/S3/jquery.validate.pack.js" type="text/javascript"></script>
+<script type="text/javascript">
+{{include "auth/validation.js"}}
+</script>
+<script src="/{{=request.application}}/static/scripts/S3/jquery.pstrength-min.1.2.js" type="text/javascript"></script>
+<script type="text/javascript">
+    $(function() {
+        $('.password:last').pstrength();
+    });
+    $("#")
+</script>

=== modified file 'views/auth/_register.html'
--- views/auth/_register.html	2010-10-26 09:31:42 +0000
+++ views/auth/_register.html	2010-12-23 21:23:11 +0000
@@ -8,51 +8,7 @@
 $(function() {
     $('.password:last').pstrength();
 });
-// Client-side validation (needed to check for passwords being same)
-$(document).ready(function() {
-    // validate signup form on keyup and submit
-    //HACK
-    var validator = $('#regform').validate({
-        errorClass: 'req',
-        rules: {
-            first_name: {
-                required: true
-                },
-            email: {
-                required: true,
-                email: true
-                //remote: 'emailsurl'  // TODO
-            },
-            password: {
-                required: true
-            },
-            password_two: {
-                required: true,
-                equalTo: '.password:last'
-            }
-        },
-        messages: {
-            firstname: '  {{=T("Enter your firstname")}}',
-            password: {
-                required: '  {{=T("Provide a password")}}'
-            },
-            password_two: {
-                required: '  {{=T("Repeat your password")}}',
-                equalTo: '  {{=T("Enter the same password as above")}}'
-            },
-            email: {
-                required: '  {{=T("Please enter a valid email address")}}',
-                minlength: '  {{=T("Please enter a valid email address")}}'
-            }
-        },
-         errorPlacement: function(error, element) {
-              error.appendTo( element.parent().next() );
-         },
-         submitHandler: function(form) {
-                form.submit();
-         }
-    });
-});
+{{include "auth/validation.js"}}
 </script>
 
 {{if self_registration:}}

=== added file 'views/auth/validation.js'
--- views/auth/validation.js	1970-01-01 00:00:00 +0000
+++ views/auth/validation.js	2010-12-23 21:23:11 +0000
@@ -0,0 +1,45 @@
+// Client-side validation (needed to check for passwords being same)
+$(document).ready(function() {
+    // validate signup form on keyup and submit
+    //HACK
+    var validator = $('#regform').validate({
+        errorClass: 'req',
+        rules: {
+            first_name: {
+                required: true
+                },
+            email: {
+                required: true,
+                email: true
+                //remote: 'emailsurl'  // TODO
+            },
+            password: {
+                required: true
+            },
+            password_two: {
+                required: true,
+                equalTo: '.password:last'
+            }
+        },
+        messages: {
+            firstname: '  {{=T("Enter your firstname")}}',
+            password: {
+                required: '  {{=T("Provide a password")}}'
+            },
+            password_two: {
+                required: '  {{=T("Repeat your password")}}',
+                equalTo: '  {{=T("Enter the same password as above")}}'
+            },
+            email: {
+                required: '  {{=T("Please enter a valid email address")}}',
+                minlength: '  {{=T("Please enter a valid email address")}}'
+            }
+        },
+         errorPlacement: function(error, element) {
+              error.appendTo( element.parent().next() );
+         },
+         submitHandler: function(form) {
+                form.submit();
+         }
+    });
+});
\ No newline at end of file