Merge lp:~mike-amy/sahana-eden/LA into lp:sahana-eden

[Mike Amy]

Add site (office) widget.

Implemented requested changes to the Add Human resource widget:

* Moved Close and Reset next to the Submit button
* Changed Close -> Cancel; Reset -> Clear; Submit -> Save
* Display throbber (static/img/ajax-loader.gif) when loading/saving form
* Hide Main widget when displaying the inner form.

Please note revision 2586. Had some problems and got past it by commenting out a debug line. Not sure if that line is in error, but caused a missing page for me.

[lp:~mike-amy/sahana-eden/LA]

2593. By Mike Amy on 2011-09-08

fixed a problem stopping offices being created from the inner forms

2594. By Mike Amy on 2011-09-13

Add xyz widget refactoring and tests

2595. By Mike Amy on 2011-09-13

merged from la

2596. By Mike Amy on 2011-09-14

fixed 'Additional 2' test => 'Address 2' :). Cleaned up 01_menu.py

2597. By Mike Amy on 2011-09-14

merged from LA

Unmerged revisions

2597. By Mike Amy on 2011-09-14

merged from LA

2596. By Mike Amy on 2011-09-14

fixed 'Additional 2' test => 'Address 2' :). Cleaned up 01_menu.py

2595. By Mike Amy on 2011-09-13

merged from la

2594. By Mike Amy on 2011-09-13

Add xyz widget refactoring and tests

2593. By Mike Amy on 2011-09-08

fixed a problem stopping offices being created from the inner forms

2592. By Mike Amy on 2011-09-08

merged from trunk

2591. By Mike Amy on 2011-09-08

Display throbber when loading inner form iframe to show something is happening, and hide main widget when it is displayed.

2590. By Mike Amy on 2011-09-07

Moved inner form buttons near to submit button and renamed as 'Cancel' and 'Close'

2589. By Mike Amy on 2011-09-07

stopped link showing for autocompleted sites (offices)

2588. By Mike Amy on 2011-09-07

merged from trunk

=== modified file '.bzrignore'
--- .bzrignore	2011-08-10 21:33:23 +0000
+++ .bzrignore	2011-09-08 19:09:00 +0000
@@ -14,6 +14,8 @@
 !static/fonts/setfonts.py
 !static/fonts/generatefontmapping.py
 *.ttf
