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:
Michal Čihař 2012-04-11 00:37:34 +02:00
commit c3afd91c8f
4 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libraries/display_change_password.lib.php
View File

@ -25,51 +25,44 @@ $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";
}?>
<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">
<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>
<td>
<?php echo __('Password Hashing'); ?>:
<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>
</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>
<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 id="tr_element_before_generate_password">
<td>&nbsp;</td>
</tr>
<tr>
<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>
</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>-->
<?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>
</form>

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

@ -123,6 +123,11 @@ fieldset legend {
background-color: <?php echo 'OPERA' != PMA_USR_BROWSER_AGENT ? 'transparent' : $GLOBALS['cfg']['BgOne']; ?>;
}
.some-margin {
margin: .5em;
margin-top: 1em;
}
/* buttons in some browsers (eg. Konqueror) are block elements,
this breaks design */
button {

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

@ -252,7 +252,6 @@ fieldset {
border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
-webkit-border-radius: 4px 4px 0 0;
padding: 5px;
border: #aaa solid 1px;
padding: 1.5em;
background: #eee;
@ -284,6 +283,10 @@ fieldset legend {
box-shadow: 3px 3px 15px #bbb;
}
.some-margin {
margin: 1.5em;
}
/* buttons in some browsers (eg. Konqueror) are block elements,
this breaks design */
button {

2
user_password.php
View File

@ -53,8 +53,6 @@ if (isset($_REQUEST['nopass'])) {
// Loads the headers
require_once './libraries/header.inc.php';
echo '<h1>' . __('Change password') . '</h1>' . "\n\n";
// Displays an error message if required
if (isset($message)) {
$message->display();