mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Upgrade to jquery-ui 1.9.1

Browse Source
This commit is contained in:
CaMer0n
2012-11-01 00:13:24 +00:00
parent 792cc7e715
commit f57297982c
4 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/image.php
View File

@@ -470,7 +470,7 @@ class media_form_ui extends e_admin_form_ui
// "featurebox-bbcode" => "Featurebox [img] bbcode", // "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) foreach($pref['e_imageresize'] as $val)
{ {
@@ -486,9 +486,9 @@ class media_form_ui extends e_admin_form_ui
$valW = vartrue($curval[$key]['w']); $valW = vartrue($curval[$key]['w']);
$valH = vartrue($curval[$key]['h']); $valH = vartrue($curval[$key]['h']);
$text .= "<div style='margin-bottomp:8px;text-align:right;width:280px'>".$title.": "; $text .= "<div style='margin-bottomp:8px;text-align:right;width:290px'>".$title.": ";
$text .= "<input class='e-tip' placeholder='ex. 400' style='text-align:right' type='text' name='resize_dimensions[{$key}][w]' value='$valW' size='5' title='maximum width in pixels' /> X "; $text .= "<input class='e-tip e-spinner' placeholder='ex. 400' style='text-align:right' type='text' name='resize_dimensions[{$key}][w]' value='$valW' size='5' title='maximum width in pixels' /> X ";
$text .= "<input class='e-tip' placeholder='ex. 400' style='text-align:right' type='text' name='resize_dimensions[{$key}][h]' value='$valH' size='5' title='maximum height in pixels' />"; $text .= "<input class='e-tip e-spinner' placeholder='ex. 400' style='text-align:right' type='text' name='resize_dimensions[{$key}][h]' value='$valH' size='5' title='maximum height in pixels' />";
$text .= "</div>"; $text .= "</div>";
// $text .= $frm->text("resize_dimensions[{$key}]",$val, 5, array('size'=>'5')).$title."<br />"; // $text .= $frm->text("resize_dimensions[{$key}]",$val, 5, array('size'=>'5')).$title."<br />";
} }
@@ -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_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'), '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'), '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_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'=>'text', 'data'=>'int', 'writeParms'=>'help=Avatar images will be constrained to these dimensions (in pixels)'), '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'), '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')), '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')),

21
e107_files/jslib/core/all.jquery.js
View File

@@ -10,6 +10,7 @@ $(document).ready(function()
{ {
$(".e-hideme").hide(); $(".e-hideme").hide();
$(".e-expandit").show(); $(".e-expandit").show();
$(".e-spinner").spinner();
// default 'toggle'. // 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 */ /* update time difference cookie */
var serverDelta=Math.floor(localTime-serverTime); var serverDelta=Math.floor(localTime-serverTime);
if(!path) path = '/';
document.cookie = 'e107_tdOffset='+serverDelta+'; path=/; domain= .'+domain; if(!domain) domain = '';
document.cookie = 'e107_tdSetTime='+(localTime-serverDelta)+'; path=/; domain=.'+domain; /* server time when set */ 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='; var tzCookie = 'e107_tzOffset=';
// if (document.cookie.indexOf(tzCookie) < 0) { // if (document.cookie.indexOf(tzCookie) < 0) {
/* set if not already set */ /* set if not already set */
var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */ var timezoneOffset = nowLocal.getTimezoneOffset(); /* client-to-GMT in minutes */
document.cookie = tzCookie + timezoneOffset+'; path=/; domain=.'+domain; document.cookie = tzCookie + timezoneOffset+'; path='+path+domain;
// } // }
} }
function urljump(url){ function urljump(url){

2
e107_handlers/form_handler.php
View File

@@ -2058,7 +2058,7 @@ class e_form
$maxlength = vartrue($parms['maxlength'], 255); $maxlength = vartrue($parms['maxlength'], 255);
unset($parms['maxlength']); unset($parms['maxlength']);
if(!vartrue($parms['size'])) $parms['size'] = 15; 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'; if(!$value) $value = '0';
$ret = vartrue($parms['pre']).$this->text($key, $value, $maxlength, $parms).vartrue($parms['post']); $ret = vartrue($parms['pre']).$this->text($key, $value, $maxlength, $parms).vartrue($parms['post']);
break; break;

16
e107_handlers/js_manager.php
View File

@@ -25,17 +25,25 @@ class e_jsmanager
'e107.js'), 'e107.js'),
/* /*
'jquery' => array( 'jquery' => array(
"jquery/jquery-1.7.2.min.js", "http://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css",
"jquery/jquery-ui-1.8.21.custom.min.js", "http://code.jquery.com/jquery-1.8.2.js",
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/base/jquery-ui.css" "http://code.jquery.com/ui/1.9.1/jquery-ui.js"
), ),
*/
'jquery' => array( 'jquery' => array(
"http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js", "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/jquery-ui.min.js",
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/base/jquery-ui.css" "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"
)
); );