dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37037
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18951: tracker-capture: use default print stylesheet from dhis-web-commons
------------------------------------------------------------
revno: 18951
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-04-20 13:38:15 +0200
message:
tracker-capture: use default print stylesheet from dhis-web-commons
removed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css
modified:
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/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/index.html
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/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-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-04-14 09:56:06 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2015-04-20 11:38:15 +0000
@@ -1,5 +1,5 @@
<div class="container-1-1">
- <div class="col-sm-12 vertical-spacing not-printable">
+ <div class="col-sm-12 vertical-spacing hideInPrint">
<button type="button" class="btn btn-default" ng-click="back()">{{'back'| translate}}</button>
@@ -38,7 +38,7 @@
smaller-widgets={{ dashboardWidgets | filter: {parent: 'smallerWidget'} }}
class="row connectedSortable empty-dashboard-container">
<div class="col-sm-12" id={{biggerWidget.title}} ng-repeat="biggerWidget in dashboardWidgets | orderBy:'order' | filter: {parent: 'biggerWidget'}"">
- <div ng-show="biggerWidget.show" ng-include="biggerWidget.view" ng-class="{true: 'not-printable'} [biggerWidget.title != 'report']"></div>
+ <div ng-show="biggerWidget.show" ng-include="biggerWidget.view" ng-class="{true: 'hideInPrint'} [biggerWidget.title != 'report']"></div>
</div>
</div>
</div>
@@ -49,7 +49,7 @@
smaller-widgets={{ dashboardWidgets | filter: {parent: 'smallerWidget'} }}
class="row connectedSortable empty-dashboard-container">
<div class="col-sm-12" id={{smallerWidget.title}} ng-repeat="smallerWidget in dashboardWidgets | orderBy:'order' | filter: {parent: 'smallerWidget'}">
- <div ng-show="smallerWidget.show" ng-include="smallerWidget.view" ng-class="{true: 'not-printable'} [smallerWidget.title != 'report']"></div>
+ <div ng-show="smallerWidget.show" ng-include="smallerWidget.view" ng-class="{true: 'hideInPrint'} [smallerWidget.title != 'report']"></div>
</div>
</div>
</div>
=== 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-03-06 16:52:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html 2015-04-20 11:38:15 +0000
@@ -18,7 +18,7 @@
<div class="row top-bar">
<div class="col-sm-12">
{{'overdue_events'| translate}}
- <div class="pull-right not-printable">
+ <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>
@@ -109,7 +109,7 @@
<div ng-switch-default>
<!-- report begins -->
- <div class='pull-right vertical-spacing not-printable'>
+ <div class='pull-right vertical-spacing hideInPrint'>
<button type="button"
class="btn btn-primary"
onclick="javascript:window.print()">
@@ -132,13 +132,13 @@
<!-- sort icon begins -->
<span ng-click="sortGrid(gridColumn)">
{{gridColumn.name}}
- <i ng-if="sortHeader == gridColumn.id && reverse" class="fa fa-sort-desc not-printable"></i>
- <i ng-if="sortHeader == gridColumn.id && !reverse" class="fa fa-sort-asc not-printable"></i>
+ <i ng-if="sortHeader == gridColumn.id && reverse" class="fa fa-sort-desc hideInPrint"></i>
+ <i ng-if="sortHeader == gridColumn.id && !reverse" class="fa fa-sort-asc hideInPrint"></i>
</span>
<!-- sort icon ends -->
<!-- filter icon begins -->
- <span class='pull-right not-printable'>
+ <span class='pull-right hideInPrint'>
<span ng-show="gridColumn.type != 'date' && gridColumn.type != 'int'">
<a href ng-click="searchInGrid(gridColumn)" title="{{'search'| translate}}"><span ng-class="{true: 'filter-without-content', false: 'filter-with-content'} [filterText[gridColumn.id] == undefined || filterText[gridColumn.id] == '']"><i class="fa fa-search"></i></span></a>
</span>
@@ -149,7 +149,7 @@
<!-- filter icon ends -->
<!-- filter input field begins -->
- <span ng-show="gridColumn.showFilter" class="not-printable">
+ <span ng-show="gridColumn.showFilter" class="hideInPrint">
<span ng-switch="gridColumn.type">
<span ng-switch-when="int">
<input style="width: 45%;" placeholder="{{'lower_limit'| translate}}" type="number" ng-model="filterText[gridColumn.id].start" ng-blur="searchInGrid(gridColumn)">
=== 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-01-20 16:41:34 +0000
+++ 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
@@ -1,5 +1,5 @@
<div class="panel panel-info" ng-controller="TeiReportController">
- <div class="panel-heading handle bold not-printable">
+ <div class="panel-heading handle bold hideInPrint">
{{reportWidget.title| translate}}
<span class="pull-right widget-link">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(reportWidget)">
@@ -11,7 +11,7 @@
</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="remove-default-padding not-printable">
+ <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}}">
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-03-19 10:18:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-04-20 11:38:15 +0000
@@ -125,18 +125,17 @@
<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">
<link type="text/css" rel="stylesheet" media="screen" href="styles/screen.css">
- <link type="text/css" rel="stylesheet" media="print" href="styles/print.css">
-
<script type="text/javascript" src="../main.js"></script>
</head>
<body>
<d2-header-bar></d2-header-bar>
- <div class="container-1" data-ng-view=''></div>
+ <div ng-view></div>
</body>
</html>
\ No newline at end of file
=== removed 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-03-06 10:08:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#header, #leftBar, .not-printable {
- display: none;
-}
\ No newline at end of file
=== 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-04-17 07:19:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2015-04-20 11:38:15 +0000
@@ -1,3 +1,15 @@
+html, body {
+ height:100%;
+ margin: 0;
+ padding: 0;
+ background-color: white;
+ font-size: 10pt;
+}
+
+.not-for-screen {
+ display: none;
+}
+
h1 {
font-size: 1.8em;
}
@@ -894,7 +906,7 @@
}
@media print {
- #header, #leftBar, .not-printable {
+ #header, #leftBar, .hideInPrint {
display: none;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-03-31 12:18:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-04-20 11:38:15 +0000
@@ -75,7 +75,7 @@
<span ng-if='showRegistrationDiv'>
{{selectedProgram.trackedEntity.name}} {{'register'| translate}}
</span>
- <div class="pull-right not-printable">
+ <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="trackedEntityList.rows.length <= 0">
<i class="fa fa-cog" title="{{'settings'| translate}}"></i>
@@ -124,7 +124,7 @@
<!-- program selection ends -->
<!-- simple/advanced search begins -->
- <div id="searchDropDownParent" class="input-group col-md-4 not-printable">
+ <div id="searchDropDownParent" class="input-group col-md-4 hideInPrint">
<input type="text" placeholder="{{'type_your_search_criteria_here'| translate}}" ng-model="searchText" class="form-control expanded" d2-enter="search(searchMode.freeText)" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()" ng-disabled="showRegistrationDiv">
<div class="input-group-btn">
<button class="btn btn-default search-dropdown-button trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-click="showHideSearch()" ng-disabled="showRegistrationDiv"><i class="fa fa-caret-down"></i></button>
@@ -139,7 +139,7 @@
<!-- simple/advanced search ends -->
<!--search/registration buttons begin-->
- <div class="col-md-4 trim not-printable">
+ <div class="col-md-4 trim hideInPrint">
<button type="button"
class="btn btn-success"
ng-disabled="showRegistrationDiv"
