------------------------------------------------------------
revno: 20836
committer: Abyot Asalefew Gizaw <aby...@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-10-21 22:58:53 +0200
message:
event-capture: take out ouTree from D2LeftBar directive
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
--
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-event-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-10-01 10:07:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-10-21 20:58:53 +0000
@@ -1,4 +1,24 @@
-<d2-left-bar></d2-left-bar>
+<span id="showLeftBar">
+ <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</span>
+
+<div id="leftBar">
+
+ <d2-left-bar></d2-left-bar>
+
+ <div id="orgUnitTree">
+ <ul>
+ </ul>
+ </div>
+
+ <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'in_progress'| translate}}"/>
+
+ <div class="small-horizonal-spacing" ng-if="!treeLoaded">
+ {{'loading_tree'| translate}}
+ </div>
+
+</div>
+
<div class="page" id="mainPage">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html 2015-10-12 14:21:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/left-bar.html 2015-10-21 20:58:53 +0000
@@ -1,25 +1,12 @@
-<span id="showLeftBar">
- <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
-</span>
-<div id="leftBar">
- <div id="hideLeftBar">
- <a href="index.action" title="{{'show_main_menu'| translate}}" id="showMainMenuLink"><i class="fa fa-home leftBarIcon"></i></a>
- <a href="javascript:dhis2.leftBar.hideAnimated()" title="{{'hide_menu'| translate}}" id="hideMainMenuLink"><i class="fa fa-arrow-left leftBarIcon"></i></a>
- <a href="javascript:dhis2.leftBar.extendAnimated()" title="{{'extend_menu'| translate}}" id="extendMainMenuLink"><i class="fa fa-arrow-right leftBarIcon"></i></a>
- </div>
- <div style="margin-top:20px">
- <img id="searchIcon" src="../images/search.png" style="cursor: pointer" title="{{searchOusLabel}}">
- <span id="searchSpan" style="width:100%;display:none;">
- <input type="text" id="searchField" name="key"/>
- <input type="button" value="{{findLabel}}" onclick="selection.findByName()"/>
- </span>
- </div>
- <div id="orgUnitTree">
- <ul>
- </ul>
- </div>
- <img id="ouwt_loader" src="../images/ajax-loader-bar.gif"/>
- <div class="small-horizonal-spacing" ng-if="!treeLoaded">
- {{'loading_tree'| translate}}
- </div>
+<div id="hideLeftBar">
+ <a href="index.action" title="{{'show_main_menu'| translate}}" id="showMainMenuLink"><i class="fa fa-home leftBarIcon"></i></a>
+ <a href="javascript:dhis2.leftBar.hideAnimated()" title="{{'hide_menu'| translate}}" id="hideMainMenuLink"><i class="fa fa-arrow-left leftBarIcon"></i></a>
+ <a href="javascript:dhis2.leftBar.extendAnimated()" title="{{'extend_menu'| translate}}" id="extendMainMenuLink"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</div>
+<div style="margin-top:20px">
+ <img id="searchIcon" src="../images/search.png" style="cursor: pointer" title="{{searchOusLabel}}">
+ <span id="searchSpan" style="width:100%;display:none;">
+ <input type="text" id="searchField" name="key"/>
+ <input type="button" value="{{findLabel}}" onclick="selection.findByName()"/>
+ </span>
</div>
\ No newline at end of file
=== 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-10-21 10:04:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2015-10-21 20:58:53 +0000
@@ -364,6 +364,7 @@
$scope.back = function(){
$location.path('/').search({program: $scope.selectedProgramId});
+ $route.reload();
};
$scope.displayEnrollment = false;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
