dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11220: Minor fix

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 17 Jun 2013 19:44:24 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 11220
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-06-17 21:42:08 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.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	2013-06-17 17:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-06-17 19:42:08 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
     <head>
-        <title>$encoder.htmlEncode( ${applicationTitle} )</title>        
+        <title>$!encoder.htmlEncode( ${applicationTitle} )</title>        
         <script type="text/javascript" src="../javascripts/jQuery/jquery.min.js"></script>
         <script type="text/javascript">
             $(document).ready(function() {
@@ -20,17 +20,17 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
-    	<h1 style="display:none">$encoder.htmlEncode( ${applicationTitle} )</h1>
+    	<h1 style="display:none">$!encoder.htmlEncode( ${applicationTitle} )</h1>
     	<div style="display:none">DHIS 2</div>
         <div>       
         #if ( $keyFlag )
             <img id="flagArea" src="../flags/${keyFlagImage}">
         #end
         #if ( $applicationTitle )
-            <span id="titleArea">$encoder.htmlEncode( ${applicationTitle} )</span>
+            <span id="titleArea">$!encoder.htmlEncode( ${applicationTitle} )</span>
         #end        
         #if ( $keyApplicationIntro )
-            <span id="introArea">${keyApplicationIntro}</span>
+            <span id="introArea">$!{keyApplicationIntro}</span>
         #end
         </div>
         #if ( $keyConfig.selfRegistrationAllowed() )
@@ -77,9 +77,9 @@
             <span id="loginMessage">Wrong username or password</span>
             #end
             #if ( $keyApplicationNotification )
-            <div id="notificationArea">${keyApplicationNotification}</div>
+            <div id="notificationArea">$!{keyApplicationNotification}</div>
             #end
         </div>
-        <div id="footerArea"><span>Powered by <a href="http://www.dhis2.org";>DHIS 2</a>&nbsp;&nbsp;${keyApplicationFooter}</div>
+        <div id="footerArea"><span>Powered by <a href="http://www.dhis2.org";>DHIS 2</a>&nbsp;&nbsp;$!{keyApplicationFooter}</div>
     </body>
 </html>