=== 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-08-13 07:18:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-08-13 16:25:17 +0000
@@ -109,6 +109,8 @@
offline=Offline
online=Online
+next=Next
+previous=Previous
online_notification=You are online
offline_notification=You are offline, data will be stored locally
ajax_login_failed=Login failed, check your username and password and try again
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2013-08-08 17:05:40 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2013-08-13 16:25:17 +0000
@@ -40,9 +40,6 @@
//------------------------------------------------------------------------------
dhis2.db.tmpl = {
- openAddLink: "
${i18n_add}" +
- "${i18n_manage}",
-
dashboardLink: "${name}",
moduleIntro: "${i18n_click}
",
@@ -145,6 +142,20 @@
dhis2.db.moveItem( dhis2.db.currentItem, destItemId, position );
}
+dhis2.db.scrollLeft = function()
+{
+ $( "#dashboardListWrapper" ).animate( {
+ scrollTop: "-=29"
+ }, 180 );
+}
+
+dhis2.db.scrollRight = function()
+{
+ $( "#dashboardListWrapper" ).animate( {
+ scrollTop: "+=29"
+ }, 180 );
+}
+
dhis2.db.openAddDashboardForm = function()
{
$( "#addDashboardForm" ).dialog( {
@@ -246,7 +257,7 @@
{
var $l = $( "#dashboardList" );
- $l.empty().append( $.tmpl( dhis2.db.tmpl.openAddLink, { "i18n_add": i18n_add_new, "i18n_manage": i18n_manage } ) );
+ $l.empty();
$.getJSON( "../api/dashboards.json?paging=false&links=false", function( data )
{
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2013-08-07 10:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2013-08-13 16:25:17 +0000
@@ -2,8 +2,6 @@
var i18n_share_your_interpretation_of = '$encoder.jsEscape( $i18n.getString( "share_your_interpretation_of" ), "'")';
var i18n_interpretation_was_shared = '$encoder.jsEscape( $i18n.getString( "interpretation_was_shared" ), "'")';
var i18n_viewing = '$encoder.jsEscape( $i18n.getString( "viewing" ), "'")';
-var i18n_add_new = '$encoder.jsEscape( $i18n.getString( "add_new" ), "'")';
-var i18n_manage = '$encoder.jsEscape( $i18n.getString( "manage" ), "'")';
var i18n_click_add_new_to_get_started = '$encoder.jsEscape( $i18n.getString( "click_add_new_to_get_started" ), "'")';
var i18n_add_stuff_by_searching = '$encoder.jsEscape( $i18n.getString( "add_stuff_by_searching" ), "'")';
var i18n_arrange_dashboard_by_dragging_and_dropping = '$encoder.jsEscape( $i18n.getString( "arrange_dashboard_by_dragging_and_dropping" ), "'")';
@@ -37,8 +35,17 @@
+
+