[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1380-g12b5d8d
Michal Čihař
nijel at users.sourceforge.net
Fri Apr 9 11:14:14 CEST 2010
The branch, master has been updated
via 12b5d8d20b08c25115e9e6b7c68865a8b191fdc5 (commit)
via 5603e1a68373b88fa46911d2e38c0a7e7def017e (commit)
from 1fc253e19e6952437fe980a932cf62e5200988e5 (commit)
- Log -----------------------------------------------------------------
commit 12b5d8d20b08c25115e9e6b7c68865a8b191fdc5
Author: Michal Čihař <mcihar at novell.com>
Date: Fri Apr 9 11:13:20 2010 +0200
Convert end of lines.
commit 5603e1a68373b88fa46911d2e38c0a7e7def017e
Author: Crack <piotrprz at gmail.com>
Date: Thu Apr 8 19:30:20 2010 +0200
Setup script: migrate MooTools code to jQuery
-----------------------------------------------------------------------
Summary of changes:
js/jquery/jquery.json-2.2.min.js | 31 +
setup/index.php | 5 +-
setup/lib/FormDisplay.class.php | 4 +-
setup/scripts.js | 1446 +++++++++++++++++++-------------------
setup/styles.css | 768 ++++++++++----------
5 files changed, 1154 insertions(+), 1100 deletions(-)
create mode 100644 js/jquery/jquery.json-2.2.min.js
diff --git a/js/jquery/jquery.json-2.2.min.js b/js/jquery/jquery.json-2.2.min.js
new file mode 100644
index 0000000..bad4a0a
--- /dev/null
+++ b/js/jquery/jquery.json-2.2.min.js
@@ -0,0 +1,31 @@
+
+(function($){$.toJSON=function(o)
+{if(typeof(JSON)=='object'&&JSON.stringify)
+return JSON.stringify(o);var type=typeof(o);if(o===null)
+return"null";if(type=="undefined")
+return undefined;if(type=="number"||type=="boolean")
+return o+"";if(type=="string")
+return $.quoteString(o);if(type=='object')
+{if(typeof o.toJSON=="function")
+return $.toJSON(o.toJSON());if(o.constructor===Date)
+{var month=o.getUTCMonth()+1;if(month<10)month='0'+month;var day=o.getUTCDate();if(day<10)day='0'+day;var year=o.getUTCFullYear();var hours=o.getUTCHours();if(hours<10)hours='0'+hours;var minutes=o.getUTCMinutes();if(minutes<10)minutes='0'+minutes;var seconds=o.getUTCSeconds();if(seconds<10)seconds='0'+seconds;var milli=o.getUTCMilliseconds();if(milli<100)milli='0'+milli;if(milli<10)milli='0'+milli;return'"'+year+'-'+month+'-'+day+'T'+
+hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
+if(o.constructor===Array)
+{var ret=[];for(var i=0;i<o.length;i++)
+ret.push($.toJSON(o[i])||"null");return"["+ret.join(",")+"]";}
+var pairs=[];for(var k in o){var name;var type=typeof k;if(type=="number")
+name='"'+k+'"';else if(type=="string")
+name=$.quoteString(k);else
+continue;if(typeof o[k]=="function")
+continue;var val=$.toJSON(o[k]);pairs.push(name+":"+val);}
+return"{"+pairs.join(", ")+"}";}};$.evalJSON=function(src)
+{if(typeof(JSON)=='object'&&JSON.parse)
+return JSON.parse(src);return eval("("+src+")");};$.secureEvalJSON=function(src)
+{if(typeof(JSON)=='object'&&JSON.parse)
+return JSON.parse(src);var filtered=src;filtered=filtered.replace(/\\["\\\/bfnrtu]/g,'@');filtered=filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']');filtered=filtered.replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered))
+return eval("("+src+")");else
+throw new SyntaxError("Error parsing JSON, source is not valid.");};$.quoteString=function(string)
+{if(string.match(_escapeable))
+{return'"'+string.replace(_escapeable,function(a)
+{var c=_meta[a];if(typeof c==='string')return c;c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';}
+return'"'+string+'"';};var _escapeable=/["\\\x00-\x1f\x7f-\x9f]/g;var _meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};})(jQuery);
\ No newline at end of file
diff --git a/setup/index.php b/setup/index.php
index 44174b7..a0f5b3a 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -34,8 +34,9 @@ require './libraries/header_http.inc.php';
<link href="../favicon.ico" rel="icon" type="image/x-icon" />
<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="styles.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../js/mootools.js"></script>
-<script type="text/javascript" src="../js/mootools-more.js"></script>
+<script type="text/javascript" src="../js/jquery/jquery-1.4.2-min.js"></script>
+<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.min.js"></script>
+<script type="text/javascript" src="../js/jquery/jquery.json-2.2.min.js"></script>
<script type="text/javascript" src="scripts.js"></script>
</head>
<body>
diff --git a/setup/lib/FormDisplay.class.php b/setup/lib/FormDisplay.class.php
index e3c8b0a..f1ee1c3 100644
--- a/setup/lib/FormDisplay.class.php
+++ b/setup/lib/FormDisplay.class.php
@@ -227,10 +227,10 @@ class FormDisplay
: filter_input($GLOBALS["str$str"]); // null if not set
$js_lang[] = "'$str': '" . PMA_jsFormat($lang, false) . '\'';
}
- $js[] = '$extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})';
+ $js[] = '$.extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})';
}
- $js[] = '$extend(defaultValues, {' . implode(",\n\t", $js_default) . '})';
+ $js[] = '$.extend(defaultValues, {' . implode(",\n\t", $js_default) . '})';
display_js($js);
}
diff --git a/setup/scripts.js b/setup/scripts.js
index 16b0568..7298e63 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -1,717 +1,729 @@
-/**
- * functions used in setup script
- *
- * @version $Id$
- */
-
-// show this window in top frame
-if (top != self) {
- window.top.location.href = location;
-}
-
-// default values for fields
-var defaultValues = {};
-
-// language strings
-var PMA_messages = {};
-
-/**
- * Returns field type
- *
- * @param Element field
- */
-function getFieldType(field) {
- if (field.tagName == 'INPUT') {
- return field.getProperty('type');
- } else if (field.tagName == 'SELECT') {
- return 'select';
- } else if (field.tagName == 'TEXTAREA') {
- return 'text';
- }
- return '';
-}
-
-/**
- * Sets field value
- *
- * value must be of type:
- * o undefined (omitted) - restore default value (form default, not PMA default)
- * o String - if type is 'text'
- * o boolean - if type is 'checkbox'
- * o Array of values - if type is 'select'
- *
- * @param Element field
- * @param String field_type see getFieldType
- * @param mixed value
- */
-function setFieldValue(field, field_type, value) {
- switch (field_type) {
- case 'text':
- field.value = $defined(value) ? value : field.defaultValue;
- break;
- case 'checkbox':
- field.checked = $defined(value) ? value : field.defaultChecked;
- break;
- case 'select':
- var i, imax = field.options.length;
- if (!$defined(value)) {
- for (i = 0; i < imax; i++) {
- field.options[i].selected = field.options[i].defaultSelected;
- }
- } else {
- for (i = 0; i < imax; i++) {
- field.options[i].selected = (value.indexOf(field.options[i].value) != -1);
- }
- }
- break;
- }
- markField(field);
-}
-
-/**
- * Gets field value
- *
- * Will return one of:
- * o String - if type is 'text'
- * o boolean - if type is 'checkbox'
- * o Array of values - if type is 'select'
- *
- * @param Element field
- * @param String field_type see getFieldType
- * @return mixed
- */
-function getFieldValue(field, field_type) {
- switch (field_type) {
- case 'text':
- return field.value;
- case 'checkbox':
- return field.checked;
- case 'select':
- var i, imax = field.options.length, items = [];
- for (i = 0; i < imax; i++) {
- if (field.options[i].selected) {
- items.push(field.options[i].value);
- }
- }
- return items;
- }
-}
-
-/**
- * Returns values for all fields in fieldsets
- */
-function getAllValues() {
- var elements = $$('fieldset input, fieldset select, fieldset textarea');
- var values = {}
- var type, value;
- for (var i = 0; i < elements.length; i++) {
- type = getFieldType(elements[i]);
- value = getFieldValue(elements[i], type);
- if (typeof value != 'undefined') {
- // we only have single selects, fatten array
- if (type == 'select') {
- value = value[0];
- }
- values[elements[i].name] = value;
- }
- }
- return values;
-}
-
-/**
- * Checks whether field has its default value
- *
- * @param Element field
- * @param String type
- * @return boolean
- */
-function checkFieldDefault(field, type) {
- if (!$defined(defaultValues[field.id])) {
- return true;
- }
- var isDefault = true
- var currentValue = getFieldValue(field, type);
- if (type != 'select') {
- isDefault = currentValue == defaultValues[field.id];
- } else {
- // compare arrays, will work for our representation of select values
- if (currentValue.length != defaultValues[field.id].length) {
- isDefault = false;
- }
- else {
- for (var i = 0; i < currentValue.length; i++) {
- if (currentValue[i] != defaultValues[field.id][i]) {
- isDefault = false;
- break;
- }
- }
- }
- }
- return isDefault;
-}
-
-/**
- * Returns element's id prefix
- * @param Element element
- */
-function getIdPrefix(element) {
- return element.id.replace(/[^-]+$/, '');
-}
-
-// ------------------------------------------------------------------
-// Messages
-//
-
-// stores hidden message ids
-var hiddenMessages = [];
-
-window.addEvent('domready', function() {
- var hidden = hiddenMessages.length;
- for (var i = 0; i < hidden; i++) {
- $(hiddenMessages[i]).style.display = 'none';
- }
- if (hidden > 0) {
- var link = $('show_hidden_messages');
- link.addEvent('click', function(e) {
- e.stop();
- for (var i = 0; i < hidden; i++) {
- $(hiddenMessages[i]).style.display = '';
- }
- this.dispose();
- });
- link.set('html', link.get('html').replace('#MSG_COUNT', hidden));
- link.style.display = '';
- }
-});
-
-//
-// END: Messages
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Form validation and field operations
-//
-
-// form validator assignments
-var validate = {};
-
-// form validator list
-var validators = {
- /**
- * Validates positive number
- *
- * @param boolean isKeyUp
- */
- validate_positive_number: function (isKeyUp) {
- var result = this.value.test('^[0-9]*$') && this.value != '0';
- return result ? true : PMA_messages['error_nan_p'];
- },
- /**
- * Validates non-negative number
- *
- * @param boolean isKeyUp
- */
- validate_non_negative_number: function (isKeyUp) {
- var result = this.value.test('^[0-9]*$');
- return result ? true : PMA_messages['error_nan_nneg'];
- },
- /**
- * Validates port number
- *
- * @param boolean isKeyUp
- */
- validate_port_number: function(isKeyUp) {
- var result = this.value.test('^[0-9]*$') && this.value != '0';
- if (!result || this.value > 65536) {
- result = PMA_messages['error_incorrect_port'];
- }
- return result;
- },
- // field validators
- _field: {
- /**
- * hide_db field
- *
- * @param boolean isKeyUp
- */
- hide_db: function(isKeyUp) {
- if (!isKeyUp && this.value != '') {
- var data = {};
- data[this.id] = this.value;
- ajaxValidate(this, 'Servers/1/hide_db', data);
- }
- return true;
- },
- /**
- * TrustedProxies field
- *
- * @param boolean isKeyUp
- */
- TrustedProxies: function(isKeyUp) {
- if (!isKeyUp && this.value != '') {
- var data = {};
- data[this.id] = this.value;
- ajaxValidate(this, 'TrustedProxies', data);
- }
- return true;
- },
- },
- // fieldset validators
- _fieldset: {
- /**
- * Validates Server fieldset
- *
- * @param boolean isKeyUp
- */
- Server: function(isKeyUp) {
- if (!isKeyUp) {
- ajaxValidate(this, 'Server', getAllValues());
- }
- return true;
- },
- /**
- * Validates Server_login_options fieldset
- *
- * @param boolean isKeyUp
- */
- Server_login_options: function(isKeyUp) {
- return validators._fieldset.Server.bind(this)(isKeyUp);
- },
- /**
- * Validates Server_pmadb fieldset
- *
- * @param boolean isKeyUp
- */
- Server_pmadb: function(isKeyUp) {
- if (isKeyUp) {
- return true;
- }
-
- var prefix = getIdPrefix(this.getElement('input'));
- var pmadb_active = $(prefix + 'pmadb').value != '';
- if (pmadb_active) {
- ajaxValidate(this, 'Server_pmadb', getAllValues());
- }
-
- return true;
- }
- }
-}
-
-/**
- * Calls server-side validation procedures
- *
- * @param Element parent input field in <fieldset> or <fieldset>
- * @param String id validator id
- * @param Object values values hash (element_id: value)
- */
-function ajaxValidate(parent, id, values) {
- // ensure that parent is a fieldset
- if (parent.tagName != 'FIELDSET') {
- parent = parent.getParent('fieldset');
- if (!parent) {
- return false;
- }
- }
- // ensure that we have a Request object
- if (typeof parent.request == 'undefined') {
- parent.validate = {
- request: new Request.JSON({
- url: 'validate.php',
- autoCancel: true,
- onSuccess: function(response) {
- if (response == null) {
- return;
- }
- var error = {};
- if ($type(response) != 'object') {
- error[parent.id] = [response];
- } else if (typeof response['error'] != 'undefined') {
- error[parent.id] = [response['error']];
- } else {
- $each(response, function(value, key) {
- error[key] = $type(value) == 'array' ? value : [value];
- });
- }
- displayErrors(error);
- }}),
- token: parent.getParent('form').token.value
- };
- }
-
- parent.validate.request.send({
- data: {
- token: parent.validate.token,
- id: id,
- values: JSON.encode(values)}
- });
-
- return true;
-}
-
-/**
- * Registers validator for given field
- *
- * @param String id field id
- * @param String type validator (key in validators object)
- * @param boolean onKeyUp whether fire on key up
- * @param mixed params validation function parameters
- */
-function validateField(id, type, onKeyUp, params) {
- if (typeof validators[type] == 'undefined') {
- return;
- }
- if (typeof validate[id] == 'undefined') {
- validate[id] = [];
- }
- validate[id].push([type, params, onKeyUp]);
-}
-
-/**
- * Returns valdiation functions associated with form field
- *
- * @param String field_id form field id
- * @param boolean onKeyUpOnly see validateField
- * @return Array array of [function, paramseters to be passed to function]
- */
-function getFieldValidators(field_id, onKeyUpOnly) {
- // look for field bound validator
- var name = field_id.match(/[^-]+$/)[0];
- if (typeof validators._field[name] != 'undefined') {
- return [[validators._field[name], null]];
- }
-
- // look for registered validators
- var functions = [];
- if (typeof validate[field_id] != 'undefined') {
- // validate[field_id]: array of [type, params, onKeyUp]
- for (var i = 0, imax = validate[field_id].length; i < imax; i++) {
- if (onKeyUpOnly && !validate[field_id][i][2]) {
- continue;
- }
- functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]);
- }
- }
-
- return functions;
-}
-
-/**
- * Displays errors for given form fields
- *
- * WARNING: created DOM elements must be identical with the ones made by
- * display_input() in FormDisplay.tpl.php!
- *
- * @param Object error list (key: field id, value: error array)
- */
-function displayErrors(errors) {
- $each(errors, function(errors, field_id) {
- var field = $(field_id);
- var isFieldset = field.tagName == 'FIELDSET';
- var errorCnt = isFieldset
- ? field.getElement('dl.errors')
- : field.getNext('.inline_errors');
-
- // remove empty errors (used to clear error list)
- errors = errors.filter(function(item) {
- return item != '';
- });
-
- if (errors.length) {
- // if error container doesn't exist, create it
- if (errorCnt === null) {
- if (isFieldset) {
- errorCnt = new Element('dl', {
- 'class': 'errors'
- });
- errorCnt.inject(field.getElement('table'), 'before');
- } else {
- errorCnt = new Element('dl', {
- 'class': 'inline_errors'
- });
- errorCnt.inject(field.getParent('td'), 'bottom');
- }
- }
-
- var html = '';
- for (var i = 0, imax = errors.length; i < imax; i++) {
- html += '<dd>' + errors[i] + '</dd>';
- }
- errorCnt.set('html', html);
- } else if (errorCnt !== null) {
- // remove useless error container
- errorCnt.dispose();
- }
- });
-}
-
-/**
- * Validates fieldset and puts errors in 'errors' object
- *
- * @param Element field
- * @param boolean isKeyUp
- * @param Object errors
- */
-function validate_fieldset(fieldset, isKeyUp, errors) {
- if (fieldset && typeof validators._fieldset[fieldset.id] != 'undefined') {
- var fieldset_errors = validators._fieldset[fieldset.id].bind(fieldset)(isKeyUp);
- $each(fieldset_errors, function(field_errors, field_id) {
- if (typeof errors[field_id] == 'undefined') {
- errors[field_id] = [];
- }
- errors[field_id][$type(field_errors) == 'array' ? 'extend' : 'push'](field_errors);
- });
- }
-}
-
-/**
- * Validates form field and puts errors in 'errors' object
- *
- * @param Element field
- * @param boolean isKeyUp
- * @param Object errors
- */
-function validate_field(field, isKeyUp, errors) {
- errors[field.id] = [];
- var functions = getFieldValidators(field.id, isKeyUp);
- for (var i = 0; i < functions.length; i++) {
- var result = functions[i][0].bind(field)(isKeyUp, functions[i][1]);
- if (result !== true) {
- errors[field.id][$type(result) == 'array' ? 'extend' : 'push'](result);
- }
- }
-}
-
-/**
- * Validates form field and parent fieldset
- *
- * @param Element field
- * @param boolean isKeyUp
- */
-function validate_field_and_fieldset(field, isKeyUp) {
- var errors = {};
- validate_field(field, isKeyUp, errors);
- validate_fieldset(field.getParent('fieldset'), isKeyUp, errors);
- displayErrors(errors);
-}
-
-/**
- * Marks field depending on its value (system default or custom)
- *
- * @param Element field
- */
-function markField(field) {
- var type = getFieldType(field);
- var isDefault = checkFieldDefault(field, type);
-
- // checkboxes uses parent <span> for marking
- var fieldMarker = (type == 'checkbox') ? field.getParent() : field;
- setRestoreDefaultBtn(field, !isDefault);
- fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom');
-}
-
-/**
- * Enables or disables the "restore default value" button
- *
- * @param Element field
- * @param bool display
- */
-function setRestoreDefaultBtn(field, display) {
- var td = field.getParent('td');
- if (!td) return;
- var el = td.getElement('.restore-default');
- if (!el) return;
- el.style.display = (display ? '' : 'none');
-}
-
-window.addEvent('domready', function() {
- var elements = $$('input[id], select[id], textarea[id]');
- var elements_count = elements.length;
-
- // register validators and mark custom values
- for (var i = 0; i < elements_count; i++) {
- var el = elements[i];
- markField(el);
- el.addEvent('change', function(e) {
- validate_field_and_fieldset(this, false);
- markField(this);
- });
- // text fields can be validated after each change
- if (el.tagName == 'INPUT' && el.type == 'text') {
- el.addEvent('keyup', function(e) {
- validate_field_and_fieldset(this, true);
- markField(el);
- });
- }
- // disable textarea spellcheck
- if (el.tagName == 'TEXTAREA') {
- el.setProperty('spellcheck', false)
- }
- }
-
- // check whether we've refreshed a page and browser remembered modified
- // form values
- var check_page_refresh = $('check_page_refresh');
- if (!check_page_refresh || check_page_refresh.value == '1') {
- // run all field validators
- var errors = {};
- for (var i = 0; i < elements_count; i++) {
- validate_field(elements[i], false, errors);
- }
- // run all fieldset validators
- $$('fieldset').each(function(el){
- validate_fieldset(el, false, errors);
- });
-
- displayErrors(errors);
- } else if (check_page_refresh) {
- check_page_refresh.value = '1';
- }
-});
-
-//
-// END: Form validation and field operations
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Tabbed forms
-//
-
-/**
- * Sets active tab
- *
- * @param Element tab_link
- */
-function setTab(tab_link) {
- var tabs_menu = tab_link.getParent('.tabs');
-
- var links = tabs_menu.getElements('a');
- var contents;
- for (var i = 0, imax = links.length; i < imax; i++) {
- contents = $(links[i].getProperty('href').substr(1));
- if (links[i] == tab_link) {
- links[i].addClass('active');
- contents.style.display = 'block';
- } else {
- links[i].removeClass('active');
- contents.style.display = 'none';
- }
- }
- location.hash = 'tab_' + tab_link.getProperty('href').substr(1);
-}
-
-window.addEvent('domready', function() {
- var tabs = $$('.tabs');
- var url_tab = location.hash.match(/^#tab_.+/)
- ? $$('a[href$="' + location.hash.substr(5) + '"]') : null;
- if (url_tab) {
- url_tab = url_tab[0];
- }
- // add tabs events and activate one tab (the first one or indicated by location hash)
- for (var i = 0, imax = tabs.length; i < imax; i++) {
- var links = tabs[i].getElements('a');
- var selected_tab = links[0];
- for (var j = 0, jmax = links.length; j < jmax; j++) {
- links[j].addEvent('click', function(e) {
- e.stop();
- setTab(this);
- });
- if (links[j] == url_tab) {
- selected_tab = links[j];
- }
- }
- setTab(selected_tab);
- }
- // tab links handling, check each 200ms
- // (works with history in FF, further browser support here would be an overkill)
- var prev_hash = location.hash;
- (function() {
- if (location.hash != prev_hash) {
- prev_hash = location.hash;
- var url_tab = location.hash.match(/^#tab_.+/)
- ? $$('a[href$="' + location.hash.substr(5) + '"]') : null;
- if (url_tab) {
- setTab(url_tab[0]);
- }
- }
- }).periodical(200);
-});
-
-//
-// END: Tabbed forms
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Form reset buttons
-//
-
-window.addEvent('domready', function() {
- var buttons = $$('input[type=button]');
- for (var i = 0, imax = buttons.length; i < imax; i++) {
- buttons[i].addEvent('click', function(e) {
- var fields = this.getParent('fieldset').getElements('input, select, textarea');
- for (var i = 0, imax = fields.length; i < imax; i++) {
- setFieldValue(fields[i], getFieldType(fields[i]));
- }
- });
- }
-});
-
-//
-// END: Form reset buttons
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// "Restore default" and "set value" buttons
-//
-
-/**
- * Restores field's default value
- *
- * @param String field_id
- */
-function restoreField(field_id) {
- var field = $(field_id);
- if (!field || !$defined(defaultValues[field_id])) {
- return;
- }
- setFieldValue(field, getFieldType(field), defaultValues[field_id]);
-}
-
-window.addEvent('domready', function() {
- var buttons = $$('.restore-default, .set-value');
- var fixIE = Browser.Engine.name == 'trident' && Browser.Engine.version == 4;
- for (var i = 0, imax = buttons.length; i < imax; i++) {
- buttons[i].set('opacity', 0.25);
- if (!buttons[i].hasClass('restore-default')) {
- // restore-default is handled by markField
- buttons[i].style.display = '';
- }
- buttons[i].addEvents({
- mouseenter: function(e) {this.set('opacity', 1);},
- mouseleave: function(e) {this.set('opacity', 0.25);},
- click: function(e) {
- e.stop();
- var href = this.getProperty('href').substr(1);
- var field_id;
- if (this.hasClass('restore-default')) {
- field_id = href;
- restoreField(field_id);
- } else {
- field_id = href.match(/^[^=]+/)[0];
- var value = href.match(/=(.+)$/)[1];
- setFieldValue($(field_id), 'text', value);
- }
- $(field_id).fireEvent('change');
- }
- });
- // fix IE showing <img> alt text instead of link title
- if (fixIE) {
- buttons[i].getChildren('img')[0].alt = buttons[i].title;
- }
- }
-});
-
-//
-// END: "Restore default" and "set value" buttons
-// ------------------------------------------------------------------
+/**
+ * functions used in setup script
+ *
+ * @version $Id$
+ */
+
+// show this window in top frame
+if (top != self) {
+ window.top.location.href = location;
+}
+
+// default values for fields
+var defaultValues = {};
+
+// language strings
+var PMA_messages = {};
+
+/**
+ * Returns field type
+ *
+ * @param Element field
+ */
+function getFieldType(field) {
+ field = $(field);
+ var tagName = field.attr('tagName');
+ if (tagName == 'INPUT') {
+ return field.attr('type');
+ } else if (tagName == 'SELECT') {
+ return 'select';
+ } else if (tagName == 'TEXTAREA') {
+ return 'text';
+ }
+ return '';
+}
+
+/**
+ * Sets field value
+ *
+ * value must be of type:
+ * o undefined (omitted) - restore default value (form default, not PMA default)
+ * o String - if field_type is 'text'
+ * o boolean - if field_type is 'checkbox'
+ * o Array of values - if field_type is 'select'
+ *
+ * @param Element field
+ * @param String field_type see getFieldType
+ * @param mixed value
+ */
+function setFieldValue(field, field_type, value) {
+ field = $(field);
+ switch (field_type) {
+ case 'text':
+ field.attr('value', (value != undefined ? value : field.attr('defaultValue')));
+ break;
+ case 'checkbox':
+ field.attr('checked', (value != undefined ? value : field.attr('defaultChecked')));
+ break;
+ case 'select':
+ var options = field.attr('options');
+ var i, imax = options.length;
+ if (value == undefined) {
+ for (i = 0; i < imax; i++) {
+ options[i].selected = options[i].defaultSelected;
+ }
+ } else {
+ for (i = 0; i < imax; i++) {
+ options[i].selected = (value.indexOf(options[i].value) != -1);
+ }
+ }
+ break;
+ }
+ markField(field);
+}
+
+/**
+ * Gets field value
+ *
+ * Will return one of:
+ * o String - if type is 'text'
+ * o boolean - if type is 'checkbox'
+ * o Array of values - if type is 'select'
+ *
+ * @param Element field
+ * @param String field_type see getFieldType
+ * @return mixed
+ */
+function getFieldValue(field, field_type) {
+ field = $(field);
+ switch (field_type) {
+ case 'text':
+ return field.attr('value');
+ case 'checkbox':
+ return field.attr('checked');
+ case 'select':
+ var options = field.attr('options');
+ var i, imax = options.length, items = [];
+ for (i = 0; i < imax; i++) {
+ if (options[i].selected) {
+ items.push(options[i].value);
+ }
+ }
+ return items;
+ }
+}
+
+/**
+ * Returns values for all fields in fieldsets
+ */
+function getAllValues() {
+ var elements = $('fieldset input, fieldset select, fieldset textarea');
+ var values = {};
+ var type, value;
+ for (var i = 0; i < elements.length; i++) {
+ type = getFieldType(elements[i]);
+ value = getFieldValue(elements[i], type);
+ if (typeof value != 'undefined') {
+ // we only have single selects, fatten array
+ if (type == 'select') {
+ value = value[0];
+ }
+ values[elements[i].name] = value;
+ }
+ }
+ return values;
+}
+
+/**
+ * Checks whether field has its default value
+ *
+ * @param Element field
+ * @param String type
+ * @return boolean
+ */
+function checkFieldDefault(field, type) {
+ field = $(field);
+ var field_id = field.attr('id');
+ if (typeof defaultValues[field_id] == 'undefined') {
+ return true;
+ }
+ var isDefault = true;
+ var currentValue = getFieldValue(field, type);
+ if (type != 'select') {
+ isDefault = currentValue == defaultValues[field_id];
+ } else {
+ // compare arrays, will work for our representation of select values
+ if (currentValue.length != defaultValues[field_id].length) {
+ isDefault = false;
+ }
+ else {
+ for (var i = 0; i < currentValue.length; i++) {
+ if (currentValue[i] != defaultValues[field_id][i]) {
+ isDefault = false;
+ break;
+ }
+ }
+ }
+ }
+ return isDefault;
+}
+
+/**
+ * Returns element's id prefix
+ * @param Element element
+ */
+function getIdPrefix(element) {
+ return $(element).attr('id').replace(/[^-]+$/, '');
+}
+
+// ------------------------------------------------------------------
+// Messages
+//
+
+// stores hidden message ids
+var hiddenMessages = [];
+
+$(function() {
+ var hidden = hiddenMessages.length;
+ for (var i = 0; i < hidden; i++) {
+ $('#'+hiddenMessages[i]).css('display', 'none');
+ }
+ if (hidden > 0) {
+ var link = $('#show_hidden_messages');
+ link.click(function(e) {
+ e.preventDefault();
+ for (var i = 0; i < hidden; i++) {
+ $('#'+hiddenMessages[i]).show(500);
+ }
+ $(this).remove();
+ });
+ link.html(link.html().replace('#MSG_COUNT', hidden));
+ link.css('display', '');
+ }
+});
+
+//
+// END: Messages
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// Form validation and field operations
+//
+
+// form validator assignments
+var validate = {};
+
+// form validator list
+var validators = {
+ // regexp: numeric value
+ _regexp_numeric: new RegExp('^[0-9]*$'),
+ /**
+ * Validates positive number
+ *
+ * @param boolean isKeyUp
+ */
+ validate_positive_number: function (isKeyUp) {
+ var result = this.value != '0' && validators._regexp_numeric.test(this.value);
+ return result ? true : PMA_messages['error_nan_p'];
+ },
+ /**
+ * Validates non-negative number
+ *
+ * @param boolean isKeyUp
+ */
+ validate_non_negative_number: function (isKeyUp) {
+ var result = validators._regexp_numeric.test(this.value);
+ return result ? true : PMA_messages['error_nan_nneg'];
+ },
+ /**
+ * Validates port number
+ *
+ * @param boolean isKeyUp
+ */
+ validate_port_number: function(isKeyUp) {
+ var result = validators._regexp_numeric.test(this.value) && this.value != '0';
+ if (!result || this.value > 65536) {
+ result = PMA_messages['error_incorrect_port'];
+ }
+ return result;
+ },
+ // field validators
+ _field: {
+ /**
+ * hide_db field
+ *
+ * @param boolean isKeyUp
+ */
+ hide_db: function(isKeyUp) {
+ if (!isKeyUp && this.value != '') {
+ var data = {};
+ data[this.id] = this.value;
+ ajaxValidate(this, 'Servers/1/hide_db', data);
+ }
+ return true;
+ },
+ /**
+ * TrustedProxies field
+ *
+ * @param boolean isKeyUp
+ */
+ TrustedProxies: function(isKeyUp) {
+ if (!isKeyUp && this.value != '') {
+ var data = {};
+ data[this.id] = this.value;
+ ajaxValidate(this, 'TrustedProxies', data);
+ }
+ return true;
+ }
+ },
+ // fieldset validators
+ _fieldset: {
+ /**
+ * Validates Server fieldset
+ *
+ * @param boolean isKeyUp
+ */
+ Server: function(isKeyUp) {
+ if (!isKeyUp) {
+ ajaxValidate(this, 'Server', getAllValues());
+ }
+ return true;
+ },
+ /**
+ * Validates Server_login_options fieldset
+ *
+ * @param boolean isKeyUp
+ */
+ Server_login_options: function(isKeyUp) {
+ return validators._fieldset.Server.apply(this, [isKeyUp]);
+ },
+ /**
+ * Validates Server_pmadb fieldset
+ *
+ * @param boolean isKeyUp
+ */
+ Server_pmadb: function(isKeyUp) {
+ if (isKeyUp) {
+ return true;
+ }
+
+ var prefix = getIdPrefix($(this).find('input'));
+ var pmadb_active = $('#' + prefix + 'pmadb').val() != '';
+ if (pmadb_active) {
+ ajaxValidate(this, 'Server_pmadb', getAllValues());
+ }
+
+ return true;
+ }
+ }
+};
+
+/**
+ * Calls server-side validation procedures
+ *
+ * @param Element parent input field in <fieldset> or <fieldset>
+ * @param String id validator id
+ * @param Object values values hash (element_id: value)
+ */
+function ajaxValidate(parent, id, values) {
+ parent = $(parent);
+ // ensure that parent is a fieldset
+ if (parent.attr('tagName') != 'FIELDSET') {
+ parent = parent.closest('fieldset');
+ if (parent.length == 0) {
+ return false;
+ }
+ }
+
+ if (parent.data('ajax') != null) {
+ parent.data('ajax').abort();
+ }
+
+ parent.data('ajax', $.ajax({
+ url: 'validate.php',
+ cache: false,
+ type: 'POST',
+ data: {
+ token: parent.closest('form').find('input[name=token]').val(),
+ id: id,
+ values: $.toJSON(values)
+ },
+ success: function(response) {
+ if (response == null) {
+ return;
+ }
+
+ var error = {};
+ if (typeof response != 'object') {
+ error[parent.id] = [response];
+ } else if (typeof response['error'] != 'undefined') {
+ error[parent.id] = [response['error']];
+ } else {
+ for (key in response) {
+ var value = response[key];
+ error[key] = jQuery.isArray(value) ? value : [value];
+ }
+ }
+ displayErrors(error);
+ },
+ complete: function() {
+ parent.removeData('ajax');
+ }
+ }));
+
+ return true;
+}
+
+/**
+ * Registers validator for given field
+ *
+ * @param String id field id
+ * @param String type validator (key in validators object)
+ * @param boolean onKeyUp whether fire on key up
+ * @param mixed params validation function parameters
+ */
+function validateField(id, type, onKeyUp, params) {
+ if (typeof validators[type] == 'undefined') {
+ return;
+ }
+ if (typeof validate[id] == 'undefined') {
+ validate[id] = [];
+ }
+ validate[id].push([type, params, onKeyUp]);
+}
+
+/**
+ * Returns valdiation functions associated with form field
+ *
+ * @param String field_id form field id
+ * @param boolean onKeyUpOnly see validateField
+ * @return Array array of [function, paramseters to be passed to function]
+ */
+function getFieldValidators(field_id, onKeyUpOnly) {
+ // look for field bound validator
+ var name = field_id.match(/[^-]+$/)[0];
+ if (typeof validators._field[name] != 'undefined') {
+ return [[validators._field[name], null]];
+ }
+
+ // look for registered validators
+ var functions = [];
+ if (typeof validate[field_id] != 'undefined') {
+ // validate[field_id]: array of [type, params, onKeyUp]
+ for (var i = 0, imax = validate[field_id].length; i < imax; i++) {
+ if (onKeyUpOnly && !validate[field_id][i][2]) {
+ continue;
+ }
+ functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]);
+ }
+ }
+
+ return functions;
+}
+
+/**
+ * Displays errors for given form fields
+ *
+ * WARNING: created DOM elements must be identical with the ones made by
+ * display_input() in FormDisplay.tpl.php!
+ *
+ * @param Object error list (key: field id, value: error array)
+ */
+function displayErrors(error_list) {
+ for (field_id in error_list) {
+ var errors = error_list[field_id];
+ var field = $('#'+field_id);
+ var isFieldset = field.attr('tagName') == 'FIELDSET';
+ var errorCnt = isFieldset
+ ? field.find('dl.errors')
+ : field.siblings('.inline_errors');
+
+ // remove empty errors (used to clear error list)
+ errors = $.grep(errors, function(item) {
+ return item != '';
+ });
+
+ if (errors.length) {
+ // if error container doesn't exist, create it
+ if (errorCnt.length == 0) {
+ if (isFieldset) {
+ errorCnt = $('<dl class="errors" />');
+ field.find('table').before(errorCnt);
+ } else {
+ errorCnt = $('<dl class="inline_errors" />');
+ field.closest('td').append(errorCnt);
+ }
+ }
+
+ var html = '';
+ for (var i = 0, imax = errors.length; i < imax; i++) {
+ html += '<dd>' + errors[i] + '</dd>';
+ }
+ errorCnt.html(html);
+ } else if (errorCnt !== null) {
+ // remove useless error container
+ errorCnt.remove();
+ }
+ }
+}
+
+/**
+ * Validates fieldset and puts errors in 'errors' object
+ *
+ * @param Element field
+ * @param boolean isKeyUp
+ * @param Object errors
+ */
+function validate_fieldset(fieldset, isKeyUp, errors) {
+ fieldset = $(fieldset);
+ if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') {
+ var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]);
+ for (field_id in fieldset_errors) {
+ if (typeof errors[field_id] == 'undefined') {
+ errors[field_id] = [];
+ }
+ if (typeof fieldset_errors[field_id] == 'string') {
+ fieldset_errors[field_id] = [fieldset_errors[field_id]];
+ }
+ $.merge(errors[field_id], fieldset_errors[field_id]);
+ }
+ }
+}
+
+/**
+ * Validates form field and puts errors in 'errors' object
+ *
+ * @param Element field
+ * @param boolean isKeyUp
+ * @param Object errors
+ */
+function validate_field(field, isKeyUp, errors) {
+ field = $(field);
+ var field_id = field.attr('id');
+ errors[field_id] = [];
+ var functions = getFieldValidators(field_id, isKeyUp);
+ for (var i = 0; i < functions.length; i++) {
+ var result = functions[i][0].apply(field[0], [isKeyUp, functions[i][1]]);
+ if (result !== true) {
+ if (typeof result == 'string') {
+ result = [result];
+ }
+ $.merge(errors[field_id], result);
+ }
+ }
+}
+
+/**
+ * Validates form field and parent fieldset
+ *
+ * @param Element field
+ * @param boolean isKeyUp
+ */
+function validate_field_and_fieldset(field, isKeyUp) {
+ field = $(field);
+ var errors = {};
+ validate_field(field, isKeyUp, errors);
+ validate_fieldset(field.closest('fieldset'), isKeyUp, errors);
+ displayErrors(errors);
+}
+
+/**
+ * Marks field depending on its value (system default or custom)
+ *
+ * @param Element field
+ */
+function markField(field) {
+ field = $(field);
+ var type = getFieldType(field);
+ var isDefault = checkFieldDefault(field, type);
+
+ // checkboxes uses parent <span> for marking
+ var fieldMarker = (type == 'checkbox') ? field.parent() : field;
+ setRestoreDefaultBtn(field, !isDefault);
+ fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom');
+}
+
+/**
+ * Enables or disables the "restore default value" button
+ *
+ * @param Element field
+ * @param bool display
+ */
+function setRestoreDefaultBtn(field, display) {
+ var el = $(field).closest('td').find('.restore-default');
+ el.css('display', (el.css('display') ? '' : 'none'));
+}
+
+$(function() {
+ // register validators and mark custom values
+ var elements = $('input[id], select[id], textarea[id]');
+ $('input[id], select[id], textarea[id]').each(function(){
+ markField(this);
+ var el = $(this);
+ el.bind('change', function() {
+ validate_field_and_fieldset(this, false);
+ markField(this);
+ });
+ var tagName = el.attr('tagName');
+ // text fields can be validated after each change
+ if (tagName == 'INPUT' && el.attr('type') == 'text') {
+ el.keyup(function() {
+ validate_field_and_fieldset(el, true);
+ markField(el);
+ });
+ }
+ // disable textarea spellcheck
+ if (tagName == 'TEXTAREA') {
+ el.attr('spellcheck', false);
+ }
+ });
+
+ // check whether we've refreshed a page and browser remembered modified
+ // form values
+ var check_page_refresh = $('#check_page_refresh');
+ if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') {
+ // run all field validators
+ var errors = {};
+ for (var i = 0; i < elements.length; i++) {
+ validate_field(elements[i], false, errors);
+ }
+ // run all fieldset validators
+ $('fieldset').each(function(){
+ validate_fieldset(this, false, errors);
+ });
+
+ displayErrors(errors);
+ } else if (check_page_refresh) {
+ check_page_refresh.val('1');
+ }
+});
+
+//
+// END: Form validation and field operations
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// Tabbed forms
+//
+
+/**
+ * Sets active tab
+ *
+ * @param Element tab_link
+ */
+function setTab(tab_link) {
+ var tabs_menu = $(tab_link).closest('.tabs');
+
+ var links = tabs_menu.find('a');
+ var contents, link;
+ for (var i = 0, imax = links.length; i < imax; i++) {
+ link = $(links[i]);
+ contents = $(link.attr('href'));
+ if (links[i] == tab_link) {
+ link.addClass('active');
+ contents.css('display', 'block');
+ } else {
+ link.removeClass('active');
+ contents.css('display', 'none');
+ }
+ }
+ location.hash = 'tab_' + $(tab_link).attr('href').substr(1);
+}
+
+$(function() {
+ var tabs = $('.tabs');
+ var url_tab = location.hash.match(/^#tab_.+/)
+ ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
+ if (url_tab) {
+ url_tab = url_tab[0];
+ }
+ // add tabs events and activate one tab (the first one or indicated by location hash)
+ for (var i = 0, imax = tabs.length; i < imax; i++) {
+ var links = $(tabs[i]).find('a');
+ var selected_tab = links[0];
+ for (var j = 0, jmax = links.length; j < jmax; j++) {
+ $(links[j]).click(function(e) {
+ e.preventDefault();
+ setTab(this);
+ });
+ if (links[j] == url_tab) {
+ selected_tab = links[j];
+ }
+ }
+ setTab(selected_tab);
+ }
+ // tab links handling, check each 200ms
+ // (works with history in FF, further browser support here would be an overkill)
+ var prev_hash = location.hash;
+ setInterval(function() {
+ if (location.hash != prev_hash) {
+ prev_hash = location.hash;
+ var url_tab = location.hash.match(/^#tab_.+/)
+ ? $('a[href$="' + location.hash.substr(5) + '"]') : null;
+ if (url_tab) {
+ setTab(url_tab[0]);
+ }
+ }
+ }, 200);
+});
+
+//
+// END: Tabbed forms
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// Form reset buttons
+//
+
+$(function() {
+ $('input[type=button]').click(function(e) {
+ var fields = $(this).closest('fieldset').find('input, select, textarea');
+ for (var i = 0, imax = fields.length; i < imax; i++) {
+ setFieldValue(fields[i], getFieldType(fields[i]));
+ }
+ });
+});
+
+//
+// END: Form reset buttons
+// ------------------------------------------------------------------
+
+// ------------------------------------------------------------------
+// "Restore default" and "set value" buttons
+//
+
+/**
+ * Restores field's default value
+ *
+ * @param String field_id
+ */
+function restoreField(field_id) {
+ var field = $('#'+field_id);
+ if (field.length == 0 || defaultValues[field_id] == undefined) {
+ return;
+ }
+ setFieldValue(field, getFieldType(field), defaultValues[field_id]);
+}
+
+$(function() {
+ $('.restore-default, .set-value').each(function() {
+ var link = $(this);
+ link.css('opacity', 0.25);
+ if (!link.hasClass('restore-default')) {
+ // restore-default is handled by markField
+ link.css('display', '');
+ }
+ link.bind({
+ mouseenter: function() {$(this).css('opacity', 1);},
+ mouseleave: function() {$(this).css('opacity', 0.25);},
+ click: function(e) {
+ e.preventDefault();
+ var href = $(this).attr('href').substr(1);
+ var field_id;
+ if ($(this).hasClass('restore-default')) {
+ field_id = href;
+ restoreField(field_id);
+ } else {
+ field_id = href.match(/^[^=]+/)[0];
+ var value = href.match(/=(.+)$/)[1];
+ setFieldValue($('#'+field_id), 'text', value);
+ }
+ $('#'+field_id).trigger('change');
+ }
+ });
+ });
+});
+
+//
+// END: "Restore default" and "set value" buttons
+// ------------------------------------------------------------------
diff --git a/setup/styles.css b/setup/styles.css
index 0b89143..d5a399d 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -1,379 +1,389 @@
-/* global styles */
-
-body {
- padding-bottom: 1em;
-}
-
-img {
- border: 0;
-}
-
-a {
- color: #004C96;
-}
-
-a:hover, a:active {
- color: #000;
-}
-
-h1 {
- font-size: 1.5em;
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-/* language selection box */
-
-#select_lang {
- position: absolute;
- right: 1em;
- top: 1em;
-}
-
-/* menu */
-
-#menu {
- float: left;
- width: 200px;
-}
-
-#menu ul {
- margin: 1em 1em 1em 0.5em;
- padding: 0 0.5em;
- list-style: none;
-}
-
-#menu li a {
- padding: 3px;
- font-weight: bold;
- display: block;
- color: #669;
- text-decoration: none;
- zoom: 1; /* IE fix */
-}
-
-#menu li a:hover, #menu li a:active {
- color: #C00;
-}
-
-/* page contents and footer layout */
-
-#page {
- margin-left: 200px;
-}
-
-#footer {
- margin-top: 1em;
-}
-
-#footer a {
- margin-right: 0.5em;
- text-decoration: none;
- font-size: small;
-}
-
-/* phpMyAdmin logo colors */
-
-.blue {
- color: #7584B3;
-}
-
-.orange {
- color: #FFAD17;
-}
-
-.red {
- color: #C00;
-}
-
-/* main page messages */
-
-div.notice, div.warning, div.error {
- margin: 0.5em 0;
- padding: 10px 10px 10px 36px;
- border: 1px solid #000;
- background: #FFD url(../themes/original/img/b_tipp.png) no-repeat 10px 0.8em;
-}
-
-div.notice h4, div.warning h4, div.error h4 {
- font-weight: bold;
- font-size: large;
- margin: 0 0 0.2em 0;
- border-bottom: 1px solid #000;
-}
-
-div.notice {
- border-color: #FFD700;
- background-color: #FFD;
- background-image: url(../themes/original/img/s_notice.png);
-}
-
-div.notice h4 {
- border-color: #FFD700;
-}
-
-div.warning {
- border-color: #C00;
- background-color: #FFC;
- background-image: url(../themes/original/img/s_warn.png);
-}
-
-div.warning h4 {
- color: #C00;
- border-color: #C00;
-}
-
-div.error {
- border-color: #D00;
- background-color: #FFC;
- background-image: url(../themes/original/img/s_error.png);
-}
-
-div.error h4 {
- color: #D00;
- border-color: #D00;
-}
-
-/* form tabs */
-
-ul.tabs {
- margin: 0;
- padding: 0 0 7px 0;
- list-style: none;
- font-weight: bold;
-}
-
-ul.tabs li {
- float: left;
-}
-
-ul.tabs li a {
- display: block;
- margin: 2px 2px 0;
- padding: 2px 8px;
- background: #DEE1FF;
- white-space: nowrap;
- text-decoration: none;
- border: 1px #9AA4FF solid;
- border-bottom: none;
-}
-
-ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li a.active {
- margin: 0;
- padding: 2px 10px 4px;
- background: #F7FBFF;
-}
-
-ul.tabs li a:hover, ul.tabs li a:active {
- color: #C00;
-}
-
-.tabs_contents {
- border-top: 2px #66B solid;
-}
-
-.tabs_contents fieldset {
- margin-top: 0;
- border-top: none;
-}
-
-.tabs_contents legend {
- display: none;
-}
-
-/* "restore default value" and "set value: foo" buttons */
-
-.restore-default img, .set-value img {
- margin-bottom: -3px;
-}
-
-/* forms */
-
-fieldset {
- padding: 0;
- margin-top: 1em;
- border: 2px #DEE1FF solid;
- background: #DEE1FF;
-}
-
-.form {
- border: 2px #DEE1FF solid;
-}
-
-fieldset legend {
- margin-left: 1em;
- padding: 2px 8px;
- font-weight: bold;
- background: #F7FBFF;
- border: 1px #9AA4FF solid;
-}
-
-fieldset p {
- margin: 0;
- padding: 0.5em;
- background: #DEE1FF;
-}
-
-fieldset .errors { /* form error list */
- margin: 0 -2px 1em -2px;
- padding: 0.5em 1.5em;
- background: #FBEAD9;
- border: 1px #C83838 solid;
- border-width: 1px 0;
- list-style: none;
- font-family: sans-serif;
- font-size: small;
-}
-
-fieldset .inline_errors { /* field error list */
- margin: 0.3em 0.3em 0.3em 0;
- padding: 0;
- list-style: none;
- color: #9A0000;
-}
-
-fieldset table {
- background: #FFF;
-}
-
-fieldset th {
- width: 40%;
- min-width: 350px;
- padding: 0.3em 0.3em 0.3em 0.5em;
- text-align: left;
- vertical-align: top;
-}
-
-fieldset th small {
- display: block;
-}
-
-fieldset .doc {
- margin-left: 1em;
-}
-
-fieldset td {
- padding-top: 0.3em;
- vertical-align: top;
-}
-
-fieldset th small {
- font-weight: normal;
- font-family: sans-serif;
- font-size: x-small;
- color: #666;
-}
-
-fieldset th, fieldset td {
- border-top: 1px #555 dotted;
-}
-
-fieldset .lastrow, .form .lastrow {
- background: #F7FBFF;
- padding: 0.5em;
- text-align: center;
-}
-
-.form .lastrow {
- border-top: 1px #555 dotted;
-}
-
-fieldset .lastrow input, .form .lastrow input {
- font-weight: bold;
-}
-
-/* simple form, without header and legend */
-
-fieldset.simple {
- border-top-color: #DEE1FF;
-}
-
-fieldset.simple legend {
- display: none;
-}
-
-fieldset.simple th, fieldset.simple td {
- border-top: none;
- border-bottom: 1px #555 dotted;
-}
-
-fieldset.simple .lastrow {
- border: 0;
-}
-
-/* form elements */
-
-span.checkbox {
- padding: 2px;
-}
-
-.custom { /* customized field */
- background: #FFC;
-}
-
-span.checkbox.custom {
- padding: 1px;
- border: 1px #EDEC90 solid;
- background: #FFC;
-}
-
-input[type="text"], select, textarea {
- border: 1px #A7A6AA solid;
-}
-
-input[type="text"]:focus, select:focus, textarea:focus {
- border: 1px #6676FF solid;
- background: #F7FBFF;
-}
-
-.green { /* default form button */
- color: #080;
-}
-
-table.datatable {
- margin: 0.5em 0 1em;
-}
-
-table.datatable th {
- padding: 0 1em 0 0.5em;
- border-bottom: 2px #66F solid;
- text-align: left;
-}
-
-table.datatable td {
- padding: 1px 0.5em;
- border-bottom: 1px #DEE1FF solid;
-}
-
-/* textarea with config file's contents */
-
-#textconfig {
- width: 100%;
- border: 0;
-}
-
-/* error list */
-
-dd {
- margin-left: 0.5em;
-}
-
-dd:before {
- content: "\25B8 ";
-}
-
-/* links on failed validation page, when saving a form */
-
-a.btn {
- padding: 1px 5px;
- text-decoration: none;
- background: #E2E8FF;
- border: 1px #A6C8FF solid;
- border-top-color: #AFD0FF;
- border-left-color: #AFD0FF;
- font-weight: bold;
-}
-
-a.btn:hover, a.btn:active {
- background: #E6F5FF;
- color: #004C96;
-}
+/* global styles */
+
+body {
+ padding-bottom: 1em;
+}
+
+img {
+ border: 0;
+}
+
+a {
+ color: #004C96;
+}
+
+a:hover, a:active {
+ color: #000;
+}
+
+h1 {
+ font-size: 1.5em;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+/* language selection box */
+
+#select_lang {
+ position: absolute;
+ right: 1em;
+ top: 1em;
+}
+
+/* menu */
+
+#menu {
+ float: left;
+ width: 200px;
+}
+
+#menu ul {
+ margin: 1em 1em 1em 0.5em;
+ padding: 0 0.5em;
+ list-style: none;
+}
+
+#menu li a {
+ padding: 3px;
+ font-weight: bold;
+ display: block;
+ color: #669;
+ text-decoration: none;
+ zoom: 1; /* IE fix */
+}
+
+#menu li a:hover, #menu li a:active {
+ color: #C00;
+}
+
+/* page contents and footer layout */
+
+#page {
+ margin-left: 200px;
+}
+
+#footer {
+ margin-top: 1em;
+}
+
+#footer a {
+ margin-right: 0.5em;
+ text-decoration: none;
+ font-size: small;
+}
+
+/* phpMyAdmin logo colors */
+
+.blue {
+ color: #7584B3;
+}
+
+.orange {
+ color: #FFAD17;
+}
+
+.red {
+ color: #C00;
+}
+
+/* main page messages */
+
+div.notice, div.warning, div.error {
+ margin: 0.5em 0;
+ padding: 10px 10px 10px 36px;
+ border: 1px solid #000;
+ background: #FFD url(../themes/original/img/b_tipp.png) no-repeat 10px 0.8em;
+}
+
+div.notice h4, div.warning h4, div.error h4 {
+ font-weight: bold;
+ font-size: large;
+ margin: 0 0 0.2em 0;
+ border-bottom: 1px solid #000;
+}
+
+div.notice {
+ border-color: #FFD700;
+ background-color: #FFD;
+ background-image: url(../themes/original/img/s_notice.png);
+}
+
+div.notice h4 {
+ border-color: #FFD700;
+}
+
+div.notice[id^=version_check] {
+ border-color: #002DFF;
+ background-color: #EEF;
+}
+
+div.notice[id^=version_check] h4 {
+ border-color: #002DFF;
+}
+
+div.warning {
+ border-color: #C00;
+ background-color: #FFC;
+ background-image: url(../themes/original/img/s_warn.png);
+}
+
+div.warning h4 {
+ color: #C00;
+ border-color: #C00;
+}
+
+div.error {
+ border-color: #D00;
+ background-color: #FFC;
+ background-image: url(../themes/original/img/s_error.png);
+}
+
+div.error h4 {
+ color: #D00;
+ border-color: #D00;
+}
+
+/* form tabs */
+
+ul.tabs {
+ margin: 0;
+ padding: 0 0 7px 0;
+ list-style: none;
+ font-weight: bold;
+}
+
+ul.tabs li {
+ float: left;
+}
+
+ul.tabs li a {
+ display: block;
+ margin: 2px 2px 0;
+ padding: 2px 8px;
+ background: #DEE1FF;
+ white-space: nowrap;
+ text-decoration: none;
+ border: 1px #9AA4FF solid;
+ border-bottom: none;
+}
+
+ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li a.active {
+ margin: 0;
+ padding: 2px 10px 4px;
+ background: #F7FBFF;
+}
+
+ul.tabs li a:hover, ul.tabs li a:active {
+ color: #C00;
+}
+
+.tabs_contents {
+ border-top: 2px #66B solid;
+}
+
+.tabs_contents fieldset {
+ margin-top: 0;
+ border-top: none;
+}
+
+.tabs_contents legend {
+ display: none;
+}
+
+/* "restore default value" and "set value: foo" buttons */
+
+.restore-default img, .set-value img {
+ margin-bottom: -3px;
+}
+
+/* forms */
+
+fieldset {
+ padding: 0;
+ margin-top: 1em;
+ border: 2px #DEE1FF solid;
+ background: #DEE1FF;
+}
+
+.form {
+ border: 2px #DEE1FF solid;
+}
+
+fieldset legend {
+ margin-left: 1em;
+ padding: 2px 8px;
+ font-weight: bold;
+ background: #F7FBFF;
+ border: 1px #9AA4FF solid;
+}
+
+fieldset p {
+ margin: 0;
+ padding: 0.5em;
+ background: #DEE1FF;
+}
+
+fieldset .errors { /* form error list */
+ margin: 0 -2px 1em -2px;
+ padding: 0.5em 1.5em;
+ background: #FBEAD9;
+ border: 1px #C83838 solid;
+ border-width: 1px 0;
+ list-style: none;
+ font-family: sans-serif;
+ font-size: small;
+}
+
+fieldset .inline_errors { /* field error list */
+ margin: 0.3em 0.3em 0.3em 0;
+ padding: 0;
+ list-style: none;
+ color: #9A0000;
+ font-size: small;
+}
+
+fieldset table {
+ background: #FFF;
+}
+
+fieldset th {
+ width: 40%;
+ min-width: 350px;
+ padding: 0.3em 0.3em 0.3em 0.5em;
+ text-align: left;
+ vertical-align: top;
+}
+
+fieldset th small {
+ display: block;
+}
+
+fieldset .doc {
+ margin-left: 1em;
+}
+
+fieldset td {
+ padding-top: 0.3em;
+ vertical-align: top;
+}
+
+fieldset th small {
+ font-weight: normal;
+ font-family: sans-serif;
+ font-size: x-small;
+ color: #666;
+}
+
+fieldset th, fieldset td {
+ border-top: 1px #555 dotted;
+}
+
+fieldset .lastrow, .form .lastrow {
+ background: #F7FBFF;
+ padding: 0.5em;
+ text-align: center;
+}
+
+.form .lastrow {
+ border-top: 1px #555 dotted;
+}
+
+fieldset .lastrow input, .form .lastrow input {
+ font-weight: bold;
+}
+
+/* simple form, without header and legend */
+
+fieldset.simple {
+ border-top-color: #DEE1FF;
+}
+
+fieldset.simple legend {
+ display: none;
+}
+
+fieldset.simple th, fieldset.simple td {
+ border-top: none;
+ border-bottom: 1px #555 dotted;
+}
+
+fieldset.simple .lastrow {
+ border: 0;
+}
+
+/* form elements */
+
+span.checkbox {
+ padding: 2px;
+}
+
+.custom { /* customized field */
+ background: #FFC;
+}
+
+span.checkbox.custom {
+ padding: 1px;
+ border: 1px #EDEC90 solid;
+ background: #FFC;
+}
+
+input[type="text"], select, textarea {
+ border: 1px #A7A6AA solid;
+}
+
+input[type="text"]:focus, select:focus, textarea:focus {
+ border: 1px #6676FF solid;
+ background: #F7FBFF;
+}
+
+.green { /* default form button */
+ color: #080;
+}
+
+table.datatable {
+ margin: 0.5em 0 1em;
+}
+
+table.datatable th {
+ padding: 0 1em 0 0.5em;
+ border-bottom: 2px #66F solid;
+ text-align: left;
+}
+
+table.datatable td {
+ padding: 1px 0.5em;
+ border-bottom: 1px #DEE1FF solid;
+}
+
+/* textarea with config file's contents */
+
+#textconfig {
+ width: 100%;
+ border: 0;
+}
+
+/* error list */
+
+dd {
+ margin-left: 0.5em;
+}
+
+dd:before {
+ content: "\25B8 ";
+}
+
+/* links on failed validation page, when saving a form */
+
+a.btn {
+ padding: 1px 5px;
+ text-decoration: none;
+ background: #E2E8FF;
+ border: 1px #A6C8FF solid;
+ border-top-color: #AFD0FF;
+ border-left-color: #AFD0FF;
+ font-weight: bold;
+}
+
+a.btn:hover, a.btn:active {
+ background: #E6F5FF;
+ color: #004C96;
+}
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list