dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6233
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-09 14:21:38 +0100
message:
  Improved help center
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/helpitems_stylesheet.xsl
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/helpitems_stylesheet.xsl'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/helpitems_stylesheet.xsl	2012-01-22 05:29:27 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/helpitems_stylesheet.xsl	2012-03-09 13:21:38 +0000
@@ -3,7 +3,7 @@
 <xsl:output method="html" encoding="UTF-8"/>
 
 <xsl:template match="chapter">
-  <h5><xsl:value-of select="title"/></h5>
+  <h6><xsl:value-of select="title"/></h6>
   <div>
     <ul><xsl:apply-templates select="descendant::section[@id]"/></ul>
   </div>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm	2010-05-06 14:59:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/help.vm	2012-03-09 13:21:38 +0000
@@ -4,6 +4,11 @@
 <table>
 <tr>
 <td valign="top"><div id="helpMenu"></div></td>
-<td valign="top"><div id="helpContent">$i18n.getString( "help_intro" )</div></td>
+<td valign="top">
+	<div id="helpContent">
+		<h3>$i18n.getString( "help_intro_header" )<h3>
+		<p>$i18n.getString( "help_intro_text" )</p>
+	</div>
+</td>
 </tr>
 </table>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-03-04 16:39:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-03-09 13:21:38 +0000
@@ -66,16 +66,13 @@
 div#helpMenu
 {
   width: 260px;
-  padding-top: 7px;
-  padding-bottom: 13px;
-  padding-left: 20px;
-  padding-right: 20px;
-  border: 1px solid #a0a0a0;
+  margin-right: 15px;
 }
 
 div#helpMenu ul
 {
   list-style-type: none;
+  font-size: 9pt;
 }
 
 div#helpMenu a
@@ -83,20 +80,24 @@
   text-decoration: none;
 }
 
-div#helpMenu h5
+div#helpMenu h6
 {
-  cursor:pointer;
+  cursor: pointer;
+  padding: 3px 0px 4px 25px;
 }
 
 div#helpContent
 {
-  padding-left: 20px;
-  padding-right: 20px;
+  margin-top: 1px;
+  margin-right: 15px;
+  border: 1px solid #c0c0c0; 
+  padding: 10px 20px 20px 20px;
+  border-radius: 3px;
 }
 
-div#helpContent ul,ol
+div#helpContent ul, ol
 {
-  padding-left: 17px;
+  padding-left: 15px;
 }
 
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-03-06 13:48:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-03-09 13:21:38 +0000
@@ -812,7 +812,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-commons/about/help.vm</param>
       <param name="menu">/dhis-web-commons/about/menu.vm</param>
-      <param name="javascripts">../dhis-web-commons/util/jquery-ui.js,../dhis-web-commons/about/help.js</param>
+      <param name="javascripts">../dhis-web-commons/about/help.js</param>
     </action>
 
     <action name="getHelpContent" class="org.hisp.dhis.help.action.GetHelpContentAction">

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-03-09 11:46:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-03-09 13:21:38 +0000
@@ -333,7 +333,8 @@
 update_user_success=Updated information successfully
 wrong_password=Wrong password
 help_center=Help Center
-help_intro=Welcome to the DHIS 2 Help Center. Please select an item from the menu to the left.
+help_intro_header=Welcome to the DHIS 2 Help Center
+help_intro_text=Please select an item from the menu to the left.
 please_wait_while_the_system_is_processing=Please wait while the system is processing
 
 #-- Contact info ---------------------------------------------------------------#