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

[Graeme Foster]

changes for LA logs:

152, Skills widget - height
205, Assignment screen: Cancel Assignment button
216, Padding on the tables in the rheader
220, Links to Download adobe acrobat reader
227, Give2LA in Quote: 2 too small
276, Click Why from some screens, goes to /default/
286, Donation Drive - Add a Comments Field
290, Add New Voucher Distribution - Remove 'Requested by'
291, Add New Voucher Distribution -Add a comments field

Also started work on 237, Donation Request Form - need more details on what's to go in the form and have I put it in the right place. (/don/req/7/commit?inv_item_id=1)

=== modified file 'controllers/don.py'
--- controllers/don.py	2011-09-02 07:42:58 +0000
+++ controllers/don.py	2011-09-03 14:23:25 +0000
@@ -164,8 +164,40 @@
     
     # Defined in the Model for use from Multiple Controllers for unified menus
     output =  response.s3.req_controller()
+    output["rheader"].append(
+                       DIV(
+                            BUTTON(T("Donation Request Form"),
+                                   _class="accept-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req_print",
+                                            args=[request.args[0]]
+                                            )
+                                    ),
+                            BUTTON("",
+                                   _class="acrobatReader",
+                                   _onClick="javascript: window.open('%s')" % \
+                                        "http://www.adobe.com/products/acrobat/readstep2.html"),
+
+                            )
+                       )
     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 = "Donation Request",
+                    header = lambda x, y: None,
+                    footer = lambda x, y: None,
+                    )
+    return r()
+
 # -----------------------------------------------------------------------------
 # @ToDo: move to inside a prep - only for inv_item components
 # Add inv_item directly to Org
@@ -527,6 +559,17 @@
 # -----------------------------------------------------------------------------
 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
 

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2011-09-02 12:42:17 +0000
+++ controllers/vol.py	2011-09-03 14:23:25 +0000
@@ -1619,6 +1619,11 @@
                                                   "assignment",
                                                   assignment,
                                                   "print"])),
+                            BUTTON("",
+                                   _class="acrobatReader",
+                                   _onClick="javascript: window.open('%s')" % \
+                                        "http://www.adobe.com/products/acrobat/readstep2.html"),
+
                             BR(),
                             BUTTON(T("CANCEL ASSIGNMENT"),
                                    _class="wide-grey-button",

=== modified file 'models/don.py'
--- models/don.py	2011-09-01 16:28:16 +0000
+++ models/don.py	2011-09-03 14:23:25 +0000
@@ -63,6 +63,12 @@
                                                 empty = False,
                                                 widget = None
                                                 ),
+                                comments("donation_comments",
+                                         writable = True,
+                                         label = T("Donation Comments"),
+                                         comment=DIV(_class="tooltip",
+                                            _title="%s|%s" % (T("Donation Comments"),
+                                                              T("Additional comments concerning this donation drive.")))),
                                 Field("volume",
                                       "double",
                                       label = T("Volume Collected (cub. ft)")),
@@ -97,10 +103,10 @@
                                 event_id(default=session.s3.event),
                                 Field("date",
                                       "date"),
-                                human_resource_id("requested_by_id",
-                                                  label = T("Requested By"),
-                                                  empty = False,
-                                                  default = s3_logged_in_human_resource()),
+#                                human_resource_id("requested_by_id",
+#                                                  label = T("Requested By"),
+#                                                  empty = False,
+#                                                  default = s3_logged_in_human_resource()),
                                 organisation_id(label = T("Distributed By Organization"),
                                                 empty = False,
                                                 ),
@@ -122,6 +128,12 @@
                                            #              _title="%s|%s" % (T("Requested By Facility"),
                                            #                                T("Enter some characters to bring up a list of possible matches"))),
                                            represent = shn_site_represent),
+                                comments("distribute_comments",
+                                         writable = True,
+                                         label = T("Voucher Comments"),
+                                         comment=DIV(_class="tooltip",
+                                            _title="%s|%s" % (T("Distribution Comments"),
+                                                              T("Additional comments about this voucher distribution.")))),
                                 *s3_meta_fields())
         # CRUD strings
         ADD_DISTRIBUTE = T("Record Voucher Distribution")
@@ -217,6 +229,24 @@
                                     )
             canvas.restoreState()
 
+        def donationRequest(pdf, **args):
+            from reportlab.lib.styles import ParagraphStyle
+            from reportlab.lib.styles import getSampleStyleSheet
+            
+            stylesheet=getSampleStyleSheet()
+            normalStyle = stylesheet["Normal"]
+            style = normalStyle
+            styleA = ParagraphStyle(name="StyleA",
+                                    parent=normalStyle,
+                                    fontName="CertFont",
+                                    fontSize=8,
+                                    leading=12,
+                                    borderPadding = (10, 2, 10, 2),
+                                    alignment = 1,
+                                    )
+            line1 = "Thanks for all the fish."
+            pdf.addParagraph(line1, styleA)
+            
         def donationCertificate(pdf, **args):
 
             from reportlab.lib.styles import ParagraphStyle
@@ -360,6 +390,7 @@
 
         # Pass variables back to global scope (response.s3.*)
         return dict(
+                    donationRequest = donationRequest,
                     donationCertificate = donationCertificate,
                     donCertBorder = donCertBorder,
                     )

=== modified file 'modules/s3/s3tools.py'
--- modules/s3/s3tools.py	2011-08-30 06:19:17 +0000
+++ modules/s3/s3tools.py	2011-09-03 14:23:25 +0000
@@ -314,10 +314,11 @@
                 (name, right, link) = item[:3]
                 if not right:
                     import re
