Skip to content

Commit db48730

Browse files
gesinn-it-geagesinn-it-gea
committed
fixed some i18n for 'de', added css, improved styleability, prepared 2.0.1
1 parent 978d7d5 commit db48730

File tree

7 files changed

+141
-103
lines changed

7 files changed

+141
-103
lines changed

‎extension.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "EditAccount",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"author": [
55
"Łukasz Garczewski",
66
"Jack Phoenix",
@@ -50,6 +50,13 @@
5050
"EditAccount": "includes/specials/SpecialEditAccount.php"
5151
},
5252
"ResourceModules": {
53+
"ext.editAccount": {
54+
"localBasePath": "modules",
55+
"remoteExtPath": "EditAccount/modules",
56+
"styles": [
57+
"editAccount.css"
58+
]
59+
},
5360
"ext.editAccount.displayuser": {
5461
"localBasePath": "modules/js",
5562
"remoteExtPath": "EditAccount/modules/js",

‎i18n/de.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
"editaccount": "Benutzerkonto bearbeiten",
1515
"editaccount-general-description": "Schließt das Benutzerkonto",
1616
"editaccount-user-id": "'''Benutzerkennung''': $1",
17-
"editaccount-user-reg-date": "'''Registrierungsdatum des Benutzerkontos''': $1",
17+
"editaccount-user-reg-date": "'''Registrierungsdatum''': $1",
1818
"editaccount-return": "Zurück",
1919
"editaccount-desc": "Ermöglicht die Verwaltung diverser Daten eines [[Special:EditAccount|Benutzerkontos]] durch berechtigte Benutzer",
2020
"editaccount-frame-manage": "Ein Benutzerkonto bearbeiten",
2121
"editaccount-frame-usage": "Notiz",
2222
"editaccount-usage": "Die Daten der einzelnen Benutzerkonten werden separat für jedes Wiki gespeichert. Sofern ein Passwort oder eine E-Mail-Adresse zurücksetzt wird, wird lediglich der Cache für dieses Wiki gelöscht. Benutzer müssen sich daher in diesem Wiki erneut einloggen, um Probleme mit dem Cache zu vermeiden.",
2323
"editaccount-label-select": "Wähle ein Benutzerkonto",
24-
"editaccount-submit-account": "Benutzerkonto verwalten",
24+
"editaccount-submit-account": "Benutzerkonto bearbeiten",
2525
"editaccount-frame-account": "Bearbeiten von Benutzerkonto: $1",
2626
"editaccount-frame-close": "Deaktivieren von Benutzerkonto: $1",
27-
"editaccount-label-email": "Neue E-Mail-Adresse setzen",
28-
"editaccount-label-pass": "Neues Passwort setzen",
29-
"editaccount-label-realname": "Neuen bürgerlichen Namen setzen",
27+
"editaccount-label-email": "Neue E-Mail-Adresse setzen:",
28+
"editaccount-label-pass": "Neues Passwort setzen:",
29+
"editaccount-label-realname": "Neuen bürgerlichen Namen setzen:",
3030
"editaccount-label-clearunsub": "Abbestellt",
3131
"editaccount-label-toggleadopt": "Status des Adoptierenden ändern (für AutomaticWikiAdopt):",
3232
"editaccount-label-toggleadopt-prevent": "Automatische Adoption verhindern",
@@ -47,7 +47,7 @@
4747
"editaccount-success-pass": "Das Passwort des Benutzerkontos $1 wurde erfolgreich geändert.",
4848
"editaccount-success-realname": "Der bürgerliche Name des Benutzerkontos $1 wurde erfolgreich geändert.",
4949
"editaccount-success-unsub": "Das Bit zum Abbestellen des Benutzerkontos $1 wurde erfolgreich entfernt.",
50-
"editaccount-success-disable": "Das Bit zum Deaktivieren des Benutzerkontos $1 wurde erfolgreich entfernt.",
50+
"editaccount-success-disable": "Das Benutzerkonto $1 wurde reaktiviert.",
5151
"editaccount-success-toggleadopt": "Die Berechtigung zur Adoption des Benutzerkontos $1 wurde erfolgreich entfernt.",
5252
"editaccount-success-close": "Das Benutzerkonto $1 wurde erfolgreich deaktiviert.",
5353
"editaccount-error-email": "Die E-Mail-Adresse des Benutzerkontos wurde nicht geändert. Versuche es bitte erneut oder kontaktiere den Systemadministrator.",
@@ -60,7 +60,7 @@
6060
"editaccount-remove-avatar-fail": "Der Avatar konnte nicht automatisch entfernt werden.",
6161
"editaccount-requested": "Hinweis: Benutzer hat Kontoschließung beantragt",
6262
"editaccount-not-requested": "ACHTUNG: Benutzer hat keine Kontoschließung beantragt",
63-
"editaccount-label-account-status": "'''Status des Benutzerkontos''': $1",
63+
"editaccount-label-account-status": "'''Status''': $1",
6464
"editaccount-label-email-status": "'''E-Mail-Status''': $1",
6565
"editaccount-status-confirmed": "Bestätigt",
6666
"editaccount-status-unconfirmed": "Unbestätigt",

‎i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"editaccount-success-pass": "Changed password for account $1.",
4141
"editaccount-success-realname": "Changed real name for account $1.",
4242
"editaccount-success-unsub": "Removed unsubscribe bit for account $1.",
43-
"editaccount-success-disable": "Removed disabled bit for account $1.",
43+
"editaccount-success-disable": "Account $1 has been reactivated.",
4444
"editaccount-success-toggleadopt": "Toggled adoption eligibility status for account $1.",
4545
"editaccount-success-close": "Disabled account $1.",
4646
"editaccount-error-email": "E-mail was not changed. Try again or contact the Tech Team.",

‎includes/specials/SpecialEditAccount.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ public function execute( $par ) {
262262

263263
// HTML output
264264
$out->addTemplate( $tmpl );
265+
$out->addModules("ext.editAccount");
265266
$out->addModules("ext.editAccount.displayuser");
266267
}
267268

‎modules/editAccount.css

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.edit-account-card {
2+
margin-bottom: 1rem;
3+
}
4+
5+
.edit-account-card-header {
6+
font-size: large;
7+
font-weight: bold;
8+
}
9+
10+
.edit-account-form-fields {
11+
display: table;
12+
margin-bottom: 1rem;
13+
}
14+
15+
.edit-account-form-input-text {
16+
width: 300px;
17+
}
18+
19+
.edit-account-form-row {
20+
display: table-row;
21+
}
22+
23+
.edit-account-form-cell {
24+
display: table-cell;
25+
padding-right: 1.5rem;
26+
margin-bottom: 0.3rem;
27+
}
28+
29+
/* edit account*/
30+
.edit-account-user-info {
31+
margin-bottom: 1rem;
32+
}
33+
34+
/* close account */

‎templates/displayuser.tmpl.php

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -32,86 +32,85 @@ public function execute() {
3232
$isUnsub = $this->data['isUnsub'];
3333
$disabled = $this->data['disabled'];
3434
$isDisabled = $this->data['isDisabled'];
35-
?>
36-
<!-- s:<?php echo __FILE__ ?> -->
37-
<small><a href="<?php echo $returnURL; ?>"><?php echo wfMessage( 'editaccount-return' )->plain() ?></a><?php echo wfMessage( 'pipe-separator' )->plain() . $logLink ?></small>
38-
<?php if ( $status !== null ) { ?>
39-
<fieldset>
40-
<legend><?php echo wfMessage( 'editaccount-status' )->plain() ?></legend>
41-
<?php
42-
if ( $status ) {
43-
echo Xml::element( 'span', [ 'style' => 'color: darkgreen; font-weight: bold;' ], $statusMsg );
44-
} else {
45-
echo Xml::element( 'span', [ 'style' => 'color: #fe0000; font-weight: bold;' ], $statusMsg );
46-
}
4735

48-
if ( !empty( $statusMsg2 ) ) {
49-
echo Xml::element( 'span', [ 'style' => 'color: #fe0000; font-weight: bold;' ], $statusMsg2 );
36+
if ( $status !== null ) {
37+
if ( $status ) {
38+
echo Xml::element( 'div', [ 'class' => 'successbox' ], $statusMsg );
39+
} else {
40+
echo Xml::element( 'div', [ 'class' => 'errorbox' ], $statusMsg );
41+
}
42+
if ( !empty( $statusMsg2 ) ) {
43+
echo Xml::element( 'div', [ 'class' => 'errorbox' ], $statusMsg2 );
44+
}
5045
}
51-
?>
52-
</fieldset>
53-
<?php } ?>
54-
<fieldset>
55-
<legend><?php echo wfMessage( 'editaccount-frame-account', $user )->escaped() ?></legend>
56-
<div class="edit-account-user-info">
57-
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-user-id', $userId )->parse(); ?></div>
58-
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-user-reg-date', $userReg )->parse(); ?></div>
59-
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-label-account-status', $userStatus )->parse(); ?></div>
60-
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-label-email-status', $emailStatus )->parse(); ?></div>
61-
<div class="edit-account-user-info-row"><?php echo $changeEmailRequested; ?><br />
62-
</div>
63-
<form method="post" action="" id="EditAccountForm">
64-
<div>
65-
<input type="radio" id="wpActionSetEmail" name="wpAction" value="setemail" />
66-
<label for="wpActionSetEmail"><?php echo wfMessage( 'editaccount-label-email' )->escaped() ?></label>
67-
<input type="text" name="wpNewEmail" value="<?php echo $userEmail ?>" />
68-
</div>
69-
70-
<div>
71-
<input type="radio" id="wpActionSetPass" name="wpAction" value="setpass" />
72-
<label for="wpActionSetPass"><?php echo wfMessage( 'editaccount-label-pass' )->escaped() ?></label>
73-
<input type="text" name="wpNewPass" />
74-
</div>
46+
?>
47+
<!-- s:<?php echo __FILE__ ?> -->
48+
<div class="edit-account-card" id="edit-account-edit-card">
49+
<div class="edit-account-card-header"><?php echo wfMessage( 'editaccount-frame-account', $user )->escaped() ?></div>
50+
<div class="edit-account-card-body">
51+
<div class="edit-account-user-info">
52+
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-user-id', $userId )->parse(); ?></div>
53+
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-user-reg-date', $userReg )->parse(); ?></div>
54+
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-label-account-status', $userStatus )->parse(); ?></div>
55+
<div class="edit-account-user-info-row"><?php echo wfMessage( 'editaccount-label-email-status', $emailStatus )->parse(); ?></div>
56+
<div class="edit-account-user-info-row"><?php echo $changeEmailRequested; ?></div>
57+
</div>
58+
<form method="post" action="" id="edit-account-edit-form">
59+
<div class="edit-account-form-fields">
60+
<div class="edit-account-form-row">
61+
<input type="radio" id="wpActionSetEmail" name="wpAction" value="setemail" class="edit-account-form-cell" />
62+
<label for="wpActionSetEmail" class="edit-account-form-cell"><?php echo wfMessage( 'editaccount-label-email' )->escaped() ?></label>
63+
<input type="text" name="wpNewEmail" value="<?php echo $userEmail ?>" class="edit-account-form-cell edit-account-form-input-text"/>
64+
</div>
7565

76-
<div>
77-
<input type="radio" id="wpActionSetRealName" name="wpAction" value="setrealname" <?php echo $disabled; ?> />
78-
<label for="wpActionSetRealName"><?php echo wfMessage( 'editaccount-label-realname' )->escaped() ?></label>
79-
<input type="text" name="wpNewRealName" value="<?php echo $userRealName ?>" <?php echo $disabled; ?> />
80-
</div>
66+
<div class="edit-account-form-row">
67+
<input type="radio" id="wpActionSetPass" name="wpAction" value="setpass" class="edit-account-form-cell"/>
68+
<label for="wpActionSetPass" class="edit-account-form-cell"><?php echo wfMessage( 'editaccount-label-pass' )->escaped() ?></label>
69+
<input type="text" name="wpNewPass" class="edit-account-form-cell edit-account-form-input-text" />
70+
</div>
8171

82-
<?php if ( class_exists( 'AutoWikiAdoption' ) ) {
83-
/* We don't use that extension, so I'm hiding this option from the GUI --JP 20 October 2012 */ ?>
84-
<div>
85-
<input type="radio" id="wpActionToggleAdopt" name="wpAction" value="toggleadopter" />
86-
<label for="wpActionToggleAdopt"><?php echo wfMessage( 'editaccount-label-toggleadopt' )->escaped() ?></label>
87-
<span><?php echo ( $isAdopter ) ? wfMessage( 'editaccount-label-toggleadopt-prevent' )->escaped() : wfMessage( 'editaccount-label-toggleadopt-allow' )->escaped() ?></span>
88-
</div>
89-
<?php } ?>
72+
<div class="edit-account-form-row">
73+
<input type="radio" id="wpActionSetRealName" name="wpAction" value="setrealname" class="edit-account-form-cell" <?php echo $disabled; ?> />
74+
<label for="wpActionSetRealName" class="edit-account-form-cell"><?php echo wfMessage( 'editaccount-label-realname' )->escaped() ?></label>
75+
<input type="text" name="wpNewRealName" value="<?php echo $userRealName ?>" <?php echo $disabled; ?> class="edit-account-form-cell edit-account-form-input-text" />
76+
</div>
9077

91-
<?php if ( $isUnsub ) { ?>
92-
<div>
93-
<input type="radio" id="wpActionClearUnsub" name="wpAction" value="clearunsub" <?php echo $disabled; ?> />
94-
<label for="wpActionClearUnsub"><?php echo wfMessage( 'editaccount-submit-clearunsub' )->escaped() ?></label>
95-
</div>
96-
<?php }
97-
// end unsub ?>
78+
<?php if ( class_exists( 'AutoWikiAdoption' ) ) {
79+
/* We don't use that extension, so I'm hiding this option from the GUI --JP 20 October 2012 */ ?>
80+
<div class="edit-account-form-row">
81+
<input type="radio" id="wpActionToggleAdopt" name="wpAction" value="toggleadopter" class="edit-account-form-cell" />
82+
<label for="wpActionToggleAdopt" class="edit-account-form-cell"><?php echo wfMessage( 'editaccount-label-toggleadopt' )->escaped() ?></label>
83+
<span class="edit-account-form-cell"><?php echo ( $isAdopter ) ? wfMessage( 'editaccount-label-toggleadopt-prevent' )->escaped() : wfMessage( 'editaccount-label-toggleadopt-allow' )->escaped() ?></span>
84+
</div>
85+
<?php } ?>
9886

99-
<div>
100-
<label for="wpReason"><?php echo wfMessage( 'editaccount-label-reason' )->escaped() ?></label>
101-
<input id="wpReason" name="wpReason" type="text" />
102-
</div>
87+
<?php if ( $isUnsub ) { ?>
88+
<div class="edit-account-form-row">
89+
<input type="radio" id="wpActionClearUnsub" name="wpAction" value="clearunsub" <?php echo $disabled; ?> class="edit-account-form-cell" />
90+
<label for="wpActionClearUnsub" class="edit-account-form-cell"><?php echo wfMessage( 'editaccount-submit-clearunsub' )->escaped() ?></label>
91+
</div>
92+
<?php }
93+
// end unsub ?>
10394

104-
<div>
105-
<input type="submit" value="<?php echo wfMessage( 'editaccount-submit-button' )->escaped() ?>" />
106-
</div>
95+
<div class="edit-account-form-row">
96+
<div class="edit-account-form-cell"></div>
97+
<label for="wpReason" class="edit-account-form-cell"><?php echo wfMessage( 'editaccount-label-reason' )->escaped() ?></label>
98+
<input id="wpReason" name="wpReason" type="text" class="edit-account-form-cell edit-account-form-input-text" />
99+
</div>
100+
</div>
101+
<div>
102+
<input type="submit" value="<?php echo wfMessage( 'editaccount-submit-button' )->escaped() ?>" />
103+
</div>
107104

108-
<input type="hidden" name="wpUserName" value="<?php echo $user_hsc ?>" />
109-
</form>
110-
</fieldset>
111-
<fieldset>
112-
<legend><?php echo wfMessage( 'editaccount-frame-close', $user )->escaped() ?></legend>
105+
<input type="hidden" name="wpUserName" value="<?php echo $user_hsc ?>" />
106+
</form>
107+
</div>
108+
</div>
109+
<div class="edit-account-card" id="edit-account-close-card">
110+
<div class="edit-account-card-header"><?php echo wfMessage( 'editaccount-frame-close', $user )->escaped() ?></div>
111+
<div class="edit-account-card-body">
113112
<p><?php echo wfMessage( 'editaccount-usage-close' )->plain() ?></p>
114-
<form method="post" action="">
113+
<form method="post" action="" id="edit-account-close-form">
115114
<input type="submit" value="<?php echo wfMessage( 'editaccount-submit-close' )->plain() ?>" <?php echo $disabled; ?> />
116115
<input type="hidden" name="wpAction" value="closeaccount" />
117116
<input type="hidden" name="wpUserName" value="<?php echo $user_hsc ?>" />
@@ -125,7 +124,8 @@ public function execute() {
125124
</form>
126125
<?php }
127126
// end undisable ?>
128-
</fieldset>
127+
</div>
128+
</div>
129129
<!-- e:<?php echo __FILE__ ?> -->
130130
<?php
131131
}

‎templates/selectuser.tmpl.php

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,26 @@ public function execute() {
1818
$statusMsg = $this->data['statusMsg'];
1919
$statusMsg2 = $this->data['statusMsg2'];
2020
$user_hsc = $this->data['user_hsc'];
21+
22+
if ( $status !== null ) {
23+
if ( $status ) {
24+
echo Xml::element( 'div', [ 'class' => 'successbox' ], $statusMsg );
25+
} else {
26+
echo Xml::element( 'div', [ 'class' => 'errorbox' ], $statusMsg );
27+
}
28+
if ( !empty( $statusMsg2 ) ) {
29+
echo Xml::element( 'div', [ 'class' => 'errorbox' ], $statusMsg2 );
30+
}
31+
}
2132
?>
2233
<!-- s:<?php echo __FILE__ ?> -->
23-
<?php if ( $status !== null ) { ?>
24-
<fieldset>
25-
<legend><?php echo wfMessage( 'editaccount-status' )->plain(); ?></legend>
26-
<?php
27-
if ( $status ) {
28-
echo Xml::element( 'span', [ 'style' => 'color: darkgreen; font-weight: bold;' ], $statusMsg );
29-
} else {
30-
echo Xml::element( 'span', [ 'style' => 'color: #fe0000; font-weight: bold;' ], $statusMsg );
31-
}
32-
if ( !empty( $statusMsg2 ) ) {
33-
echo Xml::element( 'span', [ 'style' => 'color: #fe0000; font-weight: bold;' ], $statusMsg2 );
34-
}
35-
?>
36-
</fieldset>
37-
<?php } ?>
38-
<form method="post" id="editaccountSelectForm" action="">
39-
<fieldset>
40-
<input type="text" name="wpUserName" value="<?php echo $user_hsc; ?>" />
41-
<input type="submit" value="<?php echo wfMessage( 'editaccount-submit-account' )->plain(); ?>" />
42-
<input type="hidden" name="wpAction" value="displayuser" />
43-
</fieldset>
44-
</form>
34+
<form method="post" id="edit-account-select-form" action="">
35+
<fieldset>
36+
<input type="text" name="wpUserName" value="<?php echo $user_hsc; ?>" />
37+
<input type="submit" value="<?php echo wfMessage( 'editaccount-submit-account' )->plain(); ?>" />
38+
<input type="hidden" name="wpAction" value="displayuser" />
39+
</fieldset>
40+
</form>
4541
<!-- e:<?php echo __FILE__ ?> -->
4642
<?php
4743
}

0 commit comments

Comments
 (0)