Skip to content

Commit

Permalink
Initially implement a jQuery approach, similar/blended with current y…
Browse files Browse the repository at this point in the history
…ui approach, includes jQuery, jQueryUI all themes, jQuery timepicker addon, also adds a custom smarty compiler plugin {switch} statement [#609]
  • Loading branch information
dleffler committed Nov 8, 2012
1 parent d61a147 commit 645bd5f
Show file tree
Hide file tree
Showing 472 changed files with 45,558 additions and 67 deletions.
19 changes: 6 additions & 13 deletions exponent.js.php
Expand Up @@ -15,13 +15,10 @@
#
##################################################
?>

// exponent Javascript Support Systems

// Exponent Javascript Support Systems
EXPONENT = {};

// map certian php CONSTANTS to JS vars

// map certain php CONSTANTS to JS vars
EXPONENT.LANG = "<?php echo LANG; ?>";
EXPONENT.PATH_RELATIVE = "<?php echo PATH_RELATIVE; ?>";
EXPONENT.URL_FULL = "<?php echo URL_FULL; ?>";
Expand All @@ -32,6 +29,9 @@
EXPONENT.JS_URL = '<?php echo JS_URL; ?>';
EXPONENT.JS_PATH = '<?php echo JS_RELATIVE; ?>'; //TODO deprecated
EXPONENT.JS_RELATIVE = '<?php echo JS_RELATIVE; ?>';
EXPONENT.JQUERY_RELATIVE = '<?php echo JQUERY_RELATIVE; ?>';
EXPONENT.JQUERY_PATH = '<?php echo JQUERY_PATH; ?>';
EXPONENT.JQUERY_URL = '<?php echo JQUERY_URL; ?>';
EXPONENT.YUI3_VERSION = '<?php echo YUI3_VERSION; ?>';
EXPONENT.YUI3_PATH = '<?php echo YUI3_RELATIVE; ?>'; //TODO deprecated
EXPONENT.YUI3_RELATIVE = '<?php echo YUI3_RELATIVE; ?>';
Expand All @@ -43,20 +43,14 @@
EXPONENT.FLOWPLAYER_VERSION = '<?php echo FLOWPLAYER_VERSION; ?>';
EXPONENT.FLOWPLAYER_RELATIVE = '<?php echo FLOWPLAYER_RELATIVE; ?>';

// Exponent YUI Configuration
EXPONENT.YUI3_CONFIG = {
combine:<?php echo (MINIFY==1&&MINIFY_YUI3==1)?1:0; ?>,
// base: EXPONENT.YUI3_RELATIVE,
// root: EXPONENT.YUI3_RELATIVE.substr(1),
comboBase: EXPONENT.PATH_RELATIVE+'external/minify/min/index.php?b='+EXPONENT.PATH_RELATIVE.substr(1)+'external/yui&f=',
filter: {
'searchExp': "&([2-3])",
'replaceStr': ",$1"
},
//combine: false,
// filter: "debug",
// onFailure: function (error) {
// console.debug(error);
// },
modules: {},
groups: {
yui2: {
Expand All @@ -68,7 +62,6 @@
"yui2-": {
configFn: function (me) {
if(/-skin|reset|fonts|grids|base/.test(me.name)) {
//return me;
me.type = "css";
me.path = me.path.replace(/\.js/, ".css");
me.path = me.path.replace(/\/yui2-skin/, "/assets/skins/sam/yui2-skin");
Expand Down
16 changes: 15 additions & 1 deletion exponent_constants.php
Expand Up @@ -478,14 +478,26 @@
define('YUI2_URL', URL_FULL.'external/yui/2in3/dist/'.YUI2_VERSION.'/build/');
}

if (!defined('JQUERYUI_STYLE')) {
/*
* Default jQuery CSS Style Constant
* Changing the version here lets Exponent adjust where to look
*/
define('JQUERYUI_STYLE', 'redmond');
}
if (!defined('JQUERY_RELATIVE')) {
/*
* YUI 2 Version Constant
* jQuery/jQueryUI Version Constants
* Changing the version here lets Exponent adjust where to look
*/
define('JQUERY_VERSION', '1.8.2');
define('JQUERYUI_VERSION', '1.9.1');
define('JQUERY_RELATIVE', PATH_RELATIVE.'external/jquery/');
define('JQUERY_PATH', BASE.'external/jquery/');
define('JQUERY_URL', URL_FULL.'external/jquery/');
define('JQUERY_SCRIPT', JQUERY_RELATIVE.'js/jquery-'.JQUERY_VERSION.'.min.js');
define('JQUERYUI_SCRIPT', JQUERY_RELATIVE.'js/jquery-ui-'.JQUERYUI_VERSION.'.custom.min.js');
define('JQUERYUI_CSS', JQUERY_RELATIVE.'css/'.JQUERYUI_STYLE.'/jquery-ui.css');
}

if (!defined('SMARTY_PATH')) {
Expand Down Expand Up @@ -518,4 +530,6 @@
define('FLOWPLAYER_CONTROLS_VERSION', '3.2.14');
}

define('BING_API', '92487BA7619E18106C842DD8463C4EC411F281B1');

?>
10 changes: 10 additions & 0 deletions external/jquery/addons/css/jquery-ui-timepicker-addon.css
@@ -0,0 +1,10 @@
.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
.ui-timepicker-div dl { text-align: left; }
.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }

.ui-timepicker-rtl{ direction: rtl; }
.ui-timepicker-rtl dl { text-align: right; }
.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

0 comments on commit 645bd5f

Please sign in to comment.