dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6416: fixes to css rendering in web-api

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 28 Mar 2012 12:20:17 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 6416
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-03-28 14:18:20 +0200
message:
  fixes to css rendering in web-api
removed:
  dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/
  dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/css/
  dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/css/main.css
added:
  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/META-INF/dhis/servlet.xml
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml


--
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-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2012-03-16 10:08:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2012-03-28 12:18:20 +0000
@@ -11,11 +11,13 @@
 
   <sec:global-method-security pre-post-annotations="enabled" />
 
-	<mvc:annotation-driven>
-		<mvc:message-converters>
-			<bean class="org.hisp.dhis.api.mobile.support.DataStreamSerializableMessageConverter"/>
-		</mvc:message-converters>
-	</mvc:annotation-driven>
+  <mvc:resources mapping="/static/**" location="classpath:/static/" />
+
+  <mvc:annotation-driven>
+    <mvc:message-converters>
+      <bean class="org.hisp.dhis.api.mobile.support.DataStreamSerializableMessageConverter" />
+    </mvc:message-converters>
+  </mvc:annotation-driven>
 
   <context:component-scan base-package="org.hisp.dhis.api" />
 

=== added directory 'dhis-2/dhis-web/dhis-web-api/src/main/resources/static'
=== added directory 'dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css'
=== added 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	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/static/css/main.css	2012-03-28 12:18:20 +0000
@@ -0,0 +1,20 @@
+html
+{
+    font-family : sans-serif;
+    font-size   : 12pt;
+}
+
+table
+{
+    border-collapse : collapse;
+}
+
+table, th, td
+{
+    border  : 1px solid #c0c0c0;
+    padding : 3px;
+}
+
+h2 {
+    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 10:43:23 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl	2012-03-28 12:18:20 +0000
@@ -10,7 +10,7 @@
     <html>
       <head>
         <title>DHIS Web-API</title>
-        <link rel="stylesheet" href="../dhis-web-api/css/main.css" />
+        <link rel="stylesheet" href="/api/static/css/main.css" />
 
         <!-- stylesheets, javascript etc -->
       </head>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml	2012-03-12 20:25:54 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml	2012-03-28 12:18:20 +0000
@@ -13,11 +13,19 @@
     <filter-name>OpenSessionInViewFilter</filter-name>
     <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
   </filter>
+  <filter>
+    <filter-name>filterChainProxy</filter-name>
+    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+  </filter>
 
   <filter-mapping>
     <filter-name>OpenSessionInViewFilter</filter-name>
     <url-pattern>/api/*</url-pattern>
   </filter-mapping>
+  <filter-mapping>
+    <filter-name>filterChainProxy</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
   <listener>
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>

=== removed directory 'dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api'
=== removed directory 'dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/css'
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/css/main.css'
--- dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/css/main.css	2012-03-28 10:43:23 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/webapp/dhis-web-api/css/main.css	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-html
-{
-    font-family : sans-serif;
-    font-size   : 12pt;
-}
-
-table
-{
-    border-collapse : collapse;
-}
-
-table, th, td
-{
-    border  : 1px solid #c0c0c0;
-    padding : 3px;
-}