dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 22149: tracker/event-capture: now loads custom css and js files

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 07 Mar 2016 12:59:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 22149
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-03-07 13:58:14 +0100
message:
  tracker/event-capture: now loads custom css and js files
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html


--
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-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache	2016-02-08 11:54:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache	2016-03-07 12:58:14 +0000
@@ -80,6 +80,8 @@
 ../dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js
 ../main.js
 
+../api/files/script
+
 ../dhis-web-commons/font-awesome/css/font-awesome.min.css
 ../dhis-web-commons/css/light_blue/light_blue.css
 ../dhis-web-commons/css/widgets.css
@@ -91,6 +93,8 @@
 
 styles/style.css
 
+../api/files/style
+
 ../dhis-web-commons/css/light_blue/logo_banner.png
 ../images/ajax-loader-bar.gif
 ../images/colapse.png

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2016-01-13 17:09:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html	2016-03-07 12:58:14 +0000
@@ -89,7 +89,11 @@
         <link type="text/css" rel="stylesheet" href="../dhis-web-commons/javascripts/angular/plugins/select.css">
         <link type="text/css" rel="stylesheet" href="../dhis-web-commons/javascripts/angular/plugins/select2.css">
         
-        <link type="text/css" rel="stylesheet" href="styles/style.css"> 
+        <link type="text/css" rel="stylesheet" href="styles/style.css">
+        
+        <!-- Custom user styles and scripts -->
+        <link type="text/css" rel="stylesheet" href="../api/files/style" />
+        <script type="text/javascript" src="../api/files/script"></script>
 
     </head>
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html	2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html	2016-03-07 12:58:14 +0000
@@ -124,6 +124,10 @@
         <link type="text/css" rel="stylesheet" href="styles/style.css">
         <link type="text/css" rel="stylesheet" media="print" href="styles/print.css">
         <script type="text/javascript" src="../main.js"></script>
+        
+        <!-- Custom user styles and scripts -->
+        <link type="text/css" rel="stylesheet" href="../api/files/style" />
+        <script type="text/javascript" src="../api/files/script"></script>
 
     </head>
     <body>