dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11190
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-06-10 17:15:17 +0200
message:
  Minor adjustments to app manager
modified:
  dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties
  dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm
  dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm
  dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.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-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties	2013-05-29 21:29:34 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties	2013-06-10 15:15:17 +0000
@@ -1,11 +1,11 @@
 appmanager_list_app=Installed Apps
 appmanager_settings=Settings
-appmanager_go=Get New Apps
+appmanager_app_store=App Store
 appmanager_saved_settings=Saved Settings 
-appmanager_installation_folder=App Installation Folder:
-appmanager_baseurl=App Base URL:
-appmanager_store_url=AppStore URL:
-appmanager_upload_app_package=Upload App Package (zip)
+appmanager_installation_folder=App Installation Folder
+appmanager_baseurl=App Base URL
+appmanager_store_url=App Store URL
+appmanager_upload_app_package=Upload App package (ZIP)
 appmanager_install_success=App Installed Successfully
 appmanager_invalid_package=Invalid App Package
 appmanager_not_zip=Incorrect App Package Format

=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm	2013-05-29 21:29:34 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm	2013-06-10 15:15:17 +0000
@@ -26,13 +26,16 @@
       <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>
-  <input type="submit" value="Save" />
 </form>
 
 <h3>$i18n.getString( "appmanager_management" )</h3>
 
-<table style="width:100%">
+<table style="width:80%">
   <tr>
     <td style="vertical-align:top">
       <table class="listTable" id="userList" width='100%'>
@@ -42,7 +45,7 @@
           <tr>
             <th>$i18n.getString( "appmanager_appname" )</th>
             <th>$i18n.getString( "version" )</th>
-            <th class="{sorter: false}" style="width:120px;">$i18n.getString( "operations" )</th>
+            <th class="{sorter: false}" style="width:75px;">$i18n.getString( "operations" )</th>
           </tr>
         </thead>
         <tbody id="list">
@@ -51,7 +54,7 @@
           <tr id="tr${app.name.replace(' ','_')}" #alternate( $mark )>
             <td>$encoder.htmlEncode( $app.name )</td>
             <td>$encoder.htmlEncode( $app.version )</td>
-            <td style="text-align:right">
+            <td>
               <a href="javascript:deleteApp( '$encoder.jsEncode( $app.name.replace(' ','_') )', '$encoder.jsEncode( $app.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png"></a>
             </td>
           </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm	2013-05-28 08:27:16 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm	2013-06-10 15:15:17 +0000
@@ -5,14 +5,29 @@
         autoUpload();
 });
 </script>
+<style type="text/css">
+#uploadArea {
+    border: 1px solid #ccc; 
+    border-radius: 3px; 
+    padding: 10px; 
+    width: 440px; 
+    margin-bottom: 30px;
+}
+
+#progressbar {
+    width: 460px;
+    margin-bottom: 30px;
+}
+</style>
+
 <div>
-    <h3>$i18n.getString( "appmanager_go" ) #*openHelp( "appManager" )*#</h3>
-    <div>
+    <h3>$i18n.getString( "appmanager_app_store" ) #*openHelp( "appManager" )*#</h3>
+    <div id="uploadArea">
         <form id="uploadPackageForm" enctype="multipart/form-data" method="post">
-        $i18n.getString( "appmanager_upload_app_package" ):<input type="file" id="upload" name="upload" accept="application/zip,.zip" />
+        <span style="margin-right: 30px">$i18n.getString( "appmanager_upload_app_package" ):</span><input type="file" id="upload" name="upload" accept="application/zip,.zip" />
         </form>
-        <div id="progressbar"></div>
     </div>
+    <div id="progressbar"></div>
 </div>
 #if( $!appStoreUrl )
 <iframe src="$appStoreUrl" seamless="true" style="width: 100%; height: 500px; border: none;"></iframe> 

=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm	2013-05-28 15:50:33 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm	2013-06-10 15:15:17 +0000
@@ -2,7 +2,7 @@
 <ul>
     <li><a href="appList.action">$i18n.getString( "appmanager_list_app" )</a></li>
 #if( $auth.hasAccess( "dhis-web-appmanager", "appSettings" ) )
+    <li><a href="appStore.action">$i18n.getString( "appmanager_app_store" )</a></li>
     <li><a href="appSettings.action">$i18n.getString( "appmanager_settings" )</a></li>
-    <li><a href="appStore.action">$i18n.getString( "appmanager_go" )</a></li>
 #end
 </ul>