Revision: 51823
Author: siebrand
Date: 2009-06-13 15:45:03 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
* tweak 'edittoolbar' message
* stylize.php, trailing whitespace removed
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php
trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.hooks.php
trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.hooks.php
trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.php
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-06-13 14:27:16 UTC (rev 51822)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-06-13 15:45:03 UTC (rev 51823)
@@ -9,14 +9,14 @@
class EditToolbarHooks {
/* Static Functions */
-
+
/**
* EditPageBeforeEditToolbar hook
* Intercept the display of the toolbar, replacing the content of
$toolbar
*/
public static function intercept( &$toolbar ) {
global $wgUser, $wgEditToolbarGlobalEnable,
$wgEditToolbarUserEnable;
-
+
// Checks if...
if (
// The following is NOT true
@@ -28,7 +28,7 @@
// Toolbar is per-user enablable
$wgEditToolbarUserEnable &&
// And this user has enabled it
- $wgUser->getOption( 'usebetatoolbar' )
+ $wgUser->getOption( 'usebetatoolbar' )
)
)
) {
@@ -37,7 +37,7 @@
}
// Replaces stock toolbar with new toolbar container
$toolbar = '<div id="edittoolbar"></div>';
-
+
// Add JS and CSS
global $wgEditToolbarStyleVersion;
UsabilityInitiativeHooks::addScript(
@@ -174,14 +174,14 @@
// Continue
return true;
}
-
+
/**
* GetPreferences hook
* Add toolbar related items to the preferences
*/
public static function addPreferences( $user, $defaultPreferences ) {
global $wgEditToolbarGlobalEnable, $wgEditToolbarUserEnable;
-
+
// Checks if...
if (
// Toolbar is NOT globablly enabled
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php
2009-06-13 14:27:16 UTC (rev 51822)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php
2009-06-13 15:45:03 UTC (rev 51823)
@@ -12,7 +12,7 @@
* @author Trevor Parscal
*/
$messages['en'] = array(
- 'edittoolbar' => 'Editing Toolbar',
+ 'edittoolbar' => 'Editing toolbar',
'edittoolbar-desc' => 'Edit page toolbar with enhanced usability',
'edittoolbar-preference' => 'Enable enhanced editing toolbar',
'edittoolbar-loading' => 'Loading...',
Modified: trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.hooks.php
2009-06-13 14:27:16 UTC (rev 51822)
+++ trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.hooks.php
2009-06-13 15:45:03 UTC (rev 51823)
@@ -7,16 +7,16 @@
*/
class EditWarningHooks {
-
+
/* Static Functions */
-
+
/**
* AjaxAddScript hook
* Initializes the component
*/
public static function initialize() {
global $wgEditWarningStyleVersion;
-
+
// Adds script to document
UsabilityInitiativeHooks::addScript(
'EditWarning/EditWarning.js', $wgEditWarningStyleVersion
Modified: trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.hooks.php
2009-06-13 14:27:16 UTC (rev 51822)
+++ trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.hooks.php
2009-06-13 15:45:03 UTC (rev 51823)
@@ -7,22 +7,22 @@
*/
class PrefStatsHooks {
-
+
/* Static Functions */
public static function schema() {
global $wgExtNewTables;
$wgExtNewTables[] = array( 'prefstats',
dirname( __FILE__ ) . '/PrefStats.sql' );
}
-
- public static function save($user, &$options) {
+
+ public static function save( $user, &$options ) {
global $wgPrefStatsEnable, $wgPrefStatsTrackPrefs;
- if( !$wgPrefStatsEnable )
+ if ( !$wgPrefStatsEnable )
return;
-
+
$dbw = wfGetDb( DB_MASTER );
- foreach( $wgPrefStatsTrackPrefs as $pref => $value ) {
- if( isset( $options[$pref] ) && $options[$pref] ==
$value )
+ foreach ( $wgPrefStatsTrackPrefs as $pref => $value ) {
+ if ( isset( $options[$pref] ) && $options[$pref] ==
$value )
// FIXME: if the user disables and re-enables,
// we're not tracking that
$dbw->insert( 'prefstats', array(
@@ -31,15 +31,15 @@
'ps_value' => $value,
'ps_start' => $dbw->timestamp(
wfTimestamp() ),
'ps_end' => null,
- 'ps_duration' => -1 //hack
+ 'ps_duration' => - 1 // hack
), __METHOD__, array( 'IGNORE' ) );
else {
$start = $dbw->selectField( 'prefstats',
- 'ps_start', array(
+ 'ps_start', array(
'ps_user' => $user->getId(),
'ps_pref' => $pref
), __METHOD__ );
- if( $start ) {
+ if ( $start ) {
$duration = wfTimestamp( TS_UNIX ) -
wfTimestamp( TS_UNIX, $start );
$dbw->update( 'prefstats', array(
@@ -50,5 +50,5 @@
}
}
}
-
+
}
Modified: trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.php
===================================================================
--- trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.php
2009-06-13 14:27:16 UTC (rev 51822)
+++ trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.php
2009-06-13 15:45:03 UTC (rev 51823)
@@ -17,7 +17,7 @@
/* Configuration */
-//.Set to false to disable tracking
+// .Set to false to disable tracking
$wgPrefStatsEnable = true;
// array('prefname' => 'value')
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-06-13 14:27:16 UTC (rev 51822)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-06-13 15:45:03 UTC (rev 51823)
@@ -9,7 +9,7 @@
class UsabilityInitiativeHooks {
/* Static Members */
-
+
private static $messages = array();
private static $styles = array();
private static $scripts = array(
@@ -19,7 +19,7 @@
array( 'src' => 'Resources/jquery.async.js', 'version' => 1 ),
array( 'src' => 'Resources/messages.js', 'version' => 1 ),
);
-
+
/* Static Functions */
/**
@@ -28,7 +28,7 @@
*/
public static function addJs( $out ) {
global $wgScriptPath, $wgJsMimeType;
-
+
// Loops over each script
foreach ( self::$scripts as $script ) {
// Add javascript to document
@@ -66,14 +66,14 @@
// Continue
return true;
}
-
+
/**
* BeforePageDisplay hook
* Adds styles
*/
public static function addCss( $out ) {
global $wgScriptPath, $wgJsMimeType;
-
+
// Loops over each style
foreach ( self::$styles as $style ) {
// Add css for various styles
@@ -89,7 +89,7 @@
}
return true;
}
-
+
/**
* Adds a reference to a javascript file to the head of the document
* @param string $src Path to the file relative to this extension's
folder
@@ -98,7 +98,7 @@
public static function addScript( $src, $version = '' ) {
self::$scripts[] = array( 'src' => $src, 'version' => $version
);
}
-
+
/**
* Adds a reference to a css file to the head of the document
* @param string $src Path to the file relative to this extension's
folder
@@ -107,7 +107,7 @@
public static function addStyle( $src, $version = '' ) {
self::$styles[] = array( 'src' => $src, 'version' => $version );
}
-
+
/**
* Adds internationalized message definitions to the document for access
* via javascript using the gM() function
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
