Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Foellmann <foellmann@foe-services.de>2015-05-06 15:15:26 +0300
committerChristian Foellmann <foellmann@foe-services.de>2015-05-06 15:15:26 +0300
commit00b86eea95cdbe5188abb0b2be138cc6b1218b1c (patch)
tree6e721d5285f74f81b1fee9e381c735ec0df5d256
parenta904f56ebd4791d56515ecc7e41657573de9eda9 (diff)
UPDATE 4.4.5.04.4.5.0
-rw-r--r--ChangeLog13
-rw-r--r--README2
-rw-r--r--db_structure.php2
-rw-r--r--js/db_central_columns.js9
-rw-r--r--js/functions.js2
-rw-r--r--js/line_counts.php864
-rw-r--r--js/pmd/move.js34
-rw-r--r--libraries/Advisor.class.php2
-rw-r--r--libraries/Config.class.php2
-rw-r--r--libraries/DbSearch.class.php6
-rw-r--r--libraries/DisplayResults.class.php32
-rw-r--r--libraries/Util.class.php5
-rw-r--r--libraries/advisory_rules.txt14
-rw-r--r--libraries/config.default.php2
-rw-r--r--libraries/core.lib.php9
-rw-r--r--libraries/db_designer.lib.php25
-rw-r--r--libraries/language_stats.inc.php8
-rw-r--r--libraries/vendor_config.php6
-rw-r--r--locale/ia/LC_MESSAGES/phpmyadmin.mobin203595 -> 204592 bytes
-rw-r--r--locale/tr/LC_MESSAGES/phpmyadmin.mobin348750 -> 348868 bytes
-rw-r--r--themes/original/css/common.css.php6
-rw-r--r--themes/pmahomme/css/common.css.php2
-rw-r--r--themes/pmahomme/css/pmd.css.php8
23 files changed, 553 insertions, 500 deletions
diff --git a/ChangeLog b/ChangeLog
index 043d1d243b..5be0385f82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
phpMyAdmin - ChangeLog
======================
+4.4.5.0 (2015-05-05)
+- bug Table overhead stats: missing space before the unit
+- bug Fix resize icon in Designer
+- bug #4879 Exit fullscreen in Designer does not change the button text
+- bug #4880 Designer icons missing when using original theme
+- bug #4878 Column list of central columns is not cleared
+- bug #4881 jQuery dialogs of the Designer are not displayed in fullscreen
+- bug #4883 Search function breaks when searching for certain combinations of backslashes and slashes
+- bug #4830 Maximum execution time exceeded in Util.class.php (better fix)
+- bug #4885 Some icons are above the overlay of jQuery dialogs
+- bug #4886 Clicking on external links in advisor rules give JS error
+- bug #4888 Filter in central columns does not work in other languages
+
4.4.4.0 (2015-04-26)
- bug #4863 Edit vs Change
- bug #4859 Don't scroll (to bottom) when editing multiple rows
diff --git a/README b/README
index 6e9633b3aa..8e6bd32520 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.4.4
+Version 4.4.5
A set of PHP-scripts to manage MySQL over the web.
diff --git a/db_structure.php b/db_structure.php
index 07eaa2d0fc..9773a94a38 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -181,7 +181,7 @@ foreach ($tables as $keyname => $current_table) {
if ($formatted_overhead != '') {
$overhead = '<a href="tbl_structure.php'
. $tbl_url_query . '#showusage">'
- . '<span>' . $formatted_overhead . '</span>'
+ . '<span>' . $formatted_overhead . '</span>&nbsp;'
. '<span class="unit">' . $overhead_unit . '</span>'
. '</a>' . "\n";
$overhead_check .=
diff --git a/js/db_central_columns.js b/js/db_central_columns.js
index 64ba96e850..18b1153a81 100644
--- a/js/db_central_columns.js
+++ b/js/db_central_columns.js
@@ -53,7 +53,10 @@ AJAX.registerOnload('db_central_columns.js', function () {
});
window.scrollTo(0, 0);
$(document).on("keyup", ".filter_rows", function () {
- var cols = ["Name", "Type", "Attribute","Length/Values", "Collation", "Null", "Extra", "Default"];
+ // get the column names
+ var cols = $('th.column_heading').map(function () {
+ return $.trim($(this).text());
+ }).get();
$.uiTableFilter($("#table_columns"), $(this).val(), cols, null, "td span");
});
$('.edit').click(function() {
@@ -151,7 +154,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
});
$('#table-select').change(function(e) {
var selectvalue = $(this).val();
- var default_column_select = $('#column-select').html();
+ var default_column_select = $('#column-select option:first');
var href = "db_central_columns.php";
var params = {
'ajax_request' : true,
@@ -163,7 +166,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
$('#column-select').html('<option value="">' + PMA_messages.strLoading + '</option>');
if (selectvalue !== "") {
$.post(href, params, function (data) {
- $('#column-select').html(default_column_select);
+ $('#column-select').empty().append(default_column_select);
$('#column-select').append(data.message);
});
}
diff --git a/js/functions.js b/js/functions.js
index 49bb1f6269..a81062617d 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2068,7 +2068,7 @@ function PMA_ajaxShowMessage(message, timeout)
// Create a parent element for the AJAX messages, if necessary
if ($('#loading_parent').length === 0) {
$('<div id="loading_parent"></div>')
- .prependTo("body");
+ .prependTo("#page_content");
}
// Update message count to create distinct message elements every time
ajax_message_count++;
diff --git a/js/line_counts.php b/js/line_counts.php
index fb15c1488d..ba58e0cd0d 100644
--- a/js/line_counts.php
+++ b/js/line_counts.php
@@ -13,511 +13,511 @@ if (! defined('PHPMYADMIN')) {
define('LINE_COUNTS', true);
$LINE_COUNT = array();
-$LINE_COUNT["OpenStreetMap.js"] = 126;
-$LINE_COUNT["big_ints.js"] = 67;
-$LINE_COUNT["canvg/canvg.js"] = 2508;
-$LINE_COUNT["chart.js"] = 664;
-$LINE_COUNT["codemirror/addon/hint/show-hint.js"] = 394;
-$LINE_COUNT["codemirror/addon/hint/sql-hint.js"] = 248;
-$LINE_COUNT["codemirror/addon/runmode/runmode.js"] = 72;
-$LINE_COUNT["codemirror/lib/codemirror.js"] = 8645;
-$LINE_COUNT["codemirror/mode/javascript/javascript.js"] = 692;
-$LINE_COUNT["codemirror/mode/sql/sql.js"] = 391;
-$LINE_COUNT["codemirror/mode/xml/xml.js"] = 384;
-$LINE_COUNT["common.js"] = 515;
-$LINE_COUNT["config.js"] = 798;
-$LINE_COUNT["cross_framing_protection.js"] = 10;
-$LINE_COUNT["db_operations.js"] = 157;
-$LINE_COUNT["db_qbe.js"] = 64;
-$LINE_COUNT["db_search.js"] = 239;
-$LINE_COUNT["db_structure.js"] = 391;
-$LINE_COUNT["db_tracking.js"] = 80;
-$LINE_COUNT["doclinks.js"] = 365;
$LINE_COUNT["error_report.js"] = 338;
-$LINE_COUNT["gis_data_editor.js"] = 396;
-$LINE_COUNT["import.js"] = 167;
-$LINE_COUNT["jqplot/excanvas.js"] = 1438;
-$LINE_COUNT["jqplot/jquery.jqplot.js"] = 11411;
-$LINE_COUNT["jqplot/plugins/jqplot.barRenderer.js"] = 800;
-$LINE_COUNT["jqplot/plugins/jqplot.byteFormatter.js"] = 46;
-$LINE_COUNT["jqplot/plugins/jqplot.canvasAxisLabelRenderer.js"] = 202;
-$LINE_COUNT["jqplot/plugins/jqplot.canvasTextRenderer.js"] = 448;
-$LINE_COUNT["jqplot/plugins/jqplot.categoryAxisRenderer.js"] = 679;
-$LINE_COUNT["jqplot/plugins/jqplot.cursor.js"] = 1108;
-$LINE_COUNT["jqplot/plugins/jqplot.dateAxisRenderer.js"] = 741;
-$LINE_COUNT["jqplot/plugins/jqplot.highlighter.js"] = 464;
-$LINE_COUNT["jqplot/plugins/jqplot.pieRenderer.js"] = 903;
-$LINE_COUNT["jqplot/plugins/jqplot.pointLabels.js"] = 376;
-$LINE_COUNT["jquery/jquery-1.11.1.min.js"] = 4;
-$LINE_COUNT["jquery/jquery-ui-1.11.2.min.js"] = 12;
+$LINE_COUNT["functions.js"] = 4545;
+$LINE_COUNT["db_central_columns.js"] = 200;
$LINE_COUNT["jquery/jquery-ui-timepicker-addon.js"] = 2223;
-$LINE_COUNT["jquery/jquery.ba-hashchange-1.3.js"] = 390;
$LINE_COUNT["jquery/jquery.cookie.js"] = 91;
-$LINE_COUNT["jquery/jquery.debounce-1.0.5.js"] = 70;
-$LINE_COUNT["jquery/jquery.event.drag-2.2.js"] = 401;
-$LINE_COUNT["jquery/jquery.fullscreen.js"] = 60;
-$LINE_COUNT["jquery/jquery.mousewheel.js"] = 221;
$LINE_COUNT["jquery/jquery.sortableTable.js"] = 271;
+$LINE_COUNT["jquery/jquery.mousewheel.js"] = 221;
$LINE_COUNT["jquery/jquery.svg.js"] = 1352;
-$LINE_COUNT["jquery/jquery.tablesorter.js"] = 1032;
+$LINE_COUNT["jquery/jquery.event.drag-2.2.js"] = 401;
+$LINE_COUNT["jquery/jquery-ui-1.11.2.min.js"] = 12;
+$LINE_COUNT["jquery/jquery.debounce-1.0.5.js"] = 70;
$LINE_COUNT["jquery/jquery.uitablefilter.js"] = 117;
-$LINE_COUNT["jquery/src/jquery-ui/accordion.js"] = 584;
-$LINE_COUNT["jquery/src/jquery-ui/autocomplete.js"] = 628;
-$LINE_COUNT["jquery/src/jquery-ui/button.js"] = 411;
-$LINE_COUNT["jquery/src/jquery-ui/core.js"] = 304;
-$LINE_COUNT["jquery/src/jquery-ui/datepicker.js"] = 2080;
-$LINE_COUNT["jquery/src/jquery-ui/dialog.js"] = 875;
-$LINE_COUNT["jquery/src/jquery-ui/draggable.js"] = 1128;
-$LINE_COUNT["jquery/src/jquery-ui/droppable.js"] = 413;
-$LINE_COUNT["jquery/src/jquery-ui/effect-blind.js"] = 90;
-$LINE_COUNT["jquery/src/jquery-ui/effect-bounce.js"] = 123;
-$LINE_COUNT["jquery/src/jquery-ui/effect-clip.js"] = 77;
-$LINE_COUNT["jquery/src/jquery-ui/effect-drop.js"] = 75;
-$LINE_COUNT["jquery/src/jquery-ui/effect-explode.js"] = 107;
-$LINE_COUNT["jquery/src/jquery-ui/effect-fade.js"] = 40;
-$LINE_COUNT["jquery/src/jquery-ui/effect-fold.js"] = 86;
-$LINE_COUNT["jquery/src/jquery-ui/effect-highlight.js"] = 60;
-$LINE_COUNT["jquery/src/jquery-ui/effect-puff.js"] = 60;
-$LINE_COUNT["jquery/src/jquery-ui/effect-pulsate.js"] = 73;
-$LINE_COUNT["jquery/src/jquery-ui/effect-scale.js"] = 89;
-$LINE_COUNT["jquery/src/jquery-ui/effect-shake.js"] = 84;
-$LINE_COUNT["jquery/src/jquery-ui/effect-size.js"] = 233;
-$LINE_COUNT["jquery/src/jquery-ui/effect-slide.js"] = 74;
-$LINE_COUNT["jquery/src/jquery-ui/effect-transfer.js"] = 57;
-$LINE_COUNT["jquery/src/jquery-ui/effect.js"] = 1301;
-$LINE_COUNT["jquery/src/jquery-ui/menu.js"] = 646;
-$LINE_COUNT["jquery/src/jquery-ui/mouse.js"] = 199;
-$LINE_COUNT["jquery/src/jquery-ui/position.js"] = 517;
-$LINE_COUNT["jquery/src/jquery-ui/progressbar.js"] = 159;
-$LINE_COUNT["jquery/src/jquery-ui/resizable.js"] = 1179;
-$LINE_COUNT["jquery/src/jquery-ui/selectable.js"] = 287;
-$LINE_COUNT["jquery/src/jquery-ui/selectmenu.js"] = 616;
-$LINE_COUNT["jquery/src/jquery-ui/slider.js"] = 699;
-$LINE_COUNT["jquery/src/jquery-ui/sortable.js"] = 1304;
-$LINE_COUNT["jquery/src/jquery-ui/spinner.js"] = 514;
-$LINE_COUNT["jquery/src/jquery-ui/tabs.js"] = 880;
-$LINE_COUNT["jquery/src/jquery-ui/tooltip.js"] = 461;
-$LINE_COUNT["jquery/src/jquery-ui/widget.js"] = 557;
-$LINE_COUNT["jquery/src/jquery/ajax.js"] = 807;
-$LINE_COUNT["jquery/src/jquery/ajax/jsonp.js"] = 89;
-$LINE_COUNT["jquery/src/jquery/ajax/load.js"] = 75;
-$LINE_COUNT["jquery/src/jquery/ajax/parseJSON.js"] = 51;
-$LINE_COUNT["jquery/src/jquery/ajax/parseXML.js"] = 31;
-$LINE_COUNT["jquery/src/jquery/ajax/script.js"] = 93;
-$LINE_COUNT["jquery/src/jquery/ajax/var/nonce.js"] = 5;
-$LINE_COUNT["jquery/src/jquery/ajax/var/rquery.js"] = 3;
-$LINE_COUNT["jquery/src/jquery/ajax/xhr.js"] = 196;
-$LINE_COUNT["jquery/src/jquery/attributes.js"] = 11;
-$LINE_COUNT["jquery/src/jquery/attributes/attr.js"] = 271;
-$LINE_COUNT["jquery/src/jquery/attributes/classes.js"] = 157;
-$LINE_COUNT["jquery/src/jquery/attributes/prop.js"] = 134;
-$LINE_COUNT["jquery/src/jquery/attributes/support.js"] = 62;
-$LINE_COUNT["jquery/src/jquery/attributes/val.js"] = 178;
-$LINE_COUNT["jquery/src/jquery/callbacks.js"] = 205;
-$LINE_COUNT["jquery/src/jquery/core.js"] = 534;
-$LINE_COUNT["jquery/src/jquery/core/access.js"] = 60;
+$LINE_COUNT["jquery/src/jquery/intro.js"] = 44;
+$LINE_COUNT["jquery/src/jquery/serialize.js"] = 110;
$LINE_COUNT["jquery/src/jquery/core/init.js"] = 132;
$LINE_COUNT["jquery/src/jquery/core/parseHTML.js"] = 39;
$LINE_COUNT["jquery/src/jquery/core/ready.js"] = 152;
+$LINE_COUNT["jquery/src/jquery/core/access.js"] = 60;
$LINE_COUNT["jquery/src/jquery/core/var/rsingleTag.js"] = 4;
-$LINE_COUNT["jquery/src/jquery/css.js"] = 504;
-$LINE_COUNT["jquery/src/jquery/css/addGetHookIf.js"] = 32;
-$LINE_COUNT["jquery/src/jquery/css/curCSS.js"] = 117;
-$LINE_COUNT["jquery/src/jquery/css/defaultDisplay.js"] = 69;
-$LINE_COUNT["jquery/src/jquery/css/hiddenVisibleSelectors.js"] = 20;
+$LINE_COUNT["jquery/src/jquery/traversing.js"] = 200;
+$LINE_COUNT["jquery/src/jquery/offset.js"] = 211;
+$LINE_COUNT["jquery/src/jquery/support.js"] = 58;
+$LINE_COUNT["jquery/src/jquery/selector.js"] = 1;
+$LINE_COUNT["jquery/src/jquery/exports/amd.js"] = 24;
+$LINE_COUNT["jquery/src/jquery/exports/global.js"] = 32;
+$LINE_COUNT["jquery/src/jquery/queue/delay.js"] = 22;
+$LINE_COUNT["jquery/src/jquery/manipulation.js"] = 744;
+$LINE_COUNT["jquery/src/jquery/effects/support.js"] = 55;
+$LINE_COUNT["jquery/src/jquery/effects/animatedSelector.js"] = 13;
+$LINE_COUNT["jquery/src/jquery/effects/Tween.js"] = 114;
+$LINE_COUNT["jquery/src/jquery/selector-sizzle.js"] = 14;
$LINE_COUNT["jquery/src/jquery/css/support.js"] = 149;
+$LINE_COUNT["jquery/src/jquery/css/defaultDisplay.js"] = 69;
$LINE_COUNT["jquery/src/jquery/css/swap.js"] = 28;
-$LINE_COUNT["jquery/src/jquery/css/var/cssExpand.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/css/hiddenVisibleSelectors.js"] = 20;
$LINE_COUNT["jquery/src/jquery/css/var/isHidden.js"] = 13;
-$LINE_COUNT["jquery/src/jquery/css/var/rmargin.js"] = 3;
$LINE_COUNT["jquery/src/jquery/css/var/rnumnonpx.js"] = 5;
-$LINE_COUNT["jquery/src/jquery/data.js"] = 335;
-$LINE_COUNT["jquery/src/jquery/data/accepts.js"] = 21;
-$LINE_COUNT["jquery/src/jquery/data/support.js"] = 25;
-$LINE_COUNT["jquery/src/jquery/deferred.js"] = 150;
+$LINE_COUNT["jquery/src/jquery/css/var/rmargin.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/css/var/cssExpand.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/css/curCSS.js"] = 117;
+$LINE_COUNT["jquery/src/jquery/css/addGetHookIf.js"] = 32;
$LINE_COUNT["jquery/src/jquery/deprecated.js"] = 13;
-$LINE_COUNT["jquery/src/jquery/dimensions.js"] = 50;
-$LINE_COUNT["jquery/src/jquery/effects.js"] = 656;
-$LINE_COUNT["jquery/src/jquery/effects/Tween.js"] = 114;
-$LINE_COUNT["jquery/src/jquery/effects/animatedSelector.js"] = 13;
-$LINE_COUNT["jquery/src/jquery/effects/support.js"] = 55;
-$LINE_COUNT["jquery/src/jquery/event.js"] = 1037;
-$LINE_COUNT["jquery/src/jquery/event/alias.js"] = 39;
-$LINE_COUNT["jquery/src/jquery/event/support.js"] = 26;
-$LINE_COUNT["jquery/src/jquery/exports/amd.js"] = 24;
-$LINE_COUNT["jquery/src/jquery/exports/global.js"] = 32;
-$LINE_COUNT["jquery/src/jquery/intro.js"] = 44;
+$LINE_COUNT["jquery/src/jquery/traversing/findFilter.js"] = 100;
+$LINE_COUNT["jquery/src/jquery/traversing/var/rneedsContext.js"] = 6;
+$LINE_COUNT["jquery/src/jquery/core.js"] = 534;
+$LINE_COUNT["jquery/src/jquery/ajax.js"] = 807;
$LINE_COUNT["jquery/src/jquery/jquery.js"] = 37;
-$LINE_COUNT["jquery/src/jquery/manipulation.js"] = 744;
-$LINE_COUNT["jquery/src/jquery/manipulation/_evalUrl.js"] = 18;
$LINE_COUNT["jquery/src/jquery/manipulation/support.js"] = 76;
+$LINE_COUNT["jquery/src/jquery/manipulation/_evalUrl.js"] = 18;
$LINE_COUNT["jquery/src/jquery/manipulation/var/rcheckableType.js"] = 3;
-$LINE_COUNT["jquery/src/jquery/offset.js"] = 211;
-$LINE_COUNT["jquery/src/jquery/outro.js"] = 1;
-$LINE_COUNT["jquery/src/jquery/queue.js"] = 142;
-$LINE_COUNT["jquery/src/jquery/queue/delay.js"] = 22;
-$LINE_COUNT["jquery/src/jquery/selector-sizzle.js"] = 14;
-$LINE_COUNT["jquery/src/jquery/selector.js"] = 1;
-$LINE_COUNT["jquery/src/jquery/serialize.js"] = 110;
-$LINE_COUNT["jquery/src/jquery/sizzle/dist/sizzle.js"] = 2044;
+$LINE_COUNT["jquery/src/jquery/event/alias.js"] = 39;
+$LINE_COUNT["jquery/src/jquery/event/support.js"] = 26;
+$LINE_COUNT["jquery/src/jquery/dimensions.js"] = 50;
+$LINE_COUNT["jquery/src/jquery/event.js"] = 1037;
+$LINE_COUNT["jquery/src/jquery/ajax/parseJSON.js"] = 51;
+$LINE_COUNT["jquery/src/jquery/ajax/jsonp.js"] = 89;
+$LINE_COUNT["jquery/src/jquery/ajax/load.js"] = 75;
+$LINE_COUNT["jquery/src/jquery/ajax/script.js"] = 93;
+$LINE_COUNT["jquery/src/jquery/ajax/parseXML.js"] = 31;
+$LINE_COUNT["jquery/src/jquery/ajax/var/nonce.js"] = 5;
+$LINE_COUNT["jquery/src/jquery/ajax/var/rquery.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/ajax/xhr.js"] = 196;
+$LINE_COUNT["jquery/src/jquery/attributes/classes.js"] = 157;
+$LINE_COUNT["jquery/src/jquery/attributes/support.js"] = 62;
+$LINE_COUNT["jquery/src/jquery/attributes/prop.js"] = 134;
+$LINE_COUNT["jquery/src/jquery/attributes/val.js"] = 178;
+$LINE_COUNT["jquery/src/jquery/attributes/attr.js"] = 271;
+$LINE_COUNT["jquery/src/jquery/css.js"] = 504;
+$LINE_COUNT["jquery/src/jquery/attributes.js"] = 11;
+$LINE_COUNT["jquery/src/jquery/wrap.js"] = 75;
$LINE_COUNT["jquery/src/jquery/sizzle/dist/sizzle.min.js"] = 2;
-$LINE_COUNT["jquery/src/jquery/sizzle/test/data/empty.js"] = 0;
-$LINE_COUNT["jquery/src/jquery/sizzle/test/data/testinit.js"] = 136;
-$LINE_COUNT["jquery/src/jquery/sizzle/test/jquery.js"] = 9596;
+$LINE_COUNT["jquery/src/jquery/sizzle/dist/sizzle.js"] = 2044;
$LINE_COUNT["jquery/src/jquery/sizzle/test/unit/extending.js"] = 95;
$LINE_COUNT["jquery/src/jquery/sizzle/test/unit/selector.js"] = 1149;
$LINE_COUNT["jquery/src/jquery/sizzle/test/unit/utilities.js"] = 169;
-$LINE_COUNT["jquery/src/jquery/support.js"] = 58;
-$LINE_COUNT["jquery/src/jquery/traversing.js"] = 200;
-$LINE_COUNT["jquery/src/jquery/traversing/findFilter.js"] = 100;
-$LINE_COUNT["jquery/src/jquery/traversing/var/rneedsContext.js"] = 6;
-$LINE_COUNT["jquery/src/jquery/var/class2type.js"] = 4;
-$LINE_COUNT["jquery/src/jquery/var/concat.js"] = 5;
-$LINE_COUNT["jquery/src/jquery/var/deletedIds.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/sizzle/test/jquery.js"] = 9596;
+$LINE_COUNT["jquery/src/jquery/sizzle/test/data/testinit.js"] = 136;
+$LINE_COUNT["jquery/src/jquery/sizzle/test/data/empty.js"] = 0;
+$LINE_COUNT["jquery/src/jquery/deferred.js"] = 150;
+$LINE_COUNT["jquery/src/jquery/data/accepts.js"] = 21;
+$LINE_COUNT["jquery/src/jquery/data/support.js"] = 25;
+$LINE_COUNT["jquery/src/jquery/queue.js"] = 142;
+$LINE_COUNT["jquery/src/jquery/data.js"] = 335;
+$LINE_COUNT["jquery/src/jquery/outro.js"] = 1;
+$LINE_COUNT["jquery/src/jquery/callbacks.js"] = 205;
$LINE_COUNT["jquery/src/jquery/var/hasOwn.js"] = 5;
-$LINE_COUNT["jquery/src/jquery/var/indexOf.js"] = 5;
-$LINE_COUNT["jquery/src/jquery/var/pnum.js"] = 3;
-$LINE_COUNT["jquery/src/jquery/var/push.js"] = 5;
+$LINE_COUNT["jquery/src/jquery/var/concat.js"] = 5;
$LINE_COUNT["jquery/src/jquery/var/rnotwhite.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/var/support.js"] = 4;
$LINE_COUNT["jquery/src/jquery/var/slice.js"] = 5;
+$LINE_COUNT["jquery/src/jquery/var/deletedIds.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/var/indexOf.js"] = 5;
$LINE_COUNT["jquery/src/jquery/var/strundefined.js"] = 3;
-$LINE_COUNT["jquery/src/jquery/var/support.js"] = 4;
+$LINE_COUNT["jquery/src/jquery/var/class2type.js"] = 4;
+$LINE_COUNT["jquery/src/jquery/var/push.js"] = 5;
$LINE_COUNT["jquery/src/jquery/var/toString.js"] = 5;
-$LINE_COUNT["jquery/src/jquery/wrap.js"] = 75;
-$LINE_COUNT["keyhandler.js"] = 145;
-$LINE_COUNT["menu-resizer.js"] = 182;
-$LINE_COUNT["multi_column_sort.js"] = 81;
+$LINE_COUNT["jquery/src/jquery/var/pnum.js"] = 3;
+$LINE_COUNT["jquery/src/jquery/effects.js"] = 656;
+$LINE_COUNT["jquery/src/jquery-ui/effect-scale.js"] = 89;
+$LINE_COUNT["jquery/src/jquery-ui/effect-bounce.js"] = 123;
+$LINE_COUNT["jquery/src/jquery-ui/effect-drop.js"] = 75;
+$LINE_COUNT["jquery/src/jquery-ui/position.js"] = 517;
+$LINE_COUNT["jquery/src/jquery-ui/effect-shake.js"] = 84;
+$LINE_COUNT["jquery/src/jquery-ui/tooltip.js"] = 461;
+$LINE_COUNT["jquery/src/jquery-ui/effect-slide.js"] = 74;
+$LINE_COUNT["jquery/src/jquery-ui/dialog.js"] = 875;
+$LINE_COUNT["jquery/src/jquery-ui/effect-size.js"] = 233;
+$LINE_COUNT["jquery/src/jquery-ui/accordion.js"] = 584;
+$LINE_COUNT["jquery/src/jquery-ui/effect-clip.js"] = 77;
+$LINE_COUNT["jquery/src/jquery-ui/effect-transfer.js"] = 57;
+$LINE_COUNT["jquery/src/jquery-ui/draggable.js"] = 1128;
+$LINE_COUNT["jquery/src/jquery-ui/effect.js"] = 1301;
+$LINE_COUNT["jquery/src/jquery-ui/mouse.js"] = 199;
+$LINE_COUNT["jquery/src/jquery-ui/resizable.js"] = 1179;
+$LINE_COUNT["jquery/src/jquery-ui/selectmenu.js"] = 616;
+$LINE_COUNT["jquery/src/jquery-ui/button.js"] = 411;
+$LINE_COUNT["jquery/src/jquery-ui/effect-fade.js"] = 40;
+$LINE_COUNT["jquery/src/jquery-ui/effect-blind.js"] = 90;
+$LINE_COUNT["jquery/src/jquery-ui/widget.js"] = 557;
+$LINE_COUNT["jquery/src/jquery-ui/datepicker.js"] = 2080;
+$LINE_COUNT["jquery/src/jquery-ui/core.js"] = 304;
+$LINE_COUNT["jquery/src/jquery-ui/effect-fold.js"] = 86;
+$LINE_COUNT["jquery/src/jquery-ui/tabs.js"] = 880;
+$LINE_COUNT["jquery/src/jquery-ui/selectable.js"] = 287;
+$LINE_COUNT["jquery/src/jquery-ui/menu.js"] = 646;
+$LINE_COUNT["jquery/src/jquery-ui/effect-explode.js"] = 107;
+$LINE_COUNT["jquery/src/jquery-ui/progressbar.js"] = 159;
+$LINE_COUNT["jquery/src/jquery-ui/effect-highlight.js"] = 60;
+$LINE_COUNT["jquery/src/jquery-ui/effect-puff.js"] = 60;
+$LINE_COUNT["jquery/src/jquery-ui/autocomplete.js"] = 628;
+$LINE_COUNT["jquery/src/jquery-ui/droppable.js"] = 413;
+$LINE_COUNT["jquery/src/jquery-ui/effect-pulsate.js"] = 73;
+$LINE_COUNT["jquery/src/jquery-ui/sortable.js"] = 1304;
+$LINE_COUNT["jquery/src/jquery-ui/slider.js"] = 699;
+$LINE_COUNT["jquery/src/jquery-ui/spinner.js"] = 514;
+$LINE_COUNT["jquery/jquery-1.11.1.min.js"] = 4;
+$LINE_COUNT["jquery/jquery.fullscreen.js"] = 60;
+$LINE_COUNT["jquery/jquery.ba-hashchange-1.3.js"] = 390;
+$LINE_COUNT["jquery/jquery.tablesorter.js"] = 1032;
+$LINE_COUNT["indexes.js"] = 697;
+$LINE_COUNT["gis_data_editor.js"] = 396;
+$LINE_COUNT["db_search.js"] = 239;
+$LINE_COUNT["db_tracking.js"] = 80;
+$LINE_COUNT["server_plugins.js"] = 30;
+$LINE_COUNT["tbl_zoom_plot_jqplot.js"] = 638;
+$LINE_COUNT["tbl_change.js"] = 754;
+$LINE_COUNT["tracekit/tracekit.js"] = 1114;
+$LINE_COUNT["tbl_select.js"] = 395;
+$LINE_COUNT["replication.js"] = 72;
$LINE_COUNT["normalization.js"] = 707;
+$LINE_COUNT["rte.js"] = 944;
+$LINE_COUNT["server_status_processes.js"] = 189;
+$LINE_COUNT["tbl_relation.js"] = 233;
+$LINE_COUNT["server_status_queries.js"] = 34;
+$LINE_COUNT["tbl_structure.js"] = 395;
+$LINE_COUNT["jqplot/plugins/jqplot.categoryAxisRenderer.js"] = 679;
+$LINE_COUNT["jqplot/plugins/jqplot.pointLabels.js"] = 376;
+$LINE_COUNT["jqplot/plugins/jqplot.dateAxisRenderer.js"] = 741;
+$LINE_COUNT["jqplot/plugins/jqplot.barRenderer.js"] = 800;
+$LINE_COUNT["jqplot/plugins/jqplot.byteFormatter.js"] = 46;
+$LINE_COUNT["jqplot/plugins/jqplot.canvasAxisLabelRenderer.js"] = 202;
+$LINE_COUNT["jqplot/plugins/jqplot.highlighter.js"] = 464;
+$LINE_COUNT["jqplot/plugins/jqplot.pieRenderer.js"] = 903;
+$LINE_COUNT["jqplot/plugins/jqplot.cursor.js"] = 1108;
+$LINE_COUNT["jqplot/plugins/jqplot.canvasTextRenderer.js"] = 448;
+$LINE_COUNT["jqplot/jquery.jqplot.js"] = 11411;
+$LINE_COUNT["jqplot/excanvas.js"] = 1438;
+$LINE_COUNT["canvg/canvg.js"] = 2508;
+$LINE_COUNT["tbl_gis_visualization.js"] = 353;
+$LINE_COUNT["server_status_advisor.js"] = 93;
+$LINE_COUNT["config.js"] = 798;
+$LINE_COUNT["big_ints.js"] = 67;
+$LINE_COUNT["tbl_operations.js"] = 240;
+$LINE_COUNT["server_user_groups.js"] = 42;
+$LINE_COUNT["tbl_tracking.js"] = 95;
+$LINE_COUNT["makegrid.js"] = 1978;
+$LINE_COUNT["export.js"] = 401;
+$LINE_COUNT["doclinks.js"] = 365;
+$LINE_COUNT["console.js"] = 1032;
+$LINE_COUNT["transformations/json.js"] = 17;
+$LINE_COUNT["transformations/image_upload.js"] = 28;
+$LINE_COUNT["transformations/xml.js"] = 18;
+$LINE_COUNT["transformations/sql_editor.js"] = 30;
+$LINE_COUNT["transformations/json_editor.js"] = 17;
+$LINE_COUNT["transformations/xml_editor.js"] = 16;
+$LINE_COUNT["sprintf.js"] = 211;
+$LINE_COUNT["server_status_monitor.js"] = 2172;
+$LINE_COUNT["ajax.js"] = 1041;
+$LINE_COUNT["menu-resizer.js"] = 182;
+$LINE_COUNT["tbl_find_replace.js"] = 47;
+$LINE_COUNT["codemirror/addon/hint/show-hint.js"] = 394;
+$LINE_COUNT["codemirror/addon/hint/sql-hint.js"] = 248;
+$LINE_COUNT["codemirror/addon/runmode/runmode.js"] = 72;
+$LINE_COUNT["codemirror/lib/codemirror.js"] = 8645;
+$LINE_COUNT["codemirror/mode/javascript/javascript.js"] = 692;
+$LINE_COUNT["codemirror/mode/xml/xml.js"] = 384;
+$LINE_COUNT["codemirror/mode/sql/sql.js"] = 391;
+$LINE_COUNT["sql.js"] = 839;
+$LINE_COUNT["server_databases.js"] = 137;
+$LINE_COUNT["OpenStreetMap.js"] = 126;
+$LINE_COUNT["db_structure.js"] = 391;
+$LINE_COUNT["db_qbe.js"] = 64;
+$LINE_COUNT["chart.js"] = 664;
+$LINE_COUNT["tbl_chart.js"] = 437;
+$LINE_COUNT["db_operations.js"] = 157;
+$LINE_COUNT["pmd/init.js"] = 40;
+$LINE_COUNT["pmd/iecanvas.js"] = 147;
+$LINE_COUNT["pmd/designer_page.js"] = 150;
+$LINE_COUNT["pmd/history.js"] = 811;
+$LINE_COUNT["pmd/designer_db.js"] = 136;
+$LINE_COUNT["pmd/designer_objects.js"] = 17;
+$LINE_COUNT["pmd/move.js"] = 1993;
+$LINE_COUNT["cross_framing_protection.js"] = 10;
$LINE_COUNT["openlayers/OpenLayers.js"] = 2680;
-$LINE_COUNT["openlayers/src/openlayers/lib/Firebug/firebug.js"] = 674;
-$LINE_COUNT["openlayers/src/openlayers/lib/Firebug/firebugx.js"] = 9;
+$LINE_COUNT["openlayers/src/openlayers/lib/Rico/Color.js"] = 244;
+$LINE_COUNT["openlayers/src/openlayers/lib/Rico/Corner.js"] = 329;
$LINE_COUNT["openlayers/src/openlayers/lib/Gears/gears_init.js"] = 88;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers.js"] = 348;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Ajax.js"] = 678;
+$LINE_COUNT["openlayers/src/openlayers/lib/Firebug/firebugx.js"] = 9;
+$LINE_COUNT["openlayers/src/openlayers/lib/Firebug/firebug.js"] = 674;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js"] = 681;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js"] = 681;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js"] = 116;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js"] = 251;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js"] = 190;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js"] = 125;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js"] = 85;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Console.js"] = 246;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control.js"] = 368;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js"] = 166;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js"] = 97;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Button.js"] = 44;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js"] = 303;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js"] = 94;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js"] = 126;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js"] = 63;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js"] = 595;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js"] = 373;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js"] = 127;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js"] = 620;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js"] = 321;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js"] = 777;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/MouseDefaults.js"] = 368;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js"] = 213;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/MouseToolbar.js"] = 406;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js"] = 55;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js"] = 303;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js"] = 423;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js"] = 720;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js"] = 86;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js"] = 63;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js"] = 246;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js"] = 396;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js"] = 371;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js"] = 220;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js"] = 569;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js"] = 99;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js"] = 223;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js"] = 613;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js"] = 547;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Split.js"] = 498;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js"] = 579;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js"] = 524;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js"] = 442;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js"] = 95;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js"] = 35;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js"] = 35;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js"] = 54;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js"] = 40;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Events.js"] = 855;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Feature.js"] = 227;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js"] = 454;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Feature/WFS.js"] = 80;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter.js"] = 68;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js"] = 258;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js"] = 81;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js"] = 119;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js"] = 128;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format.js"] = 123;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js"] = 1028;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js"] = 49;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js"] = 727;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js"] = 34;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js"] = 243;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js"] = 34;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js"] = 440;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Context.js"] = 334;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js"] = 115;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js"] = 426;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js"] = 168;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js"] = 181;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML.js"] = 924;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js"] = 578;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js"] = 193;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js"] = 462;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js"] = 184;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js"] = 716;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js"] = 420;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js"] = 389;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/KML.js"] = 1429;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js"] = 457;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js"] = 256;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js"] = 50;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js"] = 64;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js"] = 81;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js"] = 589;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js"] = 131;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js"] = 1099;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js"] = 51;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js"] = 83;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js"] = 158;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js"] = 193;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js"] = 262;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Text.js"] = 152;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js"] = 220;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js"] = 126;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js"] = 156;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js"] = 35;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js"] = 197;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js"] = 34;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js"] = 368;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js"] = 150;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js"] = 161;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js"] = 358;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js"] = 152;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js"] = 835;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js"] = 76;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js"] = 127;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js"] = 81;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js"] = 418;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js"] = 118;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js"] = 62;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js"] = 58;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js"] = 128;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js"] = 30;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js"] = 91;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js"] = 100;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js"] = 284;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js"] = 162;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js"] = 221;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/XML.js"] = 881;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry.js"] = 456;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js"] = 546;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js"] = 93;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js"] = 552;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js"] = 417;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js"] = 262;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js"] = 70;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js"] = 46;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js"] = 283;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js"] = 259;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Rectangle.js"] = 99;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Surface.js"] = 17;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler.js"] = 287;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js"] = 221;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js"] = 325;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js"] = 420;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js"] = 388;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js"] = 183;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js"] = 109;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js"] = 283;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js"] = 302;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js"] = 373;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js"] = 144;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js"] = 421;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Icon.js"] = 227;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang.js"] = 133;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js"] = 38;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js"] = 80;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js"] = 29;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/br.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js"] = 128;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js"] = 69;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js"] = 119;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/de.js"] = 81;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/el.js"] = 19;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js"] = 21;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/en.js"] = 128;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/es.js"] = 129;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js"] = 34;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js"] = 80;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js"] = 35;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Marker.js"] = 242;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js"] = 79;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js"] = 61;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js"] = 61;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/id.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js"] = 82;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/de.js"] = 81;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js"] = 35;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js"] = 29;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/io.js"] = 19;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/is.js"] = 37;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js"] = 118;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js"] = 34;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/it.js"] = 116;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/es.js"] = 129;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/el.js"] = 19;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js"] = 119;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/te.js"] = 27;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js"] = 79;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js"] = 80;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/km.js"] = 25;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js"] = 118;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js"] = 61;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/en.js"] = 128;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js"] = 116;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js"] = 128;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/km.js"] = 25;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/id.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js"] = 38;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js"] = 27;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js"] = 80;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js"] = 81;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js"] = 82;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js"] = 71;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js"] = 69;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js"] = 81;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js"] = 71;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/te.js"] = 27;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js"] = 79;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js"] = 116;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js"] = 21;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/br.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/is.js"] = 37;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js"] = 117;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer.js"] = 1304;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js"] = 253;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js"] = 466;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js"] = 76;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js"] = 418;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js"] = 315;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/GML.js"] = 174;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js"] = 266;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js"] = 795;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js"] = 419;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js"] = 264;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js"] = 268;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js"] = 199;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js"] = 755;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js"] = 230;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js"] = 254;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js"] = 418;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js"] = 206;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js"] = 148;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js"] = 489;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js"] = 199;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js"] = 72;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js"] = 187;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MultiMap.js"] = 284;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js"] = 103;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js"] = 196;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js"] = 167;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js"] = 264;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js"] = 165;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js"] = 947;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js"] = 157;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MultiMap.js"] = 284;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js"] = 230;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js"] = 196;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/VirtualEarth.js"] = 368;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js"] = 419;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js"] = 266;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js"] = 157;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js"] = 947;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js"] = 187;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js"] = 315;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js"] = 148;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WFS.js"] = 609;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js"] = 268;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Post.js"] = 99;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js"] = 165;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js"] = 466;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js"] = 76;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js"] = 253;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js"] = 103;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js"] = 72;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js"] = 254;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js"] = 72;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js"] = 476;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js"] = 120;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js"] = 196;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Post.js"] = 99;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Yahoo.js"] = 430;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js"] = 120;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js"] = 795;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js"] = 308;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Map.js"] = 2417;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Marker.js"] = 242;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js"] = 120;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/GML.js"] = 174;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js"] = 476;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js"] = 167;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js"] = 489;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup.js"] = 1052;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js"] = 198;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js"] = 190;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js"] = 343;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js"] = 231;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Projection.js"] = 178;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol.js"] = 272;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js"] = 655;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js"] = 33;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Icon.js"] = 227;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js"] = 132;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL.js"] = 88;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL/Gears.js"] = 561;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js"] = 71;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL.js"] = 88;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js"] = 655;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js"] = 342;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js"] = 44;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js"] = 48;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer.js"] = 362;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js"] = 494;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js"] = 44;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js"] = 33;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control.js"] = 368;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js"] = 589;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js"] = 131;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js"] = 389;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Text.js"] = 152;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js"] = 152;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js"] = 256;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js"] = 64;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js"] = 50;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js"] = 440;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js"] = 100;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js"] = 1028;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js"] = 420;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js"] = 835;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js"] = 127;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js"] = 76;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js"] = 34;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js"] = 221;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js"] = 81;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js"] = 158;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/XML.js"] = 881;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js"] = 220;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Context.js"] = 334;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js"] = 83;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js"] = 79;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/KML.js"] = 1429;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js"] = 91;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js"] = 284;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js"] = 193;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js"] = 462;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js"] = 578;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js"] = 34;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js"] = 34;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js"] = 457;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js"] = 193;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js"] = 716;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js"] = 368;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js"] = 161;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js"] = 150;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js"] = 126;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js"] = 35;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js"] = 156;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js"] = 358;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js"] = 49;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js"] = 115;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js"] = 162;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js"] = 184;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js"] = 262;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js"] = 81;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/GML.js"] = 924;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js"] = 243;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js"] = 1099;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js"] = 51;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js"] = 727;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js"] = 426;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js"] = 181;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js"] = 168;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js"] = 197;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js"] = 418;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js"] = 58;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js"] = 30;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js"] = 62;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js"] = 128;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js"] = 118;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js"] = 190;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js"] = 343;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js"] = 231;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js"] = 198;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js"] = 383;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js"] = 999;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js"] = 1010;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js"] = 494;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js"] = 995;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js"] = 999;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Request.js"] = 358;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js"] = 383;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Format.js"] = 123;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js"] = 120;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Rule.js"] = 239;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/SingleFile.js"] = 10;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js"] = 213;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js"] = 303;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js"] = 396;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/MouseToolbar.js"] = 406;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js"] = 613;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js"] = 54;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js"] = 620;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Button.js"] = 44;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js"] = 166;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js"] = 303;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js"] = 99;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js"] = 220;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js"] = 720;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js"] = 223;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js"] = 371;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js"] = 35;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js"] = 373;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js"] = 442;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js"] = 246;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js"] = 55;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js"] = 40;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js"] = 777;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/MouseDefaults.js"] = 368;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js"] = 127;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js"] = 126;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js"] = 97;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js"] = 524;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js"] = 94;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js"] = 423;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js"] = 63;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js"] = 595;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js"] = 35;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js"] = 579;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js"] = 321;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js"] = 569;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js"] = 86;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Split.js"] = 498;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js"] = 547;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js"] = 63;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js"] = 95;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Renderer.js"] = 362;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Lang.js"] = 133;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Console.js"] = 246;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tile.js"] = 281;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Protocol.js"] = 272;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Style2.js"] = 111;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Request.js"] = 358;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js"] = 552;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js"] = 259;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js"] = 46;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js"] = 546;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js"] = 93;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Rectangle.js"] = 99;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js"] = 417;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Surface.js"] = 17;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js"] = 70;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js"] = 262;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js"] = 283;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy.js"] = 117;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js"] = 51;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js"] = 325;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js"] = 144;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js"] = 109;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js"] = 420;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js"] = 283;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js"] = 302;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js"] = 421;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js"] = 221;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js"] = 183;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js"] = 388;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js"] = 373;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js"] = 454;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Feature/WFS.js"] = 80;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tween.js"] = 318;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Util.js"] = 1797;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/StyleMap.js"] = 160;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Events.js"] = 855;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Projection.js"] = 178;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Style.js"] = 443;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter.js"] = 68;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js"] = 278;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js"] = 280;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js"] = 164;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js"] = 138;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js"] = 236;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js"] = 140;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js"] = 164;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js"] = 229;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Style.js"] = 443;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Style2.js"] = 111;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/StyleMap.js"] = 160;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js"] = 51;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js"] = 236;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js"] = 125;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js"] = 251;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js"] = 116;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js"] = 681;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js"] = 85;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js"] = 190;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Map.js"] = 2417;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js"] = 65;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js"] = 69;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js"] = 141;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js"] = 81;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js"] = 34;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js"] = 65;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tile.js"] = 281;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js"] = 141;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/SingleFile.js"] = 10;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js"] = 128;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js"] = 119;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js"] = 81;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js"] = 258;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Ajax.js"] = 678;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Handler.js"] = 287;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Feature.js"] = 227;
+$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tile/WFS.js"] = 192;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js"] = 578;
$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js"] = 262;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tile/WFS.js"] = 192;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Tween.js"] = 318;
-$LINE_COUNT["openlayers/src/openlayers/lib/OpenLayers/Util.js"] = 1797;
-$LINE_COUNT["openlayers/src/openlayers/lib/Rico/Color.js"] = 244;
-$LINE_COUNT["openlayers/src/openlayers/lib/Rico/Corner.js"] = 329;
-$LINE_COUNT["pmd/designer_db.js"] = 136;
-$LINE_COUNT["pmd/designer_objects.js"] = 17;
-$LINE_COUNT["pmd/designer_page.js"] = 150;
-$LINE_COUNT["pmd/history.js"] = 811;
-$LINE_COUNT["pmd/iecanvas.js"] = 147;
-$LINE_COUNT["pmd/init.js"] = 40;
-$LINE_COUNT["pmd/move.js"] = 1983;
-$LINE_COUNT["replication.js"] = 72;
-$LINE_COUNT["rte.js"] = 944;
-$LINE_COUNT["server_databases.js"] = 137;
-$LINE_COUNT["server_plugins.js"] = 30;
-$LINE_COUNT["server_privileges.js"] = 451;
-$LINE_COUNT["server_status_advisor.js"] = 93;
-$LINE_COUNT["server_status_monitor.js"] = 2172;
-$LINE_COUNT["server_status_processes.js"] = 189;
-$LINE_COUNT["server_status_queries.js"] = 34;
-$LINE_COUNT["server_status_sorter.js"] = 89;
+$LINE_COUNT["navigation.js"] = 1505;
+$LINE_COUNT["import.js"] = 167;
$LINE_COUNT["server_status_variables.js"] = 103;
-$LINE_COUNT["server_user_groups.js"] = 42;
+$LINE_COUNT["server_status_sorter.js"] = 89;
+$LINE_COUNT["common.js"] = 515;
+$LINE_COUNT["keyhandler.js"] = 145;
+$LINE_COUNT["server_privileges.js"] = 451;
+$LINE_COUNT["multi_column_sort.js"] = 81;
$LINE_COUNT["server_variables.js"] = 147;
-$LINE_COUNT["sprintf.js"] = 211;
-$LINE_COUNT["tbl_find_replace.js"] = 47;
-$LINE_COUNT["tbl_gis_visualization.js"] = 353;
-$LINE_COUNT["tbl_operations.js"] = 240;
-$LINE_COUNT["tbl_relation.js"] = 233;
-$LINE_COUNT["tbl_select.js"] = 395;
-$LINE_COUNT["tbl_structure.js"] = 395;
-$LINE_COUNT["tbl_tracking.js"] = 95;
-$LINE_COUNT["tbl_zoom_plot_jqplot.js"] = 638;
-$LINE_COUNT["tracekit/tracekit.js"] = 1114;
-$LINE_COUNT["transformations/image_upload.js"] = 28;
-$LINE_COUNT["transformations/json.js"] = 17;
-$LINE_COUNT["transformations/json_editor.js"] = 17;
-$LINE_COUNT["transformations/sql_editor.js"] = 30;
-$LINE_COUNT["transformations/xml.js"] = 18;
-$LINE_COUNT["transformations/xml_editor.js"] = 16;
-$LINE_COUNT["ajax.js"] = 1041;
-$LINE_COUNT["console.js"] = 1032;
-$LINE_COUNT["db_central_columns.js"] = 197;
-$LINE_COUNT["export.js"] = 401;
-$LINE_COUNT["functions.js"] = 4545;
-$LINE_COUNT["indexes.js"] = 697;
-$LINE_COUNT["makegrid.js"] = 1978;
-$LINE_COUNT["navigation.js"] = 1505;
-$LINE_COUNT["sql.js"] = 839;
-$LINE_COUNT["tbl_change.js"] = 754;
-$LINE_COUNT["tbl_chart.js"] = 437;
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 66eb690785..8c13e78dee 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -26,7 +26,10 @@ AJAX.registerOnload('pmd/move.js', function () {
if (! $.FullScreen.isFullScreen()) {
$('#page_content').removeClass('content_fullscreen')
.css({'width': 'auto', 'height': 'auto'});
- $('#toggleFullscreen').show();
+ var $img = $('#toggleFullscreen img');
+ $img.attr('src', $img.data('enter'));
+ var $span = $img.siblings('span');
+ $span.text($span.data('enter'));
}
});
} else {
@@ -520,16 +523,17 @@ function Rect(x1, y1, w, h, color)
//--------------------------- FULLSCREEN -------------------------------------
function Toggle_fullscreen()
{
- var button = $('#toggleFullscreen').children().last();
+ var $img = $('#toggleFullscreen img');
+ var $span = $img.siblings('span');
if (! $.FullScreen.isFullScreen()) {
- button.html(button.attr('data-exit'));
+ $img.attr('src', $img.data('exit'))
+ $span.text($span.data('exit'));
$('#page_content')
.addClass('content_fullscreen')
.css({'width': screen.width - 5, 'height': screen.height - 5})
.requestFullScreen();
}
if ($.FullScreen.isFullScreen()) {
- button.html(button.attr('data-enter'));
$.FullScreen.cancelFullScreen();
}
}
@@ -671,6 +675,7 @@ function Save3(callback)
$('<div id="page_save_dialog"></div>')
.append($form)
.dialog({
+ appendTo: '#page_content',
title: PMA_messages.strSavePage,
width: 300,
modal: true,
@@ -718,6 +723,7 @@ function Edit_pages()
$('<div id="page_edit_dialog"></div>')
.append(data.message)
.dialog({
+ appendTo: '#page_content',
title: PMA_messages.strOpenPage,
width: 350,
modal: true,
@@ -798,6 +804,7 @@ function Delete_pages()
$('<div id="page_delete_dialog"></div>')
.append(data.message)
.dialog({
+ appendTo: '#page_content',
title: PMA_messages.strDeletePage,
width: 350,
modal: true,
@@ -896,6 +903,7 @@ function Save_as()
$('<div id="page_save_as_dialog"></div>')
.append(data.message)
.dialog({
+ appendTo: '#page_content',
title: "Save table coordinates",
width: 450,
modal: true,
@@ -930,6 +938,7 @@ function Prompt_to_save_current_page(callback)
$('<div id="prompt_save_dialog"></div>')
.append('<div>' + PMA_messages.strLeavingPage + '</div>')
.dialog({
+ appendTo: '#page_content',
title: PMA_messages.strSavePage,
width: 300,
modal: true,
@@ -977,6 +986,7 @@ function Export_pages()
$('<div id="page_export_dialog"></div>')
.append($form)
.dialog({
+ appendTo: '#page_content',
title: PMA_messages.strExportRelationalSchema,
width: 550,
modal: true,
@@ -1167,7 +1177,7 @@ function Small_tab_all(id_this) // max/min all tables
}
}
icon.alt = ">";
- icon.src = pmaThemeImage + "pmd/rightarrow1.png";
+ icon.src = icon.dataset.right;
} else {
for (key in j_tabs) {
if (document.getElementById('id_hide_tbody_' + key).innerHTML != "v") {
@@ -1175,7 +1185,7 @@ function Small_tab_all(id_this) // max/min all tables
}
}
icon.alt = "v";
- icon.src = pmaThemeImage + "pmd/downarrow1.png";
+ icon.src = icon.dataset.down;
}
Re_load();
}
@@ -1378,10 +1388,10 @@ function Hide_tab_all(id_this) // max/min all tables
{
if (id_this.alt == 'v') {
id_this.alt = '>';
- id_this.src = pmaThemeImage + "pmd/rightarrow1.png";
+ id_this.src = id_this.dataset.right;
} else {
id_this.alt = 'v';
- id_this.src = pmaThemeImage + "pmd/downarrow1.png";
+ id_this.src = id_this.dataset.down;
}
var E = document.form1;
for (var i = 0; i < E.elements.length; i++) {
@@ -1429,10 +1439,10 @@ function No_have_constr(id_this)
if (id_this.alt == 'v') {
id_this.alt = '>';
- id_this.src = pmaThemeImage + "pmd/rightarrow2.png";
+ id_this.src = id_this.dataset.right;;
} else {
id_this.alt = 'v';
- id_this.src = pmaThemeImage + "pmd/downarrow2.png";
+ id_this.src = id_this.dataset.down;
}
var E = document.form1;
for (var i = 0; i < E.elements.length; i++) {
@@ -1491,7 +1501,7 @@ function Show_left_menu(id_this) // max/min all tables
document.getElementById("layer_menu").style.top = '0px';
document.getElementById("layer_menu").style.display = 'block';
icon.alt = ">";
- icon.src = pmaThemeImage + "pmd/uparrow2_m.png";
+ icon.src = icon.dataset.up;
if (isIE) {
General_scroll();
}
@@ -1499,7 +1509,7 @@ function Show_left_menu(id_this) // max/min all tables
document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll
document.getElementById("layer_menu").style.display = 'none';
icon.alt = "v";
- icon.src = pmaThemeImage + "pmd/downarrow2_m.png";
+ icon.src = icon.dataset.down;
}
}
//------------------------------------------------------------------------------
diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php
index fed6d19a23..41612bdbed 100644
--- a/libraries/Advisor.class.php
+++ b/libraries/Advisor.class.php
@@ -267,7 +267,7 @@ class Advisor
*/
private function _replaceLinkURL($matches)
{
- return 'href="' . PMA_linkURL($matches[2]) . '"';
+ return 'href="' . PMA_linkURL($matches[2]) . '" target="_blank"';
}
/**
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 64e57157ca..9b7fba0dc4 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.4.4');
+ $this->set('PMA_VERSION', '4.4.5');
/**
* @deprecated
*/
diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php
index 30e30d2a66..a6a1e831d0 100644
--- a/libraries/DbSearch.class.php
+++ b/libraries/DbSearch.class.php
@@ -205,14 +205,14 @@ class PMA_DbSearch
// For "as regular expression" (search option 4), LIKE won't be used
// Usage example: If user is searching for a literal $ in a regexp search,
// he should enter \$ as the value.
- $this->_criteriaSearchString = PMA_Util::sqlAddSlashes(
+ $criteriaSearchStringEscaped = PMA_Util::sqlAddSlashes(
$this->_criteriaSearchString,
($this->_criteriaSearchType == 4 ? false : true)
);
// Extract search words or pattern
$search_words = (($this->_criteriaSearchType > 2)
- ? array($this->_criteriaSearchString)
- : explode(' ', $this->_criteriaSearchString));
+ ? array($criteriaSearchStringEscaped)
+ : explode(' ', $criteriaSearchStringEscaped));
foreach ($search_words as $search_word) {
// Eliminates empty values
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 1db4951a34..217fd784f8 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -2839,8 +2839,11 @@ class PMA_DisplayResults
$row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
+ $previousMetaOrgTable = '';
+
+ $columnCount = $this->__get('fields_cnt');
for ($currentColumn = 0;
- $currentColumn < $this->__get('fields_cnt');
+ $currentColumn < $columnCount;
++$currentColumn) {
// assign $i with appropriate column order
@@ -2983,14 +2986,25 @@ class PMA_DisplayResults
'transform_key' => $meta->name,
);
- $unique_conditions = PMA_Util::getUniqueCondition(
- $dt_result,
- $this->__get('fields_cnt'),
- $this->__get('fields_meta'),
- $row,
- false,
- $meta->orgtable
- );
+ /*
+ * The result set can have columns from more than one table,
+ * this is why we have to check for the unique conditions
+ * related to this table; however getUniqueCondition() is
+ * costly and does not need to be called if we already know
+ * the conditions for the current table.
+ */
+
+ if ($meta->orgtable != $previousMetaOrgTable) {
+ $unique_conditions = PMA_Util::getUniqueCondition(
+ $dt_result,
+ $this->__get('fields_cnt'),
+ $this->__get('fields_meta'),
+ $row,
+ false,
+ $meta->orgtable
+ );
+ $previousMetaOrgTable = $meta->orgtable;
+ }
$transform_url_params = array(
'db' => $this->__get('db'),
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 3964d68ec3..1521fd32ae 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2317,10 +2317,9 @@ class PMA_Util
$pageNowMinusRange = ($pageNow - $range);
$pageNowPlusRange = ($pageNow + $range);
- $gotopage = $prompt . ' <select class="pageselector ';
- $gotopage .= ' ajax';
+ $gotopage = $prompt . ' <select class="pageselector ajax"';
- $gotopage .= '" name="' . $name . '" >';
+ $gotopage .= ' name="' . $name . '" >';
if ($nbTotalPage < $showAll) {
$pages = range(1, $nbTotalPage);
} else {
diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index 0060b45d19..b3d6114967 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -129,14 +129,14 @@ rule 'Distribution'
version_comment
preg_match('/percona/i',value)
The MySQL manual only is accurate for official MySQL binaries.
- Percona documentation is at http://www.percona.com/docs/wiki/
+ Percona documentation is at http://www.percona.com/software/documentation/
'percona' found in version_comment
rule 'Distribution'
version
PMA_DRIZZLE
The MySQL manual only is accurate for official MySQL binaries.
- Drizzle documentation is at http://docs.drizzle.org/
+ Drizzle documentation is at http://www.drizzle.org/content/documentation/
Version string (%s) matches Drizzle versioning scheme | value
rule 'MySQL Architecture'
@@ -284,7 +284,7 @@ rule 'Temp disk rate' [!fired('Percentage of temp tables on disk')]
# Several independent Blog entries suggest (http://ronaldbradford.com/blog/more-on-understanding-sort_buffer_size-2010-05-10/ and http://www.xaprb.com/blog/2010/05/09/how-to-tune-mysqls-sort_buffer_size/)
# that sort_buffer_size should be left as it is. And increasing read_buffer_size is only suggested when there are a lot of
# table scans (http://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html#sysvar_read_buffer_size and other sources) though
-# setting it too high is bad too (http://www.mysqlperformanceblog.com/2007/09/17/mysql-what-read_buffer_size-value-is-optimal/).
+# setting it too high is bad too (http://www.percona.com/blog/2007/09/17/mysql-what-read_buffer_size-value-is-optimal/).
#rule 'Temp table rate'
# Created_tmp_tables / Uptime
# value * 60 * 60 > 1
@@ -400,14 +400,14 @@ rule 'Percentage of aborted connections'
Aborted_connects / Connections * 100
value > 1
Too many connections are aborted.
- Connections are usually aborted when they cannot be authorized. <a href="http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-source-of-aborted_connects/">This article</a> might help you track down the source.
+ Connections are usually aborted when they cannot be authorized. <a href="http://www.percona.com/blog/2008/08/23/how-to-track-down-the-source-of-aborted_connects/">This article</a> might help you track down the source.
%s% of all connections are aborted. This value should be below 1% | round(value,1)
rule 'Rate of aborted connections'
Aborted_connects / Uptime
value * 60 * 60 > 1
Too many connections are aborted.
- Connections are usually aborted when they cannot be authorized. <a href="http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-source-of-aborted_connects/">This article</a> might help you track down the source.
+ Connections are usually aborted when they cannot be authorized. <a href="http://www.percona.com/blog/2008/08/23/how-to-track-down-the-source-of-aborted_connects/">This article</a> might help you track down the source.
Aborted connections rate is at %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
rule 'Percentage of aborted clients'
@@ -444,14 +444,14 @@ rule 'Max InnoDB log size' [innodb_buffer_pool_size > 0 && innodb_log_file_size
innodb_log_file_size / (1024 * 1024)
value > 256
The InnoDB log file size is inadequately large.
- It is usually sufficient to set {innodb_log_file_size} to 25% of the size of {innodb_buffer_pool_size}. A very big {innodb_log_file_size} slows down the recovery time after a database crash considerably. See also <a href="http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-innodb_log_file_size/">this Article</a>. You need to shutdown the server, remove the InnoDB log files, set the new value in my.cnf, start the server, then check the error logs if everything went fine. See also <a href="http://mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-proper-way.html">this blog entry</a>
+ It is usually sufficient to set {innodb_log_file_size} to 25% of the size of {innodb_buffer_pool_size}. A very big {innodb_log_file_size} slows down the recovery time after a database crash considerably. See also <a href="http://www.percona.com/blog/2006/07/03/choosing-proper-innodb_log_file_size/">this Article</a>. You need to shutdown the server, remove the InnoDB log files, set the new value in my.cnf, start the server, then check the error logs if everything went fine. See also <a href="http://mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-proper-way.html">this blog entry</a>
Your absolute InnoDB log size is %s MiB | round(value,1)
rule 'InnoDB buffer pool size' [system_memory > 0]
innodb_buffer_pool_size / system_memory * 100
value < 60
Your InnoDB buffer pool is fairly small.
- The InnoDB buffer pool has a profound impact on performance for InnoDB tables. Assign all your remaining memory to this buffer. For database servers that use solely InnoDB as storage engine and have no other services (e.g. a web server) running, you may set this as high as 80% of your available memory. If that is not the case, you need to carefully assess the memory consumption of your other services and non-InnoDB-Tables and set this variable accordingly. If it is set too high, your system will start swapping, which decreases performance significantly. See also <a href="http://www.mysqlperformanceblog.com/2007/11/03/choosing-innodb_buffer_pool_size/">this article</a>
+ The InnoDB buffer pool has a profound impact on performance for InnoDB tables. Assign all your remaining memory to this buffer. For database servers that use solely InnoDB as storage engine and have no other services (e.g. a web server) running, you may set this as high as 80% of your available memory. If that is not the case, you need to carefully assess the memory consumption of your other services and non-InnoDB-Tables and set this variable accordingly. If it is set too high, your system will start swapping, which decreases performance significantly. See also <a href="http://www.percona.com/blog/2007/11/03/choosing-innodb_buffer_pool_size/">this article</a>
You are currently using %s% of your memory for the InnoDB buffer pool. This rule fires if you are assigning less than 60%, however this might be perfectly adequate for your system if you don't have much InnoDB tables or other services running on the same machine. | value
#
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 652bdda4c6..973443be60 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -988,7 +988,7 @@ $cfg['NavigationTreeDefaultTabTable'] = 'tbl_structure.php';
$cfg['NavigationTreeDefaultTabTable2'] = '';
/**
- * Disables the possibility of database expansion
+ * Enables the possibility of navigation tree expansion
*
* @global boolean $cfg['NavigationTreeEnableExpansion']
*/
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index d0ed214891..4add6f4680 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -857,12 +857,19 @@ function PMA_isAllowedDomain($url)
'docs.phpmyadmin.net',
/* mysql.com domains */
'dev.mysql.com','bugs.mysql.com',
+ /* drizzle.com domains */
+ 'www.drizzle.org',
/* php.net domains */
'php.net',
/* Github domains*/
'github.com','www.github.com',
/* Following are doubtful ones. */
- 'www.primebase.com','pbxt.blogspot.com'
+ 'www.primebase.com',
+ 'pbxt.blogspot.com',
+ 'www.percona.com',
+ 'mysqldatabaseadministration.blogspot.com',
+ 'ronaldbradford.com',
+ 'xaprb.com',
);
if (in_array(/*overload*/mb_strtolower($domain), $domainWhiteList)) {
return true;
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index 7f9b944acc..4eef3ff781 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -253,15 +253,17 @@ function PMA_getDesignerPageMenu($visualBuilder, $selected_page)
$html .= '<a class="M_butt" id="key_Show_left_menu" href="#" target="_self">';
$html .= '<img class="' . $iconClass . '" title="' . __('Show/Hide tables list') . '" alt="v" ';
- $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2_m.png')
- . '" />';
+ $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2_m.png') . '" '
+ . 'data-down="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2_m.png') . '" '
+ . 'data-up="' . $_SESSION['PMA_Theme']->getImgPath('pmd/uparrow2_m.png') . '" />';
$html .= '<span class="' . $textClass . '">' . __('Show/Hide tables list') . '</span>';
$html .= '</a>';
$html .= '<a href="#" id="toggleFullscreen" class="M_butt" target="_self">';
$html .= '<img class="' . $iconClass . '" title="' . __('View in fullscreen') . '" alt="" ';
- $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png')
- . '" />';
+ $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png') . '" '
+ . 'data-enter="' . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png') . '" '
+ . 'data-exit="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exitFullscreen.png') . '" />';
$html .= '<span class="' . $textClass . '" data-exit="' . __('Exit fullscreen');
$html .= '" data-enter="' . __('View in fullscreen') . '">' . __('View in fullscreen') . '</span>';
$html .= '</a>';
@@ -363,8 +365,9 @@ function PMA_getDesignerPageMenu($visualBuilder, $selected_page)
$html .= '<a href="#" class="M_butt" target="_self" id="key_SB_all">';
$html .= '<img class="' . $iconClass . '" title="' . __('Small/Big All') . '" alt="v" ';
- $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png')
- . '" />';
+ $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png') .'" '
+ . 'data-right="' . $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow1.png') .'" '
+ . 'data-down="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png') .'"" />';
$html .= '<span class="' . $textClass . '">' . __('Small/Big All') . '</span>';
$html .= '</a>';
@@ -456,16 +459,18 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
$html .= '<a href="#" class="M_butt" target="_self" ';
$html .= '>';
$html .= '<img title="' . __('Hide/Show all') . '" alt="v" id="key_HS_all" ';
- $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png')
- . '" />';
+ $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png') . '" '
+ . 'data-down="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png') . '" '
+ . 'data-right="' . $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow1.png') . '" />';
$html .= '</a>';
$html .= '<a href="#" class="M_butt" target="_self" ';
$html .= '>';
$html .= '<img alt="v" id="key_HS" ';
$html .= 'title="' . __('Hide/Show Tables with no relation') . '"';
- $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png')
- . '" />';
+ $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png') . '" '
+ . 'data-down="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png') . '" '
+ . 'data-right="' . $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png') . '" />';
$html .= '</a>';
$html .= '</div>';
diff --git a/libraries/language_stats.inc.php b/libraries/language_stats.inc.php
index 80a42694fd..34e2e58695 100644
--- a/libraries/language_stats.inc.php
+++ b/libraries/language_stats.inc.php
@@ -6,8 +6,8 @@ $GLOBALS["language_stats"] = array (
'af' => 9,
'ar' => 38,
'az' => 57,
- 'be' => 27,
'be@latin' => 26,
+ 'be' => 27,
'bg' => 62,
'bn' => 83,
'br' => 19,
@@ -57,16 +57,16 @@ $GLOBALS["language_stats"] = array (
'nl' => 100,
'pa' => 2,
'pl' => 86,
- 'pt' => 59,
'pt_BR' => 100,
+ 'pt' => 59,
'ro' => 59,
'ru' => 96,
'si' => 65,
'sk' => 84,
'sl' => 100,
'sq' => 100,
- 'sr' => 25,
'sr@latin' => 50,
+ 'sr' => 25,
'sv' => 88,
'ta' => 38,
'te' => 10,
@@ -77,8 +77,8 @@ $GLOBALS["language_stats"] = array (
'ug' => 11,
'uk' => 89,
'ur' => 19,
- 'uz' => 36,
'uz@latin' => 35,
+ 'uz' => 36,
'vi' => 2,
'vls' => 3,
'zh_CN' => 80,
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
index 056afb0aa2..e3b1443161 100644
--- a/libraries/vendor_config.php
+++ b/libraries/vendor_config.php
@@ -37,12 +37,6 @@ define('SETUP_CONFIG_FILE', './config/config.inc.php');
define('SETUP_DIR_WRITABLE', true);
/**
- * Directory where examples reside. Useful when you want to include
- * the examples directory with documentation, eg. /usr/share/doc.
- */
-define('EXAMPLES_DIR', './examples/');
-
-/**
* Directory where SQL scripts to create/upgrade configuration storage reside.
*/
define('SQL_DIR', './sql/');
diff --git a/locale/ia/LC_MESSAGES/phpmyadmin.mo b/locale/ia/LC_MESSAGES/phpmyadmin.mo
index a30e712168..b48cd78c02 100644
--- a/locale/ia/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/ia/LC_MESSAGES/phpmyadmin.mo
Binary files differ
diff --git a/locale/tr/LC_MESSAGES/phpmyadmin.mo b/locale/tr/LC_MESSAGES/phpmyadmin.mo
index 52a48992c3..76784bc2f4 100644
--- a/locale/tr/LC_MESSAGES/phpmyadmin.mo
+++ b/locale/tr/LC_MESSAGES/phpmyadmin.mo
Binary files differ
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 8bf7a6cb4d..49b55a3ea5 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -181,6 +181,10 @@ button {
margin-<?php echo $right; ?>: 1em;
}
+.floatright {
+ float: <?php echo $right; ?>;
+}
+
table.nospacing {
border-spacing: 0;
}
@@ -820,7 +824,7 @@ div#tablestatistics table {
position: fixed;
padding: .1em .3em;
top: 0;
- z-index: 900;
+ z-index: 99;
background: white;
}
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index efd0c60154..ef51d8678d 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1150,7 +1150,7 @@ div#tablestatistics table {
position: fixed;
padding: .25em .25em .2em;
top: 0;
- z-index: 900;
+ z-index: 99;
background: #888;
}
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index db93a8a084..1a9b70ccc7 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -351,7 +351,7 @@ a.M_butt:hover {
}
#layer_menu {
- z-index: 100;
+ z-index: 50;
position: relative;
float: right;
background-color: #EAEEF0;
@@ -387,7 +387,11 @@ a.M_butt:hover {
#layer_menu_sizer {
background-image: url(<?php echo $resizeImg; ?>);
- cursor: nw-resize;
+ cursor: e-resize;
+}
+
+#layer_menu_sizer .icon {
+ margin: 0;
}
.panel {