=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-16 09:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-16 10:05:27 +0000
@@ -35,115 +35,121 @@
                             | <a href ng-click="showEnrollmentHistory()" title="{{'history'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget - link'} [showEnrollmentHistoryDiv]">{{'history'| translate}}</span></a>
                         </span>
                     </div>
-                    <div ng-if="selectedEnrollment.enrollment">                    
-                        <table class="dhis2-list-table-striped dhis2-table-hover">
-                            <tr>
-                                <td>
-                                    {{'enrolling_orgunit' | translate}}
-                                </td>
-                                <td>
-                                    <input type="text" class="form-control" value={{selectedEnrollment.orgUnitName}} ng-disabled="true"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    {{selectedProgram.enrollmentDateLabel}}
-                                </td>
-                                <td>
-                                    <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.enrollmentDate" ng-disabled="true"/>
-                                </td>
-                            </tr>
-                            <tr ng-if="selectedProgram.displayIncidentDate">                    
-                                <td>
-                                    {{selectedProgram.incidentDateLabel}}
-                                </td>
-                                <td>
-                                    <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.incidentDate" ng-disabled="true"/>
-                                </td>
-                            </tr>                
-                        </table>
-
-                        <div class="vertical-spacing">
-                            <button type="button" 
-                                    class="btn btn-primary"
-                                    ng-disabled="!canUseEnrollment()"
-                                    ng-click="completeEnrollment()">
-                                {{selectedEnrollment.status === 'ACTIVE' ? 'complete' : 'incomplete' | translate}}
-                            </button>
-                            <button type="button" 
-                                    class="btn btn-warning"
-                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                                    ng-click="cancelEnrollment()">
-                                {{'cancel'| translate}}
-                            </button>
-                            <button type="button"
-                                    title="{{selectedEnrollment.followup ? 'unmark_for_followup' : 'mark_for_followup' | translate}}"
-                                    ng-class="{true: 'btn btn-danger', false: 'btn btn-default'} [selectedEnrollment.followup]"
-                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                                    ng-click="markForFollowup()">
-                                <i class="fa fa-exclamation-triangle"></i>
-                            </button>
-                        </div>
-                    </div>
-
-                    <!-- various alerts begin -->
-                    <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !hasEnrollmentHistory">
-                        <div class="alert alert-warning">{{'not_yet_enrolled_enrollment'| translate}}</div>
-                    </div>
-                    <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !showEnrollmentHistoryDiv && hasEnrollmentHistory">
-                        <div class="alert alert-warning">{{'no_active_enrollment_exists'| translate}}</div>
-                    </div>
-                    <div ng-if="!selectedProgram && programExists">
-                        <div class="alert alert-danger">{{'please_select_a_program_for_enrollment'| translate}}</div> 
-                    </div>
-                    <div ng-if="!programExists">
-                        <div class="alert alert-danger">{{'no_program_exists_enrollment'| translate}}</div> 
-                    </div>
-                    <!-- various alerts end -->
-
-                    <!-- operations on historical enrollment begins -->
-                    <div ng-if="showEnrollmentHistoryDiv && !selectedEnrollment">
-                        <table class="table table-striped dhis2-table-hover table-bordered">
-                            <tr>
-                                <th>
-                                    {{selectedProgram.enrollmentDateLabel}}
-                                </th>
-                                <th ng-if="selectedProgram.displayIncidentDate">
-                                    {{selectedProgram.incidentDateLabel}}
-                                </th>
-                                <th>
-                                    {{'enrolling_orgunit' | translate}}
-                                </th>
-                            </tr>
-                            <tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
-                                <td>
-                                    {{en.enrollmentDate}}
-                                </td>
-                                <td ng-if="selectedProgram.displayIncidentDate">
-                                    {{en.incidentDate}}
-                                </td>
-                                <td>
-                                    {{en.orgUnitName}}
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                    <!-- operations on historical enrollment ends -->
+                    <div class="vertical-spacing">
+                        <div ng-if="selectedEnrollment.enrollment">                    
+                            <table class="dhis2-list-table-striped dhis2-table-hover">
+                                <tr>
+                                    <td>
+                                        {{'enrolling_orgunit' | translate}}
+                                    </td>
+                                    <td>
+                                        <input type="text" class="form-control" value={{selectedEnrollment.orgUnitName}} ng-disabled="true"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        {{selectedProgram.enrollmentDateLabel}}
+                                    </td>
+                                    <td>
+                                        <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.enrollmentDate" ng-disabled="true"/>
+                                    </td>
+                                </tr>
+                                <tr ng-if="selectedProgram.displayIncidentDate">                    
+                                    <td>
+                                        {{selectedProgram.incidentDateLabel}}
+                                    </td>
+                                    <td>
+                                        <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.incidentDate" ng-disabled="true"/>
+                                    </td>
+                                </tr>                
+                            </table>
+
+                            <div class="vertical-spacing">
+                                <button type="button" 
+                                        class="btn btn-primary"
+                                        ng-disabled="!canUseEnrollment()"
+                                        ng-click="completeEnrollment()">
+                                    {{selectedEnrollment.status === 'ACTIVE' ? 'complete' : 'incomplete' | translate}}
+                                </button>
+                                <button type="button" 
+                                        class="btn btn-warning"
+                                        ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
+                                        ng-click="cancelEnrollment()">
+                                    {{'cancel'| translate}}
+                                </button>
+                                <button type="button"
+                                        title="{{selectedEnrollment.followup ? 'unmark_for_followup' : 'mark_for_followup' | translate}}"
+                                        ng-class="{true: 'btn btn-danger', false: 'btn btn-default'} [selectedEnrollment.followup]"
+                                        ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
+                                        ng-click="markForFollowup()">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                </button>
+                            </div>
+                        </div>
+
+                        <!-- various alerts begin -->
+                        <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !hasEnrollmentHistory">
+                            <div class="alert alert-warning">{{'not_yet_enrolled_enrollment'| translate}}</div>
+                        </div>
+                        <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !showEnrollmentHistoryDiv && hasEnrollmentHistory">
+                            <div class="alert alert-warning">{{'no_active_enrollment_exists'| translate}}</div>
+                        </div>
+                        <div ng-if="!selectedProgram && programExists">
+                            <div class="alert alert-danger">{{'please_select_a_program_for_enrollment'| translate}}</div> 
+                        </div>
+                        <div ng-if="!programExists">
+                            <div class="alert alert-danger">{{'no_program_exists_enrollment'| translate}}</div> 
+                        </div>
+                        <!-- various alerts end -->
+
+                        <!-- operations on historical enrollment begins -->
+                        <div ng-if="showEnrollmentHistoryDiv && !selectedEnrollment">
+                            <table class="table table-striped dhis2-table-hover table-bordered">
+                                <tr>
+                                    <th>
+                                        {{selectedProgram.enrollmentDateLabel}}
+                                    </th>
+                                    <th ng-if="selectedProgram.displayIncidentDate">
+                                        {{selectedProgram.incidentDateLabel}}
+                                    </th>
+                                    <th>
+                                        {{'enrolling_orgunit' | translate}}
+                                    </th>
+                                </tr>
+                                <tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
+                                    <td>
+                                        {{en.enrollmentDate}}
+                                    </td>
+                                    <td ng-if="selectedProgram.displayIncidentDate">
+                                        {{en.incidentDate}}
+                                    </td>
+                                    <td>
+                                        {{en.orgUnitName}}
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        <!-- operations on historical enrollment ends -->
+                    </div>
+                    
                 </div>
                 <div class="col-sm-6 border-left" ng-if="!showEnrollmentDiv">
