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:
Weblate 2015-03-19 05:53:09 +01:00
commit c7375b352b
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/functions.js
View File

@ -368,7 +368,7 @@ function PMA_addDatepicker($this_element, type, options)
}, 0);
},
onSelect: function() {
$this_element.data('datepicker').inline = true;
$this_element.data('datepicker').inline = true;
},
onClose: function (dateText, dp_inst) {
// The value is no more from the date picker
@ -3493,6 +3493,7 @@ function showIndexEditDialog($outer)
);
}
});
$('div.add_fields').removeClass('hide');
// focus index size input on column picked
$outer.find('table#index_columns select').change(function () {
if ($(this).find("option:selected").val() === '') {

1
js/indexes.js
View File

@ -344,6 +344,7 @@ function PMA_showAddIndexDialog(source_array, array_index, target_columns, col_i
open: function () {
checkIndexName("index_frm");
PMA_showHints($div);
PMA_init_slider();
$('#index_columns td').each(function () {
$(this).css("width", $(this).width() + 'px');
});

4
libraries/navigation/NavigationTree.class.php
View File

@ -843,7 +843,7 @@ class PMA_NavigationTree
$retval .= urlencode($parents[0]->real_name);
$retval .= "</span>";
if (empty($listContent)) {
$retval .= "<div style='margin:0.75em;font-size:1.2em'>";
$retval .= "<div style='margin:0.75em'>";
$retval .= __('No tables found in database.');
$retval .= "</div>";
}
@ -1206,7 +1206,7 @@ class PMA_NavigationTree
$retval .= '</select></form>';
$retval .= '</div></div>';
$retval .= '<div id="pma_navigation_tree_content">';
$retval .= '<div style="margin:0.75em;font-size:1.2em">';
$retval .= '<div style="margin:0.75em">';
$retval .= __('Please select a database.');
$retval .= '</div>';
$retval .= '</div>';

2
libraries/tbl_indexes.lib.php
View File

@ -460,7 +460,7 @@ function PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields)
$html .= '<div class="add_more">';
$btn_value = sprintf(__('Add %s column(s) to index'), 1);
$html .= '<div class="slider"></div>';
$html .= '<div class="add_fields">';
$html .= '<div class="add_fields hide">';
$html .= '<input type="submit" id="add_fields" value="' . $btn_value . '" />';
$html .= '</div>';
$html .= '</div>';