Commit cbb968a1 authored by rjsmelo's avatar rjsmelo

[ENH] Move the folder for libraries bunddled from vendor to vendor_bundled, fix paths across tiki

parent a5977c4b
......@@ -47,8 +47,7 @@ admin/index.php -text
/check_composer_exists.php -text
/comments.php -text
/commxmlrpc.php -text
/composer.json -text
/composer.lock -text
/composer.json.dist -text
/console.php -text
/contribution.php -text
/copyright.txt -text
......@@ -8021,6 +8020,9 @@ tiki_tests/tikitestslib.php -text
tiki_tests/web.config -text
/validate-ajax.php -text
vendor/.htaccess -text
vendor_bundled/.htaccess -text
vendor_bundled/composer.json -text
vendor_bundled/composer.lock -text
vendor_extra/anythingslider-themes/css/theme-default1.css -text
vendor_extra/anythingslider-themes/css/theme-default2.css -text
vendor_extra/anythingslider-themes/css/theme-mini-dark.css -text
......
......@@ -17,7 +17,7 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
}
if (! file_exists('vendor/autoload.php')) {
if (! file_exists('vendor_bundled/vendor/autoload.php')) {
$title="Tiki Installer missing third party software files";
$content="<p>Your Tiki is not completely installed because Composer has not been run to fetch package dependencies.</p>";
$content.="<p>You need to run <b>sh setup.sh</b> from the command line.</p>";
......
{
"name": "tiki/tiki-custom",
"description": "Tiki Wiki CMS Groupware",
"license": "LGPL-2.1",
"homepage": "https://tiki.org",
"minimum-stability": "stable",
"require": {
},
"config": {
"process-timeout": 5000,
"bin-dir": "bin"
}
}
......@@ -356,7 +356,7 @@ function get_files_list($dir, &$entries, $regexp_pattern)
$entry = $dir . '/' . $e;
if (is_dir($entry)) {
// do not descend and no CVS/Subversion files
if ($e != '..' && $e != '.' && $e != 'CVS' && $e != '.svn' && $entry != './temp/templates_c' && $entry != './vendor') {
if ($e != '..' && $e != '.' && $e != 'CVS' && $e != '.svn' && $entry != './temp/templates_c' && $entry != './vendor_bundled/vendor') {
if (! get_files_list($entry, $entries, $regexp_pattern)) {
return false;
}
......@@ -409,7 +409,7 @@ function check_smarty_syntax(&$error_msg)
$prefs['log_tpl'] = 'y';
$prefs['feature_sefurl_filter'] = 'y';
$prefs['site_layout'] = 'basic';
require_once 'vendor/smarty/smarty/libs/Smarty.class.php';
require_once 'vendor_bundled/vendor/smarty/smarty/libs/Smarty.class.php';
require_once 'lib/init/smarty.php';
// needed in Smarty_Tiki
define('TIKI_PATH', getcwd());
......
......@@ -56,7 +56,7 @@ if ($request->hasProperty('outputFiles')) {
$excludeDirs = array(
'dump' , 'img', 'lang',
'vendor', 'vendor_extra',
'vendor_bundled', 'vendor', 'vendor_extra',
'lib/test', 'temp',
'temp/cache', 'temp/templates_c',
);
......
{
"patches": {
"adodb/adodb-php": {
"Remove references to ADOdb Extension": "installer/composer-patches/adodb-php__remove_references_to_adodb_extension.patch",
"Remove the check for ADOdb Extension": "installer/composer-patches/adodb-php__remove-the-check-if-the-adodb-php_ext-is-enabled.patch"
"Remove references to ADOdb Extension": "../installer/composer-patches/adodb-php__remove_references_to_adodb_extension.patch",
"Remove the check for ADOdb Extension": "../installer/composer-patches/adodb-php__remove-the-check-if-the-adodb-php_ext-is-enabled.patch"
}
}
}
......@@ -150,7 +150,7 @@ if (!empty($_POST['lang'])) {
$language = $prefs['site_language'] = $prefs['language'] = $_POST['lang'];
if (Language::isRTL()) {
$prefs['feature_bidi'] = 'y';
TikiLib::lib('header')->add_cssfile('vendor/morteza/bootstrap-rtl/dist/css/bootstrap-rtl.min.css', 99); // 99 is high rank order as it should load after all other css files
TikiLib::lib('header')->add_cssfile('vendor_bundled/vendor/morteza/bootstrap-rtl/dist/css/bootstrap-rtl.min.css', 99); // 99 is high rank order as it should load after all other css files
}
} else {
$language = $prefs['site_language'] = $prefs['language'] = 'en';
......@@ -1277,11 +1277,11 @@ if ( isset($_POST['general_settings']) && $_POST['general_settings'] == 'y' ) {
$headerlib = TikiLib::lib('header');
$headerlib->add_js("var tiki_cookie_jar=new Array();");
$headerlib->add_cssfile('vendor/twitter/bootstrap/dist/css/bootstrap.css');
$headerlib->add_cssfile('vendor/fortawesome/font-awesome/css/font-awesome.min.css');
$headerlib->add_cssfile('vendor_bundled/vendor/twitter/bootstrap/dist/css/bootstrap.css');
$headerlib->add_cssfile('vendor_bundled/vendor/fortawesome/font-awesome/css/font-awesome.min.css');
$headerlib->add_cssfile('themes/base_files/css/tiki_base.css');
$headerlib->add_jsfile('lib/tiki-js.js');
$headerlib->add_jsfile_dependancy("vendor/components/jquery/jquery.min.js");
$headerlib->add_jsfile_dependancy("vendor_bundled/vendor/components/jquery/jquery.min.js");
$headerlib->add_jsfile('lib/jquery_tiki/tiki-jquery.js');
$js = '
// JS Object to hold prefs for jq
......
......@@ -47,8 +47,8 @@ class WYSIWYGLib
$headerlib = TikiLib::lib('header');
$headerlib->add_js_config('window.CKEDITOR_BASEPATH = "'. $tikiroot . 'vendor/ckeditor/ckeditor/";')
->add_jsfile('vendor/ckeditor/ckeditor/ckeditor.js', true)
$headerlib->add_js_config('window.CKEDITOR_BASEPATH = "'. $tikiroot . 'vendor_bundled/vendor/ckeditor/ckeditor/";')
->add_jsfile('vendor_bundled/vendor/ckeditor/ckeditor/ckeditor.js', true)
->add_js('window.CKEDITOR.config._TikiRoot = "'.$tikiroot.'";', 1);
// Inline editing config
......@@ -115,10 +115,10 @@ window.CKEDITOR.config.toolbar = ' .$cktools.';
$headerlib = TikiLib::lib('header');
$headerlib->add_js('window.CKEDITOR.config.extraPlugins = "' . $prefs['wysiwyg_extra_plugins'] . '";');
$headerlib->add_js_config('window.CKEDITOR_BASEPATH = "'. $tikiroot . 'vendor/ckeditor/ckeditor/";')
$headerlib->add_js_config('window.CKEDITOR_BASEPATH = "'. $tikiroot . 'vendor_bundled/vendor/ckeditor/ckeditor/";')
//// for js debugging - copy _source from ckeditor distribution to libs/ckeditor to use
//// note, this breaks ajax page load via wikitopline edit icon
->add_jsfile('vendor/ckeditor/ckeditor/ckeditor.js', true)
->add_jsfile('vendor_bundled/vendor/ckeditor/ckeditor/ckeditor.js', true)
->add_js('window.CKEDITOR.config._TikiRoot = "'.$tikiroot.'";', 1);
$headerlib->add_js(
......
......@@ -30,7 +30,7 @@ test = { mode: function () {}, indentation: function() {} }
$js .= @file_get_contents("lib/codemirror_tiki/mode/tiki/tiki.js");
$css .= @file_get_contents("themes/base_files/feature_css/codemirror_mode_tiki.css");
foreach (glob('vendor/codemirror/codemirror/mode/*', GLOB_ONLYDIR) as $dir) {
foreach (glob('vendor_bundled/vendor/codemirror/codemirror/mode/*', GLOB_ONLYDIR) as $dir) {
foreach (glob($dir.'/*.js', GLOB_NOCHECK) as $jsFile) {
if(
is_file($jsFile) && (
......@@ -54,7 +54,7 @@ test = { mode: function () {}, indentation: function() {} }
}
//load themes
foreach (glob('vendor/codemirror/codemirror/theme/*.css') as $cssFile) {
foreach (glob('vendor_bundled/vendor/codemirror/codemirror/theme/*.css') as $cssFile) {
$css .= @file_get_contents($cssFile);
}
......
......@@ -563,13 +563,13 @@ JQ
$version = $args['version'];
$headerlib
->add_jsfile('vendor/rangy/rangy/uncompressed/rangy-core.js')
->add_jsfile('vendor/rangy/rangy/uncompressed/rangy-cssclassapplier.js')
->add_jsfile('vendor/rangy/rangy/uncompressed/rangy-selectionsaverestore.js')
->add_jsfile('vendor_bundled/vendor/rangy/rangy/uncompressed/rangy-core.js')
->add_jsfile('vendor_bundled/vendor/rangy/rangy/uncompressed/rangy-cssclassapplier.js')
->add_jsfile('vendor_bundled/vendor/rangy/rangy/uncompressed/rangy-selectionsaverestore.js')
->add_jsfile('lib/rangy_tiki/rangy-phraser.js')
->add_jsfile('vendor/jquery/jquery-sheet/plugins/ZeroClipboard.min.js')
->add_jsfile('vendor_bundled/vendor/jquery/jquery-sheet/plugins/ZeroClipboard.min.js')
->add_jsfile('lib/core/JisonParser/Phraser.js')
->add_jsfile('vendor/jquery/md5/js/md5.js');
->add_jsfile('vendor_bundled/vendor/jquery/md5/js/md5.js');
$me = new FutureLink_FutureUI($page);
......
......@@ -253,7 +253,7 @@ JQ
$smarty = TikiLib::lib('smarty');
//TODO - not sure the tablesorter js and css files need to be loaded since they are loaded in tiki-setup
$headerlib
->add_jsfile('vendor/jquery/plugins/tablesorter/js/jquery.tablesorter.js')
->add_jsfile('vendor_bundled/vendor/jquery/plugins/tablesorter/js/jquery.tablesorter.js')
->add_jq_onready(
<<<JQ
$('a.futurelinkA,a.pastlinkA')
......
......@@ -5,9 +5,9 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
include_once "vendor/studio-42/elfinder/php/elFinderConnector.class.php";
include_once "vendor/studio-42/elfinder/php/elFinder.class.php";
include_once "vendor/studio-42/elfinder/php/elFinderVolumeDriver.class.php";
include_once "vendor_bundled/vendor/studio-42/elfinder/php/elFinderConnector.class.php";
include_once "vendor_bundled/vendor/studio-42/elfinder/php/elFinder.class.php";
include_once "vendor_bundled/vendor/studio-42/elfinder/php/elFinderVolumeDriver.class.php";
include_once 'lib/jquery_tiki/elfinder/elFinderVolumeTikiFiles.class.php';
include_once 'lib/jquery_tiki/elfinder/tikiElFinder.php';
......
......@@ -106,7 +106,7 @@ class LessCompileCommand extends Command
}
foreach ($files as $file) {
$command = "php vendor/oyejorge/less.php/bin/lessc {$file['less']} {$file['css']}";
$command = "php vendor_bundled/vendor/oyejorge/less.php/bin/lessc {$file['less']} {$file['css']}";
$output->writeln($command);
$result = shell_exec($command);
$result = str_replace(array("\r", "\n"), '', $result);
......
......@@ -15,7 +15,7 @@ class BootstrapCompiler
{
if (class_exists('lessc')) { // this can get called before composer has installed all the packages
$base = __DIR__ . '/../../../../vendor/twitter/bootstrap';
$base = $event->getComposer()->getConfig()->get('vendor-dir') . '/twitter/bootstrap';
if (! file_exists($base . '/css')) {
mkdir($base . '/css');
......
......@@ -43,7 +43,7 @@ class CleanVendors
public static function clean(Event $event)
{
$themes = __DIR__ . '/../../../../themes/';
$vendors = __DIR__ . '/../../../../vendor/';
$vendors = $event->getComposer()->getConfig()->get('vendor-dir');
$fs = new FileSystem;
$fs->ensureDirectoryExists($themes);
......
......@@ -32,7 +32,7 @@ class WikiPlugin_Negotiator_Wiki
private $alias;
public static $standardRelativePath = 'lib/wiki-plugins/wikiplugin_';
public static $zendRelativePath = 'vendor/zendframework/zendframework1/library/';
public static $zendRelativePath = 'vendor_bundled/vendor/zendframework/zendframework1/library/';
public static $checkZendPaths = true;
static $pluginIndexes = array();
static $pluginInfo = array();
......
......@@ -643,7 +643,7 @@ class HeaderLib
$topMsg .= "\n/* list of files for rank:$rank */\n";
$topMsg .= '/* ' . print_r($jsfiles[$rank], true) . ' */' . "\n";
foreach ($jsfiles[$rank] as $f) {
// important - some scripts like vendor/jquery/plugins/async/jquery.async.js do not terminate their last bits with a ';'
// important - some scripts like vendor_bundled/vendor/jquery/plugins/async/jquery.async.js do not terminate their last bits with a ';'
// this is bad practise and that causes issues when putting them all in one file!
$minified = ';';
$msg = '';
......@@ -1187,7 +1187,7 @@ window.onload = loadScript;');
if ($prefs['geo_openlayers_version'] === 'ol3') {
// $this->add_jsfile_external('vendor/openlayers/ol3/ol.js', true);
$this->add_jsfile_external('vendor/openlayers/ol3/ol-debug.js', true);
$this->add_jsfile_external('vendor_bundled/vendor/openlayers/ol3/ol-debug.js', true);
$this->add_js(
''
);
......
......@@ -20,14 +20,14 @@ if (strpos($_SERVER['SCRIPT_NAME'], basename(__FILE__)) !== false) {
exit;
}
if (! file_exists(__DIR__ . '/../../vendor/autoload.php')) {
if (! file_exists(__DIR__ . '/../../vendor_bundled/vendor/autoload.php')) {
echo "Your Tiki is not completely installed because Composer has not been run to fetch package dependencies.\n";
echo "You need to run 'sh setup.sh' from the command line.\n";
echo "See https://dev.tiki.org/Composer for details.\n";
exit;
}
require_once __DIR__ . '/../../vendor/autoload.php';
require_once __DIR__ . '/../../vendor_bundled/vendor/autoload.php';
/**
* performs some checks on the underlying system, before initializing Tiki.
......
......@@ -952,7 +952,7 @@ $.fn.tiki = function(func, type, options) {
case "carousel":
if (jqueryTiki.carousel) {
opts = {
imagePath: "vendor/jquery/plugins/infinitecarousel/images/",
imagePath: "vendor_bundled/vendor/jquery/plugins/infinitecarousel/images/",
autoPilot: true
};
$.extend(opts, options);
......@@ -3477,7 +3477,7 @@ function objectLockToggle(icon) {
/**
* Remove accents from chars
* vendor/jquery/plugins/tablesorter/js/jquery.tablesorter.combined.js:2373
* vendor_bundled/vendor/jquery/plugins/tablesorter/js/jquery.tablesorter.combined.js:2373
*
* @param str
*/
......
......@@ -1240,10 +1240,10 @@ class MultilingualLib extends TikiLib
// Some languages need BiDi support. Add their code names here ...
if (Language::isRTL()) {
$prefs['feature_bidi'] = 'y';
TikiLib::lib('header')->add_cssfile('vendor/morteza/bootstrap-rtl/dist/css/bootstrap-rtl.min.css', 99); // 99 is high rank order as it should load after all other css files
TikiLib::lib('header')->add_cssfile('vendor_bundled/vendor/morteza/bootstrap-rtl/dist/css/bootstrap-rtl.min.css', 99); // 99 is high rank order as it should load after all other css files
} else {
$prefs['feature_bidi'] = 'n';
TikiLib::lib('header')->drop_cssfile('vendor/morteza/bootstrap-rtl/dist/css/bootstrap-rtl.min.css');
TikiLib::lib('header')->drop_cssfile('vendor_bundled/vendor/morteza/bootstrap-rtl/dist/css/bootstrap-rtl.min.css');
}
}
}
......
......@@ -59,11 +59,11 @@ if ( !isset($_REQUEST['mobile_mode']) || $_REQUEST['mobile_mode'] === 'y' ) {
if ($prefs['feature_shadowbox'] === 'y') {
$headerlib
->add_jsfile_external('vendor/jquery/photoswipe/lib/klass.min.js', true)
->add_jsfile_external('vendor/jquery/photoswipe/code.photoswipe.jquery-3.0.5.min.js', true)
->add_jsfile_external('vendor_bundled/vendor/jquery/photoswipe/lib/klass.min.js', true)
->add_jsfile_external('vendor_bundled/vendor/jquery/photoswipe/code.photoswipe.jquery-3.0.5.min.js', true)
->add_jq_onready('var $photosToSwipe = $("a[data-box*=\'box\'][data-box*=\'type=img\'], a[data-box*=\'box\'][data-box!=\'type=\']");
if ($photosToSwipe.length) {$photosToSwipe.photoSwipe();}', 5)
->add_cssfile('vendor/jquery/photoswipe/photoswipe.css');
->add_cssfile('vendor_bundled/vendor/jquery/photoswipe/photoswipe.css');
}
global $base_url;
......
......@@ -45,7 +45,7 @@ if (!empty($_SESSION['try_theme'])) {
//START loading theme related items
//1) Always add default bootstrap JS and make some preference settings
$headerlib->add_jsfile('vendor/twitter/bootstrap/dist/js/bootstrap.js');
$headerlib->add_jsfile('vendor_bundled/vendor/twitter/bootstrap/dist/js/bootstrap.js');
$headerlib->add_jsfile('lib/jquery_tiki/tiki-bootstrapmodalfix.js');
if ($prefs['feature_fixed_width'] === 'y') {
......@@ -60,7 +60,7 @@ if ($prefs['feature_fixed_width'] === 'y') {
$headerlib->add_cssfile("themes/base_files/css/tiki_base.css");
//3) Always add bundled font-awesome css for the default icon fonts
$headerlib->add_cssfile('vendor/fortawesome/font-awesome/css/font-awesome.min.css');
$headerlib->add_cssfile('vendor_bundled/vendor/fortawesome/font-awesome/css/font-awesome.min.css');
//4) Add Addon custom css first, so it can be overridden by themes
foreach (TikiAddons::getPaths() as $path) {
......
......@@ -18,7 +18,7 @@ if ( basename($_SERVER['SCRIPT_NAME']) == basename(__FILE__) ) {
}
// The following constant is at least used in the release.php script and in the error handling functions
define('THIRD_PARTY_LIBS_PATTERN', '#(lib/pear|lib/ajax|vendor)#');
define('THIRD_PARTY_LIBS_PATTERN', '#(lib/pear|lib/ajax|vendor_bundled/vendor|vendor)#');
define('TIKI_SMARTY_DIR', 'lib/smarty_tiki/');
// add a line like the following in db/local.php to use an external smarty installation: $smarty_path='/usr/share/php/smarty/'
......
......@@ -377,27 +377,27 @@ class SheetLib extends TikiLib
if (!$this->setup_jQuery_sheet_files) {
$headerlib
//core
->add_cssfile( 'vendor/jquery/jquery-sheet/jquery.sheet.css' )
->add_jsfile( 'vendor/jquery/jquery-sheet/jquery.sheet.js' )
->add_cssfile( 'vendor_bundled/vendor/jquery/jquery-sheet/jquery.sheet.css' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/jquery.sheet.js' )
//parsers
->add_jsfile( 'vendor/jquery/jquery-sheet/parser/formula/formula.js' )
->add_jsfile( 'vendor/jquery/jquery-sheet/parser/tsv/tsv.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/parser/formula/formula.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/parser/tsv/tsv.js' )
//tiki integration
->add_jsfile( 'lib/sheet/grid.js' )
// plugins
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/jquery.sheet.dts.js' )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/jquery.sheet.advancedfn.js' )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/jquery.sheet.financefn.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/jquery.sheet.dts.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/jquery.sheet.advancedfn.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/jquery.sheet.financefn.js' )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/globalize.js' )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/globalize.cultures.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/globalize.js' )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/globalize.cultures.js' )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/jquery.nearest.min.js', true )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/raphael-min.js', true )
->add_jsfile( 'vendor/jquery/jquery-sheet/plugins/g.raphael-min.js', true );
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/jquery.nearest.min.js', true )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/raphael-min.js', true )
->add_jsfile( 'vendor_bundled/vendor/jquery/jquery-sheet/plugins/g.raphael-min.js', true );
$this->setup_jQuery_sheet_files = true;
}
......
......@@ -7,14 +7,14 @@
// hook in timeline libs which need to be in the head - may have to alter headerlib to allow this to be done serverside.
(function() {
Timeline_ajax_url = "vendor/simile_timeline/simile_timeline/timeline_ajax/simile-ajax-api.js";
Timeline_urlPrefix = "vendor/simile_timeline/simile_timeline/timeline_js/";
Timeline_ajax_url = "vendor_bundled/vendor/simile_timeline/simile_timeline/timeline_ajax/simile-ajax-api.js";
Timeline_urlPrefix = "vendor_bundled/vendor/simile_timeline/simile_timeline/timeline_js/";
Timeline_parameters = "bundle=true";
var head = document.getElementsByTagName("head")[0];
var script = document.createElement("script");
script.type = "text/javascript";
script.language = "JavaScript";
script.src = "vendor/simile_timeline/simile_timeline/timeline_js/timeline-api.js?bundle=true;";
script.src = "vendor_bundled/vendor/simile_timeline/simile_timeline/timeline_js/timeline-api.js?bundle=true;";
head.appendChild(script);
})();
......
......@@ -24,28 +24,28 @@ function smarty_function_filegal_uploader($params, $smarty)
$headerlib = TikiLib::lib('header');
// Image loader and canvas libs
$headerlib->add_jsfile('vendor/blueimp/javascript-load-image/js/load-image.all.min.js');
$headerlib->add_jsfile('vendor/blueimp/javascript-canvas-to-blob/js/canvas-to-blob.min.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/javascript-load-image/js/load-image.all.min.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/javascript-canvas-to-blob/js/canvas-to-blob.min.js');
// The Iframe Transport is required for browsers without support for XHR file uploads
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js');
// The basic File Upload plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js');
// The File Upload processing plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js');
// The File Upload image preview & resize plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js');
// The File Upload audio preview plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-audio.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-audio.js');
// The File Upload video preview plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-video.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-video.js');
// The File Upload validation plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js');
// The File Upload user interface plugin
$headerlib->add_jsfile('vendor/blueimp/jquery-file-upload/js/jquery.fileupload-ui.js');
$headerlib->add_jsfile('vendor_bundled/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-ui.js');
// CSS
$headerlib->add_cssfile('vendor/blueimp/jquery-file-upload/css/jquery.fileupload.css');
$headerlib->add_cssfile('vendor/blueimp/jquery-file-upload/css/jquery.fileupload-ui.css');
$headerlib->add_cssfile('vendor_bundled/vendor/blueimp/jquery-file-upload/css/jquery.fileupload.css');
$headerlib->add_cssfile('vendor_bundled/vendor/blueimp/jquery-file-upload/css/jquery.fileupload-ui.css');
// Tiki customised application script
$headerlib->add_jsfile('lib/jquery_tiki/tiki-jquery_upload.js');
......
......@@ -143,7 +143,7 @@ $.fn.loadDraw = function(o) {
options.push('lang=' + $.lang);
}
var drawFrame = $('<iframe src="vendor/svg-edit/svg-edit/svg-editor.html?' + options.join('&') + '" id="svgedit"></iframe>')
var drawFrame = $('<iframe src="vendor_bundled/vendor/svg-edit/svg-edit/svg-editor.html?' + options.join('&') + '" id="svgedit"></iframe>')
.appendTo(me)
.load(function() {
me
......
......@@ -19,14 +19,14 @@ $paths = array(
realpath('../..'),
realpath('core'),
realpath('../pear'),
realpath('../../vendor'),
realpath('../../vendor/mikey179/vfsStream/src/main/php'),
realpath('../../vendor_bundled/vendor'),
realpath('../../vendor_bundled/vendor/mikey179/vfsStream/src/main/php'),
realpath('../../vendor_extra/pear')
);
ini_set('include_path', implode(PATH_SEPARATOR, $paths));
require_once __DIR__ . '/../../vendor/autoload.php';
require_once __DIR__ . '/../../vendor_bundled/vendor/autoload.php';
if (!is_file(dirname(__FILE__) . '/local.php')) {
die("\nYou need to setup a new database and create a local.php file for the test suite inside " . dirname(__FILE__) . "\n\n");
......
......@@ -19,7 +19,7 @@ function tra($string)
return $string;
}
require __DIR__ . '/../../../vendor/autoload.php';
require __DIR__ . '/../../../vendor_bundled/vendor/autoload.php';
$tikidomain = '';
$api_tiki = null;
......
......@@ -6264,7 +6264,7 @@ JS;
break;
case "uilightness":
$result['backgroundColor'] = '#F6A828';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#1C94C4';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#333';
......@@ -6272,7 +6272,7 @@ JS;
break;
case "uidarkness":
$result['backgroundColor'] = '#333';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = 'white';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = 'white';
......@@ -6280,7 +6280,7 @@ JS;
break;
case "smoothness":
$result['backgroundColor'] = '#E6E6E6';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#212121';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#222';
......@@ -6288,7 +6288,7 @@ JS;
break;
case "start":
$result['backgroundColor'] = '#2191c0';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#acdd4a';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = 'white';
......@@ -6296,7 +6296,7 @@ JS;
break;
case "redmond":
$result['backgroundColor'] = '#C5DBEC';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#2E6E9E';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#222';
......@@ -6304,7 +6304,7 @@ JS;
break;
case "sunny":
$result['backgroundColor'] = '#FEEEBD';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#0074C7';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#383838';
......@@ -6312,7 +6312,7 @@ JS;
break;
case "overcast":
$result['backgroundColor'] = '#C9C9C9';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#212121';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#333';
......@@ -6320,7 +6320,7 @@ JS;
break;
case "lefrog":
$result['backgroundColor'] = '#285C00';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = 'white';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = 'white';
......@@ -6328,7 +6328,7 @@ JS;
break;
case "flick":
$result['backgroundColor'] = '#DDD';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#0073EA';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#444';
......@@ -6336,7 +6336,7 @@ JS;
break;
case "peppergrinder":
$result['backgroundColor'] = '#ECEADF';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';
$result['headerFontColor'] = '#654B24';
$result['headerBackgroundColor'] = '';
$result['slideFontColor'] = '#1F1F1F';
......@@ -6344,7 +6344,7 @@ JS;
break;
case "eggplant":
$result['backgroundColor'] = '#3D3644';
$result['backgroundImage'] = 'vendor/jquery/jquery-s5/images/bg.png';
$result['backgroundImage'] = 'vendor_bundled/vendor/jquery/jquery-s5/images/bg.png';