dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24916
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12257: Impl floating layout of module and intro pages
------------------------------------------------------------
revno: 12257
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-09-26 16:59:56 +0200
message:
Impl floating layout of module and intro pages
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManagerService.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.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/java/org/hisp/dhis/appmanager/DefaultAppManagerService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManagerService.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManagerService.java 2013-09-26 14:59:56 +0000
@@ -104,14 +104,14 @@
}
}
}
-
+
return appList;
}
@Override
public void setAppFolderPath( String appFolderPath )
{
- if(!appFolderPath.isEmpty())
+ if ( !appFolderPath.isEmpty() )
{
try
{
@@ -126,6 +126,7 @@
log.error( ex.getLocalizedMessage(), ex );
}
}
+
appSettingManager.saveSystemSetting( KEY_APP_FOLDER_PATH, appFolderPath );
}
@@ -142,17 +143,19 @@
{
getInstalledApps();
}
-
+
return appFolderNames.get( app );
}
@Override
- public String getAppBaseUrl() {
+ public String getAppBaseUrl()
+ {
return StringUtils.trimToNull( (String) appSettingManager.getSystemSetting( KEY_APP_BASE_URL ) );
}
@Override
- public void setAppBaseUrl(String appBaseUrl) {
+ public void setAppBaseUrl( String appBaseUrl )
+ {
appSettingManager.saveSystemSetting( KEY_APP_BASE_URL, appBaseUrl );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm 2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm 2013-09-26 14:59:56 +0000
@@ -1,24 +1,11 @@
-<table cellspacing="0" cellpadding="0">
-<tr>
-
-<td valign="top">
-<ul class="introList introTwoColList" style="margin-right:15px;">
+<ul class="moduleList">
#introListImgItem( "../dhis-web-commons-about/help.action", "help_center", "function-help-center" )
#introListImgItem( "../dhis-web-commons-about/software.action", "supportive_software", "function-supportive-software" )
#introListImgItem( "../dhis-web-commons-about/modules.action", "system_overview", "function-system-overview" )
#introListImgItem( "../api", "web_api", "function-web-api" )
- #introListImgItem( "../dhis-web-commons-about/about.action", "about_dhis2", "function-about-dhis2" )
-</ul>
-</td>
-
-<td valign="top">
-<ul class="introList introTwoColList">
+ #introListImgItem( "../dhis-web-commons-about/about.action", "about_dhis2", "function-about-dhis2" )
#introListImgItem( "../dhis-web-commons-about/userSettings.action", "settings", "function-settings" )
#introListImgItem( "../dhis-web-commons-about/showUpdateUserProfileForm.action", "profile", "function-profile" )
#introListImgItem( "../dhis-web-commons-about/showUpdateUserAccountForm.action", "account", "function-account" )
- #introListImgItem( "../dhis-web-commons-security/logout.action", "log_out", "function-log-out" )
-</ul>
-</td>
-
-</tr>
-</table>
\ No newline at end of file
+ #introListImgItem( "../dhis-web-commons-security/logout.action", "log_out", "function-log-out" )
+</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm 2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm 2013-09-26 14:59:56 +0000
@@ -1,25 +1,5 @@
-<table cellspacing="0" cellpadding="0">
-<tr>
-
-#if( $maintenanceModules && $maintenanceModules.size() > 0 )
-<td valign="top">
-<ul class="introList introTwoColList" style="margin-right:15px;">
-#foreach( $module in $maintenanceModules )
- #introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
-#end
-</ul>
-</td>
-#end
-
-#if( $serviceModules && $serviceModules.size() > 0 )
-<td valign="top">
-<ul class="introList introTwoColList">
-#foreach( $module in $serviceModules )
- #introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
-#end
-</ul>
-</td>
-#end
-
-</tr>
-</table>
+<ul class="moduleList">
+#foreach( $module in $menuModules )
+ #introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
+#end
+</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-09-19 06:45:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-09-26 14:59:56 +0000
@@ -398,19 +398,33 @@
.introList
{
list-style-type:none;
- width: 490px;
- padding-top: 10px;
- padding-bottom: 20px;
- padding-left: 5px;
- padding-right: 5px;
- color: #444;
-}
-
-.introTwoColList
-{
- padding-left: 0;
- padding-right: 0;
- width: 347px;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.moduleList
+{
+ list-style-type:none;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.introList li
+{
+ width: 435px;
+ margin-right: 30px;
+}
+
+.moduleList li
+{
+ width: 305px;
+ margin-right: 20px;
}
.introIcon
@@ -420,10 +434,11 @@
.introItem
{
- padding: 18px;
+ padding: 15px;
cursor: pointer;
min-height: 44px;
border-bottom: 1px solid #e0e0e0;
+ float: left;
}
.introItem:hover
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-09-19 06:45:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-09-26 14:59:56 +0000
@@ -391,19 +391,33 @@
.introList
{
list-style-type:none;
- width: 490px;
- padding-top: 10px;
- padding-bottom: 20px;
- padding-left: 5px;
- padding-right: 5px;
- color: #444;
-}
-
-.introTwoColList
-{
- padding-left: 0;
- padding-right: 0;
- width: 347px;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.moduleList
+{
+ list-style-type:none;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.introList li
+{
+ width: 435px;
+ margin-right: 30px;
+}
+
+.moduleList li
+{
+ width: 305px;
+ margin-right: 20px;
}
.introIcon
@@ -413,10 +427,11 @@
.introItem
{
- padding: 18px;
+ padding: 15px;
cursor: pointer;
min-height: 44px;
border-bottom: 1px solid #e0e0e0;
+ float: left;
}
.introItem:hover
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-09-19 06:45:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-09-26 14:59:56 +0000
@@ -393,19 +393,33 @@
.introList
{
list-style-type:none;
- width: 490px;
- padding-top: 10px;
- padding-bottom: 20px;
- padding-left: 5px;
- padding-right: 5px;
- color: #444;
-}
-
-.introTwoColList
-{
- padding-left: 0;
- padding-right: 0;
- width: 347px;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.moduleList
+{
+ list-style-type:none;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.introList li
+{
+ width: 435px;
+ margin-right: 30px;
+}
+
+.moduleList li
+{
+ width: 305px;
+ margin-right: 20px;
}
.introIcon
@@ -415,10 +429,11 @@
.introItem
{
- padding: 18px;
+ padding: 15px;
cursor: pointer;
min-height: 44px;
border-bottom: 1px solid #e0e0e0;
+ float: left;
}
.introItem:hover
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-09-19 06:45:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-09-26 14:59:56 +0000
@@ -391,19 +391,33 @@
.introList
{
list-style-type:none;
- width: 490px;
- padding-top: 10px;
- padding-bottom: 20px;
- padding-left: 5px;
- padding-right: 5px;
- color: #444;
-}
-
-.introTwoColList
-{
- padding-left: 0;
- padding-right: 0;
- width: 347px;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.moduleList
+{
+ list-style-type:none;
+ width: 100%;
+ max-width: 1100px;
+ padding-top: 10px;
+ padding-bottom: 20px;
+ color: #444;
+}
+
+.introList li
+{
+ width: 435px;
+ margin-right: 30px;
+}
+
+.moduleList li
+{
+ width: 305px;
+ margin-right: 20px;
}
.introIcon
@@ -413,10 +427,11 @@
.introItem
{
- padding: 18px;
+ padding: 15px;
cursor: pointer;
min-height: 44px;
border-bottom: 1px solid #e0e0e0;
+ float: left;
}
.introItem:hover
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java 2013-09-26 14:59:56 +0000
@@ -50,6 +50,7 @@
private static final String KEY_MAINTENANCE_MODULES = "maintenanceModules";
private static final String KEY_SERVICE_MODULES = "serviceModules";
+ private static final String KEY_MENU_MODULES = "menuModules";
// -------------------------------------------------------------------------
// Dependencies
@@ -85,6 +86,7 @@
handle.put( KEY_MAINTENANCE_MODULES, moduleManager.getAccessibleMaintenanceModules() );
handle.put( KEY_SERVICE_MODULES, moduleManager.getAccessibleServiceModules() );
+ handle.put( KEY_MENU_MODULES, moduleManager.getAccessibleMenuModules() );
actionInvocation.getStack().push( handle );
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java 2013-09-26 14:59:56 +0000
@@ -129,6 +129,13 @@
return menuModules;
}
+ public List<Module> getAccessibleMenuModules()
+ {
+ detectModules();
+
+ return getAccessibleModules( menuModules );
+ }
+
public List<Module> getMaintenanceMenuModules()
{
detectModules();
@@ -163,7 +170,7 @@
return modulesByName.values();
}
-
+
public Module getCurrentModule()
{
return currentModule.get();
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java 2013-09-26 14:59:56 +0000
@@ -45,6 +45,8 @@
List<Module> getMenuModules();
+ List<Module> getAccessibleMenuModules();
+
List<Module> getMaintenanceMenuModules();
List<Module> getAccessibleMaintenanceModules();
=== 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 2013-09-19 09:34:43 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-09-26 14:59:56 +0000
@@ -82,14 +82,14 @@
intro_dhis-web-dataentry=Enter data for forms either on-line or off-line, validate data and view data trends.
intro_dhis-web-importexport=Import and export data from DHIS or third-party systems on various formats.
intro_dhis-web-validationrule=Validate and assess data quality using validation rules or statistical methods.
-intro_dhis-web-mapping=Visualize data on maps using polygons, points, symbols with customizable legends.
+intro_dhis-web-mapping=Visualize data on maps using polygons, points, symbols in multiple layers.
intro_dhis-web-reporting=Analyse data and reporting rates using predefined and dynamic report tools.
intro_dhis-web-light=Access a mobile device optimized version of data entry, messages and analysis.
intro_dhis-web-mobile=Access a smartphone optimized version of data entry, settings, messages.
intro_dhis-web-dashboard-integration=Get an overview of favorite charts, reports and maps and view or write messages.
intro_dhis-web-visualizer=Create dynamic data visualizations for data elements and indicators.
intro_dhis-web-pivot=Generate flexible pivot tables with data aggregated in all dimensions.
-intro_dhis-web-sms=Send reminders and notifications as SMS to phones, manually or as scheduled tasks.
+intro_dhis-web-sms=Send SMS reminders and notifications as to phones manually or as scheduled tasks.
intro_dhis-web-spreadsheet-reporting=Generate and import data from reports based on predefined Excel templates.
intro_dhis-web-appmanager=Access and upload apps, which are extensions to the standard user interface.
@@ -97,12 +97,12 @@
intro_help_center=Get help on a various of topics related to setting up and using the DHIS 2.
intro_supportive_software=Get an overview of useful software like report designers mobile clients.
-intro_system_overview=Visit the system overview page to get a complete list of modules and their purpose.
+intro_system_overview=Visit the system overview page to get a complete list of modules.
intro_web_api=Go to the Web API entry point, which is an interface for other computer systems.
intro_about_dhis2=Get information about the system version and runtime environment.
intro_settings=Set your personal preferences for interface language, style and email settings.
-intro_profile=Set up your personal profile with information your like job title and interests.
-intro_account=Manage your user account including name, password, email and mobile number.
+intro_profile=Set up your personal profile with information like job title and interests.
+intro_account=Manage your user account including name, password, email and mobile.
intro_log_out=Go here to log out of the system and deny others to access your user account.
#-- Common ---------------------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2013-09-05 13:09:59 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2013-09-26 14:59:56 +0000
@@ -264,7 +264,7 @@
intro_xml_data_import=Import data values on the DXF 2 XML format which is used for data exchange by DHIS 2 and other software.
intro_csv_data_import=Import data values on the CSV format which is used for data exchange by DHIS 2 and other third-party software.
intro_pdf_data_import=Import data from a PDF data entry form. PDF forms can be generated from the data set module.
-intro_event_data_import=Import event data.
+intro_event_data_import=Import events for programs, stages and persons on the DXF 2 format.
intro_dhis14_import=Import data from DHIS 1.4 installations. DHIS 1.4 is the predecessor of DHIS 2.
intro_data_export=Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF 2.
intro_metadata_export=Export meta data like data elements and organisation units to the standard DHIS 2 exchange format.
@@ -272,6 +272,7 @@
intro_dhis14_file_configuration=Set the configuration for the DHIS 1.4 file import process, such as the location of the data file.
intro_metadata_import=Import meta-data like data elements and organisation units using the standard DHIS 2 exchange format called DXF 2.
intro_integration_configuration=Configure and upload flexible routes for automated integration with other systems.
+intro_event_data_export=Export event data for programs, stages and persons on the DXF 2 format.
no_item_to_match=There is no selected item to match
dry_run=Dry run
strategy=Strategy
