← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14615: Externalized css

 

------------------------------------------------------------
revno: 14615
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-04-02 16:21:37 +0200
message:
  Externalized css
modified:
  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/style/dhis-web-reporting.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-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-03-31 18:05:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-04-02 14:21:37 +0000
@@ -72,28 +72,6 @@
 var i18n_confirm_unaccept = '$encoder.jsEscape( $i18n.getString( "confirm_unaccept" ) , "'")';
 </script>
 
-<style type="text/css" media="print">
-div#control {
-  display: none;
-}
-
-h3#dataset_report_header {
-  display: none;
-}
-
-#download_buttons {
-  display: none;
-}
-
-#shareForm {
-  display: none;
-}  
-
-.gridTable {
-    width: 100%;
-}
-</style>
-
 <style type="text/css">
 div#control {
   margin-bottom: 15px;
@@ -105,7 +83,7 @@
 }
 </style>
 
-<h3 id="dataset_report_header">$i18n.getString( "dataset_report" ) #openHelp( "dataset_reports" )</h3>
+<h3 id="dataSetReportHeader">$i18n.getString( "dataset_report" ) #openHelp( "dataset_reports" )</h3>
 
 <div id="control">
 <input type="button" value='$i18n.getString( "data" )' style="width:140px" onclick="showCriteria()">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css	2013-12-28 15:41:14 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css	2014-04-02 14:21:37 +0000
@@ -27,4 +27,27 @@
   display: inline-block;
   vertical-align: top;
   margin-left: 15px;
-}
\ No newline at end of file
+}
+
+@media print
+{
+	div#control 
+    {
+	  display: none;
+	}
+	
+	h3#dataSetReportHeader
+    {
+	  display: none;
+	}
+		
+	#shareForm 
+    {
+	  display: none;
+	}  
+	
+	.gridTable 
+    {
+	    width: 100%;
+	}
+}