Skip to content

Commit 389da88

Browse files
authored
SAK-33253 - Move portal javascript variable up before other snippets (sakaiproject#4697)
1 parent cbc66c1 commit 389da88

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@
77
<meta charset="utf-8">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

10-
#parse("/vm/morpheus/snippets/title-snippet.vm")
11-
12-
#parse("/vm/morpheus/snippets/portalCSS-snippet.vm")
13-
14-
<link href="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.css$!{portalCDNQuery}" rel="stylesheet" />
15-
<link href="${pageScriptPath}jquery/cluetip/1.2.10/css/jquery.cluetip.css$!{portalCDNQuery}" rel="stylesheet">
16-
<link href="${pageScriptPath}jquery/qtip/jquery.qtip-latest.min.css$!{portalCDNQuery}" rel="stylesheet">
17-
<link href="${pageWebjarsPath}pnotify/2.1.0/pnotify.core.min.css$!{portalCDNQuery}" rel="stylesheet">
18-
<link href="${pageWebjarsPath}pnotify/2.1.0/pnotify.buttons.min.css$!{portalCDNQuery}" rel="stylesheet">
19-
<link href="${pageWebjarsPath}cropper/2.3.2/dist/cropper.min.css$!{portalCDNQuery}" rel="stylesheet">
20-
<script src="${pageSkinRepo}/${pageSkin}/js/lib/modernizr.js$!{portalCDNQuery}"></script>
21-
#if ($useBullhornAlerts)
22-
<script src="/profile2-tool/javascript/profile2-eb.js$!{portalCDNQuery}"></script>
23-
<script src="${pageWebjarsPath}momentjs/2.11.1/min/moment-with-locales.min.js$!{portalCDNQuery}"></script>
24-
#end
25-
2610
<script> ## Include this at the top so tool markup and headscripts.js can use it
2711
## SAK-16484 Allow Javascript to easily get at user details.
2812
## SAK-13987, SAK-16162, SAK-19132 - Portal Logout Timer
@@ -68,6 +52,22 @@
6852
"portalCDNQuery" : "$!{portalCDNQuery}"
6953
};
7054
</script>
55+
56+
#parse("/vm/morpheus/snippets/title-snippet.vm")
57+
58+
#parse("/vm/morpheus/snippets/portalCSS-snippet.vm")
59+
60+
<link href="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.css$!{portalCDNQuery}" rel="stylesheet" />
61+
<link href="${pageScriptPath}jquery/cluetip/1.2.10/css/jquery.cluetip.css$!{portalCDNQuery}" rel="stylesheet">
62+
<link href="${pageScriptPath}jquery/qtip/jquery.qtip-latest.min.css$!{portalCDNQuery}" rel="stylesheet">
63+
<link href="${pageWebjarsPath}pnotify/2.1.0/pnotify.core.min.css$!{portalCDNQuery}" rel="stylesheet">
64+
<link href="${pageWebjarsPath}pnotify/2.1.0/pnotify.buttons.min.css$!{portalCDNQuery}" rel="stylesheet">
65+
<link href="${pageWebjarsPath}cropper/2.3.2/dist/cropper.min.css$!{portalCDNQuery}" rel="stylesheet">
66+
<script src="${pageSkinRepo}/${pageSkin}/js/lib/modernizr.js$!{portalCDNQuery}"></script>
67+
#if ($useBullhornAlerts)
68+
<script src="/profile2-tool/javascript/profile2-eb.js$!{portalCDNQuery}"></script>
69+
<script src="${pageWebjarsPath}momentjs/2.11.1/min/moment-with-locales.min.js$!{portalCDNQuery}"></script>
70+
#end
7171

7272
<!-- inlined tool header contribution -->
7373
## if any of the tools requested an inline render, their header content gets aggregated here

0 commit comments

Comments
 (0)