← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #36800

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18816: Login page, moved language selector to the right. Added right footer appearance text.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 18816
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-04-07 11:42:13 +0200
message:
  Login page, moved language selector to the right. Added right footer appearance text.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemAppearanceSettings.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettingsString.vm


--
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-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-03-26 14:13:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-04-07 09:42:13 +0000
@@ -52,6 +52,7 @@
     final String KEY_APPLICATION_INTRO = "keyApplicationIntro";
     final String KEY_APPLICATION_NOTIFICATION = "keyApplicationNotification";
     final String KEY_APPLICATION_FOOTER = "keyApplicationFooter";
+    final String KEY_APPLICATION_RIGHT_FOOTER = "keyApplicationRightFooter";
     final String KEY_FLAG = "keyFlag";
     final String KEY_FLAG_IMAGE = "keyFlagImage";
     final String KEY_START_MODULE = "startModule";

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2014-12-16 13:13:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2015-04-07 09:42:13 +0000
@@ -131,18 +131,32 @@
   position: absolute;
   bottom: 0;
   left: 0;
-  padding: 10px 0 9px 0;
+  padding: 8px 0 7px 0;
   font-size: 13px;
   border-top: 1px solid #416f9d;
   color: #6b90b8;
   width: 100%;
 }
 
-#poweredByLabel
-{
+.innerFooterArea
+{
+  line-height: 26px;
+  display: inline-block;
+  vertical-align: middle;
+}  
+
+#leftFooterArea
+{
+  float: left;
   margin-left: 50px;
 }
 
+#rightFooterArea
+{
+  float: right;
+  margin-right: 50px;
+}
+
 #localeSelect
 {
   width: 160px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2014-10-17 13:04:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2015-04-07 09:42:13 +0000
@@ -84,17 +84,18 @@
         </div>
         </div>
         <div id="footerArea">
-        	<span id="poweredByLabel">Powered by</span>
-        	<a href="http://www.dhis2.org";>DHIS 2</a>&nbsp;
-        	<span id="applicationFooter">$!{keyApplicationFooter}</span>
-
-        	<select id="localeSelect" onchange="login.localeChanged()" style="margin-left: 30px">
-        		<option value="">[ Change language ]</option>
-        		#foreach( $locale in $availableLocales )
-        		<option value="${locale.language}">${locale.displayName}</option>
-		        #end
-	        </select>
-
+        	<div id="leftFooterArea" class="innerFooterArea">
+	        	Powered by <a href="http://www.dhis2.org";>DHIS 2</a>&nbsp; <span id="applicationFooter">$!{keyApplicationFooter}
+		    </div>
+			<div id="rightFooterArea" class="innerFooterArea">
+				$!{keyApplicationRightFooter}
+				<select id="localeSelect" onchange="login.localeChanged()" style="margin-left: 30px">
+	        		<option value="">[ Change language ]</option>
+	        		#foreach( $locale in $availableLocales )
+	        		<option value="${locale.language}">${locale.displayName}</option>
+			        #end
+		        </select>
+		    </div>
         </div>
     </body>
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java	2015-03-30 13:18:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java	2015-04-07 09:42:13 +0000
@@ -103,6 +103,7 @@
         map.put( KEY_APPLICATION_INTRO, systemSettingManager.getSystemSetting( KEY_APPLICATION_INTRO ) );
         map.put( KEY_APPLICATION_NOTIFICATION, systemSettingManager.getSystemSetting( KEY_APPLICATION_NOTIFICATION ) );
         map.put( KEY_APPLICATION_FOOTER, systemSettingManager.getSystemSetting( KEY_APPLICATION_FOOTER ) );
+        map.put( KEY_APPLICATION_RIGHT_FOOTER, systemSettingManager.getSystemSetting( KEY_APPLICATION_RIGHT_FOOTER ) );
         map.put( KEY_FLAG, systemSettingManager.getSystemSetting( KEY_FLAG, DEFAULT_FLAG ) );
         map.put( KEY_FLAG_IMAGE, systemSettingManager.getFlagImage() );
         map.put( KEY_START_MODULE, systemSettingManager.getSystemSetting( KEY_START_MODULE, DEFAULT_START_MODULE ) );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java	2015-04-07 09:42:13 +0000
@@ -93,6 +93,13 @@
     {
         this.applicationFooter = applicationFooter;
     }
+    
+    private String applicationRightFooter;
+
+    public void setApplicationRightFooter( String applicationRightFooter )
+    {
+        this.applicationRightFooter = applicationRightFooter;
+    }
 
     private String flag;
 
@@ -168,6 +175,7 @@
         applicationTitle = StringUtils.trimToNull( applicationTitle );
         applicationNotification = StringUtils.trimToNull( applicationNotification );
         applicationFooter = StringUtils.trimToNull( applicationFooter );
+        applicationRightFooter = StringUtils.trimToNull( applicationRightFooter );
         flag = StringUtils.trimToNull( flag );
         startModule = StringUtils.trimToNull( startModule );
 
@@ -185,6 +193,7 @@
         systemSettingManager.saveSystemSetting( KEY_APPLICATION_INTRO + localeSelect, applicationIntro );
         systemSettingManager.saveSystemSetting( KEY_APPLICATION_NOTIFICATION + localeSelect, applicationNotification );
         systemSettingManager.saveSystemSetting( KEY_APPLICATION_FOOTER + localeSelect, applicationFooter );
+        systemSettingManager.saveSystemSetting( KEY_APPLICATION_RIGHT_FOOTER + localeSelect, applicationRightFooter );
         systemSettingManager.saveSystemSetting( KEY_FLAG, flag );
         systemSettingManager.saveSystemSetting( KEY_START_MODULE, startModule );
         systemSettingManager.saveSystemSetting( KEY_REQUIRE_ADD_TO_VIEW, requireAddToView );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-03-31 15:57:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-04-07 09:42:13 +0000
@@ -92,7 +92,8 @@
 tls=TLS
 email_sender=Email sender
 allows_html=allows HTML
-application_footer=Application footer
+application_left_footer=Application left-side footer
+application_right_footer=Application right-side footer
 user_credentials_expires=Require user account password change
 never=Never
 months=Months

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemAppearanceSettings.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemAppearanceSettings.js	2013-10-16 17:46:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemAppearanceSettings.js	2015-04-07 09:42:13 +0000
@@ -6,5 +6,6 @@
 		$( '#applicationIntro' ).val( json.keyApplicationIntro );
 		$( '#applicationNotification' ).val( json.keyApplicationNotification );
 		$( '#applicationFooter' ).val( json.keyApplicationFooter );
+		$( '#applicationRightFooter' ).val( json.keyApplicationRightFooter );
 	} );	
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm	2015-02-13 12:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm	2015-04-07 09:42:13 +0000
@@ -6,6 +6,7 @@
                 applicationIntro: getFieldValue( 'applicationIntro' ),
                 applicationNotification: getFieldValue( 'applicationNotification' ),
                 applicationFooter: getFieldValue( 'applicationFooter' ),
