dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37036
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18950: event-capture: use default print stylesheet from dhis-web-commons
------------------------------------------------------------
revno: 18950
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-04-20 13:29:12 +0200
message:
event-capture: use default print stylesheet from dhis-web-commons
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
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-event-capture/views/ec-custom-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-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-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-03-27 15:17:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-04-20 11:29:12 +0000
@@ -91,9 +91,9 @@
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js"></script>
<link type="text/css" rel="stylesheet" href="../dhis-web-commons/font-awesome/css/font-awesome.min.css"/>
- <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/light_blue/light_blue.css"/>
<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css"/>
<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/menu.css">
+ <link type="text/css" rel="stylesheet" media="print" href="../dhis-web-commons/css/print.css">
<link type="text/css" rel="stylesheet" href="styles/style.css">
=== 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-03-06 10:08:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-04-20 11:29:12 +0000
@@ -936,52 +936,4 @@
.small-horizonal-spacing{
margin-left: 5px;
-}
-
-@media print {
- #header, #leftBar, .not-printable {
- display: none;
- }
-
- .container-default-form {
- width: 90%;
- }
-
- ::-webkit-input-placeholder { /* WebKit browsers */
- color: transparent;
- }
- :-moz-placeholder { /* Mozilla Firefox 4 to 18 */
- color: transparent;
- }
- ::-moz-placeholder { /* Mozilla Firefox 19+ */
- color: transparent;
- }
- :-ms-input-placeholder { /* Internet Explorer 10+ */
- color: transparent;
- }
-
- .listTable
- {
- width: 100%;
- border-collapse: collapse;
- padding-top: 10px;
- cursor: pointer;
- }
-
- .listTable th
- {
- background-color: rgba( 0, 0, 0, 0 );
- border-bottom: 1px solid #cad5e5;
- padding: 6px 0 3px 5px;
- }
-
- .listTable td
- {
- padding: 2px 2px 2px 5px;
- }
-
- .listTable > tbody > tr > td
- {
- padding: 11px 0 10px 5px;
- }
-}
+}
\ 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 2015-04-17 13:14:21 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-04-20 11:29:12 +0000
@@ -378,13 +378,13 @@
<!-- buttons for event registration / update begins -->
<div style="clear: both;">
<span ng-if="editingEventInFull">
- <button type="button" ng-click="updateEvent()" class="button not-printable">{{'update'| translate}}</button>
- <button type="button" ng-click="cancel()" class="button not-printable">{{'cancel'| translate}}</button>
+ <button type="button" ng-click="updateEvent()" class="button hideInPrint">{{'update'| translate}}</button>
+ <button type="button" ng-click="cancel()" class="button hideInPrint">{{'cancel'| translate}}</button>
</span>
<span ng-if="eventRegistration">
- <button type="button" ng-disabled="disableSaveAndAddNew" ng-click="addEvent(true)" class="button not-printable">{{'save_and_add_new'| translate}}</button>
- <button type="button" ng-click="addEvent()" class="button not-printable">{{'save_and_back'| translate}}</button>
- <button type="button" ng-click="cancel()" class="button not-printable">{{'cancel'| translate}}</button>
+ <button type="button" ng-disabled="disableSaveAndAddNew" ng-click="addEvent(true)" class="button hideInPrint">{{'save_and_add_new'| translate}}</button>
+ <button type="button" ng-click="addEvent()" class="button hideInPrint">{{'save_and_back'| translate}}</button>
+ <button type="button" ng-click="cancel()" class="button hideInPrint">{{'cancel'| translate}}</button>
</span>
<span ng-if="isFormInvalid()" class="horizontal-spacing red">{{'form_invalid' | translate}}</span>
=== 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-03-04 12:38:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-04-20 11:29:12 +0000
@@ -85,13 +85,13 @@
<!-- buttons for event registration / update begins -->
<div style="clear: both;">
<span ng-if="editingEventInFull">
- <button type="button" ng-click="updateEvent()" class="button not-printable">{{'update'| translate}}</button>
- <button type="button" ng-click="cancel()" class="button not-printable">{{'cancel'| translate}}</button>
+ <button type="button" ng-click="updateEvent()" class="button hideInPrint">{{'update'| translate}}</button>
+ <button type="button" ng-click="cancel()" class="button hideInPrint">{{'cancel'| translate}}</button>
</span>
<span ng-if="eventRegistration">
- <button type="button" ng-disabled="disableSaveAndAddNew" ng-click="addEvent(true)" class="button not-printable">{{'save_and_add_new'| translate}}</button>
- <button type="button" ng-click="addEvent()" class="button not-printable">{{'save_and_back'| translate}}</button>
- <button type="button" ng-click="cancel()" class="button not-printable">{{'cancel'| translate}}</button>
+ <button type="button" ng-disabled="disableSaveAndAddNew" ng-click="addEvent(true)" class="button hideInPrint">{{'save_and_add_new'| translate}}</button>
+ <button type="button" ng-click="addEvent()" class="button hideInPrint">{{'save_and_back'| translate}}</button>
+ <button type="button" ng-click="cancel()" class="button hideInPrint">{{'cancel'| translate}}</button>
</span>
<span ng-if="isFormInvalid()" class="horizontal-spacing red">{{'form_invalid' | translate}}</span>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2015-03-19 14:30:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2015-04-20 11:29:12 +0000
@@ -14,7 +14,7 @@
<div ng-switch-default>
<h4>
{{'registered_events'| translate}}<span class="small-horizonal-spacing" ng-if="pager.total">({{'total' | translate}}: {{pager.total}})</span>
- <button class="button button-std pull-right not-printable"
+ <button class="button button-std pull-right hideInPrint"
ng-show="dhis2Events.length"
ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid"
ng-click="showHideColumns()">
@@ -53,7 +53,7 @@
<!-- sort icon ends -->
<!-- filter icon begins -->
- <span class='pull-right not-printable'>
+ <span class='pull-right hideInPrint'>
<span ng-show="eventGridColumn.type !='date' && eventGridColumn.type !='int'">
<a href ng-click="searchInGrid(eventGridColumn)" title="{{'search'| translate}}"><span ng-class="{true: 'filter-without-content', false: 'filter-with-content'} [filterText[eventGridColumn.id] == undefined || filterText[eventGridColumn.id] == '']"><i class="fa fa-search"></i></span></a>
</span>
=== 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-02-09 07:47:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-04-20 11:29:12 +0000
@@ -44,7 +44,7 @@
</select>
</td>
<td style='padding-left: 10px;'>
- <button class="button button-std not-printable"
+ <button class="button button-std hideInPrint"
ng-show="selectedProgramStage"
ng-click="showEventRegistration()"
ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid">
@@ -52,7 +52,7 @@
</button>
</td>
<td ng-if="dhis2Events.length > 0" style='padding-left: 10px;'>
- <button class="button button-std not-printable"
+ <button class="button button-std hideInPrint"
onclick="javascript:window.print()">
<span ng-if="!eventRegistration && !editingEventInFull">{{'print_list'| translate}}</span>
<span ng-if="eventRegistration">{{'print_form'| translate}}</span>
