dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6800: Web api, removev external css, worked only when dhis is installed on server root

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sat, 28 Apr 2012 09:02:11 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 6800
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-28 10:59:43 +0200
message:
  Web api, removev external css, worked only when dhis is installed on server root
removed:
  dhis-2/dhis-web/dhis-web-api/src/main/resources/static/
  dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css/
  dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css/main.css
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl


--
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

=== removed directory 'dhis-2/dhis-web/dhis-web-api/src/main/resources/static'
=== removed directory 'dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css'
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css/main.css'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css/main.css	2012-03-28 12:45:07 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css/main.css	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-html
-{
-    font-family : sans-serif;
-    font-size   : 12pt;
-}
-
-table
-{
-    border-collapse : collapse;
-}
-
-table, th, td
-{
-    border  : 1px solid #c0c0c0;
-    padding : 3px;
-}
-
-h1, h2, h3 {
-    text-transform: capitalize;
-}

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl	2012-03-28 12:18:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl	2012-04-28 08:59:43 +0000
@@ -10,9 +10,22 @@
     <html>
       <head>
         <title>DHIS Web-API</title>
-        <link rel="stylesheet" href="/api/static/css/main.css" />
-
-        <!-- stylesheets, javascript etc -->
+        <style type="text/css">
+        html {
+          font-family: sans-serif;
+          font-size: 12pt;
+        }
+        table {
+          border-collapse: collapse;
+		}
+		table, th, td {
+		  border: 1px solid #c0c0c0;
+          padding: 3px;
+        }
+		h1, h2, h3 {
+          text-transform: capitalize;
+        }
+		</style>
       </head>
 
       <body>