SAK-27774

Switch to using the ne PortalUtils class to get jQuery loaded correctly. git-svn-id: https://source.sakaiproject.org/svn/user/trunk@311725 66ffb92e-73f9-0310-93c1-f5514f145a0a
ferris001 · Aug 8, 2014 · 32ab0ac · 32ab0ac
1 parent e1f7210
commit 32ab0ac
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 56 deletions.
diff --git a/user/user-tool-prefs/tool/pom.xml b/user/user-tool-prefs/tool/pom.xml
@@ -65,6 +65,10 @@
       <groupId>org.sakaiproject.jsf</groupId>
       <artifactId>jsf-app</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.sakaiproject.portal</groupId>
+        <artifactId>sakai-portal-util</artifactId>
+    </dependency>
 <!-- end Sakai integration dependencies -->
     <dependency>
       <groupId>commons-digester</groupId>

diff --git a/user/user-tool-prefs/tool/src/webapp/WEB-INF/faces-config.xml b/user/user-tool-prefs/tool/src/webapp/WEB-INF/faces-config.xml
@@ -105,6 +105,20 @@
 			<value>user-tool-prefs</value>
 		</managed-property>
 	</managed-bean>
+
+    <managed-bean>
+        <description>
+            JSF Portal Object
+        </description>
+        <managed-bean-name>Portal</managed-bean-name>
+        <managed-bean-class>org.sakaiproject.portal.util.PortalBean</managed-bean-class>
+        <managed-bean-scope>session</managed-bean-scope>
+        <managed-property>
+            <description>Caller</description>
+            <property-name>caller</property-name>
+            <value>user-tool-prefs</value>
+        </managed-property>
+    </managed-bean>
 
   <!-- let the framework deal with the beans -->
   <managed-bean>

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/locale.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/locale.jsp
@@ -10,14 +10,7 @@
 	<sakai:stylesheet path="/css/prefs.css"/>
 	<sakai:view_content>
 		<h:form id="locale_form">
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
         <script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js">//</script>
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/noti.jsp
@@ -15,14 +15,7 @@
 	<sakai:view_content>
 
 <f:verbatim>
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
     <script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js">//</script>
 	<script type="text/javascript">
 	<!--

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/noti_addSiteOverride.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/noti_addSiteOverride.jsp
@@ -10,14 +10,7 @@
 	<sakai:view_container title="#{msgs.prefs_title}">
 	<sakai:view_content>
 <f:verbatim>
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
 <script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 <script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js">//</script>
 </f:verbatim>

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/privacy.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/privacy.jsp
@@ -11,14 +11,7 @@
 	<sakai:view_content>
     <h:form>
       <!--SAK-18566 -->
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
         <script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js">//</script>
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/tab-dhtml-moresites.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/tab-dhtml-moresites.jsp
@@ -10,14 +10,7 @@
     <sakai:stylesheet path="/css/prefs.css"/>
     <sakai:view_content>
 <f:verbatim> 
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
 		<script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js">//</script> 
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/tab.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/tab.jsp
@@ -12,14 +12,9 @@
 <sakai:view_content>
 
 <f:verbatim>
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
+
   <script type="text/javascript" src="/library/js/fluid/1.4/MyInfusion.js">//</script>
   <script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">//</script>
 <script type="text/javascript">

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/timezone.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/timezone.jsp
@@ -10,14 +10,7 @@
     <sakai:stylesheet path="/css/prefs.css"/>
 	<sakai:view_content>
 		<h:form id="timezone_form">
-<script type="text/javascript">
-if ( window.jQuery ) {
-    window.console && console.log("jQuery already loaded "+jQuery.fn.jquery);
-} else {
-    document.write('\x3Cscript type="text/javascript" src="/library/js/jquery/jquery-1.9.1.min.js?version=">'+'\x3C/script>')
-    window.console && console.log("Loaded jQuery");
-}
-</script>
+<h:outputText value="#{Portal.latestJQuery}" escape="false"/>
         <script type="text/javascript" src="/library/js/fluid-latest/InfusionAll.js">//</script>
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">