dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18751
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-03-30 16:50:33 +0200
message:
  minor + added help entry for server base url, field placeholder.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.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-services/dhis-service-core/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2014-10-15 04:17:05 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2015-03-30 14:50:33 +0000
@@ -72,6 +72,9 @@
 <listitem>
 <para>Days after period end to qualify for timely data submission: Sets the number of days after the end of a period in which a data entry form must be marked as complete in order to be considered timely. This affects the &quot;reporting rate&quot; tool in the reporting module which lists forms marked as complete as well as marked as complete in time. The default value is 15.</para>
 </listitem>
+<listitem>
+<para>Server base URL: The full, externally accessible base URL for this server. Example: https://apps.dhis2.org/demo is the server base URL for the DHIS 2 demo server. The URL is used to provide links to this server from external locations such as in emails sent from the system.</para>
+</listitem>
 </itemizedlist>
 </section>
 <section id="systemAppearanceSettings">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-03-30 14:13:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-03-30 14:50:33 +0000
@@ -129,4 +129,5 @@
 default_analysis_relative_period=Default relative period for analysis
 infrastructural_indicators=Infrastructural indicators
 cors_whitelist=CORS Whitelist
-require_authority_to_add_to_view_object_lists=Require authority to add to view object lists
\ No newline at end of file
+require_authority_to_add_to_view_object_lists=Require authority to add to view object lists
+example=Example
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-03-30 14:15:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-03-30 14:50:33 +0000
@@ -1,5 +1,4 @@
 <script>
-    console.log( '$!keyInstanceBaseUrl' );
   jQuery(document).ready(function() {
     jQuery("input[type=button]").click(function() {
       jQuery.postUTF8('setSystemGeneralSettings.action', {
@@ -159,7 +158,7 @@
 <div class="settingLabel">$i18n.getString( "server_base_url" )</div>
 
 <div class="setting">
-    <input type="text" id="instanceBaseUrl" name="instanceBaseUrl" value="$!keyInstanceBaseUrl"/>
+    <input type="text" id="instanceBaseUrl" name="instanceBaseUrl" placeholder="$i18n.getString( 'example' ): https://apps.dhis2.org/demo"; value="$!keyInstanceBaseUrl"/>
 </div>
 
 <div class="settingLabel">$i18n.getString( "google_analytics_ua_key" )</div>