dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20645: Changed the src of the logoes to use the static content api instead.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 12 Oct 2015 16:09:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Stian Sandvold (stian-sandvold)
------------------------------------------------------------
revno: 20645 [merge]
committer: Stian Sandvold <stian.sandvold@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-10-12 18:08:15 +0200
message:
  Changed the src of the logoes to use the static content api instead.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm


--
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-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2015-04-07 09:42:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2015-10-12 15:13:12 +0000
@@ -33,11 +33,7 @@
         <div id="loginField">
         <div id="loginArea">
             <div id="bannerArea">
-            #if ( $keyCustomLoginPageLogo )
-            <img src="../../external-static/logo_front.png"></a>
-            #else
-            <a href="http://www.dhis2.org";><img src="logo_front.png" style="border:none"></a>
-            #end
+            <a href="http://www.dhis2.org";><img src="/api/staticContent/logo_front" style="border:none"></a>
             </div>
             
             <form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2015-09-30 18:50:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2015-10-12 15:13:12 +0000
@@ -104,11 +104,7 @@
     </script>
   </head>
 
-  #if ( $keyCustomTopMenuLogo )
-  #set( $logoBanner = "../external-static/logo_banner.png" )
-  #else
-  #set( $logoBanner = "../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" )
-  #end
+  #set( $logoBanner = "/api/staticContent/logo_banner" )
 
   <body>
     #parse( "macros.vm" )