dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19516
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8541: Improved system settings screens
------------------------------------------------------------
revno: 8541
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-16 15:03:12 +0200
message:
Improved system settings screens
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
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/systemAppearanceSettings.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.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-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-10-15 08:33:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2012-10-16 13:03:12 +0000
@@ -486,6 +486,28 @@
}
/*----------------------------------------------------------------------------*/
+/* Settings */
+/*----------------------------------------------------------------------------*/
+
+.settingLabel
+{
+ padding: 2px;
+ font-size: 10pt;
+}
+
+.setting
+{
+ padding: 2px;
+ font-size: 10pt;
+ margin-bottom: 15px;
+}
+
+.setting input[type=text],input[type=password],select
+{
+ width: 25em;
+}
+
+/*----------------------------------------------------------------------------*/
/* Paging */
/*----------------------------------------------------------------------------*/
=== 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 2012-10-11 14:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2012-10-16 13:03:12 +0000
@@ -1,4 +1,4 @@
-omit_indicators_zero_numerator_data_mart=Omit indicator values with zero numerator value in data mart
+omit_indicators_zero_numerator_data_mart=Omit indicator values with zero numerator in data mart
dashboard_charts_to_display=Dashboard Charts to Display
code=Code
system_settings=System settings
=== 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 2012-10-11 11:56:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm 2012-10-16 13:03:12 +0000
@@ -17,42 +17,44 @@
<h3>$i18n.getString( "appearance_settings" ) #openHelp( "systemAppearanceSettings" )</h3>
-<h4>$i18n.getString( "application_title" )</h4>
-
-<p><input type="text" id="applicationTitle" name="applicationTitle" style="width:30em" maxlength="40" value="$!{applicationTitle}"/></p>
-
-<h4>$i18n.getString( "application_introduction" )</h4>
-
-<p><input type="text" id="applicationIntro" name="applicationIntro" style="width:30em" maxlength="80" value="$!{applicationIntro}"/></p>
-
-<h4>$i18n.getString( "style" )</h4>
-
-<select id='currentStyle' name='currentStyle' style="width:30em">
+<div class="settingLabel">$i18n.getString( "application_title" )</div>
+
+<div class="setting"><input type="text" id="applicationTitle" name="applicationTitle" maxlength="40" value="$!{applicationTitle}"/></div>
+
+<div class="settingLabel">$i18n.getString( "application_introduction" )</div>
+
+<div class="setting"><input type="text" id="applicationIntro" name="applicationIntro" maxlength="80" value="$!{applicationIntro}"/></div>
+
+<div class="settingLabel">$i18n.getString( "style" )</div>
+
+<div class="setting">
+<select id="currentStyle" name="currentStyle">
#foreach( $style in $styles.entrySet() )
<option value="$style.value" #if( $style.value == $currentStyle )selected="selected"#end>$i18n.getString( $style.key )</option>
#end
</select>
-
-<h4>$i18n.getString( "flag" )</h4>
-
-<p>
-<select id="flag" name="flag" style="width:30em">
+</div>
+
+<div class="settingLabel">$i18n.getString( "flag" )</div>
+
+<div class="setting">
+<select id="flag" name="flag">
<option value="NO_FLAG">$i18n.getString( "no_flag" )</option>
#foreach ( $flag in $flags )
<option value="$flag" #if( $flag == $keyFlag )selected="selected"#end>$i18n.getString( $flag )</option>
#end
</select>
-</p>
-
-<h4>$i18n.getString( "start_page" )</h4>
-
-<p>
-<select id="startModule" name="startModule" style="width:30em">
+</div>
+
+<div class="settingLabel">$i18n.getString( "start_page" )</div>
+
+<div class="setting">
+<select id="startModule" name="startModule">
<option value="NO_START_PAGE">$i18n.getString( "system_overview" )</option>
#foreach ( $module in $modules )
<option value="$module.name" #if( $module.name == $startModule )selected="selected"#end>$i18n.getString( "$module.name" )</option>
#end
</select>
-</p>
+</div>
-<p><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></p>
\ No newline at end of file
+<div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm 2012-04-16 12:26:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm 2012-10-16 13:03:12 +0000
@@ -17,23 +17,22 @@
});
</script>
-
<h3>$i18n.getString( "smtp_settings" ) #openHelp( "systemEmailSettings" )</h3>
<form id="emailSettingForm">
-<h4>$i18n.getString( "host_name" )</h4>
-
-<p><input type="text" id="smtpHostName" name="smtpHostName" style="width:20em" value="$!smtpHostName"/></p>
-
-<h4>$i18n.getString( "username" )</h4>
-
-<p><input type="text" id="smtpUsername" name="smtpUsername" value="$!smtpUsername" style="width:20em" autocomplete="off"/></p>
-
-<h4>$i18n.getString( "password" )</h4>
-
-<p><input type="password" id="smtpPassword" name="smtpPassword" value="$!smtpPassword" style="width:20em" autocomplete="off"/></p>
-
-<p><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/></p>
+<div class="settingLabel">$i18n.getString( "host_name" )</div>
+
+<div class="setting"><input type="text" id="smtpHostName" name="smtpHostName" style="width:20em" value="$!smtpHostName"/></div>
+
+<div class="settingLabel">$i18n.getString( "username" )</div>
+
+<div class="setting"><input type="text" id="smtpUsername" name="smtpUsername" value="$!smtpUsername" style="width:20em" autocomplete="off"/></div>
+
+<div class="settingLabel">$i18n.getString( "password" )</div>
+
+<div class="setting"><input type="password" id="smtpPassword" name="smtpPassword" value="$!smtpPassword" style="width:20em" autocomplete="off"/></div>
+
+<div class="settingLabel"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/></div>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-10-03 18:12:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-10-16 13:03:12 +0000
@@ -21,56 +21,51 @@
<h3>$i18n.getString( "general_settings" ) #openHelp( "systemGeneralSettings" )</h3>
-<!-- cache_strategy -->
-<h4>$i18n.getString( "cache_strategy" )</h4>
+<div class="settingLabel">$i18n.getString( "cache_strategy" )</div>
-<p>
-<select id="cacheStrategy" name="cacheStrategy" style="width:30em">
+<div class="setting">
+<select id="cacheStrategy" name="cacheStrategy">
<option value="NO_CACHE" #if( $keyCacheStrategy == "NO_CACHE" )selected="selected"#end>$i18n.getString( "no_cache" )</option>
<option value="CACHE_6AM_TOMORROW" #if( $keyCacheStrategy == "CACHE_6AM_TOMORROW" )selected="selected"#end>$i18n.getString( "cache_until_6am_tomorrow" )</option>
<option value="CACHE_TWO_WEEKS" #if( $keyCacheStrategy == "CACHE_TWO_WEEKS" )selected="selected"#end>$i18n.getString( "cache_for_two_weeks" )</option>
</select>
-</p>
-
-<!-- infrastructural_data_elements -->
-<h4>$i18n.getString( "infrastructural_data_elements" )</h4>
-
-<p>
-<select id="infrastructuralDataElements" name="infrastructuralDataElements" style="width:30em">
+</div>
+
+<div class="settingLabel">$i18n.getString( "infrastructural_data_elements" )</div>
+
+<div class="setting">
+<select id="infrastructuralDataElements" name="infrastructuralDataElements">
#foreach ( $group in $dataElementGroups )
<option value="$group.id" #if( $group.id == $configuration.infrastructuralDataElements.id )selected="selected"#end>$group.name</option>
#end
</select>
-</p>
-
-<!-- infrastructural_period_type -->
-<h4>$i18n.getString( "infrastructural_period_type" )</h4>
-
-<p>
-<select id="infrastructuralPeriodType" name="infrastructuralPeriodType" style="width:30em">
+</div>
+
+<div class="settingLabel">$i18n.getString( "infrastructural_period_type" )</div>
+
+<div class="setting">
+<select id="infrastructuralPeriodType" name="infrastructuralPeriodType">
#foreach ( $type in $periodTypes )
<option value="$type.name" #if( $type.name == $configuration.infrastructuralPeriodTypeDefaultIfNull.name )selected="selected"#end>$type.name</option>
#end
</select>
-</p>
-
-<!-- feedback_recipients -->
-<h4>$i18n.getString( "feedback_recipients" )</h4>
-
-<p>
-<select id="feedbackRecipients" name="feedbackRecipients" style="width:30em">
+</div>
+
+<div class="settingLabel">$i18n.getString( "feedback_recipients" )</div>
+
+<div class="setting">
+<select id="feedbackRecipients" name="feedbackRecipients" style="width:25em">
<option value="-1">$i18n.getString( "no_feedback_recipients" )</option>
#foreach ( $group in $userGroups )
<option value="$group.id" #if( $group.id == $!feedbackRecipients.id )selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
#end
</select>
-</p>
-
-<!-- max_levels_to_offline -->
-<h4>$i18n.getString( "max_levels_to_offline" )</h4>
-
-<p>
-<select id="offlineOrganisationUnitLevel" name="offlineOrganisationUnitLevel" style="width:30em">
+</div>
+
+<div class="settingLabel">$i18n.getString( "max_levels_to_offline" )</div>
+
+<div class="setting">
+<select id="offlineOrganisationUnitLevel" name="offlineOrganisationUnitLevel">
#set( $level = 1)
#foreach ( $organisationUnitLevel in $organisationUnitLevels )
@@ -78,35 +73,28 @@
#set( $level = $level + 1)
#end
</select>
-</p>
-
-<!-- omit_indicators_zero_numerator_data_mart -->
-<h4>$i18n.getString( "omit_indicators_zero_numerator_data_mart" )</h4>
-
-<p>
- <input type="checkbox" id="omitIndicatorsZeroNumeratorDataMart" name="omitIndicatorsZeroNumeratorDataMart" #if( $omitIndicatorsZeroNumeratorDataMart )checked="checked"#end/>
-</p>
-
-<!-- data_analysis_factor -->
-<h4>$i18n.getString( "data_analysis_factor" )</h4>
-
-<p>
- <input type="text" id="factorDeviation" name="factorDeviation" value="$!factorDeviation"/>
-</p>
-
-<!-- days_after_period_timeliness -->
-<h4>$i18n.getString( "days_after_period_timeliness" )</h4>
-
-<p>
- <input type="text" id="completenessOffset" name="completenessOffset" value="$!completenessOffset"/>
-</p>
-
-
-<!-- area code -->
-<h4>$i18n.getString( "phone_number_area_code" )</h4>
-
-<p>
+</div>
+
+<div class="settingLabel">$i18n.getString( "data_analysis_factor" )</div>
+<div class="setting">
+ <input type="text" id="factorDeviation" name="factorDeviation" value="$!factorDeviation"/>
+</div>
+
+<div class="settingLabel">$i18n.getString( "days_after_period_timeliness" )</div>
+
+<div class="setting">
+ <input type="text" id="completenessOffset" name="completenessOffset" value="$!completenessOffset"/>
+</div>
+
+<div class="settingLabel">$i18n.getString( "phone_number_area_code" )</div>
+
+<div class="setting">
<input type="text" id="phoneNumberAreaCode" name="phoneNumberAreaCode" value="$!phoneNumberAreaCode"/>
-</p>
-
-<p><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></p>
\ No newline at end of file
+</div>
+
+<div class="setting">
+ <input type="checkbox" id="omitIndicatorsZeroNumeratorDataMart" name="omitIndicatorsZeroNumeratorDataMart" #if( $omitIndicatorsZeroNumeratorDataMart )checked="checked"#end/>
+ <label for="omitIndicatorsZeroNumeratorDataMart">$i18n.getString( "omit_indicators_zero_numerator_data_mart" )</label>
+</div>
+
+<div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>
