diff --git a/e107_admin/image.php b/e107_admin/image.php index 6d1b34d51..b6a5befe5 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -470,7 +470,7 @@ class media_form_ui extends e_admin_form_ui // "featurebox-bbcode" => "Featurebox [img] bbcode", ); - if(vartrue($pref['e_imageresize'])) + if(vartrue($pref['e_imageresize']) && is_array($pref['e_imageresize'])) { foreach($pref['e_imageresize'] as $val) { @@ -486,9 +486,9 @@ class media_form_ui extends e_admin_form_ui $valW = vartrue($curval[$key]['w']); $valH = vartrue($curval[$key]['h']); - $text .= "
".$title.": "; - $text .= " X "; - $text .= ""; + $text .= "
".$title.": "; + $text .= " X "; + $text .= ""; $text .= "
"; // $text .= $frm->text("resize_dimensions[{$key}]",$val, 5, array('size'=>'5')).$title."
"; } @@ -648,8 +648,8 @@ class media_admin_ui extends e_admin_ui 'image_post_class' => array('title'=> IMALAN_10, 'type' => 'userclass', 'data'=>'int', 'writeParms'=>'help=IMALAN_11&classlist=public,guest,nobody,member,admin,main,classes' ), 'image_post_disabled_method' => array('title'=> IMALAN_12, 'type' => 'boolean','writeParms'=>'enabled=IMALAN_15&disabled=IMALAN_14'), 'resize_method' => array('title'=> IMALAN_3, 'type'=>'method', 'data'=>'str'), - 'im_width' => array('title'=> "Avatar Width", 'type'=>'text', 'data'=>'int', 'writeParms'=>'help=Avatar images will be constrained to these dimensions (in pixels)'), //TODO LAN - 'im_height' => array('title'=> "Avatar Height", 'type'=>'text', 'data'=>'int', 'writeParms'=>'help=Avatar images will be constrained to these dimensions (in pixels)'), + 'im_width' => array('title'=> "Avatar Width", 'type'=>'number', 'data'=>'int', 'writeParms'=>'help=Avatar images will be constrained to these dimensions (in pixels)'), //TODO LAN + 'im_height' => array('title'=> "Avatar Height", 'type'=>'number', 'data'=>'int', 'writeParms'=>'help=Avatar images will be constrained to these dimensions (in pixels)'), 'resize_dimensions' => array('title'=> "Resize-Image Dimensions", 'type'=>'method', 'data'=>'str'), 'watermark_activate' => array('title'=> 'Watermark Activation', 'type' => 'text', 'data' => 'str', 'help'=>'All images with a width or height greater than this value will be given a watermark during resizing.'), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')), diff --git a/e107_files/jslib/core/all.jquery.js b/e107_files/jslib/core/all.jquery.js index 085db3a83..ac8461db1 100644 --- a/e107_files/jslib/core/all.jquery.js +++ b/e107_files/jslib/core/all.jquery.js @@ -9,7 +9,8 @@ $.ajaxSetup({ $(document).ready(function() { $(".e-hideme").hide(); - $(".e-expandit").show(); + $(".e-expandit").show(); + $(".e-spinner").spinner(); // default 'toggle'. @@ -612,24 +613,26 @@ $(document).ready(function() - function SyncWithServerTime(serverTime,domain) +function SyncWithServerTime(serverTime, path, domain) +{ + if (serverTime) { - if (serverTime) - { - /* update time difference cookie */ - var serverDelta=Math.floor(localTime-serverTime); - - document.cookie = 'e107_tdOffset='+serverDelta+'; path=/; domain= .'+domain; - document.cookie = 'e107_tdSetTime='+(localTime-serverDelta)+'; path=/; domain=.'+domain; /* server time when set */ - } - - var tzCookie = 'e107_tzOffset='; - // if (document.cookie.indexOf(tzCookie) < 0) { - /* set if not already set */ - var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */ - document.cookie = tzCookie + timezoneOffset+'; path=/; domain=.'+domain; - // } + /* update time difference cookie */ + var serverDelta=Math.floor(localTime-serverTime); + if(!path) path = '/'; + if(!domain) domain = ''; + else domain = '; domain=' + domain; + document.cookie = 'e107_tdOffset='+serverDelta+'; path='+path+domain; + document.cookie = 'e107_tdSetTime='+(localTime-serverDelta)+'; path='+path+domain; /* server time when set */ } + + var tzCookie = 'e107_tzOffset='; +// if (document.cookie.indexOf(tzCookie) < 0) { + /* set if not already set */ + var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */ + document.cookie = tzCookie + timezoneOffset+'; path='+path+domain; +// } +} function urljump(url){ diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index c15894fab..cb2a85358 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -2058,7 +2058,7 @@ class e_form $maxlength = vartrue($parms['maxlength'], 255); unset($parms['maxlength']); if(!vartrue($parms['size'])) $parms['size'] = 15; - if(!vartrue($parms['class'])) $parms['class'] = 'tbox number'; + if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner'; if(!$value) $value = '0'; $ret = vartrue($parms['pre']).$this->text($key, $value, $maxlength, $parms).vartrue($parms['post']); break; diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php index c53764734..29ef20754 100644 --- a/e107_handlers/js_manager.php +++ b/e107_handlers/js_manager.php @@ -25,17 +25,25 @@ class e_jsmanager 'e107.js'), /* 'jquery' => array( - "jquery/jquery-1.7.2.min.js", - "jquery/jquery-ui-1.8.21.custom.min.js", - "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/base/jquery-ui.css" + "http://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css", + "http://code.jquery.com/jquery-1.8.2.js", + "http://code.jquery.com/ui/1.9.1/jquery-ui.js" ), - */ + 'jquery' => array( "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/base/jquery-ui.css" ) + */ + + + 'jquery' => array( + "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/base/jquery-ui.css", + "http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js", + "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" + ) );