gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2012-01-27 12:40:12 +01:00
commit e66f23fcae
4 changed files with 1125 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1525
js/codemirror/lib/codemirror.js vendored
View File

File diff suppressed because it is too large Load Diff

16
js/functions.js
View File

@ -2053,7 +2053,7 @@ $(document).ready(function() {
//Sort the table
$(tables_table).PMA_sort_table('th');
// Adjust summary row
PMA_adjustTotals();
}
@ -3434,7 +3434,13 @@ $(document).ready(function() {
$(document).ready(function() {
var elm = $('#sqlquery');
if (elm.length > 0 && typeof CodeMirror != 'undefined') {
codemirror_editor = CodeMirror.fromTextArea(elm[0], {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"});
codemirror_editor = CodeMirror.fromTextArea(elm[0], {
lineNumbers: true,
matchBrackets: true,
indentUnit: 4,
mode: "text/x-mysql",
lineWrapping: true
});
}
});
@ -3645,11 +3651,11 @@ $(document).ready(function () {
/**
* Toggles row colors of a set of 'tr' elements starting from a given element
*
*
* @param $start Starting element
*/
function toggleRowColors($start)
{
function toggleRowColors($start)
{
for (var $curr_row = $start; $curr_row.length > 0; $curr_row = $curr_row.next()) {
if ($curr_row.hasClass('odd')) {
$curr_row.removeClass('odd').addClass('even');

17
themes/original/css/theme_right.css.php
View File

@ -2198,12 +2198,16 @@ fieldset .disabled-field td {
}
.CodeMirror-scroll {
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
overflow: auto;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
/* This is needed to prevent an IE[67] bug where the scrolled content
is visible outside of the scrolling box. */
position: relative;
}
.CodeMirror-gutter {
position: absolute; left: 0; top: 0;
z-index: 10;
background-color: #f7f7f7;
border-right: 1px solid #eee;
min-width: 2em;
@ -2213,6 +2217,7 @@ fieldset .disabled-field td {
color: #aaa;
text-align: right;
padding: .4em .2em .4em .4em;
white-space: pre !important;
}
.CodeMirror-lines {
padding: .4em;
@ -2227,6 +2232,16 @@ fieldset .disabled-field td {
font-family: inherit;
font-size: inherit;
padding: 0; margin: 0;
white-space: pre;
word-wrap: normal;
}
.CodeMirror-wrap pre {
word-wrap: break-word;
white-space: pre-wrap;
}
.CodeMirror-wrap .CodeMirror-scroll {
overflow-x: hidden;
}
.CodeMirror textarea {

15
themes/pmahomme/css/theme_right.css.php
View File

@ -2620,10 +2620,14 @@ fieldset .disabled-field td {
.CodeMirror-scroll {
overflow: auto;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
/* This is needed to prevent an IE[67] bug where the scrolled content
is visible outside of the scrolling box. */
position: relative;
}
.CodeMirror-gutter {
position: absolute; left: 0; top: 0;
z-index: 10;
background-color: #f7f7f7;
border-right: 1px solid #eee;
min-width: 2em;
@ -2633,6 +2637,7 @@ fieldset .disabled-field td {
color: #aaa;
text-align: right;
padding: .4em .2em .4em .4em;
white-space: pre !important;
}
.CodeMirror-lines {
padding: .4em;
@ -2647,6 +2652,16 @@ fieldset .disabled-field td {
font-family: inherit;
font-size: inherit;
padding: 0; margin: 0;
white-space: pre;
word-wrap: normal;
}
.CodeMirror-wrap pre {
word-wrap: break-word;
white-space: pre-wrap;
}
.CodeMirror-wrap .CodeMirror-scroll {
overflow-x: hidden;
}
.CodeMirror textarea {