dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40379
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20466: tracker-capture: making right side widgets sticky - WIP
------------------------------------------------------------
revno: 20466
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-02 12:23:45 +0200
message:
tracker-capture: making right side widgets sticky - WIP
modified:
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.html
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/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
--
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-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-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2015-10-02 10:23:45 +0000
@@ -40,7 +40,10 @@
$scope.settingsLabel = $translate.instant('settings');
$scope.showHideWidgetsLabel = $translate.instant('show_hide_widgets');
$scope.notEnrolledLabel = $translate.instant('not_yet_enrolled_data_entry');
+ $scope.stickLabel = $translate.instant('stick_right_widgets');
+ $scope.unstickLabel = $translate.instant('unstick_right_widgets');
+ $scope.stickyDisabled = true;
$scope.previousTeiExists = false;
$scope.nextTeiExists = false;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2015-10-01 13:43:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2015-10-02 10:23:45 +0000
@@ -20,6 +20,9 @@
<!-- dashboard setting begins -->
<div class="pull-right">
+ <button type="button" title="{{stickyDisabled ? stickLabel : unstickLabel}}" class="btn btn-default" ng-click="stickyDisabled = !stickyDisabled">
+ <i class="fa fa-thumb-tack" ng-class="{true: 'red'} [!stickyDisabled]"></i>
+ </button>
<div class="btn-group trim" dropdown is-open="status.isopen">
<button type="button" title="{{settingsLabel}}" class="btn btn-default dropdown-toggle" dropdown-toggle>
<i class="fa fa-cog"></i>
@@ -54,7 +57,7 @@
<!-- dashboard bigger widgets end -->
<!-- dashboard smaller widgets begin -->
- <div ng-class="widgetSize.smaller">
+ <div ng-class="widgetSize.smaller" sticky disabled-sticky="stickyDisabled">
<div id="smallerWidget"
d2-sortable
bigger-widgets={{ dashboardWidgets | filter: {parent: 'biggerWidget'} }}
=== 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-09-26 16:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-10-02 10:23:45 +0000
@@ -359,4 +359,6 @@
tei_inactive_only_read=The TEI is inactive. Only read operations are allowed.
hide_menu=Hide menu
extend_menu=Extend menu
-show_main_menu=Show main menu
\ No newline at end of file
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-09-24 13:34:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-10-02 10:23:45 +0000
@@ -95,6 +95,7 @@
<script type="text/javascript" src="scripts/leftbar-menu-controller.js"></script>
<script type="text/javascript" src="scripts/report-types-controller.js"></script>
<script type="text/javascript" src="scripts/ng-csv.js"></script>
+ <script type="text/javascript" src="scripts/sticky.min.js"></script>
<script type="text/javascript" src="components/dashboard/dashboard-controller.js"></script>
<script type="text/javascript" src="components/dashboard/dashboard-widgets-controller.js"></script>
<script type="text/javascript" src="components/registration/registration-controller.js"></script>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js 2015-07-13 07:37:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js 2015-10-02 10:23:45 +0000
@@ -22,6 +22,7 @@
'infinite-scroll',
'd2HeaderBar',
'ngCsv',
+ 'sticky',
'nvd3ChartDirectives',
'pascalprecht.translate'])
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2015-10-01 13:43:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2015-10-02 10:23:45 +0000
@@ -4,7 +4,6 @@
padding: 0;
background-color: white;
font-size: 10pt;
- overflow: auto;
}
.not-for-screen {
@@ -184,7 +183,6 @@
.input-success {
background-color: #b9ffb9 !important;
- color: red;
}
.alert-default {
