← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9598: Improved layout/css for printing

 

------------------------------------------------------------
revno: 9598
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-01-24 12:11:31 +0100
message:
  Improved layout/css for printing
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/print.css
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm


--
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-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2012-11-15 17:50:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2013-01-24 11:11:31 +0000
@@ -8,6 +8,7 @@
 css/light_blue/logo_banner.png
 css/light_blue/logo_separator.png
 css/widgets.css
+css/print.css
 ../dhis-web-dataentry/style/dhis-web-dataentry.css
 javascripts/jQuery/jquery.min.js
 javascripts/jQuery/jquery.metadata.js

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/print.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/print.css	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/print.css	2013-01-24 11:11:31 +0000
@@ -0,0 +1,25 @@
+body
+{
+  font-family: arial, sans-serif;
+}
+
+div#header 
+{
+  display: none;
+}
+
+div#leftBar 
+{
+  display: none;
+}
+
+div#headerMessage 
+{
+  display: none;
+}
+
+div#rightBar
+{
+  display: none;
+}
+	
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-01-15 13:48:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-01-24 11:11:31 +0000
@@ -5,6 +5,7 @@
 	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/${stylesheet}" />
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css" />
+    <link type="text/css" rel="stylesheet" media="print" href="../dhis-web-commons/css/print.css" />
     #foreach ( $style in $stylesheets )
     <link type="text/css" rel="stylesheet" href="$style">
     #end    

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2012-12-04 13:16:24 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2013-01-24 11:11:31 +0000
@@ -25,26 +25,22 @@
 </script>
 
 <style type="text/css" media="print">
-div#header {
-    display: none;
-}
-
-div#leftBar {
-    display: none;
-}
-
 div#control {
-    display: none;
+  display: none;
 }
 
 h3#dataset_report_header {
-    display: none;
+  display: none;
 }
 
 #download_buttons {
-    display: none;
+  display: none;
 }
 
+#shareForm {
+  display: none;
+}  
+
 .gridTable {
     width: 100%;
 }