+                applicationRightFooter: getFieldValue( 'applicationRightFooter' ),
                 currentStyle: getFieldValue( 'currentStyle' ),
 				startModule: getFieldValue( 'startModule' ),
 				flag: getFieldValue( 'flag' ),
@@ -47,10 +48,14 @@
 
 <div class="setting"><textarea id="applicationNotification" name="applicationNotification">$!{keyApplicationNotification}</textarea></div>
 
-<div class="settingLabel">$i18n.getString( "application_footer" ) <span class="tipText">($i18n.getString( "allows_html" ))</span></div>
+<div class="settingLabel">$i18n.getString( "application_left_footer" ) <span class="tipText">($i18n.getString( "allows_html" ))</span></div>
 
 <div class="setting"><textarea id="applicationFooter" name="applicationFooter">$!{keyApplicationFooter}</textarea></div>
 
+<div class="settingLabel">$i18n.getString( "application_right_footer" ) <span class="tipText">($i18n.getString( "allows_html" ))</span></div>
+
+<div class="setting"><textarea id="applicationRightFooter" name="applicationRightFooter">$!{keyApplicationRightFooter}</textarea></div>
+
 <div class="settingLabel">$i18n.getString( "style" )</div>
 
 <div class="setting">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettingsString.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettingsString.vm	2013-10-16 17:46:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettingsString.vm	2015-04-07 09:42:13 +0000
@@ -2,5 +2,6 @@
 "applicationTitle": "$!encoder.jsonEncode( $!translations.get( "applicationTitle" ) )",
 "keyApplicationIntro": "$!encoder.jsonEncode( $translations.get( "keyApplicationIntro" ) )",
 "keyApplicationNotification": "$!encoder.jsonEncode( $translations.get( "keyApplicationNotification" ) )",
-"keyApplicationFooter": "$!encoder.jsonEncode( $translations.get( "keyApplicationFooter" ) )"
+"keyApplicationFooter": "$!encoder.jsonEncode( $translations.get( "keyApplicationFooter" ) )",
+"keyApplicationRightFooter": "$!encoder.jsonEncode( $translations.get( "keyApplicationRightFooter" ) )"
 }
  Thread Previous • Date Previous • • Thread Next