+                    _link = link
                     if "default" not in _highlight:
                         _highlight = re.match("(.*/).*$", _highlight).group(1)
-                        link = re.match("(.*/).*$", link).group(1)
-                    _class = "highlight" if str(link) in _highlight else " "
+                        _link = re.match("(.*/).*$", link).group(1)
+                    _class = "highlight" if str(_link) in _highlight else " "
                     items.append(LI(
                         A(name, _href=link, _class=_class)
                     ))

=== added file 'static/img/acrobat_reader_50x50.gif'
Binary files static/img/acrobat_reader_50x50.gif	1970-01-01 00:00:00 +0000 and static/img/acrobat_reader_50x50.gif	2011-09-03 14:23:25 +0000 differ
=== modified file 'static/scripts/S3/ui.multiselect.js'
--- static/scripts/S3/ui.multiselect.js	2011-08-13 21:20:44 +0000
+++ static/scripts/S3/ui.multiselect.js	2011-09-03 14:23:25 +0000
@@ -57,6 +57,9 @@
 		var that = this;
 
 		// set dimensions
+		var displayLines = 8; // added by GF
+		this.element.height(21*displayLines+this.selectedActions.height()+2); // added by GF
+
 		this.container.width(this.element.width()+1);
 		this.selectedContainer.width(Math.floor(this.element.width()*this.options.dividerLocation));
 		this.availableContainer.width(Math.floor(this.element.width()*(1-this.options.dividerLocation)));

=== modified file 'static/styles/S3/sahana.css'
--- static/styles/S3/sahana.css	2011-08-30 09:42:54 +0000
+++ static/styles/S3/sahana.css	2011-09-03 14:23:25 +0000
@@ -196,6 +196,7 @@
 #header #la-logo, #header #logo{float:left;}
 #header #la-logo{margin-top:24px;}
 #header #logo{margin:55px 0px 0px 70px;}
+
 /*#header #personal-menu{float:right;width:50%;margin-right:0px;font-size:0.90em;}*/
 #header #personal-menu{float:right;width:400px;margin-right:0px;font-size:0.90em;}
 #header #personal-menu .pmenu-wrapper{float:right;}
@@ -210,7 +211,7 @@
 #header blockquote .open,#header blockquote .close{position:absolute;display:block;margin-top:10px;width:15px;height:15px;text-indent:9999px;}
 #header blockquote .open{top:-10px;left:52px;float:left;background:url(../../img/la/open_quote.png) no-repeat;}
 #header blockquote .close{bottom:25px;right:12px;float:left;background:url(../../img/la/close_quote.png) no-repeat;}
-
+#header blockquote .give2laTWO{font-weight: bold;}
 /*** Navigation ***/
 
 /* Main Navigation */
@@ -445,8 +446,9 @@
 .submit-button:active{background-position:0px -41px;}
 .print-button{clear:both;width:143px;height:45px;background-image:url(../../img/la/medium_red_button.png);background-repeat:no-repeat;border:0px;color:#fff;font-weight:bold;text-transform:uppercase;}
 a.print-button{display:block;height:30px;padding-top:13px;text-align:center;}
-.wide-grey-button{clear:both;width:130px; height:18px;margin-bottom:10px;background:url(../../img/la/grey_button_wide.png) no-repeat;font-size:0.8em;color:#fff;text-transform:uppercase;}
+.wide-grey-button{clear:both;width:130px; height:18px;margin-bottom:10px;background:url(../../img/la/grey_button_wide.png) no-repeat;font-size:0.7em;color:#fff;text-transform:uppercase;}
 a.wide-grey-button{display:block;padding-top:2px;text-align:center;}
+.acrobatReader{float:right; width:50px; height:50px; background:url(../../img/acrobat_reader_50x50.gif);}
 
 .apply-button,
 .accept-button,
@@ -673,9 +675,11 @@
 td.x-toolbar-left table {
     margin-bottom: 0;
 }
+/* removed by Graeme since it hides some of the Parallax formatting see LA log 216
 table td {
     padding: 0;
 }
+*/
 /* Fix for breadcrumbs */
 div#home {
     /*float: right;*/

=== modified file 'views/layout.html'
--- views/layout.html	2011-08-30 08:30:15 +0000
+++ views/layout.html	2011-09-03 14:23:25 +0000
@@ -84,7 +84,9 @@
   			</div>
 			  <a href='#main-content' class='skipnavigation'>Skip to Content</a> 
 			  {{=MENUS3(response.menu, _type="nav", _id="nav", _highlight=request["wsgi"]["environ"]["PATH_INFO"])}}
-        <blockquote><span class='open'>&#8220;</span><span class='quote'>{{=T("Donate. Volunteer. Serve.")}}<br/>{{=T("Please Give2LA and do your part to ensure LA is ready for a disaster.")}}</span><span class='close'>&#8221;</span><br/><span class='name'>Mayor Antonio Villaraigosa</span></blockquote>
+        <blockquote><span class='open'>&#8220;</span>
+                    <span class='quote'>{{=T("Donate. Volunteer. Serve.")}}<br/>{{=XML(T("Please %(give2la)s and do your part to ensure LA is ready for a disaster.") % {"give2la":"Give<span class='give2laTWO'>2</span>LA"}) }}</span>
+                    <span class='close'>&#8221;</span><br/><span class='name'>Mayor Antonio Villaraigosa</span></blockquote>
       </div><!-- end #header --> 
  
           <div id='content'>