cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/4.5 to 2ee3d42
Date Thu, 13 Nov 2014 23:40:50 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 8ec26fb53 -> 2ee3d4258


CLOUDSTACK-7645: UI: Fix dictionary JSP include order

-Places dictionary JSP includes at top of script includes, to help solve
a potential issue where the dictionary may not always be loaded before
the UI initializes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ee3d425
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ee3d425
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ee3d425

Branch: refs/heads/4.5
Commit: 2ee3d4258e52f2f2ef2b14e818f95b3d11a49139
Parents: 8ec26fb
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Nov 13 15:25:12 2014 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Nov 13 15:25:12 2014 -0800

----------------------------------------------------------------------
 ui/index.jsp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ee3d425/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 42973f7..bab00eb 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1692,6 +1692,10 @@
         <script src="lib/jquery.md5.js" type="text/javascript" ></script>
         <script src="lib/require.js" type="text/javascript"></script>
 
+        <!-- localized messages -->
+        <jsp:include page="dictionary.jsp" />
+        <jsp:include page="dictionary2.jsp" />
+
         <script src="lib/excanvas.js" type="text/javascript"></script>
         <script src="lib/flot/jquery.flot.js" type="text/javascript"></script>
         <script src="lib/flot/jquery.colorhelpers.js" type="text/javascript"></script>
@@ -1776,9 +1780,5 @@
         <script type="text/javascript" src="plugins/plugins.js?t=<%=now%>"></script>
         <script type="text/javascript" src="modules/modules.js?t=<%=now%>"></script>
         <script type="text/javascript" src="scripts/plugins.js?t=<%=now%>"></script>
-
-        <!-- localized messages -->
-        <jsp:include page="dictionary.jsp" />
-	<jsp:include page="dictionary2.jsp" />
     </body>
 </html>


Mime
View raw message