dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #42014
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21464: minor
------------------------------------------------------------
revno: 21464
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-12-16 10:17:18 +0100
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html
--
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/registration/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2015-12-04 12:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2015-12-16 09:17:18 +0000
@@ -1,76 +1,75 @@
<div ng-controller="RegistrationController">
- <div ng-class="{true: 'bordered-div col-sm-8'} [registrationMode === 'REGISTRATION']">
- <!--registration form starts -->
- <form name="outerForm" novalidate>
-
- <!-- Entity type begins -->
- <div ng-if="!selectedProgram && registrationMode === 'REGISTRATION'">
- <h3>{{'category'| translate}}</h3>
- <table class="dhis2-list-table-striped dhis2-table-hover">
- <tr>
- <td>
- {{'entity_type'| translate}}
- </td>
- <td>
- <select class="form-control"
- ng-model="trackedEntities.selected"
- ng-options="trackedEntity.name for trackedEntity in trackedEntities.available | orderBy: 'name'">
- </select>
- </td>
- </tr>
- </table>
- <hr>
- </div>
- <!-- Entity type ends -->
-
- <!--custom registration form begins -->
- <div class="vertical-spacing" ng-if="customFormExists">
-
- <!-- enrollment and incidence dates begin -->
- <div ng-if="selectedProgram && !customForm.hasProgramDate && registrationMode !== 'PROFILE'">
- <div ng-include="'components/registration/enrollment-dates-form.html'"></div>
- </div>
- <!-- enrollment and incidence dates end -->
-
- <div ng-include="'../dhis-web-commons/angular-forms/custom-form.html'"></div>
-
- </div>
- <!-- custom registration form ends-->
-
- <!-- default registration form begins -->
- <div class="vertical-spacing" ng-if="!customFormExists">
- <div ng-if="selectedProgram && registrationMode !== 'PROFILE'" ng-include="'components/registration/enrollment-dates-form.html'"></div>
- <div ng-include="'components/registration/default-registration-form.html'"></div>
- </div>
- <!-- default registration form ends -->
-
- <div ng-if="formEmpty && outerForm.submitted">
- <div class="alert alert-warning">{{'form_is_empty_fill_at_least_one'| translate}}</div>
- </div>
-
- <div ng-if="!editingDisabled && registrationMode === 'PROFILE'" class="vertical-spacing">
- <button type="button" class="btn btn-primary small-horizonal-spacing" ng-click="registerEntity(null)">{{'save'| translate}}</button>
- <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="cancel()">{{'cancel'| translate}}</button>
- </div>
-
- <div class="vertical-spacing" ng-if="registrationMode === 'ENROLLMENT'">
- <button type="button" class="btn btn-primary" ng-click="registerEntity(null)">{{'enroll'| translate}}</button>
- <button type="button" class="btn btn-default" ng-click="showNewEnrollment()">{{'cancel'| translate}}</button>
- </div>
-
- <div class="vertical-spacing" ng-if="registrationMode === 'REGISTRATION'">
- <button type="button" class="btn btn-primary" ng-click="registerEntity('DASHBOARD')">{{'save_and_continue'| translate}}</button>
- <button type="button" class="btn btn-success small-horizonal-spacing" ng-click="registerEntity('SELF')">{{'save_and_add_new'| translate}}</button>
- <button type="button" class="btn btn-primary" onclick="javascript:window.print()">{{'print_form'| translate}}</button>
- <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="showRegistration()">{{'cancel'| translate}}</button>
- </div>
-
- </form>
- <!--registration form ends -->
- </div>
+ <!--registration form starts -->
+ <form name="outerForm" novalidate>
+
+ <!-- Entity type begins -->
+ <div ng-if="!selectedProgram && registrationMode === 'REGISTRATION'">
+ <h3>{{'category'| translate}}</h3>
+ <table class="dhis2-list-table-striped dhis2-table-hover">
+ <tr>
+ <td>
+ {{'entity_type'| translate}}
+ </td>
+ <td>
+ <select class="form-control"
+ ng-model="trackedEntities.selected"
+ ng-options="trackedEntity.name for trackedEntity in trackedEntities.available | orderBy: 'name'">
+ </select>
+ </td>
+ </tr>
+ </table>
+ <hr>
+ </div>
+ <!-- Entity type ends -->
+
+ <!--custom registration form begins -->
+ <div class="vertical-spacing" ng-if="customFormExists">
+
+ <!-- enrollment and incidence dates begin -->
+ <div ng-if="selectedProgram && !customForm.hasProgramDate && registrationMode !== 'PROFILE'">
+ <div ng-include="'components/registration/enrollment-dates-form.html'"></div>
+ </div>
+ <!-- enrollment and incidence dates end -->
+
+ <div ng-include="'../dhis-web-commons/angular-forms/custom-form.html'"></div>
+
+ </div>
+ <!-- custom registration form ends-->
+
+ <!-- default registration form begins -->
+ <div class="vertical-spacing" ng-if="!customFormExists">
+ <div ng-if="selectedProgram && registrationMode !== 'PROFILE'" ng-include="'components/registration/enrollment-dates-form.html'"></div>
+ <div ng-include="'components/registration/default-registration-form.html'"></div>
+ </div>
+ <!-- default registration form ends -->
+
+ <div ng-if="formEmpty && outerForm.submitted">
+ <div class="alert alert-warning">{{'form_is_empty_fill_at_least_one'| translate}}</div>
+ </div>
+
+ <div ng-if="!editingDisabled && registrationMode === 'PROFILE'" class="vertical-spacing">
+ <button type="button" class="btn btn-primary small-horizonal-spacing" ng-click="registerEntity(null)">{{'save'| translate}}</button>
+ <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="cancel()">{{'cancel'| translate}}</button>
+ </div>
+
+ <div class="vertical-spacing" ng-if="registrationMode === 'ENROLLMENT'">
+ <button type="button" class="btn btn-primary" ng-click="registerEntity(null)">{{'enroll'| translate}}</button>
+ <button type="button" class="btn btn-default" ng-click="showNewEnrollment()">{{'cancel'| translate}}</button>
+ </div>
+
+ <div class="vertical-spacing" ng-if="registrationMode === 'REGISTRATION'">
+ <button type="button" class="btn btn-primary" ng-click="registerEntity('DASHBOARD')">{{'save_and_continue'| translate}}</button>
+ <button type="button" class="btn btn-success small-horizonal-spacing" ng-click="registerEntity('SELF')">{{'save_and_add_new'| translate}}</button>
+ <button type="button" class="btn btn-primary" onclick="javascript:window.print()">{{'print_form'| translate}}</button>
+ <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="showRegistration()">{{'cancel'| translate}}</button>
+ </div>
+
+ </form>
+ <!--registration form ends -->
<div ng-if="warningMessages.length > 0" style="margin-top:18px" ng-class="{true: 'col-sm-4'} [registrationMode === 'REGISTRATION']">
<div ng-include="'views/warnings.html'"></div>
</div>
+
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-12-10 12:54:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-12-16 09:17:18 +0000
@@ -131,8 +131,8 @@
<!--- Error display for search ends -->
<!--registration form begins -->
- <div class="row" ng-if="showRegistrationDiv">
- <div class="col-sm-12" ng-include="'components/registration/registration.html'"></div>
+ <div class="row" ng-if="showRegistrationDiv">
+ <div class="col-sm-8 bordered-div " ng-include="'components/registration/registration.html'"></div>
</div>
<!-- registration form ends -->
