The branch, master has been updated
via 0b0fbb8ed193e75a8533855e15af17fd980d058d (commit)
from fff8f28a53c5706958f022e95d339228269ca511 (commit)
- Log -----------------------------------------------------------------
commit 0b0fbb8ed193e75a8533855e15af17fd980d058d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Oct 29 08:11:05 2010 -0400
dead code
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 136 -------------------------------------------------------
1 files changed, 0 insertions(+), 136 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index cd0dc9a..af068ad 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -898,142 +898,6 @@ function unMarkAllRows( container_id ) {
return true;
}
-/**
- * Sets/unsets the pointer and marker in browse mode
- *
- * @param object the table row
- * @param integer the row number
- * @param string the action calling this script (over, out or click)
- * @param string the default background color
- * @param string the color to use for mouseover
- * @param string the color to use for marking a row
- *
- * @return boolean whether pointer is set or not
- */
-function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerColor, theMarkColor)
-{
- var theCells = null;
-
- // 1. Pointer and mark feature are disabled or the browser can't get the
- // row -> exits
- if ((thePointerColor == '' && theMarkColor == '')
- || typeof(theRow.style) == 'undefined') {
- return false;
- }
-
- // 1.1 Sets the mouse pointer to pointer on mouseover and back to normal otherwise.
- if (theAction == "over" || theAction == "click") {
- theRow.style.cursor='pointer';
- } else {
- theRow.style.cursor='default';
- }
-
- // 2. Gets the current row and exits if the browser can't get it
- if (typeof(document.getElementsByTagName) != 'undefined') {
- theCells = theRow.getElementsByTagName('td');
- }
- else if (typeof(theRow.cells) != 'undefined') {
- theCells = theRow.cells;
- }
- else {
- return false;
- }
-
- // 3. Gets the current color...
- var rowCellsCnt = theCells.length;
- var domDetect = null;
- var currentColor = null;
- var newColor = null;
- // 3.1 ... with DOM compatible browsers except Opera that does not return
- // valid values with "getAttribute"
- if (typeof(window.opera) == 'undefined'
- && typeof(theCells[0].getAttribute) != 'undefined') {
- currentColor = theCells[0].getAttribute('bgcolor');
- domDetect = true;
- }
- // 3.2 ... with other browsers
- else {
- currentColor = theCells[0].style.backgroundColor;
- domDetect = false;
- } // end 3
-
- // 3.3 ... Opera changes colors set via HTML to rgb(r,g,b) format so fix it
- if (currentColor.indexOf("rgb") >= 0)
- {
- var rgbStr = currentColor.slice(currentColor.indexOf('(') + 1,
- currentColor.indexOf(')'));
- var rgbValues = rgbStr.split(",");
- currentColor = "#";
- var hexChars = "0123456789ABCDEF";
- for (var i = 0; i < 3; i++)
- {
- var v = rgbValues[i].valueOf();
- currentColor += hexChars.charAt(v/16) + hexChars.charAt(v%16);
- }
- }
-
- // 4. Defines the new color
- // 4.1 Current color is the default one
- if (currentColor == ''
- || currentColor.toLowerCase() == theDefaultColor.toLowerCase()) {
- if (theAction == 'over' && thePointerColor != '') {
- newColor = thePointerColor;
- }
- else if (theAction == 'click' && theMarkColor != '') {
- newColor = theMarkColor;
- marked_row[theRowNum] = true;
- // Deactivated onclick marking of the checkbox because it's also executed
- // when an action (like edit/delete) on a single item is performed. Then the checkbox
- // would get deactived, even though we need it activated. Maybe there is a way
- // to detect if the row was clicked, and not an item therein...
- // document.getElementById('id_rows_to_delete' + theRowNum).checked = true;
- }
- }
- // 4.1.2 Current color is the pointer one
- else if (currentColor.toLowerCase() == thePointerColor.toLowerCase()
- && (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])) {
- if (theAction == 'out') {
- newColor = theDefaultColor;
- }
- else if (theAction == 'click' && theMarkColor != '') {
- newColor = theMarkColor;
- marked_row[theRowNum] = true;
- // document.getElementById('id_rows_to_delete' + theRowNum).checked = true;
- }
- }
- // 4.1.3 Current color is the marker one
- else if (currentColor.toLowerCase() == theMarkColor.toLowerCase()) {
- if (theAction == 'click') {
- newColor = (thePointerColor != '')
- ? thePointerColor
- : theDefaultColor;
- marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])
- ? true
- : null;
- // document.getElementById('id_rows_to_delete' + theRowNum).checked = false;
- }
- } // end 4
-
- // 5. Sets the new color...
- if (newColor) {
- var c = null;
- // 5.1 ... with DOM compatible browsers except Opera
- if (domDetect) {
- for (c = 0; c < rowCellsCnt; c++) {
- theCells[c].setAttribute('bgcolor', newColor, 0);
- } // end for
- }
- // 5.2 ... with other browsers
- else {
- for (c = 0; c < rowCellsCnt; c++) {
- theCells[c].style.backgroundColor = newColor;
- }
- }
- } // end 5
-
- return true;
-} // end of the 'setPointer()' function
-
/*
* Sets/unsets the pointer and marker in vertical browse mode
*
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via fff8f28a53c5706958f022e95d339228269ca511 (commit)
via 540cd447a3f8b8e324daf9ccd2ec8112687a690f (commit)
from 7a23316314fc3c0c83f33d96ca6c8480ce885259 (commit)
- Log -----------------------------------------------------------------
commit fff8f28a53c5706958f022e95d339228269ca511
Merge: 7a23316314fc3c0c83f33d96ca6c8480ce885259 540cd447a3f8b8e324daf9ccd2ec8112687a690f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Oct 29 05:39:02 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 21 ++++++++-------------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de1f54f..40b269b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,7 @@
- bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
3.3.9.0 (not yet released)
+- bug [doc] Fix references to MySQL doc
3.3.8.0 (2010-10-25)
- bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/Documentation.html b/Documentation.html
index e0fd263..d572174 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2674,7 +2674,7 @@ setfacl -d -m "g:www-data:rwx" tmp
<a href="#faq1_12">1.12 I have lost my MySQL root password, what can I do?</a></h4>
<p> The MySQL manual explains how to
- <a href="http://www.mysql.com/doc/R/e/Resetting_permissions.html">
+ <a href="http://dev.mysql.com/doc/mysql/en/resetting-permissions.html">
reset the permissions</a>.</p>
<h4 id="faq1_13">
@@ -2730,7 +2730,7 @@ setfacl -d -m "g:www-data:rwx" tmp
support?</a></h4>
<p> Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For
- older MySQL versions, you need to use 2.8.x branch. phpMyAdmin can
+ older MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can
connect to your MySQL server using PHP's classic
<a href="http://php.net/mysql">MySQL extension</a> as well as the
<a href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that
@@ -2740,12 +2740,7 @@ setfacl -d -m "g:www-data:rwx" tmp
extension of your choice to a MySQL client library of at least the same
minor version since the one that is bundled with some PHP distributions is
rather old and might cause problems <a href="#faq1_17a">
- (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.
- If your webserver is running on a windows system, you might want to try
- MySQL's
- <a href="http://dev.mysql.com/downloads/connector/php/">Connector/PHP</a>
- instead of the MySQL / MySQLi extensions that are bundled with the official
- php Win32 builds.</p>
+ (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.</p>
<h5 id="faq1_17a">
<a href="#faq1_17a">1.17a I cannot connect to the MySQL server. It always returns the error
@@ -3138,7 +3133,7 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
</ul>
<p> Have also a look at the
- <a href="http://www.mysql.com/doc/C/a/Can_not_connect_to_server.html">
+ <a href="http://dev.mysql.com/doc/en/can-not-connect-to-server.html">
corresponding section of the MySQL documentation</a>.</p>
<h4 id="faq2_4">
@@ -3372,8 +3367,8 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
<p> When MySQL is running in ANSI-compatibility mode, there are some major
differences in how <abbr title="structured query language">SQL</abbr> is
- structured (see <a href="http://dev.mysql.com/doc/mysql/en/ANSI_mode.html">
- http://dev.mysql.com/doc/mysql/en/ANSI_mode.html</a>). Most important of all,
+ structured (see <a href="http://dev.mysql.com/doc/mysql/en/ansi-mode.html">
+ http://dev.mysql.com/doc/mysql/en/ansi-mode.html</a>). Most important of all,
the quote-character (") is interpreted as an identifier quote character and
not as a string quote character, which makes many internal phpMyAdmin
operations into invalid <abbr title="structured query language">SQL</abbr>
@@ -3960,7 +3955,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
columns!</a></h4>
<p> No, it's MySQL that is doing
- <a href="http://www.mysql.com/doc/S/i/Silent_column_changes.html">silent
+ <a href="http://dev.mysql.com/doc/en/silent-column-changes.html">silent
column type changing</a>.</p>
<h4 id="underscore">
@@ -5056,7 +5051,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
<li><a href="http://www.wikipedia.org/wiki/Server_%28computing%29">Server</a>
- a computer system that provides services to other computing
systems over a network.</li>
- <li><a id="glossar_storage_engine" href="http://dev.mysql.com/doc/refman/5.0/en/storage-engines.html">Storage Engines</a>
+ <li><a id="glossar_storage_engine" href="http://dev.mysql.com/doc/en/storage-engines.html">Storage Engines</a>
- handlers for different table types</li>
<li><a href="http://www.wikipedia.org/wiki/Socket#Computer_sockets">socket</a>
- a form of inter-process communication.</li>
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via 540cd447a3f8b8e324daf9ccd2ec8112687a690f (commit)
from 74f593aa867f631d1e80c177bbd61e70a5c2af30 (commit)
- Log -----------------------------------------------------------------
commit 540cd447a3f8b8e324daf9ccd2ec8112687a690f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Oct 29 05:38:12 2010 -0400
bug [doc] Fix references to MySQL doc
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 21 ++++++++-------------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1e73469..4808160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ $Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $
3.3.9.0 (not yet released)
+- bug [doc] Fix references to MySQL doc
3.3.8.0 (2010-10-25)
- bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/Documentation.html b/Documentation.html
index 95a6681..cb21dfc 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2701,7 +2701,7 @@ setfacl -d -m "g:www-data:rwx" tmp
<a href="#faq1_12">1.12 I have lost my MySQL root password, what can I do?</a></h4>
<p> The MySQL manual explains how to
- <a href="http://www.mysql.com/doc/R/e/Resetting_permissions.html">
+ <a href="http://dev.mysql.com/doc/mysql/en/resetting-permissions.html">
reset the permissions</a>.</p>
<h4 id="faq1_13">
@@ -2767,7 +2767,7 @@ setfacl -d -m "g:www-data:rwx" tmp
support?</a></h4>
<p> Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For
- older MySQL versions, you need to use 2.8.x branch. phpMyAdmin can
+ older MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can
connect to your MySQL server using PHP's classic
<a href="http://php.net/mysql">MySQL extension</a> as well as the
<a href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that
@@ -2777,12 +2777,7 @@ setfacl -d -m "g:www-data:rwx" tmp
extension of your choice to a MySQL client library of at least the same
minor version since the one that is bundled with some PHP distributions is
rather old and might cause problems <a href="#faq1_17a">
- (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.
- If your webserver is running on a windows system, you might want to try
- MySQL's
- <a href="http://dev.mysql.com/downloads/connector/php/">Connector/PHP</a>
- instead of the MySQL / MySQLi extensions that are bundled with the official
- php Win32 builds.</p>
+ (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.</p>
<h5 id="faq1_17a">
<a href="#faq1_17a">1.17a I cannot connect to the MySQL server. It always returns the error
@@ -3175,7 +3170,7 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
</ul>
<p> Have also a look at the
- <a href="http://www.mysql.com/doc/C/a/Can_not_connect_to_server.html">
+ <a href="http://dev.mysql.com/doc/en/can-not-connect-to-server.html">
corresponding section of the MySQL documentation</a>.</p>
<h4 id="faq2_4">
@@ -3409,8 +3404,8 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
<p> When MySQL is running in ANSI-compatibility mode, there are some major
differences in how <abbr title="structured query language">SQL</abbr> is
- structured (see <a href="http://dev.mysql.com/doc/mysql/en/ANSI_mode.html">
- http://dev.mysql.com/doc/mysql/en/ANSI_mode.html</a>). Most important of all,
+ structured (see <a href="http://dev.mysql.com/doc/mysql/en/ansi-mode.html">
+ http://dev.mysql.com/doc/mysql/en/ansi-mode.html</a>). Most important of all,
the quote-character (") is interpreted as an identifier quote character and
not as a string quote character, which makes many internal phpMyAdmin
operations into invalid <abbr title="structured query language">SQL</abbr>
@@ -3995,7 +3990,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
columns!</a></h4>
<p> No, it's MySQL that is doing
- <a href="http://www.mysql.com/doc/S/i/Silent_column_changes.html">silent
+ <a href="http://dev.mysql.com/doc/en/silent-column-changes.html">silent
column type changing</a>.</p>
<h4 id="underscore">
@@ -4912,7 +4907,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
<li><a href="http://www.wikipedia.org/wiki/Server_%28computing%29">Server</a>
- a computer system that provides services to other computing
systems over a network.</li>
- <li><a id="glossar_storage_engine" href="http://dev.mysql.com/doc/refman/5.0/en/storage-engines.html">Storage Engines</a>
+ <li><a id="glossar_storage_engine" href="http://dev.mysql.com/doc/en/storage-engines.html">Storage Engines</a>
- handlers for different table types</li>
<li><a href="http://www.wikipedia.org/wiki/Socket#Computer_sockets">socket</a>
- a form of inter-process communication.</li>
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 7a23316314fc3c0c83f33d96ca6c8480ce885259 (commit)
from 36d2627151a7d1349d78bae43d0caf0a7c3a97b3 (commit)
- Log -----------------------------------------------------------------
commit 7a23316314fc3c0c83f33d96ca6c8480ce885259
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Oct 28 13:11:46 2010 -0400
for all data pages including AJAX-reached, handle clicking of the companion checkbox and the shift-clicking
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 145 +++++++++++-----------------------------
libraries/display_tbl.lib.php | 2 +-
2 files changed, 41 insertions(+), 106 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index 6a764b1..cd0dc9a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -873,101 +873,6 @@ $(document).ready(function() {
var marked_row = new Array;
/**
- * enables highlight and marking of rows in data tables
- *
- */
-function PMA_markRowsInit() {
- // for every table row ...
- var rows = document.getElementsByTagName('tr');
- for ( var i = 0; i < rows.length; i++ ) {
- // ... with the class 'odd' or 'even' ...
- if ( 'odd' != rows[i].className.substr(0,3) && 'even' != rows[i].className.substr(0,4) ) {
- continue;
- }
- // ... add event listeners ...
- // Do not set click events if not wanted
- if (rows[i].className.search(/noclick/) != -1) {
- continue;
- }
- // ... and to mark the row on click ...
- $(rows[i]).bind('mousedown', function(event) {
- var unique_id;
- var checkbox;
- var table;
-
- // Somehow IE8 has this not set
- if (!event) var event = window.event
-
- checkbox = this.getElementsByTagName( 'input' )[0];
- if ( checkbox && checkbox.type == 'checkbox' ) {
- unique_id = checkbox.name + checkbox.value;
- } else if ( this.id.length > 0 ) {
- unique_id = this.id;
- } else {
- return;
- }
-
- if ( typeof(marked_row[unique_id]) == 'undefined' || !marked_row[unique_id] ) {
- marked_row[unique_id] = true;
- } else {
- marked_row[unique_id] = false;
- }
-
- if ( checkbox && checkbox.disabled == false ) {
- checkbox.checked = marked_row[unique_id];
- if (typeof(event) == 'object') {
- table = this.parentNode;
- parentTableLimit = 0;
- while (table.tagName.toLowerCase() != 'table' && parentTableLimit < 20) {
- parentTableLimit++;
- table = table.parentNode;
- }
-
- if (event.shiftKey == true && table.lastClicked != undefined) {
- if (event.preventDefault) {event.preventDefault();} else {event.returnValue = false;}
- i = table.lastClicked;
-
- if (i < this.rowIndex) {
- i++;
- } else {
- i--;
- }
-
- while (i != this.rowIndex) {
- $(table.rows[i]).mousedown();
- if (i < this.rowIndex) {
- i++;
- } else {
- i--;
- }
- }
- }
-
- table.lastClicked = this.rowIndex;
- }
- }
- });
-
- // ... and disable label ...
- var labeltag = rows[i].getElementsByTagName('label')[0];
- if ( labeltag ) {
- labeltag.onclick = function() {
- return false;
- }
- }
- // .. and checkbox clicks
- var checkbox = rows[i].getElementsByTagName('input')[0];
- if ( checkbox ) {
- checkbox.onclick = function() {
- // opera does not recognize return false;
- this.checked = ! this.checked;
- }
- }
- }
-}
-$(document).ready(PMA_markRowsInit);
-
-/**
* marks all rows and selects its first checkbox inside the given element
* the given element is usaly a table or a div containing the table or tables
*
@@ -2665,11 +2570,12 @@ $(function() {
});
/**
- * When there is a checkbox on both ends of the row, propagate the click on
- * one of them to the other one
+ * For the checkboxes in browse mode, handles the shift/click (only works
+ * in horizontal mode) and propagates the click to the "companion" checkbox
+ * (in both horizontal and vertical). Works also for pages reached via AJAX.
*/
$(document).ready(function() {
- $('.verify_other_checkbox').live('click',function() {
+ $('.multi_checkbox').live('click',function(e) {
var current_checkbox_id = this.id;
var left_checkbox_id = current_checkbox_id.replace('_right', '_left');
var right_checkbox_id = current_checkbox_id.replace('_left', '_right');
@@ -2680,12 +2586,41 @@ $(document).ready(function() {
other_checkbox_id = left_checkbox_id;
}
- // the default action has not been prevented so if we have
- // just clicked this "if" is true
- if ($('#' + current_checkbox_id).is(':checked')) {
- $('#' + other_checkbox_id).attr('checked', true);
+ var $current_checkbox = $('#' + current_checkbox_id);
+ var $other_checkbox = $('#' + other_checkbox_id);
+
+ if (e.shiftKey) {
+ var index_of_current_checkbox = $('.multi_checkbox').index($current_checkbox);
+ var $last_checkbox = $('.multi_checkbox').filter('.last_clicked');
+ var index_of_last_click = $('.multi_checkbox').index($last_checkbox);
+ $('.multi_checkbox')
+ .filter(function(index) {
+ // the first clicked row can be on a row above or below the
+ // shift-clicked row
+ return (index_of_current_checkbox > index_of_last_click && index > index_of_last_click && index < index_of_current_checkbox)
+ || (index_of_last_click > index_of_current_checkbox && index < index_of_last_click && index > index_of_current_checkbox);
+ })
+ .each(function(index) {
+ var $intermediate_checkbox = $(this);
+ if ($current_checkbox.is(':checked')) {
+ $intermediate_checkbox.attr('checked', true);
+ } else {
+ $intermediate_checkbox.attr('checked', false);
+ }
+ });
+ }
+
+ $('.multi_checkbox').removeClass('last_clicked');
+ $current_checkbox.addClass('last_clicked');
+
+ // When there is a checkbox on both ends of the row, propagate the
+ // click on one of them to the other one.
+ // (the default action has not been prevented so if we have
+ // just clicked, this "if" is true)
+ if ($current_checkbox.is(':checked')) {
+ $other_checkbox.attr('checked', true);
} else {
- $('#' + other_checkbox_id).attr('checked', false);
- }
+ $other_checkbox.attr('checked', false);
+ }
});
-}) // end of $(document).ready() for verify other checkbox
+}) // end of $(document).ready() for multi checkbox
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 1e7b73a..6504839 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2464,7 +2464,7 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla
$ret .= ' align="center">'
. '<input type="checkbox" id="id_rows_to_delete' . $row_no . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"'
. ' onclick="' . $column_marker_vertical . '"'
- . ' class="verify_other_checkbox"'
+ . ' class="multi_checkbox"'
. ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />'
. ' </td>';
}
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 6e556755dcda459810580daea5b83bba69d44cca (commit)
from b0fa0379b2aa2539071415c24af7be3a443a7fd4 (commit)
- Log -----------------------------------------------------------------
commit 6e556755dcda459810580daea5b83bba69d44cca
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Oct 27 13:04:43 2010 -0400
German book out of print
-----------------------------------------------------------------------
Summary of changes:
images/books/pma_de_90x122.jpg | Bin 10949 -> 0 bytes
images/books/pma_en_3.1_100x123.png | Bin 23427 -> 0 bytes
images/books/pma_en_97x123.png | Bin 45459 -> 0 bytes
images/books/pma_it_90x117.jpg | Bin 4139 -> 0 bytes
templates/docs.tpl | 18 ------------------
templates/index.tpl | 1 -
6 files changed, 0 insertions(+), 19 deletions(-)
delete mode 100644 images/books/pma_de_90x122.jpg
delete mode 100644 images/books/pma_en_3.1_100x123.png
delete mode 100644 images/books/pma_en_97x123.png
delete mode 100644 images/books/pma_it_90x117.jpg
diff --git a/images/books/pma_de_90x122.jpg b/images/books/pma_de_90x122.jpg
deleted file mode 100644
index 45eadac..0000000
Binary files a/images/books/pma_de_90x122.jpg and /dev/null differ
diff --git a/images/books/pma_en_3.1_100x123.png b/images/books/pma_en_3.1_100x123.png
deleted file mode 100644
index dc5cb1c..0000000
Binary files a/images/books/pma_en_3.1_100x123.png and /dev/null differ
diff --git a/images/books/pma_en_97x123.png b/images/books/pma_en_97x123.png
deleted file mode 100644
index cbb4459..0000000
Binary files a/images/books/pma_en_97x123.png and /dev/null differ
diff --git a/images/books/pma_it_90x117.jpg b/images/books/pma_it_90x117.jpg
deleted file mode 100644
index 5e806e1..0000000
Binary files a/images/books/pma_it_90x117.jpg and /dev/null differ
diff --git a/templates/docs.tpl b/templates/docs.tpl
index 682d545..9699dbf 100644
--- a/templates/docs.tpl
+++ b/templates/docs.tpl
@@ -137,24 +137,6 @@ Este libro es una guía completa que le ayuda a sacar partido del potencia
</div>
-<div class="floatbox book">
-<h3>phpMyAdmin - MySQL-Datenbanken effizient über das Web verwalten</h3>
-
-<a href="http://www.addison-wesley.de/main/main.asp?page=home/bookdetails&Produc…"><img src="${base_url}images/books/pma_de_90x122.jpg" alt="Book cover" width="90" height="122" /></a>
-
-<p xml:lang="de">
-Dieses Buch gibt Ihnen einen profunden Einstieg in die effiziente Verwaltung von MySQL-Datenbanken mit phpMyAdmin (neue Version 2.6.0) bis hin zur professionellen Administration. Der Autor zeigt, wie Sie mit phpMyAdmin Datenbanken anlegen, editieren, abfragen und pflegen und wie Sie Benutzer anlegen und verwalten.
-</p>
-
-<p xml:lang="de">Sie lernen, wie Sie Abfragen optimieren und automatisieren und was Sie beim Arbeiten mit verschiedenen Zeichensätzen und MIME-Typen beachten müssen u.v.a.m. Ein Troubleshooting-Kapitel hilft bei Problemen.
-</p>
-
-<p xml:lang="de">
-<a href="http://www.addison-wesley.de/main/main.asp?page=home/bookdetails&Produc…">Besuchen Sie auch die Webseite der deutschen Ausgabe</a>
-</p>
-</div>
-
-
<div class="clearer"></div>
</div>
diff --git a/templates/index.tpl b/templates/index.tpl
index 1b39993..0510e4e 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -23,7 +23,6 @@ etc), while you still have the ability to directly execute any SQL statement.
<img src="images/books/pma_en_3.3_113x149.jpg" alt="phpMyAdmin book" />
<img src="images/books/pma_en_100x123.png" alt="phpMyAdmin book" />
<img src="images/books/pma_cz_90x122.jpg" alt="phpMyAdmin book" />
-<img src="images/books/pma_de_90x122.jpg" alt="phpMyAdmin book" />
<img src="images/books/pma_es_100x123.png" alt="phpMyAdmin book" />
</a>
</div>
hooks/post-receive
--
phpMyAdmin website
The branch, master has been updated
via 6dd2e460f22b2f874e1a318c7f2e06d8219670be (commit)
from d0d96fbd5669e0537ad0088c6222c901b4d2a354 (commit)
- Log -----------------------------------------------------------------
commit 6dd2e460f22b2f874e1a318c7f2e06d8219670be
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Oct 26 07:58:17 2010 -0400
row highlighting in horizontal mode for IE6 on pages reached via AJAX
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index dc459cd..6a764b1 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -858,6 +858,16 @@ $(document).ready(function() {
})
/**
+ * For row highlighting in horizontal mode (necessary for IE 6; use "live"
+ * so that it works also for pages reached via AJAX)
+ */
+$(document).ready(function() {
+ $('tr.odd, tr.even').live('hover',function() {
+ $(this).toggleClass('hover');
+ });
+})
+
+/**
* This array is used to remember mark status of rows in browse mode
*/
var marked_row = new Array;
@@ -875,16 +885,6 @@ function PMA_markRowsInit() {
continue;
}
// ... add event listeners ...
- // ... to highlight the row on mouseover ...
- if ( navigator.appName == 'Microsoft Internet Explorer' ) {
- // but only for IE, other browsers are handled by :hover in css
- rows[i].onmouseover = function() {
- this.className += ' hover';
- }
- rows[i].onmouseout = function() {
- this.className = this.className.replace( ' hover', '' );
- }
- }
// Do not set click events if not wanted
if (rows[i].className.search(/noclick/) != -1) {
continue;
hooks/post-receive
--
phpMyAdmin