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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2012-04-11 23:08:42 +05:30
commit bf8dac8ecc
5 changed files with 76 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/functions.js
View File

@ -157,7 +157,7 @@ function PMA_current_version()
function displayPasswordGenerateButton()
{
$('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
$('#tr_element_before_generate_password').parent().append('<tr class="vmiddle"><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
$('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
}
@ -2348,6 +2348,9 @@ $(document).ready(function() {
});
$('#change_password_anchor.ajax').live('click', function(event) {
event.preventDefault();
var $msgbox = PMA_ajaxShowMessage();
$(this).removeClass('ajax').addClass('dialog_active');
/**
* @var button_options Object containing options to be passed to jQueryUI's dialog
@ -2403,7 +2406,13 @@ $(document).ready(function() {
}
})
.append(data);
// for this dialog, we remove the fieldset wrapping due to double headings
$("fieldset#fieldset_change_password")
.find("legend").remove().end()
.find("table.noclick").unwrap().addClass("some-margin")
.find("input#text_pma_pw").focus();
displayPasswordGenerateButton();
PMA_ajaxRemoveMessage($msgbox);
}); // end $.get()
}); // end handler for change password anchor

28
js/server_privileges.js
View File

@ -368,17 +368,23 @@ $(document).ready(function() {
button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close");};
var token = $(this).parents('form').find('input[name="token"]').val();
$.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true, 'token': token}, function(data) {
var $div = $('<div id="edit_user_dialog"></div>')
.append(data)
.dialog({
width: 900,
height: 600,
buttons: button_options,
close: function () {
$(this).remove();
}
}); //dialog options end
$.get($(this).attr('href'),
{
'ajax_request':true,
'edit_user_dialog': true,
'token': token
},
function(data) {
var $div = $('<div id="edit_user_dialog"></div>')
.append(data)
.dialog({
width: 900,
height: 600,
buttons: button_options,
close: function () {
$(this).remove();
}
}); //dialog options end
displayPasswordGenerateButton();
PMA_ajaxRemoveMessage($msgbox);
PMA_convertFootnotesToTooltips($div);

79
libraries/display_change_password.lib.php
View File

@ -25,44 +25,51 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
echo '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
. '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
}?>
<table class="data noclick some-margin">
<tr class="odd">
<td colspan="2">
<input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
<label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label>
</td>
</tr>
<tr class="even">
<td>
<input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " />
<label for="nopass_0"><?php echo __('Password'); ?>:&nbsp;</label>
<fieldset id="fieldset_change_password">
<legend><?php echo __('Change password'); ?></legend>
<table class="data noclick">
<tr class="odd">
<td colspan="2">
<input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
<label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label>
</td>
</tr>
<tr class="even vmiddle">
<td>
<input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " />
<label for="nopass_0"><?php echo __('Password'); ?>:&nbsp;</label>
</td>
<td>
<input type="password" name="pma_pw" id="text_pma_pw" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
&nbsp;&nbsp;
<?php echo __('Re-type'); ?>:&nbsp;
<input type="password" name="pma_pw2" id="text_pma_pw2" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
</td>
</tr>
<tr class="vmiddle">
<td>
<?php echo __('Password Hashing'); ?>:
</td>
<td>
<input type="password" name="pma_pw" id="text_pma_pw" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
&nbsp;&nbsp;
<?php echo __('Re-type'); ?>:&nbsp;
<input type="password" name="pma_pw2" id="text_pma_pw2" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
<input type="radio" name="pw_hash" id="radio_pw_hash_new" value="new" checked="checked" />
<label for="radio_pw_hash_new">
MySQL&nbsp;4.1+
</label>
</td>
</tr>
<tr>
</tr>
<tr id="tr_element_before_generate_password">
<td>&nbsp;</td>
<td>
<?php echo __('Password Hashing'); ?>:
</td>
<td>
<input type="radio" name="pw_hash" id="radio_pw_hash_new" value="new" checked="checked" />
<label for="radio_pw_hash_new">
MySQL&nbsp;4.1+
</label>
</td>
</tr>
<tr id="tr_element_before_generate_password">
<td>&nbsp;</td>
<td>
<input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" />
<label for="radio_pw_hash_old">
<?php echo __('MySQL 4.0 compatible'); ?>
</label>
</td>
</tr>
</table>
<input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" />
<label for="radio_pw_hash_old">
<?php echo __('MySQL 4.0 compatible'); ?>
</label>
</td>
</tr>
</table>
</fieldset>
<!-- <fieldset id="fieldset_change_password_footer" class="tblFooters">
<input type="submit" name="change_pw" value="<?php //echo(__('Go')); ?>" />
<button aria-disabled="false" name="change_pw" role="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="submit"><span class="ui-button-text">Go</span></button>
</fieldset>-->
</form>

5
libraries/tbl_properties.inc.php
View File

@ -559,8 +559,9 @@ echo PMA_generate_common_hidden_inputs($_form_params);
unset($_form_params);
if ($action == 'tbl_create.php') {
?>
<table class="table-name">
<tr><td><?php echo __('Table name'); ?>:&nbsp;<input type="text" name="table" size="40" maxlength="80"
<table>
<tr class="vmiddle">
<td><?php echo __('Table name'); ?>:&nbsp;<input type="text" name="table" size="40" maxlength="80"
value="<?php echo (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : ''); ?>"
class="textfield" autofocus />
</td>

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

@ -374,15 +374,15 @@ th.right, td.right {
text-align: right;
}
tr.vtop, th.vtop, td.vtop {
tr.vtop th, tr.vtop td, th.vtop, td.vtop {
vertical-align: top;
}
tr.vmiddle, th.vmiddle, td.vmiddle {
tr.vmiddle th, tr.vmiddle td, th.vmiddle, td.vmiddle {
vertical-align: middle;
}
tr.vbottom, th.vbottom, td.vbottom {
tr.vbottom th, tr.vbottom td, th.vbottom, td.vbottom {
vertical-align: bottom;
}
@ -2268,13 +2268,6 @@ hr.enum_editor_no_js {
bottom: .35em;
}
/**
* Create table styles
*/
#create_table_form table.table-name td {
vertical-align: middle;
}
/**
* Table structure styles
*/