dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43176
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21932: minor
------------------------------------------------------------
revno: 21932
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2016-02-10 12:02:18 +0100
message:
minor
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-tracker-capture/components/registration/registration-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 2016-01-19 09:31:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2016-02-10 11:02:18 +0000
@@ -36,7 +36,7 @@
<!-- selection begins-->
<div class="col-sm-12 selectionGroup">
<div class="row col-sm-6 selectionArea">
- <div class="row col-sm-12">
+ <div class="row">
<div class="col-sm-4">
{{registeringUnitLabel}}
</div>
@@ -45,7 +45,7 @@
value="{{selectedOrgUnit.name|| pleaseSelectLabel}}" disabled="">
</div>
</div>
- <div class="row col-sm-12 small-vertical-spacing">
+ <div class="row small-vertical-spacing">
<div class="col-sm-4">
{{programLabel}}
</div>
@@ -61,7 +61,7 @@
</select>
</div>
</div>
- <div class="row col-sm-12 small-vertical-spacing" ng-if="selectedProgram" ng-repeat="category in selectedCategories">
+ <div class="row small-vertical-spacing" ng-if="selectedProgram" ng-repeat="category in selectedCategories">
<div class="col-sm-4">
{{category.name}}
</div>
@@ -75,7 +75,7 @@
</select>
</div>
</div>
- <div class="row col-sm-12 small-vertical-spacing" ng-if="selectedProgramStage && selectedProgramStage.programStageSections.length && eventRegistration || editingEventInFull">
+ <div class="row small-vertical-spacing" ng-if="selectedProgramStage && selectedProgramStage.programStageSections.length && eventRegistration || editingEventInFull">
<div class="col-sm-4">
{{'section'| translate}}
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-02-10 11:02:18 +0000
@@ -36,7 +36,7 @@
$scope.showHelpText = function(attributeId){
$scope.helpTexts[attributeId] = $scope.helpTexts[attributeId] ? false : true;
- }
+ };
$scope.attributesById = CurrentSelection.getAttributesById();
if(!$scope.attributesById){
@@ -424,9 +424,10 @@
actionButtonText: 'yes',
headerText: 'cancel',
bodyText: 'are_you_sure_to_cancel_registration'
- }
+ };
+
ModalService.showModal({}, modalOptions).then(function(){
cancelFunction();
});
- }
+ };
});