dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12791
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-22 14:17:54 +0200
message:
  App management, simplified configuration
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/appSettings.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/appmanager/AppManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java	2013-10-09 17:16:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java	2013-10-22 12:17:54 +0000
@@ -42,6 +42,7 @@
     final String KEY_APP_FOLDER_PATH = "appFolderPath";    
     final String KEY_APP_BASE_URL = "appBaseUrl";
     final String KEY_APP_STORE_URL = "appStoreUrl";
+    final String DEFAULT_APP_STORE_URL = "http://appstore.dhis2.org";;
         
     /**
      * Gets the Base URL for accessing the apps

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java	2013-10-09 17:16:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java	2013-10-22 12:17:54 +0000
@@ -87,7 +87,7 @@
     @Override
     public String getAppStoreUrl()
     {
-        return StringUtils.trimToNull( (String) appSettingManager.getSystemSetting( KEY_APP_STORE_URL ) );
+        return StringUtils.trimToNull( (String) appSettingManager.getSystemSetting( KEY_APP_STORE_URL, DEFAULT_APP_STORE_URL ) );
     }
 
     @Override

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java	2013-09-26 17:20:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java	2013-10-22 12:17:54 +0000
@@ -127,18 +127,6 @@
         appManager.setAppBaseUrl( appBaseUrl );
     }
 
-    private String appStoreUrl;
-
-    public String getAppStoreUrl()
-    {
-        return appManager.getAppStoreUrl();
-    }
-
-    public void setAppStoreUrl( String appStoreUrl )
-    {
-        appManager.setAppStoreUrl( appStoreUrl );
-    }
-
     private List<App> appList;
 
     public List<App> getAppList()

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties	2013-06-11 15:13:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties	2013-10-22 12:17:54 +0000
@@ -2,9 +2,11 @@
 appmanager_settings=Settings
 appmanager_app_store=App Store
 appmanager_saved_settings=Saved Settings 
-appmanager_installation_folder=App Installation Folder
-appmanager_baseurl=App Base URL
-appmanager_store_url=App Store URL
+appmanager_installation_folder=App installation folder
+appmanager_absolute_server_path=absolute path on server for uploaded apps
+appmanager_baseurl=App base URL
+appmanager_where_apps_can_be_found=location of where apps can be found on the Web
+appmanager_store_url=App store URL
 appmanager_upload_app_package=Upload App package (ZIP)
 appmanager_install_success=App installed successfully
 appmanager_manifest_not_found=Manifest file not found in app
@@ -16,4 +18,4 @@
 appmanager_appname=Application name
 appmanager_you_have_no_apps_installed=You have no apps installed at the moment
 appmanager_author=Author
-appmanager_version=Version
\ No newline at end of file
+appmanager_version=Version

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/appSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/appSettings.vm	2013-06-10 15:15:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/appSettings.vm	2013-10-22 12:17:54 +0000
@@ -13,24 +13,11 @@
 <h3>$i18n.getString( "appmanager_settings" )</h3>
 
 <form id="appSettingsForm" action="appSettings.action" method="post">
-  <table>
-    <tr>
-      <td>$i18n.getString( "appmanager_installation_folder" )</td>
-      <td><input type="text" id="appFolderPath" name="appFolderPath" style="width:40em" value="$!appFolderPath"/> </td>
-    </tr>
-    <tr>
-      <td>$i18n.getString( "appmanager_baseurl" )</td>
-      <td><input type="text" id="appBaseUrl" name="appBaseUrl" style="width:40em" value="$!appBaseUrl"/> </td>
-    </tr>
-    <tr>
-      <td>$i18n.getString( "appmanager_store_url" )</td>
-      <td><input type="text" id="appStoreUrl" name="appStoreUrl" style="width:40em" value="$!appStoreUrl"/> </td>
-    </tr>
-    <tr>
-      <td></td>
-      <td><input type="submit" value="Save" style="width:120px" /></td>
-    </tr>
-  </table>
+<div class="settingLabel">$i18n.getString( "appmanager_installation_folder" ) <span class="tipText">($i18n.getString( "appmanager_absolute_server_path" ))</span></div>
+<div class="setting"><input type="text" id="appFolderPath" name="appFolderPath" style="width:40em" value="$!appFolderPath"/></div>
+<div class="settingLabel">$i18n.getString( "appmanager_baseurl" ) <span class="tipText">($i18n.getString( "appmanager_where_apps_can_be_found" ))</span></div>
+<div class="setting"><input type="text" id="appBaseUrl" name="appBaseUrl" style="width:40em" value="$!appBaseUrl"/></div>
+<div><input type="submit" value="Save" style="width:120px" /></div>
 </form>
 
 <h3>$i18n.getString( "appmanager_management" )</h3>