Repository: cloudstack Updated Branches: refs/heads/master ade305be2 -> 9717bbdc5
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/9717bbdc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9717bbdc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9717bbdc Branch: refs/heads/master Commit: 9717bbdc511dc77f57f511dc27e4ec9d8dc5ddb4 Parents: ade305b Author: Brian Federle <[email protected]> Authored: Thu Nov 13 15:25:12 2014 -0800 Committer: Brian Federle <[email protected]> Committed: Thu Nov 13 15:41:02 2014 -0800 ---------------------------------------------------------------------- ui/index.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9717bbdc/ui/index.jsp ---------------------------------------------------------------------- diff --git a/ui/index.jsp b/ui/index.jsp index a2e8fc9..1000101 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -1693,6 +1693,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> @@ -1777,9 +1781,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>
