refs #514 : merge with 2.0 tree.

Needlworks · Feb 25, 2011 · 46e0891 · 46e0891
2 parents fe7ebbe + e5a6e17
commit 46e0891
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 20 deletions.
diff --git a/documents/manual_config.txt b/documents/manual_config.txt
@@ -53,4 +53,6 @@ $service['memcached'] = false;       // Using memcache to handle session and cac
 $memcached['server'] = 'localhost';  // Where memcache server is.
 // From Textcube 1.8.4
 $service['requirelogin'] = false;    // Force log-in process to every blogs. (for private blog service)
-?>
+// From Textcube 2.0
+$service['jqueryURL'] = '';		// Add URL if you want to use external jquery via CDN. e.g.) Microsoft's CDN: http://ajax.aspnetcdn.com/ajax/jQuery/ 
+?>
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -13,7 +13,7 @@
 define('CRLF', "\r\n");
 define('TAB', "	");
 define('INT_MAX',2147483647);
-define('JQUERY_VERSION','1.4.4');
+define('JQUERY_VERSION','1.5.1');
 if( strstr( PHP_OS, "WIN") !== false ) {
 	define('DS', "\\");
 } else {
@@ -61,4 +61,5 @@
 $service['debug_rewrite_module'] = false;
 $service['useNumericURLonRSS'] = false;
 $service['forceinstall'] = false;
+$service['jqueryURL'] = "";	// You can change this to use external CDNs. (microsoft / google, etc..)
 ?>
diff --git a/interface/blog/trackback/send/index.php b/interface/blog/trackback/send/index.php
@@ -19,7 +19,7 @@
 	<title><?php echo _text('글걸기 시도');?></title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 	<link rel="stylesheet" type="text/css" href="<?php echo $context->getProperty('service.path') . $context->getProperty('panel.skin');?>/popup-trackback.css" />
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/common2.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>

diff --git a/interface/common/control/header.php b/interface/common/control/header.php
@@ -353,21 +353,12 @@
 		//]]>
 	</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/byTextcube.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/common2.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/owner.js"></script>
 <?php
-if(!in_array($blogMenu['contentMenu'],array('post','edit'))) {
-?>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/mootools10.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/moodalbox/moodalbox.js"></script>
-	<link rel="stylesheet" href="<?php echo $context->getProperty('service.path');?>/resources/style/helper/moodalbox.css" type="text/css" media="screen" />
-<?php
-}
-?>
-<?php
 if($context->getProperty('service.interface') == 'simple') {
 	if(!in_array($blogMenu['contentMenu'],array('post','edit'))) {
 ?>

diff --git a/interface/common/owner/header.php b/interface/common/owner/header.php
@@ -367,7 +367,7 @@
 		//]]>
 	</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/byTextcube.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/common2.js"></script>

diff --git a/interface/common/owner/headerForPopupEditor.php b/interface/common/owner/headerForPopupEditor.php
@@ -83,7 +83,7 @@
 	</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/locale/messages.php"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/byTextcube.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/common2.js"></script>

diff --git a/interface/login/index.php b/interface/login/index.php
@@ -111,7 +111,7 @@
 		<link rel="stylesheet" type="text/css" href="<?php echo $context->getProperty('service.path').$context->getProperty('panel.skin');?>/login.ie7.css" />
 	<![endif]-->
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/byTextcube.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/EAF4.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/common2.js"></script>

diff --git a/interface/owner/entry/attach/index.php b/interface/owner/entry/attach/index.php
@@ -25,7 +25,7 @@
 		<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $context->getProperty('service.path').$context->getProperty('panel.skin');?>/editor.css" />
 		<!--[if lte IE 6]><link rel="stylesheet" type="text/css" media="screen" href="<?php echo $context->getProperty('service.path').$context->getProperty('panel.skin');?>/editor.ie.css" /><![endif]-->
 		<!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<?php echo $context->getProperty('service.path').$context->getProperty('panel.skin');?>/editor.ie7.css" /><![endif]-->
-		<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+		<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 		<script type="text/javascript">jQuery.noConflict();</script>
 		<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>
 		<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/common2.js"></script>

diff --git a/interface/owner/plugin/currentSetting/index.php b/interface/owner/plugin/currentSetting/index.php
@@ -72,7 +72,7 @@
 <?php
 }
 ?>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/pluginconfig.js"></script>

diff --git a/interface/owner/skin/setting/tree/preview/index.php b/interface/owner/skin/setting/tree/preview/index.php
@@ -52,7 +52,7 @@
 			var adminSkin = "<?php echo $context->getProperty('panel.skin');?>";
 		//]]>
 	</script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.jqueryURL');?>jquery-<?php echo JQUERY_VERSION;?>.min.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/EAF4.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path');?>/resources/script/common2.js"></script>

diff --git a/library/preprocessor.php b/library/preprocessor.php
@@ -204,7 +204,13 @@
 		unset($languageDomain);
 		unset($language);
 	}
-
+/** Resource Options
+    ----------------
+	Determine the resource URLs and paths.
+*/
+	if(is_null($context->getProperty('service.jqueryURL'))) {
+		$context->setProperty('service.jqueryURL',$context->getProperty('service.path')."/resources/script/jquery/";
+	}
 /** Administration panel skin / editor template
     -------------------------------------------
     When necessary, loads admin panel skin information.

diff --git a/resources/script/jquery/jquery-1.5.1.min.js b/resources/script/jquery/jquery-1.5.1.min.js
diff --git a/setup.php b/setup.php
@@ -1307,6 +1307,16 @@ function fail($msg) {
 //\$service['debug_rewrite_module'] = true; // rewrite handling module debuging.
 //\$service['session_cookie_path'] = \$service['path']; // for avoiding spoiling other textcube's session id sharing root.
 //\$service['allowBlogVisibilitySetting'] = true; // Allow service users to change blog visibility.
+//\$service['externalresources'] = false;  // Loads resources from external storage.
+//\$service['resourcepath'] = 'http://example.com/resource';	// Specify the full URI of external resource.
+//\$service['favicon_daily_traffic'] = 10; // Set favicon traffic limitation. default is 10MB.
+//\$service['skincache'] = true;        // Use skin pre-fetching. Textcube will parse static elements (blog name, title…) only when you change skin. Reduces CPU loads.
+//\$database['port'] = 3639;            // Database port number
+//\$database['dbms'] = 'MySQL';         // DBMS. (MySQL, MySQLi, PostgreSQL, Cubrid.)
+//\$service['memcached'] = true;       // Using memcache to handle session and cache
+//\$memcached['server'] = 'localhost';  // Where memcache server is.
+//\$service['requirelogin'] = false;    // Force log-in process to every blogs. (for private blog service)
+//\$service['jqueryURL'] = '';		// Add URL if you want to use external jquery via CDN. e.g.) Microsoft's CDN: http://ajax.aspnetcdn.com/ajax/jQuery/ 
 ?>"
             );
             fclose($fp);