dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14450
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4914: (mobile) several minor changes to light module, mainly footer changes, but also some i18n
------------------------------------------------------------
revno: 4914
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-12 23:08:12 +0200
message:
(mobile) several minor changes to light module, mainly footer changes, but also some i18n
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetPeriodsAction.java
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css
--
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-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetPeriodsAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetPeriodsAction.java 2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetPeriodsAction.java 2011-10-12 21:08:12 +0000
@@ -53,8 +53,8 @@
public class GetPeriodsAction
implements Action
{
- private static final int MAX_PERIODS = 36;
-
+ private static final int MAX_PERIODS = 10;
+
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -90,7 +90,7 @@
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
-
+
private Integer organisationUnitId;
public void setOrganisationUnitId( Integer organisationUnitId )
@@ -132,25 +132,25 @@
// -------------------------------------------------------------------------
// Action Implementation
// -------------------------------------------------------------------------
-
+
@Override
public String execute()
{
if ( dataSetId != null )
{
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
-
+
DataSet dataSet = dataSetService.getDataSet( dataSetId );
CalendarPeriodType periodType = (CalendarPeriodType) dataSet.getPeriodType();
- periods = periodType.generateLast5Years( new Date() );
+ periods = periodType.generateLast5Years( new Date() );
FilterUtils.filter( periods, new PastAndCurrentPeriodFilter() );
Collections.reverse( periods );
-
+
if ( periods.size() > MAX_PERIODS )
{
periods = periods.subList( 0, MAX_PERIODS );
}
-
+
for ( Period period : periods )
{
period.setName( format.formatPeriod( period ) );
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2011-10-12 21:08:12 +0000
@@ -1,13 +1,15 @@
+menu = Menu
+home = Home
+navigate_to = Navigate to
+dashboard = Dashboard
+data_entry = Data Entry
+logout = Logout
+desktop_version = Desktop version
report_table_parameters = Report parameters
get_report = Get report
+reporting_period = Report period
select_organisation_unit = Please select organisation unit
-DHIS_2=DHIS 2
-data_entry = Data Entry
-dashboard = Dashboard
available_datasets = Available data sets
available_organisation_units = Available organisation units
-logout = Logout
available_periods = Available periods
-menu = Menu
-save = Save
-reporting_period = Report period
+dataset_is_complete = DataSet is complete
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm 2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm 2011-10-12 21:08:12 +0000
@@ -61,20 +61,22 @@
<div class="header-box" align="center">
<p style="text-align: left;">
<input type="checkbox" id="complete" name="complete" value="true" #if($complete)checked="true"#end style="width: 15px; height: 15px; vertical-align: middle;" />
- <label for="complete" style="vertical-align: middle; width: auto;">DataSet is complete</label>
+ <label for="complete" style="vertical-align: middle; width: auto;">$i18n.getString("dataset_is_complete")</label>
</p>
</div>
<div class="header-box" align="center">
<p>
- <input type="submit" style="width: 100%;" value=$i18n.getString("save")/>
+ <input type="submit" style="width: 100%;" value="$i18n.getString("save")" />
</p>
</div>
</form>
<div id="footer">
-<ul><li>
-<a href="selectPeriod.action">$i18n.getString("available_periods")</a></li>
+<h2>Navigate to</h2>
+<ul>
+ <li><a href="selectPeriod.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$periodId">$i18n.getString("available_periods")</a></li>
+ <li><a href="index.action">$i18n.getString("home")</a></li>
</ul>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2011-10-12 13:13:14 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2011-10-12 21:08:12 +0000
@@ -1,7 +1,7 @@
<html>
<head>
-<title>$i18n.getString("DHIS_2")</title>
+<title>$i18n.getString("district_health_information_software")</title>
<meta name="viewport" content="width=device-width, user-scalable=yes" />
<link rel="stylesheet" href="/dhis-web-light/style/light.css" />
</head>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm 2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm 2011-10-12 21:08:12 +0000
@@ -9,9 +9,9 @@
</p>
<div id="footer">
-
+<h2>Navigate to</h2>
<ul>
+ <li><a href="index.action">$i18n.getString("desktop_version")</a></li>
<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString("logout")</a></li>
</ul>
-
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm 2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectDataSet.vm 2011-10-12 21:08:12 +0000
@@ -9,7 +9,9 @@
</p>
<div id="footer">
-<ul><li>
-<a href="selectOrganisationUnit.action">$i18n.getString("available_organisation_units")</a></li>
+<h2>Navigate to</h2>
+<ul>
+ <li><a href="selectOrganisationUnit.action">$i18n.getString("available_organisation_units")</a></li>
+ <li><a href="index.action">$i18n.getString("home")</a></li>
</ul>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm 2011-10-12 17:32:39 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectOrganisationUnit.vm 2011-10-12 21:08:12 +0000
@@ -10,7 +10,8 @@
</p>
<div id="footer">
-<ul><li>
-<a href="index.action">$i18n.getString("menu")</a></li>
+<h2>Navigate to</h2>
+<ul>
+ <li><a href="index.action">$i18n.getString("home")</a></li>
</ul>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm 2011-10-12 17:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm 2011-10-12 21:08:12 +0000
@@ -13,7 +13,9 @@
</p>
<div id="footer">
-<ul><li>
-<a href="selectDataSet.action">$i18n.getString("available_datasets")</a></li>
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+ <li><a href="selectDataSet.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId">$i18n.getString("available_datasets")</a></li>
+ <li><a href="index.action">$i18n.getString("home")</a></li>
</ul>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css 2011-10-11 17:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css 2011-10-12 21:08:12 +0000
@@ -100,17 +100,29 @@
*
*/
body div#footer {
+ font-size: 0.9em;
background-color: #F6F6F6;
border-top: 1px solid #D8D8D8;
- padding: .7em 0em;
+ padding-left: 2%;
+ padding-right: 2%;
+ padding-bottom: 6px;
+ padding-top: 6px;
clear: both;
- height: 1.5em;
display: block;
}
+body div#footer h2 {
+ font-size: 0.9em;
+ color: black;
+ line-height: normal;
+ border: none;
+ padding: 0;
+ clear: both;
+}
+
body div#footer ul {
- margin-left: 2em;
- padding-left: 0;
+ margin-left: 0;
+ padding-left: 5px;
padding-right: 0;
margin-bottom: 0;
margin-top: 0;
@@ -123,14 +135,13 @@
}
body div#footer p {
- margin-left: 2%;
margin-top: .3em;
padding: 0;
}
body div#footer ul li {
list-style-type: none;
- text-align: right;
+ text-align: left;
}
/*
