dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #42139
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21527: event-capture: print default and custom forms
------------------------------------------------------------
revno: 21527
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-24 13:02:01 +0100
message:
event-capture: print default and custom forms
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/ec-custom-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/event-details.html
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/styles/print.css
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 2015-12-03 17:37:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-12-24 12:02:01 +0000
@@ -10,6 +10,37 @@
display: none;
}
+@media print {
+ .not-for-screen {
+ display: block;
+ }
+ body, html {
+ width: 100% !important;
+ height: auto !important;
+ }
+
+ ::-webkit-input-placeholder { /* WebKit browsers */
+ color: white !important;
+ }
+ :-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+ color: white !important;
+ }
+ ::-moz-placeholder { /* Mozilla Firefox 19+ */
+ color: white !important;
+ }
+ :-ms-input-placeholder { /* Internet Explorer 10+ */
+ color: white !important;
+ }
+
+ .select2-default {
+ color: #f00 !important;
+ }
+
+ #header, #leftBar, .hideInPrint {
+ display: none !important;
+ }
+}
+
/*----------------------------------------------------------------------------*/
/* Table
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-10-07 14:23:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-12-24 12:02:01 +0000
@@ -28,7 +28,7 @@
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'latitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
+ {{'latitude'| translate}}<span class="pull-right hideInPrint"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
<td>
<input type="number"
ng-model="currentEvent.coordinate.latitude"
@@ -42,7 +42,7 @@
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'longitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
+ {{'longitude'| translate}}<span class="pull-right hideInPrint"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
</td>
<td>
<input type="number"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/event-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/event-details.html 2015-10-20 09:25:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/event-details.html 2015-12-24 12:02:01 +0000
@@ -29,7 +29,7 @@
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'latitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
+ {{'latitude'| translate}}<span class="pull-right hideInPrint"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
</td>
<td>
<input type="number"
@@ -44,7 +44,7 @@
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'longitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
+ {{'longitude'| translate}}<span class="pull-right hideInPrint"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
</td>
<td>
<input type="number"
=== 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 2015-12-03 17:37:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-12-24 12:02:01 +0000
@@ -1,4 +1,4 @@
-<span id="showLeftBar">
+<span id="showLeftBar" class="hideInPrint">
<a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
</span>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css 2015-12-16 13:50:33 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css 2015-12-24 12:02:01 +0000
@@ -1,22 +1,27 @@
-@media print {
- a[href]:after {
- content: none;
- }
+body, html {
+ width: 100% !important;
+ height: auto !important;
}
.not-for-screen {
- display: none;
-}
-
-@media print {
- .not-for-screen {
display: block;
- }
- body, html, #print-div {
- margin-top:0%;
- display:block;
- height:100%;
- }
+}
+
+::-webkit-input-placeholder { /* WebKit browsers */
+ color: white !important;
+}
+:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+ color: white !important;
+}
+::-moz-placeholder { /* Mozilla Firefox 19+ */
+ color: white !important;
+}
+:-ms-input-placeholder { /* Internet Explorer 10+ */
+ color: white !important;
+}
+
+#header, #leftBar, .hideInPrint {
+ display: none !important;
}
.dhis2-table-striped-border {
=== 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 2015-12-24 11:47:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2015-12-24 12:02:01 +0000
@@ -31,9 +31,9 @@
:-ms-input-placeholder { /* Internet Explorer 10+ */
color: white !important;
}
-
- .select2-default {
- color: #f00 !important;
+
+ #header, #leftBar, .hideInPrint {
+ display: none !important;
}
}
@@ -1044,12 +1044,6 @@
color: #555;
}
-@media print {
- #header, #leftBar, .hideInPrint {
- display: none;
- }
-}
-
.org-unit-tree {
margin-left: -5px;
color: #000;
