=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2015-01-13 18:53:55 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2015-01-14 10:27:59 +0000
@@ -108,6 +108,7 @@
add_stuff_by_searching=Add stuff by searching from the search field above
arrange_dashboard_by_dragging_and_dropping=Then arrange dashboard by dragging and dropping items
click_to_explore_drag_to_new_position=Click to explore or drag to new position
+click_and_drag_to_new_position=Click and drag to new position
drag_to_new_position=Drag to new position
system_notification=System notification
and=and
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2015-01-14 09:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2015-01-14 10:27:59 +0000
@@ -30,6 +30,7 @@
var i18n_see_more_hits = '$encoder.jsEscape( $i18n.getString( "see_more_hits" ), "'")';
var i18n_see_fewer_hits = '$encoder.jsEscape( $i18n.getString( "see_fewer_hits" ), "'")';
var i18n_add = '$encoder.jsEscape( $i18n.getString( "add" ), "'")';
+var i18n_click_and_drag_to_new_position = '$encoder.jsEscape( $i18n.getString( "click_and_drag_to_new_position" ), "'")';
jQuery( document ).ready( function() {
dhis2.leftBar.resetPosition(); ## Force left bar initial position when displaying dashboard
=== 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 2015-01-13 23:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2015-01-14 10:27:59 +0000
@@ -80,7 +80,8 @@
"${i18n_view}" +
"${i18n_share}" +
"${i18n_explore}" +
- "${i18n_resize}" +
+ "${i18n_resize}" +
+ "" +
"
" +
"",
@@ -88,7 +89,8 @@
"" +
"" +
"",
@@ -97,7 +99,8 @@
"${i18n_view}" +
"${i18n_share}" +
"${i18n_explore}" +
- "${i18n_resize}" +
+ "${i18n_resize}" +
+ "" +
"" +
"",
@@ -106,7 +109,8 @@
"${i18n_view}" +
"${i18n_share}" +
"${i18n_explore}" +
- "${i18n_resize}" +
+ "${i18n_resize}" +
+ "" +
"" +
"",
@@ -115,7 +119,8 @@
"${i18n_view}" +
"${i18n_share}" +
"${i18n_explore}" +
- "${i18n_resize}" +
+ "${i18n_resize}" +
+ "" +
"" +
""
};
@@ -445,7 +450,7 @@
if ( "chart" == dashboardItem.type )
{
$d.append( $.tmpl( dhis2.db.tmpl.chartItem, { "itemId": dashboardItem.id, "id": dashboardItem.chart.id, "name": dashboardItem.chart.name, "style": style,
- "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click": i18n_click_to_explore_drag_to_new_position } ) );
+ "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click_and_drag_to_new_position": i18n_click_and_drag_to_new_position } ) );
DHIS.getChart({
url: '..',
@@ -481,7 +486,7 @@
{
$d.append( $.tmpl( dhis2.db.tmpl.eventChartItem, { "itemId": dashboardItem.id, "id": dashboardItem.eventChart.id,
"name": dashboardItem.eventChart.name, "style": style, "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size,
- "i18n_share": i18n_share_interpretation, "i18n_click": i18n_click_to_explore_drag_to_new_position, "i18n_explore": i18n_explore } ) );
+ "i18n_share": i18n_share_interpretation, "i18n_click_and_drag_to_new_position": i18n_click_and_drag_to_new_position, "i18n_explore": i18n_explore } ) );
DHIS.getEventChart({
url: '..',
@@ -516,7 +521,7 @@
else if ( "map" == dashboardItem.type )
{
$d.append( $.tmpl( dhis2.db.tmpl.mapItem, { "itemId": dashboardItem.id, "id": dashboardItem.map.id, "name": dashboardItem.map.name, "style": style,
- "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click": i18n_click_to_explore_drag_to_new_position } ) );
+ "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click_and_drag_to_new_position": i18n_click_and_drag_to_new_position } ) );
DHIS.getMap({
url: '..',
@@ -533,7 +538,7 @@
else if ( "reportTable" == dashboardItem.type )
{
$d.append( $.tmpl( dhis2.db.tmpl.reportTableItem, { "itemId": dashboardItem.id, "id": dashboardItem.reportTable.id, "name": dashboardItem.reportTable.name, "style": style,
- "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click": i18n_click_to_explore_drag_to_new_position } ) );
+ "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click_and_drag_to_new_position": i18n_click_and_drag_to_new_position } ) );
DHIS.getTable({
url: '..',
@@ -551,7 +556,7 @@
else if ( "eventReport" == dashboardItem.type )
{
$d.append( $.tmpl( dhis2.db.tmpl.reportTableItem, { "itemId": dashboardItem.id, "id": dashboardItem.reportTable.id, "name": dashboardItem.reportTable.name, "style": style,
- "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click": i18n_click_to_explore_drag_to_new_position } ) );
+ "i18n_remove": i18n_remove, "i18n_view": i18n_view_full_size, "i18n_share": i18n_share_interpretation, "i18n_click_and_drag_to_new_position": i18n_click_and_drag_to_new_position } ) );
DHIS.getEventReport({
url: '..',
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2015-01-14 09:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2015-01-14 10:27:59 +0000
@@ -261,6 +261,15 @@
padding: 9px 3% 7px 3%;
}
+.dragIcon
+{
+ color: #444;
+ margin: 3px 6px 0 6px;
+ float: right;
+ cursor: pointer;
+ font-size: 10px;
+}
+
.hitHeader
{
padding: 5px 6px 5px 33px;