From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 10 May 2013 23:47:44 +0000 (+0200)
Subject: Added jquery cdn support
X-Git-Tag: 2.0.0_Beta_1~203^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62d601a5809ae050c08a07d9d1646ce81bd3a7b0;p=GitHub%2FWoltLab%2FWCF.git

Added jquery cdn support
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index bb62172a54..fbc5e6ca2f 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -54,6 +54,9 @@
 					<category name="general.system.date">
 						<parent>general.system</parent>
 					</category>
+					<category name="general.system.jquery">
+						<parent>general.system</parent>
+					</category>
 				<category name="general.mail">
 					<parent>general</parent>
 				</category>
@@ -312,6 +315,17 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
 			</option>
 			<!-- /general.system.date -->
 			
+			<!-- general.system.jquery -->
+			<option name="jquery_source">
+				<categoryname>general.system.jquery</categoryname>
+				<optiontype>radioButton</optiontype>
+				<defaultvalue>google</defaultvalue>
+				<selectoptions>local:wcf.acp.option.jquery_source.local
+google:wcf.acp.option.jquery_source.google
+microsoft:wcf.acp.option.jquery_source.microsoft</selectoptions>
+			</option>
+			<!-- /general.system.jquery -->
+			
 			<!-- mail.general -->
 			<option name="mail_from_name">
 				<categoryname>general.mail.general</categoryname>
diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 584c42d2b2..1ad2c05ebf 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -15,8 +15,26 @@
 	var TIME_NOW = {@TIME_NOW};
 	//]]>
 </script>
+{if JQUERY_SOURCE == 'google'}
+<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
+{else if JQUERY_SOURCE == 'microsoft'}
+<script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.0.min.js"></script>
+<script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.2/jquery-ui.min.js"></script>
+{else}
 <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js"></script>
 <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js"></script>
+{/if}
+{if JQUERY_SOURCE != 'local'}
+<script type="text/javascript">
+	//<![CDATA[
+	if (!window.jQuery) {
+		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js"><\/script>');
+		document.write('<script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js"><\/script>');
+	}
+	//]]>
+</script>
+{/if}
 <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js"></script>
 <script type="text/javascript" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js"></script>
 <script type="text/javascript" src="{@$__wcf->getPath()}js/WCF.js"></script>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 4e03e76fad..f691b0725a 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -328,6 +328,7 @@
 		<item name="wcf.acp.option.category.user.general"><![CDATA[Allgemein]]></item>
 		<item name="wcf.acp.option.category.security.antispam"><![CDATA[Anti-Spam]]></item>
 		<item name="wcf.acp.option.category.security.censorship"><![CDATA[Zensur]]></item>
+		<item name="wcf.acp.option.category.general.system.jquery"><![CDATA[jQuery]]></item>
 		
 		<item name="wcf.acp.option.cookie_domain"><![CDATA[Cookiedomain]]></item>
 		<item name="wcf.acp.option.cookie_domain.description"><![CDATA[Standardmäßig sollten Sie dieses Feld frei lassen, da ein Ausfüllen nur in wenigen Fällen notwendig ist.]]></item>
@@ -415,6 +416,10 @@
 		<item name="wcf.acp.option.external_link_rel_nofollow.description"><![CDATA[Das Attribut „rel="nofollow"“ weist Suchmaschinen an, einen bestimmten Link auf einer Seite zu ignorieren.]]></item>
 		<item name="wcf.acp.option.external_link_target_blank"><![CDATA[Externe Links in neuem Fenster öffnen]]></item>
 		<item name="wcf.acp.option.external_link_target_blank.description"><![CDATA[Setzt das Attribut „target="_blank"“ auf externe Links und weist den Browser dadurch an, einen aufgerufenen Link in einem neuen Browser-Fenster zu öffnen.]]></item>
+		<item name="wcf.acp.option.jquery_source"><![CDATA[jQuery-Quelle]]></item>
+		<item name="wcf.acp.option.jquery_source.local"><![CDATA[lokale Version]]></item>
+		<item name="wcf.acp.option.jquery_source.google"><![CDATA[Google Hosted Libraries CDN]]></item>
+		<item name="wcf.acp.option.jquery_source.microsoft"><![CDATA[Microsoft Ajax CDN]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a0e8c416be..0e2729538c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -328,6 +328,7 @@
 		<item name="wcf.acp.option.category.user.general"><![CDATA[General]]></item>
 		<item name="wcf.acp.option.category.security.antispam"><![CDATA[Anti-Spam]]></item>
 		<item name="wcf.acp.option.category.security.censorship"><![CDATA[Censorship]]></item>
+		<item name="wcf.acp.option.category.general.system.jquery"><![CDATA[jQuery]]></item>
 		
 		<item name="wcf.acp.option.cookie_domain"><![CDATA[Cookie Domain]]></item>
 		<item name="wcf.acp.option.cookie_domain.description"><![CDATA[Should be left blank except for special circumstances.]]></item>
@@ -415,6 +416,10 @@
 		<item name="wcf.acp.option.external_link_rel_nofollow.description"><![CDATA[The attribute “rel="nofollow"” tells search engines to disregard external links.]]></item>
 		<item name="wcf.acp.option.external_link_target_blank"><![CDATA[Open external links in a new window]]></item>
 		<item name="wcf.acp.option.external_link_target_blank.description"><![CDATA[Appends the attribute “target="_blank"” to external links, causing the user’s browser to open the link in a new window.]]></item>
+		<item name="wcf.acp.option.jquery_source"><![CDATA[jQuery Source]]></item>
+		<item name="wcf.acp.option.jquery_source.local"><![CDATA[Local Version]]></item>
+		<item name="wcf.acp.option.jquery_source.google"><![CDATA[Google Hosted Libraries CDN]]></item>
+		<item name="wcf.acp.option.jquery_source.microsoft"><![CDATA[Microsoft Ajax CDN]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">