=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-08-09 18:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-08-09 22:28:42 +0000
@@ -49,6 +49,8 @@
 print_form=Print form
 print_details=Print details
 show_hide_columns=Show/hide columns
+hide_column=Hide column
+show_column=Show column
 show_all=Show all
 hide=Hide
 select_columns_to_show=Select columns to show

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/column-modal.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/column-modal.html	2014-12-16 15:44:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/column-modal.html	2015-08-09 22:28:42 +0000
@@ -5,12 +5,12 @@
 <div class="modal-body page">   
     <table class="listTable dhis2-table-striped-border">
         <tr ng-repeat="eventGridColumn in gridColumns">
-            <td>
+            <td ng-click="eventGridColumn.show = !eventGridColumn.show">
                 <span ng-if="eventGridColumn.id !== 'comment' && eventGridColumn.id !== 'uid'">{{eventGridColumn.name}}</span>
                 <span ng-if="eventGridColumn.id === 'comment' || eventGridColumn.id === 'uid'">{{eventGridColumn.name | translate}}</span>
             </td>
             <td>
-                <input type="checkbox" ng-model="eventGridColumn.show" ng-change="showHideColumns(eventGridColumn)" ng-disabled="hiddenGridColumns + 1 == eventGridColumns.length && eventGridColumn.show">
+                <input type="checkbox" ng-model="eventGridColumn.show" ng-change="showHideColumns(eventGridColumn)">
             </td>
         </tr>                                    
     </table>    

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-06-23 19:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-08-09 22:28:42 +0000
@@ -8,6 +8,7 @@
                 $modal,
                 $timeout,
                 $filter,
+                $translate,
                 TCStorageService,
                 orderByFilter,
                 SessionStorageService,
@@ -18,6 +19,7 @@
                 ProgramFactory,
                 DHIS2EventFactory,
                 DashboardLayoutService,
+                DialogService,
                 AttributesFactory,
                 CurrentSelection,
                 AuthorityService) {
@@ -353,7 +355,20 @@
         var currentLayout = getCurrentDashboardLayout();
         angular.extend(layout, currentLayout);
         delete layout.DEFAULT;
-        DashboardLayoutService.saveLayout(layout, true).then(function(){                          
+        DashboardLayoutService.saveLayout(layout, true).then(function(){
+            var dialogOptions = {
+                    headerText: 'success',
+                    bodyText: $translate.instant('dashboard_layout_saved')
+                };
+            DialogService.showDialog({}, dialogOptions);
+            return;
+        }, function(){
+            var dialogOptions = {
+                    headerText: 'error',
+                    bodyText: $translate.instant('dashboard_layout_not_saved')
+                };
+            DialogService.showDialog({}, dialogOptions);
+            return;
         });
     };
     $scope.showHideWidgets = function(){

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-widgets.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-widgets.html	2015-02-18 13:12:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-widgets.html	2015-08-09 22:28:42 +0000
@@ -5,7 +5,7 @@
 <div class="modal-body">   
     <table class="listTable dhis2-table-striped-border">
         <tr ng-repeat="widget in dashboardWidgets">
-            <td>
+            <td ng-click="widget.show = !widget.show">
                 {{widget.title | translate}}
             </td>
             <td>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-08-07 10:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-08-09 22:28:42 +0000
@@ -200,6 +200,10 @@
 select_columns_to_show=Select columns to show
 show_hide_widgets=Show/hide widgets
 select_widgets_to_show=Select widgets to show
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
 close=Close
 generate=Generate
 print=Print
@@ -262,6 +266,10 @@
 update_error=Error in update
 event_creation_error=Error in event creation
 relationship_error=Error in relationship assignment
+error=Error
+success=Success
+dashboard_layout_saved=Dashboard layout saved as default.
+dashboard_layout_not_saved=Error in saving dashboard layout saved as default.
 event_orgunit_name=Organisation unit
 category=Category
 entity_type=Entity type

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html	2014-09-11 12:35:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html	2015-08-09 22:28:42 +0000
@@ -4,11 +4,11 @@
 <div class="modal-body page">   
     <table class="listTable dhis2-table-striped-border">
         <tr ng-repeat="gridColumn in gridColumns">
-            <td>
+            <td ng-click="gridColumn.show = !gridColumn.show">
                 {{gridColumn.name}}
             </td>
             <td>
-                <input type="checkbox" ng-model="gridColumn.show" ng-change="showHideColumns(gridColumn)" ng-disabled="hiddenGridColumns + 1 == gridColumns.length && gridColumn.show">
+                <input type="checkbox" ng-model="gridColumn.show" ng-change="showHideColumns(gridColumn)">
             </td>
         </tr>                                    
     </table>