dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39783
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20168: tracker-capture: more view filters replaced by controller side logic
------------------------------------------------------------
revno: 20168
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-09-15 18:03:55 +0200
message:
tracker-capture: more view filters replaced by controller side logic
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html
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/components/dataentry/dataentry.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html
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/notes/notes.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.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/activeprograms/active-programs.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html 2015-09-11 15:16:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html 2015-09-15 16:03:55 +0000
@@ -3,10 +3,10 @@
{{activeProgramsWidget.title| translate}}
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(activeProgramsWidget)">
- <span ng-show="activeProgramsWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!activeProgramsWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="activeProgramsWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!activeProgramsWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(activeProgramsWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(activeProgramsWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="activeProgramsWidget.expand && activeEnrollments.length > 0" class="panel-body dashboard-element-container">
=== 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 08:10:51 +0000
+++ 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
@@ -31,6 +31,16 @@
$scope.userAuthority = AuthorityService.getUserAuthorities(SessionStorageService.get('USER_ROLES'));
$scope.sortedTeiIds = CurrentSelection.getSortedTeiIds();
+ //Labels
+ $scope.removeLabel = $translate.instant('remove');
+ $scope.expandLabel = $translate.instant('expand');
+ $scope.collapseLabel = $translate.instant('collapse');
+ $scope.noDataReportLabel = $translate.instant('no_data_report');
+ $scope.noRelationshipLabel = $translate.instant('no_relationship');
+ $scope.settingsLabel = $translate.instant('settings');
+ $scope.showHideWidgetsLabel = $translate.instant('show_hide_widgets');
+ $scope.notEnrolledLabel = $translate.instant('not_yet_enrolled_data_entry');
+
$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-09-11 15:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2015-09-15 16:03:55 +0000
@@ -21,11 +21,11 @@
<!-- dashboard setting begins -->
<div class="pull-right">
<div class="btn-group trim" dropdown is-open="status.isopen">
- <button type="button" title="{{'settings'| translate}}" class="btn btn-default dropdown-toggle" dropdown-toggle>
+ <button type="button" title="{{settingsLabel}}" class="btn btn-default dropdown-toggle" dropdown-toggle>
<i class="fa fa-cog"></i>
</button>
<ul class="dropdown-menu pull-right" role="menu">
- <li><a href ng-click="showHideWidgets()">{{'show_hide_widgets'| translate}}</a></li>
+ <li><a href ng-click="showHideWidgets()">{{showHideWidgetsLabel}}</a></li>
<li ng-if="userAuthority.canAdministerDashboard"><a href ng-click="saveDashboarLayoutAsDefault()">{{'save_layout_as_default'| translate}}</a></li>
<li><a href ng-click="activiateTEI()">{{selectedTei.inactive ? 'activate_tei' : 'deactivate_tei' | translate}}</a></li>
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2015-09-08 12:24:06 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2015-09-15 16:03:55 +0000
@@ -8,10 +8,10 @@
<a href ng-click="filterEvents = !filterEvents" title="{{filterEvents ? 'list_events' : 'filter_events'| translate}}" ng-show="eventFilteringRequired"><span ng-if="!filterEvents"><i class="fa fa-filter vertical-center"></i></span><span ng-if="filterEvents"><i class="fa fa-list vertical-center"></i></span></a>
<a href ng-click="toggleLegend()" title="{{'event_color_legend'| translate}}" class="small-horizonal-spacing"><i class="fa fa-info-circle vertical-center"></i></a>
<a class="small-horizonal-spacing" href ng-click="expandCollapse(dataentryWidget)">
- <span ng-show="dataentryWidget.expand"><i class="fa fa-chevron-up vertical-center" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!dataentryWidget.expand"><i class="fa fa-chevron-down vertical-center" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="dataentryWidget.expand"><i class="fa fa-chevron-up vertical-center" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!dataentryWidget.expand"><i class="fa fa-chevron-down vertical-center" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(dataentryWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle vertical-center"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(dataentryWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle vertical-center"></i></a>
</span>
</div>
@@ -31,7 +31,7 @@
<table class="table table-bordered">
<thead>
<tr>
- <th class="active" style="vertical-align:middle" ng-repeat="stage in programStages | orderBy:'sortOrder':reverse">
+ <th class="active" style="vertical-align:middle" ng-repeat="stage in programStages">
{{stage.name}}
<!-- event add/filter icon begins -->
@@ -73,7 +73,7 @@
</table>
</div>
- <div ng-if="!selectedEnrollment || !selectedEnrollment.enrollment" class="alert alert-danger">{{'not_yet_enrolled_data_entry'| translate}}</div>
+ <div ng-if="!selectedEnrollment || !selectedEnrollment.enrollment" class="alert alert-danger">{{notEnrolledLabel}}</div>
<form name="outerForm" novalidate>
<div ng-if="currentEvent">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2015-09-14 20:10:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2015-09-15 16:03:55 +0000
@@ -16,6 +16,7 @@
</thead>
<tr class="col-md-12" ng-repeat="prStDe in currentStage.programStageDataElements" ng-if="!isHidden(prStDe.dataElement.id)">
<td>
+ <!--<span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name"></span>-->
{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}
<a ng-if="prStDe.dataElement.description" Title="{{prStDe.dataElement.description}}" ng-init="showHelpText[prStDe.dataElement.id] = false;" ng-click="showHelpText[prStDe.dataElement.id] = !showHelpText[prStDe.dataElement.id]">
<span class="glyphicon glyphicon-info-sign" ></span>
@@ -240,6 +241,7 @@
<tbody id="list">
<tr ng-repeat="de in section.programStageDataElements" ng-if="!isHidden(de.dataElement.id)">
<td>
+ <!--<span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name"></span>-->
{{prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name}}
<a ng-if="prStDes[de.dataElement.id].dataElement.description" Title="{{prStDes[de.dataElement.id].dataElement.description}}" ng-init="showHelpText[de.dataElement.id] = false;" ng-click="showHelpText[de.dataElement.id] = !showHelpText[de.dataElement.id]">
<span class="glyphicon glyphicon-info-sign" ></span>
=== 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-09-11 15:16:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-09-15 16:03:55 +0000
@@ -14,10 +14,10 @@
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(enrollmentWidget)">
- <span ng-show="enrollmentWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!enrollmentWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="enrollmentWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!enrollmentWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(enrollmentWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(enrollmentWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="enrollmentWidget.expand" class="panel-body dashboard-widget-container">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2015-01-20 16:41:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2015-09-15 16:03:55 +0000
@@ -12,10 +12,10 @@
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(notesWidget)">
- <span ng-show="notesWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!notesWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="notesWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!notesWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(notesWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(notesWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="notesWidget.expand" class="panel-body dashboard-widget-container">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2015-08-26 10:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2015-09-15 16:03:55 +0000
@@ -7,10 +7,10 @@
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(profileWidget)">
- <span ng-show="profileWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!profileWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="profileWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!profileWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(profileWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(profileWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="profileWidget.expand" class="panel-body dashboard-widget-container">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2015-09-07 07:55:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2015-09-15 16:03:55 +0000
@@ -2,7 +2,7 @@
<table class="dhis2-list-table-striped dhis2-table-hover">
<tr ng-repeat="attribute in attributes" ng-if="!hiddenFields[attribute.id]">
<td>
- {{attribute.name}}<span ng-if="attribute.mandatory || attribute.unique" class="required">*</span>
+ <span ng-bind="attribute.name"></span><span ng-if="attribute.mandatory || attribute.unique" class="required">*</span>
</td>
<td>
<ng-form name="innerForm">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2015-09-11 15:16:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2015-09-15 16:03:55 +0000
@@ -11,14 +11,14 @@
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(relationshipsWidget)">
- <span ng-show="relationshipsWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!relationshipsWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="relationshipsWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!relationshipsWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(relationshipsWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(relationshipsWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="relationshipsWidget.expand" class="panel-body dashboard-widget-container">
- <div ng-show="selectedTei && !selectedTei.relationships || selectedTei.relationships.length < 1" class="alert alert-warning">{{'no_relationship'| translate}}</div>
+ <div ng-show="selectedTei && !selectedTei.relationships || selectedTei.relationships.length < 1" class="alert alert-warning">{{noRelationshipLabel}}</div>
<div ng-show="!selectedTei" class="alert alert-danger">{{'relationship_not_possible'| translate}}</div>
<div ng-if="relatedTeis.length > 0">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html 2015-09-15 13:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html 2015-09-15 16:03:55 +0000
@@ -21,7 +21,7 @@
<div class="pull-right hideInPrint">
<div class="btn-group" dropdown is-open="status.isopen">
<button type="button" class="btn btn-default dropdown-toggle" ng-disabled="!overdueEvents.length">
- <i class="fa fa-cog" title="{{'settings'| translate}}"></i>
+ <i class="fa fa-cog" title="{{settingsLabel}}"></i>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<li ng-show="overdueEvents.length > 0"><a href ng-click="showHideColumns()">{{'show_hide_columns'| translate}}</a></li>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html 2015-04-20 11:38:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html 2015-09-15 16:03:55 +0000
@@ -3,14 +3,14 @@
{{reportWidget.title| translate}}
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(reportWidget)">
- <span ng-show="reportWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!reportWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="reportWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!reportWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(reportWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(reportWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="reportWidget.expand" class="panel-body dashboard-widget-container">
- <div ng-if="!dataExists" class="alert alert-warning">{{'no_data_report'| translate}}</div>
+ <div ng-if="!dataExists" class="alert alert-warning">{{noDataReportLabel}}</div>
<div ng-if="dataExists" class="remove-default-padding hideInPrint">
<table class="table table-striped dhis2-table-hover">
<tr ng-click="showProgramReportDetails(pr)" ng-repeat="pr in programs" ng-if="report[pr.id].enrollments" title="{{'details'| translate}}">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2015-09-15 13:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2015-09-15 16:03:55 +0000
@@ -21,7 +21,7 @@
<div class="pull-right">
<div class="btn-group" dropdown is-open="status.isopen">
<button type="button" class="btn btn-default dropdown-toggle" ng-disabled="!upcomingEvents.length">
- <i class="fa fa-cog" title="{{'settings'| translate}}"></i>
+ <i class="fa fa-cog" title="{{settingsLabel}}"></i>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<li ng-show="upcomingEvents.length > 0"><a href ng-click="showHideColumns()">{{'show_hide_columns'| translate}}</a></li>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js 2015-06-23 13:17:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js 2015-09-15 16:03:55 +0000
@@ -2,6 +2,7 @@
function(
$rootScope,
$scope,
+ $translate,
$log) {
@@ -9,7 +10,7 @@
: $scope.$parent.$parent.smallerWidget ? $scope.$parent.$parent.smallerWidget : null;
$scope.widgetTitle = $scope.widget.title;
-
+ $scope.widgetTitleLabel = $translate.instant($scope.widgetTitle);
$scope.displayTextEffects = {};
$scope.displayKeyDataEffects = {};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound.html 2015-06-02 05:55:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound.html 2015-09-15 16:03:55 +0000
@@ -1,12 +1,12 @@
<div class="panel panel-info" ng-controller="RuleBoundController">
<div class="panel-heading handle bold">
- {{widgetTitle | translate}}
+ {{widgetTitleLabel}}
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(this.widget)">
- <span ng-show="this.widget.expand"><i class="fa fa-chevron-up" title="{{'collapse' | translate}}"></i></span>
- <span ng-show="!this.widget.expand"><i class="fa fa-chevron-down" title="{{'expand' | translate}}"></i></span>
+ <span ng-show="this.widget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!this.widget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(this.widget)" title="{{'remove' | translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(this.widget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="this.widget.expand" class="dashboard-element-container">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html 2015-09-11 15:16:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html 2015-09-15 16:03:55 +0000
@@ -3,10 +3,10 @@
{{current_selectionsWidget.title| translate}}
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(current_selectionsWidget)">
- <span ng-show="current_selectionsWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!current_selectionsWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
+ <span ng-show="current_selectionsWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
+ <span ng-show="!current_selectionsWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
</a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(current_selectionsWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
+ <a class="small-horizonal-spacing" href ng-click="removeWidget(current_selectionsWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
<div ng-show="current_selectionsWidget.expand" class="panel-body dashboard-element-container">
