Merge lp:~graeme-acm/sahana-eden/LA into lp:sahana-eden/la

[Graeme Foster]

Added FAQ and updated help

[Fran Boon (flavour)]

Are these lines temporary code to avoid adding strings to the languages file?
T = lambda str : str

=== modified file 'controllers/default.py'
--- controllers/default.py	2011-09-12 22:08:49 +0000
+++ controllers/default.py	2011-09-13 13:20:51 +0000
@@ -238,7 +238,109 @@
 def help():
     """ Custom View """
     response.title = T("Help")
-    return dict()
+    entries = []
+    question = T("How do I register as a volunteer?")
+    reply = T("Follow these steps, to register:")
+    list = []
+    list.append(T("On the Home Page, click the ‘Volunteer’ link.  Review the ‘List of Requests for Volunteers’.  To select a %(request)s (Volunteer Task), click on %(apply)s; OR You can register by clicking the ‘Register’ link located on the top of the web page.") % dict(request="<i>%s</i>" % T("Request for Volunteers"),
+                                                                                                                                                                                                                                                                                apply = "<strong>%s</strong>" % T("‘APPLY’")))
+    list.append(T("Enter your information into the Required Fields.  After you have entered your information, click %(accept)s to register." % dict(accept="<strong>%s</strong" % T("‘I ACCEPT, CREATE MY ACCOUNT’"))))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("How do I update my Profile, Skills and Emergency Details?")
+    reply = T("After you are signed-in, please follow these steps to edit your profile: ")
+    list = []
+    list.append(T("On the top menu, click %(volunteer)s." % dict(volunteer="<strong>%s</strong>" % T("VOLUNTEER"))))
+    list.append(T("On the left menu, click %(profile)s ." % dict(profile="<strong>%s</strong>" % T("'My Profile'"))))
+    list.append(T("On this page, you can update your profile."))
+    list.append(T("Additional information like %(notifications)s and other volunteer agency affiliations also can be updated in this page." % dict(notifications="<strong>%s</strong>" % T("Notifications"))))
+    list.append(T("Then click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
+    list.append(T("On the left menu, click %(skills)s." % dict(skills="<strong>%s</strong>" % T("Skills"))))
+    list.append(T("Click the %s sign next to the skill(s) that best describes how you can support the City." % "<strong>'+'</strong>"))
+    list.append(T("You may also search for a skill by providing the first few characters in the search box.  (Example: When searching for ‘Driving’ skills, enter the first letters of the word)."))
+    list.append(T("If your skill(s) is not listed, you may enter it in the %(extraSkills)s field below." % dict(extraSkills="<strong>%s</strong>" % T("Skills"))))
+    list.append(T("Then click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
+    list.append(T("You may also update your Emergency Contacts information by clicking on 'Emergency Contacts' located on the left menu."))
+    list.append(T("Then click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("How do I apply for a Volunteer Request after I have registered with Give2LA?")
+    reply = T("You can apply by clicking the %(signin)s link located on the top of the web page." % dict(signin="<strong>%s</strong>" % T("‘Sign-In’")))
+    list = []
+    list.append(T("Enter your E-Mail and Password information."))
+    list.append(T("Review the ‘List of Requests for Volunteers’."))
+    list.append(T("To select a Volunteer Task, click on %(apply)s."% dict(apply="<strong>%s</strong>" % T("‘APPLY’"))))
+    list.append(T("Review the ‘Volunteer Assignment Details’.  Enter your Emergency Contact information."))
+    list.append(T("Download the Give2LA Volunteer Registration Forms, complete the forms, and take them with you to your Volunteer Assignment."))
+    list.append(T("Then click %(commit)s." % dict(commit="<strong>%s</strong>" % T("Commit"))))
+    list.append(T("Review the Volunteer Application details."))
+    list.append(T("Then click %(form)s and take them with you to your Volunteer Assignment." % dict(form="<strong>%s</strong>" % T("'Print Volunteer Assignment Form'"))))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("Can I provide feedback or evaluation for an assignment after volunteering?")
+    reply = T("Yes.  After you have signed-in, follow these steps:")
+    list = []
+    list.append(T("On the top menu, click  %(volunteer)s." % dict(volunteer="<strong>%s</strong>" % T("VOLUNTEER"))))
+    list.append(T("On the left menu, click  %(assignments)s." % dict(assignments="<strong>%s</strong>" % T("‘My Assignments’"))))
+    list.append(T("Click on the ‘Details’ button of the Volunteer Task you have completed."))
+    list.append(T("Scroll down to the bottom of the screen to get to ‘Evaluation of Event’."))
+    list.append(T("Enter the evaluation details; and click %(save)s" % dict(save="<strong>%s</strong>" % T("Save"))))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("I would like to register my corporation for donations, what is the process?")
+    reply = T("Follow these steps, to register")
+    list = []
+    list.append(T("Locate the %(register)s for Corporations and Organizations on the Home Page and click on it." % dict(register="<strong>%s</strong>" % T("‘CLICK HERE TO REGISTER’"))))
+    list.append(T("Enter the Mandatory details and click on the button %(accept)s at the bottom of the screen to register") % dict(accept="<strong>%s</strong" % T("‘I ACCEPT, CREATE MY ACCOUNT’")))
+    entry = (question, reply, list)
+    entries.append(entry)
+
+    return dict(entries=entries)
+
+# -----------------------------------------------------------------------------
+def faq():
+    """ Custom View """
+    donateLink = A(T("Donate Page"), _href=URL(c="don",f="index"))
+
+    response.title = T("Frequently Asked Questions")
+    entries = []
+    question = T("Is there a minimum age limit to volunteer?")
+    reply = T("Yes, you have to be at least 18 years of age to Volunteer.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("What is the Privacy policy of Give2LA?")
+    reply = T("Please refer to the %(privacy)s" % dict(privacy=A(T("Privacy Policy"), _href=URL(c="default",f="disclaimer"))))
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Can I bring a friend to volunteer?")
+    reply = T("Yes, but your friend must also %(register)s and apply to the same Volunteer Assignment." % dict(register=A(T("Register"), _href=URL(c="vol",f="register"))))
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Will I get any food or reimbursements for expenses while volunteering?")
+    reply = T("No, unless it is otherwise stated on the Volunteer Assignment.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Can I donate cash to support the City of Los Angeles?")
+    reply = T("Yes, you can donate cash to the %(laepf)s who support the City of Los Angeles or other partner organizations listed on the %(donate)s. These links will take you directly to the organization’s website to complete the cash donation transaction." % dict(laepf="<a href=http://laemergencypreparednessfoundation.org/>LAEPF</a>", donate=donateLink))
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("What is the process for donating in-kind Items?")
+    reply = T("The City of Los Angeles prefers cash donations. In-kind items can be donated directly to the organization(s) listed under Donate Items  or through any Upcoming Donation Drive  on the %(donate)s" % dict(donate=donateLink))
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Do I have to be a U.S. citizen or legal U.S. resident to volunteer?")
+    reply = T("Yes.  You must be a U.S. citizen,  legal U.S. resident, or have gained legal entry into the United States.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Do I have to live in the City of Los Angeles to volunteer?")
+    reply = T("No, anyone may register to support the City of Los Angeles’ volunteer efforts.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Is my donation tax deductible?")
+    reply = T("Yes.  All donations are tax deductible.  The partner organization that receives your donation will provide a receipt for your donation.  Please make sure you obtain your tax receipt from the organization and keep it in a safe place for tax purposes.  The City of Los Angeles will not issue receipts for your donation.")
+    entry = (question, reply)
+    entries.append(entry)
+    return dict(entries=entries)
 
 # -----------------------------------------------------------------------------
 def sitemap():

=== removed directory 'databases'
=== modified file 'models/don.py'
--- models/don.py	2011-09-08 07:39:54 +0000
+++ models/don.py	2011-09-13 13:20:51 +0000
@@ -467,6 +467,7 @@
 
             pdf.setMargins(top=1.1*inch, bottom=0.5*inch, left=0.4*inch, right = 0.4*inch)
             # Standard lines of text
+            T = lambda str : str
             line1 = "ANTONIO R. VILLARAIGOSA"
             line2 = "Mayor"
             line3A = "THE CITY OF LOS ANGELES"

=== modified file 'models/vol.py'
--- models/vol.py	2011-09-12 19:14:48 +0000
+++ models/vol.py	2011-09-13 13:20:51 +0000
@@ -889,7 +889,7 @@
                 comments = rtable.comments
                 if comments == None:
                     comments = ""
-
+                T = lambda str : str
                 lbl_title1 = "%s:" % T("Assignment Details")
                 lbl_title2 = "%s:" % T("Point of Contact")
                 lbl_startTime = T("Arrival Time")
@@ -1123,6 +1123,7 @@
                 # set the banner
                 pdf.setMargins(left=0.4*inch, right = 0.4*inch)
                 pdf.setHeaderBanner("static/img/la/Give2LAbranding_BW.jpg")
+                T = lambda str : str
                 # Get the request data
                 rtable = db.req_req
                 etable = db.event_event
@@ -1379,6 +1380,7 @@
                                left=0.4*inch,
                                right = 0.4*inch)
                 # Standard lines of text
+                T = lambda str : str
                 line1 = "ANTONIO R. VILLARAIGOSA"
                 line2 = "Mayor"
                 line3A = "THE CITY OF LOS ANGELES"

=== modified file 'views/default/help.html'
--- views/default/help.html	2011-09-11 11:46:07 +0000
+++ views/default/help.html	2011-09-13 13:20:51 +0000
@@ -1,100 +1,14 @@
 {{extend "layout.html"}}
 <div id='home'>
-<h1>{{=T("Help")}}</h1>
-<h2 class='paper-strip'>{{=T("How do I Register as a Volunteer?")}}</h2>
-<p>
-{{=T("Follow these steps, to register")}}:
-<ol>
-<li>{{=XML(T("On the Home Page, click the 'Volunteer' link. Review the 'List of Requests for Volunteers'. To select a Volunteer Task, click on '%(apply)s'; OR" % dict(apply = B(T("APPLY")))))}}<br />
-{{=T("You can register by clicking the 'Register' link located on the top of the web page.")}}</li>
-<li>{{=XML(T("Enter your information into the Required Fields. After you have entered your information, click '%(accept)s' to register." % dict(accept = B(T("I ACCEPT, CREATE MY ACCOUNT")))))}}</li>
-</ol>
-</p>
-<h2 class='paper-strip'>{{=T("How do I update my Profile, Skills and Emergency Details?")}}</h2>
-<p>
-{{=T("After you are signed-in, please follow these steps to edit your profile")}}: 
-<ol>
-<li>{{=XML(T("On the top Navigation Bar, click '%(volunteer)s'." % dict(volunteer = B(T("VOLUNTEER")))))}}</li>
-<li>{{=XML(T("On the left side of the screen, click '%(my_profile)s'." % dict(my_profile = B(T("My Profile")))))}}</li>
-<li>{{=T("On this page, you can update your personal information.")}}</li>
-<li>{{=XML(T("Additional information like 'Notifications' and other volunteer agency affiliations also can be updated in this page." % dict(volunteer = B(T("VOLUNTEER")))))}}</li>
-<li>{{=XML(T("Then click '%(save)s'." % dict(save = B(T("SAVE")))))}}</li>
-<li>{{=XML(T("On the left side of the screen, click '%(skills)s'." % dict(skills = B(T("Skills")))))}}</li>
-<li>{{=T("Click the '+' sign next to the skill(s) that best describes how you can support the City.")}}</li>
-<li>{{=T("You may also search for a skill by providing the first few characters in the search box. (Example: When searching for 'Driving' skills, enter the first letters of the word).")}}</li>
-<li>{{=XML(T("If your skill(s) is not listed, you may enter it in the '%(skills)s' field." % dict(skills = B(T("Additional Skills & Information")))))}}</li>
-<li>{{=XML(T("Then click '%(save)s'." % dict(save = B(T("SAVE")))))}}</li>
-<li>{{=XML(T("You may also update your Emergency Contacts information by clicking on '%(contacts)s' located on the left side of screen." % dict(contacts = B(T("Emergency Contacts")))))}}</li>
-<li>{{=XML(T("Then click '%(save)s'." % dict(save = B(T("SAVE")))))}}</li>
-</ol>
-</p>
-<h2 class='paper-strip'>{{=XML(T("How do I apply for a Volunteer Request after I have registered with %(give2la)s?" % dict(give2la = I(T("Give2LA")))))}}</h2>
-<p>
-<ol>
-<li>{{=T("You can apply by clicking the 'Sign-In' link located on the top of the web page.")}}</li>
-<li>{{=T("Enter your E-Mail and Password information.")}}</li>
-<li>{{=T("Review the 'List of Requests for Volunteers'.")}}</li>
-<li>{{=XML(T("To select a Volunteer Task, click on '%(apply)s'." % dict(apply = B(T("APPLY")))))}}</li>
-<li>{{=T("Review the 'Volunteer Assignment Details'. Enter your Emergency Contact information.")}}</li>
-<li>{{=XML(T("Download the %(give2la)s Volunteer Registration Forms, complete the forms, and take them with you to your Volunteer Assignment." % dict(give2la = I(B(T("Give2LA"))))))}}</li>
-<li>{{=T("Then click 'Commit'.")}}</li>
-<li>{{=T("Review the Volunteer Application details.")}}</li>
-<li>{{=XML(T("Then click '%(print_assign)s' and take them with you to your Volunteer Assignment." % dict(print_assign = B(T("Print Volunteer Assignment Form")))))}}</li>
-</ol>
-</p>
-<h2 class='paper-strip'>{{=T("Can I provide feedback (or evaluate the task), after volunteering?")}}</h2>
-<p>
-{{=T("Yes. After you have signed-in, follow these steps")}}:
-<ol>
-<li>{{=XML(T("On the top Navigation Bar, click '%(volunteer)s'." % dict(volunteer = B(T("VOLUNTEER")))))}}</li>
-<li>{{=XML(T("On the left side of the screen, click '%(my_assignments)s'." % dict(my_assignments = B(T("My Assignments")))))}}</li>
-<li>{{=T("Click on the 'Details' button of the Volunteer Task you have completed.")}}</li>
-<li>{{=T("Scroll down to the bottom of the screen to get to 'Evaluation of Event'.")}}</li>
-<li>{{=T("Enter the evaluation details; and click 'Save'.")}}</li>
-</ol>
-</p>
-<h2 class='paper-strip'>{{=T("Is there a minimum age limit for registering to Volunteer?")}}</h2>
-<p>
-{{=T("Yes, you have to be 18 years of age and older to register to Volunteer.")}}
-</p>
-<h2 class='paper-strip'>{{=XML(T("What is the Privacy policy of %(give2la)s?" % dict(give2la = I(T("Give2LA")))))}}</h2>
-<p>
-{{=XML(T("Please refer to the %(url)s" % dict(url=A(T("Privacy Policy"), _href=URL(f="disclaimer#privacy")))))}}
-</p>
-<h2 class='paper-strip'>{{=T("Can I bring a Friend to Volunteer?")}}</h2>
-<p>
-{{=T("We encourage your friend to register unless it is explicitly stated in the Request for Volunteers that registration is optional.")}}
-</p>
-<h2 class='paper-strip'>{{=T("Where can I get additional information on the assignment like - Lunch arrangements, Gas reimbursements, accommodation for disabled individuals and eligibility for community time etc.?")}}</h2>
-<p>
-{{=T("Please refer to the instructions provided on the Volunteer assignment form, for additional details please get in touch with the contact person listed.")}}
-</p>
-<h2 class='paper-strip'>{{=T("What is the process for Donating Cash?")}}</h2>
-<p>
-{{=T("Cash can be donated through one of the preferred partner organizations by clicking on the links from the Donation page. Please note that you will be landing on an external website to complete the cash donation transaction.")}}
-</p>
-<h2 class='paper-strip'>{{=T("What is the process for Donating In-Kind Items?")}}</h2>
-<p>
-{{=T("City of Los Angeles encourages Cash donations, however In-Kind item donations are received directly by our partner organizations based on their current needs.")}}
-</p>
-<h2 class='paper-strip'>{{=T("I would like to register my Corporation for Donations, What is the process?")}}</h2>
-<p>
-{{=T("Follow these steps, to register")}}:
-<ol>
-<li>{{=XML(T("Locate the '%(register)s' for Corporations and Organizations on the Home Page and click on it." % dict(register = B(T("CLICK HERE TO REGISTER")))))}}</li>
-<li>{{=XML(T("Enter the Mandatory details and click on the button '%(accept)s' at the bottom of the screen to register" % dict(accept = B(T("I ACCEPT, CREATE MY ACCOUNT")))))}}</li>
-</ol>
-</p>
-<h2 class='paper-strip'>{{=T("Do I have to be a U.S. Citizen or legal U.S. Resident to volunteer?")}}</h2>
-<p>
-{{=T("Yes. You must be a U.S. Citizen, Legal U.S. Resident, or have gained legal entry into the United States.")}}
-</p>
-<h2 class='paper-strip'>{{=T("Do I have to live in the City of Los Angeles to volunteer?")}}</h2>
-<p>
-{{=T("No, anyone may register to support the City of Los Angeles' volunteer efforts.")}}
-</p>
-<h2 class='paper-strip'>{{=T("Is my Donation tax deductible?")}}</h2>
-<p>
-{{=T("Yes. All donations are tax deductible. The partner organization that receives your donation will provide a receipt for your donation. Please make sure you obtain your tax receipt from the organization and keep it in a safe place for tax purposes. The City of Los Angeles will not issue receipts for your donation.")}}
-</p>
+<h1>{{=response.title}}</h1>
+{{for entry in entries:}}
+   <h2 class='paper-strip'>{{=XML(entry[0])}}</h2>
+   <p>{{=XML(entry[1])}}<p>
+   <ol>
+   {{for replyItem in entry[2]:}}
+     <li>{{=XML(replyItem)}}</li>
+   {{pass}}
+   </ol>
+{{pass}}
+
 </div>

=== modified file 'views/footer.html'
--- views/footer.html	2011-09-11 11:46:07 +0000
+++ views/footer.html	2011-09-13 13:20:51 +0000
@@ -2,6 +2,7 @@
 <ul class='footer-nav'>
     <li><a href='/{{=request.application}}/default/contact'>{{=T("Contact")}}</a></li>
     <li><a href='/{{=request.application}}/default/help'>{{=T("Help")}}</a></li>
+    <li><a href='/{{=request.application}}/default/faq'>{{=T("FAQ")}}</a></li>
     <li><a href='/{{=request.application}}/default/sitemap'>{{=T("Sitemap")}}</a></li>
     <li><a href='/{{=request.application}}/default/disclaimer'>{{=T("Disclaimer")}}</a></li>
     <li><a href='http://readyla.org' alt='{{=T("ReadyLA Website")}} - {{=T("This link will open a new browser window.")}}'>ReadyLA</a></li>