- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-843-gd2a521f
by Michal Čihař 26 Mar '10

26 Mar '10

The branch, gettext has been updated via d2a521f369de842a3130bfeafd3816a6d24614fa (commit) via b994ec6934cef1b02d944969b05ace1f991dbaa7 (commit) via 783892518ce82c32374a6a643396244eff4c0ad3 (commit) via 719d6dd9f0c634fe49c121b4775f77a6953a954b (commit) from 9608b0805e0c928904069277c3b7958d4c50c8d8 (commit) - Log ----------------------------------------------------------------- commit d2a521f369de842a3130bfeafd3816a6d24614fa Merge: 9608b0805e0c928904069277c3b7958d4c50c8d8 b994ec6934cef1b02d944969b05ace1f991dbaa7 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 26 08:28:21 2010 +0100 Merge branch 'master' into gettext ----------------------------------------------------------------------- Summary of changes: js/colorpicker/css/colorpicker.css | 161 ++++++ js/colorpicker/css/layout.css | 218 +++++++++ js/colorpicker/images/blank.gif | Bin 0 -> 49 bytes js/colorpicker/images/colorpicker_background.png | Bin 0 -> 1897 bytes js/colorpicker/images/colorpicker_hex.png | Bin 0 -> 532 bytes js/colorpicker/images/colorpicker_hsb_b.png | Bin 0 -> 970 bytes js/colorpicker/images/colorpicker_hsb_h.png | Bin 0 -> 1012 bytes js/colorpicker/images/colorpicker_hsb_s.png | Bin 0 -> 1171 bytes js/colorpicker/images/colorpicker_indic.gif | Bin 0 -> 86 bytes js/colorpicker/images/colorpicker_overlay.png | Bin 0 -> 10355 bytes js/colorpicker/images/colorpicker_rgb_b.png | Bin 0 -> 970 bytes js/colorpicker/images/colorpicker_rgb_g.png | Bin 0 -> 1069 bytes js/colorpicker/images/colorpicker_rgb_r.png | Bin 0 -> 1066 bytes js/colorpicker/images/colorpicker_select.gif | Bin 0 -> 78 bytes js/colorpicker/images/colorpicker_submit.png | Bin 0 -> 984 bytes js/colorpicker/images/custom_background.png | Bin 0 -> 1916 bytes js/colorpicker/images/custom_hex.png | Bin 0 -> 562 bytes js/colorpicker/images/custom_hsb_b.png | Bin 0 -> 1097 bytes js/colorpicker/images/custom_hsb_h.png | Bin 0 -> 970 bytes js/colorpicker/images/custom_hsb_s.png | Bin 0 -> 1168 bytes js/colorpicker/images/custom_indic.gif | Bin 0 -> 86 bytes js/colorpicker/images/custom_rgb_b.png | Bin 0 -> 1008 bytes js/colorpicker/images/custom_rgb_g.png | Bin 0 -> 1069 bytes js/colorpicker/images/custom_rgb_r.png | Bin 0 -> 1018 bytes js/colorpicker/images/custom_submit.png | Bin 0 -> 997 bytes js/colorpicker/images/select.png | Bin 0 -> 506 bytes js/colorpicker/images/select2.png | Bin 0 -> 518 bytes js/colorpicker/images/slider.png | Bin 0 -> 315 bytes js/colorpicker/js/colorpicker.js | 484 +++++++++++++++++++ js/mooRainbow/images/blank.gif | Bin 43 -> 0 bytes js/mooRainbow/images/moor_arrows.gif | Bin 94 -> 0 bytes js/mooRainbow/images/moor_boverlay.png | Bin 799 -> 0 bytes js/mooRainbow/images/moor_cursor.gif | Bin 80 -> 0 bytes js/mooRainbow/images/moor_slider.png | Bin 590 -> 0 bytes js/mooRainbow/images/moor_woverlay.png | Bin 768 -> 0 bytes js/mooRainbow/images/rainbow.png | Bin 794 -> 0 bytes js/mooRainbow/mooRainbow.css | 114 ----- js/mooRainbow/mooRainbow.js | 563 ---------------------- js/mootools-domready-rainbow.js | 16 - libraries/common.inc.php | 2 - libraries/header_meta_style.inc.php | 11 +- main.php | 39 ++- 42 files changed, 901 insertions(+), 707 deletions(-) create mode 100644 js/colorpicker/css/colorpicker.css create mode 100644 js/colorpicker/css/layout.css create mode 100644 js/colorpicker/images/blank.gif create mode 100644 js/colorpicker/images/colorpicker_background.png create mode 100644 js/colorpicker/images/colorpicker_hex.png create mode 100644 js/colorpicker/images/colorpicker_hsb_b.png create mode 100644 js/colorpicker/images/colorpicker_hsb_h.png create mode 100644 js/colorpicker/images/colorpicker_hsb_s.png create mode 100644 js/colorpicker/images/colorpicker_indic.gif create mode 100644 js/colorpicker/images/colorpicker_overlay.png create mode 100644 js/colorpicker/images/colorpicker_rgb_b.png create mode 100644 js/colorpicker/images/colorpicker_rgb_g.png create mode 100644 js/colorpicker/images/colorpicker_rgb_r.png create mode 100644 js/colorpicker/images/colorpicker_select.gif create mode 100644 js/colorpicker/images/colorpicker_submit.png create mode 100644 js/colorpicker/images/custom_background.png create mode 100644 js/colorpicker/images/custom_hex.png create mode 100644 js/colorpicker/images/custom_hsb_b.png create mode 100644 js/colorpicker/images/custom_hsb_h.png create mode 100644 js/colorpicker/images/custom_hsb_s.png create mode 100644 js/colorpicker/images/custom_indic.gif create mode 100644 js/colorpicker/images/custom_rgb_b.png create mode 100644 js/colorpicker/images/custom_rgb_g.png create mode 100644 js/colorpicker/images/custom_rgb_r.png create mode 100644 js/colorpicker/images/custom_submit.png create mode 100644 js/colorpicker/images/select.png create mode 100644 js/colorpicker/images/select2.png create mode 100644 js/colorpicker/images/slider.png create mode 100644 js/colorpicker/js/colorpicker.js delete mode 100644 js/mooRainbow/images/blank.gif delete mode 100644 js/mooRainbow/images/moor_arrows.gif delete mode 100644 js/mooRainbow/images/moor_boverlay.png delete mode 100644 js/mooRainbow/images/moor_cursor.gif delete mode 100644 js/mooRainbow/images/moor_slider.png delete mode 100644 js/mooRainbow/images/moor_woverlay.png delete mode 100644 js/mooRainbow/images/rainbow.png delete mode 100644 js/mooRainbow/mooRainbow.css delete mode 100644 js/mooRainbow/mooRainbow.js delete mode 100644 js/mootools-domready-rainbow.js diff --git a/js/colorpicker/css/colorpicker.css b/js/colorpicker/css/colorpicker.css new file mode 100644 index 0000000..05b02b4 --- /dev/null +++ b/js/colorpicker/css/colorpicker.css @@ -0,0 +1,161 @@ +.colorpicker { + width: 356px; + height: 176px; + overflow: hidden; + position: absolute; + background: url(../images/colorpicker_background.png); + font-family: Arial, Helvetica, sans-serif; + display: none; +} +.colorpicker_color { + width: 150px; + height: 150px; + left: 14px; + top: 13px; + position: absolute; + background: #f00; + overflow: hidden; + cursor: crosshair; +} +.colorpicker_color div { + position: absolute; + top: 0; + left: 0; + width: 150px; + height: 150px; + background: url(../images/colorpicker_overlay.png); +} +.colorpicker_color div div { + position: absolute; + top: 0; + left: 0; + width: 11px; + height: 11px; + overflow: hidden; + background: url(../images/colorpicker_select.gif); + margin: -5px 0 0 -5px; +} +.colorpicker_hue { + position: absolute; + top: 13px; + left: 171px; + width: 35px; + height: 150px; + cursor: n-resize; +} +.colorpicker_hue div { + position: absolute; + width: 35px; + height: 9px; + overflow: hidden; + background: url(../images/colorpicker_indic.gif) left top; + margin: -4px 0 0 0; + left: 0px; +} +.colorpicker_new_color { + position: absolute; + width: 60px; + height: 30px; + left: 213px; + top: 13px; + background: #f00; +} +.colorpicker_current_color { + position: absolute; + width: 60px; + height: 30px; + left: 283px; + top: 13px; + background: #f00; +} +.colorpicker input { + background-color: transparent; + border: 1px solid transparent; + position: absolute; + font-size: 10px; + font-family: Arial, Helvetica, sans-serif; + color: #898989; + top: 4px; + right: 11px; + text-align: right; + margin: 0; + padding: 0; + height: 11px; +} +.colorpicker_hex { + position: absolute; + width: 72px; + height: 22px; + background: url(../images/colorpicker_hex.png) top; + left: 212px; + top: 142px; +} +.colorpicker_hex input { + right: 6px; +} +.colorpicker_field { + height: 22px; + width: 62px; + background-position: top; + position: absolute; +} +.colorpicker_field span { + position: absolute; + width: 12px; + height: 22px; + overflow: hidden; + top: 0; + right: 0; + cursor: n-resize; +} +.colorpicker_rgb_r { + background-image: url(../images/colorpicker_rgb_r.png); + top: 52px; + left: 212px; +} +.colorpicker_rgb_g { + background-image: url(../images/colorpicker_rgb_g.png); + top: 82px; + left: 212px; +} +.colorpicker_rgb_b { + background-image: url(../images/colorpicker_rgb_b.png); + top: 112px; + left: 212px; +} +.colorpicker_hsb_h { + background-image: url(../images/colorpicker_hsb_h.png); + top: 52px; + left: 282px; +} +.colorpicker_hsb_s { + background-image: url(../images/colorpicker_hsb_s.png); + top: 82px; + left: 282px; +} +.colorpicker_hsb_b { + background-image: url(../images/colorpicker_hsb_b.png); + top: 112px; + left: 282px; +} +.colorpicker_submit { + position: absolute; + width: 22px; + height: 22px; + background: url(../images/colorpicker_submit.png) top; + left: 322px; + top: 142px; + overflow: hidden; +} +.colorpicker_focus { + background-position: center; +} +.colorpicker_hex.colorpicker_focus { + background-position: bottom; +} +.colorpicker_submit.colorpicker_focus { + background-position: bottom; +} +.colorpicker_slider { + background-position: bottom; +} diff --git a/js/colorpicker/css/layout.css b/js/colorpicker/css/layout.css new file mode 100644 index 0000000..396e671 --- /dev/null +++ b/js/colorpicker/css/layout.css @@ -0,0 +1,218 @@ +/*body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { + margin:0; + padding:0; +} +table { + border-collapse:collapse; + border-spacing:0; +} +fieldset,img { + border:0; +} +address,caption,cite,code,dfn,em,strong,th,var { + font-style:normal; + font-weight:normal; +} +ol,ul { + list-style:none; +} +caption,th { + text-align:left; +} +h1,h2,h3,h4,h5,h6 { + font-size:100%; + font-weight:normal; +} +q:before,q:after { + content:''; +} +abbr,acronym { border:0; +} +html, body { + background-color: #fff; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #52697E; +} +body { + text-align: center; + overflow: auto; +} +.wrapper { + width: 700px; + margin: 0 auto; + text-align: left; +} +h1 { + font-size: 21px; + height: 47px; + line-height: 47px; + text-transform: uppercase; +} +.navigationTabs { + height: 23px; + line-height: 23px; + border-bottom: 1px solid #ccc; +} +.navigationTabs li { + float: left; + height: 23px; + line-height: 23px; + padding-right: 3px; +} +.navigationTabs li a{ + float: left; + dispaly: block; + height: 23px; + line-height: 23px; + padding: 0 10px; + overflow: hidden; + color: #52697E; + background-color: #eee; + position: relative; + text-decoration: none; +} +.navigationTabs li a:hover { + background-color: #f0f0f0; +} +.navigationTabs li a.active { + background-color: #fff; + border: 1px solid #ccc; + border-bottom: 0px solid; +} +.tabsContent { + border: 1px solid #ccc; + border-top: 0px solid; + width: 698px; + overflow: hidden; +} +.tab { + padding: 16px; + display: none; +} +.tab h2 { + font-weight: bold; + font-size: 16px; +} +.tab h3 { + font-weight: bold; + font-size: 14px; + margin-top: 20px; +} +.tab p { + margin-top: 16px; + clear: both; +} +.tab ul { + margin-top: 16px; + list-style: disc; +} +.tab li { + margin: 10px 0 0 35px; +} +.tab a { + color: #8FB0CF; +} +.tab strong { + font-weight: bold; +} +.tab pre { + font-size: 11px; + margin-top: 20px; + width: 668px; + overflow: auto; + clear: both; +} +.tab table { + width: 100%; +} +.tab table td { + padding: 6px 10px 6px 0; + vertical-align: top; +} +.tab dt { + margin-top: 16px; +} +*/ +#colorSelector { + position: relative; + width: 36px; + height: 36px; + background: url(../images/select.png); +} +#colorSelector div { + position: absolute; + top: 3px; + left: 3px; + width: 30px; + height: 30px; + background: url(../images/select.png) center; +} +#colorSelector2 { + position: absolute; + top: 0; + left: 0; + width: 36px; + height: 36px; + background: url(../images/select2.png); +} +#colorSelector2 div { + position: absolute; + top: 4px; + left: 4px; + width: 28px; + height: 28px; + background: url(../images/select2.png) center; +} +#colorpickerHolder2 { + top: 32px; + left: 0; + width: 356px; + height: 0; + overflow: hidden; + position: absolute; +} +#colorpickerHolder2 .colorpicker { + background-image: url(../images/custom_background.png); + position: absolute; + bottom: 0; + left: 0; +} +#colorpickerHolder2 .colorpicker_hue div { + background-image: url(../images/custom_indic.gif); +} +#colorpickerHolder2 .colorpicker_hex { + background-image: url(../images/custom_hex.png); +} +#colorpickerHolder2 .colorpicker_rgb_r { + background-image: url(../images/custom_rgb_r.png); +} +#colorpickerHolder2 .colorpicker_rgb_g { + background-image: url(../images/custom_rgb_g.png); +} +#colorpickerHolder2 .colorpicker_rgb_b { + background-image: url(../images/custom_rgb_b.png); +} +#colorpickerHolder2 .colorpicker_hsb_s { + background-image: url(../images/custom_hsb_s.png); + display: none; +} +#colorpickerHolder2 .colorpicker_hsb_h { + background-image: url(../images/custom_hsb_h.png); + display: none; +} +#colorpickerHolder2 .colorpicker_hsb_b { + background-image: url(../images/custom_hsb_b.png); + display: none; +} +#colorpickerHolder2 .colorpicker_submit { + background-image: url(../images/custom_submit.png); +} +#colorpickerHolder2 .colorpicker input { + color: #778398; +} +#customWidget { + position: relative; + height: 36px; +} diff --git a/js/colorpicker/images/blank.gif b/js/colorpicker/images/blank.gif new file mode 100644 index 0000000..75b945d Binary files /dev/null and b/js/colorpicker/images/blank.gif differ diff --git a/js/colorpicker/images/colorpicker_background.png b/js/colorpicker/images/colorpicker_background.png new file mode 100644 index 0000000..8401572 Binary files /dev/null and b/js/colorpicker/images/colorpicker_background.png differ diff --git a/js/colorpicker/images/colorpicker_hex.png b/js/colorpicker/images/colorpicker_hex.png new file mode 100644 index 0000000..4e532d7 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hex.png differ diff --git a/js/colorpicker/images/colorpicker_hsb_b.png b/js/colorpicker/images/colorpicker_hsb_b.png new file mode 100644 index 0000000..dfac595 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hsb_b.png differ diff --git a/js/colorpicker/images/colorpicker_hsb_h.png b/js/colorpicker/images/colorpicker_hsb_h.png new file mode 100644 index 0000000..3977ed9 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hsb_h.png differ diff --git a/js/colorpicker/images/colorpicker_hsb_s.png b/js/colorpicker/images/colorpicker_hsb_s.png new file mode 100644 index 0000000..a2a6997 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hsb_s.png differ diff --git a/js/colorpicker/images/colorpicker_indic.gif b/js/colorpicker/images/colorpicker_indic.gif new file mode 100644 index 0000000..f9fa95e Binary files /dev/null and b/js/colorpicker/images/colorpicker_indic.gif differ diff --git a/js/colorpicker/images/colorpicker_overlay.png b/js/colorpicker/images/colorpicker_overlay.png new file mode 100644 index 0000000..561cdd9 Binary files /dev/null and b/js/colorpicker/images/colorpicker_overlay.png differ diff --git a/js/colorpicker/images/colorpicker_rgb_b.png b/js/colorpicker/images/colorpicker_rgb_b.png new file mode 100644 index 0000000..dfac595 Binary files /dev/null and b/js/colorpicker/images/colorpicker_rgb_b.png differ diff --git a/js/colorpicker/images/colorpicker_rgb_g.png b/js/colorpicker/images/colorpicker_rgb_g.png new file mode 100644 index 0000000..72b3276 Binary files /dev/null and b/js/colorpicker/images/colorpicker_rgb_g.png differ diff --git a/js/colorpicker/images/colorpicker_rgb_r.png b/js/colorpicker/images/colorpicker_rgb_r.png new file mode 100644 index 0000000..4855fe0 Binary files /dev/null and b/js/colorpicker/images/colorpicker_rgb_r.png differ diff --git a/js/colorpicker/images/colorpicker_select.gif b/js/colorpicker/images/colorpicker_select.gif new file mode 100644 index 0000000..599f7f1 Binary files /dev/null and b/js/colorpicker/images/colorpicker_select.gif differ diff --git a/js/colorpicker/images/colorpicker_submit.png b/js/colorpicker/images/colorpicker_submit.png new file mode 100644 index 0000000..7f4c082 Binary files /dev/null and b/js/colorpicker/images/colorpicker_submit.png differ diff --git a/js/colorpicker/images/custom_background.png b/js/colorpicker/images/custom_background.png new file mode 100644 index 0000000..cf55ffd Binary files /dev/null and b/js/colorpicker/images/custom_background.png differ diff --git a/js/colorpicker/images/custom_hex.png b/js/colorpicker/images/custom_hex.png new file mode 100644 index 0000000..888f444 Binary files /dev/null and b/js/colorpicker/images/custom_hex.png differ diff --git a/js/colorpicker/images/custom_hsb_b.png b/js/colorpicker/images/custom_hsb_b.png new file mode 100644 index 0000000..2f99dae Binary files /dev/null and b/js/colorpicker/images/custom_hsb_b.png differ diff --git a/js/colorpicker/images/custom_hsb_h.png b/js/colorpicker/images/custom_hsb_h.png new file mode 100644 index 0000000..a217e92 Binary files /dev/null and b/js/colorpicker/images/custom_hsb_h.png differ diff --git a/js/colorpicker/images/custom_hsb_s.png b/js/colorpicker/images/custom_hsb_s.png new file mode 100644 index 0000000..7826b41 Binary files /dev/null and b/js/colorpicker/images/custom_hsb_s.png differ diff --git a/js/colorpicker/images/custom_indic.gif b/js/colorpicker/images/custom_indic.gif new file mode 100644 index 0000000..222fb94 Binary files /dev/null and b/js/colorpicker/images/custom_indic.gif differ diff --git a/js/colorpicker/images/custom_rgb_b.png b/js/colorpicker/images/custom_rgb_b.png new file mode 100644 index 0000000..80764e5 Binary files /dev/null and b/js/colorpicker/images/custom_rgb_b.png differ diff --git a/js/colorpicker/images/custom_rgb_g.png b/js/colorpicker/images/custom_rgb_g.png new file mode 100644 index 0000000..fc9778b Binary files /dev/null and b/js/colorpicker/images/custom_rgb_g.png differ diff --git a/js/colorpicker/images/custom_rgb_r.png b/js/colorpicker/images/custom_rgb_r.png new file mode 100644 index 0000000..91b0cd4 Binary files /dev/null and b/js/colorpicker/images/custom_rgb_r.png differ diff --git a/js/colorpicker/images/custom_submit.png b/js/colorpicker/images/custom_submit.png new file mode 100644 index 0000000..cd202cd Binary files /dev/null and b/js/colorpicker/images/custom_submit.png differ diff --git a/js/colorpicker/images/select.png b/js/colorpicker/images/select.png new file mode 100644 index 0000000..21213bf Binary files /dev/null and b/js/colorpicker/images/select.png differ diff --git a/js/colorpicker/images/select2.png b/js/colorpicker/images/select2.png new file mode 100644 index 0000000..2cd2cab Binary files /dev/null and b/js/colorpicker/images/select2.png differ diff --git a/js/colorpicker/images/slider.png b/js/colorpicker/images/slider.png new file mode 100644 index 0000000..8b03da9 Binary files /dev/null and b/js/colorpicker/images/slider.png differ diff --git a/js/colorpicker/js/colorpicker.js b/js/colorpicker/js/colorpicker.js new file mode 100644 index 0000000..10a2b22 --- /dev/null +++ b/js/colorpicker/js/colorpicker.js @@ -0,0 +1,484 @@ +/** + * + * Color picker + * Author: Stefan Petre www.eyecon.ro + * + * Dual licensed under the MIT and GPL licenses + * + */ +(function ($) { + var ColorPicker = function () { + var + ids = {}, + inAction, + charMin = 65, + visible, + tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>', + defaults = { + eventName: 'click', + onShow: function () {}, + onBeforeShow: function(){}, + onHide: function () {}, + onChange: function () {}, + onSubmit: function () {}, + color: 'ff0000', + livePreview: true, + flat: false + }, + fillRGBFields = function (hsb, cal) { + var rgb = HSBToRGB(hsb); + $(cal).data('colorpicker').fields + .eq(1).val(rgb.r).end() + .eq(2).val(rgb.g).end() + .eq(3).val(rgb.b).end(); + }, + fillHSBFields = function (hsb, cal) { + $(cal).data('colorpicker').fields + .eq(4).val(hsb.h).end() + .eq(5).val(hsb.s).end() + .eq(6).val(hsb.b).end(); + }, + fillHexFields = function (hsb, cal) { + $(cal).data('colorpicker').fields + .eq(0).val(HSBToHex(hsb)).end(); + }, + setSelector = function (hsb, cal) { + $(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100})); + $(cal).data('colorpicker').selectorIndic.css({ + left: parseInt(150 * hsb.s/100, 10), + top: parseInt(150 * (100-hsb.b)/100, 10) + }); + }, + setHue = function (hsb, cal) { + $(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10)); + }, + setCurrentColor = function (hsb, cal) { + $(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb)); + }, + setNewColor = function (hsb, cal) { + $(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb)); + }, + keyDown = function (ev) { + var pressedKey = ev.charCode || ev.keyCode || -1; + if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) { + return false; + } + var cal = $(this).parent().parent(); + if (cal.data('colorpicker').livePreview === true) { + change.apply(this); + } + }, + change = function (ev) { + var cal = $(this).parent().parent(), col; + if (this.parentNode.className.indexOf('_hex') > 0) { + cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value)); + } else if (this.parentNode.className.indexOf('_hsb') > 0) { + cal.data('colorpicker').color = col = fixHSB({ + h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10), + s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10), + b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10) + }); + } else { + cal.data('colorpicker').color = col = RGBToHSB(fixRGB({ + r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10), + g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10), + b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10) + })); + } + if (ev) { + fillRGBFields(col, cal.get(0)); + fillHexFields(col, cal.get(0)); + fillHSBFields(col, cal.get(0)); + } + setSelector(col, cal.get(0)); + setHue(col, cal.get(0)); + setNewColor(col, cal.get(0)); + cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]); + }, + blur = function (ev) { + var cal = $(this).parent().parent(); + cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus'); + }, + focus = function () { + charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65; + $(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus'); + $(this).parent().addClass('colorpicker_focus'); + }, + downIncrement = function (ev) { + var field = $(this).parent().find('input').focus(); + var current = { + el: $(this).parent().addClass('colorpicker_slider'), + max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255), + y: ev.pageY, + field: field, + val: parseInt(field.val(), 10), + preview: $(this).parent().parent().data('colorpicker').livePreview + }; + $(document).bind('mouseup', current, upIncrement); + $(document).bind('mousemove', current, moveIncrement); + }, + moveIncrement = function (ev) { + ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10)))); + if (ev.data.preview) { + change.apply(ev.data.field.get(0), [true]); + } + return false; + }, + upIncrement = function (ev) { + change.apply(ev.data.field.get(0), [true]); + ev.data.el.removeClass('colorpicker_slider').find('input').focus(); + $(document).unbind('mouseup', upIncrement); + $(document).unbind('mousemove', moveIncrement); + return false; + }, + downHue = function (ev) { + var current = { + cal: $(this).parent(), + y: $(this).offset().top + }; + current.preview = current.cal.data('colorpicker').livePreview; + $(document).bind('mouseup', current, upHue); + $(document).bind('mousemove', current, moveHue); + }, + moveHue = function (ev) { + change.apply( + ev.data.cal.data('colorpicker') + .fields + .eq(4) + .val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10)) + .get(0), + [ev.data.preview] + ); + return false; + }, + upHue = function (ev) { + fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + $(document).unbind('mouseup', upHue); + $(document).unbind('mousemove', moveHue); + return false; + }, + downSelector = function (ev) { + var current = { + cal: $(this).parent(), + pos: $(this).offset() + }; + current.preview = current.cal.data('colorpicker').livePreview; + $(document).bind('mouseup', current, upSelector); + $(document).bind('mousemove', current, moveSelector); + }, + moveSelector = function (ev) { + change.apply( + ev.data.cal.data('colorpicker') + .fields + .eq(6) + .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10)) + .end() + .eq(5) + .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10)) + .get(0), + [ev.data.preview] + ); + return false; + }, + upSelector = function (ev) { + fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + $(document).unbind('mouseup', upSelector); + $(document).unbind('mousemove', moveSelector); + return false; + }, + enterSubmit = function (ev) { + $(this).addClass('colorpicker_focus'); + }, + leaveSubmit = function (ev) { + $(this).removeClass('colorpicker_focus'); + }, + clickSubmit = function (ev) { + var cal = $(this).parent(); + var col = cal.data('colorpicker').color; + cal.data('colorpicker').origColor = col; + setCurrentColor(col, cal.get(0)); + cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); + }, + show = function (ev) { + var cal = $('#' + $(this).data('colorpickerId')); + cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]); + var pos = $(this).offset(); + var viewPort = getViewport(); + var top = pos.top + this.offsetHeight; + var left = pos.left; + if (top + 176 > viewPort.t + viewPort.h) { + top -= this.offsetHeight + 176; + } + if (left + 356 > viewPort.l + viewPort.w) { + left -= 356; + } + cal.css({left: left + 'px', top: top + 'px'}); + if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) { + cal.show(); + } + $(document).bind('mousedown', {cal: cal}, hide); + return false; + }, + hide = function (ev) { + if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) { + if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) { + ev.data.cal.hide(); + } + $(document).unbind('mousedown', hide); + } + }, + isChildOf = function(parentEl, el, container) { + if (parentEl == el) { + return true; + } + if (parentEl.contains) { + return parentEl.contains(el); + } + if ( parentEl.compareDocumentPosition ) { + return !!(parentEl.compareDocumentPosition(el) & 16); + } + var prEl = el.parentNode; + while(prEl && prEl != container) { + if (prEl == parentEl) + return true; + prEl = prEl.parentNode; + } + return false; + }, + getViewport = function () { + var m = document.compatMode == 'CSS1Compat'; + return { + l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft), + t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop), + w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth), + h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight) + }; + }, + fixHSB = function (hsb) { + return { + h: Math.min(360, Math.max(0, hsb.h)), + s: Math.min(100, Math.max(0, hsb.s)), + b: Math.min(100, Math.max(0, hsb.b)) + }; + }, + fixRGB = function (rgb) { + return { + r: Math.min(255, Math.max(0, rgb.r)), + g: Math.min(255, Math.max(0, rgb.g)), + b: Math.min(255, Math.max(0, rgb.b)) + }; + }, + fixHex = function (hex) { + var len = 6 - hex.length; + if (len > 0) { + var o = []; + for (var i=0; i<len; i++) { + o.push('0'); + } + o.push(hex); + hex = o.join(''); + } + return hex; + }, + HexToRGB = function (hex) { + var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16); + return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)}; + }, + HexToHSB = function (hex) { + return RGBToHSB(HexToRGB(hex)); + }, + RGBToHSB = function (rgb) { + var hsb = { + h: 0, + s: 0, + b: 0 + }; + var min = Math.min(rgb.r, rgb.g, rgb.b); + var max = Math.max(rgb.r, rgb.g, rgb.b); + var delta = max - min; + hsb.b = max; + if (max != 0) { + + } + hsb.s = max != 0 ? 255 * delta / max : 0; + if (hsb.s != 0) { + if (rgb.r == max) { + hsb.h = (rgb.g - rgb.b) / delta; + } else if (rgb.g == max) { + hsb.h = 2 + (rgb.b - rgb.r) / delta; + } else { + hsb.h = 4 + (rgb.r - rgb.g) / delta; + } + } else { + hsb.h = -1; + } + hsb.h *= 60; + if (hsb.h < 0) { + hsb.h += 360; + } + hsb.s *= 100/255; + hsb.b *= 100/255; + return hsb; + }, + HSBToRGB = function (hsb) { + var rgb = {}; + var h = Math.round(hsb.h); + var s = Math.round(hsb.s*255/100); + var v = Math.round(hsb.b*255/100); + if(s == 0) { + rgb.r = rgb.g = rgb.b = v; + } else { + var t1 = v; + var t2 = (255-s)*v/255; + var t3 = (t1-t2)*(h%60)/60; + if(h==360) h = 0; + if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3} + else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3} + else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3} + else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3} + else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3} + else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3} + else {rgb.r=0; rgb.g=0; rgb.b=0} + } + return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)}; + }, + RGBToHex = function (rgb) { + var hex = [ + rgb.r.toString(16), + rgb.g.toString(16), + rgb.b.toString(16) + ]; + $.each(hex, function (nr, val) { + if (val.length == 1) { + hex[nr] = '0' + val; + } + }); + return hex.join(''); + }, + HSBToHex = function (hsb) { + return RGBToHex(HSBToRGB(hsb)); + }, + restoreOriginal = function () { + var cal = $(this).parent(); + var col = cal.data('colorpicker').origColor; + cal.data('colorpicker').color = col; + fillRGBFields(col, cal.get(0)); + fillHexFields(col, cal.get(0)); + fillHSBFields(col, cal.get(0)); + setSelector(col, cal.get(0)); + setHue(col, cal.get(0)); + setNewColor(col, cal.get(0)); + }; + return { + init: function (opt) { + opt = $.extend({}, defaults, opt||{}); + if (typeof opt.color == 'string') { + opt.color = HexToHSB(opt.color); + } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) { + opt.color = RGBToHSB(opt.color); + } else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) { + opt.color = fixHSB(opt.color); + } else { + return this; + } + return this.each(function () { + if (!$(this).data('colorpickerId')) { + var options = $.extend({}, opt); + options.origColor = opt.color; + var id = 'collorpicker_' + parseInt(Math.random() * 1000); + $(this).data('colorpickerId', id); + var cal = $(tpl).attr('id', id); + if (options.flat) { + cal.appendTo(this).show(); + } else { + cal.appendTo(document.body); + } + options.fields = cal + .find('input') + .bind('keyup', keyDown) + .bind('change', change) + .bind('blur', blur) + .bind('focus', focus); + cal + .find('span').bind('mousedown', downIncrement).end() + .find('>div.colorpicker_current_color').bind('click', restoreOriginal); + options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector); + options.selectorIndic = options.selector.find('div div'); + options.el = this; + options.hue = cal.find('div.colorpicker_hue div'); + cal.find('div.colorpicker_hue').bind('mousedown', downHue); + options.newColor = cal.find('div.colorpicker_new_color'); + options.currentColor = cal.find('div.colorpicker_current_color'); + cal.data('colorpicker', options); + cal.find('div.colorpicker_submit') + .bind('mouseenter', enterSubmit) + .bind('mouseleave', leaveSubmit) + .bind('click', clickSubmit); + fillRGBFields(options.color, cal.get(0)); + fillHSBFields(options.color, cal.get(0)); + fillHexFields(options.color, cal.get(0)); + setHue(options.color, cal.get(0)); + setSelector(options.color, cal.get(0)); + setCurrentColor(options.color, cal.get(0)); + setNewColor(options.color, cal.get(0)); + if (options.flat) { + cal.css({ + position: 'relative', + display: 'block' + }); + } else { + $(this).bind(options.eventName, show); + } + } + }); + }, + showPicker: function() { + return this.each( function () { + if ($(this).data('colorpickerId')) { + show.apply(this); + } + }); + }, + hidePicker: function() { + return this.each( function () { + if ($(this).data('colorpickerId')) { + $('#' + $(this).data('colorpickerId')).hide(); + } + }); + }, + setColor: function(col) { + if (typeof col == 'string') { + col = HexToHSB(col); + } else if (col.r != undefined && col.g != undefined && col.b != undefined) { + col = RGBToHSB(col); + } else if (col.h != undefined && col.s != undefined && col.b != undefined) { + col = fixHSB(col); + } else { + return this; + } + return this.each(function(){ + if ($(this).data('colorpickerId')) { + var cal = $('#' + $(this).data('colorpickerId')); + cal.data('colorpicker').color = col; + cal.data('colorpicker').origColor = col; + fillRGBFields(col, cal.get(0)); + fillHSBFields(col, cal.get(0)); + fillHexFields(col, cal.get(0)); + setHue(col, cal.get(0)); + setSelector(col, cal.get(0)); + setCurrentColor(col, cal.get(0)); + setNewColor(col, cal.get(0)); + } + }); + } + }; + }(); + $.fn.extend({ + ColorPicker: ColorPicker.init, + ColorPickerHide: ColorPicker.hidePicker, + ColorPickerShow: ColorPicker.showPicker, + ColorPickerSetColor: ColorPicker.setColor + }); +})(jQuery) \ No newline at end of file diff --git a/js/mooRainbow/images/blank.gif b/js/mooRainbow/images/blank.gif deleted file mode 100644 index c9c195f..0000000 Binary files a/js/mooRainbow/images/blank.gif and /dev/null differ diff --git a/js/mooRainbow/images/moor_arrows.gif b/js/mooRainbow/images/moor_arrows.gif deleted file mode 100644 index c57addc..0000000 Binary files a/js/mooRainbow/images/moor_arrows.gif and /dev/null differ diff --git a/js/mooRainbow/images/moor_boverlay.png b/js/mooRainbow/images/moor_boverlay.png deleted file mode 100644 index 7ac228b..0000000 Binary files a/js/mooRainbow/images/moor_boverlay.png and /dev/null differ diff --git a/js/mooRainbow/images/moor_cursor.gif b/js/mooRainbow/images/moor_cursor.gif deleted file mode 100644 index 9515a38..0000000 Binary files a/js/mooRainbow/images/moor_cursor.gif and /dev/null differ diff --git a/js/mooRainbow/images/moor_slider.png b/js/mooRainbow/images/moor_slider.png deleted file mode 100644 index 9f4c47b..0000000 Binary files a/js/mooRainbow/images/moor_slider.png and /dev/null differ diff --git a/js/mooRainbow/images/moor_woverlay.png b/js/mooRainbow/images/moor_woverlay.png deleted file mode 100644 index c3f3e96..0000000 Binary files a/js/mooRainbow/images/moor_woverlay.png and /dev/null differ diff --git a/js/mooRainbow/images/rainbow.png b/js/mooRainbow/images/rainbow.png deleted file mode 100644 index a62ec90..0000000 Binary files a/js/mooRainbow/images/rainbow.png and /dev/null differ diff --git a/js/mooRainbow/mooRainbow.css b/js/mooRainbow/mooRainbow.css deleted file mode 100644 index 764664e..0000000 --- a/js/mooRainbow/mooRainbow.css +++ /dev/null @@ -1,114 +0,0 @@ -/*** - * - mooRainbow: defaultCSS - * author: w00fz <w00fzIT(a)gmail.com> - */ - -#mooRainbow { font-size: 11px; color: #000; } - -.moor-box { - width: 390px; - height: 310px; - border: 1px solid #636163; - background-color: #f9f9f9; -} -.moor-overlayBox { - width: 256px; /* Width and Height of the overlay must be setted here: default 256x256 */ - height: 256px; - margin-top: 9px; - margin-left: 9px; - border: 1px solid #000; -} -.moor-slider { - border: 1px solid #000; - margin-top: 9px; - margin-left: 280px; - width: 19px; /* if you want a bigger or smaller slider... */ - height: 256px; -} -.moor-colorBox { - border: 1px solid #000; - width: 59px; - height: 68px; - margin-top: 20px; - margin-left: 315px; -} -.moor-currentColor { /* Bottom Box Color, the backup one */ - margin-top: 55px; - margin-left: 316px; - width: 59px; - height: 34px; -} -.moor-okButton { - font-family: Tahoma; - font-weight: bold; - font-size: 11px; - margin-top: 278px; - margin-left: 8px; - background: #e6e6e6; - height: 23px; - border: 1px solid #d6d6d6; - border-left-color: #f5f5f5; - border-top-color: #f5f5f5; -} -#mooRainbow label { - font-family: mono; -} -/* Following are just <label> */ -.moor-rLabel { - margin-top: 100px; - margin-left: 315px; -} -.moor-gLabel { - margin-top: 125px; - margin-left: 315px; -} -.moor-bLabel { - margin-top: 150px; - margin-left: 315px; -} -.moor-HueLabel { - margin-top: 190px; - margin-left: 315px; -} -span.moor-ballino { /* Style hue � (degree) !! */ - margin-top: 190px; - margin-left: 370px; -} -.moor-SatuLabel { - margin-top: 215px; - margin-left: 315px; -} -.moor-BrighLabel { - margin-top: 240px; - margin-left: 315px; -} -.moor-hexLabel { - margin-top: 275px; - margin-left: 280px; -} - -/* <input> */ -.moor-rInput, .moor-gInput, .moor-bInput, .moor-HueInput, .moor-SatuInput, .moor-BrighInput { - width: 30px; -} -.moor-hexInput { - width: 55px; -} -.moor-cursor { - background-image: url(images/moor_cursor.gif); - width: 12px; - height: 12px; -} -.moor-arrows { - background-image: url(images/moor_arrows.gif); - top: 9px; - left: 270px; - width: 41px; - height: 9px; -} -.moor-chooseColor { /* Top Box Color, the choosen one */ - margin-top: 21px; - margin-left: 316px; - width: 59px; - height: 34px; -} \ No newline at end of file diff --git a/js/mooRainbow/mooRainbow.js b/js/mooRainbow/mooRainbow.js deleted file mode 100644 index c355a73..0000000 --- a/js/mooRainbow/mooRainbow.js +++ /dev/null @@ -1,563 +0,0 @@ -/*** - * MooRainbow - * - * @version 1.2b1 - * @license MIT-style license - * @author Djamil Legato (w00fz) - < w00fzIT [at] gmail.com > - * @infos http://moorainbow.woolly-sheep.net - * @copyright Author - * - * includes a fix for mootools 1.2 by Piotr Przybylski - */ - -var MooRainbow = new Class({ - Implements: [Options, Events], - options: { - id: 'mooRainbow', - prefix: 'moor-', - imgPath: 'images/', - startColor: [255, 0, 0], - wheel: false, - onComplete: Class.empty, - onChange: Class.empty, - selectText: 'Select' - }, - - initialize: function(el, options) { - this.element = $(el); if (!this.element) return; - this.setOptions(options); - - this.sliderPos = 0; - this.pickerPos = {x: 0, y: 0}; - this.backupColor = this.options.startColor; - this.currentColor = this.options.startColor; - this.sets = { - rgb: [], - hsb: [], - hex: [] - }; - this.pickerClick = this.sliderClick = false; - if (!this.layout) this.doLayout(); - this.OverlayEvents(); - this.sliderEvents(); - this.backupEvent(); - if (this.options.wheel) this.wheelEvents(); - this.element.addEvent('click', function(e) { this.toggle(e); }.bind(this)); - - this.layout.overlay.setStyle('background-color', this.options.startColor.rgbToHex()); - this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex()); - - this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w; - this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h; - - this.manualSet(this.options.startColor); - - this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w; - this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h; - this.sliderPos = this.snippet('arrPos') - this.snippet('arrSize', 'int'); - - if (Browser.Engine.webkit) this.hide(); - }, - - toggle: function() { - this[this.visible ? 'hide' : 'show']() - }, - - show: function() { - this.rePosition(); - this.layout.setStyle('display', 'block'); - this.visible = true; - }, - - hide: function() { - this.layout.setStyles({'display': 'none'}); - this.visible = false; - }, - - manualSet: function(color, type) { - if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb'; - var rgb, hsb, hex; - - if (type == 'rgb') { rgb = color; hsb = color.rgbToHsb(); hex = color.rgbToHex(); } - else if (type == 'hsb') { hsb = color; rgb = color.hsbToRgb(); hex = rgb.rgbToHex(); } - else { hex = color; rgb = color.hexToRgb(true); hsb = rgb.rgbToHsb(); } - - this.setMooRainbow(rgb); - this.autoSet(hsb); - }, - - autoSet: function(hsb) { - var curH = this.snippet('curSize', 'int').h; - var curW = this.snippet('curSize', 'int').w; - var oveH = this.layout.overlay.height; - var oveW = this.layout.overlay.width; - var sliH = this.layout.slider.height; - var arwH = this.snippet('arrSize', 'int'); - var hue; - - var posx = Math.round(((oveW * hsb[1]) / 100) - curW); - var posy = Math.round(- ((oveH * hsb[2]) / 100) + oveH - curH); - - var c = Math.round(((sliH * hsb[0]) / 360)); c = (c == 360) ? 0 : c; - var position = sliH - c + this.snippet('slider') - arwH; - hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex(); - - this.layout.cursor.setStyles({'top': posy, 'left': posx}); - this.layout.arrows.setStyle('top', position); - this.layout.overlay.setStyle('background-color', hue); - this.sliderPos = this.snippet('arrPos') - arwH; - this.pickerPos.x = this.snippet('curPos').l + curW; - this.pickerPos.y = this.snippet('curPos').t + curH; - }, - - setMooRainbow: function(color, type) { - if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb'; - var rgb, hsb, hex; - - if (type == 'rgb') { rgb = color; hsb = color.rgbToHsb(); hex = color.rgbToHex(); } - else if (type == 'hsb') { hsb = color; rgb = color.hsbToRgb(); hex = rgb.rgbToHex(); } - else { hex = color; rgb = color.hexToRgb(); hsb = rgb.rgbToHsb(); } - - this.sets = { - rgb: rgb, - hsb: hsb, - hex: hex - }; - - if (!$chk(this.pickerPos.x)) - this.autoSet(hsb); - - this.RedInput.value = rgb[0]; - this.GreenInput.value = rgb[1]; - this.BlueInput.value = rgb[2]; - this.HueInput.value = hsb[0]; - this.SatuInput.value = hsb[1]; - this.BrighInput.value = hsb[2]; - this.hexInput.value = hex; - - this.currentColor = rgb; - - this.chooseColor.setStyle('background-color', rgb.rgbToHex()); - }, - - parseColors: function(x, y, z) { - var s = Math.round((x * 100) / this.layout.overlay.width); - var b = 100 - Math.round((y * 100) / this.layout.overlay.height); - var h = 360 - Math.round((z * 360) / this.layout.slider.height) + this.snippet('slider') - this.snippet('arrSize', 'int'); - h -= this.snippet('arrSize', 'int'); - h = (h >= 360) ? 0 : (h < 0) ? 0 : h; - s = (s > 100) ? 100 : (s < 0) ? 0 : s; - b = (b > 100) ? 100 : (b < 0) ? 0 : b; - - return [h, s, b]; - }, - - OverlayEvents: function() { - var lim, curH, curW, inputs; - curH = this.snippet('curSize', 'int').h; - curW = this.snippet('curSize', 'int').w; - inputs = $A(this.arrRGB).concat(this.arrHSB, this.hexInput); - - document.addEvent('click', function() { - if(this.visible) this.hide(this.layout); - }.bind(this)); - - inputs.each(function(el) { - if(el) { - el.addEvent('keydown', this.eventKeydown.bindWithEvent(this, el)); - el.addEvent('keyup', this.eventKeyup.bindWithEvent(this, el)); - } - }, this); - [this.element, this.layout].each(function(el) { - el.addEvents({ - 'click': function(e) { new Event(e).stop();}, - 'keyup': function(e) { - e = new Event(e); - if(e.key == 'esc' && this.visible) this.hide(this.layout); - }.bind(this) - }, this); - }, this); - - lim = { - x: [0 - curW, (this.layout.overlay.width - curW)], - y: [0 - curH, (this.layout.overlay.height - curH)] - }; - - this.layout.drag = new Drag(this.layout.cursor, { - limit: lim, - onStart: this.overlayDrag.bind(this), - onDrag: this.overlayDrag.bind(this), - snap: 0 - }); - - this.layout.overlay2.addEvent('mousedown', function(e){ - e = new Event(e); - this.layout.cursor.setStyles({ - 'top': e.page.y - this.layout.overlay.getPosition().y - curH, - 'left': e.page.x - this.layout.overlay.getPosition().x - curW - }); - this.overlayDrag(); - this.layout.drag.start(e); - }.bind(this)); - - this.okButton.addEvent('click', function() { - if(this.currentColor == this.options.startColor) { - this.hide(); - this.fireEvent('onComplete', [this.sets, this]); - } - else { - this.backupColor = this.currentColor; - this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex()); - this.hide(); - this.fireEvent('onComplete', [this.sets, this]); - } - }.bind(this)); - }, - - overlayDrag: function() { - var curH = this.snippet('curSize', 'int').h; - var curW = this.snippet('curSize', 'int').w; - this.pickerPos.x = this.snippet('curPos').l + curW; - this.pickerPos.y = this.snippet('curPos').t + curH; - - this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb'); - this.fireEvent('onChange', [this.sets, this]); - }, - - sliderEvents: function() { - var arwH = this.snippet('arrSize', 'int'), lim; - - lim = [0 + this.snippet('slider') - arwH, this.layout.slider.height - arwH + this.snippet('slider')]; - this.layout.sliderDrag = new Drag(this.layout.arrows, { - limit: {y: lim}, - modifiers: {x: false}, - onStart: this.sliderDrag.bind(this), - onDrag: this.sliderDrag.bind(this), - snap: 0 - }); - - this.layout.slider.addEvent('mousedown', function(e){ - e = new Event(e); - - this.layout.arrows.setStyle( - 'top', e.page.y - this.layout.slider.getPosition().y + this.snippet('slider') - arwH - ); - this.sliderDrag(); - this.layout.sliderDrag.start(e); - }.bind(this)); - }, - - sliderDrag: function() { - var arwH = this.snippet('arrSize', 'int'), hue; - - this.sliderPos = this.snippet('arrPos') - arwH; - this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb'); - hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex(); - this.layout.overlay.setStyle('background-color', hue); - this.fireEvent('onChange', [this.sets, this]); - }, - - backupEvent: function() { - this.layout.backup.addEvent('click', function() { - this.manualSet(this.backupColor); - this.fireEvent('onChange', [this.sets, this]); - }.bind(this)); - }, - - wheelEvents: function() { - var arrColors = $A(this.arrRGB).extend(this.arrHSB); - - arrColors.each(function(el) { - el.addEvents({ - 'mousewheel': this.eventKeys.bindWithEvent(this, el), - 'keydown': this.eventKeys.bindWithEvent(this, el) - }); - }, this); - - [this.layout.arrows, this.layout.slider].each(function(el) { - el.addEvents({ - 'mousewheel': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider']), - 'keydown': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider']) - }); - }, this); - }, - - eventKeys: function(e, el, id) { - var wheel, type; - id = (!id) ? el.id : this.arrHSB[0]; - - if (e.type == 'keydown') { - if (e.key == 'up') wheel = 1; - else if (e.key == 'down') wheel = -1; - else return; - } else if (e.type == Element.Events.mousewheel.base) wheel = (e.wheel > 0) ? 1 : -1; - - if (this.arrRGB.contains(el)) type = 'rgb'; - else if (this.arrHSB.contains(el)) type = 'hsb'; - else type = 'hsb'; - - if (type == 'rgb') { - var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass; - var value = (el.value.toInt() || 0) + wheel; - value = (value > 255) ? 255 : (value < 0) ? 0 : value; - - switch(el.className) { - case prefix + 'rInput': pass = [value, rgb[1], rgb[2]]; break; - case prefix + 'gInput': pass = [rgb[0], value, rgb[2]]; break; - case prefix + 'bInput': pass = [rgb[0], rgb[1], value]; break; - default : pass = rgb; - } - this.manualSet(pass); - this.fireEvent('onChange', [this.sets, this]); - } else { - var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass; - var value = (el.value.toInt() || 0) + wheel; - - if (el.className.test(/(HueInput)/)) value = (value > 359) ? 0 : (value < 0) ? 0 : value; - else value = (value > 100) ? 100 : (value < 0) ? 0 : value; - - switch(el.className) { - case prefix + 'HueInput': pass = [value, hsb[1], hsb[2]]; break; - case prefix + 'SatuInput': pass = [hsb[0], value, hsb[2]]; break; - case prefix + 'BrighInput': pass = [hsb[0], hsb[1], value]; break; - default : pass = hsb; - } - - this.manualSet(pass, 'hsb'); - this.fireEvent('onChange', [this.sets, this]); - } - e.stop(); - }, - - eventKeydown: function(e, el) { - var n = e.code, k = e.key; - - if ((!el.className.test(/hexInput/) && !(n >= 48 && n <= 57)) && - (k!='backspace' && k!='tab' && k !='delete' && k!='left' && k!='right')) - e.stop(); - }, - - eventKeyup: function(e, el) { - var n = e.code, k = e.key, pass, prefix, chr = el.value.charAt(0); - - if (!$chk(el.value)) return; - if (el.className.test(/hexInput/)) { - if (chr != "#" && el.value.length != 6) return; - if (chr == '#' && el.value.length != 7) return; - } else { - if (!(n >= 48 && n <= 57) && (!['backspace', 'tab', 'delete', 'left', 'right'].contains(k)) && el.value.length > 3) return; - } - - prefix = this.options.prefix; - - if (el.className.test(/(rInput|gInput|bInput)/)) { - if (el.value < 0 || el.value > 255) return; - switch(el.className){ - case prefix + 'rInput': pass = [el.value, this.sets.rgb[1], this.sets.rgb[2]]; break; - case prefix + 'gInput': pass = [this.sets.rgb[0], el.value, this.sets.rgb[2]]; break; - case prefix + 'bInput': pass = [this.sets.rgb[0], this.sets.rgb[1], el.value]; break; - default : pass = this.sets.rgb; - } - this.manualSet(pass); - this.fireEvent('onChange', [this.sets, this]); - } - else if (!el.className.test(/hexInput/)) { - if (el.className.test(/HueInput/) && el.value < 0 || el.value > 360) return; - else if (el.className.test(/HueInput/) && el.value == 360) el.value = 0; - else if (el.className.test(/(SatuInput|BrighInput)/) && el.value < 0 || el.value > 100) return; - switch(el.className){ - case prefix + 'HueInput': pass = [el.value, this.sets.hsb[1], this.sets.hsb[2]]; break; - case prefix + 'SatuInput': pass = [this.sets.hsb[0], el.value, this.sets.hsb[2]]; break; - case prefix + 'BrighInput': pass = [this.sets.hsb[0], this.sets.hsb[1], el.value]; break; - default : pass = this.sets.hsb; - } - this.manualSet(pass, 'hsb'); - this.fireEvent('onChange', [this.sets, this]); - } else { - pass = el.value.hexToRgb(true); - if (isNaN(pass[0])||isNaN(pass[1])||isNaN(pass[2])) return; - - if ($chk(pass)) { - this.manualSet(pass); - this.fireEvent('onChange', [this.sets, this]); - } - } - - }, - - doLayout: function() { - var id = this.options.id, prefix = this.options.prefix; - var idPrefix = id + ' .' + prefix; - - this.layout = new Element('div', { - 'styles': {'display': 'block', 'position': 'absolute'}, - 'id': id - }).inject(document.body); - - var box = new Element('div', { - 'styles': {'position': 'relative'}, - 'class': prefix + 'box' - }).inject(this.layout); - - var div = new Element('div', { - 'styles': {'position': 'absolute', 'overflow': 'hidden'}, - 'class': prefix + 'overlayBox' - }).inject(box); - - var ar = new Element('div', { - 'styles': {'position': 'absolute', 'zIndex': 1}, - 'class': prefix + 'arrows' - }).inject(box); - ar.width = ar.getStyle('width').toInt(); - ar.height = ar.getStyle('height').toInt(); - - var ov = new Element('img', { - 'styles': {'background-color': '#fff', 'position': 'relative', 'zIndex': 2}, - 'src': this.options.imgPath + 'moor_woverlay.png', - 'class': prefix + 'overlay' - }).inject(div); - - var ov2 = new Element('img', { - 'styles': {'position': 'absolute', 'top': 0, 'left': 0, 'zIndex': 2}, - 'src': this.options.imgPath + 'moor_boverlay.png', - 'class': prefix + 'overlay' - }).inject(div); - - if (Browser.Engine.trident4) { - div.setStyle('overflow', ''); - var src = ov.src; - ov.src = this.options.imgPath + 'blank.gif'; - ov.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')"; - src = ov2.src; - ov2.src = this.options.imgPath + 'blank.gif'; - ov2.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')"; - } - ov.width = ov2.width = div.getStyle('width').toInt(); - ov.height = ov2.height = div.getStyle('height').toInt(); - - var cr = new Element('div', { - 'styles': {'overflow': 'hidden', 'position': 'absolute', 'zIndex': 2}, - 'class': prefix + 'cursor' - }).inject(div); - cr.width = cr.getStyle('width').toInt(); - cr.height = cr.getStyle('height').toInt(); - - var sl = new Element('img', { - 'styles': {'position': 'absolute', 'z-index': 2}, - 'src': this.options.imgPath + 'moor_slider.png', - 'class': prefix + 'slider' - }).inject(box); - this.layout.slider = sl; - sl.width = sl.getStyle('width').toInt(); - sl.height = sl.getStyle('height').toInt(); - - new Element('div', { - 'styles': {'position': 'absolute'}, - 'class': prefix + 'colorBox' - }).inject(box); - - new Element('div', { - 'styles': {'zIndex': 2, 'position': 'absolute'}, - 'class': prefix + 'chooseColor' - }).inject(box); - - this.layout.backup = new Element('div', { - 'styles': {'zIndex': 2, 'position': 'absolute', 'cursor': 'pointer'}, - 'class': prefix + 'currentColor' - }).inject(box); - - var R = new Element('label').inject(box).setStyle('position', 'absolute'); - var G = R.clone().inject(box).addClass(prefix + 'gLabel').set('html', 'G: '); - var B = R.clone().inject(box).addClass(prefix + 'bLabel').set('html', 'B: '); - R.set('html', 'R: ').addClass(prefix + 'rLabel'); - - var inputR = new Element('input'); - var inputG = inputR.clone().inject(G).addClass(prefix + 'gInput'); - var inputB = inputR.clone().inject(B).addClass(prefix + 'bInput'); - inputR.inject(R).addClass(prefix + 'rInput'); - - var HU = new Element('label').inject(box).setStyle('position', 'absolute'); - var SA = HU.clone().inject(box).addClass(prefix + 'SatuLabel').set('html', 'S: '); - var BR = HU.clone().inject(box).addClass(prefix + 'BrighLabel').set('html', 'B: '); - HU.set('html', 'H: ').addClass(prefix + 'HueLabel'); - - var inputHU = new Element('input'); - var inputSA = inputHU.clone().inject(SA).addClass(prefix + 'SatuInput'); - var inputBR = inputHU.clone().inject(BR).addClass(prefix + 'BrighInput'); - inputHU.inject(HU).addClass(prefix + 'HueInput'); - SA.innerHTML += " %"; BR.innerHTML += " %"; - SP = new Element('span', {'styles': {'position': 'absolute'}, 'class': prefix + 'ballino'}) - SP.innerHTML = " °" - SP.inject(HU,'after'); - - var hex = new Element('label').inject(box).setStyle('position', 'absolute').addClass(prefix + 'hexLabel').set('html', '#hex: ').adopt(new Element('input').addClass(prefix + 'hexInput')); - - var ok = new Element('input', { - 'styles': {'position': 'absolute'}, - 'type': 'button', - 'value': this.options.selectText, - 'class': prefix + 'okButton' - }).inject(box); - - this.rePosition(); - - var overlays = $$('#' + id + ' .' + prefix + 'overlay'); - this.layout.overlay = overlays[0]; - this.layout.overlay2 = overlays[1]; - this.layout.cursor = cr; - this.layout.arrows = ar; - this.chooseColor = this.layout.getElement('.' + prefix + 'chooseColor'); - this.RedInput = inputR; - this.GreenInput = inputG; - this.BlueInput = inputB; - this.HueInput = inputHU; - this.SatuInput = this.layout.getElement('.' + prefix + 'SatuInput'); - this.BrighInput = this.layout.getElement('.' + prefix + 'BrighInput'); - this.hexInput = this.layout.getElement('.' + prefix + 'hexInput');; - - this.arrRGB = [this.RedInput, this.GreenInput, this.BlueInput]; - this.arrHSB = [this.HueInput, this.SatuInput, this.BrighInput]; - this.okButton = ok; - - if (!Browser.Engine.webkit419) this.hide(); - }, - rePosition: function() { - var coords = this.element.getCoordinates(); - this.layout.setStyles({ - 'left': coords.left, - 'top': coords.top + coords.height + 1 - }); - }, - - snippet: function(mode, type) { - var size; type = (type) ? type : 'none'; - - switch(mode) { - case 'arrPos': - var t = this.layout.arrows.getStyle('top').toInt(); - size = t; - break; - case 'arrSize': - var h = this.layout.arrows.height; - h = (type == 'int') ? (h/2).toInt() : h; - size = h; - break; - case 'curPos': - var l = this.layout.cursor.getStyle('left').toInt(); - var t = this.layout.cursor.getStyle('top').toInt(); - size = {'l': l, 't': t}; - break; - case 'slider': - var t = this.layout.slider.getStyle('marginTop').toInt(); - size = t; - break; - default : - var h = this.layout.cursor.height; - var w = this.layout.cursor.width; - h = (type == 'int') ? (h/2).toInt() : h; - w = (type == 'int') ? (w/2).toInt() : w; - size = {w: w, h: h}; - }; - return size; - } -}); diff --git a/js/mootools-domready-rainbow.js b/js/mootools-domready-rainbow.js deleted file mode 100644 index 40041df..0000000 --- a/js/mootools-domready-rainbow.js +++ /dev/null @@ -1,16 +0,0 @@ -window.addEvent('domready', function() { - var r = new MooRainbow('myRainbow', { - 'startColor': [58, 142, 246], - 'imgPath': 'js/mooRainbow/images/', - 'onChange': function(color) { - top.frame_navigation.document.getElementById('body_leftFrame').style.backgroundColor = color.hex; - top.frame_navigation.document.getElementById('pmalogo').style.backgroundColor = color.hex; - top.frame_content.document.body.style.backgroundColor = color.hex; - }, - 'onComplete': function(color) { - top.frame_content.document.getElementById('rainbowform').custom_color.value = color.hex; - top.frame_content.document.getElementById('rainbowform').custom_color_rgb.value = color.rgb; - top.frame_content.document.getElementById('rainbowform').submit(); - } - }); -}); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 11c5f8b..5a4afc4 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -666,10 +666,8 @@ unset($default_server); if (isset($_REQUEST['custom_color_reset'])) { unset($_SESSION['tmp_user_values']['custom_color']); - unset($_SESSION['tmp_user_values']['custom_color_rgb']); } elseif (isset($_REQUEST['custom_color'])) { $_SESSION['tmp_user_values']['custom_color'] = $_REQUEST['custom_color']; - $_SESSION['tmp_user_values']['custom_color_rgb'] = $_REQUEST['custom_color_rgb']; } /** * @global PMA_Theme_Manager $_SESSION['PMA_Theme_Manager'] diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 5413be6..c6c6f96 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -46,11 +46,14 @@ if ($GLOBALS['text_dir'] == 'ltr') { echo 'phpMyAdmin'; } ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> -<?php if (defined('PMA_MOORAINBOW')) { ?> - <link rel="stylesheet" type="text/css" href="js/mooRainbow/mooRainbow.css" /> +<?php +// goes before our themed CSS + if (defined('PMA_COLORPICKER')) { ?> + <link rel="stylesheet" type="text/css" href="js/colorpicker/css/colorpicker.css" /> + <link rel="stylesheet" media="screen" type="text/css" href="js/colorpicker/css/layout.css" /> <?php - } + } ?> + <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" /> <meta name="robots" content="noindex,nofollow" /> diff --git a/main.php b/main.php index ef9c6b5..36a8125 100644 --- a/main.php +++ b/main.php @@ -9,11 +9,11 @@ /** * Gets some core libraries and displays a top message if required */ -define('PMA_MOORAINBOW', true); +define('PMA_COLORPICKER', true); require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'mootools-more.js'; -$GLOBALS['js_include'][] = 'mooRainbow/mooRainbow.js'; -$GLOBALS['js_include'][] = 'mootools-domready-rainbow.js'; + +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; // Handles some variables that may have been sent by the calling script $GLOBALS['db'] = ''; @@ -159,14 +159,37 @@ if ($GLOBALS['cfg']['ThemeManager']) { //<![CDATA[ document.write('<li id="li_custom_color">'); document.write('<?php echo PMA_escapeJsString($strCustomColor) . ': '; ?>'); - document.write('<img id="myRainbow" src="js/mooRainbow/images/rainbow.png" alt="[r]" width="16" height="16" />'); - document.write('<form name="rainbowform" id="rainbowform" method="post" action="index.php" target="_parent">'); + document.write('<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">'); document.write('<?php echo PMA_generate_common_hidden_inputs(); ?>'); - document.write('<input type="hidden" name="custom_color" />'); - document.write('<input type="hidden" name="custom_color_rgb" />'); + document.write('<input type="hidden" id="custom_color" name="custom_color" value="" />'); document.write('<input type="submit" name="custom_color_reset" value="<?php echo $strReset; ?>" />'); document.write('</form>'); + document.write('<div id="colorSelector">'); + document.write('</div>'); document.write('</li>'); + + $(document).ready(function() { + // Choosing another id does not work! + $('#colorSelector').ColorPicker({ + color: '#0000ff', + onShow: function (colpkr) { + $(colpkr).fadeIn(500); + return false; + }, + onHide: function (colpkr) { + $(colpkr).fadeOut(500); + return false; + }, + onChange: function(hsb, hex, rgb) { + top.frame_content.document.body.style.backgroundColor = '#' + hex; + top.frame_navigation.document.body.style.backgroundColor = '#' + hex; + }, + onSubmit: function(hsb, hex, rgb) { + $('#custom_color').val('#' + hex); + $('#colorform').submit(); + } + }); + }); //]]> </script> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-266-gb994ec6
by Marc Delisle 25 Mar '10

25 Mar '10

The branch, master has been updated via b994ec6934cef1b02d944969b05ace1f991dbaa7 (commit) from 783892518ce82c32374a6a643396244eff4c0ad3 (commit) - Log ----------------------------------------------------------------- commit b994ec6934cef1b02d944969b05ace1f991dbaa7 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Mar 25 17:03:18 2010 -0400 forgot to add this ----------------------------------------------------------------------- Summary of changes: js/colorpicker/css/colorpicker.css | 161 +++++++ js/colorpicker/css/layout.css | 218 ++++++++++ js/colorpicker/images/blank.gif | Bin 0 -> 49 bytes js/colorpicker/images/colorpicker_background.png | Bin 0 -> 1897 bytes js/colorpicker/images/colorpicker_hex.png | Bin 0 -> 532 bytes js/colorpicker/images/colorpicker_hsb_b.png | Bin 0 -> 970 bytes js/colorpicker/images/colorpicker_hsb_h.png | Bin 0 -> 1012 bytes js/colorpicker/images/colorpicker_hsb_s.png | Bin 0 -> 1171 bytes js/colorpicker/images/colorpicker_indic.gif | Bin 0 -> 86 bytes js/colorpicker/images/colorpicker_overlay.png | Bin 0 -> 10355 bytes js/colorpicker/images/colorpicker_rgb_b.png | Bin 0 -> 970 bytes js/colorpicker/images/colorpicker_rgb_g.png | Bin 0 -> 1069 bytes js/colorpicker/images/colorpicker_rgb_r.png | Bin 0 -> 1066 bytes js/colorpicker/images/colorpicker_select.gif | Bin 0 -> 78 bytes js/colorpicker/images/colorpicker_submit.png | Bin 0 -> 984 bytes js/colorpicker/images/custom_background.png | Bin 0 -> 1916 bytes js/colorpicker/images/custom_hex.png | Bin 0 -> 562 bytes js/colorpicker/images/custom_hsb_b.png | Bin 0 -> 1097 bytes js/colorpicker/images/custom_hsb_h.png | Bin 0 -> 970 bytes js/colorpicker/images/custom_hsb_s.png | Bin 0 -> 1168 bytes js/colorpicker/images/custom_indic.gif | Bin 0 -> 86 bytes js/colorpicker/images/custom_rgb_b.png | Bin 0 -> 1008 bytes js/colorpicker/images/custom_rgb_g.png | Bin 0 -> 1069 bytes js/colorpicker/images/custom_rgb_r.png | Bin 0 -> 1018 bytes js/colorpicker/images/custom_submit.png | Bin 0 -> 997 bytes js/colorpicker/images/select.png | Bin 0 -> 506 bytes js/colorpicker/images/select2.png | Bin 0 -> 518 bytes js/colorpicker/images/slider.png | Bin 0 -> 315 bytes js/colorpicker/js/colorpicker.js | 484 ++++++++++++++++++++++ 29 files changed, 863 insertions(+), 0 deletions(-) create mode 100644 js/colorpicker/css/colorpicker.css create mode 100644 js/colorpicker/css/layout.css create mode 100644 js/colorpicker/images/blank.gif create mode 100644 js/colorpicker/images/colorpicker_background.png create mode 100644 js/colorpicker/images/colorpicker_hex.png create mode 100644 js/colorpicker/images/colorpicker_hsb_b.png create mode 100644 js/colorpicker/images/colorpicker_hsb_h.png create mode 100644 js/colorpicker/images/colorpicker_hsb_s.png create mode 100644 js/colorpicker/images/colorpicker_indic.gif create mode 100644 js/colorpicker/images/colorpicker_overlay.png create mode 100644 js/colorpicker/images/colorpicker_rgb_b.png create mode 100644 js/colorpicker/images/colorpicker_rgb_g.png create mode 100644 js/colorpicker/images/colorpicker_rgb_r.png create mode 100644 js/colorpicker/images/colorpicker_select.gif create mode 100644 js/colorpicker/images/colorpicker_submit.png create mode 100644 js/colorpicker/images/custom_background.png create mode 100644 js/colorpicker/images/custom_hex.png create mode 100644 js/colorpicker/images/custom_hsb_b.png create mode 100644 js/colorpicker/images/custom_hsb_h.png create mode 100644 js/colorpicker/images/custom_hsb_s.png create mode 100644 js/colorpicker/images/custom_indic.gif create mode 100644 js/colorpicker/images/custom_rgb_b.png create mode 100644 js/colorpicker/images/custom_rgb_g.png create mode 100644 js/colorpicker/images/custom_rgb_r.png create mode 100644 js/colorpicker/images/custom_submit.png create mode 100644 js/colorpicker/images/select.png create mode 100644 js/colorpicker/images/select2.png create mode 100644 js/colorpicker/images/slider.png create mode 100644 js/colorpicker/js/colorpicker.js diff --git a/js/colorpicker/css/colorpicker.css b/js/colorpicker/css/colorpicker.css new file mode 100644 index 0000000..05b02b4 --- /dev/null +++ b/js/colorpicker/css/colorpicker.css @@ -0,0 +1,161 @@ +.colorpicker { + width: 356px; + height: 176px; + overflow: hidden; + position: absolute; + background: url(../images/colorpicker_background.png); + font-family: Arial, Helvetica, sans-serif; + display: none; +} +.colorpicker_color { + width: 150px; + height: 150px; + left: 14px; + top: 13px; + position: absolute; + background: #f00; + overflow: hidden; + cursor: crosshair; +} +.colorpicker_color div { + position: absolute; + top: 0; + left: 0; + width: 150px; + height: 150px; + background: url(../images/colorpicker_overlay.png); +} +.colorpicker_color div div { + position: absolute; + top: 0; + left: 0; + width: 11px; + height: 11px; + overflow: hidden; + background: url(../images/colorpicker_select.gif); + margin: -5px 0 0 -5px; +} +.colorpicker_hue { + position: absolute; + top: 13px; + left: 171px; + width: 35px; + height: 150px; + cursor: n-resize; +} +.colorpicker_hue div { + position: absolute; + width: 35px; + height: 9px; + overflow: hidden; + background: url(../images/colorpicker_indic.gif) left top; + margin: -4px 0 0 0; + left: 0px; +} +.colorpicker_new_color { + position: absolute; + width: 60px; + height: 30px; + left: 213px; + top: 13px; + background: #f00; +} +.colorpicker_current_color { + position: absolute; + width: 60px; + height: 30px; + left: 283px; + top: 13px; + background: #f00; +} +.colorpicker input { + background-color: transparent; + border: 1px solid transparent; + position: absolute; + font-size: 10px; + font-family: Arial, Helvetica, sans-serif; + color: #898989; + top: 4px; + right: 11px; + text-align: right; + margin: 0; + padding: 0; + height: 11px; +} +.colorpicker_hex { + position: absolute; + width: 72px; + height: 22px; + background: url(../images/colorpicker_hex.png) top; + left: 212px; + top: 142px; +} +.colorpicker_hex input { + right: 6px; +} +.colorpicker_field { + height: 22px; + width: 62px; + background-position: top; + position: absolute; +} +.colorpicker_field span { + position: absolute; + width: 12px; + height: 22px; + overflow: hidden; + top: 0; + right: 0; + cursor: n-resize; +} +.colorpicker_rgb_r { + background-image: url(../images/colorpicker_rgb_r.png); + top: 52px; + left: 212px; +} +.colorpicker_rgb_g { + background-image: url(../images/colorpicker_rgb_g.png); + top: 82px; + left: 212px; +} +.colorpicker_rgb_b { + background-image: url(../images/colorpicker_rgb_b.png); + top: 112px; + left: 212px; +} +.colorpicker_hsb_h { + background-image: url(../images/colorpicker_hsb_h.png); + top: 52px; + left: 282px; +} +.colorpicker_hsb_s { + background-image: url(../images/colorpicker_hsb_s.png); + top: 82px; + left: 282px; +} +.colorpicker_hsb_b { + background-image: url(../images/colorpicker_hsb_b.png); + top: 112px; + left: 282px; +} +.colorpicker_submit { + position: absolute; + width: 22px; + height: 22px; + background: url(../images/colorpicker_submit.png) top; + left: 322px; + top: 142px; + overflow: hidden; +} +.colorpicker_focus { + background-position: center; +} +.colorpicker_hex.colorpicker_focus { + background-position: bottom; +} +.colorpicker_submit.colorpicker_focus { + background-position: bottom; +} +.colorpicker_slider { + background-position: bottom; +} diff --git a/js/colorpicker/css/layout.css b/js/colorpicker/css/layout.css new file mode 100644 index 0000000..396e671 --- /dev/null +++ b/js/colorpicker/css/layout.css @@ -0,0 +1,218 @@ +/*body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { + margin:0; + padding:0; +} +table { + border-collapse:collapse; + border-spacing:0; +} +fieldset,img { + border:0; +} +address,caption,cite,code,dfn,em,strong,th,var { + font-style:normal; + font-weight:normal; +} +ol,ul { + list-style:none; +} +caption,th { + text-align:left; +} +h1,h2,h3,h4,h5,h6 { + font-size:100%; + font-weight:normal; +} +q:before,q:after { + content:''; +} +abbr,acronym { border:0; +} +html, body { + background-color: #fff; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #52697E; +} +body { + text-align: center; + overflow: auto; +} +.wrapper { + width: 700px; + margin: 0 auto; + text-align: left; +} +h1 { + font-size: 21px; + height: 47px; + line-height: 47px; + text-transform: uppercase; +} +.navigationTabs { + height: 23px; + line-height: 23px; + border-bottom: 1px solid #ccc; +} +.navigationTabs li { + float: left; + height: 23px; + line-height: 23px; + padding-right: 3px; +} +.navigationTabs li a{ + float: left; + dispaly: block; + height: 23px; + line-height: 23px; + padding: 0 10px; + overflow: hidden; + color: #52697E; + background-color: #eee; + position: relative; + text-decoration: none; +} +.navigationTabs li a:hover { + background-color: #f0f0f0; +} +.navigationTabs li a.active { + background-color: #fff; + border: 1px solid #ccc; + border-bottom: 0px solid; +} +.tabsContent { + border: 1px solid #ccc; + border-top: 0px solid; + width: 698px; + overflow: hidden; +} +.tab { + padding: 16px; + display: none; +} +.tab h2 { + font-weight: bold; + font-size: 16px; +} +.tab h3 { + font-weight: bold; + font-size: 14px; + margin-top: 20px; +} +.tab p { + margin-top: 16px; + clear: both; +} +.tab ul { + margin-top: 16px; + list-style: disc; +} +.tab li { + margin: 10px 0 0 35px; +} +.tab a { + color: #8FB0CF; +} +.tab strong { + font-weight: bold; +} +.tab pre { + font-size: 11px; + margin-top: 20px; + width: 668px; + overflow: auto; + clear: both; +} +.tab table { + width: 100%; +} +.tab table td { + padding: 6px 10px 6px 0; + vertical-align: top; +} +.tab dt { + margin-top: 16px; +} +*/ +#colorSelector { + position: relative; + width: 36px; + height: 36px; + background: url(../images/select.png); +} +#colorSelector div { + position: absolute; + top: 3px; + left: 3px; + width: 30px; + height: 30px; + background: url(../images/select.png) center; +} +#colorSelector2 { + position: absolute; + top: 0; + left: 0; + width: 36px; + height: 36px; + background: url(../images/select2.png); +} +#colorSelector2 div { + position: absolute; + top: 4px; + left: 4px; + width: 28px; + height: 28px; + background: url(../images/select2.png) center; +} +#colorpickerHolder2 { + top: 32px; + left: 0; + width: 356px; + height: 0; + overflow: hidden; + position: absolute; +} +#colorpickerHolder2 .colorpicker { + background-image: url(../images/custom_background.png); + position: absolute; + bottom: 0; + left: 0; +} +#colorpickerHolder2 .colorpicker_hue div { + background-image: url(../images/custom_indic.gif); +} +#colorpickerHolder2 .colorpicker_hex { + background-image: url(../images/custom_hex.png); +} +#colorpickerHolder2 .colorpicker_rgb_r { + background-image: url(../images/custom_rgb_r.png); +} +#colorpickerHolder2 .colorpicker_rgb_g { + background-image: url(../images/custom_rgb_g.png); +} +#colorpickerHolder2 .colorpicker_rgb_b { + background-image: url(../images/custom_rgb_b.png); +} +#colorpickerHolder2 .colorpicker_hsb_s { + background-image: url(../images/custom_hsb_s.png); + display: none; +} +#colorpickerHolder2 .colorpicker_hsb_h { + background-image: url(../images/custom_hsb_h.png); + display: none; +} +#colorpickerHolder2 .colorpicker_hsb_b { + background-image: url(../images/custom_hsb_b.png); + display: none; +} +#colorpickerHolder2 .colorpicker_submit { + background-image: url(../images/custom_submit.png); +} +#colorpickerHolder2 .colorpicker input { + color: #778398; +} +#customWidget { + position: relative; + height: 36px; +} diff --git a/js/colorpicker/images/blank.gif b/js/colorpicker/images/blank.gif new file mode 100644 index 0000000..75b945d Binary files /dev/null and b/js/colorpicker/images/blank.gif differ diff --git a/js/colorpicker/images/colorpicker_background.png b/js/colorpicker/images/colorpicker_background.png new file mode 100644 index 0000000..8401572 Binary files /dev/null and b/js/colorpicker/images/colorpicker_background.png differ diff --git a/js/colorpicker/images/colorpicker_hex.png b/js/colorpicker/images/colorpicker_hex.png new file mode 100644 index 0000000..4e532d7 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hex.png differ diff --git a/js/colorpicker/images/colorpicker_hsb_b.png b/js/colorpicker/images/colorpicker_hsb_b.png new file mode 100644 index 0000000..dfac595 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hsb_b.png differ diff --git a/js/colorpicker/images/colorpicker_hsb_h.png b/js/colorpicker/images/colorpicker_hsb_h.png new file mode 100644 index 0000000..3977ed9 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hsb_h.png differ diff --git a/js/colorpicker/images/colorpicker_hsb_s.png b/js/colorpicker/images/colorpicker_hsb_s.png new file mode 100644 index 0000000..a2a6997 Binary files /dev/null and b/js/colorpicker/images/colorpicker_hsb_s.png differ diff --git a/js/colorpicker/images/colorpicker_indic.gif b/js/colorpicker/images/colorpicker_indic.gif new file mode 100644 index 0000000..f9fa95e Binary files /dev/null and b/js/colorpicker/images/colorpicker_indic.gif differ diff --git a/js/colorpicker/images/colorpicker_overlay.png b/js/colorpicker/images/colorpicker_overlay.png new file mode 100644 index 0000000..561cdd9 Binary files /dev/null and b/js/colorpicker/images/colorpicker_overlay.png differ diff --git a/js/colorpicker/images/colorpicker_rgb_b.png b/js/colorpicker/images/colorpicker_rgb_b.png new file mode 100644 index 0000000..dfac595 Binary files /dev/null and b/js/colorpicker/images/colorpicker_rgb_b.png differ diff --git a/js/colorpicker/images/colorpicker_rgb_g.png b/js/colorpicker/images/colorpicker_rgb_g.png new file mode 100644 index 0000000..72b3276 Binary files /dev/null and b/js/colorpicker/images/colorpicker_rgb_g.png differ diff --git a/js/colorpicker/images/colorpicker_rgb_r.png b/js/colorpicker/images/colorpicker_rgb_r.png new file mode 100644 index 0000000..4855fe0 Binary files /dev/null and b/js/colorpicker/images/colorpicker_rgb_r.png differ diff --git a/js/colorpicker/images/colorpicker_select.gif b/js/colorpicker/images/colorpicker_select.gif new file mode 100644 index 0000000..599f7f1 Binary files /dev/null and b/js/colorpicker/images/colorpicker_select.gif differ diff --git a/js/colorpicker/images/colorpicker_submit.png b/js/colorpicker/images/colorpicker_submit.png new file mode 100644 index 0000000..7f4c082 Binary files /dev/null and b/js/colorpicker/images/colorpicker_submit.png differ diff --git a/js/colorpicker/images/custom_background.png b/js/colorpicker/images/custom_background.png new file mode 100644 index 0000000..cf55ffd Binary files /dev/null and b/js/colorpicker/images/custom_background.png differ diff --git a/js/colorpicker/images/custom_hex.png b/js/colorpicker/images/custom_hex.png new file mode 100644 index 0000000..888f444 Binary files /dev/null and b/js/colorpicker/images/custom_hex.png differ diff --git a/js/colorpicker/images/custom_hsb_b.png b/js/colorpicker/images/custom_hsb_b.png new file mode 100644 index 0000000..2f99dae Binary files /dev/null and b/js/colorpicker/images/custom_hsb_b.png differ diff --git a/js/colorpicker/images/custom_hsb_h.png b/js/colorpicker/images/custom_hsb_h.png new file mode 100644 index 0000000..a217e92 Binary files /dev/null and b/js/colorpicker/images/custom_hsb_h.png differ diff --git a/js/colorpicker/images/custom_hsb_s.png b/js/colorpicker/images/custom_hsb_s.png new file mode 100644 index 0000000..7826b41 Binary files /dev/null and b/js/colorpicker/images/custom_hsb_s.png differ diff --git a/js/colorpicker/images/custom_indic.gif b/js/colorpicker/images/custom_indic.gif new file mode 100644 index 0000000..222fb94 Binary files /dev/null and b/js/colorpicker/images/custom_indic.gif differ diff --git a/js/colorpicker/images/custom_rgb_b.png b/js/colorpicker/images/custom_rgb_b.png new file mode 100644 index 0000000..80764e5 Binary files /dev/null and b/js/colorpicker/images/custom_rgb_b.png differ diff --git a/js/colorpicker/images/custom_rgb_g.png b/js/colorpicker/images/custom_rgb_g.png new file mode 100644 index 0000000..fc9778b Binary files /dev/null and b/js/colorpicker/images/custom_rgb_g.png differ diff --git a/js/colorpicker/images/custom_rgb_r.png b/js/colorpicker/images/custom_rgb_r.png new file mode 100644 index 0000000..91b0cd4 Binary files /dev/null and b/js/colorpicker/images/custom_rgb_r.png differ diff --git a/js/colorpicker/images/custom_submit.png b/js/colorpicker/images/custom_submit.png new file mode 100644 index 0000000..cd202cd Binary files /dev/null and b/js/colorpicker/images/custom_submit.png differ diff --git a/js/colorpicker/images/select.png b/js/colorpicker/images/select.png new file mode 100644 index 0000000..21213bf Binary files /dev/null and b/js/colorpicker/images/select.png differ diff --git a/js/colorpicker/images/select2.png b/js/colorpicker/images/select2.png new file mode 100644 index 0000000..2cd2cab Binary files /dev/null and b/js/colorpicker/images/select2.png differ diff --git a/js/colorpicker/images/slider.png b/js/colorpicker/images/slider.png new file mode 100644 index 0000000..8b03da9 Binary files /dev/null and b/js/colorpicker/images/slider.png differ diff --git a/js/colorpicker/js/colorpicker.js b/js/colorpicker/js/colorpicker.js new file mode 100644 index 0000000..10a2b22 --- /dev/null +++ b/js/colorpicker/js/colorpicker.js @@ -0,0 +1,484 @@ +/** + * + * Color picker + * Author: Stefan Petre www.eyecon.ro + * + * Dual licensed under the MIT and GPL licenses + * + */ +(function ($) { + var ColorPicker = function () { + var + ids = {}, + inAction, + charMin = 65, + visible, + tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>', + defaults = { + eventName: 'click', + onShow: function () {}, + onBeforeShow: function(){}, + onHide: function () {}, + onChange: function () {}, + onSubmit: function () {}, + color: 'ff0000', + livePreview: true, + flat: false + }, + fillRGBFields = function (hsb, cal) { + var rgb = HSBToRGB(hsb); + $(cal).data('colorpicker').fields + .eq(1).val(rgb.r).end() + .eq(2).val(rgb.g).end() + .eq(3).val(rgb.b).end(); + }, + fillHSBFields = function (hsb, cal) { + $(cal).data('colorpicker').fields + .eq(4).val(hsb.h).end() + .eq(5).val(hsb.s).end() + .eq(6).val(hsb.b).end(); + }, + fillHexFields = function (hsb, cal) { + $(cal).data('colorpicker').fields + .eq(0).val(HSBToHex(hsb)).end(); + }, + setSelector = function (hsb, cal) { + $(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100})); + $(cal).data('colorpicker').selectorIndic.css({ + left: parseInt(150 * hsb.s/100, 10), + top: parseInt(150 * (100-hsb.b)/100, 10) + }); + }, + setHue = function (hsb, cal) { + $(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10)); + }, + setCurrentColor = function (hsb, cal) { + $(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb)); + }, + setNewColor = function (hsb, cal) { + $(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb)); + }, + keyDown = function (ev) { + var pressedKey = ev.charCode || ev.keyCode || -1; + if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) { + return false; + } + var cal = $(this).parent().parent(); + if (cal.data('colorpicker').livePreview === true) { + change.apply(this); + } + }, + change = function (ev) { + var cal = $(this).parent().parent(), col; + if (this.parentNode.className.indexOf('_hex') > 0) { + cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value)); + } else if (this.parentNode.className.indexOf('_hsb') > 0) { + cal.data('colorpicker').color = col = fixHSB({ + h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10), + s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10), + b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10) + }); + } else { + cal.data('colorpicker').color = col = RGBToHSB(fixRGB({ + r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10), + g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10), + b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10) + })); + } + if (ev) { + fillRGBFields(col, cal.get(0)); + fillHexFields(col, cal.get(0)); + fillHSBFields(col, cal.get(0)); + } + setSelector(col, cal.get(0)); + setHue(col, cal.get(0)); + setNewColor(col, cal.get(0)); + cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]); + }, + blur = function (ev) { + var cal = $(this).parent().parent(); + cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus'); + }, + focus = function () { + charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65; + $(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus'); + $(this).parent().addClass('colorpicker_focus'); + }, + downIncrement = function (ev) { + var field = $(this).parent().find('input').focus(); + var current = { + el: $(this).parent().addClass('colorpicker_slider'), + max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255), + y: ev.pageY, + field: field, + val: parseInt(field.val(), 10), + preview: $(this).parent().parent().data('colorpicker').livePreview + }; + $(document).bind('mouseup', current, upIncrement); + $(document).bind('mousemove', current, moveIncrement); + }, + moveIncrement = function (ev) { + ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10)))); + if (ev.data.preview) { + change.apply(ev.data.field.get(0), [true]); + } + return false; + }, + upIncrement = function (ev) { + change.apply(ev.data.field.get(0), [true]); + ev.data.el.removeClass('colorpicker_slider').find('input').focus(); + $(document).unbind('mouseup', upIncrement); + $(document).unbind('mousemove', moveIncrement); + return false; + }, + downHue = function (ev) { + var current = { + cal: $(this).parent(), + y: $(this).offset().top + }; + current.preview = current.cal.data('colorpicker').livePreview; + $(document).bind('mouseup', current, upHue); + $(document).bind('mousemove', current, moveHue); + }, + moveHue = function (ev) { + change.apply( + ev.data.cal.data('colorpicker') + .fields + .eq(4) + .val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10)) + .get(0), + [ev.data.preview] + ); + return false; + }, + upHue = function (ev) { + fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + $(document).unbind('mouseup', upHue); + $(document).unbind('mousemove', moveHue); + return false; + }, + downSelector = function (ev) { + var current = { + cal: $(this).parent(), + pos: $(this).offset() + }; + current.preview = current.cal.data('colorpicker').livePreview; + $(document).bind('mouseup', current, upSelector); + $(document).bind('mousemove', current, moveSelector); + }, + moveSelector = function (ev) { + change.apply( + ev.data.cal.data('colorpicker') + .fields + .eq(6) + .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10)) + .end() + .eq(5) + .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10)) + .get(0), + [ev.data.preview] + ); + return false; + }, + upSelector = function (ev) { + fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); + $(document).unbind('mouseup', upSelector); + $(document).unbind('mousemove', moveSelector); + return false; + }, + enterSubmit = function (ev) { + $(this).addClass('colorpicker_focus'); + }, + leaveSubmit = function (ev) { + $(this).removeClass('colorpicker_focus'); + }, + clickSubmit = function (ev) { + var cal = $(this).parent(); + var col = cal.data('colorpicker').color; + cal.data('colorpicker').origColor = col; + setCurrentColor(col, cal.get(0)); + cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); + }, + show = function (ev) { + var cal = $('#' + $(this).data('colorpickerId')); + cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]); + var pos = $(this).offset(); + var viewPort = getViewport(); + var top = pos.top + this.offsetHeight; + var left = pos.left; + if (top + 176 > viewPort.t + viewPort.h) { + top -= this.offsetHeight + 176; + } + if (left + 356 > viewPort.l + viewPort.w) { + left -= 356; + } + cal.css({left: left + 'px', top: top + 'px'}); + if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) { + cal.show(); + } + $(document).bind('mousedown', {cal: cal}, hide); + return false; + }, + hide = function (ev) { + if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) { + if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) { + ev.data.cal.hide(); + } + $(document).unbind('mousedown', hide); + } + }, + isChildOf = function(parentEl, el, container) { + if (parentEl == el) { + return true; + } + if (parentEl.contains) { + return parentEl.contains(el); + } + if ( parentEl.compareDocumentPosition ) { + return !!(parentEl.compareDocumentPosition(el) & 16); + } + var prEl = el.parentNode; + while(prEl && prEl != container) { + if (prEl == parentEl) + return true; + prEl = prEl.parentNode; + } + return false; + }, + getViewport = function () { + var m = document.compatMode == 'CSS1Compat'; + return { + l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft), + t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop), + w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth), + h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight) + }; + }, + fixHSB = function (hsb) { + return { + h: Math.min(360, Math.max(0, hsb.h)), + s: Math.min(100, Math.max(0, hsb.s)), + b: Math.min(100, Math.max(0, hsb.b)) + }; + }, + fixRGB = function (rgb) { + return { + r: Math.min(255, Math.max(0, rgb.r)), + g: Math.min(255, Math.max(0, rgb.g)), + b: Math.min(255, Math.max(0, rgb.b)) + }; + }, + fixHex = function (hex) { + var len = 6 - hex.length; + if (len > 0) { + var o = []; + for (var i=0; i<len; i++) { + o.push('0'); + } + o.push(hex); + hex = o.join(''); + } + return hex; + }, + HexToRGB = function (hex) { + var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16); + return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)}; + }, + HexToHSB = function (hex) { + return RGBToHSB(HexToRGB(hex)); + }, + RGBToHSB = function (rgb) { + var hsb = { + h: 0, + s: 0, + b: 0 + }; + var min = Math.min(rgb.r, rgb.g, rgb.b); + var max = Math.max(rgb.r, rgb.g, rgb.b); + var delta = max - min; + hsb.b = max; + if (max != 0) { + + } + hsb.s = max != 0 ? 255 * delta / max : 0; + if (hsb.s != 0) { + if (rgb.r == max) { + hsb.h = (rgb.g - rgb.b) / delta; + } else if (rgb.g == max) { + hsb.h = 2 + (rgb.b - rgb.r) / delta; + } else { + hsb.h = 4 + (rgb.r - rgb.g) / delta; + } + } else { + hsb.h = -1; + } + hsb.h *= 60; + if (hsb.h < 0) { + hsb.h += 360; + } + hsb.s *= 100/255; + hsb.b *= 100/255; + return hsb; + }, + HSBToRGB = function (hsb) { + var rgb = {}; + var h = Math.round(hsb.h); + var s = Math.round(hsb.s*255/100); + var v = Math.round(hsb.b*255/100); + if(s == 0) { + rgb.r = rgb.g = rgb.b = v; + } else { + var t1 = v; + var t2 = (255-s)*v/255; + var t3 = (t1-t2)*(h%60)/60; + if(h==360) h = 0; + if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3} + else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3} + else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3} + else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3} + else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3} + else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3} + else {rgb.r=0; rgb.g=0; rgb.b=0} + } + return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)}; + }, + RGBToHex = function (rgb) { + var hex = [ + rgb.r.toString(16), + rgb.g.toString(16), + rgb.b.toString(16) + ]; + $.each(hex, function (nr, val) { + if (val.length == 1) { + hex[nr] = '0' + val; + } + }); + return hex.join(''); + }, + HSBToHex = function (hsb) { + return RGBToHex(HSBToRGB(hsb)); + }, + restoreOriginal = function () { + var cal = $(this).parent(); + var col = cal.data('colorpicker').origColor; + cal.data('colorpicker').color = col; + fillRGBFields(col, cal.get(0)); + fillHexFields(col, cal.get(0)); + fillHSBFields(col, cal.get(0)); + setSelector(col, cal.get(0)); + setHue(col, cal.get(0)); + setNewColor(col, cal.get(0)); + }; + return { + init: function (opt) { + opt = $.extend({}, defaults, opt||{}); + if (typeof opt.color == 'string') { + opt.color = HexToHSB(opt.color); + } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) { + opt.color = RGBToHSB(opt.color); + } else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) { + opt.color = fixHSB(opt.color); + } else { + return this; + } + return this.each(function () { + if (!$(this).data('colorpickerId')) { + var options = $.extend({}, opt); + options.origColor = opt.color; + var id = 'collorpicker_' + parseInt(Math.random() * 1000); + $(this).data('colorpickerId', id); + var cal = $(tpl).attr('id', id); + if (options.flat) { + cal.appendTo(this).show(); + } else { + cal.appendTo(document.body); + } + options.fields = cal + .find('input') + .bind('keyup', keyDown) + .bind('change', change) + .bind('blur', blur) + .bind('focus', focus); + cal + .find('span').bind('mousedown', downIncrement).end() + .find('>div.colorpicker_current_color').bind('click', restoreOriginal); + options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector); + options.selectorIndic = options.selector.find('div div'); + options.el = this; + options.hue = cal.find('div.colorpicker_hue div'); + cal.find('div.colorpicker_hue').bind('mousedown', downHue); + options.newColor = cal.find('div.colorpicker_new_color'); + options.currentColor = cal.find('div.colorpicker_current_color'); + cal.data('colorpicker', options); + cal.find('div.colorpicker_submit') + .bind('mouseenter', enterSubmit) + .bind('mouseleave', leaveSubmit) + .bind('click', clickSubmit); + fillRGBFields(options.color, cal.get(0)); + fillHSBFields(options.color, cal.get(0)); + fillHexFields(options.color, cal.get(0)); + setHue(options.color, cal.get(0)); + setSelector(options.color, cal.get(0)); + setCurrentColor(options.color, cal.get(0)); + setNewColor(options.color, cal.get(0)); + if (options.flat) { + cal.css({ + position: 'relative', + display: 'block' + }); + } else { + $(this).bind(options.eventName, show); + } + } + }); + }, + showPicker: function() { + return this.each( function () { + if ($(this).data('colorpickerId')) { + show.apply(this); + } + }); + }, + hidePicker: function() { + return this.each( function () { + if ($(this).data('colorpickerId')) { + $('#' + $(this).data('colorpickerId')).hide(); + } + }); + }, + setColor: function(col) { + if (typeof col == 'string') { + col = HexToHSB(col); + } else if (col.r != undefined && col.g != undefined && col.b != undefined) { + col = RGBToHSB(col); + } else if (col.h != undefined && col.s != undefined && col.b != undefined) { + col = fixHSB(col); + } else { + return this; + } + return this.each(function(){ + if ($(this).data('colorpickerId')) { + var cal = $('#' + $(this).data('colorpickerId')); + cal.data('colorpicker').color = col; + cal.data('colorpicker').origColor = col; + fillRGBFields(col, cal.get(0)); + fillHSBFields(col, cal.get(0)); + fillHexFields(col, cal.get(0)); + setHue(col, cal.get(0)); + setSelector(col, cal.get(0)); + setCurrentColor(col, cal.get(0)); + setNewColor(col, cal.get(0)); + } + }); + } + }; + }(); + $.fn.extend({ + ColorPicker: ColorPicker.init, + ColorPickerHide: ColorPicker.hidePicker, + ColorPickerShow: ColorPicker.showPicker, + ColorPickerSetColor: ColorPicker.setColor + }); +})(jQuery) \ No newline at end of file hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-265-g7838925
by Marc Delisle 25 Mar '10

25 Mar '10

The branch, master has been updated via 783892518ce82c32374a6a643396244eff4c0ad3 (commit) from 719d6dd9f0c634fe49c121b4775f77a6953a954b (commit) - Log ----------------------------------------------------------------- commit 783892518ce82c32374a6a643396244eff4c0ad3 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Mar 25 13:27:58 2010 -0400 Replace MooRainbow with a jQuery color picker ----------------------------------------------------------------------- Summary of changes: js/mooRainbow/images/blank.gif | Bin 43 -> 0 bytes js/mooRainbow/images/moor_arrows.gif | Bin 94 -> 0 bytes js/mooRainbow/images/moor_boverlay.png | Bin 799 -> 0 bytes js/mooRainbow/images/moor_cursor.gif | Bin 80 -> 0 bytes js/mooRainbow/images/moor_slider.png | Bin 590 -> 0 bytes js/mooRainbow/images/moor_woverlay.png | Bin 768 -> 0 bytes js/mooRainbow/images/rainbow.png | Bin 794 -> 0 bytes js/mooRainbow/mooRainbow.css | 114 ------- js/mooRainbow/mooRainbow.js | 563 -------------------------------- js/mootools-domready-rainbow.js | 16 - libraries/common.inc.php | 2 - libraries/header_meta_style.inc.php | 11 +- main.php | 39 ++- 13 files changed, 38 insertions(+), 707 deletions(-) delete mode 100644 js/mooRainbow/images/blank.gif delete mode 100644 js/mooRainbow/images/moor_arrows.gif delete mode 100644 js/mooRainbow/images/moor_boverlay.png delete mode 100644 js/mooRainbow/images/moor_cursor.gif delete mode 100644 js/mooRainbow/images/moor_slider.png delete mode 100644 js/mooRainbow/images/moor_woverlay.png delete mode 100644 js/mooRainbow/images/rainbow.png delete mode 100644 js/mooRainbow/mooRainbow.css delete mode 100644 js/mooRainbow/mooRainbow.js delete mode 100644 js/mootools-domready-rainbow.js diff --git a/js/mooRainbow/images/blank.gif b/js/mooRainbow/images/blank.gif deleted file mode 100644 index c9c195f..0000000 Binary files a/js/mooRainbow/images/blank.gif and /dev/null differ diff --git a/js/mooRainbow/images/moor_arrows.gif b/js/mooRainbow/images/moor_arrows.gif deleted file mode 100644 index c57addc..0000000 Binary files a/js/mooRainbow/images/moor_arrows.gif and /dev/null differ diff --git a/js/mooRainbow/images/moor_boverlay.png b/js/mooRainbow/images/moor_boverlay.png deleted file mode 100644 index 7ac228b..0000000 Binary files a/js/mooRainbow/images/moor_boverlay.png and /dev/null differ diff --git a/js/mooRainbow/images/moor_cursor.gif b/js/mooRainbow/images/moor_cursor.gif deleted file mode 100644 index 9515a38..0000000 Binary files a/js/mooRainbow/images/moor_cursor.gif and /dev/null differ diff --git a/js/mooRainbow/images/moor_slider.png b/js/mooRainbow/images/moor_slider.png deleted file mode 100644 index 9f4c47b..0000000 Binary files a/js/mooRainbow/images/moor_slider.png and /dev/null differ diff --git a/js/mooRainbow/images/moor_woverlay.png b/js/mooRainbow/images/moor_woverlay.png deleted file mode 100644 index c3f3e96..0000000 Binary files a/js/mooRainbow/images/moor_woverlay.png and /dev/null differ diff --git a/js/mooRainbow/images/rainbow.png b/js/mooRainbow/images/rainbow.png deleted file mode 100644 index a62ec90..0000000 Binary files a/js/mooRainbow/images/rainbow.png and /dev/null differ diff --git a/js/mooRainbow/mooRainbow.css b/js/mooRainbow/mooRainbow.css deleted file mode 100644 index 764664e..0000000 --- a/js/mooRainbow/mooRainbow.css +++ /dev/null @@ -1,114 +0,0 @@ -/*** - * - mooRainbow: defaultCSS - * author: w00fz <w00fzIT(a)gmail.com> - */ - -#mooRainbow { font-size: 11px; color: #000; } - -.moor-box { - width: 390px; - height: 310px; - border: 1px solid #636163; - background-color: #f9f9f9; -} -.moor-overlayBox { - width: 256px; /* Width and Height of the overlay must be setted here: default 256x256 */ - height: 256px; - margin-top: 9px; - margin-left: 9px; - border: 1px solid #000; -} -.moor-slider { - border: 1px solid #000; - margin-top: 9px; - margin-left: 280px; - width: 19px; /* if you want a bigger or smaller slider... */ - height: 256px; -} -.moor-colorBox { - border: 1px solid #000; - width: 59px; - height: 68px; - margin-top: 20px; - margin-left: 315px; -} -.moor-currentColor { /* Bottom Box Color, the backup one */ - margin-top: 55px; - margin-left: 316px; - width: 59px; - height: 34px; -} -.moor-okButton { - font-family: Tahoma; - font-weight: bold; - font-size: 11px; - margin-top: 278px; - margin-left: 8px; - background: #e6e6e6; - height: 23px; - border: 1px solid #d6d6d6; - border-left-color: #f5f5f5; - border-top-color: #f5f5f5; -} -#mooRainbow label { - font-family: mono; -} -/* Following are just <label> */ -.moor-rLabel { - margin-top: 100px; - margin-left: 315px; -} -.moor-gLabel { - margin-top: 125px; - margin-left: 315px; -} -.moor-bLabel { - margin-top: 150px; - margin-left: 315px; -} -.moor-HueLabel { - margin-top: 190px; - margin-left: 315px; -} -span.moor-ballino { /* Style hue � (degree) !! */ - margin-top: 190px; - margin-left: 370px; -} -.moor-SatuLabel { - margin-top: 215px; - margin-left: 315px; -} -.moor-BrighLabel { - margin-top: 240px; - margin-left: 315px; -} -.moor-hexLabel { - margin-top: 275px; - margin-left: 280px; -} - -/* <input> */ -.moor-rInput, .moor-gInput, .moor-bInput, .moor-HueInput, .moor-SatuInput, .moor-BrighInput { - width: 30px; -} -.moor-hexInput { - width: 55px; -} -.moor-cursor { - background-image: url(images/moor_cursor.gif); - width: 12px; - height: 12px; -} -.moor-arrows { - background-image: url(images/moor_arrows.gif); - top: 9px; - left: 270px; - width: 41px; - height: 9px; -} -.moor-chooseColor { /* Top Box Color, the choosen one */ - margin-top: 21px; - margin-left: 316px; - width: 59px; - height: 34px; -} \ No newline at end of file diff --git a/js/mooRainbow/mooRainbow.js b/js/mooRainbow/mooRainbow.js deleted file mode 100644 index c355a73..0000000 --- a/js/mooRainbow/mooRainbow.js +++ /dev/null @@ -1,563 +0,0 @@ -/*** - * MooRainbow - * - * @version 1.2b1 - * @license MIT-style license - * @author Djamil Legato (w00fz) - < w00fzIT [at] gmail.com > - * @infos http://moorainbow.woolly-sheep.net - * @copyright Author - * - * includes a fix for mootools 1.2 by Piotr Przybylski - */ - -var MooRainbow = new Class({ - Implements: [Options, Events], - options: { - id: 'mooRainbow', - prefix: 'moor-', - imgPath: 'images/', - startColor: [255, 0, 0], - wheel: false, - onComplete: Class.empty, - onChange: Class.empty, - selectText: 'Select' - }, - - initialize: function(el, options) { - this.element = $(el); if (!this.element) return; - this.setOptions(options); - - this.sliderPos = 0; - this.pickerPos = {x: 0, y: 0}; - this.backupColor = this.options.startColor; - this.currentColor = this.options.startColor; - this.sets = { - rgb: [], - hsb: [], - hex: [] - }; - this.pickerClick = this.sliderClick = false; - if (!this.layout) this.doLayout(); - this.OverlayEvents(); - this.sliderEvents(); - this.backupEvent(); - if (this.options.wheel) this.wheelEvents(); - this.element.addEvent('click', function(e) { this.toggle(e); }.bind(this)); - - this.layout.overlay.setStyle('background-color', this.options.startColor.rgbToHex()); - this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex()); - - this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w; - this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h; - - this.manualSet(this.options.startColor); - - this.pickerPos.x = this.snippet('curPos').l + this.snippet('curSize', 'int').w; - this.pickerPos.y = this.snippet('curPos').t + this.snippet('curSize', 'int').h; - this.sliderPos = this.snippet('arrPos') - this.snippet('arrSize', 'int'); - - if (Browser.Engine.webkit) this.hide(); - }, - - toggle: function() { - this[this.visible ? 'hide' : 'show']() - }, - - show: function() { - this.rePosition(); - this.layout.setStyle('display', 'block'); - this.visible = true; - }, - - hide: function() { - this.layout.setStyles({'display': 'none'}); - this.visible = false; - }, - - manualSet: function(color, type) { - if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb'; - var rgb, hsb, hex; - - if (type == 'rgb') { rgb = color; hsb = color.rgbToHsb(); hex = color.rgbToHex(); } - else if (type == 'hsb') { hsb = color; rgb = color.hsbToRgb(); hex = rgb.rgbToHex(); } - else { hex = color; rgb = color.hexToRgb(true); hsb = rgb.rgbToHsb(); } - - this.setMooRainbow(rgb); - this.autoSet(hsb); - }, - - autoSet: function(hsb) { - var curH = this.snippet('curSize', 'int').h; - var curW = this.snippet('curSize', 'int').w; - var oveH = this.layout.overlay.height; - var oveW = this.layout.overlay.width; - var sliH = this.layout.slider.height; - var arwH = this.snippet('arrSize', 'int'); - var hue; - - var posx = Math.round(((oveW * hsb[1]) / 100) - curW); - var posy = Math.round(- ((oveH * hsb[2]) / 100) + oveH - curH); - - var c = Math.round(((sliH * hsb[0]) / 360)); c = (c == 360) ? 0 : c; - var position = sliH - c + this.snippet('slider') - arwH; - hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex(); - - this.layout.cursor.setStyles({'top': posy, 'left': posx}); - this.layout.arrows.setStyle('top', position); - this.layout.overlay.setStyle('background-color', hue); - this.sliderPos = this.snippet('arrPos') - arwH; - this.pickerPos.x = this.snippet('curPos').l + curW; - this.pickerPos.y = this.snippet('curPos').t + curH; - }, - - setMooRainbow: function(color, type) { - if (!type || (type != 'hsb' && type != 'hex')) type = 'rgb'; - var rgb, hsb, hex; - - if (type == 'rgb') { rgb = color; hsb = color.rgbToHsb(); hex = color.rgbToHex(); } - else if (type == 'hsb') { hsb = color; rgb = color.hsbToRgb(); hex = rgb.rgbToHex(); } - else { hex = color; rgb = color.hexToRgb(); hsb = rgb.rgbToHsb(); } - - this.sets = { - rgb: rgb, - hsb: hsb, - hex: hex - }; - - if (!$chk(this.pickerPos.x)) - this.autoSet(hsb); - - this.RedInput.value = rgb[0]; - this.GreenInput.value = rgb[1]; - this.BlueInput.value = rgb[2]; - this.HueInput.value = hsb[0]; - this.SatuInput.value = hsb[1]; - this.BrighInput.value = hsb[2]; - this.hexInput.value = hex; - - this.currentColor = rgb; - - this.chooseColor.setStyle('background-color', rgb.rgbToHex()); - }, - - parseColors: function(x, y, z) { - var s = Math.round((x * 100) / this.layout.overlay.width); - var b = 100 - Math.round((y * 100) / this.layout.overlay.height); - var h = 360 - Math.round((z * 360) / this.layout.slider.height) + this.snippet('slider') - this.snippet('arrSize', 'int'); - h -= this.snippet('arrSize', 'int'); - h = (h >= 360) ? 0 : (h < 0) ? 0 : h; - s = (s > 100) ? 100 : (s < 0) ? 0 : s; - b = (b > 100) ? 100 : (b < 0) ? 0 : b; - - return [h, s, b]; - }, - - OverlayEvents: function() { - var lim, curH, curW, inputs; - curH = this.snippet('curSize', 'int').h; - curW = this.snippet('curSize', 'int').w; - inputs = $A(this.arrRGB).concat(this.arrHSB, this.hexInput); - - document.addEvent('click', function() { - if(this.visible) this.hide(this.layout); - }.bind(this)); - - inputs.each(function(el) { - if(el) { - el.addEvent('keydown', this.eventKeydown.bindWithEvent(this, el)); - el.addEvent('keyup', this.eventKeyup.bindWithEvent(this, el)); - } - }, this); - [this.element, this.layout].each(function(el) { - el.addEvents({ - 'click': function(e) { new Event(e).stop();}, - 'keyup': function(e) { - e = new Event(e); - if(e.key == 'esc' && this.visible) this.hide(this.layout); - }.bind(this) - }, this); - }, this); - - lim = { - x: [0 - curW, (this.layout.overlay.width - curW)], - y: [0 - curH, (this.layout.overlay.height - curH)] - }; - - this.layout.drag = new Drag(this.layout.cursor, { - limit: lim, - onStart: this.overlayDrag.bind(this), - onDrag: this.overlayDrag.bind(this), - snap: 0 - }); - - this.layout.overlay2.addEvent('mousedown', function(e){ - e = new Event(e); - this.layout.cursor.setStyles({ - 'top': e.page.y - this.layout.overlay.getPosition().y - curH, - 'left': e.page.x - this.layout.overlay.getPosition().x - curW - }); - this.overlayDrag(); - this.layout.drag.start(e); - }.bind(this)); - - this.okButton.addEvent('click', function() { - if(this.currentColor == this.options.startColor) { - this.hide(); - this.fireEvent('onComplete', [this.sets, this]); - } - else { - this.backupColor = this.currentColor; - this.layout.backup.setStyle('background-color', this.backupColor.rgbToHex()); - this.hide(); - this.fireEvent('onComplete', [this.sets, this]); - } - }.bind(this)); - }, - - overlayDrag: function() { - var curH = this.snippet('curSize', 'int').h; - var curW = this.snippet('curSize', 'int').w; - this.pickerPos.x = this.snippet('curPos').l + curW; - this.pickerPos.y = this.snippet('curPos').t + curH; - - this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb'); - this.fireEvent('onChange', [this.sets, this]); - }, - - sliderEvents: function() { - var arwH = this.snippet('arrSize', 'int'), lim; - - lim = [0 + this.snippet('slider') - arwH, this.layout.slider.height - arwH + this.snippet('slider')]; - this.layout.sliderDrag = new Drag(this.layout.arrows, { - limit: {y: lim}, - modifiers: {x: false}, - onStart: this.sliderDrag.bind(this), - onDrag: this.sliderDrag.bind(this), - snap: 0 - }); - - this.layout.slider.addEvent('mousedown', function(e){ - e = new Event(e); - - this.layout.arrows.setStyle( - 'top', e.page.y - this.layout.slider.getPosition().y + this.snippet('slider') - arwH - ); - this.sliderDrag(); - this.layout.sliderDrag.start(e); - }.bind(this)); - }, - - sliderDrag: function() { - var arwH = this.snippet('arrSize', 'int'), hue; - - this.sliderPos = this.snippet('arrPos') - arwH; - this.setMooRainbow(this.parseColors(this.pickerPos.x, this.pickerPos.y, this.sliderPos), 'hsb'); - hue = [this.sets.hsb[0], 100, 100].hsbToRgb().rgbToHex(); - this.layout.overlay.setStyle('background-color', hue); - this.fireEvent('onChange', [this.sets, this]); - }, - - backupEvent: function() { - this.layout.backup.addEvent('click', function() { - this.manualSet(this.backupColor); - this.fireEvent('onChange', [this.sets, this]); - }.bind(this)); - }, - - wheelEvents: function() { - var arrColors = $A(this.arrRGB).extend(this.arrHSB); - - arrColors.each(function(el) { - el.addEvents({ - 'mousewheel': this.eventKeys.bindWithEvent(this, el), - 'keydown': this.eventKeys.bindWithEvent(this, el) - }); - }, this); - - [this.layout.arrows, this.layout.slider].each(function(el) { - el.addEvents({ - 'mousewheel': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider']), - 'keydown': this.eventKeys.bindWithEvent(this, [this.arrHSB[0], 'slider']) - }); - }, this); - }, - - eventKeys: function(e, el, id) { - var wheel, type; - id = (!id) ? el.id : this.arrHSB[0]; - - if (e.type == 'keydown') { - if (e.key == 'up') wheel = 1; - else if (e.key == 'down') wheel = -1; - else return; - } else if (e.type == Element.Events.mousewheel.base) wheel = (e.wheel > 0) ? 1 : -1; - - if (this.arrRGB.contains(el)) type = 'rgb'; - else if (this.arrHSB.contains(el)) type = 'hsb'; - else type = 'hsb'; - - if (type == 'rgb') { - var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass; - var value = (el.value.toInt() || 0) + wheel; - value = (value > 255) ? 255 : (value < 0) ? 0 : value; - - switch(el.className) { - case prefix + 'rInput': pass = [value, rgb[1], rgb[2]]; break; - case prefix + 'gInput': pass = [rgb[0], value, rgb[2]]; break; - case prefix + 'bInput': pass = [rgb[0], rgb[1], value]; break; - default : pass = rgb; - } - this.manualSet(pass); - this.fireEvent('onChange', [this.sets, this]); - } else { - var rgb = this.sets.rgb, hsb = this.sets.hsb, prefix = this.options.prefix, pass; - var value = (el.value.toInt() || 0) + wheel; - - if (el.className.test(/(HueInput)/)) value = (value > 359) ? 0 : (value < 0) ? 0 : value; - else value = (value > 100) ? 100 : (value < 0) ? 0 : value; - - switch(el.className) { - case prefix + 'HueInput': pass = [value, hsb[1], hsb[2]]; break; - case prefix + 'SatuInput': pass = [hsb[0], value, hsb[2]]; break; - case prefix + 'BrighInput': pass = [hsb[0], hsb[1], value]; break; - default : pass = hsb; - } - - this.manualSet(pass, 'hsb'); - this.fireEvent('onChange', [this.sets, this]); - } - e.stop(); - }, - - eventKeydown: function(e, el) { - var n = e.code, k = e.key; - - if ((!el.className.test(/hexInput/) && !(n >= 48 && n <= 57)) && - (k!='backspace' && k!='tab' && k !='delete' && k!='left' && k!='right')) - e.stop(); - }, - - eventKeyup: function(e, el) { - var n = e.code, k = e.key, pass, prefix, chr = el.value.charAt(0); - - if (!$chk(el.value)) return; - if (el.className.test(/hexInput/)) { - if (chr != "#" && el.value.length != 6) return; - if (chr == '#' && el.value.length != 7) return; - } else { - if (!(n >= 48 && n <= 57) && (!['backspace', 'tab', 'delete', 'left', 'right'].contains(k)) && el.value.length > 3) return; - } - - prefix = this.options.prefix; - - if (el.className.test(/(rInput|gInput|bInput)/)) { - if (el.value < 0 || el.value > 255) return; - switch(el.className){ - case prefix + 'rInput': pass = [el.value, this.sets.rgb[1], this.sets.rgb[2]]; break; - case prefix + 'gInput': pass = [this.sets.rgb[0], el.value, this.sets.rgb[2]]; break; - case prefix + 'bInput': pass = [this.sets.rgb[0], this.sets.rgb[1], el.value]; break; - default : pass = this.sets.rgb; - } - this.manualSet(pass); - this.fireEvent('onChange', [this.sets, this]); - } - else if (!el.className.test(/hexInput/)) { - if (el.className.test(/HueInput/) && el.value < 0 || el.value > 360) return; - else if (el.className.test(/HueInput/) && el.value == 360) el.value = 0; - else if (el.className.test(/(SatuInput|BrighInput)/) && el.value < 0 || el.value > 100) return; - switch(el.className){ - case prefix + 'HueInput': pass = [el.value, this.sets.hsb[1], this.sets.hsb[2]]; break; - case prefix + 'SatuInput': pass = [this.sets.hsb[0], el.value, this.sets.hsb[2]]; break; - case prefix + 'BrighInput': pass = [this.sets.hsb[0], this.sets.hsb[1], el.value]; break; - default : pass = this.sets.hsb; - } - this.manualSet(pass, 'hsb'); - this.fireEvent('onChange', [this.sets, this]); - } else { - pass = el.value.hexToRgb(true); - if (isNaN(pass[0])||isNaN(pass[1])||isNaN(pass[2])) return; - - if ($chk(pass)) { - this.manualSet(pass); - this.fireEvent('onChange', [this.sets, this]); - } - } - - }, - - doLayout: function() { - var id = this.options.id, prefix = this.options.prefix; - var idPrefix = id + ' .' + prefix; - - this.layout = new Element('div', { - 'styles': {'display': 'block', 'position': 'absolute'}, - 'id': id - }).inject(document.body); - - var box = new Element('div', { - 'styles': {'position': 'relative'}, - 'class': prefix + 'box' - }).inject(this.layout); - - var div = new Element('div', { - 'styles': {'position': 'absolute', 'overflow': 'hidden'}, - 'class': prefix + 'overlayBox' - }).inject(box); - - var ar = new Element('div', { - 'styles': {'position': 'absolute', 'zIndex': 1}, - 'class': prefix + 'arrows' - }).inject(box); - ar.width = ar.getStyle('width').toInt(); - ar.height = ar.getStyle('height').toInt(); - - var ov = new Element('img', { - 'styles': {'background-color': '#fff', 'position': 'relative', 'zIndex': 2}, - 'src': this.options.imgPath + 'moor_woverlay.png', - 'class': prefix + 'overlay' - }).inject(div); - - var ov2 = new Element('img', { - 'styles': {'position': 'absolute', 'top': 0, 'left': 0, 'zIndex': 2}, - 'src': this.options.imgPath + 'moor_boverlay.png', - 'class': prefix + 'overlay' - }).inject(div); - - if (Browser.Engine.trident4) { - div.setStyle('overflow', ''); - var src = ov.src; - ov.src = this.options.imgPath + 'blank.gif'; - ov.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')"; - src = ov2.src; - ov2.src = this.options.imgPath + 'blank.gif'; - ov2.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')"; - } - ov.width = ov2.width = div.getStyle('width').toInt(); - ov.height = ov2.height = div.getStyle('height').toInt(); - - var cr = new Element('div', { - 'styles': {'overflow': 'hidden', 'position': 'absolute', 'zIndex': 2}, - 'class': prefix + 'cursor' - }).inject(div); - cr.width = cr.getStyle('width').toInt(); - cr.height = cr.getStyle('height').toInt(); - - var sl = new Element('img', { - 'styles': {'position': 'absolute', 'z-index': 2}, - 'src': this.options.imgPath + 'moor_slider.png', - 'class': prefix + 'slider' - }).inject(box); - this.layout.slider = sl; - sl.width = sl.getStyle('width').toInt(); - sl.height = sl.getStyle('height').toInt(); - - new Element('div', { - 'styles': {'position': 'absolute'}, - 'class': prefix + 'colorBox' - }).inject(box); - - new Element('div', { - 'styles': {'zIndex': 2, 'position': 'absolute'}, - 'class': prefix + 'chooseColor' - }).inject(box); - - this.layout.backup = new Element('div', { - 'styles': {'zIndex': 2, 'position': 'absolute', 'cursor': 'pointer'}, - 'class': prefix + 'currentColor' - }).inject(box); - - var R = new Element('label').inject(box).setStyle('position', 'absolute'); - var G = R.clone().inject(box).addClass(prefix + 'gLabel').set('html', 'G: '); - var B = R.clone().inject(box).addClass(prefix + 'bLabel').set('html', 'B: '); - R.set('html', 'R: ').addClass(prefix + 'rLabel'); - - var inputR = new Element('input'); - var inputG = inputR.clone().inject(G).addClass(prefix + 'gInput'); - var inputB = inputR.clone().inject(B).addClass(prefix + 'bInput'); - inputR.inject(R).addClass(prefix + 'rInput'); - - var HU = new Element('label').inject(box).setStyle('position', 'absolute'); - var SA = HU.clone().inject(box).addClass(prefix + 'SatuLabel').set('html', 'S: '); - var BR = HU.clone().inject(box).addClass(prefix + 'BrighLabel').set('html', 'B: '); - HU.set('html', 'H: ').addClass(prefix + 'HueLabel'); - - var inputHU = new Element('input'); - var inputSA = inputHU.clone().inject(SA).addClass(prefix + 'SatuInput'); - var inputBR = inputHU.clone().inject(BR).addClass(prefix + 'BrighInput'); - inputHU.inject(HU).addClass(prefix + 'HueInput'); - SA.innerHTML += " %"; BR.innerHTML += " %"; - SP = new Element('span', {'styles': {'position': 'absolute'}, 'class': prefix + 'ballino'}) - SP.innerHTML = " °" - SP.inject(HU,'after'); - - var hex = new Element('label').inject(box).setStyle('position', 'absolute').addClass(prefix + 'hexLabel').set('html', '#hex: ').adopt(new Element('input').addClass(prefix + 'hexInput')); - - var ok = new Element('input', { - 'styles': {'position': 'absolute'}, - 'type': 'button', - 'value': this.options.selectText, - 'class': prefix + 'okButton' - }).inject(box); - - this.rePosition(); - - var overlays = $$('#' + id + ' .' + prefix + 'overlay'); - this.layout.overlay = overlays[0]; - this.layout.overlay2 = overlays[1]; - this.layout.cursor = cr; - this.layout.arrows = ar; - this.chooseColor = this.layout.getElement('.' + prefix + 'chooseColor'); - this.RedInput = inputR; - this.GreenInput = inputG; - this.BlueInput = inputB; - this.HueInput = inputHU; - this.SatuInput = this.layout.getElement('.' + prefix + 'SatuInput'); - this.BrighInput = this.layout.getElement('.' + prefix + 'BrighInput'); - this.hexInput = this.layout.getElement('.' + prefix + 'hexInput');; - - this.arrRGB = [this.RedInput, this.GreenInput, this.BlueInput]; - this.arrHSB = [this.HueInput, this.SatuInput, this.BrighInput]; - this.okButton = ok; - - if (!Browser.Engine.webkit419) this.hide(); - }, - rePosition: function() { - var coords = this.element.getCoordinates(); - this.layout.setStyles({ - 'left': coords.left, - 'top': coords.top + coords.height + 1 - }); - }, - - snippet: function(mode, type) { - var size; type = (type) ? type : 'none'; - - switch(mode) { - case 'arrPos': - var t = this.layout.arrows.getStyle('top').toInt(); - size = t; - break; - case 'arrSize': - var h = this.layout.arrows.height; - h = (type == 'int') ? (h/2).toInt() : h; - size = h; - break; - case 'curPos': - var l = this.layout.cursor.getStyle('left').toInt(); - var t = this.layout.cursor.getStyle('top').toInt(); - size = {'l': l, 't': t}; - break; - case 'slider': - var t = this.layout.slider.getStyle('marginTop').toInt(); - size = t; - break; - default : - var h = this.layout.cursor.height; - var w = this.layout.cursor.width; - h = (type == 'int') ? (h/2).toInt() : h; - w = (type == 'int') ? (w/2).toInt() : w; - size = {w: w, h: h}; - }; - return size; - } -}); diff --git a/js/mootools-domready-rainbow.js b/js/mootools-domready-rainbow.js deleted file mode 100644 index 40041df..0000000 --- a/js/mootools-domready-rainbow.js +++ /dev/null @@ -1,16 +0,0 @@ -window.addEvent('domready', function() { - var r = new MooRainbow('myRainbow', { - 'startColor': [58, 142, 246], - 'imgPath': 'js/mooRainbow/images/', - 'onChange': function(color) { - top.frame_navigation.document.getElementById('body_leftFrame').style.backgroundColor = color.hex; - top.frame_navigation.document.getElementById('pmalogo').style.backgroundColor = color.hex; - top.frame_content.document.body.style.backgroundColor = color.hex; - }, - 'onComplete': function(color) { - top.frame_content.document.getElementById('rainbowform').custom_color.value = color.hex; - top.frame_content.document.getElementById('rainbowform').custom_color_rgb.value = color.rgb; - top.frame_content.document.getElementById('rainbowform').submit(); - } - }); -}); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 11c5f8b..5a4afc4 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -666,10 +666,8 @@ unset($default_server); if (isset($_REQUEST['custom_color_reset'])) { unset($_SESSION['tmp_user_values']['custom_color']); - unset($_SESSION['tmp_user_values']['custom_color_rgb']); } elseif (isset($_REQUEST['custom_color'])) { $_SESSION['tmp_user_values']['custom_color'] = $_REQUEST['custom_color']; - $_SESSION['tmp_user_values']['custom_color_rgb'] = $_REQUEST['custom_color_rgb']; } /** * @global PMA_Theme_Manager $_SESSION['PMA_Theme_Manager'] diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 5413be6..c6c6f96 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -46,11 +46,14 @@ if ($GLOBALS['text_dir'] == 'ltr') { echo 'phpMyAdmin'; } ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> -<?php if (defined('PMA_MOORAINBOW')) { ?> - <link rel="stylesheet" type="text/css" href="js/mooRainbow/mooRainbow.css" /> +<?php +// goes before our themed CSS + if (defined('PMA_COLORPICKER')) { ?> + <link rel="stylesheet" type="text/css" href="js/colorpicker/css/colorpicker.css" /> + <link rel="stylesheet" media="screen" type="text/css" href="js/colorpicker/css/layout.css" /> <?php - } + } ?> + <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" /> <meta name="robots" content="noindex,nofollow" /> diff --git a/main.php b/main.php index ef9c6b5..36a8125 100644 --- a/main.php +++ b/main.php @@ -9,11 +9,11 @@ /** * Gets some core libraries and displays a top message if required */ -define('PMA_MOORAINBOW', true); +define('PMA_COLORPICKER', true); require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'mootools-more.js'; -$GLOBALS['js_include'][] = 'mooRainbow/mooRainbow.js'; -$GLOBALS['js_include'][] = 'mootools-domready-rainbow.js'; + +$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; +$GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; // Handles some variables that may have been sent by the calling script $GLOBALS['db'] = ''; @@ -159,14 +159,37 @@ if ($GLOBALS['cfg']['ThemeManager']) { //<![CDATA[ document.write('<li id="li_custom_color">'); document.write('<?php echo PMA_escapeJsString($strCustomColor) . ': '; ?>'); - document.write('<img id="myRainbow" src="js/mooRainbow/images/rainbow.png" alt="[r]" width="16" height="16" />'); - document.write('<form name="rainbowform" id="rainbowform" method="post" action="index.php" target="_parent">'); + document.write('<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">'); document.write('<?php echo PMA_generate_common_hidden_inputs(); ?>'); - document.write('<input type="hidden" name="custom_color" />'); - document.write('<input type="hidden" name="custom_color_rgb" />'); + document.write('<input type="hidden" id="custom_color" name="custom_color" value="" />'); document.write('<input type="submit" name="custom_color_reset" value="<?php echo $strReset; ?>" />'); document.write('</form>'); + document.write('<div id="colorSelector">'); + document.write('</div>'); document.write('</li>'); + + $(document).ready(function() { + // Choosing another id does not work! + $('#colorSelector').ColorPicker({ + color: '#0000ff', + onShow: function (colpkr) { + $(colpkr).fadeIn(500); + return false; + }, + onHide: function (colpkr) { + $(colpkr).fadeOut(500); + return false; + }, + onChange: function(hsb, hex, rgb) { + top.frame_content.document.body.style.backgroundColor = '#' + hex; + top.frame_navigation.document.body.style.backgroundColor = '#' + hex; + }, + onSubmit: function(hsb, hex, rgb) { + $('#custom_color').val('#' + hex); + $('#colorform').submit(); + } + }); + }); //]]> </script> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-839-g9608b08
by Michal Čihař 25 Mar '10

25 Mar '10

The branch, gettext has been updated via 9608b0805e0c928904069277c3b7958d4c50c8d8 (commit) from bc0251c0a0556ae38e93b9a3f338d870f843a02d (commit) - Log ----------------------------------------------------------------- commit 9608b0805e0c928904069277c3b7958d4c50c8d8 Author: veeven <veeven(a)gmail.com> Date: Wed Mar 24 16:47:29 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/te.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/te.po b/po/te.po index cda7558..d7c175d 100644 --- a/po/te.po +++ b/po/te.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-19 19:10+0200\n" -"Last-Translator: చక్రవర్తి <varthy(a)gmail.com>\n" +"PO-Revision-Date: 2010-03-24 16:47+0200\n" +"Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" "Language: te\n" "MIME-Version: 1.0\n" @@ -166,7 +166,7 @@ msgstr "డిసెం" #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string #: libraries/messages.inc.php:26 msgid "%B %d, %Y at %I:%M %p" -msgstr "" +msgstr "%B %d, %Y at %I:%M %p" #: libraries/messages.inc.php:27 #, possible-php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. c43dbf32dfc211e5364191e085fc645b50d9932a
by Michal Čihař 25 Mar '10

25 Mar '10

The branch, master has been updated via c43dbf32dfc211e5364191e085fc645b50d9932a (commit) from 147c31cd9c80b622835c5bc886e111fc27bdb842 (commit) - Log ----------------------------------------------------------------- commit c43dbf32dfc211e5364191e085fc645b50d9932a Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Thu Mar 25 02:09:48 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3c4ca71..d518235 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-22 23:58+0100\n" -"PO-Revision-Date: 2010-03-12 01:10+0200\n" +"PO-Revision-Date: 2010-03-25 02:09+0200\n" "Last-Translator: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>\n" "Language-Team: none\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -9628,13 +9628,12 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4346 -#, fuzzy msgid "" "<tt>git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/" "phpmyadmin</tt>" msgstr "" -"<tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/" -"phpMyAdmin</tt>" +"<tt>git clone " +"git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4349 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-264-g719d6dd
by Michal Čihař 24 Mar '10

24 Mar '10

The branch, master has been updated via 719d6dd9f0c634fe49c121b4775f77a6953a954b (commit) via 459fe9e905be784bcb0d3ce8ad54486c906be938 (commit) via cdef72f707e0f2a5ebf0a6a897811795f7dea165 (commit) via c70bd771719efa2fd1711f163e2aabb6bb304325 (commit) via 9f155b618c65ba2bf49f8a6dbf51d7e6f562087c (commit) from f9e1592958310191f97def4306d27f695de40245 (commit) - Log ----------------------------------------------------------------- commit 719d6dd9f0c634fe49c121b4775f77a6953a954b Merge: f9e1592958310191f97def4306d27f695de40245 459fe9e905be784bcb0d3ce8ad54486c906be938 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 24 11:10:52 2010 +0100 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: lang/belarusian_latin-utf-8.inc.php | 66 ++++++++++++++-------------------- 1 files changed, 27 insertions(+), 39 deletions(-) diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 4ac9ed6..b17405d 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -21,18 +21,6 @@ $month = array('Stu', 'Lut', 'Sak', 'Kra', 'Tra', 'Čer', 'Lip', 'Žni', 'Vier', $datefmt = '%d %B %Y, %H:%M'; $timespanfmt = '%s dzion, %s hadzinaŭ, %s chvilinaŭ i %s sekundaŭ'; -kali łaska, praviercie kanfihuracyju PHP'; -Heta moža adbycca ŭ vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža znajści fajł. -Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka z koskaj. -Kali vy atrymajecie čystuju staronku, značyć, usio dobra.'; - -Kali łaska, spytajcie aŭtara, što robić %s.'; -Kali vam treba ŭžyć zvarotny słeš ("\") abo apostraf ("\'") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; - -Kali vam patrebna ŭžyć zvarotny słeš ("\") abo apostraf ("\'") siarod hetych značeńniaŭ, pastaŭcie pierad imi zvarotny słeš (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; - -hetaje pole nia moža być adredagavanaje '; - $strAbortedClients = 'Spyniena'; $strAccessDeniedCreateConfig = 'Imavierna, pryčyna hetaha ŭ tym, što nia stvorany kanfihuracyjny fajł. Kab jaho stvaryć, možna vykarystać %1$snaładačny skrypt%2$s.'; $strAccessDeniedExplanation = 'phpMyAdmin pasprabavaŭ padłučycca da servera MySQL, ale server adchiliŭ złučeńnie. Praviercie imia chostu, karystalnika i parol u config.inc.php i ŭpeŭniciesia, što jany adpaviadajuć infarmacyi, jakuju daŭ administratar MySQL-servera.'; @@ -124,7 +112,7 @@ $strCancel = 'Skasavać'; $strCanNotLoadExportPlugins = 'Niemahčyma zahruzić płahiny ekspartavańnia, kali łaska, praviercie ŭstalavanyja fajły!'; $strCanNotLoadImportPlugins = 'Niemahčyma zahruzić płahiny impartavańnia, kali łaska, praviercie ŭstaloŭku!'; $strCannotLogin = 'Niemahčyma załahavacca na server MySQL'; -$strCantLoad = 'niemahčyma zahruzić pašyreńnie %s; +$strCantLoad = 'niemahčyma zahruzić pašyreńnie %s; kali łaska, praviercie kanfihuracyju PHP'; $strCantLoadRecodeIconv = 'Niemahčyma zahruzić pašyreńnie iconv abo pašyreńnie recode, nieabchodnyja dla pierakadavańnia symbalaŭ. Naładźcie PHP na vykarystańnie hetych pašyreńniaŭ abo ŭvohule adklučycie pierakadavańnie symbalaŭ u phpMyAdmin.'; $strCantRenameIdxToPrimary = 'Niemahčyma pierajmienavać indeks u PRIMARY!'; $strCantUseRecodeIconv = 'Niemahčyma vykarystać ni funkcyju iconv, ni libiconvr, ni recode_string u toj čas, jak pašyreńnie paviedamlaje, što jano zahružanaje. Praviercie vašuju kanfihuracyju PHP.'; @@ -164,7 +152,7 @@ $strCompleteInserts = 'Poŭnaja ŭstaŭka'; $strCompression = 'Ścisk'; $strCompressionWillBeDetected = 'Metad ścisku impartavanaha fajła budzie vyznačanaja aŭtamatyčna z: %s'; $strConfigDefaultFileError = 'Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: "%1$s"'; -$strConfigFileError = 'phpMyAdmin nia moža pračytać kanfihuracyjny fajł! +$strConfigFileError = 'phpMyAdmin nia moža pračytać kanfihuracyjny fajł! Heta moža adbycca ŭ vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža znajści fajł. Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka z koskaj. Kali vy atrymajecie čystuju staronku, značyć, usio dobra.'; $strConfigureTableCoord = 'Kali łaska, skanfihurujcie kaardynaty dla tablicy %s'; $strConnectionError = 'Niemahčyma padłučycca: niapravilnyja nałady.'; $strConnections = 'Padłučeńni'; @@ -352,13 +340,13 @@ $strHaveToShow = 'Vam nieabchodna vybrać prynamsi adnu kalonku dla adlustravań $strHebrew = 'Habrejskaja'; $strHelp = 'Dapamoha'; $strHexForBLOB = 'Šasnaccatkovyja značeńni dla polaŭ typu BLOB'; -$strHide = 'Schavać'; $strHideShowAll = 'Schavać/pakazać usie tablicy'; $strHideShowNoRelation = 'Schavać/pakazać tablicy biaz suviaziaŭ'; +$strHide = 'Schavać'; $strHome = 'Da pačatku'; $strHomepageOfficial = 'Aficyjnaja staronka phpMyAdmin'; -$strHost = 'Chost'; $strHostEmpty = 'Pustoje imia chostu!'; +$strHost = 'Chost'; $strHTMLExcel = 'Microsoft Excel 2000'; $strHTMLWord = 'Microsoft Word 2000'; $strHungarian = 'Vuhorskaja'; @@ -387,8 +375,8 @@ $strInnoDBAutoextendIncrementDesc = ' Pamier pryraščeńnia dla pašyreńnia pa $strInnoDBBufferPoolSizeDesc = 'Pamier buferu ŭ pamiaci, jaki InnoDB vykarystoŭvaje dla kešavańnia dadzienych i indeksaŭ tablic.'; $strInnoDBBufferPoolSize = 'Pamier pułu buferu'; $strInnoDBDataFilePath = 'Fajły dadzienych'; -$strInnoDBDataHomeDir = 'Chatniaja tečka dadzienych'; $strInnoDBDataHomeDirDesc = 'Ahulnaja častka šlachu tečki da ŭsich fajłaŭ dadzienych InnoDB.'; +$strInnoDBDataHomeDir = 'Chatniaja tečka dadzienych'; $strInnoDBPages = 'staronak'; $strInnodbStat = 'Stan InnoDB'; $strInsecureMySQL = 'Vaš kanfihuracyjny fajł utrymlivaje nałady (karystalnik root biez parolu), jakija adpaviadajuć pryvilejavanamu karystalniku MySQL pa zmoŭčańni. Vaš server MySQL pracuje z hetaj naładaj pa zmoŭčańni i źjaŭlajecca adkrytym dla źniešniaha ŭryvańnia, i tamu vam abaviazkova treba vypravić hetuju chibu ŭ biaśpiecy.'; @@ -431,7 +419,6 @@ $strKorean = 'Karejskaja'; $strLandscape = 'Krajavid'; $strLanguage = 'Mova'; $strLanguageUnknown = 'Nieviadomaja mova: %1$s.'; -$strLatchedPages = 'Fiksavanyja staronki'; $strLatexCaption = 'Zahałovak tablicy'; $strLatexContent = 'Źmieściva tablicy __TABLE__'; $strLatexContinuedCaption = 'Praciahnuty zahałovak tablicy'; @@ -440,6 +427,7 @@ $strLatexIncludeCaption = 'Uklučyć zahałovak tablicy'; $strLatexLabel = 'Kluč mietki'; $strLaTeX = 'LaTeX'; $strLatexStructure = 'Struktura tablicy __TABLE__'; +$strLatchedPages = 'Fiksavanyja staronki'; $strLatvian = 'Łatvijskaja'; $strLDI = 'CSV z vykarystańniem LOAD DATA'; $strLDILocal = 'Vykarystoŭvać klučavoje słova LOCAL'; @@ -468,9 +456,9 @@ $strMIME_available_mime = 'Dastupnyja MIME-typy'; $strMIME_available_transform = 'Dastupnyja pieraŭtvareńni'; $strMIME_description = 'Apisańnie'; $strMIME_MIMEtype = 'MIME-typ'; -$strMIME_nodescription = 'Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. +$strMIME_nodescription = 'Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. Kali łaska, spytajcie aŭtara, što robić %s.'; $strMIME_transformation_note = 'Dla atrymańnia śpisu dastupnych opcyjaŭ transfarmacyi i pieraŭtvareńniaŭ ichnych MIME-typaŭ, naciśnicie na %sapisańni pieraŭtvareńniaŭ%s'; -$strMIME_transformation_options_note = 'Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety farmat: \'a\', 100, b,\'c\'... +$strMIME_transformation_options_note = 'Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety farmat: \'a\', 100, b,\'c\'... Kali vam treba ŭžyć zvarotny słeš ("\") abo apostraf ("\'") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; $strMIME_transformation_options = 'Opcyi pieraŭtvareńnia'; $strMIME_transformation = 'Pieraŭtvareńnie MIME-typu braŭzeram'; $strMIMETypesForTable = 'MIME-typy tablicy'; @@ -776,7 +764,7 @@ $strServerVars = 'Nałady i źmiennyja servera'; $strServerVersion = 'Versija servera'; $strSessionStartupErrorGeneral = 'Niemahčyma biez pamyłak raspačać sesiju. Kali łaska, praviercie pamyłki ŭ vašym łogu PHP i, mahčyma, taksama ŭ łogu web-servera i skanfihurujcie PHP pravilna.'; $strSessionValue = 'Značeńnie sesii'; -$strSetEnumVal = 'Kali typ pola "enum" abo "set", kali łaska, uvodźcie značeńni vykarystoŭvajučy hety farmat: \'a\',\'b\',\'c\'... +$strSetEnumVal = 'Kali typ pola "enum" abo "set", kali łaska, uvodźcie značeńni vykarystoŭvajučy hety farmat: \'a\',\'b\',\'c\'... Kali vam patrebna ŭžyć zvarotny słeš ("\") abo apostraf ("\'") siarod hetych značeńniaŭ, pastaŭcie pierad imi zvarotny słeš (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; $strShowAll = 'Pakazać usie'; $strShowColor = 'Pakazać koler'; $strShowDatadictAs = 'Farmat słoŭnika dadzienych'; @@ -928,9 +916,9 @@ $strSQPBugInvalidIdentifer = 'Niapravilny identyfikatar'; $strSQPBugUnclosedQuote = 'Niezakrytaje dvukośsie'; $strSQPBugUnknownPunctuation = 'Nieviadomy symbal punktuacyi'; $strStandInStructureForView = 'Zamianialnaja struktura dla prahladu'; -$strStatCheckTime = 'Apošniaja pravierka'; $strStatCreateTime = 'Stvoranaja'; $strStatement = 'Vyrazy'; +$strStatCheckTime = 'Apošniaja pravierka'; $strStatisticsOverrun = 'Na zahružanym servery bajtavyja ličylniki mohuć pieraskokvać koła, tamu statystyka, jakuju pakazvaje MySQL-server, moža być niapravilnaj.'; $strStatUpdateTime = 'Apošniaje abnaŭleńnie'; $strStatus = 'Stan'; @@ -975,7 +963,7 @@ $strTable = 'Tablica'; $strTakeIt = 'hetaja'; $strTblPrivileges = 'Pryvilei, specyfičnyja dla tablicy'; $strTempData = 'Časovyja dadzienyja'; -$strTextAreaLength = ' Z-za vialikaj daŭžyni, +$strTextAreaLength = ' Z-za vialikaj daŭžyni, hetaje pole nia moža być adredagavanaje '; $strTexyText = 'Tekst Texy!'; $strThai = 'Tajlandzkaja'; $strThemeDefaultNotFound = 'Tema pa zmoŭčańni %s nia znojdzienaja!'; @@ -1111,7 +1099,7 @@ $strCouldNotConnectTarget = 'Could not connect to the target'; //to translate $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"'; //to translate $strCurrentServer = 'Current server'; //to translate -$strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate +$strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate $strDatabase_src = 'Source database'; //to translate $strDatabase_trg = 'Target database'; //to translate $strDataDiff = 'Data Difference'; //to translate @@ -1166,11 +1154,11 @@ $strRemoteServer = 'Remote server'; //to translate $strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strReplicationAddLines = 'Now, add the following lines at the end of your my.cnf and please restart the MySQL server afterwards.'; //to translate $strReplicationAddSlaveUser = 'Add slave replication user'; //to translate -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; //to translate $strReplicationControlSlave = 'Control slave:'; //to translate $strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; //to translate $strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; //to translate +$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate $strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; //to translate $strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; //to translate $strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; //to translate @@ -1183,10 +1171,10 @@ $strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report- $strReplicationShowConnectedSlaves = 'Show connected slaves'; //to translate $strReplicationShowMasterStatus = 'Show master status'; //to translate $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; //to translate -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate $strReplicationSlaveConfiguration = 'Slave configuration'; //to translate $strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; //to translate $strReplicationSlaveErrorManagement = 'Error management:'; //to translate +$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate $strReplicationSlaveIOThread = 'IO Thread %s only'; //to translate $strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'; //to translate $strReplicationSlaveReset = 'Reset slave'; //to translate @@ -1225,13 +1213,6 @@ $strSetupBZipDump_name = 'Bzip2'; //to translate $strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupCannotLoadConfig = 'Cannot load or save configuration'; //to translate $strSetupCannotLoadConfigMsg = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'; //to translate -$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate -$strSetupCharEditing_name = 'CHAR fields editing'; //to translate -$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate -$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate -$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate $strSetupClear = 'Clear'; //to translate $strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature'; //to translate $strSetupCompressOnFly_name = 'Compress on the fly'; //to translate @@ -1273,12 +1254,12 @@ $strSetuperror_nan_p = 'Not a positive number'; //to translate $strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)'; //to translate $strSetupExecTimeLimit_name = 'Maximum execution time'; //to translate $strSetupExport_asfile_name = 'Save as file'; //to translate -$strSetupExport_charset_name = 'Character set of the file'; //to translate $strSetupExport_compression_name = 'Compression'; //to translate $strSetupExport_file_template_database_name = 'Database name template'; //to translate $strSetupExport_file_template_server_name = 'Server name template'; //to translate $strSetupExport_file_template_table_name = 'Table name template'; //to translate $strSetupExport_format_name = 'Format'; //to translate +$strSetupExport_charset_name = 'Character set of the file'; //to translate $strSetupExport_onserver_name = 'Save on server'; //to translate $strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)'; //to translate $strSetupExport_remember_file_template_name = 'Remember file name template'; //to translate @@ -1341,6 +1322,13 @@ $strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] c $strSetupGZipDump_name = 'GZip'; //to translate $strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupHomepageLink = 'phpMyAdmin homepage'; //to translate +$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate +$strSetupCharEditing_name = 'CHAR fields editing'; //to translate +$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate +$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate +$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate $strSetupIconvExtraParams_name = 'Extra parameters for iconv'; //to translate $strSetupIgnoreErrors = 'Ignore errors'; //to translate $strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed'; //to translate @@ -1388,10 +1376,10 @@ $strSetupLoginCookieStore_name = 'Login cookie store'; //to translate $strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid'; //to translate $strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; //to translate $strSetupLoginCookieValidity_name = 'Login cookie validity'; //to translate -$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate -$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate $strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list'; //to translate $strSetupMaxDbList_name = 'Maximum databases'; //to translate +$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate +$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate $strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.'; //to translate $strSetupMaxRows_name = 'Maximum number of rows to display'; //to translate $strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list'; //to translate @@ -1498,20 +1486,20 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave $strSetupServers_table_info_name = 'Display fields table'; //to translate $strSetupServers_user_desc = 'Leave empty if not using config auth'; //to translate $strSetupServers_user_name = 'User for config auth'; //to translate +$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; //to translate $strSetupServers_verbose_check_name = 'Verbose check'; //to translate -$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate $strSetupServers_verbose_name = 'Verbose name of this server'; //to translate $strSetupSetValue = 'Set value: %s'; //to translate $strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button'; //to translate $strSetupShowAll_name = 'Allow to display all the rows'; //to translate -$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate -$strSetupShowChgPassword_name = 'Show password change form'; //to translate $strSetupShowCreateDb_name = 'Show create database form'; //to translate $strSetupShowForm = 'Show form'; //to translate $strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode'; //to translate $strSetupShowFunctionFields_name = 'Show function fields'; //to translate $strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)'; //to translate +$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate +$strSetupShowChgPassword_name = 'Show password change form'; //to translate $strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'; //to translate $strSetupShowPhpInfo_name = 'Show phpinfo() link'; //to translate $strSetupShowServerInfo_name = 'Show detailed MySQL server information'; //to translate hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-838-gbc0251c
by Michal Čihař 24 Mar '10

24 Mar '10

The branch, gettext has been updated via bc0251c0a0556ae38e93b9a3f338d870f843a02d (commit) via 18db851bb5f3d075cd86e6dd9f280b8090d2a090 (commit) via 459fe9e905be784bcb0d3ce8ad54486c906be938 (commit) via cdef72f707e0f2a5ebf0a6a897811795f7dea165 (commit) via c70bd771719efa2fd1711f163e2aabb6bb304325 (commit) via 9f155b618c65ba2bf49f8a6dbf51d7e6f562087c (commit) from a069d4f4af3bc61f9d831e054e1f64522c4e587c (commit) - Log ----------------------------------------------------------------- commit bc0251c0a0556ae38e93b9a3f338d870f843a02d Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 24 11:15:08 2010 +0100 Fix import of be@latin locales The original import was messed up because of broken php file. commit 18db851bb5f3d075cd86e6dd9f280b8090d2a090 Merge: a069d4f4af3bc61f9d831e054e1f64522c4e587c 459fe9e905be784bcb0d3ce8ad54486c906be938 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 24 11:10:58 2010 +0100 Merge branch 'QA_3_3' into gettext ----------------------------------------------------------------------- Summary of changes: lang/belarusian_latin-utf-8.inc.php | 66 +++---- po/be(a)latin.po | 386 ++++++++++++----------------------- 2 files changed, 162 insertions(+), 290 deletions(-) diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 4ac9ed6..b17405d 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -21,18 +21,6 @@ $month = array('Stu', 'Lut', 'Sak', 'Kra', 'Tra', 'Čer', 'Lip', 'Žni', 'Vier', $datefmt = '%d %B %Y, %H:%M'; $timespanfmt = '%s dzion, %s hadzinaŭ, %s chvilinaŭ i %s sekundaŭ'; -kali łaska, praviercie kanfihuracyju PHP'; -Heta moža adbycca ŭ vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža znajści fajł. -Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka z koskaj. -Kali vy atrymajecie čystuju staronku, značyć, usio dobra.'; - -Kali łaska, spytajcie aŭtara, što robić %s.'; -Kali vam treba ŭžyć zvarotny słeš ("\") abo apostraf ("\'") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; - -Kali vam patrebna ŭžyć zvarotny słeš ("\") abo apostraf ("\'") siarod hetych značeńniaŭ, pastaŭcie pierad imi zvarotny słeš (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; - -hetaje pole nia moža być adredagavanaje '; - $strAbortedClients = 'Spyniena'; $strAccessDeniedCreateConfig = 'Imavierna, pryčyna hetaha ŭ tym, što nia stvorany kanfihuracyjny fajł. Kab jaho stvaryć, možna vykarystać %1$snaładačny skrypt%2$s.'; $strAccessDeniedExplanation = 'phpMyAdmin pasprabavaŭ padłučycca da servera MySQL, ale server adchiliŭ złučeńnie. Praviercie imia chostu, karystalnika i parol u config.inc.php i ŭpeŭniciesia, što jany adpaviadajuć infarmacyi, jakuju daŭ administratar MySQL-servera.'; @@ -124,7 +112,7 @@ $strCancel = 'Skasavać'; $strCanNotLoadExportPlugins = 'Niemahčyma zahruzić płahiny ekspartavańnia, kali łaska, praviercie ŭstalavanyja fajły!'; $strCanNotLoadImportPlugins = 'Niemahčyma zahruzić płahiny impartavańnia, kali łaska, praviercie ŭstaloŭku!'; $strCannotLogin = 'Niemahčyma załahavacca na server MySQL'; -$strCantLoad = 'niemahčyma zahruzić pašyreńnie %s; +$strCantLoad = 'niemahčyma zahruzić pašyreńnie %s; kali łaska, praviercie kanfihuracyju PHP'; $strCantLoadRecodeIconv = 'Niemahčyma zahruzić pašyreńnie iconv abo pašyreńnie recode, nieabchodnyja dla pierakadavańnia symbalaŭ. Naładźcie PHP na vykarystańnie hetych pašyreńniaŭ abo ŭvohule adklučycie pierakadavańnie symbalaŭ u phpMyAdmin.'; $strCantRenameIdxToPrimary = 'Niemahčyma pierajmienavać indeks u PRIMARY!'; $strCantUseRecodeIconv = 'Niemahčyma vykarystać ni funkcyju iconv, ni libiconvr, ni recode_string u toj čas, jak pašyreńnie paviedamlaje, što jano zahružanaje. Praviercie vašuju kanfihuracyju PHP.'; @@ -164,7 +152,7 @@ $strCompleteInserts = 'Poŭnaja ŭstaŭka'; $strCompression = 'Ścisk'; $strCompressionWillBeDetected = 'Metad ścisku impartavanaha fajła budzie vyznačanaja aŭtamatyčna z: %s'; $strConfigDefaultFileError = 'Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: "%1$s"'; -$strConfigFileError = 'phpMyAdmin nia moža pračytać kanfihuracyjny fajł! +$strConfigFileError = 'phpMyAdmin nia moža pračytać kanfihuracyjny fajł! Heta moža adbycca ŭ vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža znajści fajł. Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka z koskaj. Kali vy atrymajecie čystuju staronku, značyć, usio dobra.'; $strConfigureTableCoord = 'Kali łaska, skanfihurujcie kaardynaty dla tablicy %s'; $strConnectionError = 'Niemahčyma padłučycca: niapravilnyja nałady.'; $strConnections = 'Padłučeńni'; @@ -352,13 +340,13 @@ $strHaveToShow = 'Vam nieabchodna vybrać prynamsi adnu kalonku dla adlustravań $strHebrew = 'Habrejskaja'; $strHelp = 'Dapamoha'; $strHexForBLOB = 'Šasnaccatkovyja značeńni dla polaŭ typu BLOB'; -$strHide = 'Schavać'; $strHideShowAll = 'Schavać/pakazać usie tablicy'; $strHideShowNoRelation = 'Schavać/pakazać tablicy biaz suviaziaŭ'; +$strHide = 'Schavać'; $strHome = 'Da pačatku'; $strHomepageOfficial = 'Aficyjnaja staronka phpMyAdmin'; -$strHost = 'Chost'; $strHostEmpty = 'Pustoje imia chostu!'; +$strHost = 'Chost'; $strHTMLExcel = 'Microsoft Excel 2000'; $strHTMLWord = 'Microsoft Word 2000'; $strHungarian = 'Vuhorskaja'; @@ -387,8 +375,8 @@ $strInnoDBAutoextendIncrementDesc = ' Pamier pryraščeńnia dla pašyreńnia pa $strInnoDBBufferPoolSizeDesc = 'Pamier buferu ŭ pamiaci, jaki InnoDB vykarystoŭvaje dla kešavańnia dadzienych i indeksaŭ tablic.'; $strInnoDBBufferPoolSize = 'Pamier pułu buferu'; $strInnoDBDataFilePath = 'Fajły dadzienych'; -$strInnoDBDataHomeDir = 'Chatniaja tečka dadzienych'; $strInnoDBDataHomeDirDesc = 'Ahulnaja častka šlachu tečki da ŭsich fajłaŭ dadzienych InnoDB.'; +$strInnoDBDataHomeDir = 'Chatniaja tečka dadzienych'; $strInnoDBPages = 'staronak'; $strInnodbStat = 'Stan InnoDB'; $strInsecureMySQL = 'Vaš kanfihuracyjny fajł utrymlivaje nałady (karystalnik root biez parolu), jakija adpaviadajuć pryvilejavanamu karystalniku MySQL pa zmoŭčańni. Vaš server MySQL pracuje z hetaj naładaj pa zmoŭčańni i źjaŭlajecca adkrytym dla źniešniaha ŭryvańnia, i tamu vam abaviazkova treba vypravić hetuju chibu ŭ biaśpiecy.'; @@ -431,7 +419,6 @@ $strKorean = 'Karejskaja'; $strLandscape = 'Krajavid'; $strLanguage = 'Mova'; $strLanguageUnknown = 'Nieviadomaja mova: %1$s.'; -$strLatchedPages = 'Fiksavanyja staronki'; $strLatexCaption = 'Zahałovak tablicy'; $strLatexContent = 'Źmieściva tablicy __TABLE__'; $strLatexContinuedCaption = 'Praciahnuty zahałovak tablicy'; @@ -440,6 +427,7 @@ $strLatexIncludeCaption = 'Uklučyć zahałovak tablicy'; $strLatexLabel = 'Kluč mietki'; $strLaTeX = 'LaTeX'; $strLatexStructure = 'Struktura tablicy __TABLE__'; +$strLatchedPages = 'Fiksavanyja staronki'; $strLatvian = 'Łatvijskaja'; $strLDI = 'CSV z vykarystańniem LOAD DATA'; $strLDILocal = 'Vykarystoŭvać klučavoje słova LOCAL'; @@ -468,9 +456,9 @@ $strMIME_available_mime = 'Dastupnyja MIME-typy'; $strMIME_available_transform = 'Dastupnyja pieraŭtvareńni'; $strMIME_description = 'Apisańnie'; $strMIME_MIMEtype = 'MIME-typ'; -$strMIME_nodescription = 'Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. +$strMIME_nodescription = 'Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. Kali łaska, spytajcie aŭtara, što robić %s.'; $strMIME_transformation_note = 'Dla atrymańnia śpisu dastupnych opcyjaŭ transfarmacyi i pieraŭtvareńniaŭ ichnych MIME-typaŭ, naciśnicie na %sapisańni pieraŭtvareńniaŭ%s'; -$strMIME_transformation_options_note = 'Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety farmat: \'a\', 100, b,\'c\'... +$strMIME_transformation_options_note = 'Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety farmat: \'a\', 100, b,\'c\'... Kali vam treba ŭžyć zvarotny słeš ("\") abo apostraf ("\'") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; $strMIME_transformation_options = 'Opcyi pieraŭtvareńnia'; $strMIME_transformation = 'Pieraŭtvareńnie MIME-typu braŭzeram'; $strMIMETypesForTable = 'MIME-typy tablicy'; @@ -776,7 +764,7 @@ $strServerVars = 'Nałady i źmiennyja servera'; $strServerVersion = 'Versija servera'; $strSessionStartupErrorGeneral = 'Niemahčyma biez pamyłak raspačać sesiju. Kali łaska, praviercie pamyłki ŭ vašym łogu PHP i, mahčyma, taksama ŭ łogu web-servera i skanfihurujcie PHP pravilna.'; $strSessionValue = 'Značeńnie sesii'; -$strSetEnumVal = 'Kali typ pola "enum" abo "set", kali łaska, uvodźcie značeńni vykarystoŭvajučy hety farmat: \'a\',\'b\',\'c\'... +$strSetEnumVal = 'Kali typ pola "enum" abo "set", kali łaska, uvodźcie značeńni vykarystoŭvajučy hety farmat: \'a\',\'b\',\'c\'... Kali vam patrebna ŭžyć zvarotny słeš ("\") abo apostraf ("\'") siarod hetych značeńniaŭ, pastaŭcie pierad imi zvarotny słeš (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; $strShowAll = 'Pakazać usie'; $strShowColor = 'Pakazać koler'; $strShowDatadictAs = 'Farmat słoŭnika dadzienych'; @@ -928,9 +916,9 @@ $strSQPBugInvalidIdentifer = 'Niapravilny identyfikatar'; $strSQPBugUnclosedQuote = 'Niezakrytaje dvukośsie'; $strSQPBugUnknownPunctuation = 'Nieviadomy symbal punktuacyi'; $strStandInStructureForView = 'Zamianialnaja struktura dla prahladu'; -$strStatCheckTime = 'Apošniaja pravierka'; $strStatCreateTime = 'Stvoranaja'; $strStatement = 'Vyrazy'; +$strStatCheckTime = 'Apošniaja pravierka'; $strStatisticsOverrun = 'Na zahružanym servery bajtavyja ličylniki mohuć pieraskokvać koła, tamu statystyka, jakuju pakazvaje MySQL-server, moža być niapravilnaj.'; $strStatUpdateTime = 'Apošniaje abnaŭleńnie'; $strStatus = 'Stan'; @@ -975,7 +963,7 @@ $strTable = 'Tablica'; $strTakeIt = 'hetaja'; $strTblPrivileges = 'Pryvilei, specyfičnyja dla tablicy'; $strTempData = 'Časovyja dadzienyja'; -$strTextAreaLength = ' Z-za vialikaj daŭžyni, +$strTextAreaLength = ' Z-za vialikaj daŭžyni, hetaje pole nia moža być adredagavanaje '; $strTexyText = 'Tekst Texy!'; $strThai = 'Tajlandzkaja'; $strThemeDefaultNotFound = 'Tema pa zmoŭčańni %s nia znojdzienaja!'; @@ -1111,7 +1099,7 @@ $strCouldNotConnectTarget = 'Could not connect to the target'; //to translate $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"'; //to translate $strCurrentServer = 'Current server'; //to translate -$strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate +$strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate $strDatabase_src = 'Source database'; //to translate $strDatabase_trg = 'Target database'; //to translate $strDataDiff = 'Data Difference'; //to translate @@ -1166,11 +1154,11 @@ $strRemoteServer = 'Remote server'; //to translate $strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strReplicationAddLines = 'Now, add the following lines at the end of your my.cnf and please restart the MySQL server afterwards.'; //to translate $strReplicationAddSlaveUser = 'Add slave replication user'; //to translate -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; //to translate $strReplicationControlSlave = 'Control slave:'; //to translate $strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; //to translate $strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; //to translate +$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate $strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; //to translate $strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; //to translate $strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; //to translate @@ -1183,10 +1171,10 @@ $strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report- $strReplicationShowConnectedSlaves = 'Show connected slaves'; //to translate $strReplicationShowMasterStatus = 'Show master status'; //to translate $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; //to translate -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate $strReplicationSlaveConfiguration = 'Slave configuration'; //to translate $strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; //to translate $strReplicationSlaveErrorManagement = 'Error management:'; //to translate +$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate $strReplicationSlaveIOThread = 'IO Thread %s only'; //to translate $strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'; //to translate $strReplicationSlaveReset = 'Reset slave'; //to translate @@ -1225,13 +1213,6 @@ $strSetupBZipDump_name = 'Bzip2'; //to translate $strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupCannotLoadConfig = 'Cannot load or save configuration'; //to translate $strSetupCannotLoadConfigMsg = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'; //to translate -$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate -$strSetupCharEditing_name = 'CHAR fields editing'; //to translate -$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate -$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate -$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate $strSetupClear = 'Clear'; //to translate $strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature'; //to translate $strSetupCompressOnFly_name = 'Compress on the fly'; //to translate @@ -1273,12 +1254,12 @@ $strSetuperror_nan_p = 'Not a positive number'; //to translate $strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)'; //to translate $strSetupExecTimeLimit_name = 'Maximum execution time'; //to translate $strSetupExport_asfile_name = 'Save as file'; //to translate -$strSetupExport_charset_name = 'Character set of the file'; //to translate $strSetupExport_compression_name = 'Compression'; //to translate $strSetupExport_file_template_database_name = 'Database name template'; //to translate $strSetupExport_file_template_server_name = 'Server name template'; //to translate $strSetupExport_file_template_table_name = 'Table name template'; //to translate $strSetupExport_format_name = 'Format'; //to translate +$strSetupExport_charset_name = 'Character set of the file'; //to translate $strSetupExport_onserver_name = 'Save on server'; //to translate $strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)'; //to translate $strSetupExport_remember_file_template_name = 'Remember file name template'; //to translate @@ -1341,6 +1322,13 @@ $strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] c $strSetupGZipDump_name = 'GZip'; //to translate $strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupHomepageLink = 'phpMyAdmin homepage'; //to translate +$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate +$strSetupCharEditing_name = 'CHAR fields editing'; //to translate +$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate +$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate +$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate $strSetupIconvExtraParams_name = 'Extra parameters for iconv'; //to translate $strSetupIgnoreErrors = 'Ignore errors'; //to translate $strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed'; //to translate @@ -1388,10 +1376,10 @@ $strSetupLoginCookieStore_name = 'Login cookie store'; //to translate $strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid'; //to translate $strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; //to translate $strSetupLoginCookieValidity_name = 'Login cookie validity'; //to translate -$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate -$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate $strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list'; //to translate $strSetupMaxDbList_name = 'Maximum databases'; //to translate +$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate +$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate $strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.'; //to translate $strSetupMaxRows_name = 'Maximum number of rows to display'; //to translate $strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list'; //to translate @@ -1498,20 +1486,20 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave $strSetupServers_table_info_name = 'Display fields table'; //to translate $strSetupServers_user_desc = 'Leave empty if not using config auth'; //to translate $strSetupServers_user_name = 'User for config auth'; //to translate +$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; //to translate $strSetupServers_verbose_check_name = 'Verbose check'; //to translate -$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate $strSetupServers_verbose_name = 'Verbose name of this server'; //to translate $strSetupSetValue = 'Set value: %s'; //to translate $strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button'; //to translate $strSetupShowAll_name = 'Allow to display all the rows'; //to translate -$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate -$strSetupShowChgPassword_name = 'Show password change form'; //to translate $strSetupShowCreateDb_name = 'Show create database form'; //to translate $strSetupShowForm = 'Show form'; //to translate $strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode'; //to translate $strSetupShowFunctionFields_name = 'Show function fields'; //to translate $strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)'; //to translate +$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate +$strSetupShowChgPassword_name = 'Show password change form'; //to translate $strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'; //to translate $strSetupShowPhpInfo_name = 'Show phpinfo() link'; //to translate $strSetupShowServerInfo_name = 'Show detailed MySQL server information'; //to translate diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 3ab7721..2fa3569 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -35,17 +35,15 @@ msgstr "" #. l10n: Language to use for MySQL 5.1 documentation #: libraries/common.lib.php:411 -#, fuzzy msgctxt "$mysql_5_1_doc_lang" msgid "en" -msgstr "Adpraŭlena" +msgstr "" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 -#, fuzzy msgctxt "$mysql_5_0_doc_lang" msgid "en" -msgstr "Adpraŭlena" +msgstr "" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:15 @@ -315,9 +313,8 @@ msgid "And" msgstr "I" #: libraries/messages.inc.php:61 -#, fuzzy msgid "and" -msgstr "I" +msgstr "" #: libraries/messages.inc.php:62 msgid "and then" @@ -457,40 +454,35 @@ msgid "Are you sure you want to disable all BLOB references for database %s?" msgstr "" #: libraries/messages.inc.php:96 -#, fuzzy msgctxt "$strBLOBRepositoryDisabled" msgid "Disabled" -msgstr "Adklučana" +msgstr "" #: libraries/messages.inc.php:97 -#, fuzzy msgid "Disable" -msgstr "Adklučana" +msgstr "" #: libraries/messages.inc.php:98 msgid "You are about to DISABLE a BLOB Repository!" msgstr "" #: libraries/messages.inc.php:99 -#, fuzzy msgctxt "$strBLOBRepositoryEnabled" msgid "Enabled" -msgstr "Uklučana" +msgstr "" #: libraries/messages.inc.php:100 -#, fuzzy msgid "Enable" -msgstr "Uklučana" +msgstr "" #: libraries/messages.inc.php:101 msgid "Remove BLOB Repository Reference" msgstr "" #: libraries/messages.inc.php:102 -#, fuzzy msgctxt "$strBLOBRepositoryRepair" msgid "Repair" -msgstr "Adramantavać" +msgstr "" #: libraries/messages.inc.php:103 msgid "Upload to BLOB repository" @@ -610,11 +602,7 @@ msgid "" "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " "extension. Please check your PHP configuration." msgstr "" -"niemahčyma zahruzić pašyreńnie %s;\n" -"$strCantLoadRecodeIconv = 'Niemahčyma zahruzić pašyreńnie iconv abo " -"pašyreńnie recode, nieabchodnyja dla pierakadavańnia symbalaŭ. Naładźcie PHP " -"na vykarystańnie hetych pašyreńniaŭ abo ŭvohule adklučycie pierakadavańnie " -"symbalaŭ u phpMyAdmin." +"niemahčyma zahruzić pašyreńnie %s; kali łaska, praviercie kanfihuracyju PHP" #: libraries/messages.inc.php:132 msgid "" @@ -622,6 +610,9 @@ msgid "" "Either configure PHP to enable these extensions or disable charset " "conversion in phpMyAdmin." msgstr "" +"Niemahčyma zahruzić pašyreńnie iconv abo pašyreńnie recode, nieabchodnyja " +"dla pierakadavańnia symbalaŭ. Naładźcie PHP na vykarystańnie hetych " +"pašyreńniaŭ abo ŭvohule adklučycie pierakadavańnie symbalaŭ u phpMyAdmin." #: libraries/messages.inc.php:133 msgid "Can't rename index to PRIMARY!" @@ -811,14 +802,17 @@ msgid "" "semicolon is missing somewhere.<br />If you receive a blank page, everything " "is fine." msgstr "" -"phpMyAdmin nia moža pračytać kanfihuracyjny fajł!\n" -"$strConfigureTableCoord = 'Kali łaska, skanfihurujcie kaardynaty dla tablicy " -"%s" +"phpMyAdmin nia moža pračytać kanfihuracyjny fajł! Heta moža adbycca ŭ " +"vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža " +"znajści fajł. Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, " +"vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni " +"PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka " +"z koskaj. Kali vy atrymajecie čystuju staronku, značyć, usio dobra." #: libraries/messages.inc.php:175 #, php-format msgid "Please configure the coordinates for table %s" -msgstr "" +msgstr "Kali łaska, skanfihurujcie kaardynaty dla tablicy %s" #: libraries/messages.inc.php:176 msgid "Cannot connect: invalid settings." @@ -925,10 +919,9 @@ msgid "Create table" msgstr "Stvaryć tablicu" #: libraries/messages.inc.php:200 -#, fuzzy msgctxt "$strCreateTableShort" msgid "Create table" -msgstr "Stvaryć tablicu" +msgstr "" #: libraries/messages.inc.php:201 msgid "Database for user" @@ -943,12 +936,12 @@ msgstr "" #, fuzzy msgctxt "$strCreateUserDatabaseNone" msgid "None" -msgstr "Niama" +msgstr "Nijakaja" #: libraries/messages.inc.php:204 -#, fuzzy, php-format +#, php-format msgid "Grant all privileges on database "%s"" -msgstr "Pravieryć pryvilei dla bazy \"%s\"." +msgstr "" #: libraries/messages.inc.php:205 msgid "Grant all privileges on wildcard name (username\\_%)" @@ -1032,9 +1025,8 @@ msgid "%s databases have been dropped successfully." msgstr "%s bazaŭ dadzienych byli paśpiachova vydalenyja." #: libraries/messages.inc.php:225 -#, fuzzy msgid "Source database" -msgstr "Pošuk u bazie dadzienych" +msgstr "" #: libraries/messages.inc.php:226 msgid "Databases statistics" @@ -1057,9 +1049,8 @@ msgstr "" "kolkaść trafiku pamiž web-serveram i serveram MySQL." #: libraries/messages.inc.php:230 -#, fuzzy msgid "Target database" -msgstr "Pošuk u bazie dadzienych" +msgstr "" #: libraries/messages.inc.php:231 msgid "Data" @@ -1070,9 +1061,8 @@ msgid "Data Dictionary" msgstr "Słoŭnik dadzienych" #: libraries/messages.inc.php:233 -#, fuzzy msgid "Data Difference" -msgstr "Struktura dla prahladu" +msgstr "" #: libraries/messages.inc.php:234 msgid "Data only" @@ -1586,14 +1576,12 @@ msgid "Free pages" msgstr "Volnych staronak" #: libraries/messages.inc.php:351 -#, fuzzy msgid "Full start" -msgstr "Poŭnatekstekstavaje" +msgstr "" #: libraries/messages.inc.php:352 -#, fuzzy msgid "Full stop" -msgstr "Poŭnatekstekstavaje" +msgstr "" #: libraries/messages.inc.php:353 msgid "Full Texts" @@ -1656,14 +1644,12 @@ msgid "Go" msgstr "Paniesłasia" #: libraries/messages.inc.php:369 -#, fuzzy msgid "Go to database" -msgstr "Bazy dadzienych adsutničajuć" +msgstr "" #: libraries/messages.inc.php:370 -#, fuzzy msgid "Go to table" -msgstr "Bazy dadzienych adsutničajuć" +msgstr "" #: libraries/messages.inc.php:371 msgid "Go to view" @@ -2308,12 +2294,13 @@ msgid "MIME type" msgstr "MIME-typ" #: libraries/messages.inc.php:519 -#, php-format, fuzzy +#, php-format msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia.\n" +"Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. Kali łaska, " +"spytajcie aŭtara, što robić %s." #: libraries/messages.inc.php:520 msgid "Browser transformation" @@ -2324,9 +2311,9 @@ msgstr "Pieraŭtvareńnie MIME-typu braŭzeram" msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" -msgstr "Dla atrymańnia śpisu dastupnych opcyjaŭ " -"transfarmacyi i pieraŭtvareńniaŭ ichnych MIME-typaŭ, naciśnicie na %" -"sapisańni pieraŭtvareńniaŭ%s" +msgstr "" +"Dla atrymańnia śpisu dastupnych opcyjaŭ transfarmacyi i pieraŭtvareńniaŭ " +"ichnych MIME-typaŭ, naciśnicie na %sapisańni pieraŭtvareńniaŭ%s" #: libraries/messages.inc.php:522 msgid "" @@ -2336,13 +2323,13 @@ msgid "" "'\\\\xyz' or 'a\\'b')." msgstr "" "Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety " -"farmat: 'a', 100, b,'c'...\n" -"$strMIME_transformation_options = 'Opcyi pieraŭtvareńnia" +"farmat: 'a', 100, b,'c'... Kali vam treba ŭžyć zvarotny słeš (\"\\\") abo " +"apostraf (\"'\") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi " +"(naprykład, '\\\\xyz' abo 'a\\'b')." #: libraries/messages.inc.php:523 -#, fuzzy msgid "Transformation options" -msgstr "Hety farmat nia maje opcyjaŭ" +msgstr "Opcyi pieraŭtvareńnia" #: libraries/messages.inc.php:524 msgid "MIME TYPES FOR TABLE" @@ -2499,14 +2486,12 @@ msgid "Name" msgstr "Nazva" #: libraries/messages.inc.php:554 -#, fuzzy msgid "Filter" -msgstr "Fajły" +msgstr "" #: libraries/messages.inc.php:555 -#, fuzzy msgid "New table" -msgstr "Niama tablic" +msgstr "" #: libraries/messages.inc.php:556 msgid "Next" @@ -2576,14 +2561,13 @@ msgid "No change" msgstr "Niama źmienaŭ" #: libraries/messages.inc.php:570 -#, fuzzy msgctxt "$strNoneDefault" msgid "None" -msgstr "Niama" +msgstr "" #: libraries/messages.inc.php:571 msgid "None" -msgstr "Niama" +msgstr "Nijakaja" #: libraries/messages.inc.php:572 msgid "No" @@ -2962,9 +2946,8 @@ msgid "No tables" msgstr "Niama tablic" #: libraries/messages.inc.php:651 -#, fuzzy msgid "Page has been created" -msgstr "Tablica %1$s stvoranaja." +msgstr "" #: libraries/messages.inc.php:652 msgid "Page creation failed" @@ -3066,9 +3049,8 @@ msgid "Polish" msgstr "Polskaja" #: libraries/messages.inc.php:675 -#, fuzzy msgid "Port" -msgstr "Paradak" +msgstr "" #: libraries/messages.inc.php:676 msgid "Portrait" @@ -3452,9 +3434,8 @@ msgid "Reload" msgstr "Abnavić" #: libraries/messages.inc.php:765 -#, fuzzy msgid "Remote server" -msgstr "Web-server" +msgstr "" #: libraries/messages.inc.php:766 msgid "Remove CRLF characters within fields" @@ -3483,9 +3464,8 @@ msgid "Rename table to" msgstr "Pierajmienavać tablicu ŭ" #: libraries/messages.inc.php:772 -#, fuzzy msgid "Rename view to" -msgstr "Pierajmienavać tablicu ŭ" +msgstr "" #: libraries/messages.inc.php:773 msgid "Repair" @@ -3573,9 +3553,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:791 -#, fuzzy msgid "Please select databases:" -msgstr "Kali łaska, vybierycie bazu dadzienych" +msgstr "" #: libraries/messages.inc.php:792 #, php-format @@ -3678,19 +3657,16 @@ msgid "" msgstr "" #: libraries/messages.inc.php:813 -#, fuzzy msgid "Master status" -msgstr "Pakazać stan zaležnych serveraŭ" +msgstr "" #: libraries/messages.inc.php:814 -#, fuzzy msgid "Replication status" -msgstr "Replikacyja" +msgstr "" #: libraries/messages.inc.php:815 -#, fuzzy msgid "Slave status" -msgstr "Pakazać stan zaležnych serveraŭ" +msgstr "" #: libraries/messages.inc.php:816 msgid "Synchronize databases with master" @@ -4014,8 +3990,9 @@ msgid "" "(for example '\\\\xyz' or 'a\\'b')." msgstr "" "Kali typ pola \"enum\" abo \"set\", kali łaska, uvodźcie značeńni " -"vykarystoŭvajučy hety farmat: 'a','b','c'...\n" -"$strShowAll = 'Pakazać usie" +"vykarystoŭvajučy hety farmat: 'a','b','c'... Kali vam patrebna ŭžyć zvarotny " +"słeš (\"\\\") abo apostraf (\"'\") siarod hetych značeńniaŭ, pastaŭcie " +"pierad imi zvarotny słeš (naprykład, '\\\\xyz' abo 'a\\'b')." #: libraries/messages.inc.php:889 msgid "settings" @@ -4041,9 +4018,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:893 -#, fuzzy msgid "Allow login to any MySQL server" -msgstr "Niemahčyma załahavacca na server MySQL" +msgstr "" #: libraries/messages.inc.php:894 msgid "Show "Drop database" link to normal users" @@ -4151,9 +4127,8 @@ msgid "Check config file permissions" msgstr "" #: libraries/messages.inc.php:916 -#, fuzzy msgid "Clear" -msgstr "Kalandar" +msgstr "" #: libraries/messages.inc.php:917 msgid "" @@ -4200,27 +4175,24 @@ msgid "Tab that is displayed when entering a database" msgstr "" #: libraries/messages.inc.php:927 -#, fuzzy msgid "Default database tab" -msgstr "Pierajmienavać bazu dadzienych u" +msgstr "" #: libraries/messages.inc.php:928 msgid "Tab that is displayed when entering a server" msgstr "" #: libraries/messages.inc.php:929 -#, fuzzy msgid "Default server tab" -msgstr "Pierajmienavać bazu dadzienych u" +msgstr "" #: libraries/messages.inc.php:930 msgid "Tab that is displayed when entering a table" msgstr "" #: libraries/messages.inc.php:931 -#, fuzzy msgid "Default table tab" -msgstr "Pierajmienavać bazu dadzienych u" +msgstr "" #: libraries/messages.inc.php:932 msgid "" @@ -4249,9 +4221,8 @@ msgid "Display servers as a list" msgstr "" #: libraries/messages.inc.php:938 -#, fuzzy msgid "Donate" -msgstr "Dadzienyja" +msgstr "" #: libraries/messages.inc.php:939 msgid "Download" @@ -4326,33 +4297,28 @@ msgid "Maximum execution time" msgstr "" #: libraries/messages.inc.php:957 -#, fuzzy msgid "Character set of the file" -msgstr "Kadyroŭka fajła:" +msgstr "" #: libraries/messages.inc.php:959 -#, fuzzy msgid "Database name template" -msgstr "Šablon nazvy fajła" +msgstr "" #: libraries/messages.inc.php:960 -#, fuzzy msgid "Server name template" -msgstr "Šablon nazvy fajła" +msgstr "" #: libraries/messages.inc.php:961 -#, fuzzy msgid "Table name template" -msgstr "Šablon nazvy fajła" +msgstr "" #: libraries/messages.inc.php:963 msgid "Save on server" msgstr "" #: libraries/messages.inc.php:965 -#, fuzzy msgid "Remember file name template" -msgstr "Šablon nazvy fajła" +msgstr "" #: libraries/messages.inc.php:966 msgid "no" @@ -4407,23 +4373,20 @@ msgid "Edit mode" msgstr "" #: libraries/messages.inc.php:978 -#, fuzzy msgid "Customize default export options" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:979 -#, fuzzy msgid "Export defaults" -msgstr "Impartavać fajły" +msgstr "" #: libraries/messages.inc.php:980 msgid "Customize default common import options" msgstr "" #: libraries/messages.inc.php:981 -#, fuzzy msgid "Import defaults" -msgstr "Impartavać fajły" +msgstr "" #: libraries/messages.inc.php:982 msgid "Set import and export directories and compression options" @@ -4434,9 +4397,8 @@ msgid "Import / export" msgstr "" #: libraries/messages.inc.php:985 -#, fuzzy msgid "Databases display options" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:986 msgid "Customize appearance of the navigation frame" @@ -4447,14 +4409,12 @@ msgid "Navigation frame" msgstr "" #: libraries/messages.inc.php:988 -#, fuzzy msgid "Servers display options" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:990 -#, fuzzy msgid "Tables display options" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:992 msgid "Main frame" @@ -4469,9 +4429,8 @@ msgid "Other core settings" msgstr "" #: libraries/messages.inc.php:995 -#, fuzzy msgid "Customize query window options" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:997 msgid "" @@ -4526,18 +4485,16 @@ msgid "Customization" msgstr "" #: libraries/messages.inc.php:1008 -#, fuzzy msgid "Customize export options" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:1009 msgid "Features" msgstr "" #: libraries/messages.inc.php:1010 -#, fuzzy msgid "Customize import defaults" -msgstr "Nałady ekspartu bazy dadzienych" +msgstr "" #: libraries/messages.inc.php:1011 msgid "Customize navigation frame" @@ -4552,9 +4509,8 @@ msgid "Customize links shown in SQL Query boxes" msgstr "" #: libraries/messages.inc.php:1014 -#, fuzzy msgid "SQL Query box" -msgstr "SQL-zapyt" +msgstr "" #: libraries/messages.inc.php:1015 msgid "" @@ -4563,27 +4519,24 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1016 -#, fuzzy msgid "SQL queries" -msgstr "SQL-zapyt" +msgstr "" #: libraries/messages.inc.php:1017 msgid "Customize startup page" msgstr "" #: libraries/messages.inc.php:1018 -#, fuzzy msgid "Startup" -msgstr "Stan" +msgstr "" #: libraries/messages.inc.php:1019 msgid "Choose how you want tabs to work" msgstr "" #: libraries/messages.inc.php:1020 -#, fuzzy msgid "Tabs" -msgstr "Tablica" +msgstr "" #: libraries/messages.inc.php:1021 msgid "" @@ -4604,9 +4557,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1024 -#, fuzzy msgid "phpMyAdmin homepage" -msgstr "Dakumentacyja pa phpMyAdmin" +msgstr "" #: libraries/messages.inc.php:1025 msgid "Extra parameters for iconv" @@ -4627,15 +4579,11 @@ msgid "Ignore multiple statement errors" msgstr "" #: libraries/messages.inc.php:1029 -#, fuzzy msgid "" "Allow interrupt of import in case script detects it is close to time limit. " "This might be good way to import large files, however it can break " "transactions." msgstr "" -"Dazvolić spynieńnie impartavańnia ŭ vypadku, kali skrypt vyśvietlić, što " -"skončvajecca čas vykanańnia. Heta moža być dobrym sposabam impartavańnia " -"vialikich fajłaŭ, adnak, heta moža pierapynić tranzakcyi." #: libraries/messages.inc.php:1030 msgid "Partial import: allow interrupt" @@ -4677,9 +4625,8 @@ msgid "How many rows can be inserted at one time" msgstr "" #: libraries/messages.inc.php:1039 -#, fuzzy msgid "Number of inserted rows" -msgstr "Kolkaść adsartavanych radkoŭ." +msgstr "" #: libraries/messages.inc.php:1040 msgid "Target for quick access icon" @@ -4706,9 +4653,8 @@ msgid "String that separates databases into different tree levels" msgstr "" #: libraries/messages.inc.php:1046 -#, fuzzy msgid "Database tree separator" -msgstr "Šablon nazvy fajła" +msgstr "" #: libraries/messages.inc.php:1047 msgid "" @@ -4725,9 +4671,8 @@ msgid "Disable this if you want to see all databases at once" msgstr "" #: libraries/messages.inc.php:1050 -#, fuzzy msgid "Use light version" -msgstr "Versija klijenta MySQL" +msgstr "" #: libraries/messages.inc.php:1051 msgid "Maximum table tree depth" @@ -4776,9 +4721,8 @@ msgid "Light tabs" msgstr "" #: libraries/messages.inc.php:1062 -#, fuzzy msgid "Load" -msgstr "Lakalny" +msgstr "" #: libraries/messages.inc.php:1063 msgid "" @@ -4841,9 +4785,8 @@ msgid "Maximum number of databases displayed in left frame and database list" msgstr "" #: libraries/messages.inc.php:1075 -#, fuzzy msgid "Maximum databases" -msgstr "Bazy dadzienych adsutničajuć" +msgstr "" #: libraries/messages.inc.php:1076 msgid "" @@ -4871,9 +4814,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1081 -#, fuzzy msgid "Memory limit" -msgstr "Abmiežavańni resursaŭ" +msgstr "" #: libraries/messages.inc.php:1082 libraries/messages.inc.php:1094 msgid "Use only icons, only text or both" @@ -4884,9 +4826,8 @@ msgid "Iconic navigation bar" msgstr "" #: libraries/messages.inc.php:1084 -#, fuzzy msgid "New server" -msgstr "Web-server" +msgstr "" #: libraries/messages.inc.php:1085 msgid "There are no configured servers" @@ -4985,9 +4926,8 @@ msgid "Directory where exports can be saved on server" msgstr "" #: libraries/messages.inc.php:1109 -#, fuzzy msgid "Save directory" -msgstr "Chatniaja tečka dadzienych" +msgstr "" #: libraries/messages.inc.php:1110 #, php-format @@ -5008,27 +4948,24 @@ msgid "You allow for connecting to the server without a password." msgstr "" #: libraries/messages.inc.php:1113 -#, fuzzy msgid "Add a new server" -msgstr "Dadać novaha karystalnika" +msgstr "" #: libraries/messages.inc.php:1114 msgid "Leave blank if not used" msgstr "" #: libraries/messages.inc.php:1115 -#, fuzzy msgid "Host authentication order" -msgstr "Aparatnaja aŭtentyfikacyja skončyłasia niaŭdała" +msgstr "" #: libraries/messages.inc.php:1116 msgid "Leave blank for defaults" msgstr "" #: libraries/messages.inc.php:1117 -#, fuzzy msgid "Host authentication rules" -msgstr "Aparatnaja aŭtentyfikacyja skončyłasia niaŭdała" +msgstr "" #: libraries/messages.inc.php:1118 msgid "Allow logins without a password" @@ -5058,14 +4995,12 @@ msgid "SweKey config file" msgstr "" #: libraries/messages.inc.php:1124 -#, fuzzy msgid "Authentication method to use" -msgstr "Aŭtentyfikacyja..." +msgstr "" #: libraries/messages.inc.php:1125 -#, fuzzy msgid "Authentication type" -msgstr "Aŭtentyfikacyja..." +msgstr "" #: libraries/messages.inc.php:1126 msgid "" @@ -5100,9 +5035,8 @@ msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure" msgstr "" #: libraries/messages.inc.php:1133 -#, fuzzy msgid "Connection type" -msgstr "Padłučeńni" +msgstr "" #: libraries/messages.inc.php:1134 msgid "Control user password" @@ -5123,9 +5057,8 @@ msgid "Count tables when showing database list" msgstr "" #: libraries/messages.inc.php:1138 -#, fuzzy msgid "Count tables" -msgstr "Niama tablic" +msgstr "" #: libraries/messages.inc.php:1139 msgid "" @@ -5134,9 +5067,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1140 -#, fuzzy msgid "Designer table" -msgstr "Defrahmentavać tablicu" +msgstr "" #: libraries/messages.inc.php:1141 msgid "" @@ -5160,27 +5092,24 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1144 -#, fuzzy msgid "Edit server" -msgstr "Web-server" +msgstr "" #: libraries/messages.inc.php:1145 msgid "What PHP extension to use; you should use mysqli if supported" msgstr "" #: libraries/messages.inc.php:1146 -#, fuzzy msgid "PHP extension to use" -msgstr "Pašyreńnie PHP" +msgstr "" #: libraries/messages.inc.php:1147 msgid "Hide databases matching regular expression (PCRE)" msgstr "" #: libraries/messages.inc.php:1148 -#, fuzzy msgid "Hide databases" -msgstr "Bazy dadzienych adsutničajuć" +msgstr "" #: libraries/messages.inc.php:1149 msgid "" @@ -5197,9 +5126,8 @@ msgid "Hostname where MySQL server is running" msgstr "" #: libraries/messages.inc.php:1152 -#, fuzzy msgid "Server hostname" -msgstr "imia servera" +msgstr "" #: libraries/messages.inc.php:1153 msgid "Logout URL" @@ -5252,9 +5180,8 @@ msgid "Port on which MySQL server is listening, leave empty for default" msgstr "" #: libraries/messages.inc.php:1165 -#, fuzzy msgid "Server port" -msgstr "ID servera" +msgstr "" #: libraries/messages.inc.php:1166 msgid "" @@ -5263,9 +5190,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1167 -#, fuzzy msgid "Relation table" -msgstr "Ramantavać tablicu" +msgstr "" #: libraries/messages.inc.php:1168 msgid "SQL command to fetch available databases" @@ -5298,9 +5224,8 @@ msgid "Socket on which MySQL server is listening, leave empty for default" msgstr "" #: libraries/messages.inc.php:1175 -#, fuzzy msgid "Server socket" -msgstr "Vybar servera" +msgstr "" #: libraries/messages.inc.php:1176 msgid "Enable SSL for connection to MySQL server" @@ -5383,9 +5308,8 @@ msgid "Show create database form" msgstr "" #: libraries/messages.inc.php:1194 -#, fuzzy msgid "Show form" -msgstr "Pakazać koler" +msgstr "" #: libraries/messages.inc.php:1195 msgid "Display the function fields in edit/insert mode" @@ -5418,18 +5342,16 @@ msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" msgstr "" #: libraries/messages.inc.php:1202 -#, fuzzy msgid "Show SQL queries" -msgstr "Pakazać poŭnyja zapyty" +msgstr "" #: libraries/messages.inc.php:1203 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" #: libraries/messages.inc.php:1204 -#, fuzzy msgid "Show statistics" -msgstr "Statystyka radku" +msgstr "" #: libraries/messages.inc.php:1205 msgid "" @@ -5463,9 +5385,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1211 -#, fuzzy msgid "Skip locked tables" -msgstr "Pakazać adkrytyja tablicy" +msgstr "" #: libraries/messages.inc.php:1216 libraries/messages.inc.php:1596 msgid "Validate SQL" @@ -5482,9 +5403,8 @@ msgid "Suggest new database name" msgstr "" #: libraries/messages.inc.php:1219 -#, fuzzy msgid "yes" -msgstr "Tak" +msgstr "" #: libraries/messages.inc.php:1220 msgid "" @@ -5503,9 +5423,8 @@ msgid "Directory on server where you can upload files for import" msgstr "" #: libraries/messages.inc.php:1223 -#, fuzzy msgid "Upload directory" -msgstr "Chatniaja tečka dadzienych" +msgstr "" #: libraries/messages.inc.php:1224 msgid "Allow for searching inside the entire database" @@ -5600,9 +5519,8 @@ msgid "ZIP" msgstr "" #: libraries/messages.inc.php:1242 -#, fuzzy msgid "Show all" -msgstr "Pakazać tablicy" +msgstr "Pakazać usie" #: libraries/messages.inc.php:1243 msgid "Show binary contents as HEX" @@ -5653,9 +5571,8 @@ msgid "Showing SQL query" msgstr "U vyhladzie SQL-zapytu" #: libraries/messages.inc.php:1255 -#, fuzzy msgid "Show insert query" -msgstr "U vyhladzie SQL-zapytu" +msgstr "" #: libraries/messages.inc.php:1256 msgid "Only show keys" @@ -6496,9 +6413,8 @@ msgid "Stand-in structure for view" msgstr "Zamianialnaja struktura dla prahladu" #: libraries/messages.inc.php:1402 -#, fuzzy msgid "Start" -msgstr "Sub" +msgstr "" #: libraries/messages.inc.php:1403 msgid "Last check" @@ -6570,18 +6486,16 @@ msgid "Propose table structure" msgstr "Prapanavanaja struktura tablicy" #: libraries/messages.inc.php:1419 -#, fuzzy msgid "Structure Difference" -msgstr "Struktura dla prahladu" +msgstr "" #: libraries/messages.inc.php:1420 msgid "Structure for view" msgstr "Struktura dla prahladu" #: libraries/messages.inc.php:1421 -#, fuzzy msgid "structure" -msgstr "Struktura" +msgstr "" #: libraries/messages.inc.php:1422 msgid "Structure" @@ -6780,13 +6694,11 @@ msgstr "Časovyja dadzienyja" #: libraries/messages.inc.php:1468 msgid " Because of its length,<br /> this field might not be editable " -msgstr "" -" Z-za vialikaj daŭžyni,\n" -"$strTexyText = 'Tekst Texy!" +msgstr " Z-za vialikaj daŭžyni, hetaje pole nia moža być adredagavanaje " #: libraries/messages.inc.php:1469 msgid "Texy! text" -msgstr "" +msgstr "Tekst Texy!" #: libraries/messages.inc.php:1470 msgid "Thai" @@ -6906,9 +6818,8 @@ msgid "Comment out these two lines if you do not need them." msgstr "" #: libraries/messages.inc.php:1494 -#, fuzzy msgid "Create version" -msgstr "Stvaryć suviaź" +msgstr "" #: libraries/messages.inc.php:1495 #, php-format @@ -6916,9 +6827,8 @@ msgid "Create version %s of %s.%s" msgstr "" #: libraries/messages.inc.php:1496 -#, fuzzy msgid "Database Log" -msgstr "Baza dadzienych" +msgstr "" #: libraries/messages.inc.php:1497 msgid "Data definition statement" @@ -6929,9 +6839,8 @@ msgid "Data manipulation statement" msgstr "" #: libraries/messages.inc.php:1499 -#, fuzzy msgid "Date" -msgstr "Dadzienyja" +msgstr "" #: libraries/messages.inc.php:1500 msgid "Deactivate now" @@ -6943,9 +6852,9 @@ msgid "Deactivate tracking for %s.%s" msgstr "" #: libraries/messages.inc.php:1502 -#, fuzzy, php-format +#, php-format msgid "Export as %s" -msgstr "Typ ekspartu" +msgstr "" #: libraries/messages.inc.php:1503 msgid "Tracking is active." @@ -7018,28 +6927,24 @@ msgid "not active" msgstr "" #: libraries/messages.inc.php:1520 -#, fuzzy msgid "Structure snapshot" -msgstr "Tolki strukturu" +msgstr "" #: libraries/messages.inc.php:1521 -#, fuzzy msgid "Created" -msgstr "Stvaryć" +msgstr "" #: libraries/messages.inc.php:1522 -#, fuzzy msgid "Last version" -msgstr "Stvaryć suviaź" +msgstr "" #: libraries/messages.inc.php:1523 msgid "Updated" msgstr "" #: libraries/messages.inc.php:1524 -#, fuzzy msgid "Version" -msgstr "Persydzkaja" +msgstr "" #: libraries/messages.inc.php:1525 msgid "Track these data definition statements:" @@ -7050,28 +6955,24 @@ msgid "Track these data manipulation statements:" msgstr "" #: libraries/messages.inc.php:1527 -#, fuzzy msgid "Tracked tables" -msgstr "Pravieryć tablicu" +msgstr "" #: libraries/messages.inc.php:1528 msgid "Tracking" msgstr "" #: libraries/messages.inc.php:1529 -#, fuzzy msgid "Track table" -msgstr "Pravieryć tablicu" +msgstr "" #: libraries/messages.inc.php:1530 -#, fuzzy msgid "Untracked tables" -msgstr "Pravieryć tablicu" +msgstr "" #: libraries/messages.inc.php:1531 -#, fuzzy msgid "Username" -msgstr "Imia karystalnika:" +msgstr "" #: libraries/messages.inc.php:1532 #, php-format @@ -7094,9 +6995,8 @@ msgid "Version %s snapshot (SQL code)" msgstr "" #: libraries/messages.inc.php:1536 -#, fuzzy msgid "Versions" -msgstr "Persydzkaja" +msgstr "" #: libraries/messages.inc.php:1537 msgid "" @@ -7560,9 +7460,8 @@ msgid "" msgstr "" #: libraries/messages.inc.php:1624 -#, fuzzy msgid "Export contents" -msgstr "Typ ekspartu" +msgstr "" #: libraries/messages.inc.php:1625 msgid "Export functions" @@ -7577,19 +7476,16 @@ msgid "Export Structure Schemas (recommended)" msgstr "" #: libraries/messages.inc.php:1628 -#, fuzzy msgid "Export tables" -msgstr "Typ ekspartu" +msgstr "" #: libraries/messages.inc.php:1629 -#, fuzzy msgid "Export triggers" -msgstr "Typ ekspartu" +msgstr "" #: libraries/messages.inc.php:1630 -#, fuzzy msgid "Export views" -msgstr "Typ ekspartu" +msgstr "" #: libraries/messages.inc.php:1631 msgid "XML" @@ -7610,17 +7506,5 @@ msgstr "archivavany ŭ zip" #: server_privileges.php:1904 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -"Symbali padstanoŭki _ i % musiać być ekranavanymi symbalem \\ dla ich " +"Symbali padstanoŭki % i _ musiać być ekranavanymi symbalem \\ dla ich " "litaralnaha vykarystańnia" - -#~ msgid "utf-8" -#~ msgstr "utf-8" - -#~ msgid "Jan0" -#~ msgstr "Stu0" - -#~ msgid "Jan1" -#~ msgstr "Stu1" - -#~ msgid "Jan2" -#~ msgstr "Stu2" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-74-g459fe9e
by Michal Čihař 24 Mar '10

24 Mar '10

The branch, QA_3_3 has been updated via 459fe9e905be784bcb0d3ce8ad54486c906be938 (commit) via cdef72f707e0f2a5ebf0a6a897811795f7dea165 (commit) via c70bd771719efa2fd1711f163e2aabb6bb304325 (commit) via 9f155b618c65ba2bf49f8a6dbf51d7e6f562087c (commit) from e8d86a5869d45a5e019bf9460d5fb0c9b398216f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lang/belarusian_latin-utf-8.inc.php | 66 ++++++++++++++-------------------- 1 files changed, 27 insertions(+), 39 deletions(-) diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index de2985e..bb0bc70 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -21,18 +21,6 @@ $month = array('Stu', 'Lut', 'Sak', 'Kra', 'Tra', 'Čer', 'Lip', 'Žni', 'Vier', $datefmt = '%d %B %Y, %H:%M'; $timespanfmt = '%s dzion, %s hadzinaŭ, %s chvilinaŭ i %s sekundaŭ'; -kali łaska, praviercie kanfihuracyju PHP'; -Heta moža adbycca ŭ vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža znajści fajł. -Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka z koskaj. -Kali vy atrymajecie čystuju staronku, značyć, usio dobra.'; - -Kali łaska, spytajcie aŭtara, što robić %s.'; -Kali vam treba ŭžyć zvarotny słeš ("\") abo apostraf ("\'") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; - -Kali vam patrebna ŭžyć zvarotny słeš ("\") abo apostraf ("\'") siarod hetych značeńniaŭ, pastaŭcie pierad imi zvarotny słeš (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; - -hetaje pole nia moža być adredagavanaje '; - $strAbortedClients = 'Spyniena'; $strAccessDeniedCreateConfig = 'Imavierna, pryčyna hetaha ŭ tym, što nia stvorany kanfihuracyjny fajł. Kab jaho stvaryć, možna vykarystać %1$snaładačny skrypt%2$s.'; $strAccessDeniedExplanation = 'phpMyAdmin pasprabavaŭ padłučycca da servera MySQL, ale server adchiliŭ złučeńnie. Praviercie imia chostu, karystalnika i parol u config.inc.php i ŭpeŭniciesia, što jany adpaviadajuć infarmacyi, jakuju daŭ administratar MySQL-servera.'; @@ -124,7 +112,7 @@ $strCancel = 'Skasavać'; $strCanNotLoadExportPlugins = 'Niemahčyma zahruzić płahiny ekspartavańnia, kali łaska, praviercie ŭstalavanyja fajły!'; $strCanNotLoadImportPlugins = 'Niemahčyma zahruzić płahiny impartavańnia, kali łaska, praviercie ŭstaloŭku!'; $strCannotLogin = 'Niemahčyma załahavacca na server MySQL'; -$strCantLoad = 'niemahčyma zahruzić pašyreńnie %s; +$strCantLoad = 'niemahčyma zahruzić pašyreńnie %s; kali łaska, praviercie kanfihuracyju PHP'; $strCantLoadRecodeIconv = 'Niemahčyma zahruzić pašyreńnie iconv abo pašyreńnie recode, nieabchodnyja dla pierakadavańnia symbalaŭ. Naładźcie PHP na vykarystańnie hetych pašyreńniaŭ abo ŭvohule adklučycie pierakadavańnie symbalaŭ u phpMyAdmin.'; $strCantRenameIdxToPrimary = 'Niemahčyma pierajmienavać indeks u PRIMARY!'; $strCantUseRecodeIconv = 'Niemahčyma vykarystać ni funkcyju iconv, ni libiconvr, ni recode_string u toj čas, jak pašyreńnie paviedamlaje, što jano zahružanaje. Praviercie vašuju kanfihuracyju PHP.'; @@ -164,7 +152,7 @@ $strCompleteInserts = 'Poŭnaja ŭstaŭka'; $strCompression = 'Ścisk'; $strCompressionWillBeDetected = 'Metad ścisku impartavanaha fajła budzie vyznačanaja aŭtamatyčna z: %s'; $strConfigDefaultFileError = 'Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: "%1$s"'; -$strConfigFileError = 'phpMyAdmin nia moža pračytać kanfihuracyjny fajł! +$strConfigFileError = 'phpMyAdmin nia moža pračytać kanfihuracyjny fajł! Heta moža adbycca ŭ vypadku, kali PHP znojdzie syntaksyčnuju pamyłku ŭ im abo kali PHP nia moža znajści fajł. Kali łaska, zahruzicie kanfihuracyjny fajł niepasredna, vykarystoŭvajučy spasyłku, pryviedzienuju nižej, i pračytajcie paviedamleńni PHP pra pamyłki. U bolšaści vypadkaŭ, niedzie prapuščany apostraf abo kropka z koskaj. Kali vy atrymajecie čystuju staronku, značyć, usio dobra.'; $strConfigureTableCoord = 'Kali łaska, skanfihurujcie kaardynaty dla tablicy %s'; $strConnectionError = 'Niemahčyma padłučycca: niapravilnyja nałady.'; $strConnections = 'Padłučeńni'; @@ -352,13 +340,13 @@ $strHaveToShow = 'Vam nieabchodna vybrać prynamsi adnu kalonku dla adlustravań $strHebrew = 'Habrejskaja'; $strHelp = 'Dapamoha'; $strHexForBLOB = 'Šasnaccatkovyja značeńni dla polaŭ typu BLOB'; -$strHide = 'Schavać'; $strHideShowAll = 'Schavać/pakazać usie tablicy'; $strHideShowNoRelation = 'Schavać/pakazać tablicy biaz suviaziaŭ'; +$strHide = 'Schavać'; $strHome = 'Da pačatku'; $strHomepageOfficial = 'Aficyjnaja staronka phpMyAdmin'; -$strHost = 'Chost'; $strHostEmpty = 'Pustoje imia chostu!'; +$strHost = 'Chost'; $strHTMLExcel = 'Microsoft Excel 2000'; $strHTMLWord = 'Microsoft Word 2000'; $strHungarian = 'Vuhorskaja'; @@ -387,8 +375,8 @@ $strInnoDBAutoextendIncrementDesc = ' Pamier pryraščeńnia dla pašyreńnia pa $strInnoDBBufferPoolSizeDesc = 'Pamier buferu ŭ pamiaci, jaki InnoDB vykarystoŭvaje dla kešavańnia dadzienych i indeksaŭ tablic.'; $strInnoDBBufferPoolSize = 'Pamier pułu buferu'; $strInnoDBDataFilePath = 'Fajły dadzienych'; -$strInnoDBDataHomeDir = 'Chatniaja tečka dadzienych'; $strInnoDBDataHomeDirDesc = 'Ahulnaja častka šlachu tečki da ŭsich fajłaŭ dadzienych InnoDB.'; +$strInnoDBDataHomeDir = 'Chatniaja tečka dadzienych'; $strInnoDBPages = 'staronak'; $strInnodbStat = 'Stan InnoDB'; $strInsecureMySQL = 'Vaš kanfihuracyjny fajł utrymlivaje nałady (karystalnik root biez parolu), jakija adpaviadajuć pryvilejavanamu karystalniku MySQL pa zmoŭčańni. Vaš server MySQL pracuje z hetaj naładaj pa zmoŭčańni i źjaŭlajecca adkrytym dla źniešniaha ŭryvańnia, i tamu vam abaviazkova treba vypravić hetuju chibu ŭ biaśpiecy.'; @@ -431,7 +419,6 @@ $strKorean = 'Karejskaja'; $strLandscape = 'Krajavid'; $strLanguage = 'Mova'; $strLanguageUnknown = 'Nieviadomaja mova: %1$s.'; -$strLatchedPages = 'Fiksavanyja staronki'; $strLatexCaption = 'Zahałovak tablicy'; $strLatexContent = 'Źmieściva tablicy __TABLE__'; $strLatexContinuedCaption = 'Praciahnuty zahałovak tablicy'; @@ -440,6 +427,7 @@ $strLatexIncludeCaption = 'Uklučyć zahałovak tablicy'; $strLatexLabel = 'Kluč mietki'; $strLaTeX = 'LaTeX'; $strLatexStructure = 'Struktura tablicy __TABLE__'; +$strLatchedPages = 'Fiksavanyja staronki'; $strLatvian = 'Łatvijskaja'; $strLDI = 'CSV z vykarystańniem LOAD DATA'; $strLDILocal = 'Vykarystoŭvać klučavoje słova LOCAL'; @@ -468,9 +456,9 @@ $strMIME_available_mime = 'Dastupnyja MIME-typy'; $strMIME_available_transform = 'Dastupnyja pieraŭtvareńni'; $strMIME_description = 'Apisańnie'; $strMIME_MIMEtype = 'MIME-typ'; -$strMIME_nodescription = 'Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. +$strMIME_nodescription = 'Niama dastupnych apisańniaŭ dla hetaha pieraŭtvareńnia. Kali łaska, spytajcie aŭtara, što robić %s.'; $strMIME_transformation_note = 'Dla atrymańnia śpisu dastupnych opcyjaŭ transfarmacyi i pieraŭtvareńniaŭ ichnych MIME-typaŭ, naciśnicie na %sapisańni pieraŭtvareńniaŭ%s'; -$strMIME_transformation_options_note = 'Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety farmat: \'a\', 100, b,\'c\'... +$strMIME_transformation_options_note = 'Kali łaska, uvodźcie značeńni opcyjaŭ pieraŭtvareńnia vykarystoŭvajučy hety farmat: \'a\', 100, b,\'c\'... Kali vam treba ŭžyć zvarotny słeš ("\") abo apostraf ("\'") u hetych značeńniach, ustaŭcie zvarotny słeš pierad imi (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; $strMIME_transformation_options = 'Opcyi pieraŭtvareńnia'; $strMIME_transformation = 'Pieraŭtvareńnie MIME-typu braŭzeram'; $strMIMETypesForTable = 'MIME-typy tablicy'; @@ -776,7 +764,7 @@ $strServerVars = 'Nałady i źmiennyja servera'; $strServerVersion = 'Versija servera'; $strSessionStartupErrorGeneral = 'Niemahčyma biez pamyłak raspačać sesiju. Kali łaska, praviercie pamyłki ŭ vašym łogu PHP i, mahčyma, taksama ŭ łogu web-servera i skanfihurujcie PHP pravilna.'; $strSessionValue = 'Značeńnie sesii'; -$strSetEnumVal = 'Kali typ pola "enum" abo "set", kali łaska, uvodźcie značeńni vykarystoŭvajučy hety farmat: \'a\',\'b\',\'c\'... +$strSetEnumVal = 'Kali typ pola "enum" abo "set", kali łaska, uvodźcie značeńni vykarystoŭvajučy hety farmat: \'a\',\'b\',\'c\'... Kali vam patrebna ŭžyć zvarotny słeš ("\") abo apostraf ("\'") siarod hetych značeńniaŭ, pastaŭcie pierad imi zvarotny słeš (naprykład, \'\\\\xyz\' abo \'a\\\'b\').'; $strShowAll = 'Pakazać usie'; $strShowColor = 'Pakazać koler'; $strShowDatadictAs = 'Farmat słoŭnika dadzienych'; @@ -928,9 +916,9 @@ $strSQPBugInvalidIdentifer = 'Niapravilny identyfikatar'; $strSQPBugUnclosedQuote = 'Niezakrytaje dvukośsie'; $strSQPBugUnknownPunctuation = 'Nieviadomy symbal punktuacyi'; $strStandInStructureForView = 'Zamianialnaja struktura dla prahladu'; -$strStatCheckTime = 'Apošniaja pravierka'; $strStatCreateTime = 'Stvoranaja'; $strStatement = 'Vyrazy'; +$strStatCheckTime = 'Apošniaja pravierka'; $strStatisticsOverrun = 'Na zahružanym servery bajtavyja ličylniki mohuć pieraskokvać koła, tamu statystyka, jakuju pakazvaje MySQL-server, moža być niapravilnaj.'; $strStatUpdateTime = 'Apošniaje abnaŭleńnie'; $strStatus = 'Stan'; @@ -975,7 +963,7 @@ $strTable = 'Tablica'; $strTakeIt = 'hetaja'; $strTblPrivileges = 'Pryvilei, specyfičnyja dla tablicy'; $strTempData = 'Časovyja dadzienyja'; -$strTextAreaLength = ' Z-za vialikaj daŭžyni, +$strTextAreaLength = ' Z-za vialikaj daŭžyni, hetaje pole nia moža być adredagavanaje '; $strTexyText = 'Tekst Texy!'; $strThai = 'Tajlandzkaja'; $strThemeDefaultNotFound = 'Tema pa zmoŭčańni %s nia znojdzienaja!'; @@ -1111,7 +1099,7 @@ $strCouldNotConnectTarget = 'Could not connect to the target'; //to translate $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"'; //to translate $strCurrentServer = 'Current server'; //to translate -$strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate +$strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate $strDatabase_src = 'Source database'; //to translate $strDatabase_trg = 'Target database'; //to translate $strDataDiff = 'Data Difference'; //to translate @@ -1166,11 +1154,11 @@ $strRemoteServer = 'Remote server'; //to translate $strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strReplicationAddLines = 'Now, add the following lines at the end of your my.cnf and please restart the MySQL server afterwards.'; //to translate $strReplicationAddSlaveUser = 'Add slave replication user'; //to translate -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; //to translate $strReplicationControlSlave = 'Control slave:'; //to translate $strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; //to translate $strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; //to translate +$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate $strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; //to translate $strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; //to translate $strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; //to translate @@ -1183,10 +1171,10 @@ $strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report- $strReplicationShowConnectedSlaves = 'Show connected slaves'; //to translate $strReplicationShowMasterStatus = 'Show master status'; //to translate $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; //to translate -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate $strReplicationSlaveConfiguration = 'Slave configuration'; //to translate $strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; //to translate $strReplicationSlaveErrorManagement = 'Error management:'; //to translate +$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate $strReplicationSlaveIOThread = 'IO Thread %s only'; //to translate $strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'; //to translate $strReplicationSlaveReset = 'Reset slave'; //to translate @@ -1225,13 +1213,6 @@ $strSetupBZipDump_name = 'Bzip2'; //to translate $strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupCannotLoadConfig = 'Cannot load or save configuration'; //to translate $strSetupCannotLoadConfigMsg = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'; //to translate -$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate -$strSetupCharEditing_name = 'CHAR fields editing'; //to translate -$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate -$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate -$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate $strSetupClear = 'Clear'; //to translate $strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature'; //to translate $strSetupCompressOnFly_name = 'Compress on the fly'; //to translate @@ -1273,12 +1254,12 @@ $strSetuperror_nan_p = 'Not a positive number'; //to translate $strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)'; //to translate $strSetupExecTimeLimit_name = 'Maximum execution time'; //to translate $strSetupExport_asfile_name = 'Save as file'; //to translate -$strSetupExport_charset_name = 'Character set of the file'; //to translate $strSetupExport_compression_name = 'Compression'; //to translate $strSetupExport_file_template_database_name = 'Database name template'; //to translate $strSetupExport_file_template_server_name = 'Server name template'; //to translate $strSetupExport_file_template_table_name = 'Table name template'; //to translate $strSetupExport_format_name = 'Format'; //to translate +$strSetupExport_charset_name = 'Character set of the file'; //to translate $strSetupExport_onserver_name = 'Save on server'; //to translate $strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)'; //to translate $strSetupExport_remember_file_template_name = 'Remember file name template'; //to translate @@ -1341,6 +1322,13 @@ $strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] c $strSetupGZipDump_name = 'GZip'; //to translate $strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupHomepageLink = 'phpMyAdmin homepage'; //to translate +$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate +$strSetupCharEditing_name = 'CHAR fields editing'; //to translate +$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate +$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate +$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate $strSetupIconvExtraParams_name = 'Extra parameters for iconv'; //to translate $strSetupIgnoreErrors = 'Ignore errors'; //to translate $strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed'; //to translate @@ -1388,10 +1376,10 @@ $strSetupLoginCookieStore_name = 'Login cookie store'; //to translate $strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid'; //to translate $strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; //to translate $strSetupLoginCookieValidity_name = 'Login cookie validity'; //to translate -$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate -$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate $strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list'; //to translate $strSetupMaxDbList_name = 'Maximum databases'; //to translate +$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate +$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate $strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.'; //to translate $strSetupMaxRows_name = 'Maximum number of rows to display'; //to translate $strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list'; //to translate @@ -1498,20 +1486,20 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave $strSetupServers_table_info_name = 'Display fields table'; //to translate $strSetupServers_user_desc = 'Leave empty if not using config auth'; //to translate $strSetupServers_user_name = 'User for config auth'; //to translate +$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; //to translate $strSetupServers_verbose_check_name = 'Verbose check'; //to translate -$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate $strSetupServers_verbose_name = 'Verbose name of this server'; //to translate $strSetupSetValue = 'Set value: %s'; //to translate $strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button'; //to translate $strSetupShowAll_name = 'Allow to display all the rows'; //to translate -$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate -$strSetupShowChgPassword_name = 'Show password change form'; //to translate $strSetupShowCreateDb_name = 'Show create database form'; //to translate $strSetupShowForm = 'Show form'; //to translate $strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode'; //to translate $strSetupShowFunctionFields_name = 'Show function fields'; //to translate $strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)'; //to translate +$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate +$strSetupShowChgPassword_name = 'Show password change form'; //to translate $strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'; //to translate $strSetupShowPhpInfo_name = 'Show phpinfo() link'; //to translate $strSetupShowServerInfo_name = 'Show detailed MySQL server information'; //to translate hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-832-ga069d4f
by Michal Čihař 24 Mar '10

24 Mar '10

The branch, gettext has been updated via a069d4f4af3bc61f9d831e054e1f64522c4e587c (commit) via f9e1592958310191f97def4306d27f695de40245 (commit) via e438f0ce7068e7af2c1f82e72607eceb09d4f17d (commit) from f0329dca46ae09e7320fc118dc9364199fd9870d (commit) - Log ----------------------------------------------------------------- commit a069d4f4af3bc61f9d831e054e1f64522c4e587c Merge: f0329dca46ae09e7320fc118dc9364199fd9870d f9e1592958310191f97def4306d27f695de40245 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 24 10:50:11 2010 +0100 Merge branch 'master' into gettext ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 53 ++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 15 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 88ea442..3fee3e1 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -29,6 +29,24 @@ then fi +# Checks whether remote branch has local tracking branch +ensure_local_branch() { + if ! git branch | grep -q '^..'"$1"'$' ; then + git branch --track $1 origin/$1 + fi +} + +# Marks current head of given branch as head of other branch +# Used for STABLE/TESTING tracking +mark_as_release() { + branch=$1 + rel_branch=$2 + echo "* Marking release as $rel_branch" + ensure_local_branch $rel_branch + git checkout $rel_branch + git merge $branch +} + # Read required parameters version=$1 shift @@ -57,7 +75,21 @@ if [ "$do_release" != 'y' ]; then exit 100 fi +# Ensure we have tracking branch +ensure_local_branch $branch + +# Create working copy +mkdir -p release +workdir=release/phpMyAdmin-$version +if [ -d $workdir ] ; then + echo "Working directory '$workdir' already exists, please move it out of way" + exit 1 +fi +git clone --local . $workdir +cd $workdir + # Checkout branch +ensure_local_branch $branch git checkout $branch # Check release version @@ -78,16 +110,6 @@ if ! grep -q "Version $version\$" README ; then exit 2 fi -# Create working copy -mkdir -p release -workdir=release/phpMyAdmin-$version -if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" - exit 1 -fi -git clone --local . $workdir -cd $workdir - # Cleanup release dir LC_ALL=C date -u > RELEASE-DATE-${version} @@ -192,11 +214,12 @@ if [ $# -gt 0 ] ; then echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch if echo $version | grep '[a-z_-]' ; then - echo "* Tagging release as TESTING" - git tag -a -f -m "Released $version" TESTING $branch + mark_as_release $branch TESTING else - echo "* Tagging release as STABLE" - git tag -a -f -m "Released $version" STABLE $branch + # We update both branches here + # As it does not make sense to have older testing than stable + mark_as_release $branch TESTING + mark_as_release $branch STABLE fi echo " Dont forget to push tags using: git push --tags" ;; @@ -215,7 +238,7 @@ cat <<END Todo now: --------- -1. If not already done, tag the repository with the new revision number +1. If not already done, tag the repository with the new revision number for a plain release or a release candidate: version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-259-gf9e1592
by Michal Čihař 24 Mar '10

24 Mar '10

The branch, master has been updated via f9e1592958310191f97def4306d27f695de40245 (commit) via e438f0ce7068e7af2c1f82e72607eceb09d4f17d (commit) from 58ebfd4591d905958d0fe2f7694bceedecf78f6b (commit) - Log ----------------------------------------------------------------- commit f9e1592958310191f97def4306d27f695de40245 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 24 10:25:56 2010 +0100 Avoid messing up with working copy more than needed. commit e438f0ce7068e7af2c1f82e72607eceb09d4f17d Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 24 10:10:56 2010 +0100 Switch to using branch for STABLE/TESTING. ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 53 ++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 15 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 9e5b0a1..22dfa88 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -29,6 +29,24 @@ then fi +# Checks whether remote branch has local tracking branch +ensure_local_branch() { + if ! git branch | grep -q '^..'"$1"'$' ; then + git branch --track $1 origin/$1 + fi +} + +# Marks current head of given branch as head of other branch +# Used for STABLE/TESTING tracking +mark_as_release() { + branch=$1 + rel_branch=$2 + echo "* Marking release as $rel_branch" + ensure_local_branch $rel_branch + git checkout $rel_branch + git merge $branch +} + # Read required parameters version=$1 shift @@ -57,7 +75,21 @@ if [ "$do_release" != 'y' ]; then exit 100 fi +# Ensure we have tracking branch +ensure_local_branch $branch + +# Create working copy +mkdir -p release +workdir=release/phpMyAdmin-$version +if [ -d $workdir ] ; then + echo "Working directory '$workdir' already exists, please move it out of way" + exit 1 +fi +git clone --local . $workdir +cd $workdir + # Checkout branch +ensure_local_branch $branch git checkout $branch # Check release version @@ -78,16 +110,6 @@ if ! grep -q "Version $version\$" README ; then exit 2 fi -# Create working copy -mkdir -p release -workdir=release/phpMyAdmin-$version -if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" - exit 1 -fi -git clone --local . $workdir -cd $workdir - # Cleanup release dir LC_ALL=C date -u > RELEASE-DATE-${version} @@ -179,11 +201,12 @@ if [ $# -gt 0 ] ; then echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch if echo $version | grep '[a-z_-]' ; then - echo "* Tagging release as TESTING" - git tag -a -f -m "Released $version" TESTING $branch + mark_as_release $branch TESTING else - echo "* Tagging release as STABLE" - git tag -a -f -m "Released $version" STABLE $branch + # We update both branches here + # As it does not make sense to have older testing than stable + mark_as_release $branch TESTING + mark_as_release $branch STABLE fi echo " Dont forget to push tags using: git push --tags" ;; @@ -202,7 +225,7 @@ cat <<END Todo now: --------- -1. If not already done, tag the repository with the new revision number +1. If not already done, tag the repository with the new revision number for a plain release or a release candidate: version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING hooks/post-receive -- phpMyAdmin

1 0