dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13703
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-01-13 17:16:53 +0100
message:
  Scheduling/execution ui, using indentation to indicate that start/end date is a data mart only setting
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-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.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	2014-01-05 18:03:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-01-13 16:16:53 +0000
@@ -522,7 +522,7 @@
 
 .settingHeader
 {
-  padding: 6px 0;
+  padding: 9px 0 6px 0;
   font-size: 12pt;
   color: #373737;
 }
@@ -570,6 +570,11 @@
   height: 8em;
 }
 
+.settingIndent
+{
+  margin-left: 12px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Paging                                                                     */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm	2013-10-16 11:58:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm	2014-01-13 16:16:53 +0000
@@ -9,9 +9,9 @@
 
 <div class="settingHeader">$i18n.getString( "resource_tables" )</div>
 
-<div class="settingLabel">$i18n.getString( "resource_table_task_strategy" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "resource_table_task_strategy" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 <select id="resourceTableStrategy" name="resourceTableStrategy" class="scheduling">
 	<option value="never">$i18n.getString( "never" )</option>
 	<option value="allDaily"#if( $resourceTableStrategy && $resourceTableStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "all_daily" )</option>
@@ -22,9 +22,9 @@
 
 <div class="settingHeader">$i18n.getString( "analytics_tables" )</div>
 
-<div class="settingLabel">$i18n.getString( "analytics_tables_task_strategy" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "analytics_tables_task_strategy" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 <select id="analyticsStrategy" name="analyticsStrategy" class="scheduling">
     <option value="never">$i18n.getString( "never" )</option>
     <option value="allDaily"#if( $analyticsStrategy && $analyticsStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "all_daily" )</option>
@@ -36,9 +36,9 @@
 
 <div class="settingHeader">$i18n.getString( "data_mart" )</div>
 
-<div class="settingLabel">$i18n.getString( "data_mart_task_strategy" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "data_mart_task_strategy" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 <select id="dataMartStrategy" name="dataMartStrategy" class="scheduling" onchange="toggleDataMart()">
     <option value="never">$i18n.getString( "never" )</option>
     <option value="last12Daily"#if( $dataMartStrategy && $dataMartStrategy == "last12Daily" ) selected="selected"#end>$i18n.getString( "last_12_months_daily" )</option>
@@ -46,9 +46,9 @@
 </select>
 </div>
 
-<div class="settingLabel">$i18n.getString( "aggregation_period_types" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "aggregation_period_types" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
     <input type="checkbox" id="weekly" class="scheduling dataMart" name="scheduledPeriodTypes" value="Weekly"#if( $scheduledPeriodTypes.contains( "Weekly" ) ) checked="checked"#end> <label for="weekly">$i18n.getString( "Weekly" )</label>&nbsp;
     <input type="checkbox" id="monthly" class="scheduling dataMart" name="scheduledPeriodTypes" value="Monthly"#if( $scheduledPeriodTypes.contains( "Monthly" ) ) checked="checked"#end> <label for="monthly">$i18n.getString( "Monthly" )</label>&nbsp;
     <input type="checkbox" id="biMonthly" class="scheduling dataMart" name="scheduledPeriodTypes" value="BiMonthly"#if( $scheduledPeriodTypes.contains( "BiMonthly" ) ) checked="checked"#end> <label for="biMonthly">$i18n.getString( "BiMonthly" )</label>&nbsp;
@@ -58,9 +58,9 @@
     <input type="checkbox" id="financialYearly" class="scheduling dataMart" name="scheduledPeriodTypes" value="FinancialJuly"#if( $scheduledPeriodTypes.contains( "FinancialJuly" ) ) checked="checked"#end> <label for="financialYearly">$i18n.getString( "financial_yearly" )</label>			
 </div>
 
-<div class="settingLabel">$i18n.getString( "organisation_unit_group_set_aggregation_level" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "organisation_unit_group_set_aggregation_level" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 <select id="orgUnitGroupSetAggLevel" name="orgUnitGroupSetAggLevel" class="scheduling dataMart">
     <option value="0"#if( $orgUnitGroupSetAggLevel && $orgUnitGroupSetAggLevel == 0 ) selected="selected"#end>[$i18n.getString( "no_aggregation" )]</option>
 	#foreach( $level in $levels )
@@ -73,9 +73,9 @@
 
 <div class="settingHeader">$i18n.getString( "data_monitoring" )</div>
 
-<div class="settingLabel">$i18n.getString( "data_monitoring_strategy" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "data_monitoring_strategy" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 <select id="monitoringStrategy" name="monitoringStrategy" class="scheduling">
     <option value="never">$i18n.getString( "never" )</option>
     <option value="allDaily"#if( $monitoringStrategy && $monitoringStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "all_daily" )</option>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm	2013-09-03 18:28:38 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm	2014-01-13 16:16:53 +0000
@@ -5,7 +5,7 @@
 
 <div class="settingHeader">$i18n.getString( "analytics_tables" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 	<input type="checkbox" id="analytics" checked="checked" />
     <label for="analytics">$i18n.getString( "analytics_tables_update" )</label>
 </div>
@@ -14,14 +14,14 @@
 
 <div class="settingHeader">$i18n.getString( "data_mart" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
     <input type="checkbox" id="dataMart" onclick="toggleDataMart()"/>
     <label for="dataMart">$i18n.getString( "data_mart_tables_update" )</label>
 </div>
 
-<div class="settingLabel">$i18n.getString( "aggregation_period_types" )</div>
+<div class="settingLabel settingIndent">$i18n.getString( "aggregation_period_types" )</div>
 
-<div class="setting">
+<div class="setting settingIndent">
 <input type="checkbox" id="weekly" class="dataMart" name="periodTypes" value="Weekly"> <label for="weekly">$i18n.getString( "Weekly" )</label>&nbsp;
 <input type="checkbox" id="monthly" class="dataMart" name="periodTypes" value="Monthly" checked="checked"> <label for="monthly">$i18n.getString( "Monthly" )</label>&nbsp;
 <input type="checkbox" id="biMonthly" class="dataMart" name="periodTypes" value="BiMonthly"> <label for="biMonthly">$i18n.getString( "BiMonthly" )</label>&nbsp;
@@ -31,13 +31,13 @@
 <input type="checkbox" id="financialYearly" class="dataMart" name="periodTypes" value="FinancialJuly"> <label for="financialYearly">$i18n.getString( "financial_yearly" )</label>
 </div>
 
-<div class="settingLabel">$i18n.getString( "start_date" )</div>
-
-<div class="setting"><input type="text" id="startDate" class="dataMart" style="width:200px"></div>
-
-<div class="settingLabel">$i18n.getString( "end_date" )</div>
-
-<div class="setting"><input type="text" id="endDate" class="dataMart" style="width:200px"></div>
+<div class="settingLabel settingIndent">$i18n.getString( "start_date" )</div>
+
+<div class="setting settingIndent"><input type="text" id="startDate" class="dataMart" style="width:200px"></div>
+
+<div class="settingLabel settingIndent">$i18n.getString( "end_date" )</div>
+
+<div class="setting settingIndent"><input type="text" id="endDate" class="dataMart" style="width:200px"></div>
 
 <div class="setting"><input type="button" onclick="startExport()" value="$i18n.getString( 'start_export' )" style="width:120px"></div>