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

[Graeme Foster]

Fixed log 296

Spotted a bug in the logic for the donation request button

=== modified file 'controllers/don.py'
--- controllers/don.py	2011-09-05 15:50:16 +0000
+++ controllers/don.py	2011-09-06 06:48:25 +0000
@@ -164,28 +164,30 @@
     
     # 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]]
-                                            )
-                                    ),
-                            # 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"),
-                            )
-                       )
+    reportButtons = DIV(
+                        BUTTON(T("Donation Request Form"),
+                               _class="accept-button",
+                               _onClick="javascript: window.location='%s'" % \
+                                    URL(c=request.controller,
+                                        f="req_print",
+                                        args=request.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"),
+                        )
+    if "rheader" in output:
+        output["rheader"].append(reportButtons)
+    else:
+        output["rheader"] = reportButtons
     return output
 
 def req_print():

=== modified file 'static/styles/S3/sahana.css'
--- static/styles/S3/sahana.css	2011-09-05 15:50:16 +0000
+++ static/styles/S3/sahana.css	2011-09-06 06:48:25 +0000
@@ -195,10 +195,10 @@
 #header{overflow:hidden;position:relative;}
 #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 #logo{margin:12px 0px 0px 70px;}
+
+
+#header #personal-menu{float:right;width:798px;margin-right:0px;font-size:0.90em;}
 #header #personal-menu .pmenu-wrapper{float:right;}
 #header #personal-menu *{float:left;}
 #header #personal-menu ul{border-right:1px #6994bc solid;padding-bottom:5px;}

=== modified file 'views/layout.html'
--- views/layout.html	2011-09-05 15:50:16 +0000
+++ views/layout.html	2011-09-06 06:48:25 +0000
@@ -74,13 +74,13 @@
   			    <img src='/{{=request.application}}/static/img/la/cityofla_logo.png' height='114' width='112' alt='{{=T("City of Los Angeles Emergency Management Department")}}' />
   			  </a>
   			</div> 
+            <div id='personal-menu'>
+                {{=MENUS3(response.menu, _type="personal-menu", _current_lang=request.vars.get("_language"), _menu_langs=s3.menu_lang)}}
+            </div>
   			<div id='logo'>
   			  <a href='/{{=request.application}}' title='{{=T("Return to Home Page")}}'>
   			    <img src='/{{=request.application}}/static/img/la/logo.png' height='58' width='284' alt='{{=T("Give to Los Angeles Logo")}}' />
   			  </a>
-  			</div> 
-  			<div id='personal-menu'>
-  			    {{=MENUS3(response.menu, _type="personal-menu", _current_lang=request.vars.get("_language"), _menu_langs=s3.menu_lang)}}
   			</div>
 			  <a href='#main-content' class='skipnavigation'>Skip to Content</a> 
 			  {{=MENUS3(response.menu, _type="nav", _id="nav", _highlight=request["wsgi"]["environ"]["PATH_INFO"])}}