dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23295
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11323: Updated adhoc tool to use 2.13-SNAPSHOT
------------------------------------------------------------
revno: 11323
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-07-03 17:17:31 +0200
message:
Updated adhoc tool to use 2.13-SNAPSHOT
renamed:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js => dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
tools/dhis-adhoc/pom.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-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-03-20 20:29:24 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-07-03 15:17:31 +0000
@@ -16,7 +16,7 @@
<param name="page">/dhis-web-dashboard-integration/mainForm.vm</param>
<param name="hideMenu">true</param>
<param name="stylesheets">style/dashboard.css</param>
- <param name="javascripts">javascript/dropdown.js</param>
+ <param name="javascripts">javascript/dashboard.js</param>
</action>
<action name="provideContent"
=== renamed file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js' => 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2013-07-03 12:43:28 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2013-07-03 15:17:31 +0000
@@ -96,6 +96,8 @@
width: 486px;
border: 1px solid #aaa;
padding: 5px 6px 0 6px;
+ box-shadow: #ccc 0px 1px 2px 0px inset;
+ border-radius: 2px;
}
#searchButton
@@ -129,6 +131,7 @@
display: none;
overflow: hidden;
z-index: 5;
+ box-shadow: #ccc 0px 1px 2px 0px;
}
#hitDiv ul
=== modified file 'tools/dhis-adhoc/pom.xml'
--- tools/dhis-adhoc/pom.xml 2013-05-06 18:21:24 +0000
+++ tools/dhis-adhoc/pom.xml 2013-07-03 15:17:31 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.13-SNAPSHOT</version>
</parent>
<artifactId>dhis-adhoc</artifactId>
@@ -39,6 +39,10 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-patient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-system</artifactId>
</dependency>