dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31500
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16058: Minor
------------------------------------------------------------
revno: 16058
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-09 17:04:26 +0200
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm
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/loader/loader.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm 2011-09-03 18:23:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm 2014-07-09 15:04:26 +0000
@@ -6,6 +6,7 @@
color: #1c425c;
font-size: 14px;
border: 1px solid #9aaab5;
+ margin-bottom: 15px;
width: 500px;
height: 230px;
text-align: center;
=== 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 2014-07-09 09:26:23 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2014-07-09 15:04:26 +0000
@@ -11,10 +11,10 @@
<link type="text/css" rel="stylesheet" href="../css/login.css">
<link type="text/css" rel="stylesheet" href="../../api/files/style/external" />
</head>
- <body>
+ <body class="loginPage">
<h1 style="display:none">$!encoder.htmlEncode( ${applicationTitle} )</h1>
<div style="display:none">DHIS 2</div>
- <div>
+ <div>
#if ( $keyFlag )
<img id="flagArea" src="../flags/$!{keyFlagImage}">
#end
@@ -91,20 +91,5 @@
</select>
</div>
-
- #* Seems we can't access macros.vm from login.vm/login_mobile.vm so we include the full script here *#
- #if( $googleAnalyticsUA && $googleAnalyticsUA != '' )
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '$encoder.jsEncode($googleAnalyticsUA)']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- #end
</body>
</html>