-                    <div class="title small-vertical-spacing">{{'for_other_programs'| translate}}</div>                
-                    <div ng-if="activeEnrollments.length > 0">
-                        <table class="table table-striped dhis2-table-hover table-bordered">
-                            <tr ng-repeat="activeEnrollment in activeEnrollments">
-                                <td ng-if="selectedProgram && selectedProgram.id !== activeEnrollment.program || !selectedProgram" title="{{'set_as_current'| translate}}" ng-click="changeProgram(activeEnrollment.program)">
-                                    {{programNames[activeEnrollment.program].name}}
-                                </td>
-                            </tr>
-                        </table> 
+                    <div class="title small-vertical-spacing">{{'for_other_programs'| translate}}</div>
+                    <div class="vertical-spacing">
+                        <div ng-if="activeEnrollments.length > 0">
+                            <table class="table table-striped dhis2-table-hover table-bordered">
+                                <tr ng-repeat="activeEnrollment in activeEnrollments">
+                                    <td ng-if="selectedProgram && selectedProgram.id !== activeEnrollment.program || !selectedProgram" title="{{'set_as_current'| translate}}" ng-click="changeProgram(activeEnrollment.program)">
+                                        {{programNames[activeEnrollment.program].name}}
+                                    </td>
+                                </tr>
+                            </table> 
+                        </div>
+                        <div ng-if="activeEnrollments.length === 0">
+                            <div class="alert alert-warning">{{'no_active_enrollments_exist'| translate}}</div>
+                        </div>
                     </div>
-                    <div ng-if="activeEnrollments.length === 0">
-                        <div class="alert alert-info">{{'no_active_enrollments_exist'| translate}}</div>
-                    </div>                
+                                    
                 </div>
             </div>        
             <!-- operations on selected enrollment ends -->