$(YUICOMPRESSOR) -o $@ /tmp/combined.js
rm -f /tmp/combined.js
-www/js/jquery-common-min.js: lib/vendor/jquery/jquery-1.4.2.min.js lib/vendor/jquery-tipsy/src/javascripts/jquery.tipsy.js lib/vendor/coolfieldset/js/jquery.coolfieldset.js www/js/jquery-common.js
+www/js/jquery-common-min.js: vendor/jquery/jquery-1.4.2.min.js vendor/jquery-tipsy/src/javascripts/jquery.tipsy.js vendor/coolfieldset/js/jquery.coolfieldset.js www/js/jquery-common.js
cat $^ > /tmp/combined.js
$(YUICOMPRESSOR) -o $@ /tmp/combined.js
rm -f /tmp/combined.js
--- src.orig/etc/httpd.conf.d/vhost-main.inc
+++ src/etc/httpd.conf.d/vhost-main.inc
@@ -37,7 +37,7 @@
- Alias /scripts/jquery-jqplot/ {core/source_path}/lib/vendor/jquery-jqplot/
- Alias /scripts/prototype/ {core/source_path}/lib/vendor/prototype/
- Alias /scripts/scriptaculous/ {core/source_path}/lib/vendor/scriptaculous/
--Alias /scripts/yui/ {core/source_path}/lib/vendor/yui/build/
-+Alias /scripts/yui/ {core/source_path}/lib/vendor/yui/
+ Alias /scripts/jquery-jqplot/ {core/source_path}/vendor/jquery-jqplot/
+ Alias /scripts/prototype/ {core/source_path}/vendor/prototype/
+ Alias /scripts/scriptaculous/ {core/source_path}/vendor/scriptaculous/
+-Alias /scripts/yui/ {core/source_path}/vendor/yui/build/
++Alias /scripts/yui/ {core/source_path}/vendor/yui/
# For FusionForge without DNS delegation, uncomment this
# and remove 30-vhosts-projects.conf
Include {core/config_path}/httpd.conf.d/plugin-*.inc
Alias /images/ {core/source_path}/www/images/
-Alias /scripts/coolfieldset/ {core/source_path}/lib/vendor/coolfieldset/
-Alias /scripts/jquery/ {core/source_path}/lib/vendor/jquery/
-Alias /scripts/jquery-ui/ {core/source_path}/lib/vendor/jquery-ui/
-Alias /scripts/jquery-tipsy/ {core/source_path}/lib/vendor/jquery-tipsy/
-Alias /scripts/jquery-storage/ {core/source_path}/lib/vendor/jquery-storage/
-Alias /scripts/jquery-simpletreemenu/ {core/source_path}/lib/vendor/jquery-simpletreemenu/
-Alias /scripts/jquery-jqplot/ {core/source_path}/lib/vendor/jquery-jqplot/
-Alias /scripts/prototype/ {core/source_path}/lib/vendor/prototype/
-Alias /scripts/scriptaculous/ {core/source_path}/lib/vendor/scriptaculous/
-Alias /scripts/yui/ {core/source_path}/lib/vendor/yui/build/
+Alias /scripts/coolfieldset/ {core/source_path}/vendor/coolfieldset/
+Alias /scripts/jquery/ {core/source_path}/vendor/jquery/
+Alias /scripts/jquery-ui/ {core/source_path}/vendor/jquery-ui/
+Alias /scripts/jquery-tipsy/ {core/source_path}/vendor/jquery-tipsy/
+Alias /scripts/jquery-storage/ {core/source_path}/vendor/jquery-storage/
+Alias /scripts/jquery-simpletreemenu/ {core/source_path}/vendor/jquery-simpletreemenu/
+Alias /scripts/jquery-jqplot/ {core/source_path}/vendor/jquery-jqplot/
+Alias /scripts/prototype/ {core/source_path}/vendor/prototype/
+Alias /scripts/scriptaculous/ {core/source_path}/vendor/scriptaculous/
+Alias /scripts/yui/ {core/source_path}/vendor/yui/build/
# For FusionForge without DNS delegation, uncomment this
# and remove 30-vhosts-projects.conf
usr/share/javascript/jquery-tipsy @SOURCE_PATH@/www/scripts/jquery-tipsy
usr/share/javascript/jquery-ui @SOURCE_PATH@/www/scripts/jquery-ui
usr/share/javascript/jquery-ui-themes @SOURCE_PATH@/www/scripts/jquery-ui-themes
-usr/share/javascript/yui @SOURCE_PATH@/lib/vendor/yui
-usr/share/javascript/prototype @SOURCE_PATH@/lib/vendor/prototype
-usr/share/javascript/scriptaculous @SOURCE_PATH@/lib/vendor/scriptaculous
-usr/share/javascript/jquery @SOURCE_PATH@/lib/vendor/jquery
-usr/share/javascript/jquery-tipsy @SOURCE_PATH@/lib/vendor/jquery-tipsy
-usr/share/javascript/jquery-ui @SOURCE_PATH@/lib/vendor/jquery-ui
-usr/share/javascript/jquery-ui-themes @SOURCE_PATH@/lib/vendor/jquery-ui-themes
+usr/share/javascript/yui @SOURCE_PATH@/vendor/yui
+usr/share/javascript/prototype @SOURCE_PATH@/vendor/prototype
+usr/share/javascript/scriptaculous @SOURCE_PATH@/vendor/scriptaculous
+usr/share/javascript/jquery @SOURCE_PATH@/vendor/jquery
+usr/share/javascript/jquery-tipsy @SOURCE_PATH@/vendor/jquery-tipsy
+usr/share/javascript/jquery-ui @SOURCE_PATH@/vendor/jquery-ui
+usr/share/javascript/jquery-ui-themes @SOURCE_PATH@/vendor/jquery-ui-themes
-/**\r
- * jQuery Plugin for creating collapsible fieldset\r
- * @requires jQuery 1.2 or later\r
- *\r
- * Copyright (c) 2010 Lucky <bogeyman2007@gmail.com>\r
- * Licensed under the GPL license:\r
- * http://www.gnu.org/licenses/gpl.html\r
- *\r
- * "animation" and "speed" options are added by Mitch Kuppinger <dpneumo@gmail.com>\r
- */\r
-\r
-(function($) {\r
- function hideFieldsetContent(obj, options){\r
- if(options.animation==true)\r
- obj.find('div').slideUp(options.speed);\r
- else\r
- obj.find('div').hide();\r
- \r
- obj.removeClass("expanded");\r
- obj.addClass("collapsed");\r
- }\r
- \r
- function showFieldsetContent(obj, options){\r
- if(options.animation==true)\r
- obj.find('div').slideDown(options.speed);\r
- else\r
- obj.find('div').show();\r
- \r
- obj.removeClass("collapsed");\r
- obj.addClass("expanded");\r
- }\r
- \r
- $.fn.coolfieldset = function(options){\r
- var setting={collapsed:false, animation:true, speed:'medium'};\r
- $.extend(setting, options);\r
- \r
- this.each(function(){\r
- var fieldset=$(this);\r
- var legend=fieldset.children('legend');\r
- \r
- if(setting.collapsed==true){\r
- legend.toggle(\r
- function(){\r
- showFieldsetContent(fieldset, setting);\r
- },\r
- function(){\r
- hideFieldsetContent(fieldset, setting);\r
- }\r
- )\r
- \r
- hideFieldsetContent(fieldset, {animation:false});\r
- }\r
- else{\r
- legend.toggle(\r
- function(){\r
- hideFieldsetContent(fieldset, setting);\r
- },\r
- function(){\r
- showFieldsetContent(fieldset, setting);\r
- }\r
- )\r
- }\r
- });\r
- }\r
+/**
+ * jQuery Plugin for creating collapsible fieldset
+ * @requires jQuery 1.2 or later
+ *
+ * Copyright (c) 2010 Lucky <bogeyman2007@gmail.com>
+ * Licensed under the GPL license:
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * "animation" and "speed" options are added by Mitch Kuppinger <dpneumo@gmail.com>
+ */
+
+(function($) {
+ function hideFieldsetContent(obj, options){
+ if(options.animation==true)
+ obj.find('div').slideUp(options.speed);
+ else
+ obj.find('div').hide();
+
+ obj.removeClass("expanded");
+ obj.addClass("collapsed");
+ }
+
+ function showFieldsetContent(obj, options){
+ if(options.animation==true)
+ obj.find('div').slideDown(options.speed);
+ else
+ obj.find('div').show();
+
+ obj.removeClass("collapsed");
+ obj.addClass("expanded");
+ }
+
+ $.fn.coolfieldset = function(options){
+ var setting={collapsed:false, animation:true, speed:'medium'};
+ $.extend(setting, options);
+
+ this.each(function(){
+ var fieldset=$(this);
+ var legend=fieldset.children('legend');
+
+ if(setting.collapsed==true){
+ legend.toggle(
+ function(){
+ showFieldsetContent(fieldset, setting);
+ },
+ function(){
+ hideFieldsetContent(fieldset, setting);
+ }
+ )
+
+ hideFieldsetContent(fieldset, {animation:false});
+ }
+ else{
+ legend.toggle(
+ function(){
+ hideFieldsetContent(fieldset, setting);
+ },
+ function(){
+ showFieldsetContent(fieldset, setting);
+ }
+ )
+ }
+ });
+ }
})(jQuery);
\ No newline at end of file
-/**\r
- * jqplot.jquerymobile plugin\r
- * jQuery Mobile virtual event support.\r
- *\r
- * Version: 1.0.4\r
- * Revision: 1120\r
- *\r
- * Copyright (c) 2011 Takashi Okamoto\r
- * jqPlot is currently available for use in all personal or commercial projects \r
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL \r
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can \r
- * choose the license that best suits your project and use it accordingly. \r
- *\r
- * Although not required, the author would appreciate an email letting him \r
- * know of any substantial use of jqPlot. You can reach the author at: \r
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .\r
- *\r
- * If you are feeling kind and generous, consider supporting the project by\r
- * making a donation at: http://www.jqplot.com/donate.php .\r
- *\r
- */\r
-(function($) {\r
- function postInit(target, data, options){\r
- this.bindCustomEvents = function() {\r
- this.eventCanvas._elem.bind('vclick', {plot:this}, this.onClick);\r
- this.eventCanvas._elem.bind('dblclick', {plot:this}, this.onDblClick);\r
- this.eventCanvas._elem.bind('taphold', {plot:this}, this.onDblClick);\r
- this.eventCanvas._elem.bind('vmousedown', {plot:this}, this.onMouseDown);\r
- this.eventCanvas._elem.bind('vmousemove', {plot:this}, this.onMouseMove);\r
- this.eventCanvas._elem.bind('mouseenter', {plot:this}, this.onMouseEnter);\r
- this.eventCanvas._elem.bind('mouseleave', {plot:this}, this.onMouseLeave);\r
- if (this.captureRightClick) {\r
- this.eventCanvas._elem.bind('vmouseup', {plot:this}, this.onRightClick);\r
- this.eventCanvas._elem.get(0).oncontextmenu = function() {\r
- return false;\r
- };\r
- }\r
- else {\r
- this.eventCanvas._elem.bind('vmouseup', {plot:this}, this.onMouseUp);\r
- }\r
- };\r
- this.plugins.mobile = true;\r
- }\r
- $.jqplot.postInitHooks.push(postInit);\r
+/**
+ * jqplot.jquerymobile plugin
+ * jQuery Mobile virtual event support.
+ *
+ * Version: 1.0.4
+ * Revision: 1120
+ *
+ * Copyright (c) 2011 Takashi Okamoto
+ * jqPlot is currently available for use in all personal or commercial projects
+ * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
+ * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can
+ * choose the license that best suits your project and use it accordingly.
+ *
+ * Although not required, the author would appreciate an email letting him
+ * know of any substantial use of jqPlot. You can reach the author at:
+ * chris at jqplot dot com or see http://www.jqplot.com/info.php .
+ *
+ * If you are feeling kind and generous, consider supporting the project by
+ * making a donation at: http://www.jqplot.com/donate.php .
+ *
+ */
+(function($) {
+ function postInit(target, data, options){
+ this.bindCustomEvents = function() {
+ this.eventCanvas._elem.bind('vclick', {plot:this}, this.onClick);
+ this.eventCanvas._elem.bind('dblclick', {plot:this}, this.onDblClick);
+ this.eventCanvas._elem.bind('taphold', {plot:this}, this.onDblClick);
+ this.eventCanvas._elem.bind('vmousedown', {plot:this}, this.onMouseDown);
+ this.eventCanvas._elem.bind('vmousemove', {plot:this}, this.onMouseMove);
+ this.eventCanvas._elem.bind('mouseenter', {plot:this}, this.onMouseEnter);
+ this.eventCanvas._elem.bind('mouseleave', {plot:this}, this.onMouseLeave);
+ if (this.captureRightClick) {
+ this.eventCanvas._elem.bind('vmouseup', {plot:this}, this.onRightClick);
+ this.eventCanvas._elem.get(0).oncontextmenu = function() {
+ return false;
+ };
+ }
+ else {
+ this.eventCanvas._elem.bind('vmouseup', {plot:this}, this.onMouseUp);
+ }
+ };
+ this.plugins.mobile = true;
+ }
+ $.jqplot.postInitHooks.push(postInit);
})(jQuery);
\ No newline at end of file
-/**\r
- * Storage plugin\r
- * Provides a simple interface for storing data such as user preferences.\r
- * Storage is useful for saving and retreiving data from the user's browser.\r
- * For newer browsers, localStorage is used.\r
- * If localStorage isn't supported, then cookies are used instead.\r
- * Retrievable data is limited to the same domain as this file.\r
- *\r
- * Usage:\r
- * This plugin extends jQuery by adding itself as a static method.\r
- * $.Storage - is the class name, which represents the user's data store, whether it's cookies or local storage.\r
- * <code>if ($.Storage)</code> will tell you if the plugin is loaded.\r
- * $.Storage.set("name", "value") - Stores a named value in the data store.\r
- * $.Storage.set({"name1":"value1", "name2":"value2", etc}) - Stores multiple name/value pairs in the data store.\r
- * $.Storage.get("name") - Retrieves the value of the given name from the data store.\r
- * $.Storage.remove("name") - Permanently deletes the name/value pair from the data store.\r
- *\r
- * @author Dave Schindler\r
- *\r
- * Distributed under the MIT License\r
- *\r
- * Copyright (c) 2010 Dave Schindler\r
- *\r
- * Permission is hereby granted, free of charge, to any person obtaining a copy\r
- * of this software and associated documentation files (the "Software"), to deal\r
- * in the Software without restriction, including without limitation the rights\r
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
- * copies of the Software, and to permit persons to whom the Software is\r
- * furnished to do so, subject to the following conditions:\r
- *\r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- *\r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- */\r
-(function($) {\r
- // Private data\r
- var isLS=typeof window.localStorage!=='undefined';\r
- // Private functions\r
- function wls(n,v){var c;if(typeof n==="string"&&typeof v==="string"){localStorage[n]=v;return true;}else if(typeof n==="object"&&typeof v==="undefined"){for(c in n){if(n.hasOwnProperty(c)){localStorage[c]=n[c];}}return true;}return false;}\r
- function wc(n,v){var dt,e,c;dt=new Date();dt.setTime(dt.getTime()+31536000000);e="; expires="+dt.toGMTString();if(typeof n==="string"&&typeof v==="string"){document.cookie=n+"="+v+e+"; path=/";return true;}else if(typeof n==="object"&&typeof v==="undefined"){for(c in n) {if(n.hasOwnProperty(c)){document.cookie=c+"="+n[c]+e+"; path=/";}}return true;}return false;}\r
- function rls(n){return localStorage[n];}\r
- function rc(n){var nn, ca, i, c;nn=n+"=";ca=document.cookie.split(';');for(i=0;i<ca.length;i++){c=ca[i];while(c.charAt(0)===' '){c=c.substring(1,c.length);}if(c.indexOf(nn)===0){return c.substring(nn.length,c.length);}}return null;}\r
- function dls(n){return delete localStorage[n];}\r
- function dc(n){return wc(n,"",-1);}\r
-\r
- /**\r
- * Public API\r
- * $.Storage - Represents the user's data store, whether it's cookies or local storage.\r
- * $.Storage.set("name", "value") - Stores a named value in the data store.\r
- * $.Storage.set({"name1":"value1", "name2":"value2", etc}) - Stores multiple name/value pairs in the data store.\r
- * $.Storage.get("name") - Retrieves the value of the given name from the data store.\r
- * $.Storage.remove("name") - Permanently deletes the name/value pair from the data store.\r
- */\r
- $.extend({\r
- Storage: {\r
- set: isLS ? wls : wc,\r
- get: isLS ? rls : rc,\r
- remove: isLS ? dls :dc\r
- }\r
- });\r
+/**
+ * Storage plugin
+ * Provides a simple interface for storing data such as user preferences.
+ * Storage is useful for saving and retreiving data from the user's browser.
+ * For newer browsers, localStorage is used.
+ * If localStorage isn't supported, then cookies are used instead.
+ * Retrievable data is limited to the same domain as this file.
+ *
+ * Usage:
+ * This plugin extends jQuery by adding itself as a static method.
+ * $.Storage - is the class name, which represents the user's data store, whether it's cookies or local storage.
+ * <code>if ($.Storage)</code> will tell you if the plugin is loaded.
+ * $.Storage.set("name", "value") - Stores a named value in the data store.
+ * $.Storage.set({"name1":"value1", "name2":"value2", etc}) - Stores multiple name/value pairs in the data store.
+ * $.Storage.get("name") - Retrieves the value of the given name from the data store.
+ * $.Storage.remove("name") - Permanently deletes the name/value pair from the data store.
+ *
+ * @author Dave Schindler
+ *
+ * Distributed under the MIT License
+ *
+ * Copyright (c) 2010 Dave Schindler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+(function($) {
+ // Private data
+ var isLS=typeof window.localStorage!=='undefined';
+ // Private functions
+ function wls(n,v){var c;if(typeof n==="string"&&typeof v==="string"){localStorage[n]=v;return true;}else if(typeof n==="object"&&typeof v==="undefined"){for(c in n){if(n.hasOwnProperty(c)){localStorage[c]=n[c];}}return true;}return false;}
+ function wc(n,v){var dt,e,c;dt=new Date();dt.setTime(dt.getTime()+31536000000);e="; expires="+dt.toGMTString();if(typeof n==="string"&&typeof v==="string"){document.cookie=n+"="+v+e+"; path=/";return true;}else if(typeof n==="object"&&typeof v==="undefined"){for(c in n) {if(n.hasOwnProperty(c)){document.cookie=c+"="+n[c]+e+"; path=/";}}return true;}return false;}
+ function rls(n){return localStorage[n];}
+ function rc(n){var nn, ca, i, c;nn=n+"=";ca=document.cookie.split(';');for(i=0;i<ca.length;i++){c=ca[i];while(c.charAt(0)===' '){c=c.substring(1,c.length);}if(c.indexOf(nn)===0){return c.substring(nn.length,c.length);}}return null;}
+ function dls(n){return delete localStorage[n];}
+ function dc(n){return wc(n,"",-1);}
+
+ /**
+ * Public API
+ * $.Storage - Represents the user's data store, whether it's cookies or local storage.
+ * $.Storage.set("name", "value") - Stores a named value in the data store.
+ * $.Storage.set({"name1":"value1", "name2":"value2", etc}) - Stores multiple name/value pairs in the data store.
+ * $.Storage.get("name") - Retrieves the value of the given name from the data store.
+ * $.Storage.remove("name") - Permanently deletes the name/value pair from the data store.
+ */
+ $.extend({
+ Storage: {
+ set: isLS ? wls : wc,
+ get: isLS ? rls : rc,
+ remove: isLS ? dls :dc
+ }
+ });
})(jQuery);
\ No newline at end of file
if (file_exists($filename)) {
$js .= '?'.date ("U", filemtime($filename));
} else {
- $filename = str_replace('/scripts/', $GLOBALS['fusionforge_basedir'].'/lib/vendor/', $js);
+ $filename = str_replace('/scripts/', $GLOBALS['fusionforge_basedir'].'/vendor/', $js);
if (file_exists($filename)) {
$js .= '?'.date ("U", filemtime($filename));
}
if (file_exists($filename)) {
$css .= '?'.date ("U", filemtime($filename));
} else {
- $filename = str_replace('/scripts/', $GLOBALS['fusionforge_basedir'].'/lib/vendor/', $css);
+ $filename = str_replace('/scripts/', $GLOBALS['fusionforge_basedir'].'/vendor/', $css);
if (file_exists($filename)) {
$css .= '?'.date ("U", filemtime($filename));
}