+!static/fonts/la/
+!static/fonts/la/*.ttf
 static/scripts/ext/.docs/*
 static/scripts/ext/.examples/*
 static/scripts/ext/.test/*

=== modified file 'VERSION'
--- VERSION	2011-09-07 21:21:44 +0000
+++ VERSION	2011-09-08 19:09:00 +0000
@@ -1,1 +1,1 @@
-r2730 (2011-09-07 22:21:43)
\ No newline at end of file
+r2724 (2011-09-08 15:09:40)
\ No newline at end of file

=== added file 'clean_la.cmd'
--- clean_la.cmd	1970-01-01 00:00:00 +0000
+++ clean_la.cmd	2011-09-08 19:09:00 +0000
@@ -0,0 +1,11 @@
+@echo off
+rem CHOICE Do you want to delete and reinitialise the Sahana Eden Database
+rem if ERRORLEVEL N goto end 
+
+rd /Q /S compiled
+
+del databases\*.* /Q 
+del errors\*.* /Q 
+del sessions\*.* /Q 
+python ..\..\web2py.py -S la -M -R applications\la\static\scripts\tools\noop.py
+PAUSE
\ No newline at end of file

=== modified file 'controllers/admin.py'
--- controllers/admin.py	2011-09-07 21:21:44 +0000
+++ controllers/admin.py	2011-09-08 19:09:00 +0000
@@ -73,6 +73,37 @@
 
 
 # -----------------------------------------------------------------------------
+def register_onaccept(form):
+    """
+        LA-specific:
+            Ensure manually-created users get added to 'Staff' role &
+            have an HRM record created.
+    """
+    # Usual Registration Tasks
+    # (PR record, Authenticated Role, Contacts)
+    person = auth.s3_register(form)
+
+    # LA-specific
+    # Add to 'Staff' role
+    table = db.auth_group
+    STAFF = db(table.uuid == "STAFF").select(table.id,
+                                             limitby=(0, 1)).first().id
+    table = db.pr_person
+    person_uuid = db(table.id == person).select(table.uuid,
+                                                limitby=(0, 1)).first().uuid
+    table = db.auth_user
+    query = (table.person_uuid == person_uuid)
+    user = db(query).select(table.id,
+                            limitby=(0, 1)).first().id
+    table = db.auth_membership
+    table.insert(user_id = user,
+                 group_id = STAFF)
+
+    # Create an HRM record so that the user appears in human_resource_id() lookups
+    table = db.hrm_human_resource
+    table.insert(person_id=person)
+
+# -----------------------------------------------------------------------------
 @auth.s3_requires_membership(1)
 def user():
     """ RESTful CRUD controller """
@@ -84,7 +115,10 @@
     s3mgr.configure(tablename,
                     main="first_name",
                     # Add users to Person Registry & 'Authenticated' role:
-                    create_onaccept = auth.s3_register)
+                    create_onaccept = register_onaccept)
+
+    # Staff don't need a Mobile Phone
+    deployment_settings.auth.registration_requests_mobile_phone = False
 
     def disable_user(r):
         if not r.id:
@@ -590,10 +624,13 @@
 @auth.s3_requires_membership(1)
 def portable():
     """ Portable app creator"""
+
+
     from gluon.admin import apath
     import os
     from operator import itemgetter, attrgetter
 
+
     app = request.application
     uploadfolder=os.path.join(apath("%s" % app,r=request),'cache')
     web2py_source = None
@@ -714,6 +751,20 @@
     return response.stream(portable_app)
 
 # =============================================================================
+# LA Code
+# =============================================================================
+@auth.s3_requires_membership(1)
+def rostermail():
+    """
+        Email Addresses for the Volunteer Roster to be sent to
+    """
+
+    return s3_rest_controller("vol", resourcename)
+
+
+
+
+# =============================================================================
 # Deprecated Code below here
 # =============================================================================
 @auth.s3_requires_membership(1)

=== modified file 'controllers/default.py'
--- controllers/default.py	2011-08-13 19:06:29 +0000
+++ controllers/default.py	2011-09-08 19:09:00 +0000
@@ -26,350 +26,14 @@
     return response.download(request, db)
 
 # -----------------------------------------------------------------------------
-# Check the validity of entered Mobile Phone data
-def register_validation(form):
-    """ Validate the fields in registration form """
-    # Mobile Phone
-    if "mobile" in form.vars and form.vars.mobile:
-        regex = re.compile(single_phone_number_pattern)
-        if not regex.match(form.vars.mobile):
-            form.errors.mobile = T("Invalid phone number")
-    elif deployment_settings.get_auth_registration_mobile_phone_mandatory():
-        form.errors.mobile = T("Phone number is required")
-    return
-
-auth.settings.register_onvalidation = register_validation
-# Add newly-registered users to Person Registry, add 'Authenticated' role
-# If Organisation is provided, then: add HRM record & add to 'Org_X_Access' role
-auth.settings.register_onaccept = auth.s3_register
-
-_table_user = auth.settings.table_user
-_table_user.first_name.label = T("First Name")
-_table_user.first_name.comment = SPAN("*", _class="req")
-_table_user.last_name.label = T("Last Name")
-if deployment_settings.get_L10n_mandatory_lastname():
-    _table_user.last_name.comment = SPAN("*", _class="req")
-_table_user.email.label = T("E-mail")
-_table_user.email.comment = SPAN("*", _class="req")
-_table_user.password.comment = SPAN("*", _class="req")
-_table_user.language.label = T("Language")
-_table_user.language.comment = DIV(_class="tooltip",
-                                   _title="%s|%s" % (T("Language"),
-                                                     T("The language you wish the site to be displayed in.")))
-_table_user.language.represent = lambda opt: s3_languages.get(opt, UNKNOWN_OPT)
-
-# Organisation widget for use in Registration Screen
-# NB User Profile is only editable by Admin - using User Management
-org_widget = IS_ONE_OF(db, "org_organisation.id",
-                       organisation_represent,
-                       orderby="org_organisation.name",
-                       sort=True)
-if deployment_settings.get_auth_registration_organisation_mandatory():
-    _table_user.organisation_id.requires = org_widget
-else:
-    _table_user.organisation_id.requires = IS_NULL_OR(org_widget)
-
-# For the User Profile:
-_table_user.organisation_id.represent = organisation_represent
-_table_user.organisation_id.comment = DIV(_class="tooltip",
-                                          _title="%s|%s|%s" % (T("Organization"),
-                                                               T("The default Organization for whom you are acting."),
-                                                               T("This setting can only be controlled by the Administrator.")))
-
-_table_user.site_id.represent = shn_site_represent
-_table_user.site_id.comment = DIV(_class="tooltip",
-                                  _title="%s|%s|%s" % (T("Facility"),
-                                                       T("The default Facility for which you are acting."),
-                                                       T("This setting can only be controlled by the Administrator.")))
-
-# -----------------------------------------------------------------------------
 def index():
     """ Main Home Page """
 
     title = deployment_settings.get_system_name()
     response.title = title
 
-    if deployment_settings.has_module("cr"):
-        s3mgr.load("cr_shelter")
-        SHELTERS = s3.crud_strings["cr_shelter"].subtitle_list
-    else:
-        SHELTERS = ""
-
-    # Menu Boxes
-    menu_btns = [#div, label, app, function
-                ["facility", SHELTERS, "cr", "shelter"],
-                ["facility", T("Warehouses"), "inv", "warehouse"],
-                ["facility", T("Hospitals"), "hms", "hospital"],
-                ["facility", T("Offices"), "org", "office"],
-                ["sit", T("Incidents"), "irs", "ireport"],
-                ["sit", T("Assessments"), "assess", "assess"],
-                ["sit", T("Assets"), "asset", "asset"],
-                ["sit", T("Inventory Items"), "inv", "inv_item"],
-                ["dec", T("Gap Map"), "project", "gap_map"],
-                ["dec", T("Gap Report"), "project", "gap_report"],
-                ["dec", T("Requests"), "req", "req"],
-                ["res", T("Projects"), "project", "project"],
-                ["res", T("Activities"), "project", "assess"],
-                ["res", T("Commitments"), "req", "commit"],
-                ["res", T("Sent Shipments"), "inv", "send"],
-                ["res", T("Received Shipments"), "inv", "recv"],
-                ]
-
-    # Change to (Mitigation)/Preparedness/Response/Recovery?
-    menu_divs = {"facility": DIV( H3(T("Facilities")),
-                                 _id = "facility_box", _class = "menu_box"),
-                 "sit": DIV( H3(T("Situation")),
-                              _id = "menu_div_sit", _class = "menu_div"),
-                 "dec": DIV( H3(T("Decision")),
-                              _id = "menu_div_dec", _class = "menu_div"),
-                 "res": DIV( H3(T("Response")),
-                              _id = "menu_div_res", _class = "menu_div"),
-                }
-
-    for div, label, app, function in menu_btns:
-        if deployment_settings.has_module(app):
-            # @ToDo: Also check permissions (e.g. for anonymous users)
-            menu_divs[div].append(A( DIV(label,
-                                         _class = "menu-btn-r"),
-                                     _class = "menu-btn-l",
-                                     _href = URL(app,function)
-                                    )
-                                 )
-
-    div_arrow = DIV(IMG(_src = "/%s/static/img/arrow_blue_right.png" % \
-                               request.application),
-                          _class = "div_arrow")
-    sit_dec_res_box = DIV(menu_divs["sit"],
-                          div_arrow,
-                          menu_divs["dec"],
-                          div_arrow,
-                          menu_divs["res"],
-                          _id = "sit_dec_res_box",
-                          _class = "menu_box fleft swidth"
-                     #div_additional,
-                    )
-    facility_box  = menu_divs["facility"]
-    facility_box.append( A( IMG(_src = "/%s/static/img/map_icon_128.png" % \
-                                    request.application),
-                            _href = URL(c="gis", f="index"),
-                            _title = T("Map")
-                            )
-                        )
-
-    datatable_ajax_source = ""
-    # Check logged in AND permissions
-    if AUTHENTICATED in session.s3.roles and \
-       auth.s3_has_permission("read", db.org_organisation):
-        org_items = organisation()
-        datatable_ajax_source = "/%s/default/organisation.aaData" % \
-                                request.application
-        response.s3.actions = None
-        response.view = "default/index.html"
-        auth.permission.controller = "org"
-        auth.permission.function = "site"
-        permitted_facilities = auth.permission.permitted_facilities(redirect_on_error=False)
-        manage_facility_box = ""
-        if permitted_facilities:
-            facility_list = s3_represent_facilities(db, permitted_facilities,
-                                                    link=False)
-            facility_opts = [OPTION(opt[1], _value = opt[0])
-                             for opt in facility_list]
-            if facility_list:
-                manage_facility_box = DIV(H3(T("Manage Your Facilities")),
-                                    SELECT(_id = "manage_facility_select",
-                                            _style = "max-width:400px;",
-                                            *facility_opts
-                                            ),
-                                    A(T("Go"),
-                                        _href = URL(c="default", f="site",
-                                                    args=[facility_list[0][0]]),
-                                        #_disabled = "disabled",
-                                        _id = "manage_facility_btn",
-                                        _class = "action-btn"
-                                        ),
-                                    _id = "manage_facility_box",
-                                    _class = "menu_box fleft")
-                response.s3.jquery_ready.append( """
-$('#manage_facility_select').change(function() {
-    $('#manage_facility_btn').attr('href', S3.Ap.concat('/default/site/',  $('#manage_facility_select').val()));
-})""" )
-            else:
-                manage_facility_box = DIV()
-
-        org_box = DIV( H3(T("Organizations")),
-                       A(T("Add Organization"),
-                          _href = URL(c="org", f="organisation",
-                                      args=["create"]),
-                          _id = "add-btn",
-                          _class = "action-btn",
-                          _style = "margin-right: 10px;"),
-                        org_items["items"],
-                        _id = "org_box",
-                        _class = "menu_box fleft"
-                        )
-    else:
-        manage_facility_box = ""
-        org_box = ""
-
-    # @ToDo: Replace this with an easily-customisable section on the homepage
-    #settings = db(db.s3_setting.id == 1).select(limitby=(0, 1)).first()
-    #if settings:
-    #    admin_name = settings.admin_name
-    #    admin_email = settings.admin_email
-    #    admin_tel = settings.admin_tel
-    #else:
-    #    # db empty and prepopulate is false
-    #    admin_name = T("Sahana Administrator").xml(),
-    #    admin_email = "support@Not Set",
-    #    admin_tel = T("Not Set").xml(),
-
-    # Login/Registration forms
-    self_registration = deployment_settings.get_security_self_registration()
-    registered = False
-    login_form = None
-    login_div = None
-    register_form = None
-    register_div = None
-    if AUTHENTICATED not in session.s3.roles:
-        # This user isn't yet logged-in
-        if request.cookies.has_key("registered"):
-            # This browser has logged-in before
-            registered = True
-
-        # Provide a login box on front page
-        request.args = ["login"]
-        auth.messages.submit_button = T("Login")
-        login_form = auth()
-        login_div = DIV(H3(T("Login")),
-                        P(XML("%s <b>%s</b> %s" % (T("Registered users can"),
-                                                   T("login"),
-                                                   T("to access the system")))))
-
-        if self_registration:
-            # Provide a Registration box on front page
-            request.args = ["register"]
-            if deployment_settings.get_terms_of_service():
-                auth.messages.submit_button = T("I accept. Create my account.")
-            else:
-                auth.messages.submit_button = T("Register")
-            register_form = auth()
-            register_div = DIV(H3(T("Register")),
-                               P(XML("%s <b>%s</b>" % (T("If you would like to help, then please"),
-                                                       T("sign-up now")))))
-
-             # Add client-side validation
-            s3_register_validation()
-
-            if session.s3.debug:
-                response.s3.scripts.append( "%s/jquery.validate.js" % s3_script_dir )
-            else:
-                response.s3.scripts.append( "%s/jquery.validate.min.js" % s3_script_dir )
-            if request.env.request_method == "POST":
-                post_script = """// Unhide register form
-    $('#register_form').removeClass('hide');
-    // Hide login form
-    $('#login_form').addClass('hide');"""
-            else:
-                post_script = ""
-            register_script = """
-    // Change register/login links to avoid page reload, make back button work.
-    $('#register-btn').attr('href', '#register');
-    $('#login-btn').attr('href', '#login');
-    %s
-    // Redirect Register Button to unhide
-    $('#register-btn').click(function() {
-        // Unhide register form
-        $('#register_form').removeClass('hide');
-        // Hide login form
-        $('#login_form').addClass('hide');
-    });
-
-    // Redirect Login Button to unhide
-    $('#login-btn').click(function() {
-        // Hide register form
-        $('#register_form').addClass('hide');
-        // Unhide login form
-        $('#login_form').removeClass('hide');
-    });""" % post_script
-            response.s3.jquery_ready.append(register_script)
-
-    if deployment_settings.frontpage.rss:
-        response.s3.external_stylesheets.append( "http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css" )
-        response.s3.scripts.append( "http://www.google.com/jsapi?key=notsupplied-wizard" )
-        response.s3.scripts.append( "http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js" )
-        counter = 0
-        feeds = ""
-        for feed in deployment_settings.frontpage.rss:
-            counter += 1
-            feeds = "".join((feeds,
-                             "{title: '%s',\n" % feed["title"],
-                             "url: '%s'}" % feed["url"]))
-            # Don't add a trailing comma for old IEs
-            if counter != len(deployment_settings.frontpage.rss):
-                feeds += ",\n"
-        feed_control = "".join(("""
-function LoadDynamicFeedControl() {
-  var feeds = [
-    """, feeds, """
-  ];
-  var options = {
-    // milliseconds before feed is reloaded (5 minutes)
-    feedCycleTime : 300000,
-    numResults : 5,
-    stacked : true,
-    horizontal : false,
-    title : '""", str(T("News")), """'
-  };
-  new GFdynamicFeedControl(feeds, 'feed-control', options);
-}
-// Load the feeds API and set the onload callback.
-google.load('feeds', '1');
-google.setOnLoadCallback(LoadDynamicFeedControl);"""))
-        response.s3.js_global.append( feed_control )
-
-    return dict(title = title,
-
-                sit_dec_res_box = sit_dec_res_box,
-                facility_box = facility_box,
-                manage_facility_box = manage_facility_box,
-                org_box = org_box,
-
-                r = None, # Required for dataTable to work
-                datatable_ajax_source = datatable_ajax_source,
-                #admin_name=admin_name,
-                #admin_email=admin_email,
-                #admin_tel=admin_tel,
-                self_registration=self_registration,
-                registered=registered,
-                login_form=login_form,
-                login_div=login_div,
-                register_form=register_form,
-                register_div=register_div
-                )
-
-# -----------------------------------------------------------------------------
-def organisation():
-    """
-        Function to handle pagination for the org list on the homepage
-    """
-
-    table = db.org_organisation
-    table.id.label = T("Organization")
-    table.id.represent = organisation_represent
-
-    response.s3.dataTable_sPaginationType = "two_button"
-    response.s3.dataTable_sDom = "rtip" #"frtip" - filter broken
-    response.s3.dataTable_iDisplayLength = 25
-
-    s3mgr.configure("org_organisation",
-                    listadd = False,
-                    addbtn = True,
-                    super_entity = db.pr_pentity,
-                    linkto = "/%s/org/organisation/%s" % (request.application,
-                                                          "%s"),
-                    list_fields = ["id",])
-
-    return s3_rest_controller("org", "organisation")
+    return dict(title = title)
+
 # -----------------------------------------------------------------------------
 def site():
     """
@@ -388,7 +52,7 @@
                      args = [id]))
     else:
         raise HTTP(404)
-
+        
 # -----------------------------------------------------------------------------
 def message():
     #if "verify_email_sent" in request.args:
@@ -425,12 +89,13 @@
     _table_user = auth.settings.table_user
     if request.args and request.args(0) == "profile":
         #_table_user.organisation.writable = False
-        _table_user.utc_offset.readable = True
-        _table_user.utc_offset.writable = True
+        #_table_user.utc_offset.readable = True
+        #_table_user.utc_offset.writable = True
+        pass
 
     login_form = register_form = None
     if request.args and request.args(0) == "login":
-        auth.messages.submit_button = T("Login")
+        auth.messages.submit_button = T("Sign In")
         form = auth()
         login_form = form
     elif request.args and request.args(0) == "register":
@@ -553,6 +218,20 @@
                 xlwt_version=xlwt_version
                 )
 
+# =============================================================================
+# LA Custom Views
+# =============================================================================
+def why():
+    """ Custom View """
+    response.title = T("Why?")
+    return dict()
+    
+# -----------------------------------------------------------------------------
+def contact():
+    """ Custom View """
+    response.title = T("Contact us")
+    return dict()
+
 # -----------------------------------------------------------------------------
 def help():
     """ Custom View """
@@ -560,38 +239,511 @@
     return dict()
 
 # -----------------------------------------------------------------------------
-def contact():
-    """
-        Give the user options to contact the site admins.
-        Either:
-            An internal Support Requests database
-        or:
-            Custom View
-    """
-    if auth.is_logged_in() and deployment_settings.get_options_support_requests():
-        # Provide an internal Support Requests ticketing system.
-        prefix = "support"
-        resourcename = "req"
-        tablename = "%s_%s" % (prefix, resourcename)
-        table = db[tablename]
-
-        # Pre-processor
-        def prep(r):
-            # Only Admins should be able to update ticket status
-            if not auth.s3_has_role(ADMIN):
-                table.status.writable = False
-                table.actions.writable = False
-            if r.interactive and r.method == "create":
-                table.status.readable = False
-                table.actions.readable = False
-            return True
-        response.s3.prep = prep
-
-        output = s3_rest_controller(prefix, resourcename)
-        return output
-    else:
-        # Default: Simple Custom View
-        response.title = T("Contact us")
-        return dict()
+def sitemap():
+    """ Custom View """
+    response.title = T("Site Map")
+    return dict()
+
+# -----------------------------------------------------------------------------
+def disclaimer():
+    """ Custom View """
+    response.title = T("Disclaimer")
+    return dict()
+
+# -----------------------------------------------------------------------------
+def register():
+    """
+        Registration for Organisations
+        - custom form
+    """
+
+    # Which type of organisation are we registering?
+    don = False
+    vol = False
+    if "type" in request.vars:
+        if request.vars.type == "don":
+            don = True
+        elif request.vars.type == "vol":
+            vol = True
+            auth.settings.registration_requires_approval = True
+
+    auth.messages.submit_button = T("I accept. Create my account.")
+    request.args = ["register"]
+    _table_user.language.default = T.accepted_language
+    _table_user.language.readable = False
+    _table_user.language.writable = False
+    form = auth()
+    form.attributes["_id"] = "regform"
+    # Custom class for Submit Button
+    form[0][-1][0][0]["_class"] = "accept-button"
+
+    # Cancel button
+    form[0][-1][0].append(BR())
+    #form[0][-1][1].append(INPUT(_type="reset", _value=T("Cancel")))
+    form[0][-1][0].append(INPUT(_type="button",
+                                _value=T("Cancel"),
+                                _class="wide-grey-button",
+                                _onClick="javascript: history.go(-1)"))
+
+    formstyle = s3.crud.formstyle
+
+    # Organisation
+    if form.errors.organisation:
+        organisation_error = DIV(form.errors.organisation,
+                                 _id="organisation__error",
+                                 _class="error",
+                                 _style="display: block;")
+    else:
+        organisation_error = ""
+    if don:
+        label = T("Corporation/Organization Name")
+    else:
+        label = T("Organization Name")
+    row = formstyle(id      = "organisation", 
+                    label   = LABEL("%s:" % label,
+                                    SPAN(" *", _class="req")), 
+                    widget  = DIV(INPUT(_name="organisation",
+                                        _id="organisation",
+                                        _class="string"),
+                                  organisation_error),
+                    comment = "")
+    form[0].insert(0, row)
+
+    # Industry Sector
+    if vol:
+        hidden = True
+        widget = INPUT(_name="sector_id",
+                       _id="sector_id",
+                       _class="string")
+    else:
+        from gluon.sqlhtml import OptionsWidget
+        hidden = False
+        widget = OptionsWidget.widget(db.org_organisation.sector_id,
+                                      value="")
+    # dropdown
+    row = formstyle(id      = "sector_id", 
+                    label   = LABEL("%s:" % T("Industry Sector")), 
+                    widget  = widget,
+                    comment = "",
+                    hidden = hidden)
+    form[0].insert(1, row)
+    # freetext box for not listed
+    row = formstyle(id      = "sector_other",
+                    label   = LABEL("%s:" % T("Other Sector not listed")), 
+                    widget  = INPUT(_name="sector_other",
+                                    _id="sector_other",
+                                    _class="string"),
+                    comment = "",
+                    hidden = hidden)
+    form[0].insert(2, row)
+
+
+    # Primary Contact Person section
+    row = TR(TD(LABEL(T("Primary Contact")),
+                _colspan="3",
+                _class="subheading"))
+    form[0][2].append(row)
+    row = formstyle(id      = "middle_name", 
+                    label   = LABEL("%s:" % T("Middle Name")), 
+                    widget  = INPUT(_name="middle_name",
+                                    _id="middle_name",
+                                    _class="string"),
+                    comment = "")
+    form[0][4].append(row)
+
+    row = formstyle(id      = "secondary_email", 
+                    label   = LABEL("%s:" % T("Secondary Email")), 
+                    widget  = INPUT(_name="secondary_email",
+                                    _id="secondary_email",
+                                    _class="string"),
+                    comment = "")
+    form[0][12].append(row)
+
+    # What are you offering?
+    if don or vol:
+        hidden = True
+    else:
+        hidden = False
+    row = formstyle(id      = "offer", 
+                    hidden  = hidden,
+                    label   = LABEL("%s:" % T("We can offer"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = (T("Items"),
+                               INPUT(_type="checkbox",
+                                     _value="on",
+                                     value="on" if don else "",
+                                     _name="has_items",
+                                     _id="has_items",
+                                     _class="boolean"),
+                               T("Volunteers"),
+                               INPUT(_type="checkbox",
+                                     _value="on",
+                                     value="on" if vol else "",
+                                     _name="vols",
+                                     _id="vols",
+                                     _class="boolean"),
+                               ),
+                    comment = "")
+    form[0][12].append(row)
+    
+    # Phone
+    if form.errors.mobile_phone:
+        mobile_phone_error = DIV(form.errors.mobile_phone,
+                                 _id="mobile_phone__error",
+                                 _class="error",
+                                 _style="display: block;")
+    else:
+        mobile_phone_error = ""
+    if form.errors.work_phone:
+        work_phone_error = DIV(form.errors.work_phone,
+                                 _id="work_phone__error",
+                                 _class="error",
+                                 _style="display: block;")
+    else:
+        work_phone_error = ""
+    row = formstyle(id      = "phone", 
+                    label   = LABEL("%s:" % T("Work Phone")), 
+                    widget  = DIV(INPUT(_name="work_phone",
+                                        _id="",
+                                        _class="string"),
+                                  work_phone_error),
+                    comment = "")
+    form[0][12].append(row)
+    row = formstyle(id      = "phone", 
+                    label   = LABEL("%s:" % current.deployment_settings.get_ui_label_mobile_phone(),
+                                    SPAN(" *", _class="req")), 
+                    widget  = DIV(INPUT(_name="mobile_phone",
+                                        _id="",
+                                        _class="string"),
+                                  mobile_phone_error),
+                    comment = "")
+    form[0][12].append(row)
+
+    # Address
+    row = TR(TD(LABEL(T("Corporation/Organization Address")),
+                _colspan="3",
+                _class="subheading"))
+    form[0][12].append(row)
+    if form.errors.address1:
+        address1_error = DIV(form.errors.address1,
+                             _id="address1__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        address1_error = ""
+    row = formstyle(id      = "address1", 
+                    label   = LABEL("%s:" % T("Address 1"),
+                                    SPAN(" *", _class="req")
+                                    ), 
+                    widget  = (INPUT(_name="address1",
+                                     _id="address1",
+                                     _class="string"),
+                               address1_error),
+                    comment = "")
+    form[0][12].append(row)
+    row = formstyle(id      = "address2", 
+                    label   = LABEL("%s:" % T("Address 2")), 
+                    widget  = INPUT(_name="address2",
+                                    _id="address2",
+                                    _class="string"),
+                    comment = "")
+    form[0][12].append(row)
+    row = formstyle(id      = "city", 
+                    label   = LABEL("%s:" % T("City"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = INPUT(_name="city",
+                    _id     = "city",
+                    _class  = "string"),
+                    comment = "")
+    form[0][12].append(row)
+    states = S3LocationDropdownWidget(level="L1",
+                                      default="California",
+                                      empty=False)
+    widget = states(db.pr_address.location_id, None)
+    row = formstyle(id      = "state", 
+                    label   = LABEL("%s:" % T("State"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = widget,
+                    comment = "")
+    form[0][12].append(row)
+    if form.errors.zip:
+        zip_error = DIV(form.errors.zip,
+                        _id="zip__error",
+                        _class="error",
+                        _style="display: block;")
+    else:
+        zip_error = ""
+    row = formstyle(id      = "zip", 
+                    label   = LABEL("%s:" % T("Zip"),
+                                    SPAN(" *", _class="req")
+                                   ),
+                    widget  = ( INPUT(_name="zip",
+                                      _id="zip",
+                                      _class="string"),
+                                zip_error
+                                ),
+                    comment = "")
+    form[0][12].append(row)
+
+    
+    #form[0][-2].append(TR(TD(LABEL(T("Terms of Service:"),
+    #                               _id="terms_of_service__label"),
+    #                         _class="w2p_fl"),
+    #                      TD(LABEL(TEXTAREA(deployment_settings.get_terms_of_service(),
+    #                                        _onfocus="this.rows=10",
+    #                                        _readonly="readonly",
+    #                                        _style="width:100%;text-align:",
+    #                                        _cols="80", _rows="10"),
+    #                               _id="terms_of_service"),
+    #                         _class="w2p_fw",
+    #                         _colspan="2"),
+    #                      _id="terms_of_service__row"))
+
+    # Add client-side validation
+    # simplified copy of s3_register_validation()
+    script = "".join(( """
+$('#regform').validate({
+    errorClass: 'req',
+    rules: {
+        first_name: {
+            required: true
+            },
+        last_name: {
+            required: true
+            },
+        email: {
+            required: true,
+            email: true
+        },
+        organisation: {
+            required: true
+        },
+        mobile_phone: {
+            required: true
+        },
+        address1: {
+            required: true
+        },
+        city: {
+            required: true
+        },
+        zip: {
+            required: true
+        },
+        password: {
+            required: true
+        },
+        password_two: {
+            required: true,
+            equalTo: '.password:first'
+        }
+    },
+    messages: {
+        firstname: '""", str(T("Enter your firstname")), """',
+        email: {
+            required: '""", str(T("Please enter a valid email address")), """',
+            minlength: '""", str(T("Please enter a valid email address")), """'
+        },
+        password: {
+            required: '""", str(T("Provide a password")), """'
+        },
+        password_two: {
+            required: '""", str(T("Repeat your password")), """',
+            equalTo: '""", str(T("Enter the same password as above")), """'
+        }
+    },
+    errorPlacement: function(error, element) {
+        error.appendTo( element.parent().next() );
+    },
+    submitHandler: function(form) {
+        form.submit();
+    }
+});""" ))
+    response.s3.jquery_ready.append( script )
+
+    if session.s3.debug:
+        response.s3.scripts.append( "%s/jquery.validate.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.js" % s3_script_dir )
+    else:
+        response.s3.scripts.append( "%s/jquery.validate.min.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.min.js" % s3_script_dir )
+
+    response.s3.jquery_ready.append("$('.password:first').pstrength();\n")
+
+    response.title = T("Register")
+    return dict(form=form)
+
+# -----------------------------------------------------------------------------
+def register_validation(form):
+    """ Validate the custom fields in registration form """
+    # Name
+    if "organisation" in request.post_vars and request.post_vars.organisation:
+        # Check not in use
+        table = db.org_organisation
+        query = (table.name == request.post_vars.organisation)
+        name = db(query).select(table.id, limitby=(0, 1)).first()
+        if name:
+            form.errors.organisation = T("Organisation Name is already in use")
+    else:
+        form.errors.organisation = T("Organisation Name is required")
+    # Phone
+    if "work_phone" in request.post_vars and request.post_vars.work_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.work_phone):
+            form.errors.work_phone = T("Invalid phone number")
+    if "mobile_phone" in request.post_vars and request.post_vars.mobile_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.mobile_phone):
+            form.errors.mobile_phone = T("Invalid phone number")
+    else:
+        form.errors.mobile_phone = T("Phone number is required")
+    # Address
+    if not request.post_vars.address1:
+        form.errors.address1 = T("Address is required")
+    if not request.post_vars.city:
+        form.errors.city = T("City is required")
+    if not request.post_vars.zip:
+        form.errors.zip = T("Zip is required")
+
+    return
+
+# -----------------------------------------------------------------------------
+def register_onaccept(form):
+    # Usual Registration Tasks
+    # (PR record, Authenticated Role, Contacts)
+    person = auth.s3_register(form)
+
+    # LA-specific
+    ptable = db.pr_person
+    query = (ptable.id == person)
+
+    db(query).update(middle_name=request.post_vars.middle_name)
+
+    pe = db(query).select(ptable.pe_id,
+                          limitby=(0, 1)).first().pe_id
+
+    # Organisation
+    organisation = request.post_vars.organisation
+    if "vols" in request.post_vars and request.post_vars.vols == "on":
+        has_vols = True
+    else:
+        has_vols = False
+    if "has_items" in request.post_vars and request.post_vars.has_items == "on":
+        has_items = True
+    else:
+        has_items = False
+
+    # Phone
+    table = db.pr_contact
+    work_phone = request.post_vars.work_phone
+    mobile_phone = request.post_vars.mobile_phone
+    if mobile_phone:
+        # Don't auto-subscribe to SMS (priority 10)
+        table.insert(pe_id = pe,
+                     contact_method = "SMS",
+                     value = mobile_phone,
+                     priority=10)
+    if work_phone:
+        # Don't auto-subscribe to SMS (priority 10)
+        table.insert(pe_id = pe,
+                     contact_method = "WORK_PHONE",
+                     value = work_phone,
+                     priority=10)
+
+    # Address
+    address1 = request.post_vars.address1
+    address2 = request.post_vars.address2
+    #if address2:
+    #    address = "%s\n%s" % (address1,
+    #                          address2)
+    #else:
+    #    address = address1
+    city = request.post_vars.city
+    state = request.post_vars.location_id
+    zip = request.post_vars.zip
+    if request.post_vars.sector_other:
+        sector_other = "Sector: %s" % request.post_vars.sector_other
+    else:
+        sector_other = ""
+    otable = db.org_organisation
+    org = otable.insert(name = organisation,
+                        has_vols = has_vols,
+                        has_items = has_items,
+                        #phone=phone,
+                        address=address1,
+                        address_2=address2,
+                        L3=city,
+                        L1=state,
+                        postcode=zip,
+                        sector_id=request.post_vars.sector_id,
+                        comments=sector_other)
+    record = Storage(id=org)
+    s3mgr.model.update_super(otable, record)
+    auth.s3_set_record_owner(otable, org)
+    # For OrgDons which don't require approval
+    if auth.user:
+        # Update the session
+        auth.user.organisation_id = org
+        user_id = auth.user.id
+    else:
+        user_id = form.vars.id
+
+    # Create HRM
+    table = db.hrm_human_resource
+    hrm = table.insert(person_id = person,
+                       organisation_id = org,
+                       owned_by_user = user_id)
+    record = Storage(id=hrm)
+    s3mgr.model.update_super(table, record)
+    auth.s3_set_record_owner(table, hrm)
+
+    # Set the Roles
+    person = db(query).select(ptable.uuid,
+                              limitby=(0, 1)).first()
+    if not person:
+        # Error
+        return
+    utable = db[auth.settings.table_user]
+    query = (utable.person_uuid == person.uuid)
+    db(query).update(organisation_id = org)
+    user = db(query).select(utable.id,
+                            limitby=(0, 1)).first()
+    if not user:
+        # Error
+        return
+    mtable = db[auth.settings.table_membership]
+    gtable = db[auth.settings.table_group]
+    _org = db(otable.id == org).select(otable.owned_by_organisation,
+                                       limitby=(0, 1)).first()
+    if _org:
+        mtable.insert(user_id = user.id,
+                      group_id = _org.owned_by_organisation)
+        
+    if has_vols:
+        OrgVol = db(gtable.uuid == ORG_VOL).select(gtable.id,
+                                                   limitby=(0, 1)).first()
+        if OrgVol:
+            mtable.insert(user_id = user.id,
+                          group_id = OrgVol.id)
+        # Go to the Contacts page so that a secondary contact can be added
+        # Flag that we've come from registration for subsequent workflow
+        #redirect(URL(c="vol", f="organisation", args=[org, "human_resource"],
+        #             vars={"register":1}))
+
+    if has_items:
+        OrgDon = db(gtable.uuid == ORG_DON).select(gtable.id,
+                                                   limitby=(0, 1)).first()
+        if OrgDon:
+            mtable.insert(user_id = user.id,
+                          group_id = OrgDon.id)
+        # Go to the Contacts page so that a secondary contact can be added
+        # Flag that we've come from registration for subsequent workflow
+        redirect(URL(c="don", f="organisation", args=[org, "human_resource"],
+                     vars={"register":1}))
+
+# -----------------------------------------------------------------------------
+#auth.settings.registration_requires_approval = True
+auth.settings.register_onvalidation = register_validation
+auth.settings.register_onaccept = register_onaccept
 
 # END =========================================================================

=== added file 'controllers/don.py'
--- controllers/don.py	1970-01-01 00:00:00 +0000
+++ controllers/don.py	2011-09-08 19:09:00 +0000
@@ -0,0 +1,619 @@
+# -*- coding: utf-8 -*-
+
+"""
+    Donations (LA Specific)
+
+    @author: Michael Howden ([e-mail])
+    @date-created: 2011-08-02
+"""
+
+
+module = request.controller
+resourcename = request.function
+
+if not deployment_settings.has_module(module):
+    raise HTTP(404, body="Module disabled: %s" % module)
+
+# Options Menu (available in all Functions)
+shn_menu(module)
+
+# Load Models
+s3mgr.load("don_collect")
+# -----------------------------------------------------------------------------
+def index():
+    """ Custom View """
+    if s3_has_role(STAFF):
+        redirect(URL(f="req"))
+    else:
+        response.menu_options = []
+        if session.s3.debug:
+            response.s3.scripts.append( "%s/jquery.hoverIntent.js" % s3_script_dir )
+        else:
+            response.s3.scripts.append( "%s/jquery.hoverIntent.minified.js" % s3_script_dir )
+        
+        response.title = T("Donate")
+        response.s3.jquery_ready.append("""
+        $(".donate-popup").css("display", "none");
+        $(".organizations-list li a").hoverIntent(donateFadeIn, donateFadeOut);
+        """)
+        response.s3.js_global.append("""
+        function donateFadeIn(){$(this).next(".donate-popup").fadeIn();}
+        function donateFadeOut(){$(this).next(".donate-popup").fadeOut();}
+        """)
+        
+        # Get Donation Drives List
+        table = db.don_collect
+        query = ( ( table.end_datetime > request.utcnow ) & 
+                  ( table.deleted == False )
+                  )
+        rows = db(query).select( table.start_datetime,
+                                 table.end_datetime,
+                                 table.site_id,
+                                 orderby = table.start_datetime
+                                )
+        if rows:
+            list = []
+            offset = IS_UTC_OFFSET.get_offset_value(session.s3.utc_offset)
+            for row in rows:
+                if offset:
+                    start_datetime = row.start_datetime + datetime.timedelta(seconds=offset)
+                    end_datetime = row.end_datetime + datetime.timedelta(seconds=offset)
+
+                start_date = start_datetime.strftime("%b %d")
+                start_time = start_datetime.strftime("%I:%M %p")
+                end_date = end_datetime.strftime("%b %d")
+                end_time = end_datetime.strftime("%I:%M %p")
+
+                site = shn_site_represent(row.site_id, address = True)
+
+                if start_date == end_date:
+                    list.append( LI( SPAN( start_date, _class = "date"),
+                                     " %s - %s" % (start_time, end_time),
+                                     site,
+                                     BR()
+                                    )
+                                )
+                else:
+                    list.append( LI( SPAN( start_date, _class = "date" ),
+                                     " %s - " % start_time,
+                                     SPAN( end_date, _class = "date" ),
+                                     " %s" % end_time,
+                                     site,
+                                     BR()
+                                    )
+                                )
+            donation_drives = TAG[""](*list)
+        else:
+            donation_drives = P(T("No Donation Drives Scheduled. Please check back later"))
+        
+        return dict(donation_drives = donation_drives)
+
+# -----------------------------------------------------------------------------
+def match():
+    # Get Req Resource Details
+    tablename, req_id = request.vars.viewing.split(".")
+    
+    # create fake resource for rheader
+    req = db(db.req_req.id == req_id).select(limitby = (0, 1)).first()
+    r = Storage()
+    r.record = req
+    r.representation = "html"
+    r.name = "don"
+    r.function = "match"
+    r.vars = request.vars
+    rheader = response.s3.don_rheader(r)
+    
+    # Get Item Filter
+    req_item = db(db.req_req_item.req_id == req_id).select(db.req_req_item.item_id,
+                                                                    limitby = [0,1]
+                                                                    ).first()
+    if req_item:
+        item_id = req_item.item_id
+    else:
+        item_id = None
+    response.s3.filter = (db.inv_inv_item.item_id == item_id)
+    
+    # Configure inv_item list
+    s3mgr.configure("inv_inv_item",
+                    insertable = False,
+                    list_fields = ["id",
+                                   "organisation_id",
+                                   "item_id",
+                                   "quantity",
+                                   "comments"]
+                                   )
+    response.s3.actions = [dict(url = URL(c="don", f="req",
+                                                      args = [req_id, "commit"],
+                                                      vars = dict(inv_item_id = "[id]")
+                                                      ),
+                                            _class = "action-btn",
+                                            label = str(T("Select")),
+                                            )
+                           ]
+    s3mgr.load("inv_inv_item")
+    output = response.s3.inv_item_controller() #s3_rest_controller("inv", "inv_item")
+    
+    # Customize form
+    output["rheader"] = rheader
+    output["title"] = T("Request for Donations Details")
+    output["subtitle"] = T("Matching Donation Items")
+    
+    return output
+
+# -----------------------------------------------------------------------------
+def req():
+    """
+        /req/req/default_type=1
+    """
+    s3mgr.configure("req_req",
+                    list_fields = ["id",
+                                   #"priority",
+                                   "status",
+                                   (T("BOC Status"), "req_commit_status"),
+                                   "created_on",
+                                   "date_required",
+                                   (T("Item"), "item"),
+                                   "site_id",
+                                ],
+                    orderby = ["created_on"])
+
+    s3mgr.load("req_req")
+    request.vars["default_type"] = 1
+    
+    #s3mgr.model.set_method("req", "req", method="match", action = match)    
+    
+    # Defined in the Model for use from Multiple Controllers for unified menus
+    output =  response.s3.req_controller()
+    if "rheader" in output:
+        if len(request.args) >0:
+            args = request.args[0]
+        else:
+            args = None
+        reportButtons = DIV(
+                            BUTTON(T("Print Donation Request Form"),
+                                   _class="accept-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req_print",
+                                            args=args
+                                            )
+                                    ),
+                            # Also in controllers/vol.py - DRY
+                            A(IMG(_src="/%s/static/img/get_adobe_reader.png" % request.application,
+                                  _title="%s - %s" % (T("Get Adobe Reader"),
+                                                      T("This link will open a new browser window.")),
+                                  _alt=T("Get Adobe Reader"),
+                                  _width=158,
+                                  _height=39,
+                                  _style="float:right;"),
+                              _href="http://www.adobe.com/products/acrobat/readstep2.html",
+                              _target="_blank"),
+                            )
+        output["rheader"].append(reportButtons)
+
+    return output
+
+def req_print():
+    """ Print Donation Request Form """
+    s3mgr.load("req_req_item")
+    r = s3base.S3Request(s3mgr,
+                         prefix="req",
+                         name="req_item",
+                         extension="pdf")
+    s3mgr.configure("req_req_item",
+                    callback = response.s3.donationRequest,
+                    formname = T("Request for Donations"),
+                    footer = lambda x, y: None,
+                    )
+    return r()
+
+# -----------------------------------------------------------------------------
+# @ToDo: move to inside a prep - only for inv_item components
+# Add inv_item directly to Org
+if deployment_settings.has_module("inv"):
+    s3mgr.load("inv_inv_item")
+    
+s3mgr.configure("inv_inv_item",
+                list_fields = ["id",
+                               "organisation_id",
+                               "item_category_id",
+                               "item_id",
+                               "pack_value",
+                               "quantity",
+                            ]
+                )
+
+db.inv_inv_item.site_id.readable = db.inv_inv_item.site_id.writable = False
+db.inv_inv_item.expiry_date.readable = db.inv_inv_item.expiry_date.writable = False
+# inv_item CRUD strings
+# INV_ITEM = T(" Donation Item")
+
+ADD_INV_ITEM = T("Add Donation Item")
+LIST_INV_ITEMS = T("List Donation Items")
+s3.crud_strings["inv_inv_item"] = Storage(
+    title_create = ADD_INV_ITEM,
+    title_display = T("Donation Item Details"),
+    title_list = LIST_INV_ITEMS,
+    title_update = T("Edit Donation Item"),
+    title_search = T("Search Donation Items"),
+    subtitle_create = ADD_INV_ITEM,
+    subtitle_list = T("Donation Items"),
+    label_list_button = LIST_INV_ITEMS,
+    label_create_button = ADD_INV_ITEM,
+    label_delete_button = T("Remove Donation Item"),
+    msg_record_created = T("Donation Item Added"),
+    msg_record_modified = T("Donation Item updated"),
+    msg_record_deleted = T("Donation Item removed"),
+    msg_list_empty = T("No Donation Items for this Corporation"))
+
+ADD_GOODS = T("In the event of a declared disaster we MAY be able to donate the following Goods:")
+LIST_GOODS = T("List Donation Goods")
+s3.crud_strings["don_good"] = Storage(
+    title_create = ADD_GOODS,
+    title_display = T("Donation Good Details"),
+    title_list = LIST_GOODS,
+    title_update = T("Edit Donation Goods"),
+    title_search = T("Search Donation Goods"),
+    subtitle_create = ADD_GOODS,
+    subtitle_list = T("Donate Goods"),
+    label_list_button = LIST_GOODS,
+    label_create_button = ADD_GOODS,
+    label_delete_button = T("Remove Donation Goods"),
+    msg_record_created = T("Donation Goods Added"),
+    msg_record_modified = T("Donation Goods updated"),
+    msg_record_deleted = T("Donation Goods removed"),
+    msg_list_empty = T("No Donation Goods for this Corporation"))
+
+ADD_SERVICE = T("In the event of a declared disaster we MAY be able to donate the following Services:")
+LIST_SERVICES = T("List Donation Services")
+s3.crud_strings["don_service"] = Storage(
+    title_create = ADD_SERVICE,
+    title_display = T("Donation Service Details"),
+    title_list = LIST_SERVICES,
+    title_update = T("Edit Donation Service"),
+    title_search = T("Search Donation Services"),
+    subtitle_create = ADD_SERVICE,
+    subtitle_list = T("Donate Services"),
+    label_list_button = LIST_SERVICES,
+    label_create_button = ADD_SERVICE,
+    label_delete_button = T("Remove Donation Service"),
+    msg_record_created = T("Donation Service Added"),
+    msg_record_modified = T("Donation Service updated"),
+    msg_record_deleted = T("Donation Service removed"),
+    msg_list_empty = T("No Donation Services for this Corporation"))
+
+ADD_FACILITY = T("In the event of a declared disaster we MAY be able to donate the following Facilities:")
+LIST_FACILITYS = T("List Donation Facilities")
+s3.crud_strings["don_facility"] = Storage(
+    title_create = ADD_FACILITY,
+    title_display = T("Donation Facility Details"),
+    title_list = LIST_FACILITYS,
+    title_update = T("Edit Donation Facility"),
+    title_search = T("Search Donation Facilities"),
+    subtitle_create = ADD_FACILITY,
+    subtitle_list = T("Donate Facilities"),
+    label_list_button = LIST_FACILITYS,
+    label_create_button = ADD_FACILITY,
+    label_delete_button = T("Remove Donation Facility"),
+    msg_record_created = T("Donation Facility Added"),
+    msg_record_modified = T("Donation Facility updated"),
+    msg_record_deleted = T("Donation Facility removed"),
+    msg_list_empty = T("No Donation Facilities for this Corporation"))
+
+# -----------------------------------------------------------------------------
+def don_item_filter(inv_item_add_filter_func):
+    itable = db.inv_inv_item
+    ctable = db.supply_item_category
+    
+    facility_cat_id = db(ctable.code == "FACILITY"
+                         ).select(ctable.id,
+                                  limitby = (0,1)
+                                  ).first().id
+    service_cat_id = db(ctable.code == "SERVICES"
+                         ).select(ctable.id,
+                                  limitby = (0,1)
+                                  ).first().id
+    
+    itable.organisation_id.widget = None # Implement SearchACWidget for Organisations
+    itable.organisation_id.requires = IS_NULL_OR(IS_ONE_OF(db, "org_organisation.id",
+                                                           organisation_represent,
+                                                           orderby="org_organisation.name",
+                                                           sort=True,
+                                                           filterby = "has_items",
+                                                           filter_opts = [True])
+                                                 )
+    itable.item_id.widget = None
+    
+    item_type = request.vars.item
+    if item_type == "goods":
+        s3.crud_strings["inv_inv_item"] = s3.crud_strings["don_good"]
+        itable.item_category_id.requires = IS_NULL_OR(IS_ONE_OF(db,
+                                                    "supply_item_category.id",
+                                                    "%(name)s",
+                                                    not_filterby = "id",
+                                                    not_filter_opts = [facility_cat_id, service_cat_id],
+                                                    sort=True))
+        response.s3.jquery_ready = [
+"""
+$(document).ready(function() {
+    S3FilterFieldChange({
+        'FilterField':    'item_category_id',
+        'Field':        'item_id',
+        'FieldResource':'item',
+        'FieldPrefix':    'supply',
+        //'url':             S3.Ap.concat('/req/req_item_packs/'),
+        //'msgNoRecords':    S3.i18n.no_packs,
+        //'fncPrep':        fncPrepItem,
+        //'fncRepresent':    fncRepresentItem
+    });
+});
+"""
+]
+        query = ( ( db.inv_inv_item.item_category_id != facility_cat_id) & 
+                  ( db.inv_inv_item.item_category_id != service_cat_id)
+                  )
+        inv_item_add_filter_func( query )
+    elif item_type in ["services", "facilities"]:
+        if item_type == "services":
+            itable.item_id.label = T("Service Type")
+            itable.quantity.label = T("Duration of Donated Services")
+            itable.item_pack_id.label = T("Unit of Time")
+            itable.pack_value.label = T("Estimated Value ($) per Unit of Time")
+            s3.crud_strings["inv_inv_item"] = s3.crud_strings["don_service"]
+            item_category_filter = service_cat_id
+            
+        elif item_type == "facilities":
+            itable.item_id.label = T("Facility Type")
+            
+            s3.crud_strings["inv_inv_item"] = s3.crud_strings["don_facility"]
+            item_category_filter = facility_cat_id
+            itable.comments.label = T("Comments (Sq. Ft, Bldg Type, Stories)")
+            itable.comments.comment = DIV(_class="tooltip",
+                                          _title="%s|%s|%s" % (T("Comments"),
+                                                               T("Square Feet, Building Type, Stories."),
+                                                               T("300 character limit.")))
+            
+        itable.item_category_id.readable = itable.item_category_id.writable = False
+        itable.item_category_id.default = item_category_filter
+        
+        itable.item_id.requires = IS_ONE_OF(db, "supply_item.id",
+                                            response.s3.item_represent,
+                                            filterby = "item_category_id",
+                                            filter_opts = [item_category_filter],
+                                            sort=True)
+        
+        query = (db.inv_inv_item.item_category_id == item_category_filter)
+        inv_item_add_filter_func( query )
+# -----------------------------------------------------------------------------
+def organisation():
+    """
+        /org/organisation/ corporation
+    """
+    
+    otable = db.org_organisation
+    
+    otable.acronym.readable = False
+    otable.acronym.writable = False
+    otable.sector_id.readable = True
+    otable.sector_id.writable = True
+    org_has_items_field = otable.has_items
+    org_has_items_field.default = True
+    response.s3.filter = (org_has_items_field == True)
+
+    def corporation_rheader(r, tabs = []):
+        """ Corporation rheader """
+    
+        if r.representation == "html":
+    
+            if r.record is None:
+                # List or Create form: rheader makes no sense here
+                return None
+            
+            tabs = [(T("Basic Details"), None),
+                    (T("Contacts"), "human_resource"),
+                    (T("Donate Goods"), "inv_item", dict(item="goods")),
+                    (T("Donate Services "), "inv_item", dict(item="services")),
+                    (T("Donate Facilities "), "inv_item", dict(item="facilities")),
+                    ]
+            if "register" not in request.vars:
+                tabs.append( (T("Donations"), "commit") )
+            rheader_tabs = s3_rheader_tabs(r, tabs)
+    
+            organisation = r.record
+            if organisation.sector_id:
+                _sectors = org_sector_represent(organisation.sector_id)
+            else:
+                _sectors = None
+    
+            if deployment_settings.get_ui_cluster():
+                sector_label = T("Cluster(s)")
+            else:
+                sector_label = T("Sector(s)")
+    
+            rheader = DIV(TABLE(
+                TR(
+                    TH("%s: " % T("Corporation")),
+                    organisation.name,
+                    TH("%s: " % sector_label),
+                    _sectors
+                    )),
+                rheader_tabs
+            )
+            return rheader
+        return None
+
+    ADD_CORPORATION = T("Add Corporation / Organization")
+    LIST_CORPORATIONS = T("List Corporations & Organizations")
+    s3.crud_strings["org_organisation"] = Storage(
+        title_create = ADD_CORPORATION,
+        title_display = T("Corporation / Organization Details"),
+        title_list = LIST_CORPORATIONS,
+        title_update = T("Edit Corporation / Organization"),
+        title_search = T("Search Corporations & Organizations"),
+        subtitle_create = T("Add New Corporation / Organization"),
+        subtitle_list = T("Corporations & Organizations"),
+        label_list_button = LIST_CORPORATIONS,
+        label_create_button = ADD_CORPORATION,
+        label_delete_button = T("Delete Corporation / Organization"),
+        msg_record_created = T("Corporation / Organization added"),
+        msg_record_modified = T("Corporation / Organization updated"),
+        msg_record_deleted = T("Corporation / Organization deleted"),
+        msg_list_empty = T("No Corporations & Organizations currently registered"))
+    
+    s3mgr.load("inv_inv_item")
+
+    def prep(r):
+        don_item_filter(lambda query: 
+                             r.resource.add_component_filter("inv_item", query))
+        if r.component and r.component.name == "human_resource":
+            hrtable = db.hrm_human_resource
+            hrtable.type.writable = hrtable.type.readable = False
+            hrtable.status.writable = hrtable.status.readable = False
+            response.s3.jquery_ready.append("$('#hrm_human_resource_person_id__row1').hide();")
+            
+            s3.crud_strings["hrm_human_resource"] = Storage(
+                title_create = T("Add Contact"),
+                title_display = T("Contact Details"),
+                title_list = T("Contacts"),
+                title_update = T("Edit Contact"),
+                title_search = T("Search Contacts"),
+                subtitle_create = T("Additional Contacts (optional)"),
+                subtitle_list = T("Contacts"),
+                label_list_button = T("List Contacts"),
+                label_create_button = T("Add Contacts"),
+                label_delete_button = T("Delete Contact"),
+                msg_record_created = T("Contact added"),
+                msg_record_modified = T("Contact updated"),
+                msg_record_deleted = T("Contact deleted"),
+                msg_no_match = T("No Contacts Found"),
+                msg_list_empty = T("Currently there are no Contact registered"))
+            
+            # Donation Organization Regisration Workflow
+            if "register" in request.vars:
+                # Only force the open on 1st run
+                response.s3.show_listadd = True
+                s3mgr.configure("hrm_human_resource",
+                                create_next = URL(c="don", f="organisation",
+                                                  args = [r.record.id, "inv_item"],
+                                                  vars = dict(item="goods"))
+                                ) 
+                
+        # We don't want this enforced workflow as it doesn't allow adding multiple Goods, etc
+        #if r.component and r.component.name == "inv_item":
+        #    next_item = dict(goods = "services",
+        #                     services = "facilities")
+        #    if request.vars.item in next_item:
+        #        response.s3.show_listadd = True
+        #        url = URL(c="don", f="organisation",
+        #                  args = [r.record.id, "inv_item"],
+        #                  vars = dict(item=next_item[request.vars.item],
+        #                              register=1))
+        #    else:
+        #        url = URL(c="don", f="index", args = [], vars = {})
+        #    s3mgr.configure("inv_inv_item",
+        #                    create_next = url
+        #                    ) 
+
+    # Add req to Corporations as Donations
+    s3mgr.configure("req_commit",
+                    insertable = False,
+                    editable = False,
+                    deletable = False,
+                    )
+    
+    s3mgr.configure( "org_organisation",
+                     list_fields = ["id",
+                                    "name",
+                                    #"type",
+                                    "sector_id",
+                                    #"country",
+                                    #"website"
+                                 ])
+
+    # req CRUD strings
+    REQ = T("Donation")
+    #ADD_REQ = T("Add Donation")
+    LIST_REQ = T("List Donations")
+    s3.crud_strings["req_req"] = Storage(
+        #title_create = ADD_REQ,
+        title_display = T("Donation Details"),
+        title_list = LIST_REQ,
+        #title_update = T("Edit Donation"),
+        title_search = T("Search Donations"),
+        #subtitle_create = ADD_REQ,
+        subtitle_list = T("Donations"),
+        label_list_button = LIST_REQ,
+        #label_create_button = ADD_REQ,
+        #label_delete_button = T("Remove Donations"),
+        #msg_record_created = T("Donation Added"),
+        #msg_record_modified = T("Donation updated"),
+        #msg_record_deleted = T("Donation removed"),
+        msg_list_empty = T("No Donations from this Corporation"))
+    
+    if not s3_has_role(STAFF):
+        response.s3.donate_cash_link =True
+    
+    return organisation_controller(organisation_rheader = corporation_rheader,
+                                   org_prep = prep)
+
+# -----------------------------------------------------------------------------
+def item():
+    """ REST Controller """
+    s3mgr.load("inv_inv_item")
+    def inv_item_add_filter_func(query):
+        response.s3.filter = query
+    don_item_filter(inv_item_add_filter_func)
+    return response.s3.inv_item_controller()
+
+# -----------------------------------------------------------------------------
+def collect():
+    """ REST Controller """
+    def prep(r):
+        s3mgr.configure("don_collect",
+                list_fields = ["id",
+                               "start_datetime",
+                               "end_datetime",
+                               "site_id",
+                               "organisation_id",
+                            ])
+        return True
+
+    response.s3.prep = prep
+    output = s3_rest_controller(module, resourcename)
+    return output
+
+# -----------------------------------------------------------------------------
+def distribute():
+    """ REST Controller """
+    output = s3_rest_controller(module, resourcename)
+    return output
+
+# -----------------------------------------------------------------------------
+def profile():
+    """ Organisation Profile """
+    return organisation_profile()
+
+# -----------------------------------------------------------------------------
+################################################################################
+### Hook to call get the donation certificate
+################################################################################
+#def certprint():
+#    """ Print Cert TEST """
+#    s3mgr.load("don_distribute")
+#    r = s3base.S3Request(s3mgr,
+#                         prefix="don",
+#                         name="distribute",
+#                         extension="pdf")
+#    s3mgr.configure("don_distribute",
+#                    callback = response.s3.donationCertificate,
+#                    formname = "Donation Certificate",
+#                    header = response.s3.donCertBorder,
+#                    footer = lambda x, y: None,
+#                    )
+#    return r()
+################################################################################
+### 
+################################################################################
+
+
+# END =========================================================================
\ No newline at end of file

=== modified file 'controllers/event.py'
--- controllers/event.py	2011-08-06 18:24:53 +0000
+++ controllers/event.py	2011-09-08 19:09:00 +0000
@@ -32,6 +32,16 @@
     redirect(URL(f="event", args="create"))
 
 # =============================================================================
+# Incidents
+# =============================================================================
+def incident():
+    """ RESTful CRUD controller """
+
+    tablename = "event_incident"
+    s3mgr.load(tablename)
+    return s3_rest_controller(module, resourcename)
+
+# =============================================================================
 # Events
 # =============================================================================
 def event():
@@ -184,7 +194,7 @@
     tabs.append((T("Map Configuration"), "config"))
 
     rheader = lambda r, tabs=tabs: event_rheader(r, tabs)
-    output = s3_rest_controller("event", resourcename,
+    output = s3_rest_controller(module, resourcename,
                                 rheader=rheader)
     return output
 

=== modified file 'controllers/gis.py'
--- controllers/gis.py	2011-08-11 23:34:08 +0000
+++ controllers/gis.py	2011-09-08 19:09:00 +0000
@@ -63,7 +63,7 @@
         catalogue_toolbar = False
 
     # @ToDo: Make these configurable
-    search = True
+    search = False
     googleEarth = True
     googleStreetview = True
     catalogue_layers = True
@@ -92,7 +92,8 @@
                        search=search,
                        catalogue_layers=catalogue_layers,
                        mouse_position = mouse_position,
-                       print_tool = print_tool
+                       print_tool = print_tool,
+                       collapsed = True
                       )
 
     return map

=== modified file 'controllers/hrm.py'
--- controllers/hrm.py	2011-08-28 19:50:18 +0000
+++ controllers/hrm.py	2011-09-08 19:09:00 +0000
@@ -915,4 +915,237 @@
                                    redirect_vars = {fieldname: id},
                                    title_name = title)
 
+# =============================================================================
+# Adding a human resource inline
+# =============================================================================
+
+def create_inline():
+
+    # arguments ?
+    formstyle = s3_formstyle
+    field_name = field.name
+    
+    # Set up fields
+    pr_person = db.pr_person
+    hrm_human_resource = db.hrm_human_resource
+    
+    fields = [
+        pr_person.first_name,
+        pr_person.middle_name,
+        pr_person.last_name,
+        
+        hrm_human_resource.job_title,
+    ]
+    
+    emailRequired = (
+        request.controller == "hrm" and 
+        deployment_settings.get_hrm_email_required()
+    )
+        
+    if emailRequired:
+        email_validator = IS_EMAIL()
+    else:
+        email_validator = IS_NULL_OR(IS_EMAIL())
+        
+    email_field_name = "email_address"
+    mobile_phone_field_name = "mobile_phone"
+    fields.extend([
+        Field(
+            "organisation_id",
+            notnull=True,
+            requires = hrm_human_resource.organisation_id.requires,
+            label = hrm_human_resource.organisation_id.label,
+            represent = hrm_human_resource.organisation_id.represent,
+        ),
+        Field(
+            email_field_name,
+            notnull=emailRequired,
+            requires=email_validator,
+            label=T("Email Address")
+        ),
+        Field(
+            mobile_phone_field_name,
+            label=T("Mobile Phone Number")
+        )
+    ])
+    
+    required_labels = s3_mark_required(
+        fields,
+        label_html = (
+            lambda field_label: 
+                TAG[""](
+                    SPAN("* ", _class="req"),
+                    field_label
+                )
+        )
+    )
+    if required_labels:
+        response.s3.has_required = True
+
+    form = SQLFORM.factory(table_name="hrm_human_resource",
+                           labels=required_labels,
+                           formstyle=formstyle,
+                           separator = "",
+                           *fields)
+
+    # JavaScript
+    def add_script(script_name):
+        response.s3.scripts.append(
+            "%s/%s" % (response.s3.script_dir, script_name)
+        )
+    
+    result = dict(
+        form = TAG[""](
+            # to stop some browsers appying a default table style to unstyled tables
+            XML("""<style type="text/css">table { font-size:inherit; }</style>"""),
+            form
+        ),
+        created_object_id = None,
+        created_object_representation = "",
+        errors = form.errors
+    )
+    
+    accepted = form.accepts(request.vars)#, session):
+
+    # more validation, don't let other validation errors upset this, 
+    # as the user wants to see all errors in one go
+    pr_contact = db.pr_contact
+    pr_person = db.pr_person
+    def var(name):
+        return request.vars.get(name, None)
+
+    def check_request_var_matches_value_if_given(var_name, value):
+        if var(var_name):
+            if var(var_name) != value:
+                if not form.errors.has_key(var_name):
+                    form.errors[var_name] = (
+                        T("There is a existing record, but the %(property)s is different. "
+                        "(Clearing this field allows use of the existing record)")
+                    ) % dict(
+                        property = var_name.replace("_", " ")
+                    )
+
+    def existing(*query):
+        return db(*query).select().first()
+
+    existing_mobile_phone_contact = None
+    existing_person = None
+    existing_human_resource = None
+    
+    # look for a person with the same email address
+    email_address = var(email_field_name)
+    if email_address:
+        existing_email_contact = existing(
+            (pr_contact.contact_method == "EMAIL") &
+            (pr_contact.value == email_address)
+        )
+        if existing_email_contact is not None:
+            # check every other contact detail matches, otherwise complain
+            
+            # mobile phone
+            existing_mobile_phone_contact = existing(
+                (pr_contact.contact_method == "MOBILE PHONE") &
+                (pr_contact.pe_id == existing_email_contact.pe_id)
+            )
+            if existing_mobile_phone_contact is not None:
+                check_request_var_matches_value_if_given(
+                    "mobile_phone",
+                    existing_mobile_phone_contact.value
+                )
+            
+            # person details
+            existing_person = existing(
+                pr_person.pe_id == existing_email_contact.pe_id
+            )
+            if existing_person is not None:
+                check_request_var_matches_value_if_given(
+                    "first_name",
+                    existing_person.first_name
+                )
+                check_request_var_matches_value_if_given(
+                    "middle_name",
+                    existing_person.middle_name
+                )
+                check_request_var_matches_value_if_given(
+                    "last_name",
+                    existing_person.last_name
+                )
+                
+                # human resource 
+                existing_human_resource = existing(
+                    hrm_human_resource.person_id == existing_person.id
+                )
+                if existing_human_resource is not None:
+                    check_request_var_matches_value_if_given(
+                        "job_title",
+                        existing_human_resource.job_title
+                    )
+                    check_request_var_matches_value_if_given(
+                        "organisation_id",
+                        existing_human_resource.organisation_id
+                    )
+
+    if accepted: # create objects as necessary
+        # an email address is assumed to uniquely identify a person
+        # however, there is no guarantee that a person has an email address
+        if existing_email_contact is None:
+            # there is no pr_pentity
+            pe_id = db.pr_pentity.insert(
+            ).pe_id
+            
+            db.pr_contact.insert(
+                pe_id = pe_id,
+                contact_method = "EMAIL",
+                value = email_address,
+            )
+        else:
+            contact_id = existing_email_contact.id
+            pe_id = existing_email_contact.pe_id
+            
+        assert pe_id is not None
+            
+        if existing_mobile_phone_contact is None:
+            if var(mobile_phone_field_name):
+                db.pr_contact.insert(
+                    pe_id = pe_id,
+                    contact_method = "MOBILE PHONE",
+                    value = var(mobile_phone_field_name)
+                )
+
+        if existing_person is None:
+            person_id = db.pr_person.insert(
+                pe_id = pe_id,
+                first_name = var("first_name"),
+                middle_name = var("middle_name"),
+                last_name = var("last_name")
+            )
+        else:
+            person_id = existing_person.id
+    
+        if form.errors:
+            response.flash = "form is invalid"
+        else:
+            if existing_human_resource:
+                result.update(
+                    created_object_id = existing_human_resource.id,
+                    created_object_representation = hrm_human_resource_represent(existing_human_resource)
+                )
+                # nothing needs adding?            
+            else:
+                created_human_resource = db.hrm_human_resource.insert(
+                    person_id = person_id,
+                    job_title = var("job_title"),
+                    organisation_id = var("organisation_id")
+                )
+                db.commit()
+                result.update(
+                    created_object_id = created_human_resource.id,
+                    created_object_representation = hrm_human_resource_represent(created_human_resource)
+                )
+            response.flash = T("form accepted")
+
+    result["vars"] = form.vars
+    response.view="inner_form.html"
+    return result
+
 # END =========================================================================

=== added file 'controllers/master.py'
--- controllers/master.py	1970-01-01 00:00:00 +0000
+++ controllers/master.py	2011-09-08 19:09:00 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+"""
+    Master Data - Controllers
+
+    @author: Fran
+"""
+
+module = request.controller
+
+if module not in deployment_settings.modules:
+    raise HTTP(404, body="Module disabled: %s" % module)
+
+# Options Menu (available in all Functions' Views)
+shn_menu(module)
+
+def index():
+    "Module's Home Page"
+
+    module_name = deployment_settings.modules[module].name_nice
+    response.title = module_name
+    return dict(module_name=module_name)

=== modified file 'controllers/org.py'
--- controllers/org.py	2011-08-06 18:24:53 +0000
+++ controllers/org.py	2011-09-08 19:09:00 +0000
@@ -159,4 +159,133 @@
 
     return output
 
+
+def add_site_inline():
+    formstyle = s3_formstyle
+    field_name = field.name
+    
+    # Set up fields
+    org_office = db.org_office
+    
+    field_names = [
+        "type",
+        "name",
+        "address",
+        "address_2",
+        "L3",
+        "L1",
+        "postcode",
+        "phone1",
+    ]
+    fields = []
+    for field_name in field_names:
+        fields.append(getattr(org_office, field_name))
+    
+    required_labels = s3_mark_required(
+        fields,
+        label_html = (
+            lambda field_label: 
+                TAG[""](
+                    SPAN("* ", _class="req"),
+                    field_label
+                )
+        )
+    )
+    if required_labels:
+        response.s3.has_required = True
+        form = SQLFORM.factory(table_name="org_office",
+                               labels=required_labels,
+                               formstyle=formstyle,
+                               separator = "",
+                               *fields)
+    
+    # change submit button text
+    submit_line = form[0][-1][0]
+    submit_button = submit_line[0]
+    submit_button.attributes["_value"] = T("Save")
+
+    # add cancel and reset buttons
+    submit_line.append(
+        INPUT(_type="button", _value=T("Cancel"), _onclick="close_iframe()")
+    )
+    submit_line.append(
+        INPUT(_type="reset", _value=T("Clear"))
+    )
+
+    # JavaScript
+    def add_script(script_name):
+        response.s3.scripts.append(
+            "%s/%s" % (response.s3.script_dir, script_name)
+        )
+    
+    result = dict(
+        form = TAG[""](
+            # to stop some browsers appying a default table style to unstyled tables
+            XML("""<style type="text/css">table { font-size:inherit; }</style>"""),
+            form
+        ),
+        created_object_id = None,
+        created_object_representation = "",
+        errors = form.errors
+    )
+    
+    accepted = form.accepts(request.vars)#, session):
+    # more validation, don't let other validation errors upset this, 
+    # as the user wants to see all errors in one go
+    def var(name):
+        return request.vars.get(name, None)
+    def check_request_var_matches_value_if_given(var_name, value):
+        if var(var_name):
+            if var(var_name) != value:
+                if not form.errors.has_key(var_name):
+                    form.errors[var_name] = (
+                        T("There is a existing record, but the %(property)s is different. "
+                        "(Clearing this field allows use of the existing record)")
+                    ) % dict(
+                        property = var_name.replace("_", " ")
+                    )
+    def existing(*query):
+        return db(*query).select().first()
+    # look for an office with the same name
+    name = var("name")
+    if name:
+        existing_office = existing(
+            org_office.name == name
+        )
+        if existing_office is not None:
+            for field_name in field_names:
+                check_request_var_matches_value_if_given(
+                    field_name,
+                    getattr(existing_office, field_name)
+                )
+    else:
+        existing_office = None
+    if accepted:
+        # create objects as necessary
+        if form.errors:
+            response.flash = "form is invalid"
+        else:
+            if existing_office is not None:
+                result.update(
+                    created_object_id = existing_office.id,
+                    created_object_representation = existing_office.name
+                )
+                # nothing needs adding?            
+            else:
+                created_office = db.org_office.insert(
+                    **dict(
+                        (field_name, var(field_name)) for field_name in field_names
+                    )
+                )
+                db.commit()
+                result.update(
+                    created_object_id = created_office.id,
+                    created_object_representation = created_office.name
+                )
+            response.flash = T("form accepted")
+
+    result["vars"] = form.vars
+    response.view="inner_form.html"
+    return result
+
 # END =========================================================================

=== modified file 'controllers/project.py'
--- controllers/project.py	2011-08-06 18:24:53 +0000
+++ controllers/project.py	2011-09-08 19:09:00 +0000
@@ -17,7 +17,6 @@
 
 # =============================================================================
 def index():
-
     """ Module's Home Page """
 
     module_name = deployment_settings.modules[module].name_nice
@@ -31,21 +30,18 @@
 
 # =============================================================================
 def need():
-
     """ RESTful CRUD controller """
 
     return s3_rest_controller(module, resourcename)
 
 # -----------------------------------------------------------------------------
 def need_type():
-
     """ RESTful CRUD controller """
 
     return s3_rest_controller(module, resourcename)
 
 # =============================================================================
 def project():
-
     """ RESTful CRUD controller """
 
     tablename = "%s_%s" % (module, resourcename)
@@ -71,65 +67,13 @@
 
 # =============================================================================
 def activity():
-
     """ RESTful CRUD controller """
 
-    tablename = "%s_%s" % (module, resourcename)
-    table = db[tablename]
-
-    tabs = [
-            (T("Details"), None),
-            (T("Requests"), "req"),
-            (T("Documents"), "document"),
-            (T("Photos"), "image"),
-            #(T("Shipments To"), "rms_req"),
-           ]
-    rheader = lambda r: activity_rheader(r, tabs)
-
-    if "create"  in request.args:
-        # Default values (from gap_report) set for fields
-        default_fieldnames = ["location_id", "need_type_id"]
-        for fieldname in default_fieldnames:
-            if fieldname in request.vars:
-                table[fieldname].default = request.vars[fieldname]
-                table[fieldname].writable = False
-                table[fieldname].comment = None
-
-    return s3_rest_controller(module, resourcename,
-                              rheader = rheader)
-
-# -----------------------------------------------------------------------------
-def activity_rheader(r, tabs=[]):
-    """ Resource Header for Activities"""
-
-    if r.representation == "html":
-        record = r.record
-        if record:
-            rheader_tabs = s3_rheader_tabs(r, tabs)
-            rheader = DIV( TABLE(
-                               TR( TH( "%s: " % T("Short Description")),
-                                   record.name,
-                                  ),
-                               TR( TH( "%s: " % T("Location")),
-                                   gis_location_represent(record.location_id),
-                                   TH( "%s: " % T("Duration")),
-                                   "%s to %s" % (record.start_date,
-                                                 record.end_date),
-                                  ),
-                               TR( TH( "%s: " % T("Organization")),
-                                   organisation_represent(record.organisation_id),
-                                   TH( "%s: " % SECTOR),
-                                   shn_org_sector_represent(record.sector_id),
-                                 ),
-                                ),
-                            rheader_tabs
-                            )
-            return rheader
-    return None
+    # Defined in the Model for use from Multiple Controllers for unified menus
+    return response.s3.project_activity_controller()
 
 # =============================================================================
 def task():
-
     """ RESTful CRUD controller """
 
     # Pre-process
@@ -211,7 +155,6 @@
 
 # =============================================================================
 def gap_report():
-
     """ Provide a Report on Gaps between Activities & Needs Assessments """
 
     # Get all assess_summary

=== modified file 'controllers/req.py'
--- controllers/req.py	2011-08-07 08:48:01 +0000
+++ controllers/req.py	2011-09-08 19:09:00 +0000
@@ -37,9 +37,13 @@
         - custom View
     """
 
-    module_name = deployment_settings.modules[module].name_nice
-    response.title = module_name
-    return dict(module_name=module_name)
+    if s3_has_role("ADMIN"):
+        module_name = deployment_settings.modules[module].name_nice
+        response.title = module_name
+        return dict(module_name=module_name)
+
+    else:
+        redirect(URL(f="req_skill"))
 
 # -----------------------------------------------------------------------------
 def is_affiliated():
@@ -65,7 +69,7 @@
 def create():
     """ Redirect to req/create """
     redirect(URL(f="req", args="create"))
-
+    
 # -----------------------------------------------------------------------------
 def req():
     """ REST Controller """
@@ -135,10 +139,10 @@
 
     output["title"] = T("Request Item from Available Inventory")
     output["req_btn"] = A( T("Return to Request"),
-                           _href = URL( c = "req",
-                                        f = "req",
-                                        args = [req_item.req_id, "req_item"]
-                                        ),
+                           _href = URL(c = "req",
+                                       f = "req",
+                                       args = [req_item.req_id, "req_item"]
+                                       ),
                            _class = "action-btn"
                            )
 
@@ -301,7 +305,7 @@
     if r.representation == "html":
         record = r.record
         if record and r.name == "commit":
-            tabs = [(T("Edit Details"), None)]
+            tabs = [(T("Details"), None)]
             
             if record.type == 1:
                 tabs.append((T("Items"), "commit_item"))

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2011-08-06 18:24:53 +0000
+++ controllers/vol.py	2011-09-08 19:09:00 +0000
@@ -2,8 +2,6 @@
 
 """
    Volunteer Module
-   - A 'My Sahana' view of an individual Volunteer's Data, Tasks, etc
-   (Ability for Anonymous users to sign-up as a Volunteer?)
 """
 
 module = request.controller
@@ -19,8 +17,11 @@
 def index():
     """ Module's Home Page """
 
-    # Default to the Personal profile
-    return person()
+    if s3_has_role(STAFF):
+        response.view = "vol/index.html"
+        return dict()
+    else:
+        redirect(URL(c="vol", f="req_skill"))
 
 # -----------------------------------------------------------------------------
 # People
@@ -28,150 +29,41 @@
 def person():
     """
         Person Controller
-        - allows a person to view/update the details held about them
+        - List of Volunteers
     """
 
+    module = "pr"
     resourcename = "person"
+    tablename = "pr_person"
+    table = db[tablename]
 
+    response.s3.filter = (table.volunteer == True)
+    
     # Load Model
     s3mgr.load("pr_address")
-    s3mgr.load("hrm_skill")
-
-    s3.crud.submit_button = T("Next")
-
-    s3mgr.model.add_component("hrm_certification",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_competency",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_credential",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_training",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_experience",
-                              pr_person="person_id")
-
-    # Q: Are volunteers assigned to a specific organisation outside of a specific Event?
-    # Yes, some are: CERT
-    s3mgr.model.add_component("hrm_human_resource",
-                              pr_person="person_id")
-
-    # Configure human resource table
-    # - for Positions
-    tablename = "hrm_human_resource"
-    table = db[tablename]
-    table.type.readable = True
-    table.type.writable = False
-    table.location_id.writable = False # Populated from pr_address
-    table.location_id.readable = False
-    s3mgr.configure(tablename,
-                    list_fields=["id",
-                                 "organisation_id",
-                                 "job_title",
-                                 "status"])
-
-    # Configure person table
-    # - hide fields
-    tablename = "pr_person"
-    table = db[tablename]
-    table.pe_label.readable = False
-    table.pe_label.writable = False
-    table.missing.readable = False
-    table.missing.writable = False
-    table.age_group.readable = False
-    table.age_group.writable = False
-    s3mgr.configure(tablename,
-                    # Wizard: Move to next Tab after Save
-                    update_next = URL(args=["[id]", "address"]),
-                    deletable=False)
-
-    # Configure for personal mode
-    s3.crud_strings[tablename].update(
-        title_display = T("Personal Profile"),
-        title_update = T("Personal Profile"))
-    # People can view their own HR data, but not edit it
-    db.hrm_human_resource.organisation_id.readable = True
-    s3mgr.configure("hrm_human_resource",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_certification",
-                    insertable = True,
-                    editable = True,
-                    deletable = True)
-    s3mgr.configure("hrm_credential",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_competency",
-                    insertable = True,  # Can add unconfirmed
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_training",    # Can add but not provide grade
-                    insertable = True,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_experience",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("pr_group_membership",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    tabs = [(T("Person Details"), None),
-            (T("Addresses"), "address"),
-            (T("Certificates"), "certification"),
-            (T("Contact Information"), "contact"),
-            #(T("Skills"), "competency"),
-            #(T("Credentials"), "credential"),
-            #(T("Trainings"), "training"),
-            #(T("Mission Record"), "experience"),
-            #(T("Positions"), "human_resource"),
-            #(T("Teams"), "group_membership")
-           ]
-
-    # Prepare CRUD
-    def prep(r):
-        if r.interactive:
-            resource = r.resource
-            r.resource.build_query(id=s3_logged_in_person())
-            if resource.count() == 1:
-                resource.load()
-                r.record = resource.records().first()
-                if r.record:
-                    r.id = r.record.id
-            if r.component:
-                if r.component.name == "address":
-                    s3mgr.configure("pr_address",
-                                    create_next = URL(args=[str(r.id), "certification"]))
-                elif r.component.name == "certification":
-                    r.component.table.certificate_id.comment = None
-                    r.component.table.organisation_id.readable = False
-                    s3mgr.configure("hrm_certification",
-                                     create_next = URL(args=[str(r.id), "contact"]))
-                #elif r.component.name == "contact":
-                #    s3mgr.configure("pr_contact",
-                #                   create_next = URL(#                                      args=[str(r.id), ""]))
-
-            return True
-        else:
-            # This controller is only for interactive use
-            redirect(URL(f='default', c="index"))
-    response.s3.prep = prep
-
-    rheader = lambda r, tabs=tabs: vol_rheader(r, tabs)
-
-    output = s3_rest_controller("pr", resourcename,
-                                native=False,
-                                rheader=rheader)
+    s3mgr.load("vol_skill")
+
+    s3mgr.model.add_component("vol_skill",
+                              pr_person="person_id")
+        
+    s3mgr.configure("vol_skill",
+                    deletable = False)
+
+    tabs = [ (T("Basic Details"), None),
+             (T("Skills"), "skill"),
+             (T("Organizational Affiliations"), "organisation"),
+             (T("Address"), "address"),
+             (T("Contact Details"), "contact"),
+        ]
+    
+    rheader = lambda r: vol_pr_rheader(r, tabs=tabs)
+    
+    output = s3_rest_controller(module, resourcename, rheader=rheader)
+    
     return output
 
 # -----------------------------------------------------------------------------
-def vol_rheader(r, tabs=[]):
+def vol_pr_rheader(r, tabs=[]):
     """ Resource headers for component views """
 
     rheader = None
@@ -190,46 +82,2227 @@
                        TH(""),
                        ""),
 
-                    TR(TH("%s: " % T("Date of Birth")),
-                       "%s" % (s3_date_represent(person.date_of_birth) or T("unknown")),
-                       TH(""),
-                       ""),
-
                     ), rheader_tabs)
 
     return rheader
 
-# -----------------------------------------------------------------------------
-# Tasks
-# -----------------------------------------------------------------------------
-def task():
-
-    """ Allow a volunteer to View the details of their own tasks """
-
-    tablename = "project_task"
-    s3mgr.load(tablename)
-    table = db[tablename]
-
-    my_person_id = s3_logged_in_person()
-
-    if not my_person_id:
-        session.error = T("No person record found for current user.")
-        redirect(URL(f="index"))
-
-    table.person_id.default = my_person_id
-
-    response.s3.filter = (table.person_id == my_person_id)
-
-    s3.crud_strings[tablename].title_list = T("My Tasks")
-    s3.crud_strings[tablename].subtitle_list = T("Task List")
-    s3.crud_strings[tablename].msg_list_empty = T("No tasks currently assigned")
-
-    s3mgr.configure(tablename,
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-
-    return s3_rest_controller("project", "task")
+# =============================================================================
+def organisation():
+    """
+        Org Controller for OrgAdmins
+    """
+
+    table = db.org_organisation
+
+    table.acronym.readable = False
+    table.acronym.writable = False
+    org_has_vols_field = table.has_vols
+    org_has_vols_field.default = True
+    response.s3.filter = (org_has_vols_field == True)
+    
+    if "register" in request.vars:
+        response.s3.show_listadd = True
+
+    return organisation_controller(organisation_rheader = organisation_rheader)
+
+# -----------------------------------------------------------------------------
+def organisation_rheader(r, tabs = []):
+    """ Organisation rheader """
+
+    if r.representation == "html":
+
+        if r.record is None:
+            # List or Create form: rheader makes no sense here
+            return None
+        
+        tabs = [(T("Basic Details"), None),
+                (T("Contacts"), "human_resource"),
+                (T("Activities"), "activity")
+                ]
+        rheader_tabs = s3_rheader_tabs(r, tabs)
+
+        organisation = r.record
+
+        rheader = DIV(TABLE(
+            TR(
+                TH("%s: " % T("Organization")),
+                organisation.name,
+                ),
+            ),
+            rheader_tabs
+        )
+        return rheader
+    return None
+
+# =============================================================================
+def vol_sidebar():
+    """ Sidebar for people who aren't logged-in """
+
+    request.args = ["login"]
+    loginform = auth()
+    loginform.attributes["_id"] = "loginform"
+    request.args = []
+
+    response.menu_left = DIV(
+    DIV(
+        P("%s:" % T("Already registered? Sign in here")),
+        #loginform,
+        FORM(
+            LABEL(T("Email")),
+            INPUT(_type="text", _name="email", _title=T("Email")),
+            LABEL(T("Password")),
+            INPUT(_type="password", _name="password", _title=T("Password")),
+            INPUT(_type="submit", _value=T("Sign In"), _title=T("Sign In"),
+                  _class="sign-in-button"),
+            loginform.custom.end,
+        _action="", _enctype="multipart/form-data", _method="post"),
+    _id="sign-in-menu",
+    _class="sub-menu"),
+    DIV(
+        P("%s:" % T("Other Volunteering Opportunities"), _class="osm-title"),
+        UL(
+            LI(
+                A(
+                    DIV("American Red Cross", _class="link-name"),
+                    DIV(
+                        H3("redcrossla.org"),
+                        IMG(_src="/%s/static/img/la/logo_arc.png" % request.application, _width="87", _height="29", _alt="American Red Cross Logo"),
+                        P("Rooted in over a century's tradition of service to the community, the American Red Cross is one of the world's most renowned humanitarian organizations.  American Red Cross volunteers assist with community emergency preparedness, services to the armed forces, emergency and disaster response, blood services, health and safety education, international services and other support volunteer services."),
+                    _class="other-popup"),
+                _href="http://redcrossla.org", _target="_blank",
+                _title="American Red Cross - Link will open to new Window")
+            ),
+            LI(
+                A(
+                    DIV("CERT", _class="link-name"),
+                    DIV(
+                        H3("www.cert-la.com"),
+                        IMG(_src="/%s/static/img/la/certlogo.png" % request.application, _width="51", _height="30", _alt="CERT Logo"),
+                        P("The Los Angeles Fire Department Community Emergency Response Training Program (CERT), has been educating the citizens of Los Angeles in Disaster Preparedness since 1987. "),
+                    _class="other-popup"),
+                _href="http://www.cert-la.com", _target="_blank",
+                _title="CERT - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("LA County Disaster Healthcare Volunteers", _class="link-name"),
+                    DIV(
+                        H3("www.lacountydhv.org"),
+                        IMG(_src="/%s/static/img/la/logo_dhv.png" % request.application, _width="88", _height="30", _alt="Disaster Healthcare Volunteers"),
+                        P("LA County Disaster Healthcare Volunteers, comprised of 4 volunteer units, is led by the County of LA Departments of Health Services, Emergency Medical Services Agency and Public Health Emergency Preparedness and Response Program.  It is specifically for licensed medical, health, mental health, and other volunteers who want to volunteer their professional skills for public health emergencies or other large scale disasters.  Actively licensed health professionals are encouraged to register with one of the four units (MRC LA, LA County Surge Unit, Long Beach MRC, Beach Cities Health District MRC) on the State of California Disaster Healthcare Volunteers (DHV) site in advance of the next disaster."),
+                    _class="other-popup"),
+                _href="http://www.lacountydhv.org", _target="_blank",
+                _title="Disaster Healthcare Volunteers - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("LA Works", _class="link-name"),
+                    DIV(
+                        H3("www.laworks.com"),
+                        IMG(_src="/%s/static/img/la/laworks.png" % request.application, _width="47", _height="40", _alt="LA Works Logo"),
+                        P("L.A. Works is a 501(c)3 nonprofit, volunteer action center that creates and implements hands-on community service projects throughout the greater LA area."),
+                    _class="other-popup"),
+                _href="http://www.laworks.com", _target="_blank",
+                _title="LA Works - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("Public Health Emergency Volunteer Network", _class="link-name"),
+                    DIV(
+                        H3("publichealth.lacounty.gov"),
+                        IMG(_src="/%s/static/img/la/logo_phev.png" % request.application, _width="121", _height="30", _alt="Public Health Emergency Volunteer (PHEV) Network"),
+                        P("The purpose of the Public Health Emergency Volunteer (PHEV) Network is to increase the coordination and collaboration with established community volunteer units that are willing to assist the Department of Public Health in responding to public health emergencies by creating a system to engage, train, and deploy these groups."),
+                    _class="other-popup"),
+                _href="http://publichealth.lacounty.gov/eprp/volview.htm", _target="_blank",
+                _title="Public Health Emergency Volunteer (PHEV) Network - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("VCLA", _class="link-name"),
+                    DIV(
+                        H3("www.vcla.net"),
+                        IMG(_src="/%s/static/img/la/vcla.png" % request.application, _width="40", _height="40", _alt="VCLA Logo"),
+                        P("The Volunteer Center of Los Angeles (VCLA) is one of the largest civic action centers in the nation. We are the volunteer hub that connects people, communities, resources and businesses across Los Angeles. Our mission is to change lives and communities by connecting volunteers with community needs to make Los Angeles a safer, greener, healthier and more hopeful place to live and work."),
+                    _class="other-popup"),
+                _href="http://www.vcla.net", _target="_blank",
+                _title="VCLA - %s" % T("Link will open to new Window"))
+            )
+        ),
+    _class="other-sub-menu")
+    )
+    if session.s3.debug:
+        response.s3.scripts.append( "%s/jquery.hoverIntent.js" % s3_script_dir )
+    else:
+        response.s3.scripts.append( "%s/jquery.hoverIntent.minified.js" % s3_script_dir )
+
+    response.s3.jquery_ready.append("""
+$('.other-popup').css('display', 'none');
+$('.tooltip .message').css('display', 'none');
+$('.other-sub-menu li a').hoverIntent(menuFadeIn, menuFadeOut);
+$('.tooltip a').hoverIntent(tooltipFadeIn, tooltipFadeOut);""")
+    response.s3.js_global.append("""
+// For Popup Panels for the Other Menu
+function menuFadeIn(){$(this).children('.other-popup').fadeIn();}
+function menuFadeOut(){$(this).children('.other-popup').fadeOut();}
+// For Tooltop Panels for the Other Menu
+function tooltipFadeIn(){$(this).next('.message').fadeIn();}
+function tooltipFadeOut(){$(this).next('.message').fadeOut();}""")
+
+# -----------------------------------------------------------------------------
+def register():
+    """ Custom Registration Form """
+
+    auth.messages.submit_button = T("I accept. Create my account.")
+    request.args = ["register"]
+    db[auth.settings.table_user].language.default = T.accepted_language
+    # @ToDo: Make use to the SQLFORM.createform function instead of inserting fields?
+    form = auth()
+    form.attributes["_id"] = "regform"
+    # Custom class for Submit Button
+    form[0][-1][0][0]["_class"] = "accept-button"
+
+    # Cancel button
+    form[0][-1][0].append(BR())
+    #form[0][-1]01].append(INPUT(_type="reset", _value=T("Cancel")))
+    form[0][-1][0].append(INPUT(_type="button",
+                                _value=T("Cancel"),
+                                _class="wide-grey-button",
+                                _onClick="javascript: history.go(-1)"))
+
+    formstyle = s3.crud.formstyle
+
+    # Medical note
+    row = formstyle(id      = "", 
+                    label   = "", 
+                    widget  = P("%s:" % T("If you are a Medical or Health Professional and wish to volunteer in a professional capacity, please register at"),
+                                BR(),
+                                A("LA County Disaster Healthcare Volunteers",
+                                  _href="http://www.lacountydhv.org",
+                                  _target="_blank"),
+                                BR(),
+                                BR(),
+                                "%s:" % T("Individuals or Volunteer Units/Organizations interested in assisting during public health emergencies (i.e. Mass vaccine/medication dispensing sites or PODs) please register at"),
+                                BR(),
+                                A("LA County Department of Public Health Emergency Preparedness and Response Program",
+                                  _href="http://publichealth.lacounty.gov/eprp/volview.htm",
+                                  _target="_blank"),
+                                _style="width: 300px;",
+                                ),
+                    comment = "")
+    form[0].insert(0, row)
+
+    # Middle Name
+    row = formstyle(id      = "middle_name", 
+                    label   = LABEL("%s:" % T("Middle Name")), 
+                    widget  = INPUT(_name="middle_name",
+                                    _id="middle_name",
+                                    _class="string"),
+                    comment = "")
+    form[0][2].append(row)
+
+    # Phone
+    phone_opts = {
+        "SMS": current.deployment_settings.get_ui_label_mobile_phone(),
+        "HOME_PHONE":   T("Home phone"),
+        "WORK_PHONE":   T("Work phone")
+    }
+    if form.errors.phone:
+        phone_error = DIV(form.errors.phone,
+                          _id="phone__error",
+                          _class="error",
+                          _style="display: block;")
+    else:
+        phone_error = ""
+    phone_widget = (INPUT(_name="phone",
+                          _id="",
+                          _class="string"),
+                    SELECT(OPTION(current.deployment_settings.get_ui_label_mobile_phone(), _value="SMS"),
+                           OPTION(T("Home phone"), _value="HOME_PHONE"),
+                           OPTION(T("Work phone"), _value="WORK_PHONE"),
+                           requires=IS_IN_SET(phone_opts),
+                           value="SMS",
+                           _name="phone_type",
+                           _id="phone_type"),
+                    phone_error
+                   )
+    phone_help = DIV(_class="tooltip",
+                     _title="%s|%s" % (T("Phone"),
+                                       T("if you provide your Cell phone then you can choose to subscribe to SMS notifications by selecting 'My Profile' once you have completed registration.")))
+    row = formstyle(id      = "phone", 
+                    label   = LABEL("%s:" % T("Phone"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = phone_widget,
+                    comment = phone_help)
+    form[0][11].append(row)
+
+    # Address
+    if form.errors.address1:
+        address1_error = DIV(form.errors.address1,
+                             _id="address1__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        address1_error = ""
+    row = formstyle(id      = "address1", 
+                    label   = LABEL("%s:" % T("Address 1"),
+                                    SPAN(" *", _class="req")
+                                    ), 
+                    widget  = (INPUT(_name="address1",
+                                     _id="address1",
+                                     _class="string"),
+                               address1_error),
+                    comment = "")
+    form[0][11].append(row)
+    row = formstyle(id      = "address2", 
+                    label   = LABEL("%s:" % T("Address 2")), 
+                    widget  = INPUT(_name="address2",
+                                    _id="address2",
+                                    _class="string"),
+                    comment = "")
+    form[0][11].append(row)
+    row = formstyle(id      = "city", 
+                    label   = LABEL("%s:" % T("City"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = INPUT(_name="city",
+                                    _id     = "city",
+                                    _class  = "string"),
+                    comment = "")
+    form[0][11].append(row)
+    states = S3LocationDropdownWidget(level="L1",
+                                      default="California",
+                                      empty=False)
+    widget = states(db.pr_address.location_id, None)
+    row = formstyle(id      = "state", 
+                    label   = LABEL("%s:" % T("State"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = widget,
+                    comment = "")
+    form[0][11].append(row)
+    if form.errors.zip:
+        zip_error = DIV(form.errors.zip,
+                        _id="zip__error",
+                        _class="error",
+                        _style="display: block;")
+    else:
+        zip_error = ""
+    row = formstyle(id      = "zip", 
+                    label   = LABEL("%s:" % T("Zip"),
+                                    SPAN(" *", _class="req")
+                                   ),
+                    widget  = ( INPUT(_name="zip",
+                                      _id="zip",
+                                      _class="string"),
+                                zip_error
+                                ),
+                    comment = "")
+    form[0][11].append(row)
+
+
+    #form[0][-2].append(TR(TD(LABEL(T("Terms of Service:"),
+    #                               _id="terms_of_service__label"),
+    #                         _class="w2p_fl"),
+    #                      TD(LABEL(TEXTAREA(deployment_settings.get_terms_of_service(),
+    #                                        _onfocus="this.rows=10",
+    #                                        _readonly="readonly",
+    #                                        _style="width:100%;text-align:",
+    #                                        _cols="80", _rows="10"),
+    #                               _id="terms_of_service"),
+    #                         _class="w2p_fw",
+    #                         _colspan="2"),
+    #                      _id="terms_of_service__row"))
+
+    # Eighteen
+    if form.errors.eighteen:
+        eighteen_error = DIV(form.errors.eighteen,
+                             _id="eighteen__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        eighteen_error = ""
+    row = formstyle(id      = "eighteen", 
+                    label   = (LABEL( "%s:" % T("I am 18 or over"),
+                                      SPAN(" *", _class="req"),
+                                      _id="eighteen__label"), 
+                                ),
+                    widget  =  (INPUT(_type="checkbox",
+                                      _value="on",
+                                      _name="eighteen",
+                                      _id="eighteen",
+                                      _class="boolean"),
+                                eighteen_error),
+                    comment = "")
+    form[0][-2].append(row)
+
+    # US Citizen
+    if form.errors.citizen:
+        citizen_error = DIV(form.errors.citizen,
+                             _id="citizen__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        citizen_error = ""
+    row = formstyle(id      = "citizen", 
+                    label   = (LABEL( "%s:" % T("I am a U.S. Citizen"),
+                                      SPAN(" *", _class="req"),
+                                      _id="citizen__label"), 
+                                ),
+                    widget  =  (INPUT(_type="checkbox",
+                                      _value="on",
+                                      _name="citizen",
+                                      _id="citizen",
+                                      _class="boolean"),
+                                citizen_error),
+                    comment = "")
+    form[0][-2].append(row)
+
+    # Privacy Policy
+    row = formstyle(id      = "", 
+                    label   = "", 
+                    widget  = P(XML(T("By clicking on 'I accept' below you are agreeing to the %(privacy_policy)s.") % \
+                                    dict(privacy_policy = A(T("Privacy Policy"),
+                                                        _href = URL(c="default",
+                                                                    f="disclaimer#privacy"),
+                                                        _target = "_blank"
+                                                        )
+                                     )
+                                    ),
+                                _style="width: 300px;",
+                                ),
+                    comment = "")
+    form[0][-2].append(row)
+
+    # Add client-side validation
+    # simplified copy of s3_register_validation()
+    script = "".join(( """
+$('#regform').validate({
+    errorClass: 'req',
+    rules: {
+        first_name: {
+            required: true
+            },
+        last_name: {
+            required: true
+            },
+        phone: {
+            required: true
+        },
+        email: {
+            required: true,
+            email: true
+        },
+        address1: {
+            required: true
+        },
+        city: {
+            required: true
+        },
+        zip: {
+            required: true
+        },
+        password: {
+            required: true
+        },
+        password_two: {
+            required: true,
+            equalTo: '.password:first'
+        },
+        eighteen: {
+            required: true
+        },
+        citizen: {
+            required: true
+        }
+    },
+    messages: {
+        firstname: '""", str(T("Enter your firstname")), """',
+        email: {
+            required: '""", str(T("Please enter a valid email address")), """',
+            minlength: '""", str(T("Please enter a valid email address")), """'
+        },
+        password: {
+            required: '""", str(T("Provide a password")), """'
+        },
+        password_two: {
+            required: '""", str(T("Repeat your password")), """',
+            equalTo: '""", str(T("Enter the same password as above")), """'
+        },
+        eighteen: '""", str(T("If you are under the age 18, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")), """',
+    },
+    errorPlacement: function(error, element) {
+        error.appendTo( element.parent().next() );
+    },
+    submitHandler: function(form) {
+        form.submit();
+    }
+});""" ))
+    response.s3.jquery_ready.append( script )
+
+    if session.s3.debug:
+        response.s3.scripts.append( "%s/jquery.validate.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.js" % s3_script_dir )
+    else:
+        response.s3.scripts.append( "%s/jquery.validate.min.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.min.js" % s3_script_dir )
+
+    response.s3.jquery_ready.append("$('.password:first').pstrength();\n")
+
+    # Add sidebar for login box & other volunteering opportunities
+    vol_sidebar()
+
+    response.s3.donate_cash_link = True
+
+    response.title = T("Register")
+    response.s3.has_required = True
+    
+    return dict(form=form)
+
+# -----------------------------------------------------------------------------
+def register_validation(form):
+    """ Validate the custom fields in registration form """
+    # Terms of Service
+    if "eighteen" not in request.post_vars or request.post_vars.eighteen != "on":
+        form.errors.eighteen = T("If you are under the age 18, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")
+    if "citizen" not in request.post_vars or request.post_vars.citizen != "on":
+        form.errors.citizen = T("If you are not a U.S. citizen, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")
+    # Phone
+    if "phone" in request.post_vars and request.post_vars.phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.phone):
+            form.errors.phone = T("Invalid phone number")
+    else:
+        form.errors.phone = T("Phone number is required")
+    # Address
+    if not request.post_vars.address1:
+        form.errors.address1 = T("Address is required")
+    if not request.post_vars.city:
+        form.errors.city = T("City is required")
+    if not request.post_vars.zip:
+        form.errors.zip = T("Zip is required")
+
+    return
+
+# -----------------------------------------------------------------------------
+def register_onaccept(form):
+    # Usual Registration Tasks
+    # (PR record, Authenticated Role, Contacts)
+    person = auth.s3_register(form)
+
+    # LA-specific
+    table = db.pr_person
+    query = (table.id == person)
+
+    db(query).update(volunteer=True,
+                     middle_name=request.post_vars.middle_name)
+
+    pe = db(query).select(table.pe_id,
+                          limitby=(0, 1)).first().pe_id
+
+    # Phone
+    table = db.pr_contact
+    phone = request.post_vars.phone
+    phone_type = request.post_vars.phone_type
+    # Don't auto-subscribe to SMS (priority 10)
+    table.insert(pe_id = pe,
+                 contact_method = phone_type,
+                 value = phone,
+                 priority=10)
+
+    # Address
+    table = db.gis_location
+    address1 = request.post_vars.address1
+    address2 = request.post_vars.address2
+    if address2:
+        address = "%s\n%s" % (address1,
+                              address2)
+    else:
+        address = address1
+    city = request.post_vars.city
+    location = request.post_vars.location_id
+    state = db(table.id == location).select(table.id,
+                                            table.name,
+                                            cache=gis.cache,
+                                            limitby=(0, 1)).first()
+    if state:
+        statename = state.name
+    else:
+        # Duff data - not USA
+        statename = "unknown"
+    zip = request.post_vars.zip
+    county = ""
+    if city:
+        query = (table.name == city) & \
+                (table.level == "L3") & \
+                (table.path.like("%%/%s/%%" % state))
+        _city = db(query).select(table.id,
+                                 table.parent,
+                                 limitby=(0, 1)).first()
+        if _city:
+            if _city.parent != state:
+                query = (table.id == _city.parent)
+                county = db(query).select(table.name,
+                                          limitby=(0, 1)).first().name
+        elif state:
+            _city = table.insert(name=city, level="L3", parent=state.id)
+            gis.update_location_tree(_city, state.id)
+        else:
+            usa = db(table.code == "US").select(table.id,
+                                                limitby=(0, 1)).first().id
+            _city = table.insert(name=city, level="L3", parent=usa)
+            gis.update_location_tree(_city, usa)
+    else:
+        _city = None
+    location = table.insert(addr_street=address, addr_postcode=zip, parent=_city)
+    gis.update_location_tree(location, _city)
+    s3mgr.load("pr_address")
+    table = db.pr_address
+    table.insert(pe_id = pe,
+                 location_id = location,
+                 address=address,
+                 postcode=zip,
+                 L3=city,
+                 L2=county,
+                 L1=statename,
+                 L0="United States")
+
+# -----------------------------------------------------------------------------
+auth.settings.register_onvalidation = register_validation
+auth.settings.register_onaccept = register_onaccept
+auth.settings.register_next = URL(c="vol", f="skill", args=["create"])
+
+# Organisation widget for use in Registration Screen
+# NB User Profile is only editable by Admin - using User Management
+org_widget = IS_ONE_OF(db, "org_organisation.id",
+                       organisation_represent,
+                       orderby="org_organisation.name",
+                       sort=True)
+if deployment_settings.get_auth_registration_organisation_mandatory():
+    _table_user.organisation_id.requires = org_widget
+else:
+    _table_user.organisation_id.requires = IS_NULL_OR(org_widget)
+
+# =============================================================================
+def profile():
+    """ Custom Profile Screen """
+
+    if not auth.is_logged_in():
+        redirect(URL(f="user", args="login"))
+    elif s3_has_role(ORG_VOL):
+        #return organisation_profile()
+        redirect(URL(f="organisation", args=[auth.user.organisation_id]))
+
+    # Only show admin-set fields if there is data
+    table = db.auth_user
+    if not auth.user.organisation_id:
+        # Not relevant to Volunteers
+        table.organisation_id.readable = False
+    if not auth.user.site_id:
+        # Only relevant to Field Staff
+        table.site_id.readable = False
+
+    # Validate the custom fields
+    auth.settings.profile_onvalidation = profile_validation
+
+    # Process the custom fields
+    auth.settings.profile_onaccept = profile_onaccept
+
+    auth.messages.profile_save_button = "Save"
+
+    request.args = ["profile"]
+    form = auth()
+
+    # Custom class for Submit Button
+    form[0][-1][1][0]["_class"] = "submit-button"
+
+    # Lookup the Person
+    id = auth.s3_logged_in_person()
+    table = db.pr_person
+    person = db(table.id == id).select(table.pe_id,
+                                       table.middle_name,
+                                       table.volunteer,
+                                       limitby=(0, 1)).first()
+
+    row = TR(TD(LABEL("%s:" % table.middle_name.label)),
+             TD(INPUT(_name="middle_name",
+                      _id="middle_name",
+                      _class="string",
+                      _value=person.middle_name)))
+    form[0][0].append(row)
+
+    # Lookup the Contacts
+    table = db.pr_contact
+    query = (table.pe_id == person.pe_id) & \
+            (table.deleted == False)
+    contacts = db(query).select(table.contact_method,
+                                table.value,
+                                table.priority)
+    cell = ""
+    home = ""
+    work = ""
+    sms_enabled = False
+    email_enabled = True
+    for contact in contacts:
+        if contact.contact_method == "SMS":
+            cell = contact.value
+            if contact.priority == 10:
+                sms_enabled = False
+            else:
+                sms_enabled = True
+        elif contact.contact_method == "EMAIL":
+            if contact.priority == 10:
+                email_enabled = False
+            else:
+                email_enabled = True
+        elif contact.contact_method == "HOME_PHONE":
+            home = contact.value
+        elif contact.contact_method == "WORK_PHONE":
+            work = contact.value
+
+    # Cell phone
+    if form.errors.mobile:
+        cell_error = DIV(form.errors.mobile,
+                         _id="mobile__error",
+                         _class="error",
+                         _style="display: block;")
+    else:
+        cell_error = ""
+    row = TR(TD(LABEL("%s:" % msg.CONTACT_OPTS["SMS"])),
+             TD(INPUT(_name="mobile",
+                      _id="mobile",
+                      _class="string",
+                      _value=cell),
+                cell_error))
+    form[0][2].append(row)
+    # @ToDo: JS validation
+
+    if person.volunteer:
+        # Home phone
+        if form.errors.home_phone:
+            home_phone_error = DIV(form.errors.home_phone,
+                                   _id="home_phone__error",
+                                   _class="error",
+                                   _style="display: block;")
+        else:
+            home_phone_error = ""
+        row = TR(TD(LABEL("%s:" % msg.CONTACT_OPTS["HOME_PHONE"])),
+                 TD(INPUT(_name="home_phone",
+                          _id="home_phone",
+                          _class="string",
+                          _value=home),
+                    home_phone_error))
+        form[0][2].append(row)
+        # @ToDo: JS validation
+        
+        # Work phone
+        if form.errors.work_phone:
+            work_phone_error = DIV(form.errors.work_phone,
+                                   _id="work_phone__error",
+                                   _class="error",
+                                   _style="display: block;")
+        else:
+            work_phone_error = ""
+        row = TR(TD(LABEL("%s:" % msg.CONTACT_OPTS["WORK_PHONE"])),
+                 TD(INPUT(_name="work_phone",
+                          _id="work_phone",
+                          _class="string",
+                          _value=work),
+                    work_phone_error))
+        form[0][2].append(row)
+        # @ToDo: JS validation
+        
+        # Lookup the Address
+        table = db.pr_address
+        query = (table.pe_id == person.pe_id) & \
+                (table.deleted == False)
+        address = db(query).select(table.location_id,
+                                   limitby=(0, 1)).first()
+        address1 = ""
+        address2 = ""
+        city = ""
+        state = ""
+        zip = ""
+        if address:
+            table = db.gis_location
+            query = (table.id == address.location_id)
+            location = db(query).select(table.id,
+                                        table.path,
+                                        table.parent,
+                                        table.addr_street,
+                                        table.addr_postcode,
+                                        limitby=(0, 1)).first()
+            if location:
+                try:
+                    address1, address2 = location.addr_street.split("\n", 1)
+                except ValueError:
+                    address1 = location.addr_street
+                zip = location.addr_postcode
+                results = gis.get_parent_per_level(None, location.id, location)
+                try:
+                    city = results["L3"].name
+                #except KeyError, AttributeError:
+                except:
+                    pass
+                try:
+                    state = results["L1"].name
+                #except KeyError, AttributeError:
+                except:
+                    pass
+
+        if form.errors.address1:
+            address1_error = DIV(form.errors.address1,
+                                 _id="address1__error",
+                                 _class="error",
+                                 _style="display: block;")
+        else:
+            address1_error = ""
+        row = TR(TD(LABEL("%s:" % T("Address 1"))),
+                 TD(INPUT(_name="address1",
+                          _id="address1",
+                          _class="string",
+                          _value=address1),
+                    address1_error))
+        form[0][2].append(row)
+        row = TR(TD(LABEL("%s:" % T("Address 2"))),
+                 TD(INPUT(_name="address2",
+                          _id="address2",
+                          _class="string",
+                          _value=address2)))
+        form[0][2].append(row)
+        row = TR(TD(LABEL("%s:" % T("City"))),
+                 TD(INPUT(_name="city",
+                          _id="city",
+                          _class="string",
+                          _value=city)))
+        form[0][2].append(row)
+        states = S3LocationDropdownWidget(level="L1",
+                                          default=state or "California",
+                                          empty=False)
+        widget = states(db.pr_address.location_id, None)
+        row = TR(TD(LABEL("%s:" % T("State"))),
+                 TD(widget))
+        form[0][2].append(row)
+        if form.errors.zip:
+            zip_error = DIV(form.errors.zip,
+                            _id="zip__error",
+                            _class="error",
+                            _style="display: block;")
+        else:
+            zip_error = ""
+        row = TR(TD(LABEL("%s:" % T("Zip"))),
+                 TD(INPUT(_name="zip",
+                          _id="zip",
+                          _class="string",
+                          _value=zip),
+                    zip_error))
+        form[0][2].append(row)
+
+        # Notifications
+        div = DIV(TR(TD(LABEL("%s:" % T("Notifications"))),
+                     TD()
+                    ),
+                  TR(TD(T("Receive Notifications via Email?")),
+                     TD(INPUT(_type="checkbox",
+                        _value="on",
+                        value="on" if email_enabled else "",
+                        _name="sub_email",
+                        _id="sub_email",
+                        _class="boolean"))
+                    ),
+                  TR(TD(T("Receive Notifications via SMS?")),
+                     TD(INPUT(_type="checkbox",
+                        _value="on",
+                        value="on" if sms_enabled else "",
+                        _name="sub_sms",
+                        _id="sub_sms",
+                        _class="boolean")),
+                     TD(DIV(_class="tooltip",
+                            _title="%s|%s" % (T("Receive Notifications via SMS"),
+                                              T("Note that this will may incur costs from your carrier."))))
+                    )
+                )
+        form[0][-2].append(div)
+    
+        # Affiliated Orgs
+        s3mgr.load("vol_organisation")
+        table = db.vol_organisation
+        orgs = db(table.pe_id == person.pe_id).select(table.organisations_id,
+                                                      limitby=(0, 1)).first()
+        if orgs:
+            orgs = orgs.organisations_id
+            table = db.org_organisation
+            if orgs:
+                _orgs = db(table.id.belongs(orgs)).select(table.acronym)
+            else:
+                _orgs = []
+            orgs = []
+            for org in _orgs:
+                orgs.append(org.acronym)
+        else:
+            orgs = []
+
+        div = DIV(TR(TD(),
+                     TD(B(T("Affiliation with other volunteer organizations")))),
+                  TR(TD(P(T("Check all that apply"),
+                          _class="red")),
+                     TD(P(T("Are you affiliated with other volunteer organizations?")))),
+                  TR(TD("American Red Cross"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "ARC" in orgs else "",
+                              _name="arc",
+                              _id="arc",
+                              _class="boolean"))),
+                  TR(TD("CERT"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "CERT" in orgs else "",
+                              _name="cert",
+                              _id="cert",
+                              _class="boolean"))),
+                  TR(TD("Disaster Healthcare Volunteers"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "DHV" in orgs else "",
+                              _name="dhv",
+                              _id="dhv",
+                              _class="boolean"))),
+                  TR(TD("LA Works"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "LAW" in orgs else "",
+                              _name="laworks",
+                              _id="laworks",
+                              _class="boolean"))),
+                  TR(TD("Volunteer Center of Los Angeles"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "VCLA" in orgs else "",
+                              _name="vcla",
+                              _id="vcla",
+                              _class="boolean"))),
+                )
+        form[0][-2].append(div)
+
+        # Skills
+        # - separate screen
+
+    response.title = T("Profile")
+    response.s3.has_required = True
+    
+    return dict(form=form)
+
+# -----------------------------------------------------------------------------
+def profile_validation(form):
+    """ Validate the custom fields in profile form """
+
+    if s3_has_role(STAFF):
+        volunteer = False
+    else:
+        volunteer = True
+
+    # Mobile Phone
+    if "mobile" in request.post_vars and request.post_vars.mobile:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.mobile):
+            form.errors.mobile = T("Invalid phone number")
+    elif "sub_sms" in request.post_vars and request.post_vars.sub_sms == "on":
+        form.errors.mobile = T("Cell phone number is required for SMS notifications")
+    # Home Phone
+    if "home_phone" in request.post_vars and request.post_vars.home_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.home_phone):
+            form.errors.home_phone = T("Invalid phone number")
+    # Work Phone
+    if "work_phone" in request.post_vars and request.post_vars.work_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.work_phone):
+            form.errors.work_phone = T("Invalid phone number")
+    # Address
+    if volunteer and not request.post_vars.address1:
+        form.errors.address1 = T("Address is required")
+    if volunteer and not request.post_vars.zip:
+        form.errors.zip = T("Zip is required")
+
+    return
+
+# -----------------------------------------------------------------------------
+def profile_onaccept(form):
+    """ Process the custom fields """
+
+    if s3_has_role(STAFF):
+        volunteer = False
+    else:
+        volunteer = True
+
+    table = db.pr_person
+    query = (table.id == auth.s3_logged_in_person())
+    db(query).update(middle_name=request.post_vars.middle_name)
+    pe = db(query).select(table.pe_id,
+                          limitby=(0, 1)).first().pe_id
+    
+    if volunteer:
+        # Contacts / Notifications
+        if "sub_email" in request.post_vars and \
+            request.post_vars.sub_email == "on":
+            email_enabled = True
+        else:
+            email_enabled = False
+        if "sub_sms" in request.post_vars and \
+            request.post_vars.sub_sms == "on":
+            sms_enabled = True
+        else:
+            sms_enabled = False
+        home_phone = request.post_vars.home_phone
+        work_phone = request.post_vars.work_phone
+    email = request.post_vars.email
+    cell = request.post_vars.mobile
+    table = db.pr_contact
+    if email:
+        utable = db.auth_user
+        query = (utable.id == auth.user.id)
+        _email = db(query).select(utable.email,
+                                  limitby=(0, 1)).first().email
+        if not _email == email:
+            # Email has changed
+            # Check that the new email doesn't clash
+            query2 = (utable.email == email)
+            test = db(query2).select(utable.id,
+                                     limitby=(0, 1)).first()
+            if not test:
+                # update auth_user
+                db(query).update(email=email)
+                # update pr_contact
+                query = (table.value == _email)
+                if volunteer:
+                    priority = 1 if email_enabled else 10
+                    db(query).update(value=email, priority=priority)
+                else:
+                    db(query).update(value=email)
+            else:
+                # Existing .requires validation prevents the user from reusing
+                # an existing email
+                pass
+        elif volunteer:
+            # Just update the notifications
+            query = (table.value == email)
+            priority = 1 if email_enabled else 10
+            db(query).update(priority=priority)
+
+    _cell = ""
+    _home_phone = ""
+    _work_phone = ""
+    query = (table.pe_id == pe) & \
+            (table.deleted == False)
+    contacts = db(query).select(table.contact_method,
+                                table.value)
+    for contact in contacts:
+        if contact.contact_method == "SMS":
+            _cell = contact.value
+        elif contact.contact_method == "HOME_PHONE":
+            _home_phone = contact.value
+        elif contact.contact_method == "WORK_PHONE":
+            _work_phone = contact.value
+    table = db.pr_contact
+    base_query = (table.pe_id == pe)
+    if volunteer:
+        priority = 1 if sms_enabled else 10
+        if _cell:
+            # Update existing record
+            query = base_query & (table.value == _cell)
+            db(query).update(value=cell, priority=priority)
+        elif cell:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="SMS", value=cell,
+                         priority=priority)
+        if _home_phone:
+            # Update existing record
+            query = base_query & (table.value == _home_phone)
+            db(query).update(value=home_phone)
+        elif home_phone:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="HOME_PHONE",
+                         value=home_phone)
+        
+        if _work_phone:
+            # Update existing record
+            query = base_query & (table.value == _work_phone)
+            db(query).update(value=work_phone)
+        elif work_phone:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="WORK_PHONE",
+                         value=work_phone)
+        
+        # Address
+        address1 = request.post_vars.address1
+        address2 = request.post_vars.address2
+        if address2:
+            address = "%s\n%s" % (address1, address2)
+        else:
+            address = address1
+        zip = request.post_vars.zip
+        city = request.post_vars.city
+        state = request.post_vars.location_id
+        table = db.gis_location
+        statename = db(table.id == state).select(table.name,
+                                                 cache=gis.cache,
+                                                 limitby=(0, 1)).first().name
+        county = ""
+        if city:
+            query = (table.name == city) & \
+                    (table.level == "L3") & \
+                    (table.path.like("%%/%s/%%" % state))
+            _city = db(query).select(table.id,
+                                     table.parent,
+                                     limitby=(0, 1)).first()
+            if _city:
+                if _city.parent != state:
+                    query = (table.id == _city.parent)
+                    county = db(query).select(table.name,
+                                              limitby=(0, 1)).first().name
+            else:
+                _city = table.insert(name=city, level="L3", parent=state)
+                gis.update_location_tree(_city, state)
+        else:
+            _city = None
+        table = db.pr_address
+        query = (table.pe_id == pe) & \
+                (table.deleted == False)
+        test = db(query).select(table.location_id,
+                                limitby=(0, 1)).first()
+        if test:
+            db(query).update(address=address,
+                             postcode=zip,
+                             L3=city,
+                             L2=county,
+                             L1=statename,
+                             L0="United States")
+            table = db.gis_location
+            location = test.location_id
+            query = (table.id == location)
+            db(query).update(addr_street=address,
+                             addr_postcode=zip,
+                             parent=_city)
+            gis.update_location_tree(location, _city)
+
+        # Affiliated Organisations
+        # Also in models/vol.py
+        vol_orgs = ["ARC", "CERT", "DHV", "LAW", "VCLA"]
+        table = db.org_organisation
+        query = (table.acronym.belongs(vol_orgs))
+        orgs = db(query).select(table.id,
+                                table.acronym,
+                                cache=(cache.ram, 60))
+        for org in orgs:
+            if org.acronym == "ARC":
+                ARC = org.id
+            elif org.acronym == "CERT":
+                CERT = org.id
+            elif org.acronym == "DHV":
+                DHV = org.id
+            elif org.acronym == "LAW":
+                LAW = org.id
+            elif org.acronym == "VCLA":
+                VCLA = org.id
+        orgs = []
+        if "arc" in request.post_vars and request.post_vars.arc == "on":
+            orgs.append(ARC)
+        if "cert" in request.post_vars and request.post_vars.cert == "on":
+            orgs.append(CERT)
+        if "dhv" in request.post_vars and request.post_vars.dhv == "on":
+            orgs.append(DHV)
+        if "laworks" in request.post_vars and \
+           request.post_vars.laworks == "on":
+            orgs.append(LAW)
+        if "vcla" in request.post_vars and request.post_vars.vcla == "on":
+            orgs.append(VCLA)
+        s3mgr.load("vol_organisation")
+        table = db.vol_organisation
+        query = (table.pe_id == pe)
+        test = db(query).select(table.id,
+                                limitby=(0, 1)).first()
+        if test:
+            db(query).update(organisations_id = orgs)
+        else:
+            table.insert(pe_id = pe,
+                         organisations_id = orgs,
+                         owned_by_user = auth.user.id)
+
+    else:
+        # Not a volunteer: EOC staff
+        if _cell:
+            # Update existing record
+            query = base_query & (table.value == _cell)
+            db(query).update(value=cell)
+        elif cell:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="SMS", value=cell)
+
+# -----------------------------------------------------------------------------
+# Skills
+# -----------------------------------------------------------------------------
+def skill():
+    """
+        Collect a Volunteer's Skills
+    """
+
+    tablename = "vol_skill"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    person = auth.s3_logged_in_person()
+    table.person_id.default = person
+    table.person_id.writable = table.person_id.readable = False
+    
+    s3mgr.configure(tablename,
+                    # Workflow: Prompt for creating Emergency Contacts after adding Skills
+                    create_next = URL(f="contact", args=["my"]),
+                    update_next = URL(f="skill", args=["my"]),
+                    deletable = False,
+                    listadd = False)
+
+    # Parse the request
+    if "my" in request.args:
+        query = (table.person_id == person)
+        record = db(query).select(table.id,
+                                  limitby=(0, 1),
+                                  cache = gis.cache).first()
+        if record:
+            r = s3mgr.parse_request(args=[str(record.id)])
+        else:
+            r = s3mgr.parse_request(args=["create"])
+    else:
+        r = s3mgr.parse_request()
+
+    # Execute the request
+    output = r()
+
+    response.title = T("My Skills")
+    return output
+
+# -----------------------------------------------------------------------------
+# Contacts
+# -----------------------------------------------------------------------------
+def contact():
+    """
+        Emergency Contacts for the volunteer
+    """
+
+    tablename = "vol_contact"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    person = auth.s3_logged_in_person()
+    table.person_id.default = person
+    table.person_id.writable = table.person_id.readable = False
+    
+    s3mgr.configure(tablename,
+                    create_next = URL(f="req_skill"),
+                    update_next = URL(f="contact", args=["my"]),
+                    deletable = False,
+                    listadd = False)
+
+    # Parse the request
+    if "my" in request.args:
+        query = (table.person_id == person)
+        record = db(query).select(table.id,
+                                  limitby=(0, 1),
+                                  cache = gis.cache).first()
+        if record:
+            r = s3mgr.parse_request(args=[str(record.id)])
+        else:
+            r = s3mgr.parse_request(args=["create"])
+    else:
+        r = s3mgr.parse_request()
+
+    # Execute the request
+    output = r()
+
+    response.title = T("Emergency Contact")
+    return output
+
+# -----------------------------------------------------------------------------
+# Assignments
+# - My Assignments menu
+# -----------------------------------------------------------------------------
+def assignment():
+
+    """ Allow a Volunteer/Org to View the details of their own assignments """
+
+    tablename = "vol_assignment"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    if auth.user.organisation_id:
+        response.s3.filter = (table.organisation_id == auth.user.organisation_id)
+        # Control List View
+        table.person_id.readable = False
+        table.number.readable = True
+        table.number.label = T("Number of Volunteers Committed")
+    else:
+        my_person_id = s3_logged_in_person()
+        # Control List View
+        table.person_id.readable = False
+
+        if not my_person_id:
+            session.error = T("No person record found for current user.")
+            redirect(URL(f="index"))
+
+        response.s3.filter = (table.person_id == my_person_id)
+
+        # Filter for current/past assignments
+        sel = ((table.checkout == None) |
+               (table.checkout >= request.utcnow) |
+               (table.task_evaluation == None))
+        s3.crud_strings[tablename].update(
+            subtitle_list = T("Current Assignments"))
+        if "show" in request.get_vars:
+            show = request.get_vars["show"]
+            if show == "past":
+                sel = ((table.checkout < request.utcnow) &
+                       (table.task_evaluation != None))
+                s3.crud_strings[tablename].update(
+                    subtitle_list = T("Past Assignments"),
+                    msg_no_match = T("No past assigments"))
+        response.s3.filter &= sel
+
+    # Post-process
+    def postp(r, output):
+        if r.interactive:
+            response.s3.actions = [dict(
+                        url = URL(c = "vol",
+                                  f = "req",
+                                  args = ["assignment", "[id]"]),
+                        _class = "action-btn",
+                        label = str(T("Details"))
+                    )]
+        return output
+    response.s3.postp = postp
+
+    output = s3_rest_controller("vol", "assignment")
+    return output
+
+# -----------------------------------------------------------------------------
+# Requests
+# -----------------------------------------------------------------------------
+# ---------------------------------------------------------------------
+def vol_req_rheader(r):
+    """
+        Resource Header for Requests
+        - Volunteer view
+        - inc Volunteer Roster
+    """
+
+    if r.representation == "html":
+        if r.name == "req":
+            record = r.record
+            if record:
+                if s3_has_role(STAFF):
+                    # Show Tabs on Roster
+                    tabs = [(T("Details"), None)]
+                    if record.type == 3 and deployment_settings.has_module("hrm"):
+                        tabs.append((T("Requested Volunteers"), "req_skill"))
+                    if deployment_settings.has_module("doc"):
+                        tabs.append((T("Documents"), "document"))
+                    #if deployment_settings.get_req_use_commit():
+                    #    tabs.append((T("Commitments"), "commit"))
+                    tabs.append((T("Roster"), "assignment"))
+                    try:
+                        # Remove the default_type from URLs as set within respective controller
+                        r.vars.pop("default_type")
+                    except KeyError:
+                        pass
+                    rheader_tabs = s3_rheader_tabs(r, tabs)
+                elif not r.component:
+                    # Volunteers should only ever access Requests via the Components
+                    return
+
+                table = db.req_req_skill
+                query = (table.req_id == record.id)
+                srecord = db(query).select(table.skill_id,
+                                           table.quantity,
+                                           table.quantity_commit,
+                                           limitby=(0, 1)).first()
+                if srecord:
+                    skills = response.s3.hrm_multi_skill_represent(srecord.skill_id)
+                    requested = srecord.quantity
+                    required = srecord.quantity - srecord.quantity_commit
+                else:
+                    skills = requested = required = ""
+                
+                address = shn_site_represent(record.site_id, address=True)
+                #table = db.org_office
+                #query = (table.id == record.site_id)
+                #srecord = db(query).select(table.name,
+                #                           table.address,
+                #                           table.postcode,
+                #                           table.L3,
+                #                           table.L1,
+                #                           limitby=(0, 1)).first()
+                #if srecord:
+                #    location = T("%(site)s in %(location)s") % dict(site = srecord.name,
+                #                                                    location = record.location)
+                #    ltable = db.gis_location
+                #    query = (ltable.name == srecord.L1)
+                #    state = db(query).select(ltable.code,
+                #                             limitby=(0, 1),
+                #                             cache=gis.cache).first()
+                #    if state:
+                #        statecode = state.code
+                #    else:
+                #        # Not valid US data (e.g. prepopulate)
+                #        statecode = None
+                #    address = "%s, %s %s %s" % (srecord.address,
+                #                                srecord.L3,
+                #                                statecode,
+                #                                srecord.postcode)
+                #else:
+                #    location = address = ""
+
+                table = db.hrm_human_resource
+                query = (table.id == record.request_for_id)
+                person = db(query).select(table.person_id,
+                                          limitby=(0, 1)).first()
+                phone = email = report_to = ""
+                if person:
+                    report_to = person_represent(person.person_id)
+                    
+                    # @ToDo: Investigate if these db calls can be done together with a join? 
+                    table = db.pr_person
+                    query = (table.id == person.person_id)
+                    pe = db(query).select(table.pe_id,
+                                          limitby=(0, 1)).first()
+                    if pe:
+                        table = db.pr_contact
+                        query = (table.pe_id == pe.pe_id) & \
+                                (table.contact_method.belongs(("SMS", "EMAIL")))
+                        contacts = db(query).select(table.contact_method,
+                                                    table.value)
+                        for contact in contacts:
+                            if contact.contact_method == "SMS":
+                                phone = contact.value
+                            elif contact.contact_method == "EMAIL":
+                                email = contact.value
+
+                if s3_has_role(STAFF):
+                    subtitle = T("Request Details")
+                    buttons = DIV(
+                        BUTTON(T("PRINT ROSTER"),
+                               _class="wide-grey-button",
+                               _onClick="javascript: window.location='%s'" % \
+                                    URL(c=request.controller,
+                                        f="req",
+                                        args=[record.id,
+                                              "assignment",
+                                              "print"])),
+                        BUTTON(T("CANCEL REQUEST"),
+                               _class="wide-grey-button",
+                               _onClick="javascript: window.location='%s'" % \
+                                    URL(c=request.controller,
+                                        f="req",
+                                        args=[record.id,
+                                              "cancel"]))
+                        )
+                    textbox = ""
+                else:
+                    subtitle = T("Volunteer Assignment Details")
+                    buttons = ""
+                    if r.component.name == "application":
+                        textbox = T("When you volunteer with Give2LA, you are an extension of the good will of the City of Los Angeles. For many survivors, volunteers are their first point of contact. Your respect, courtesy and sensitivity during these difficult times are vital. In addition, following directions, procedures, and processes given to you by your supervisor are essential; failure to do so may exclude you from future volunteer assignments.")
+                    else:
+                        give2la_forms = A( T("Give2LA Registration Forms"),
+                                           _href = URL(c="static",
+                                                       f="Volunteer_Ethics_and_Conduct.pdf")
+                                          )
+                        textbox = DIV(P(T("Thank you for Volunteering. Please print out your Volunteer Assignment Form as it contains important information about who, when, and where to report to for your Volunteer Assignment.")),
+                                      P(XML(T("As a volunteer working to assist disaster survivors and in disaster recovery efforts, you will be required to fill out and sign the %(give2la_forms)s") %
+                                            dict(give2la_forms = give2la_forms) ),
+                                        "."),
+                                      P(T("Please let us know in advance if you cannot report for your Volunteer Assignment by calling the Report To Contact listed below.")),
+                                      )
+                
+                if record.date_required:
+                    time_req = s3_time_represent(record.date_required, utc=True)
+                else:
+                    time_req = ""
+                if record.date_required_until:
+                    time_until = s3_time_represent(record.date_required_until, utc=True)
+                else:
+                    time_until = ""
+
+                rheader = DIV( 
+                                H2(subtitle, _class="paper-strip"),
+                                buttons,
+                                DIV(
+                                    TABLE(
+                                       TR(
+                                        TH(T("Request Number")),
+                                        TH(T("Task")),
+                                        TH(T("Date+Time")),
+                                        TH(T("Required Skills")),
+                                        TH(T("Request Priority")),
+                                        TH(T("Location")),
+                                        TH(T("Number of Volunteers"),BR(),T("(Still Required/Total Requested)")), # (assigned/required)
+                                        ),
+                                       TR(
+                                        TD(record.request_number),
+                                        TD(record.purpose),
+                                        TD(B(s3_date_represent_utc(record.date_required)),
+                                           BR(),
+                                           "%s - %s" % (time_req,
+                                                        time_until),
+                                           ),
+                                        TD(skills),
+                                        TD(response.s3.req_priority_represent(record.priority) ),
+                                        TD(record.location or ""),
+                                        TD(B(required),
+                                           " / %s" % requested,
+                                           _class="red")
+                                        ),
+                                    ),
+                                _id="table-container"
+                                ),
+                                TABLE(
+                                       TR(
+                                        TH(T("Report To")),
+                                        TD(report_to,
+                                           BR(),
+                                           "%s: %s" % (T("Phone"),
+                                                       phone),
+                                           BR(),
+                                           "%s: %s" % (T("Email"),
+                                                       email)),
+                                        ),
+                                       TR(
+                                        TH(T("Volunteering Location")),
+                                        TD(#location,
+                                           #BR(),
+                                           address),
+                                        ),
+                                        TR(
+                                        TH(T("Comments")),
+                                        TD(record.comments),
+                                        ),
+                                    ),
+                              P(textbox),
+                            )
+                if "assignment" in request.args:
+                    if s3_has_role(STAFF):
+                        # Volunteer Roster
+                        response.s3.rfooter = DIV(
+                            BUTTON(T("CHECK-IN ALL"),
+                                   _class="wide-grey-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=[record.id,
+                                                  "assignment",
+                                                  "checkin"])),
+                            BUTTON(T("CHECK-OUT ALL"),
+                                   _class="wide-grey-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=[record.id,
+                                                  "assignment",
+                                                  "checkout"]))
+                            )
+                    else:
+                        # Volunteer Assignment
+                        assignment = r.component_id
+                        rheader.append(
+                          DIV(
+                            BUTTON(T("PRINT VOLUNTEER ASSIGNMENT FORM"),
+                                   _class="accept-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=[record.id,
+                                                  "assignment",
+                                                  assignment,
+                                                  "print"])),
+                            # Also in controllers/don.py - DRY
+                            A(IMG(_src="/%s/static/img/get_adobe_reader.png" % request.application,
+                                  _title="%s - %s" % (T("Get Adobe Reader"),
+                                                      T("This link will open a new browser window.")),
+                                  _alt=T("Get Adobe Reader"),
+                                  _width=158,
+                                  _height=39,
+                                  _style="float:right;"),
+                              _href="http://www.adobe.com/products/acrobat/readstep2.html",
+                              _target="_blank"),
+                            BR(),
+                            BUTTON(T("CANCEL ASSIGNMENT"),
+                                   _class="wide-grey-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=[record.id,
+                                                  "assignment",
+                                                  assignment,
+                                                  "delete"]))
+                            )
+                        )
+                if s3_has_role(STAFF):
+                    rheader.append(rheader_tabs)
+
+                return rheader
+    return None
+
+def req():
+    """ REST Controller """
+
+    s3mgr.load("req_req")
+    default_type = 3
+    request.vars["default_type"] = 3 
+    
+    if "skill_id" in request.get_vars:
+        # Look up the Request from the Skill component
+        # (since that is what is available to us within the dataTables row)
+        table = db.req_req_skill
+        query = (table.id == request.vars.skill_id)
+        req = db(query).select(table.req_id,
+                               limitby=(0, 1)).first()
+        if not req:
+            session.error = T("Invalid Request!")
+            redirect(URL(f="req_skill", args=[], vars={}))
+        # @ToDo: A nicer way to do this (without a 2nd request)
+        # simply amending request.args doesn't work
+        # Need to rewrite to not use prep/postp but rather process r() directly
+        redirect(URL(args = [req.req_id, "application", "create"],
+                     vars={}))
+
+    if "document" in request.args:
+        s3mgr.load("doc_document")
+
+    req_table = db.req_req
+    s3mgr.configure(req_table,
+                    deletable=False)
+
+    type_field = req_table.type
+    type_field.default = int(default_type)
+    type_field.writable = False
+
+    if s3_has_role(STAFF):
+        if "assignment" in request.args or \
+           "checkin" in request.args or \
+           "checkout" in request.args:
+            s3mgr.load("vol_assignment")
+
+    elif s3_has_role(ORG_VOL):
+        s3mgr.load("vol_application")
+        # Volunteer Orgs can see Public Requests & those published for them
+        org = auth.user.organisation_id
+        response.s3.filter = (req_table.public == True) | \
+                             (req_table.organisations_id.belongs((org,)))
+        s3mgr.configure(req_table,
+                        editable=False), # We need the Controller/Table ACL to be editable to be able to add components
+        if "application" in request.args:
+            s3.crud.submit_button = T("COMMIT")
+            table = db.vol_application
+            table.organisation_id.default = org
+            table.organisation_id.readable = table.organisation_id.writable = False
+            table.number.readable = table.number.writable = True
+            table.person_id.readable = table.person_id.writable = False
+            field = table.team_leader_id
+            field.readable = field.writable = True
+            field.requires = IS_NOT_EMPTY()
+            #table.person_id.label = T("Team Leader")
+            #table.person_id.comment = None
+            #table.person_id.widget = S3AddPersonWidget(
+            #                                #select_existing=False
+            #                            )
+            #table.person_id.requires = IS_ADD_PERSON_WIDGET()
+            #field = table.team_leader
+            #field.readable = field.writable = True
+            #field.requires = IS_NOT_EMPTY()
+            #field = table.team_leader_contact
+            #field.readable = field.writable = True
+            #field.requires = IS_NOT_EMPTY()
+            table.emergency_contact_name.readable = table.emergency_contact_name.writable = False
+            table.emergency_contact_name.requires = []
+            table.emergency_contact_relationship.readable = table.emergency_contact_relationship.writable = False
+            table.emergency_contact_relationship.requires = []
+            table.emergency_contact_phone.readable = table.emergency_contact_phone.writable = False
+            table.emergency_contact_phone.requires = []
+            s3.crud_strings["vol_application"].subtitle_create = ""
+
+        elif "assignment" in request.args:
+            table = db.vol_assignment
+            table.organisation_id.default = org
+            table.organisation_id.readable = table.organisation_id.writable = False
+            table.person_id.readable = table.person_id.writable = False
+            # Make the component multiple=False
+            # @ToDo: Currently multiple=False will just return the .first() record even if inaccessible!
+            #        That would be fixed by a filter, however then UI would break.
+            s3mgr.model.add_component("vol_assignment",
+                                      req_req=dict(joinby="req_id",
+                                                   multiple=False))
+    else:
+        s3mgr.load("vol_application")
+        # Volunteers can only see Public Requests
+        response.s3.filter = (req_table.public == True)
+        s3mgr.configure(req_table,
+                        editable=False), # We need the Controller/Table ACL to be editable to be able to add components
+        person = s3_logged_in_person()
+        if "application" in request.args:
+            # Check for required Skills
+            table = db.req_req_skill
+            query = (table.req_id == request.args[0])
+            req = db(query).select(table.skill_id,
+                                   limitby=(0, 1)).first()
+            if req:
+                # Read the applicant's skills
+                table = db.vol_skill
+                query = (table.person_id == auth.s3_logged_in_person())
+                skillset = db(query).select(table.skill_id,
+                                            limitby=(0, 1)).first()
+                gap = False
+                if not skillset:
+                    gap = True
+                else:
+                    for skill in req.skill_id:
+                        if not skill in skillset.skill_id:
+                            gap = True
+                            break
+                if gap:
+                    response.warning = T("Please check that you have the required skills for this assignment as you've not specified that you have all the required skills.")
+
+            s3.crud.submit_button = T("COMMIT")
+            table = db.vol_application
+            table.person_id.default = person
+            table.person_id.readable = table.person_id.writable = False
+            s3.crud_strings["vol_application"].subtitle_create = ""
+            # Read in current Emergency Contacts
+            ctable = db.vol_contact
+            query = (ctable.person_id == person)
+            contacts = db(query).select(limitby=(0, 1)).first()
+            if contacts:
+                table.emergency_contact_name.default = contacts.emergency_contact_name
+                table.emergency_contact_relationship.default = contacts.emergency_contact_relationship
+                table.emergency_contact_phone.default = contacts.emergency_contact_phone
+
+        elif "assignment" in request.args:
+            table = db.vol_assignment
+            table.person_id.default = person
+            table.person_id.readable = table.person_id.writable = False
+            # Make the component multiple=False
+            # @ToDo: Currently multiple=False will just return the .first() record even if inaccessible!
+            #        That would be fixed by a filter, however then UI would break.
+            s3mgr.model.add_component("vol_assignment",
+                                      req_req=dict(joinby="req_id",
+                                                   multiple=False))
+
+    def prep(r):
+        db.req_req.status.readable = db.req_req.status.writable = False
+
+        # Remove type from list_fields
+        list_fields = s3mgr.model.get_config("req_req", 
+                                             "list_fields")
+        try:
+            list_fields.remove("type")
+        except:
+             # It has already been removed.
+             # This can happen if the req controller is called 
+             # for a second time, such as when printing reports
+             # see vol.print_assignment()
+            pass
+        s3mgr.configure(tablename, list_fields=list_fields)
+        
+        type = ( r.record and r.record.type ) or \
+               ( request.vars and request.vars.default_type )
+        if type:
+            type = int(type)
+            req_table.type.default = int(type)
+               
+        # Filter the query based on type
+        if response.s3.filter:
+            response.s3.filter = response.s3.filter & \
+                                 (db.req_req.type == type)
+        else:
+            response.s3.filter = (db.req_req.type == type)
+            
+        #if type == 3:
+        s3mgr.configure("req_req",
+                        list_fields = ["id",
+                                       "priority",
+                                       "event_id",
+                                       "purpose",
+                                       "site_id",
+                                       "date_required",
+                                    ])
+
+        if r.interactive:
+            # Set Fields and Labels depending on type
+            if type:
+                # This prevents the type from being edited AFTER it is set 
+                req_table.type.readable = False
+                req_table.type.writable = False
+                
+                crud_strings = deployment_settings.get_req_req_crud_strings(type)
+                if crud_strings:
+                    s3.crud_strings["req_req"] = crud_strings
+                    
+                if "application" in request.args:
+                    s3.crud_strings["req_req"].title_display = T("Volunteer Application")
+                elif "assignment" in request.args:
+                    if s3_has_role(STAFF) and not r.component_id:
+                        s3.crud_strings["req_req"].title_display = T("Volunteer Roster")
+                    else:
+                        s3.crud_strings["req_req"].title_display = T("Volunteer Assignment")
+                        atable = db.vol_assignment
+                        # @ToDo: Hide if vol hasn't yet checked-out or if time not > time_until
+                        #atable.task_evaluation.readable = False
+
+                    
+            if r.method != "create":
+                # Disable Edit for fields where WebEOC is Master
+                req_table.event_id.writable = False
+                req_table.incident_id.writable = False
+                #req_table.incident_id.writable = True
+                req_table.request_number.writable = False
+                req_table.priority.writable = False
+                req_table.site_id.writable = False
+                req_table.request_for_id.writable = False
+                req_table.date_required.writable = False
+                req_table.date_required_until.writable = False
+                req_table.purpose.writable = False
+                req_table.date.writable = False
+                req_table.requester_id.writable = False
+                req_table.approved_by_id.writable = False
+                req_table.comments.writable = False
+                req_table.cancel.writable = False
+            
+            if r.record and r.record.req_req_skill.count():#r.component and r.component.name == "req_skill":
+                # Is this component being updated (not created)
+                req_skill_table = db.req_req_skill
+                req_skill_table.skill_id.writable = False
+                req_skill_table.quantity.writable = False
+
+            # @ToDo: apply these changes via JS for the create form where type is editable
+            #if type == 3: # Person 
+            req_table.date_required.requires = req_table.date_required.requires.other
+            req_table.date_required_until.requires = req_table.date_required_until.requires.other
+            req_table.location.readable = True
+            req_table.public.readable = True
+            req_table.organisations_id.readable = True
+            req_table.emailed.readable = True
+            
+            if r.method == "create":
+                # Only enable Edit for fields where Sahana (not WebEOC) is Master
+                req_table.location.writable = True
+                req_table.public.writable = True
+                req_table.organisations_id.writable = True
+            
+            req_table.purpose.label = T("Task Details")
+            req_table.site_id.label =  T("Report To Facility")
+            req_table.request_for_id.label = T("Report To Person")
+            
+            if r.method != "update" and r.method != "read":
+                if not r.component:
+                    # Hide fields which don't make sense in a Create form
+                    # - includes one embedded in list_create
+                    # - list_fields over-rides, so still visible within list itself
+                    response.s3.req_create_form_mods()
+
+                    # Get the default Facility for this user
+                    # @ToDo: Use site_id in User Profile (like current organisation_id)
+                    if deployment_settings.has_module("hrm"):
+                        query = (db.hrm_human_resource.person_id == s3_logged_in_person())
+                        site = db(query).select(db.org_site.id,
+                                                limitby=(0, 1)).first()
+                        if site:
+                            r.table.site_id.default = site.id
+
+                elif r.component.name == "document":
+                    s3.crud.submit_button = T("Add")
+                    table = r.component.table
+                    # @ToDo: Fix for Link Table
+                    #table.date.default = r.record.date
+                    #if r.record.site_id:
+                    #    stable = db.org_site
+                    #    query = (stable.id == r.record.site_id)
+                    #    site = db(query).select(stable.location_id,
+                    #                            stable.organisation_id,
+                    #                            limitby=(0, 1)).first()
+                    #    if site:
+                    #        table.location_id.default = site.location_id
+                    #        table.organisation_id.default = site.organisation_id
+
+                elif r.component.name == "req_skill":
+                    #req_hide_quantities(r.component.table)
+                    table = r.component.table
+                    table.quantity_commit.writable = table.quantity_commit.readable = False
+                    table.quantity_fulfil.writable = table.quantity_fulfil.readable = False
+
+        if r.component:
+            if r.component.name == "document" or \
+                 r.component.name == "req_skill":
+                # Limit site_id to facilities the user has permissions for
+                # @ToDo: Non-Item requests shouldn't be bound to a Facility?
+                auth.permission.permitted_facilities(table=r.table,
+                                                     error_msg=T("You do not have permission for any facility to make a request."))
+
+            elif r.component.name == "assignment":
+                table = db.vol_assignment
+                if s3_has_role(STAFF):
+                    table.report_to_id.default = r.record.request_for_id
+                else:
+                    # Volunteer can evaluate task if vol has checked-in and (checked-out or time > time_until)
+                    query = (table.id == r.component_id)
+                    assign = db(query).select(table.checkin,
+                                              table.checkout,
+                                              limitby=(0, 1)).first()
+                    checkin = None
+                    if assign:
+                        checkin = assign.checkin
+                        checkout = assign.checkout
+                        query = (req_table.id == r.id)
+                        req = db(query).select(req_table.date_required_until,
+                                                          limitby=(0, 1)).first()
+                        if req:
+                            required_until = req.date_required_until
+                        else:
+                            required_until = datetime.datetime(3000, 1, 1)
+
+                    if checkin and (checkout or \
+                                    request.utcnow > required_until):
+                        db.vol_assignment.task_evaluation.writable = True
+                        db.vol_assignment.task_eval_comments.writable = True
+                    else:
+                        db.vol_assignment.task_evaluation.readable = False
+                        db.vol_assignment.task_eval_comments.readable = False
+            elif r.id and \
+                 r.component.name == "application" and \
+                 r.method == "create":
+
+                if not auth.user.organisation_id:
+                    # Display an error message if the user has already
+                    # assignments during this time period, this can
+                    # alternatively be done onvalidation of the application,
+                    # but doing it here is better UX and saves a query:
+                    req_id = r.id
+                    req = r.record
+                    # @todo: make min_lag deployment setting:
+                    min_lag = datetime.timedelta(hours=1)
+                    # Earliest that another Request can start
+                    earliest = req.date_required_until + min_lag
+                    # Latest that another Request can end
+                    latest = req.date_required - min_lag
+                    person_id = s3_logged_in_person()
+                    if person_id:
+                        rtable = db.req_req
+                        atable = db.vol_assignment
+                        query = (atable.person_id == person_id) & \
+                                (rtable.id == atable.req_id) & \
+                                ((rtable.date_required >= earliest) | \
+                                 (rtable.date_required_until >= latest))
+                        conflict = db(query).select(rtable.id,
+                                                    limitby=(0, 1)).first()
+                        if conflict:
+                            session.error = T("You are assigned to another request during this time period")
+                            redirect(URL(c="vol", f="req_skill"))
+                            # Could be made less strong:
+                            #response.error = T("You are assigned to another request during this time period")
+        else:
+            # Limit site_id to facilities the user has permissions for
+            # @ToDo: Non-Item requests shouldn't be bound to a Facility?
+            auth.permission.permitted_facilities(table=r.table,
+                                                 error_msg=T("You do not have permission for any facility to make a request."))
+
+        return True
+    response.s3.prep = prep
+
+    # Post-process
+    def postp(r, output):
+
+        if r.interactive:
+            if r.http == "POST":
+                form = output.get("form", None)
+                if not form.errors:
+                    # Form submitted Succesfully
+                    # interactive-only onaccept routines can go here
+                    if r.component and \
+                       r.component.name == "application":
+                        # Check whether Request Full:
+                        # Create Assignment, Update Commit status
+                        response.s3.application_onaccept_interactive(form)
+
+            # GET & POST
+            s3_action_buttons(r)
+            if not r.component:
+                # This is only appropriate for item requests
+                pass
+            elif r.component.name == "req_skill":
+                pass
+            elif r.component.name == "application":
+                try:
+                    form = output["form"]
+                    if form.errors.dsw:
+                        dsw_error = DIV(form.errors.dsw,
+                                             _id="dsw__error",
+                                             _class="error",
+                                             _style="display: block;")
+                    else:
+                        dsw_error = ""
+                    give2la_forms = A( T("Give2LA Registration Forms"),
+                                       _href = URL(c="static",
+                                                   f="Volunteer_Ethics_and_Conduct.pdf")
+                                      )
+                    vol_appl_conditions = SPAN( XML(T("As a volunteer working to assist disaster survivors and in disaster recovery efforts, you will be required to fill out and sign the %(give2la_forms)s. Please print these forms and bring them to the Volunteering Location. The forms  are in English only.") % \
+                                                    dict(give2la_forms = give2la_forms)
+                                                    ),
+                                                #T("As a volunteer working to assist disaster survivors and in disaster recovery efforts, you will be required to sign the following forms: "),
+                                                #A( T("Personal Statement of Understanding"),
+                                                #   _href = URL(c="static",
+                                                #               f="Volunteer_Personal_Statement.pdf"),
+                                                #  ),
+                                                #", ",
+                                                #A( T("City of Los Angeles Code of Volunteer Ethics and Conduct"),
+                                                #   _href = URL(c="static",
+                                                #               f="Volunteer_Ethics_and_Conduct.pdf"),
+                                                #  ),
+                                                #T("and "),
+                                                #A( T("DSW Volunteer Registration Form "),
+                                                #   _href = URL(c="static",
+                                                #               f="DSW_Volunteer_Registration_Form.pdf"),
+                                                #  ),
+                                                #T("or "),
+                                                #A( T("Waiver/Release of Liability"),
+                                                #   _href = URL(c="static",
+                                                #               f="Volunteer_Personal_Statement.pdf"),
+                                                #  ),
+                                                #T(".  All forms will be in English."),
+                                                BR(),
+                                                T("Check here to agree to these conditions:")
+                                                )
+                    form[0][-2].append(TR(TD(LABEL(vol_appl_conditions,
+                                                   _id="dsw__label"),
+                                             _class="w2p_fl"),
+                                          #TD(SPAN("*", _class="req"),
+                                          #   _class="w2p_fc"),
+                                          _id="dsw__row"))
+                    form[0][-2].append(TR(TD(INPUT(_type="checkbox",
+                                                   _value="on",
+                                                   _name="dsw",
+                                                   _id="dsw",
+                                                   _class="boolean"),
+                                             SPAN("*", _class="req"),
+                                             dsw_error,
+                                             _class="w2p_fw"),
+                                          _id="dsw__row"))
+                    form[0][-1][0][0]["_class"] = "accept-button"
+                    form[0][-1][0].append(BR())
+                    form[0][-1][0].append(INPUT(_type="button",
+                                                _value=T("DECLINE"),
+                                                _class="wide-grey-button",
+                                                _onClick="javascript: window.location='%s'" % \
+                                                        URL(c=request.controller,
+                                                            f="req_skill")))
+                except KeyError:
+                    # update 'form'
+                    pass
+                if "subtitle" in output and not output["subtitle"]:
+                    # Remove null subtitle from Application form to avoid CSS markup
+                    output.pop("subtitle")
+
+            elif r.component.name == "assignment":
+                ctable = r.component.table
+                # This is always appropriate
+                response.s3.actions = [
+                    dict(url = URL(f = "req",
+                                   args = [r.id,
+                                           r.component_name,
+                                           "[id]"]),
+                         _class = "action-btn",
+                         label = str(T("Details"))
+                        )]
+                # This is only appropriate if vol not yet checked-in
+                query = (ctable.checkin == None)
+                rows = db(query).select(ctable.id)
+                restrict = [str(row.id) for row in rows]
+                response.s3.actions.append(
+                    dict(url = URL(f = "req",
+                                   args = [r.id,
+                                           r.component_name,
+                                           "[id]",
+                                           "checkin"]),
+                         _class = "action-btn",
+                         label = str(T("Check-In NOW")),
+                         restrict = restrict
+                        )
+                    )
+                # This is only appropriate if vol checked-in but not out
+                query = (ctable.checkin != None) & \
+                        (ctable.checkout == None)
+                rows = db(query).select(ctable.id)
+                restrict = [str(row.id) for row in rows]
+                response.s3.actions.append(
+                    dict(url = URL(f = "req",
+                                   args = [r.id,
+                                           r.component_name,
+                                           "[id]",
+                                           "checkout"]),
+                         _class = "action-btn",
+                         label = str(T("Check-Out NOW")),
+                         restrict = restrict
+                        )
+                    )
+            else:
+                # We don't yet have other components
+                pass
+
+        return output
+    response.s3.postp = postp
+
+    rheader = vol_req_rheader
+
+    output = s3_rest_controller("req", "req", rheader=rheader)
+
+    return output
+
+# -----------------------------------------------------------------------------
+def req_skill():
+    """ REST Controller """
+
+    if s3_has_role(ORG_DON) and not s3_has_role(ORG_VOL):
+        session.warning = T("As a Corporation/Organization we suggest you donate staff as Services. If you wish to volunteer personally, then please sign out and then login with another account.")
+        redirect(URL(c="don", f="organisation", args=[auth.user.organisation_id, "inv_item"], vars={"item":"services"}))
+
+    tablename = "req_req_skill"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    s3mgr.configure(tablename,
+                    insertable=False)
+
+    if not s3_has_role(STAFF):
+        req_table = db.req_req
+        s3mgr.load("vol_assignment")
+        vtable = db.vol_assignment
+        
+        if auth.is_logged_in():
+            person = auth.s3_logged_in_person()
+        else:
+            vol_sidebar()
+
+        # Filter out:
+        #   Reqs which haven't been published to the public site
+        #   Reqs which are complete (status defined in models/req.py)
+        # @ToDo: if s3_has_role(ORG) then also allow reqs for that Org
+        response.s3.filter = \
+            ((req_table.id == table.req_id) & (req_table.public == True)) & \
+            ((req_table.id == table.req_id) & (req_table.commit_status != 2))
+
+        #if auth.s3_is_logged_in():
+        #    # Filter Out:
+        #    #   Reqs which the Vol has already got an Assignment for
+        #    response.s3.filter = response.s3.filter & \
+        #                         ~((vtable.req_id == table.req_id) & (vtable.person_id == person))
+
+        s3mgr.configure(tablename,
+                        list_fields=["id",
+                                     (T("Task"), "task"),
+                                     (T("Date + Time"), "date"),
+                                     "skill_id",
+                                     # @ToDo: If-needed, VirtualField
+                                     #"priority",
+                                     (T("Location"), "location"),
+                                     #(T("Number of Volunteers Needed (Still Needed/Total Needed)"), "needed"),
+                                     (T("Number of Volunteers Still Needed"), "needed"),
+                                     #"quantity",
+                                     "comments"
+                                    ])
+        actions = [
+                dict(url = URL(c = "vol",
+                               f = "req",
+                               args = ["application", "create"],
+                               vars = {"skill_id" : "[id]"}),
+                     _class = "apply-button",
+                     label = str(T("Apply"))
+                    )
+                ]
+    else:
+        actions = [
+                dict(url = URL(c = "vol",
+                               f = "req",
+                               args = ["req_skill", "[id]"]),
+                     _class = "action-btn",
+                     label = str(READ)
+                    )
+                ]
+
+    def prep(r):
+        if r.interactive:
+            if r.method != "update" and r.method != "read":
+                # Hide fields which don't make sense in a Create form
+                # - includes one embedded in list_create
+                # - list_fields over-rides, so still visible within list itself
+                response.s3.req_hide_quantities(r.table)
+
+        return True
+    response.s3.prep = prep
+
+    # Post-process
+    def postp(r, output):
+        if r.interactive:
+            response.s3.actions = actions
+            if not s3_has_role(STAFF) and r.method == None:
+                if auth.is_logged_in():
+                    line = XML(T("If you have the required skills, click to %(apply_button)s") %
+                                    dict( apply_button = SPAN(T("Apply"),
+                                                              _class="apply-button",
+                                                              _style ="display:inline-block;text-align:center")
+                                                              )
+                                )
+                else:
+                    line = TAG[""]( XML(T("Please %(register)s to volunteer with %(give2la)s and receive updates of new Requests for Volunteers.") %
+                                   dict( register = A( T("register"), 
+                                                           _href = URL(c = "vol",
+                                                                       f = "register")
+                                                          ),
+                                             give2la = B("Give2", I("LA"))
+                                        )
+                                   ),
+                            #BR(),
+                            #XML( T("If you have already registered please %(sign_in)s.") %
+                            #     dict( sign_in = A( T("Sign In"), 
+                            #                        _href = URL(c = "default",
+                            #                                    f = "user",
+                            #                                    args = ["login"],
+                            #                                    vars = dict(_next = "/la/vol/req_skill")
+                            #                                    )
+                            #                       )
+                            #          )
+                            #)
+                             )
+                output["rheader"] = DIV( P( B(T("The City of Los Angeles has the following Requests for Volunteers.") ),
+                                            BR(),
+                                            line
+                                           )
+                                           #T(" or "),
+                                           #A( T("Sign In"), _href = URL(c = "default",
+                                           #                              f = "user",
+                                           #                              args = ["login"],
+                                           #                              vars = dict(_next = "/la/vol/req_skill")
+                                           #                              )
+                                        )
+                                      #T("The City of Los Angeles requests your participation in the following volunteering opportunities. When you see a request that appeals to you click apply. If you have not registered to volunteer yet, please "),
+                                      #A(T("sign up"),
+                                      #  _href="/%s/vol/register" % request.application,
+                                      #  _class="signup"),
+                                      #T(" first. You can narrow down the list by for example searching for a specific task or your neighborhood."))
+            return output
+    response.s3.postp = postp
+
+    output = s3_rest_controller("req", "req_skill")
+
+    return output
+
+# -----------------------------------------------------------------------------
+def activity():
+    """ REST Controller """
+
+    s3mgr.load("project_activity")
+    # Defined in the Model for use from Multiple Controllers for unified menus
+    return response.s3.project_activity_controller()
 
 # END =========================================================================
-

=== modified file 'deployment-templates/models/000_config.py'
--- deployment-templates/models/000_config.py	2011-09-05 05:51:59 +0000
+++ deployment-templates/models/000_config.py	2011-09-08 19:09:00 +0000
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#Z -*- coding: utf-8 -*-
 
 """
     Deployment settings
@@ -36,7 +36,7 @@
 deployment_settings.auth.registration_requires_approval = False
 
 # Uncomment this to request the Mobile Phone when a user registers
-deployment_settings.auth.registration_requests_mobile_phone = True
+deployment_settings.auth.registration_requests_mobile_phone = False
 # Uncomment this to have the Mobile Phone selection during registration be mandatory
 #deployment_settings.auth.registration_mobile_phone_mandatory = True
 # Uncomment this to request the Organisation when a user registers
@@ -52,11 +52,11 @@
 deployment_settings.auth.openid = False
 
 # Always notify the approver of a new (verified) user, even if the user is automatically approved
-deployment_settings.auth.always_notify_approver = True
+deployment_settings.auth.always_notify_approver = False
 
 # Base settings
-deployment_settings.base.system_name = T("Sahana Eden Humanitarian Management Platform")
-deployment_settings.base.system_name_short = T("Sahana Eden")
+deployment_settings.base.system_name = T("Give2LA")
+deployment_settings.base.system_name_short = T("Give2LA")
 
 # Set this to the Public URL of the instance
 deployment_settings.base.public_url = "http://127.0.0.1:8000"
@@ -84,8 +84,7 @@
 # 20+ Demo (Data required for a default demo)
 #     Each subsequent Demos can take any unique number >= 20
 #     The actual demo will be defined by the file demo_folders.cfg
-deployment_settings.base.prepopulate = 1
-
+deployment_settings.base.prepopulate = 22 # LA
 
 # Set this to True to use Content Delivery Networks to speed up Internet-facing sites
 deployment_settings.base.cdn = False
@@ -104,46 +103,45 @@
 #deployment_settings.mail.server = "smtp.gmail.com:587"
 #deployment_settings.mail.login = "username:password"
 # From Address
-deployment_settings.mail.sender = "'Sahana' <[e-mail]>"
+deployment_settings.mail.sender = "'Sahana' <[e-mail]>"
 # Default email address to which requests to approve new user accounts gets sent
 # This can be overridden for specific domains/organisations via the auth_domain table
-deployment_settings.mail.approver = "[e-mail]"
+deployment_settings.mail.approver = "[e-mail]"
 
 # Frontpage settings
 # RSS feeds
-deployment_settings.frontpage.rss = [
-    {"title": "Eden",
-     # Trac timeline
-     "url": "http://eden.sahanafoundation.org/timeline?ticket=on&changeset=on&milestone=on&wiki=on&max=50&daysback=90&format=rss"
-    },
-    {"title": "Twitter",
-     # @SahanaFOSS
-     "url": "http://twitter.com/statuses/user_timeline/96591754.rss"
-     # Hashtag
-     #url: "http://search.twitter.com/search.atom?q=%23eqnz"
-    }
-]
+deployment_settings.frontpage.rss = []
+#    {"title": "ReadyLA",
+#     "url": "http://twitter.com/statuses/user_timeline/34666476.rss"
+#    },
+#    {"title": "Red Cross LA",
+#     "url": "http://twitter.com/statuses/user_timeline/14720319.rss"
+#    },
+#    {"title": "LAFD",
+#     "url": "http://twitter.com/statuses/user_timeline/823860.rss"
+#    }
+#]
 
 # L10n settings
 #deployment_settings.L10n.default_country_code = 1
 # Languages used in the deployment (used for Language Toolbar & GIS Locations)
 # http://www.loc.gov/standards/iso639-2/php/code_list.php
 deployment_settings.L10n.languages = OrderedDict([
-    ("ar", T("Arabic")),
+    #("ar", T("Arabic")),
     ("zh-cn", T("Chinese (Simplified)")),
-    ("zh-tw", T("Chinese (Traditional)")),
+    #("zh-tw", T("Chinese (Traditional)")),
     ("en", T("English")),
-    ("fr", T("French")),
-    ("de", T("German")),
-    ("el", T("Greek")),
-    ("it", T("Italian")),
+    #("fr", T("French")),
+    #("de", T("German")),
+    #("el", T("Greek")),
+    #("it", T("Italian")),
     ("ja", T("Japanese")),
     ("ko", T("Korean")),
-    ("pt", T("Portuguese")),
-    ("pt-br", T("Portuguese (Brazil)")),
-    ("ru", T("Russian")),
+    #("pt", T("Portuguese")),
+    #("pt-br", T("Portuguese (Brazil)")),
+    #("ru", T("Russian")),
     ("es", T("Spanish")),
-    ("ur", T("Urdu")),
+    #("ur", T("Urdu")),
     ("vi", T("Vietnamese")),
 ])
 # Default language for Language Toolbar (& GIS Locations in future)
@@ -151,11 +149,12 @@
 # Display the language toolbar
 deployment_settings.L10n.display_toolbar = True
 # Default timezone for users
-deployment_settings.L10n.utc_offset = "UTC +0000"
+deployment_settings.L10n.utc_offset = "UTC -0700"
 # Uncomment these to use US-style dates in English (localisations can still convert to local format)
-#deployment_settings.L10n.date_format = T("%m-%d-%Y")
-#deployment_settings.L10n.time_format = T("%H:%M:%S")
-#deployment_settings.L10n.datetime_format = T("%m-%d-%Y %H:%M:%S")
+deployment_settings.L10n.date_format = T("%m-%d-%Y")
+# NB this gets overridden for STAFF in 00_settings.py
+deployment_settings.L10n.time_format = T("%I:%M:%S %p")
+deployment_settings.L10n.datetime_format = T("%m-%d-%Y %I:%M:%S %p")
 # Religions used in Person Registry
 # @ToDo: find a better code
 # http://eden.sahanafoundation.org/ticket/594
@@ -170,7 +169,7 @@
     "other":T("other")
 }
 # Make last name in person/user records mandatory
-#deployment_settings.L10n.mandatory_lastname = True
+deployment_settings.L10n.mandatory_lastname = True
 
 # Finance settings
 #deployment_settings.fin.currencies = {
@@ -178,22 +177,23 @@
 #    "EUR" :T("Euros"),
 #    "GBP" :T("Great British Pounds")
 #}
-#deployment_settings.fin.currency_default = "USD" # Dollars
-#deployment_settings.fin.currency_writable = False # False currently breaks things 
+deployment_settings.fin.currency_default = "USD" # Dollars
+deployment_settings.fin.currency_readable = True
+deployment_settings.fin.currency_writable = False # False currently breaks things 
 
 # PDF settings
 # Default page size for reports (defaults to A4)
-#deployment_settings.base.paper_size = T("Letter")
+deployment_settings.base.paper_size = T("Letter")
 # Location of Logo used in pdfs headers
-#deployment_settings.ui.pdf_logo = "static/img/mylogo.png"
+deployment_settings.ui.pdf_logo = "static/img/la/LA-BlackWhite.JPG"
 
 # GIS (Map) settings
 # Hide the Map-based selection tool in the Location Selector
 #deployment_settings.gis.map_selector = False
 # Hide LatLon boxes in the Location Selector
-#deployment_settings.gis.latlon_selector = False
+deployment_settings.gis.latlon_selector = False
 # Use Building Names as a separate field in Street Addresses?
-#deployment_settings.gis.building_name = False
+deployment_settings.gis.building_name = False
 # Display Resources recorded to Admin-Level Locations on the map
 # @ToDo: Move into gis_config?
 deployment_settings.gis.display_L0 = False
@@ -206,12 +206,9 @@
 deployment_settings.gis.location_hierarchy = OrderedDict([
     ("L0", T("Country")),
     ("L1", T("State")),
-     #("L2", "%s / %s / %s" % (T("County"), T("District")),
-    ("L3", "%s / %s / %s" % (T("City"), T("Town"), T("Village"))),
-    #("L2", T("City")),
-    #("L3", T("Town")),
-    #("L4", T("Neighborhood")),
-    #("L4", T("Village")),
+    ("L2", T("County")),
+    ("L3", T("City")),
+    ("L4", T("Neighborhood")),
 ])
 # Maximum hierarchy level to allow for any map configuration.
 deployment_settings.gis.max_allowed_hierarchy_level = "L4"
@@ -223,15 +220,15 @@
 deployment_settings.gis.default_config_values = Storage(
     name = "Site Map Configuration",
     # Where the map is centered:
-    lat = "22.593723263",
-    lon = "5.28516253",
+    lat = "34.0149248298",
+    lon = "-118.107934628",
     # How close to zoom in initially -- larger is closer.
-    zoom = 2,
+    zoom = 9,
     zoom_levels = 22,
     projection_id = 1,
     marker_id = 1,
     map_height = 600,
-    map_width = 1000,
+    map_width = 700,
     # Rough bounds for locations, used by onvalidation to filter out lon, lat
     # which are obviously wrong (e.g. missing minus sign) or far outside the
     # intended region.