* Change tabs onmousedown
* RTL fixes
* Properly disable email options
* more!
* (bug 3163) Full translation of LanguageBr
* (bug 3617) Update for portuguese language (pt)
* Namespaces hacks on LanguagePl
* (bug 3163) Full translation of LanguageBr
* (bug 3617) Update for portuguese language (pt)
* Namespaces hacks on LanguagePl
+* New preferences design and reorganisation
$this->mDate = $request->getVal( 'wpDate' );
$this->mUserEmail = $request->getVal( 'wpUserEmail' );
$this->mRealName = $wgAllowRealName ? $request->getVal( 'wpRealName' ) : '';
$this->mDate = $request->getVal( 'wpDate' );
$this->mUserEmail = $request->getVal( 'wpUserEmail' );
$this->mRealName = $wgAllowRealName ? $request->getVal( 'wpRealName' ) : '';
- $this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 1 : 0;
+ $this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 0 : 1;
$this->mNick = $request->getVal( 'wpNick' );
$this->mUserLanguage = $request->getVal( 'wpUserLanguage' );
$this->mUserVariant = $request->getVal( 'wpUserVariant' );
$this->mNick = $request->getVal( 'wpNick' );
$this->mUserLanguage = $request->getVal( 'wpUserLanguage' );
$this->mUserVariant = $request->getVal( 'wpUserVariant' );
- function getToggle( $tname, $trailer = false) {
+ function getToggle( $tname, $trailer = false, $disabled = false ) {
global $wgUser, $wgLang;
$this->mUsedToggles[$tname] = true;
$ttext = $wgLang->getUserToggle( $tname );
$checked = $wgUser->getOption( $tname ) == 1 ? ' checked="checked"' : '';
global $wgUser, $wgLang;
$this->mUsedToggles[$tname] = true;
$ttext = $wgLang->getUserToggle( $tname );
$checked = $wgUser->getOption( $tname ) == 1 ? ' checked="checked"' : '';
+ $disabled = $disabled ? ' disabled="disabled"' : '';
$trailer = $trailer ? $trailer : '';
$trailer = $trailer ? $trailer : '';
- return "<div class='toggle'><input type='checkbox' value='1' id=\"$tname\" name=\"wpOp$tname\"$checked />" .
+ return "<div class='toggle'><input type='checkbox' value='1' id=\"$tname\" name=\"wpOp$tname\"$checked$disabled />" .
" <span class='toggletext'><label for=\"$tname\">$ttext</label>$trailer</span></div>\n";
}
" <span class='toggletext'><label for=\"$tname\">$ttext</label>$trailer</span></div>\n";
}
$this->mUserEmail = htmlspecialchars( $this->mUserEmail );
$this->mRealName = htmlspecialchars( $this->mRealName );
$this->mNick = htmlspecialchars( $this->mNick );
$this->mUserEmail = htmlspecialchars( $this->mUserEmail );
$this->mRealName = htmlspecialchars( $this->mRealName );
$this->mNick = htmlspecialchars( $this->mNick );
- if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
+ if ( !$this->mEmailFlag ) { $emfc = 'checked="checked"'; }
if ($wgEmailAuthentication && ($this->mUserEmail != '') ) {
if( $wgUser->getEmailAuthenticationTimestamp() ) {
$emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationTimestamp(), true ) ).'<br />';
if ($wgEmailAuthentication && ($this->mUserEmail != '') ) {
if( $wgUser->getEmailAuthenticationTimestamp() ) {
$emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationTimestamp(), true ) ).'<br />';
+ $disableEmailPrefs = false;
+ $disableEmailPrefs = true;
$skin = $wgUser->getSkin();
$emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
$skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Confirmemail' ),
$skin = $wgUser->getSkin();
$emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
$skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Confirmemail' ),
}
} else {
$emailauthenticated = '';
}
} else {
$emailauthenticated = '';
+ $disableEmailPrefs = false;
}
if ($this->mUserEmail == '') {
}
if ($this->mUserEmail == '') {
$ps = $this->namespacesCheckboxes();
$ps = $this->namespacesCheckboxes();
- $enotifwatchlistpages = ($wgEnotifWatchlist) ? $this->getToggle( 'enotifwatchlistpages' ) : '';
- $enotifusertalkpages = ($wgEnotifUserTalk) ? $this->getToggle( 'enotifusertalkpages' ) : '';
- $enotifminoredits = ($wgEnotifWatchlist && $wgEnotifMinorEdits) ? $this->getToggle( 'enotifminoredits' ) : '';
- $enotifrevealaddr = (($wgEnotifWatchlist || $wgEnotifUserTalk) && $wgEnotifRevealEditorAddress) ? $this->getToggle( 'enotifrevealaddr' ) : '';
+ $enotifwatchlistpages = ($wgEnotifWatchlist) ? $this->getToggle( 'enotifwatchlistpages', false, $disableEmailPrefs ) : '';
+ $enotifusertalkpages = ($wgEnotifUserTalk) ? $this->getToggle( 'enotifusertalkpages', false, $disableEmailPrefs ) : '';
+ $enotifminoredits = ($wgEnotifWatchlist && $wgEnotifMinorEdits) ? $this->getToggle( 'enotifminoredits', false, $disableEmailPrefs ) : '';
+ $enotifrevealaddr = (($wgEnotifWatchlist || $wgEnotifUserTalk) && $wgEnotifRevealEditorAddress) ? $this->getToggle( 'enotifrevealaddr', false, $disableEmailPrefs ) : '';
$prefs_help_email_enotif = ( $wgEnotifWatchlist || $wgEnotifUserTalk) ? ' ' . wfMsg('prefs-help-email-enotif') : '';
$prefs_help_realname = '';
$prefs_help_email_enotif = ( $wgEnotifWatchlist || $wgEnotifUserTalk) ? ' ' . wfMsg('prefs-help-email-enotif') : '';
$prefs_help_realname = '';
if ($wgAllowRealName) {
$wgOut->addHTML(
$this->addRow(
if ($wgAllowRealName) {
$wgOut->addHTML(
$this->addRow(
- wfMsg('yourrealname'),
- "<input type='text' name='wpRealName' value=\"{$this->mRealName}\" size='25' />"
+ '<label for="wpRealName">' . wfMsg('yourrealname') . '</label>',
+ "<input type='text' name='wpRealName' id='wpRealName' value=\"{$this->mRealName}\" size='25' />"
)
);
}
if ($wgEnableEmail) {
$wgOut->addHTML(
$this->addRow(
)
);
}
if ($wgEnableEmail) {
$wgOut->addHTML(
$this->addRow(
- wfMsg( 'youremail' ),
- "<input type='text' name='wpUserEmail' value=\"{$this->mUserEmail}\" size='25' />"
+ '<label for="wpUserEmail">' . wfMsg( 'youremail' ) . '</label>',
+ "<input type='text' name='wpUserEmail' id='wpUserEmail' value=\"{$this->mUserEmail}\" size='25' />"
)
);
}
$wgOut->addHTML(
$this->addRow(
)
);
}
$wgOut->addHTML(
$this->addRow(
- wfMsg( 'yournick' ),
- "<input type='text' name='wpNick' value=\"{$this->mNick}\" size='25' />"
+ '<label for="wpNick">' . wfMsg( 'yournick' ) . '</label>',
+ "<input type='text' name='wpNick' id='wpNick' value=\"{$this->mNick}\" size='25' />"
) .
# FIXME: The <input> part should be where the is, getToggle() needs
# to be changed to out return its output in two parts. -ævar
) .
# FIXME: The <input> part should be where the is, getToggle() needs
# to be changed to out return its output in two parts. -ævar
$selbox .= "<option value=\"$code\"$sel>$code - $name</option>\n";
}
}
$selbox .= "<option value=\"$code\"$sel>$code - $name</option>\n";
}
}
- $wgOut->addHTML( $this->addRow( wfMsg('yourlanguage'), "<select name='wpUserLanguage'>$selbox</select>" ));
+ $wgOut->addHTML(
+ $this->addRow(
+ '<label for="wpUserLanguage">' . wfMsg('yourlanguage') . '</label>',
+ "<select name='wpUserLanguage' id='wpUserLanguage'>$selbox</select>"
+ )
+ );
/* see if there are multiple language variants to choose from*/
if(!$wgDisableLangConversion) {
/* see if there are multiple language variants to choose from*/
if(!$wgDisableLangConversion) {
$enotifwatchlistpages.
$enotifusertalkpages.
$enotifminoredits );
$enotifwatchlistpages.
$enotifusertalkpages.
$enotifminoredits );
- if ($wgEnableUserEmail) {
- $emf = wfMsg( 'emailflag' );
- $wgOut->addHTML(
- "<div><input type='checkbox' $emfc value='1' name='wpEmailFlag' id='wpEmailFlag' /> <label for='wpEmailFlag'>$emf</label></div>" );
- }
+ if ($wgEnableUserEmail) {
+ $emf = wfMsg( 'emailflag' );
+ $disabled = $disableEmailPrefs ? ' disabled="disabled"' : '';
+ $wgOut->addHTML(
+ "<div><input type='checkbox' $emfc $disabled value='1' name='wpEmailFlag' id='wpEmailFlag' /> <label for='wpEmailFlag'>$emf</label></div>" );
+ }
$wgOut->addHTML( '</fieldset>' );
}
$wgOut->addHTML( '</fieldset>' );
}
'timezoneoffset' => 'Offset¹',
'servertime' => 'Server time',
'guesstimezone' => 'Fill in from browser',
'timezoneoffset' => 'Offset¹',
'servertime' => 'Server time',
'guesstimezone' => 'Fill in from browser',
-'emailflag' => 'Disable email from other users',
+'emailflag' => 'Enable email from other users',
'defaultns' => 'Search in these namespaces by default:',
'default' => 'default',
'files' => 'Files',
'defaultns' => 'Search in these namespaces by default:',
'default' => 'default',
'files' => 'Files',
if(i == 0) li.className = 'selected';
var a = document.createElement('a');
a.href = '#' + sections[i].secid;
if(i == 0) li.className = 'selected';
var a = document.createElement('a');
a.href = '#' + sections[i].secid;
- a.onclick = uncoversection;
+ a.onmousedown = a.onclick = uncoversection;
a.appendChild(document.createTextNode(sections[i].text));
a.secid = sections[i].secid;
li.appendChild(a);
a.appendChild(document.createTextNode(sections[i].text));
a.secid = sections[i].secid;
li.appendChild(a);
margin: 0;
padding: 0;
width: 100%;
margin: 0;
padding: 0;
width: 100%;
}
#preftoc li {
margin: 1px -2px 1px 2px;
}
#preftoc li {
margin: 1px -2px 1px 2px;
}
#prefcontrol {
padding-top: 2em;
}
#prefcontrol {
padding-top: 2em;
}
#preferences {
margin: 0;
border: 1px solid #aaa;
}
#preferences {
margin: 0;
border: 1px solid #aaa;
padding: 1.5em;
background-color: #F9F9F9;
}
padding: 1.5em;
background-color: #F9F9F9;
}
margin-top: 0;
background-color: #FFC1C1;
padding: .2em .7em;
margin-top: 0;
background-color: #FFC1C1;
padding: .2em .7em;
}
.btnSavePrefs {
font-weight: bold;
}
.btnSavePrefs {
font-weight: bold;
+ padding-left: .3em;
+ padding-right: .3em;
}
.preferences-save-success {
}
.preferences-save-success {
* html #column-one { right: 0; }
/* js pref toc */
* html #column-one { right: 0; }
/* js pref toc */
-#preftoc { float: right; }
-/* workaround for moz bug, displayed bullets on left side */
-#preftoc li { list-style: none; }
-#prefcontrol { float: right; }
-fieldset.prefsection,
-fieldset.operaprefsection {
- margin-left: 0 !important;
- margin-right: 15em;
+
+#preftoc {
+ margin-right: 1em;
+}
+
+.preferences-save-success, #preftoc li, .prefsection fieldset {
+ float: right;
+.prefsection {
+ padding-right: 2em;
+}
+
+/* workaround for moz bug, displayed bullets on left side */
+
#toc ul {
text-align: right;
}
#toc ul {
text-align: right;
}