Modified: web/php/branches/PROTOTYPE_2010/css/doc.css =================================================================== --- web/php/branches/PROTOTYPE_2010/css/doc.css 2009-12-22 16:25:44 UTC (rev 292488) +++ web/php/branches/PROTOTYPE_2010/css/doc.css 2009-12-22 17:02:35 UTC (rev 292489) @@ -3,6 +3,7 @@ } h3.title { + font-size: 1.5em; border-top-style: solid; border-top-width: 3px; padding-top: 6px; @@ -12,7 +13,7 @@ .methodsynopsis { border-top: 3px solid #ddd; background: #efefef; - margin: 1em 2em; + margin: 1em 2em 1.3em 2em; padding: 10px 20px; color: #666; font-family: monospace; @@ -37,4 +38,20 @@ td, th { padding: 2px 5px; +} + +.refentry .description p { + margin: 0.7em 0; +} + +.refentry .parameters dt { + font-size: 1.2em; +} + +.refentry .parameters dd { + margin-top: -0.7em; +} + +.refentry .parameters p { + margin: 0.7em 0; } \ No newline at end of file Modified: web/php/branches/PROTOTYPE_2010/css/structure.css =================================================================== --- web/php/branches/PROTOTYPE_2010/css/structure.css 2009-12-22 16:25:44 UTC (rev 292488) +++ web/php/branches/PROTOTYPE_2010/css/structure.css 2009-12-22 17:02:35 UTC (rev 292489) @@ -3,27 +3,27 @@ } h1 { - margin-bottom: 0.2em; + margin-bottom: 0.2em; } #headnav { - padding: 0 25px; + padding: 0 25px; height: 72px; } #headmenu { - width: 920px; - margin: 0 auto; + width: 920px; + margin: 0 auto; } #headnav h6, #headnav li, #headsearch { - display: block; - float: left; - margin: 0; - list-style: none; - padding: 18px 0 0 0; + display: block; + float: left; + margin: 0; + list-style: none; + padding: 18px 0 0 0; } #headnav li#headhome { @@ -31,164 +31,164 @@ #headnav li#headhome a, #headnav li#headhome a:hover { - width: 150px; - height: 16px; - text-indent: -2000em; - border: none; + width: 150px; + height: 16px; + text-indent: -2000em; + border: none; } #headnav li#headsearch { - margin: 22px 0 0 20px; + margin: 22px 0 0 20px; padding: 2px; - float: right; - border: 1px solid; + float: right; + border: 1px solid; } #headsearch-keywords { - border: 0; - padding: 2px; - width: 14em; + border: 0; + padding: 2px; + width: 14em; } #headsearch-submit { - border: 0; - margin: 1px; - padding: 3px 6px; - font-weight: bold; + border: 0; + margin: 1px; + padding: 3px 6px; + font-weight: bold; } #headnav a.menu-link, #headnav h6 a { - display: block; - padding: 10px; - margin: 0; - border-bottom: 12px solid; + display: block; + padding: 10px; + margin: 0; + border-bottom: 12px solid; } #headnav a.menu-link, #headnav li.current a.menu-link { - padding: 12px 15px 17px 15px; + padding: 12px 15px 17px 15px; } #headnav li.parent a.menu-link { - padding-right: 22px; + padding-right: 22px; } #headnav li.parent .children { - display: none; - z-index: 1000; + display: none; + z-index: 1000; position: absolute; - top: 50px; - left: 50%; + top: 71px; + left: 50%; margin-left: -470px; - width: 940px; - border-style: solid; + width: 940px; } #headnav li.parent .children .children-1 { - margin: 5px; + margin: 1px 5px 5px 5px; border: 2px solid; - line-height: 1.4; - padding: 10px 15px 15px 15px; + border-top: none; + line-height: 1.4; + padding: 10px 15px 15px 15px; } #headnav li.parent .children .children-2 { - width: 920px; - margin: 0 auto; + width: 920px; + margin: 0 auto; } .children dl { - float: left; - width: 195px; - padding-right: 15px; + float: left; + width: 195px; + padding-right: 15px; } .children dl a { - display: block; - padding: 4px; + display: block; + padding: 4px; } .children dt { - font-weight: bold; - margin-top: 1em; - border-top-width: 3px; - border-top-style: solid; + font-weight: bold; + margin-top: 1em; + border-top-width: 3px; + border-top-style: solid; } .children dd { - padding: 0 0 0 10px; - font-size: 11px; + padding: 0 0 0 10px; + font-size: 11px; } #layout { - padding: 25px 0; - width: 920px; - margin: 0 auto; + padding: 25px 0; + width: 920px; + margin: 0 auto; } .layout-menu { - float: left; - width: 160px; - padding-right: 30px; + float: left; + width: 160px; + padding-right: 30px; } .layout-menu li a { - display: block; - border-top-width: 3px; - border-top-style: solid; - padding: 4px 0; - margin-top: 1em; - font-weight: bold; + display: block; + border-top-width: 3px; + border-top-style: solid; + padding: 4px 0; + margin-top: 1em; + font-weight: bold; } .layout-menu li li a { - border: none; - font-size: 11px; - padding: 1px 0 1px 20px; - margin: 0; - font-weight: normal; + border: none; + font-size: 11px; + padding: 1px 0 1px 20px; + margin: 0; + font-weight: normal; } .layout-content { - float: left; - width: 730px; + float: left; + width: 730px; } /** * Auto-complete (.ac) */ .ac_results { - padding: 1px 3px 3px 3px; - overflow: hidden; - z-index: 99999; + padding: 1px 3px 3px 3px; + overflow: hidden; + z-index: 99999; margin: 0 0 0 1px; } .ac_results ul { - list-style-position: outside; - list-style: none; - padding: 0 0 5px 0; - margin: 0; - border: 1px solid; + list-style-position: outside; + list-style: none; + padding: 0 0 5px 0; + margin: 0; + border: 1px solid; border-top: none; } .ac_results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; + margin: 0px; + padding: 2px 5px; + cursor: default; + display: block; + /* + if width will be 100% horizontal scrollbar will apear + when scroll mode will be used + */ + /*width: 100%;*/ + font: menu; + font-size: 12px; + /* + it is very important, if line-height not setted or setted + in relative units scroll will be broken in firefox + */ + line-height: 16px; + overflow: hidden; } Modified: web/php/branches/PROTOTYPE_2010/css/theme.css =================================================================== --- web/php/branches/PROTOTYPE_2010/css/theme.css 2009-12-22 16:25:44 UTC (rev 292488) +++ web/php/branches/PROTOTYPE_2010/css/theme.css 2009-12-22 17:02:35 UTC (rev 292489) @@ -44,15 +44,19 @@ #headnav li.parent .children { background: url('../img/shade.png'); - -moz-border-radius: 10px; - -webkit-border-radius: 10px; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; } #headnav li.parent .children .children-1 { background: #fff; border-color: #604080; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; } #headnav li.parent a.menu-link { @@ -129,7 +133,7 @@ } .ac_results ul { - border-color: #987db3; + border-color: #604080; background-color: white; -moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomright: 5px; Modified: web/php/branches/PROTOTYPE_2010/index.html =================================================================== --- web/php/branches/PROTOTYPE_2010/index.html 2009-12-22 16:25:44 UTC (rev 292488) +++ web/php/branches/PROTOTYPE_2010/index.html 2009-12-22 17:02:35 UTC (rev 292489) @@ -20,7 +20,7 @@ - + @@ -237,9 +237,9 @@

Description

resource mysql_pconnect - ([ string $server= ini_get("mysql.default_host") - [, string $username= ini_get("mysql.default_user") - [, string $password= ini_get("mysql.default_password") + ([ string $server = ini_get("mysql.default_host") + [, string $username = ini_get("mysql.default_user") + [, string $password = ini_get("mysql.default_password") [, int $client_flags ]]]] )
Modified: web/php/branches/PROTOTYPE_2010/js/common.js =================================================================== --- web/php/branches/PROTOTYPE_2010/js/common.js 2009-12-22 16:25:44 UTC (rev 292488) +++ web/php/branches/PROTOTYPE_2010/js/common.js 2009-12-22 17:02:35 UTC (rev 292489) @@ -32,7 +32,7 @@ alert("User selected: " + item['name'] + "\n" + "Direct user to: " + item['page']); } - ); + ); }); }); Added: web/php/branches/PROTOTYPE_2010/js/jquery.autocomplete.js =================================================================== --- web/php/branches/PROTOTYPE_2010/js/jquery.autocomplete.js (rev 0) +++ web/php/branches/PROTOTYPE_2010/js/jquery.autocomplete.js 2009-12-22 17:02:35 UTC (rev 292489) @@ -0,0 +1,808 @@ +/* + * jQuery Autocomplete plugin 1.1 + * + * Copyright (c) 2009 Jörn Zaefferer + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $ + */ + +;(function($) { + +$.fn.extend({ + autocomplete: function(urlOrData, options) { + var isUrl = typeof urlOrData == "string"; + options = $.extend({}, $.Autocompleter.defaults, { + url: isUrl ? urlOrData : null, + data: isUrl ? null : urlOrData, + delay: isUrl ? $.Autocompleter.defaults.delay : 10, + max: options && !options.scroll ? 10 : 150 + }, options); + + // if highlight is set to false, replace it with a do-nothing function + options.highlight = options.highlight || function(value) { return value; }; + + // if the formatMatch option is not specified, then use formatItem for backwards compatibility + options.formatMatch = options.formatMatch || options.formatItem; + + return this.each(function() { + new $.Autocompleter(this, options); + }); + }, + result: function(handler) { + return this.bind("result", handler); + }, + search: function(handler) { + return this.trigger("search", [handler]); + }, + flushCache: function() { + return this.trigger("flushCache"); + }, + setOptions: function(options){ + return this.trigger("setOptions", [options]); + }, + unautocomplete: function() { + return this.trigger("unautocomplete"); + } +}); + +$.Autocompleter = function(input, options) { + + var KEY = { + UP: 38, + DOWN: 40, + DEL: 46, + TAB: 9, + RETURN: 13, + ESC: 27, + COMMA: 188, + PAGEUP: 33, + PAGEDOWN: 34, + BACKSPACE: 8 + }; + + // Create $ object for input element + var $input = $(input).attr("autocomplete", "off").addClass(options.inputClass); + + var timeout; + var previousValue = ""; + var cache = $.Autocompleter.Cache(options); + var hasFocus = 0; + var lastKeyPressCode; + var config = { + mouseDownOnSelect: false + }; + var select = $.Autocompleter.Select(options, input, selectCurrent, config); + + var blockSubmit; + + // prevent form submit in opera when selecting with return key + $.browser.opera && $(input.form).bind("submit.autocomplete", function() { + if (blockSubmit) { + blockSubmit = false; + return false; + } + }); + + // only opera doesn't trigger keydown multiple times while pressed, others don't work with keypress at all + $input.bind(($.browser.opera ? "keypress" : "keydown") + ".autocomplete", function(event) { + // a keypress means the input has focus + // avoids issue where input had focus before the autocomplete was applied + hasFocus = 1; + // track last key pressed + lastKeyPressCode = event.keyCode; + switch(event.keyCode) { + + case KEY.UP: + event.preventDefault(); + if ( select.visible() ) { + select.prev(); + } else { + onChange(0, true); + } + break; + + case KEY.DOWN: + event.preventDefault(); + if ( select.visible() ) { + select.next(); + } else { + onChange(0, true); + } + break; + + case KEY.PAGEUP: + event.preventDefault(); + if ( select.visible() ) { + select.pageUp(); + } else { + onChange(0, true); + } + break; + + case KEY.PAGEDOWN: + event.preventDefault(); + if ( select.visible() ) { + select.pageDown(); + } else { + onChange(0, true); + } + break; + + // matches also semicolon + case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA: + case KEY.TAB: + case KEY.RETURN: + if( selectCurrent() ) { + // stop default to prevent a form submit, Opera needs special handling + event.preventDefault(); + blockSubmit = true; + return false; + } + break; + + case KEY.ESC: + select.hide(); + break; + + default: + clearTimeout(timeout); + timeout = setTimeout(onChange, options.delay); + break; + } + }).focus(function(){ + // track whether the field has focus, we shouldn't process any + // results if the field no longer has focus + hasFocus++; + }).blur(function() { + hasFocus = 0; + if (!config.mouseDownOnSelect) { + hideResults(); + } + }).click(function() { + // show select when clicking in a focused field + if ( hasFocus++ > 1 && !select.visible() ) { + onChange(0, true); + } + }).bind("search", function() { + // TODO why not just specifying both arguments? + var fn = (arguments.length > 1) ? arguments[1] : null; + function findValueCallback(q, data) { + var result; + if( data && data.length ) { + for (var i=0; i < data.length; i++) { + if( data[i].result.toLowerCase() == q.toLowerCase() ) { + result = data[i]; + break; + } + } + } + if( typeof fn == "function" ) fn(result); + else $input.trigger("result", result && [result.data, result.value]); + } + $.each(trimWords($input.val()), function(i, value) { + request(value, findValueCallback, findValueCallback); + }); + }).bind("flushCache", function() { + cache.flush(); + }).bind("setOptions", function() { + $.extend(options, arguments[1]); + // if we've updated the data, repopulate + if ( "data" in arguments[1] ) + cache.populate(); + }).bind("unautocomplete", function() { + select.unbind(); + $input.unbind(); + $(input.form).unbind(".autocomplete"); + }); + + + function selectCurrent() { + var selected = select.selected(); + if( !selected ) + return false; + + var v = selected.result; + previousValue = v; + + if ( options.multiple ) { + var words = trimWords($input.val()); + if ( words.length > 1 ) { + var seperator = options.multipleSeparator.length; + var cursorAt = $(input).selection().start; + var wordAt, progress = 0; + $.each(words, function(i, word) { + progress += word.length; + if (cursorAt <= progress) { + wordAt = i; + return false; + } + progress += seperator; + }); + words[wordAt] = v; + // TODO this should set the cursor to the right position, but it gets overriden somewhere + //$.Autocompleter.Selection(input, progress + seperator, progress + seperator); + v = words.join( options.multipleSeparator ); + } + v += options.multipleSeparator; + } + + $input.val(v); + hideResultsNow(); + $input.trigger("result", [selected.data, selected.value]); + return true; + } + + function onChange(crap, skipPrevCheck) { + if( lastKeyPressCode == KEY.DEL ) { + select.hide(); + return; + } + + var currentValue = $input.val(); + + if ( !skipPrevCheck && currentValue == previousValue ) + return; + + previousValue = currentValue; + + currentValue = lastWord(currentValue); + if ( currentValue.length >= options.minChars) { + $input.addClass(options.loadingClass); + if (!options.matchCase) + currentValue = currentValue.toLowerCase(); + request(currentValue, receiveData, hideResultsNow); + } else { + stopLoading(); + select.hide(); + } + }; + + function trimWords(value) { + if (!value) + return [""]; + if (!options.multiple) + return [$.trim(value)]; + return $.map(value.split(options.multipleSeparator), function(word) { + return $.trim(value).length ? $.trim(word) : null; + }); + } + + function lastWord(value) { + if ( !options.multiple ) + return value; + var words = trimWords(value); + if (words.length == 1) + return words[0]; + var cursorAt = $(input).selection().start; + if (cursorAt == value.length) { + words = trimWords(value) + } else { + words = trimWords(value.replace(value.substring(cursorAt), "")); + } + return words[words.length - 1]; + } + + // fills in the input box w/the first match (assumed to be the best match) + // q: the term entered + // sValue: the first matching result + function autoFill(q, sValue){ + // autofill in the complete box w/the first match as long as the user hasn't entered in more data + // if the last user key pressed was backspace, don't autofill + if( options.autoFill && (lastWord($input.val()).toLowerCase() == q.toLowerCase()) && lastKeyPressCode != KEY.BACKSPACE ) { + // fill in the value (keep the case the user has typed) + $input.val($input.val() + sValue.substring(lastWord(previousValue).length)); + // select the portion of the value not typed by the user (so the next character will erase) + $(input).selection(previousValue.length, previousValue.length + sValue.length); + } + }; + + function hideResults() { + clearTimeout(timeout); + timeout = setTimeout(hideResultsNow, 200); + }; + + function hideResultsNow() { + var wasVisible = select.visible(); + select.hide(); + clearTimeout(timeout); + stopLoading(); + if (options.mustMatch) { + // call search and run callback + $input.search( + function (result){ + // if no value found, clear the input box + if( !result ) { + if (options.multiple) { + var words = trimWords($input.val()).slice(0, -1); + $input.val( words.join(options.multipleSeparator) + (words.length ? options.multipleSeparator : "") ); + } + else { + $input.val( "" ); + $input.trigger("result", null); + } + } + } + ); + } + }; + + function receiveData(q, data) { + if ( data && data.length && hasFocus ) { + stopLoading(); + select.display(data, q); + autoFill(q, data[0].value); + select.show(); + } else { + hideResultsNow(); + } + }; + + function request(term, success, failure) { + if (!options.matchCase) + term = term.toLowerCase(); + var data = cache.load(term); + // recieve the cached data + if (data && data.length) { + success(term, data); + // if an AJAX url has been supplied, try loading the data now + } else if( (typeof options.url == "string") && (options.url.length > 0) ){ + + var extraParams = { + timestamp: +new Date() + }; + $.each(options.extraParams, function(key, param) { + extraParams[key] = typeof param == "function" ? param() : param; + }); + + $.ajax({ + // try to leverage ajaxQueue plugin to abort previous requests + mode: "abort", + // limit abortion to this input + port: "autocomplete" + input.name, + dataType: options.dataType, + url: options.url, + data: $.extend({ + q: lastWord(term), + limit: options.max + }, extraParams), + success: function(data) { + var parsed = options.parse && options.parse(data) || parse(data); + cache.add(term, parsed); + success(term, parsed); + } + }); + } else { + // if we have a failure, we need to empty the list -- this prevents the the [TAB] key from selecting the last successful match + select.emptyList(); + failure(term); + } + }; + + function parse(data) { + var parsed = []; + var rows = data.split("\n"); + for (var i=0; i < rows.length; i++) { + var row = $.trim(rows[i]); + if (row) { + row = row.split("|"); + parsed[parsed.length] = { + data: row, + value: row[0], + result: options.formatResult && options.formatResult(row, row[0]) || row[0] + }; + } + } + return parsed; + }; + + function stopLoading() { + $input.removeClass(options.loadingClass); + }; + +}; + +$.Autocompleter.defaults = { + inputClass: "ac_input", + resultsClass: "ac_results", + loadingClass: "ac_loading", + minChars: 1, + delay: 400, + matchCase: false, + matchSubset: true, + matchContains: false, + cacheLength: 10, + max: 100, + mustMatch: false, + extraParams: {}, + selectFirst: true, + formatItem: function(row) { return row[0]; }, + formatMatch: null, + autoFill: false, + width: 0, + multiple: false, + multipleSeparator: ", ", + highlight: function(value, term) { + return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1"); + }, + scroll: true, + scrollHeight: 180 +}; + +$.Autocompleter.Cache = function(options) { + + var data = {}; + var length = 0; + + function matchSubset(s, sub) { + if (!options.matchCase) + s = s.toLowerCase(); + var i = s.indexOf(sub); + if (options.matchContains == "word"){ + i = s.toLowerCase().search("\\b" + sub.toLowerCase()); + } + if (i == -1) return false; + return i == 0 || options.matchContains; + }; + + function add(q, value) { + if (length > options.cacheLength){ + flush(); + } + if (!data[q]){ + length++; + } + data[q] = value; + } + + function populate(){ + if( !options.data ) return false; + // track the matches + var stMatchSets = {}, + nullData = 0; + + // no url was specified, we need to adjust the cache length to make sure it fits the local data store + if( !options.url ) options.cacheLength = 1; + + // track all options for minChars = 0 + stMatchSets[""] = []; + + // loop through the array and create a lookup structure + for ( var i = 0, ol = options.data.length; i < ol; i++ ) { + var rawValue = options.data[i]; + // if rawValue is a string, make an array otherwise just reference the array + rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue; + + var value = options.formatMatch(rawValue, i+1, options.data.length); + if ( value === false ) + continue; + + var firstChar = value.charAt(0).toLowerCase(); + // if no lookup array for this character exists, look it up now + if( !stMatchSets[firstChar] ) + stMatchSets[firstChar] = []; + + // if the match is a string + var row = { + value: value, + data: rawValue, + result: options.formatResult && options.formatResult(rawValue) || value + }; + + // push the current match into the set list + stMatchSets[firstChar].push(row); + + // keep track of minChars zero items + if ( nullData++ < options.max ) { + stMatchSets[""].push(row); + } + }; + + // add the data items to the cache + $.each(stMatchSets, function(i, value) { + // increase the cache size + options.cacheLength++; + // add to the cache + add(i, value); + }); + } + + // populate any existing data + setTimeout(populate, 25); + + function flush(){ + data = {}; + length = 0; + } + + return { + flush: flush, + add: add, + populate: populate, + load: function(q) { + if (!options.cacheLength || !length) + return null; + /* + * if dealing w/local data and matchContains than we must make sure + * to loop through all the data collections looking for matches + */ + if( !options.url && options.matchContains ){ + // track all matches + var csub = []; + // loop through all the data grids for matches + for( var k in data ){ + // don't search through the stMatchSets[""] (minChars: 0) cache + // this prevents duplicates + if( k.length > 0 ){ + var c = data[k]; + $.each(c, function(i, x) { + // if we've got a match, add it to the array + if (matchSubset(x.value, q)) { + csub.push(x); + } + }); + } + } + return csub; + } else + // if the exact item exists, use it + if (data[q]){ + return data[q]; + } else + if (options.matchSubset) { + for (var i = q.length - 1; i >= options.minChars; i--) { + var c = data[q.substr(0, i)]; + if (c) { + var csub = []; + $.each(c, function(i, x) { + if (matchSubset(x.value, q)) { + csub[csub.length] = x; + } + }); + return csub; + } + } + } + return null; + } + }; +}; + +$.Autocompleter.Select = function (options, input, select, config) { + var CLASSES = { + ACTIVE: "ac_over" + }; + + var listItems, + active = -1, + data, + term = "", + needsInit = true, + element, + list; + + // Create results + function init() { + if (!needsInit) + return; + element = $("
") + .hide() + .addClass(options.resultsClass) + .css("position", "absolute") + .appendTo(document.body); + + list = $("