------------------------------------------------------------
revno: 21835
committer: jijukjose <jijukj...@gmail.com>
branch nick: dhis2
timestamp: Fri 2016-01-29 09:57:41 +0100
message:
Improving the alignment of audit icons with respect to the input fields
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.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/registration/default-registration-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
--
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/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2016-01-27 17:55:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2016-01-29 08:57:41 +0000
@@ -473,4 +473,9 @@
.form-narrow-column {
width: 80px;
+}
+
+.audit-icon-column {
+ width: 30px;
+ align: center;
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2016-01-28 16:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2016-01-29 08:57:41 +0000
@@ -9,7 +9,7 @@
<th>
{{'value'| translate}}
</th>
- <th class="form-narrow-column hideInPrint" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
+ <th class="audit-icon-column hideInPrint" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
</th>
</tr>
</thead>
@@ -258,7 +258,7 @@
</div>
</ng-form>
</td>
- <td class="form-narrow-column hideInPrint" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
+ <td class="hideInPrint audit-icon-column" align="center" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
<d2-audit dataelement-id="{{prStDes[eventGridColumn.id].dataElement.id}}" dataelement-name="{{prStDes[eventGridColumn.id].dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
</td>
</tr>
@@ -286,7 +286,7 @@
<th>
{{'value'| translate}}
</th>
- <th class="form-narrow-column hideInPrint" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
+ <th class="audit-icon-column hideInPrint" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
</th>
</tr>
@@ -549,7 +549,7 @@
</div>
</ng-form>
</td>
- <td class="hideInPrint" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
+ <td class="hideInPrint audit-icon-column" align="center" ng-if="currentEvent.event && currentEvent.event !== 'SINGLE_EVENT'">
<d2-audit dataelement-id="{{de.dataElement.id}}" dataelement-name="{{prStDes[de.dataElement.id].dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
</td>
</tr>
=== 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 2016-01-28 16:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2016-01-29 08:57:41 +0000
@@ -6,7 +6,7 @@
</th>
<th class="" ng-bind="valueLabel">
</th>
- <th class="form-narrow-column hideInPrint" ng-if="currentEvent.event">
+ <th class="hideInPrint audit-icon-column" ng-if="currentEvent.event">
</th>
<th class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-bind="providedElsewhereLabel">
</th>
@@ -333,7 +333,7 @@
</div>
</ng-form>
</td>
- <td ng-if="currentEvent.event" class="hideInPrint form-narrow-column">
+ <td ng-if="currentEvent.event" class="hideInPrint audit-icon-column" align="center">
<d2-audit dataelement-id="{{prStDe.dataElement.id}}" dataelement-name="{{prStDe.dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
</td>
<td class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]">
@@ -365,7 +365,7 @@
</th>
<th ng-bind="valueLabel">
</th>
- <th class="form-narrow-column hideInPrint" ng-if="currentEvent.event">
+ <th class="hideInPrint audit-icon-column" ng-if="currentEvent.event">
</th>
<th class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-bind="providedElsewhereLabel">
</th>
@@ -671,7 +671,7 @@
</div>
</ng-form>
</td>
- <td class="hideInPrint" ng-if="currentEvent.event">
+ <td class="hideInPrint audit-icon-column" align="center" ng-if="currentEvent.event">
<d2-audit dataelement-id="{{de.dataElement.id}}" dataelement-name="{{prStDes[de.dataElement.id].dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
</td>
<td class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]">
=== 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 2016-01-28 16:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2016-01-29 08:57:41 +0000
@@ -199,7 +199,7 @@
</div>
</ng-form>
</td>
- <td class="hideInPrint" ng-if="selectedTeiId">
+ <td class="hideInPrint audit-icon-column" align="center" ng-if="selectedTeiId">
<d2-audit dataelement-id="{{attribute.id}}" dataelement-name="{{attribute.name}}" data-type="attribute" selected-tei-id={{selectedTei.trackedEntityInstance}}></d2-audit>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2016-01-14 17:33:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2016-01-29 08:57:41 +0000
@@ -938,6 +938,11 @@
width: 80px;
}
+.audit-icon-column {
+ width: 30px;
+ align: center;
+}
+
.underline {
text-decoration: underline;
}
_______________________________________________
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
