[MediaWiki-CVS] SVN: [89868] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89868 Revision: 89868 Author: ialex Date: 2011-06-11 06:51:56 + (Sat, 11 Jun 2011) Log Message: --- svn:eol-style native Property Changed: trunk/extensions/CodeEditor/modules/ace/LICENSE trunk/extensions/MobileFrontend/library/WURFL/Xml/wurfl-patch.rng trunk/extensions/MobileFrontend/library/WURFL/Xml/wurfl.rng trunk/extensions/MobileFrontend/library/resources/web_browsers_patch.xml trunk/extensions/MobileFrontend/library/resources/wurfl-config.xml trunk/extensions/MobileFrontend/library/resources/xslt/README trunk/extensions/MobileFrontend/library/resources/xslt/check_wurfl.xsl trunk/extensions/MobileFrontend/library/resources/xslt/convert_2_html.xsl trunk/extensions/MobileFrontend/library/resources/xslt/convert_wurfl_markups.xsl trunk/extensions/MobileFrontend/library/resources/xslt/count_useragents.xsl trunk/extensions/MobileFrontend/library/resources/xslt/get_capabilities.xsl trunk/extensions/MobileFrontend/library/resources/xslt/patch_wurfl.xsl trunk/extensions/MobileFrontend/library/resources/xslt/remove_elements.xml trunk/extensions/MobileFrontend/library/resources/xslt/remove_elements.xsl trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_capabilities.xml trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_into_sql.xsl trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_into_txt.xsl trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_into_xml.xsl trunk/extensions/MobileFrontend/library/resources/xslt/tidy_config trunk/extensions/StyleGuideDemo/README Property changes on: trunk/extensions/CodeEditor/modules/ace/LICENSE ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/WURFL/Xml/wurfl-patch.rng ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/WURFL/Xml/wurfl.rng ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/web_browsers_patch.xml ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/wurfl-config.xml ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/README ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/check_wurfl.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/convert_2_html.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/convert_wurfl_markups.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/count_useragents.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/get_capabilities.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/patch_wurfl.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/remove_elements.xml ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/remove_elements.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_capabilities.xml ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_into_sql.xsl ___ Added: svn:eol-style + native Property changes on: trunk/extensions/MobileFrontend/library/resources/xslt/roll_out_into_txt.xsl
[MediaWiki-CVS] SVN: [89869] trunk/phase3/includes/Skin.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89869
Revision: 89869
Author: ialex
Date: 2011-06-11 07:02:34 + (Sat, 11 Jun 2011)
Log Message:
---
Changed more magic __get method calls to accessors, were throwing notices
Modified Paths:
--
trunk/phase3/includes/Skin.php
Modified: trunk/phase3/includes/Skin.php
===
--- trunk/phase3/includes/Skin.php 2011-06-11 06:51:56 UTC (rev 89868)
+++ trunk/phase3/includes/Skin.php 2011-06-11 07:02:34 UTC (rev 89869)
@@ -511,7 +511,7 @@
function getCategoryLinks() {
global $wgUseCategoryBrowser, $wgContLang;
- $out = $this-getContext()-output;
+ $out = $this-getContext()-getOutput();
if ( count( $out-mCategoryLinks ) == 0 ) {
return '';
@@ -601,7 +601,7 @@
}
function getCategories() {
- $out = $this-getContext()-output;
+ $out = $this-getContext()-getOutput();
$catlinks = $this-getCategoryLinks();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89870] trunk/extensions/Translate/MessageChecks.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89870
Revision: 89870
Author: purodha
Date: 2011-06-11 07:13:37 + (Sat, 11 Jun 2011)
Log Message:
---
Fix a typing error in a comment.
Modified Paths:
--
trunk/extensions/Translate/MessageChecks.php
Modified: trunk/extensions/Translate/MessageChecks.php
===
--- trunk/extensions/Translate/MessageChecks.php2011-06-11 07:02:34 UTC
(rev 89869)
+++ trunk/extensions/Translate/MessageChecks.php2011-06-11 07:13:37 UTC
(rev 89870)
@@ -47,7 +47,7 @@
private static $globalBlacklist = null;
/**
-* Cosntructs a suitable checker for given message group.
+* Constructs a suitable checker for given message group.
* @param $group MessageGroup
*/
public function __construct( MessageGroup $group ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89871] trunk/phase3/includes/installer/LocalSettingsGenerator.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89871
Revision: 89871
Author: reedy
Date: 2011-06-11 07:33:35 + (Sat, 11 Jun 2011)
Log Message:
---
Followup r88873, remove setting of $wgEnableCreativeCommonsRdf in
LocalSettingsGenerator
Modified Paths:
--
trunk/phase3/includes/installer/LocalSettingsGenerator.php
Modified: trunk/phase3/includes/installer/LocalSettingsGenerator.php
===
--- trunk/phase3/includes/installer/LocalSettingsGenerator.php 2011-06-11
07:13:37 UTC (rev 89870)
+++ trunk/phase3/includes/installer/LocalSettingsGenerator.php 2011-06-11
07:33:35 UTC (rev 89871)
@@ -322,7 +322,6 @@
## For attaching licensing metadata to pages, and displaying an
## appropriate copyright notice / icon. GNU Free Documentation
## License and Creative Commons licenses are supported so far.
-{$rightsUrl}\$wgEnableCreativeCommonsRdf = true;
\$wgRightsPage = \\; # Set to the title of a wiki page that describes your
license/copyright
\$wgRightsUrl = \{$this-values['wgRightsUrl']}\;
\$wgRightsText = \{$this-values['wgRightsText']}\;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89872] trunk/phase3/includes/Article.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89872
Revision: 89872
Author: ialex
Date: 2011-06-11 07:43:40 + (Sat, 11 Jun 2011)
Log Message:
---
Moved part of action handling functions near other ones
Modified Paths:
--
trunk/phase3/includes/Article.php
Modified: trunk/phase3/includes/Article.php
===
--- trunk/phase3/includes/Article.php 2011-06-11 07:33:35 UTC (rev 89871)
+++ trunk/phase3/includes/Article.php 2011-06-11 07:43:40 UTC (rev 89872)
@@ -1785,6 +1785,122 @@
}
/**
+* Mark this particular edit/page as patrolled
+*/
+ public function markpatrolled() {
+ global $wgOut, $wgRequest;
+
+ $wgOut-setRobotPolicy( 'noindex,nofollow' );
+
+ # If we haven't been given an rc_id value, we can't do anything
+ $rcid = (int) $wgRequest-getVal( 'rcid' );
+
+ if ( !$wgOut-getUser()-matchEditToken( $wgRequest-getVal(
'token' ), $rcid ) ) {
+ $wgOut-showErrorPage( 'sessionfailure-title',
'sessionfailure' );
+ return;
+ }
+
+ $rc = RecentChange::newFromId( $rcid );
+
+ if ( is_null( $rc ) ) {
+ $wgOut-showErrorPage( 'markedaspatrollederror',
'markedaspatrollederrortext' );
+ return;
+ }
+
+ # It would be nice to see where the user had actually come
from, but for now just guess
+ $returnto = $rc-getAttribute( 'rc_type' ) == RC_NEW ?
'Newpages' : 'Recentchanges';
+ $return = SpecialPage::getTitleFor( $returnto );
+
+ $errors = $rc-doMarkPatrolled();
+
+ if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) {
+ $wgOut-showErrorPage( 'rcpatroldisabled',
'rcpatroldisabledtext' );
+
+ return;
+ }
+
+ if ( in_array( array( 'hookaborted' ), $errors ) ) {
+ // The hook itself has handled any output
+ return;
+ }
+
+ if ( in_array( array( 'markedaspatrollederror-noautopatrol' ),
$errors ) ) {
+ $wgOut-setPageTitle( wfMsg( 'markedaspatrollederror' )
);
+ $wgOut-addWikiMsg(
'markedaspatrollederror-noautopatrol' );
+ $wgOut-returnToMain( null, $return );
+
+ return;
+ }
+
+ if ( !empty( $errors ) ) {
+ $wgOut-showPermissionsErrorPage( $errors );
+
+ return;
+ }
+
+ # Inform the user
+ $wgOut-setPageTitle( wfMsg( 'markedaspatrolled' ) );
+ $wgOut-addWikiMsg( 'markedaspatrolledtext',
$rc-getTitle()-getPrefixedText() );
+ $wgOut-returnToMain( null, $return );
+ }
+
+ /**
+* User-interface handler for the watch action.
+* Requires Request to pass a token as of 1.19.
+* @deprecated since 1.18
+*/
+ public function watch() {
+ Action::factory( 'watch', $this )-show();
+ }
+
+ /**
+* Add this page to $wgUser's watchlist
+*
+* This is safe to be called multiple times
+*
+* @return bool true on successful watch operation
+* @deprecated since 1.18
+*/
+ public function doWatch() {
+ global $wgUser;
+ return WatchAction::doWatch( $this-mTitle, $wgUser );
+ }
+
+ /**
+* User interface handler for the unwatch action.
+* Requires Request to pass a token as of 1.19.
+* @deprecated since 1.18
+*/
+ public function unwatch() {
+ Action::factory( 'unwatch', $this )-show();
+ }
+
+ /**
+* Stop watching a page
+* @return bool true on successful unwatch
+* @deprecated since 1.18
+*/
+ public function doUnwatch() {
+ global $wgUser;
+ return WatchAction::doUnwatch( $this-mTitle, $wgUser );
+ }
+
+ /**
+* action=protect handler
+*/
+ public function protect() {
+ $form = new ProtectionForm( $this );
+ $form-execute();
+ }
+
+ /**
+* action=unprotect handler (alias)
+*/
+ public function unprotect() {
+ $this-protect();
+ }
+
+ /**
* Insert a new empty page record for this article.
* This *must* be followed up by creating a revision
* and running $this-updateRevisionOn( ... );
@@ -2324,122 +2440,6 @@
}
/**
-* Mark this particular edit/page as patrolled
-*/
- public function markpatrolled() {
- global $wgOut, $wgRequest;
-
-
[MediaWiki-CVS] SVN: [89873] trunk/phase3/languages/Language.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89873
Revision: 89873
Author: ialex
Date: 2011-06-11 08:03:59 + (Sat, 11 Jun 2011)
Log Message:
---
Removed usage of error suppression operator, also removed function_exists()
check for timezone_open() since we now require PHP 5.2.3
Modified Paths:
--
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===
--- trunk/phase3/languages/Language.php 2011-06-11 07:43:40 UTC (rev 89872)
+++ trunk/phase3/languages/Language.php 2011-06-11 08:03:59 UTC (rev 89873)
@@ -759,9 +759,12 @@
$data = explode( '|', $tz, 3 );
if ( $data[0] == 'ZoneInfo' ) {
- if ( function_exists( 'timezone_open' )
@timezone_open( $data[2] ) !== false ) {
+ wfSuppressWarnings();
+ $userTZ = timezone_open( $data[2] );
+ wfRestoreWarnings();
+ if ( $userTZ !== false ) {
$date = date_create( $ts, timezone_open( 'UTC'
) );
- date_timezone_set( $date, timezone_open(
$data[2] ) );
+ date_timezone_set( $date, $userTZ );
$date = date_format( $date, 'YmdHis' );
return $date;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89874] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89874
Revision: 89874
Author: ialex
Date: 2011-06-11 08:30:19 + (Sat, 11 Jun 2011)
Log Message:
---
* Made Special:RevisionDelete use the local variables stored in the
RequestContext object instead of global ones and removed the $skin member
* Also updated classes in includes/revisiondelete that were using the $skin
member of Special:RevisionDelete
* Handle action=revisiondelete (or rather
action=historysubmitrevisiondelete=1) with an Action object that sets the
RequestContext object of the SpecialPage object, and in this case get the
target Title object through the context instead of $wgTitle
Modified Paths:
--
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/Wiki.php
trunk/phase3/includes/revisiondelete/RevisionDelete.php
trunk/phase3/includes/revisiondelete/RevisionDeleteAbstracts.php
trunk/phase3/includes/specials/SpecialRevisiondelete.php
Added Paths:
---
trunk/phase3/includes/actions/RevisiondeleteAction.php
Modified: trunk/phase3/includes/AutoLoader.php
===
--- trunk/phase3/includes/AutoLoader.php2011-06-11 08:03:59 UTC (rev
89873)
+++ trunk/phase3/includes/AutoLoader.php2011-06-11 08:30:19 UTC (rev
89874)
@@ -250,6 +250,7 @@
# includes/actions
'CreditsAction' = 'includes/actions/CreditsAction.php',
'PurgeAction' = 'includes/actions/PurgeAction.php',
+ 'RevisiondeleteAction' = 'includes/actions/RevisiondeleteAction.php',
'UnwatchAction' = 'includes/actions/WatchAction.php',
'WatchAction' = 'includes/actions/WatchAction.php',
Modified: trunk/phase3/includes/DefaultSettings.php
===
--- trunk/phase3/includes/DefaultSettings.php 2011-06-11 08:03:59 UTC (rev
89873)
+++ trunk/phase3/includes/DefaultSettings.php 2011-06-11 08:30:19 UTC (rev
89874)
@@ -5030,6 +5030,7 @@
*/
$wgActions = array(
'credits' = true,
+ 'revisiondelete' = true,
'purge' = true,
'unwatch' = true,
'watch' = true,
Modified: trunk/phase3/includes/Wiki.php
===
--- trunk/phase3/includes/Wiki.php 2011-06-11 08:03:59 UTC (rev 89873)
+++ trunk/phase3/includes/Wiki.php 2011-06-11 08:30:19 UTC (rev 89874)
@@ -465,11 +465,6 @@
$history = new HistoryPage( $article );
$history-history();
break;
- case 'revisiondelete':
- // For show/hide submission from history page
- $special = SpecialPageFactory::getPage(
'Revisiondelete' );
- $special-execute( '' );
- break;
default:
if ( wfRunHooks( 'UnknownAction', array( $act,
$article ) ) ) {
$this-context-output-showErrorPage(
'nosuchaction', 'nosuchactiontext' );
Added: trunk/phase3/includes/actions/RevisiondeleteAction.php
===
--- trunk/phase3/includes/actions/RevisiondeleteAction.php
(rev 0)
+++ trunk/phase3/includes/actions/RevisiondeleteAction.php 2011-06-11
08:30:19 UTC (rev 89874)
@@ -0,0 +1,53 @@
+?php
+/**
+ * An action that just pass the request to Special:RevisionDelete
+ *
+ * Copyright © 2011 Alexandre Emsenhuber
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA
+ *
+ * @file
+ * @ingroup Actions
+ * @author Alexandre Emsenhuber
+ */
+
+class RevisiondeleteAction extends FormlessAction {
+
+ public function getName() {
+ return 'revisiondelete';
+ }
+
+ public function getRestriction() {
+ return null;
+ }
+
+ public function requiresUnblock() {
+ return false;
+ }
+
+ public function getDescription() {
+ return '';
+ }
+
+ public function onView() {
+ return '';
+ }
+
+
[MediaWiki-CVS] SVN: [89875] trunk/phase3/includes/SpecialPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89875
Revision: 89875
Author: ialex
Date: 2011-06-11 08:40:35 + (Sat, 11 Jun 2011)
Log Message:
---
And I forgot to commit this file in r89874
Modified Paths:
--
trunk/phase3/includes/SpecialPage.php
Modified: trunk/phase3/includes/SpecialPage.php
===
--- trunk/phase3/includes/SpecialPage.php 2011-06-11 08:30:19 UTC (rev
89874)
+++ trunk/phase3/includes/SpecialPage.php 2011-06-11 08:40:35 UTC (rev
89875)
@@ -639,6 +639,16 @@
}
/**
+* Shortcut to get user's language
+*
+* @return Language
+* @since 1.19
+*/
+ public function getLang() {
+ return $this-getContext()-getLang();
+ }
+
+ /**
* Return the full title, including $par
*
* @return Title
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89876] trunk/phase3/tests/qunit/suites/resources/mediawiki.util/ mediawiki.util.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89876
Revision: 89876
Author: krinkle
Date: 2011-06-11 10:37:39 + (Sat, 11 Jun 2011)
Log Message:
---
mediawiki.util.test.js: IE7 doesn't expose the CSSStyleSheet publicly (like it
doesn't for many). Checking object type instead.
Modified Paths:
--
trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
Modified:
trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
===
--- trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
2011-06-11 08:40:35 UTC (rev 89875)
+++ trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
2011-06-11 10:37:39 UTC (rev 89876)
@@ -50,7 +50,7 @@
expect(3);
var a = mw.util.addCSS( '#bodyContent { visibility: hidden; }' );
- ok( a instanceof CSSStyleSheet, 'Object is an instance of
CSSStyleSheet' );
+ equal( typeof a, 'object', 'addCSS returned an object' );
strictEqual( a.disabled, false, 'property disabled is available and
set to false' );
var $b = $('#bodyContent');
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89877] trunk/extensions/LiquidThreads
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89877
Revision: 89877
Author: wikinaut
Date: 2011-06-11 10:51:40 + (Sat, 11 Jun 2011)
Log Message:
---
fix for bug29320 drag to new location: when moving a reply (down under a
thread) to become a new thread and leaving new subject (required) open:
ApiThreadAction crashes with Error: no-valid-subject: undefined
Modified Paths:
--
trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php
trunk/extensions/LiquidThreads/lqt.css
trunk/extensions/LiquidThreads/lqt.js
Modified: trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php
===
--- trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php2011-06-11 10:37:39 UTC
(rev 89876)
+++ trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php2011-06-11 10:51:40 UTC
(rev 89877)
@@ -259,7 +259,7 @@
'change the subject of this thread: $1',
'lqt-ajax-invalid-subject' = 'The subject you specified was invalid,
probably ' .
'because it was too long.',
- 'lqt-ajax-no-subject' = 'You must specify a subject.',
+ 'lqt-ajax-no-subject' = 'You must specify a subject for the new
thread.',
'lqt-save-subject-error-unknown' = 'An unknown error occurred when
attempting ' .
'to set the subject of this thread. Please try to do this by clicking edit
on the top post.',
'lqt-cancel-subject-edit' = 'Cancel',
@@ -273,7 +273,7 @@
'lqt-drag-save' = 'Confirm',
'lqt-drag-title' = 'Confirm drag',
'lqt-drag-reason' = 'Reason:',
- 'lqt-drag-subject' = 'Subject for new thread:',
+ 'lqt-drag-subject' = 'Subject for new thread (mandatory):',
'lqt-edit-signature' = '(edit signature)',
'lqt-preview-signature' = '(preview)',
Modified: trunk/extensions/LiquidThreads/lqt.css
===
--- trunk/extensions/LiquidThreads/lqt.css 2011-06-11 10:37:39 UTC (rev
89876)
+++ trunk/extensions/LiquidThreads/lqt.css 2011-06-11 10:51:40 UTC (rev
89877)
@@ -467,7 +467,8 @@
border: 1px solid #ff !important;
background: yellow;
text-align: center;
- color: #99;
+ color: #44;
+ font-weight: bold !important;
}
.lqt-drop-zone.lqt-drop-zone-active {
@@ -479,7 +480,6 @@
border: 1px solid #ff !important;
color: #ff !important;
background: #00ff7f;
- font-weight: bold !important;
}
.lqt-new-messages {
Modified: trunk/extensions/LiquidThreads/lqt.js
===
--- trunk/extensions/LiquidThreads/lqt.js 2011-06-11 10:37:39 UTC (rev
89876)
+++ trunk/extensions/LiquidThreads/lqt.js 2011-06-11 10:51:40 UTC (rev
89877)
@@ -1516,9 +1516,18 @@
apiRequest.sortkey = newSortkey;
}
- liquidThreads.apiRequest( apiRequest, doneCallback );
+ if ( params.subject.length == ) {
+ $j( '.mw-ajax-loader' ).remove(); // remove
spinner
+ alert( mediaWiki.msg( 'lqt-ajax-no-subject' ) );
+ // here we should prompt the user again to
enter a new subject
+ } else {
+
+ liquidThreads.apiRequest( apiRequest,
doneCallback );
+ }
+
+
} else if (newSortkey != 'none' ) {
var apiRequest =
{
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89878] trunk/phase3/resources/jquery/jquery.tabIndex.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89878
Revision: 89878
Author: krinkle
Date: 2011-06-11 10:56:54 + (Sat, 11 Jun 2011)
Log Message:
---
Fix jquery.tabIndex even more.
* Discovered through TestSwarm. Aside from IE6/IE7, which already needed extra
checking, when IE6/IE7 is on Windows NT 5.2, it can also return NaN.
Modified Paths:
--
trunk/phase3/resources/jquery/jquery.tabIndex.js
Modified: trunk/phase3/resources/jquery/jquery.tabIndex.js
===
--- trunk/phase3/resources/jquery/jquery.tabIndex.js2011-06-11 10:51:40 UTC
(rev 89877)
+++ trunk/phase3/resources/jquery/jquery.tabIndex.js2011-06-11 10:56:54 UTC
(rev 89878)
@@ -9,12 +9,14 @@
*/
$.fn.firstTabIndex = function() {
var minTabIndex = null;
- $(this).find( '[tabindex]' ).each( function( i ) {
+ $(this).find( '[tabindex]' ).each( function() {
var tabIndex = parseInt( $(this).attr( 'tabindex' ), 10 );
// In IE6/IE7 the above jQuery selector returns all elements,
// becuase it has a default value for tabIndex in IE6/IE7 of 0
- // (rather than null/undefined). Therefore check 0 as well
- if ( tabIndex 0 ) {
+ // (rather than null/undefined). Therefore check 0 as well.
+ // Under IE7 under Windows NT 5.2 is also capable of returning
NaN.
+ if ( tabIndex 0 !isNaN( tabIndex ) ) {
+ // Initial value
if ( minTabIndex === null ) {
minTabIndex = tabIndex;
} else if ( tabIndex minTabIndex ) {
@@ -32,12 +34,15 @@
*/
$.fn.lastTabIndex = function() {
var maxTabIndex = null;
- $(this).find( '[tabindex]' ).each( function( i ) {
+ $(this).find( '[tabindex]' ).each( function() {
var tabIndex = parseInt( $(this).attr( 'tabindex' ), 10 );
- if ( maxTabIndex === null ) {
- maxTabIndex = tabIndex;
- } else if ( tabIndex maxTabIndex ) {
- maxTabIndex = tabIndex;
+ if ( tabIndex 0 !isNaN( tabIndex ) ) {
+ // Initial value
+ if ( maxTabIndex === null ) {
+ maxTabIndex = tabIndex;
+ } else if ( tabIndex maxTabIndex ) {
+ maxTabIndex = tabIndex;
+ }
}
} );
return maxTabIndex;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89879] trunk/extensions/Translate/groups/Pywikipedia/Pywikipedia.yaml
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89879 Revision: 89879 Author: xqt Date: 2011-06-11 13:05:25 + (Sat, 11 Jun 2011) Log Message: --- Translate: Add group for Pywikipedia clean_sandbox.py. Modified Paths: -- trunk/extensions/Translate/groups/Pywikipedia/Pywikipedia.yaml Modified: trunk/extensions/Translate/groups/Pywikipedia/Pywikipedia.yaml === --- trunk/extensions/Translate/groups/Pywikipedia/Pywikipedia.yaml 2011-06-11 10:56:54 UTC (rev 89878) +++ trunk/extensions/Translate/groups/Pywikipedia/Pywikipedia.yaml 2011-06-11 13:05:25 UTC (rev 89879) @@ -53,6 +53,17 @@ targetPattern: pywikipedia/category.py --- BASIC: + id: out-pywikipedia-clean_sandbox + label: Pywikipedia Clean Sandbox + display: out/pywikipedia/clean_sandbox + +FILES: + class: PythonSingleFFS + sourcePattern: %GROUPROOT%/pywikipedia/clean_sandbox.py + definitionFile: %GROUPROOT%/pywikipedia/clean_sandbox.py + targetPattern: pywikipedia/clean_sandbox.py +--- +BASIC: id: out-pywikipedia-cosmetic_changes label: Pywikipedia Cosmetic Changes display: out/pywikipedia/cosmetic_changes ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89880] trunk/extensions/LiquidThreads/lqt.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89880
Revision: 89880
Author: wikinaut
Date: 2011-06-11 13:43:55 + (Sat, 11 Jun 2011)
Log Message:
---
fixed my mistake comparing string length
Modified Paths:
--
trunk/extensions/LiquidThreads/lqt.js
Modified: trunk/extensions/LiquidThreads/lqt.js
===
--- trunk/extensions/LiquidThreads/lqt.js 2011-06-11 13:05:25 UTC (rev
89879)
+++ trunk/extensions/LiquidThreads/lqt.js 2011-06-11 13:43:55 UTC (rev
89880)
@@ -1516,7 +1516,7 @@
apiRequest.sortkey = newSortkey;
}
- if ( params.subject.length == ) {
+ if ( params.subject.length == 0 ) {
$j( '.mw-ajax-loader' ).remove(); // remove
spinner
alert( mediaWiki.msg( 'lqt-ajax-no-subject' ) );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89881] trunk/extensions/PageSchemas/PageSchemas.classes.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89881
Revision: 89881
Author: ankitgarg833
Date: 2011-06-11 13:52:46 + (Sat, 11 Jun 2011)
Log Message:
---
adding getObject method to PSTemplateField class
Modified Paths:
--
trunk/extensions/PageSchemas/PageSchemas.classes.php
Modified: trunk/extensions/PageSchemas/PageSchemas.classes.php
===
--- trunk/extensions/PageSchemas/PageSchemas.classes.php2011-06-11
13:43:55 UTC (rev 89880)
+++ trunk/extensions/PageSchemas/PageSchemas.classes.php2011-06-11
13:52:46 UTC (rev 89881)
@@ -9,8 +9,6 @@
class PageSchemas {
/* Functions */
-
-
public static function validateXML( $xml, $error_msg ) {
@@ -69,7 +67,7 @@
if ($tag == 'Template') {
$text .= self::parseTemplate($child);
} else{
- echo Code to be added by other extension\n;
+ echo Code to be added by other extension\n;
}
}
$text .= /table\n;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89882] trunk/extensions/PageSchemas/PageSchemas.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89882 Revision: 89882 Author: ankitgarg833 Date: 2011-06-11 14:33:44 + (Sat, 11 Jun 2011) Log Message: --- registering new special page GeneratePage.php Modified Paths: -- trunk/extensions/PageSchemas/PageSchemas.php Modified: trunk/extensions/PageSchemas/PageSchemas.php === --- trunk/extensions/PageSchemas/PageSchemas.php2011-06-11 13:52:46 UTC (rev 89881) +++ trunk/extensions/PageSchemas/PageSchemas.php2011-06-11 14:33:44 UTC (rev 89882) @@ -42,7 +42,10 @@ $wgAutoloadClasses['PageSchemasHooks'] = $dir . 'PageSchemas.hooks.php'; $wgAutoloadClasses['PageSchemas'] = $dir . 'PageSchemas.classes.php'; $wgAutoloadClasses['ApiQueryPageSchemas'] = $dir . 'ApiQueryPageSchemas.php'; - +$wgAutoloadClasses['SpecialPageSchemas'] = $dir . 'specials/GeneratePages.php'; +// registering Special page +$wgSpecialPages['PageSchemas'] = 'SpecialPageSchemas'; +$wgSpecialPageGroups['PageSchemas'] = 'other'; // Register parser hook $wgHooks['ParserFirstCallInit'][] = 'PageSchemasHooks::register'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89883] trunk/extensions/PageSchemas
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89883
Revision: 89883
Author: ankitgarg833
Date: 2011-06-11 14:35:41 + (Sat, 11 Jun 2011)
Log Message:
---
adding new special page GeneratePages.php. It will generate Pages based on the
xml in the page. The code is in-comlete at this point.
Added Paths:
---
trunk/extensions/PageSchemas/specials/
trunk/extensions/PageSchemas/specials/GeneratePages.php
Added: trunk/extensions/PageSchemas/specials/GeneratePages.php
===
--- trunk/extensions/PageSchemas/specials/GeneratePages.php
(rev 0)
+++ trunk/extensions/PageSchemas/specials/GeneratePages.php 2011-06-11
14:35:41 UTC (rev 89883)
@@ -0,0 +1,28 @@
+?php
+/**
+ * Displays an interface to let users create all pages based on xml
+ *
+ * @author Ankit Garg
+ */
+
+class GeneratePages extends IncludableSpecialPage {
+function __construct() {
+parent::__construct( 'GeneratePages' );
+wfLoadExtensionMessages('GeneratePages');
+}
+
+function execute( $par ) {
+global $wgRequest, $wgOut;
+
+$this-setHeaders();
+
+# Get request data from, e.g.
+ $param = $wgRequest-getText('param');
+
+# Do stuff
+ # ...
+ $output=Hello world!.$param;
+$wgOut-addWikiText( $output );
+}
+}
+
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89884] branches/salvatoreingala/Gadgets
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89884
Revision: 89884
Author: salvatoreingala
Date: 2011-06-11 15:56:07 + (Sat, 11 Jun 2011)
Log Message:
---
- Added modules/ext.gadgets.preferences.css for dialog styling
- Small improvements in code quality
Modified Paths:
--
branches/salvatoreingala/Gadgets/Gadgets.i18n.php
branches/salvatoreingala/Gadgets/Gadgets.php
branches/salvatoreingala/Gadgets/Gadgets_body.php
branches/salvatoreingala/Gadgets/modules/ext.gadgets.preferences.js
branches/salvatoreingala/Gadgets/modules/jquery.formBuilder.js
Added Paths:
---
branches/salvatoreingala/Gadgets/modules/ext.gadgets.preferences.css
Property Changed:
branches/salvatoreingala/Gadgets/
branches/salvatoreingala/Gadgets/Gadgets_body.php
Property changes on: branches/salvatoreingala/Gadgets
___
Modified: svn:mergeinfo
- /trunk/extensions/Gadgets:88253-89450
+ /trunk/extensions/Gadgets:88253-89658
Modified: branches/salvatoreingala/Gadgets/Gadgets.i18n.php
===
--- branches/salvatoreingala/Gadgets/Gadgets.i18n.php 2011-06-11 14:35:41 UTC
(rev 89883)
+++ branches/salvatoreingala/Gadgets/Gadgets.i18n.php 2011-06-11 15:56:07 UTC
(rev 89884)
@@ -45,6 +45,8 @@
'gadgets-export-download' = 'Download',
'gadgets-configure' = 'Configure',
'gadgets-configuration-of' = 'Configuration of $1',
+ 'gadgets-prefs-save' = 'Save',
+ 'gadgets-prefs-cancel' = 'Cancel',
'gadgets-unexpected-error' = 'An unexpected error occurred. Please
check your connection. If the problems persists, please contact the
developers.',
'gadgets-save-success' = 'Settings saved successfully.',
'gadgets-save-failed' = 'Failed to save settings. If the problems
persists, please contact the developers.',
@@ -152,6 +154,7 @@
);
/** Arabic (العربية)
+ * @author Aiman titi
* @author Meno25
* @author OsamaK
*/
@@ -170,7 +173,11 @@
'gadgets-pagetext' = 'بالأسفل قائمة بالإضافات الخاصة التي يمكن أن يقوم
المستخدمون بتفعيلها على [[Special:Preferences|صفحة تفضيلاتهم]]، معرفة بواسطة
[[MediaWiki:Gadgets-definition|التعريفات]].
هذا العرض يوفر دخولا سهلا لصفحات رسائل النظام التي تعرف وصف وكود كل إضافة.',
'gadgets-uses' = 'تستخدم',
+ 'gadgets-required-rights' = 'يتطلب {{PLURAL:$2|$1 حق|الحقوق التالية:
$1}}.',
+ 'gadgets-default' = 'تمكين الجميع بشكل افتراضي.',
'gadgets-export' = 'صدّر',
+ 'gadgets-export-title' = 'أداة تصدير',
+ 'gadgets-not-found' = 'الأداة $1 لم يتم العثور عليها.',
'gadgets-export-download' = 'نزّل',
);
Modified: branches/salvatoreingala/Gadgets/Gadgets.php
===
--- branches/salvatoreingala/Gadgets/Gadgets.php2011-06-11 14:35:41 UTC
(rev 89883)
+++ branches/salvatoreingala/Gadgets/Gadgets.php2011-06-11 15:56:07 UTC
(rev 89884)
@@ -82,13 +82,14 @@
$wgResourceModules['ext.gadgets.preferences'] = array(
'scripts' = array( 'ext.gadgets.preferences.js' ),
+ 'styles'= array( 'ext.gadgets.preferences.css' ),
'dependencies' = array(
'jquery', 'jquery.json', 'jquery.ui.dialog',
'jquery.formBuilder',
'mediawiki.htmlform', 'ext.gadgets'
),
'messages' = array(
- 'gadgets-configure', 'gadgets-configuration-of',
'gadgets-unexpected-error',
- 'gadgets-save-success', 'gadgets-save-failed'
+ 'gadgets-configure', 'gadgets-configuration-of',
'gadgets-prefs-save', 'gadgets-prefs-cancel',
+ 'gadgets-unexpected-error', 'gadgets-save-success',
'gadgets-save-failed'
),
'localBasePath' = $dir . 'modules/',
'remoteExtPath' = 'Gadgets/modules'
Modified: branches/salvatoreingala/Gadgets/Gadgets_body.php
===
--- branches/salvatoreingala/Gadgets/Gadgets_body.php 2011-06-11 14:35:41 UTC
(rev 89883)
+++ branches/salvatoreingala/Gadgets/Gadgets_body.php 2011-06-11 15:56:07 UTC
(rev 89884)
@@ -919,10 +919,7 @@
return true;
case 'select':
$values = array_values(
$prefDescription['options'] );
- if ( !in_array( $pref, $values, true ) ) {
- return false;
- }
- return true;
+ return in_array( $pref, $values, true );
default:
return false; //unexisting type
}
@@ -1158,3 +1155,4 @@
}
}
+
Property changes on: branches/salvatoreingala/Gadgets/Gadgets_body.php
[MediaWiki-CVS] SVN: [89885] trunk/extensions/PageSchemas/GeneratePages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89885
Revision: 89885
Author: ankitgarg833
Date: 2011-06-11 16:49:02 + (Sat, 11 Jun 2011)
Log Message:
---
removing specials/GeneratePages.php to outside.
Added Paths:
---
trunk/extensions/PageSchemas/GeneratePages.php
Added: trunk/extensions/PageSchemas/GeneratePages.php
===
--- trunk/extensions/PageSchemas/GeneratePages.php
(rev 0)
+++ trunk/extensions/PageSchemas/GeneratePages.php 2011-06-11 16:49:02 UTC
(rev 89885)
@@ -0,0 +1,27 @@
+?php
+/**
+ * Displays an interface to let users create all pages based on xml
+ *
+ * @author Ankit Garg
+ */
+
+class GeneratePages extends IncludableSpecialPage {
+function __construct() {
+parent::__construct( 'GeneratePages' );
+wfLoadExtensionMessages('GeneratePages');
+}
+
+function execute( $par ) {
+global $wgRequest, $wgOut;
+
+$this-setHeaders();
+
+# Get request data from, e.g.
+ $param = $wgRequest-getText('param');
+
+# Do stuff
+ # ...
+ $output=Hello world!.$param;
+$wgOut-addWikiText( $output );
+}
+}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89886] trunk/extensions/PageSchemas/PageSchemas.classes.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89886
Revision: 89886
Author: ankitgarg833
Date: 2011-06-11 16:55:07 + (Sat, 11 Jun 2011)
Log Message:
---
added generateAllPages function : incomplete
Modified Paths:
--
trunk/extensions/PageSchemas/PageSchemas.classes.php
Modified: trunk/extensions/PageSchemas/PageSchemas.classes.php
===
--- trunk/extensions/PageSchemas/PageSchemas.classes.php2011-06-11
16:49:02 UTC (rev 89885)
+++ trunk/extensions/PageSchemas/PageSchemas.classes.php2011-06-11
16:55:07 UTC (rev 89886)
@@ -143,9 +143,13 @@
$PSTemplates[$i++]= $templateObj;
}
}
- }
-
+ }
+ /* function to generate all pages based on the Xml contained in the
page */
+ function generateAllPages () {
+ wfRunHooks( 'PageSchemasGeneratePages', array($this-pageXml)
);
+ }
+
/*return an array of PSTemplate Objects */
static function getTemplates () {
return PSTemplates;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89887] trunk/extensions/PageSchemas/PageSchemas.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89887 Revision: 89887 Author: ankitgarg833 Date: 2011-06-11 16:55:48 + (Sat, 11 Jun 2011) Log Message: --- support for special Page. Modified Paths: -- trunk/extensions/PageSchemas/PageSchemas.php Modified: trunk/extensions/PageSchemas/PageSchemas.php === --- trunk/extensions/PageSchemas/PageSchemas.php2011-06-11 16:55:07 UTC (rev 89886) +++ trunk/extensions/PageSchemas/PageSchemas.php2011-06-11 16:55:48 UTC (rev 89887) @@ -25,7 +25,7 @@ // Credits $wgExtensionCredits['parserhook'][] = array( 'path' = __FILE__, - 'name' = 'Page Schemas', + 'name' = 'PageSchemas', 'author'= array( 'Ankit Garg' ), 'version' = '0.0.1', 'url' = 'http://www.mediawiki.org/wiki/Extension:PageSchemas', @@ -42,9 +42,9 @@ $wgAutoloadClasses['PageSchemasHooks'] = $dir . 'PageSchemas.hooks.php'; $wgAutoloadClasses['PageSchemas'] = $dir . 'PageSchemas.classes.php'; $wgAutoloadClasses['ApiQueryPageSchemas'] = $dir . 'ApiQueryPageSchemas.php'; -$wgAutoloadClasses['SpecialPageSchemas'] = $dir . 'specials/GeneratePages.php'; +$wgAutoloadClasses['GeneratePages'] = $dir . 'GeneratePages.php'; // registering Special page -$wgSpecialPages['PageSchemas'] = 'SpecialPageSchemas'; +$wgSpecialPages['PageSchemas'] = 'GeneratePages'; $wgSpecialPageGroups['PageSchemas'] = 'other'; // Register parser hook $wgHooks['ParserFirstCallInit'][] = 'PageSchemasHooks::register'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89888] trunk/extensions/PageSchemas/specials/GeneratePages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89888 Revision: 89888 Author: ankitgarg833 Date: 2011-06-11 16:58:05 + (Sat, 11 Jun 2011) Log Message: --- Modified Paths: -- trunk/extensions/PageSchemas/specials/GeneratePages.php Modified: trunk/extensions/PageSchemas/specials/GeneratePages.php === --- trunk/extensions/PageSchemas/specials/GeneratePages.php 2011-06-11 16:55:48 UTC (rev 89887) +++ trunk/extensions/PageSchemas/specials/GeneratePages.php 2011-06-11 16:58:05 UTC (rev 89888) @@ -25,4 +25,3 @@ $wgOut-addWikiText( $output ); } } - ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89889] trunk/extensions/PageSchemas/PageSchemas.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89889 Revision: 89889 Author: ankitgarg833 Date: 2011-06-11 16:58:27 + (Sat, 11 Jun 2011) Log Message: --- Modified Paths: -- trunk/extensions/PageSchemas/PageSchemas.php Modified: trunk/extensions/PageSchemas/PageSchemas.php === --- trunk/extensions/PageSchemas/PageSchemas.php2011-06-11 16:58:05 UTC (rev 89888) +++ trunk/extensions/PageSchemas/PageSchemas.php2011-06-11 16:58:27 UTC (rev 89889) @@ -42,7 +42,7 @@ $wgAutoloadClasses['PageSchemasHooks'] = $dir . 'PageSchemas.hooks.php'; $wgAutoloadClasses['PageSchemas'] = $dir . 'PageSchemas.classes.php'; $wgAutoloadClasses['ApiQueryPageSchemas'] = $dir . 'ApiQueryPageSchemas.php'; -$wgAutoloadClasses['GeneratePages'] = $dir . 'GeneratePages.php'; +$wgAutoloadClasses['GeneratePages'] = $dir . 'specials/GeneratePages.php'; // registering Special page $wgSpecialPages['PageSchemas'] = 'GeneratePages'; $wgSpecialPageGroups['PageSchemas'] = 'other'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89890] branches/salvatoreingala/Gadgets
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89890
Revision: 89890
Author: salvatoreingala
Date: 2011-06-11 17:23:26 + (Sat, 11 Jun 2011)
Log Message:
---
Added an intro field to preference dialog and removed some dangling code
Modified Paths:
--
branches/salvatoreingala/Gadgets/Gadgets.i18n.php
branches/salvatoreingala/Gadgets/modules/jquery.formBuilder.js
Modified: branches/salvatoreingala/Gadgets/Gadgets.i18n.php
===
--- branches/salvatoreingala/Gadgets/Gadgets.i18n.php 2011-06-11 16:58:27 UTC
(rev 89889)
+++ branches/salvatoreingala/Gadgets/Gadgets.i18n.php 2011-06-11 17:23:26 UTC
(rev 89890)
@@ -178,6 +178,10 @@
'gadgets-export' = 'صدّر',
'gadgets-export-title' = 'أداة تصدير',
'gadgets-not-found' = 'الأداة $1 لم يتم العثور عليها.',
+ 'gadgets-export-text' = 'لتصدير $1 الأداة، انقر فوق
{{int:gadgets-export-download}} زر حفظ الملف الذي تم تحميله،
+ الذهاب إلى الخاص: الاستيراد على واجهة الويكي وتحميله. قم بإضافة ما يلي إلى
MediaWiki:Gadgets-definition الصفحة:
+pre$2/pre
+يجب أن يكون لديك الأذونات المناسبة على الويكي (بما في ذلك الحق في تحرير رسائل
النظام) ويجب أن يتم تمكين الاستيراد من تحميل الملف.',
'gadgets-export-download' = 'نزّل',
);
@@ -1604,6 +1608,7 @@
);
/** Malay (Bahasa Melayu)
+ * @author Anakmalaysia
* @author Aviator
* @author Zamwan
*/
@@ -1617,6 +1622,8 @@
'gadgets-title' = 'Gajet',
'gadgets-pagetext' = 'Yang berikut ialah senarai gajet khas yang boleh
dihidupkan oleh pengguna melalui [[Special:Preferences|laman keutamaan]],
sebagai mana yang telah [[MediaWiki:Gadgets-definition|ditakrifkan]]. Laman ini
menyediakan capaian mudah kepada laman pesanan sistem yang mentakrifkan setiap
kod dan keterangan gajet.',
'gadgets-uses' = 'Menggunakan',
+ 'gadgets-required-rights' = 'Memerlukan {{PLURAL:$2|hak $1|hak-hak
berikut: $1}}.',
+ 'gadgets-default' = 'Dihidupkan untuk semua orang secara sediaan.',
'gadgets-export' = 'Eksport',
'gadgets-export-title' = 'Eksport gajet',
'gadgets-not-found' = 'Gajet $1 tiada.',
@@ -2201,6 +2208,7 @@
/** Albanian (Shqip)
* @author Mikullovci11
* @author Olsi
+ * @author Vinie007
*/
$messages['sq'] = array(
'gadgets-desc' = 'Lejin përdoruesit të zgjedhin [[Special:Gadgets|CSS
dhe JavaScript gadgets]] në [[Special:Preferences|preferencat]] e tyre',
@@ -2216,6 +2224,8 @@
'gadgets-pagetext' = 'Më poshtë është një listë e mjeteve shtesë
speciale që mund të aktivizohen në [[Special:Preferences|faqen e preferencave]]
të tyre, siç është përcaktuar nga [[MediaWiki:Gadgets-definition|përkufizimet]].
Kjo pasqyrë siguron qasje të lehtë në faqet e mesazheve të sistemit që
përkufizon përshkrimin e çdo mjeti shtesë dhe kodin.',
'gadgets-uses' = 'Përdorues',
+ 'gadgets-required-rights' = 'Kërkon {{PLURAL:$2| $1 drejtën | drejta:
$1 }}.',
+ 'gadgets-default' = 'Aktivizuar për të gjithë nga default.',
'gadgets-export' = 'Eksporto',
'gadgets-export-title' = 'Eksport mjetesh shtesë',
'gadgets-not-found' = 'Mjeti shtesë $1 nuk u gjet.',
Modified: branches/salvatoreingala/Gadgets/modules/jquery.formBuilder.js
===
--- branches/salvatoreingala/Gadgets/modules/jquery.formBuilder.js
2011-06-11 16:58:27 UTC (rev 89889)
+++ branches/salvatoreingala/Gadgets/modules/jquery.formBuilder.js
2011-06-11 17:23:26 UTC (rev 89890)
@@ -288,23 +288,22 @@
};
function buildFormBody() {
- var description = this.get(0);
+ var description = this.get( 0 );
if ( typeof description != 'object' ) {
mw.log( description should be an object, instead of a
+ typeof description );
return null;
}
var $form = $( 'form/' );
- var $fieldset = $( 'fieldset/' ).appendTo( $form );
- if ( typeof description.label == 'string' ) {
- $( 'legend/' )
- .text( $s( description.label ) )
- .appendTo( $fieldset );
+ //If there is an intro, adds it to the form as a label
+ if ( typeof description.intro == 'string' ) {
+ $( 'p/' )
+ .text( $s( description.intro ) )
+ .addClass( 'mw-gadgets-prefsDialog-intro' )
+ .appendTo( $form );
}
- //TODO: manage form params
-
if ( typeof description.fields != 'object' ) {
mw.log( description.fields should be an object,
instead of a + typeof description.fields );
return null;
___
[MediaWiki-CVS] SVN: [89891] trunk/phase3/maintenance/sqlite.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89891
Revision: 89891
Author: maxsem
Date: 2011-06-11 18:45:56 + (Sat, 11 Jun 2011)
Log Message:
---
sqlite.php: don't fail after --check-syntax on a non-SQLite DB
Modified Paths:
--
trunk/phase3/maintenance/sqlite.php
Modified: trunk/phase3/maintenance/sqlite.php
===
--- trunk/phase3/maintenance/sqlite.php 2011-06-11 17:23:26 UTC (rev 89890)
+++ trunk/phase3/maintenance/sqlite.php 2011-06-11 18:45:56 UTC (rev 89891)
@@ -44,6 +44,7 @@
// Should work even if we use a non-SQLite database
if ( $this-hasOption( 'check-syntax' ) ) {
$this-checkSyntax();
+ return;
}
$this-db = wfGetDB( DB_MASTER );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89892] trunk/extensions/OggHandler/OggHandler_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89892
Revision: 89892
Author: rotem
Date: 2011-06-11 20:27:50 + (Sat, 11 Jun 2011)
Log Message:
---
(bug 20044) Misaligned text on file pages (RTL wikis only)
Modified Paths:
--
trunk/extensions/OggHandler/OggHandler_body.php
Modified: trunk/extensions/OggHandler/OggHandler_body.php
===
--- trunk/extensions/OggHandler/OggHandler_body.php 2011-06-11 18:45:56 UTC
(rev 89891)
+++ trunk/extensions/OggHandler/OggHandler_body.php 2011-06-11 20:27:50 UTC
(rev 89892)
@@ -448,7 +448,7 @@
}
function setHeaders( $out ) {
- global $wgOggScriptVersion, $wgCortadoJarFile, $wgServer;
+ global $wgOggScriptVersion, $wgCortadoJarFile, $wgServer,
$wgContLang;
if ( $out-hasHeadItem( 'OggHandlerScript' )
$out-hasHeadItem( 'OggHandlerInlineScript' )
$out-hasHeadItem( 'OggHandlerInlineCSS' ) ) {
@@ -471,6 +471,7 @@
}
$encCortadoUrl = Xml::encodeJsVar( $cortadoUrl );
$encExtPathUrl = Xml::encodeJsVar( $scriptPath );
+ $alignStart = $wgContLang-alignStart();
$out-addHeadItem( 'OggHandlerScript' , Html::linkedScript(
{$scriptPath}/OggPlayer.js?$wgOggScriptVersion ) );
@@ -487,7 +488,7 @@
.ogg-player-options {
border: solid 1px #ccc;
padding: 2pt;
- text-align: left;
+ text-align: $alignStart;
font-size: 10pt;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89893] trunk/extensions/ArticleFeedback/api/ApiQueryArticleFeedback. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89893
Revision: 89893
Author: gurch
Date: 2011-06-11 21:01:08 + (Sat, 11 Jun 2011)
Log Message:
---
ArticleFeedback API:
* don't throw internal error when there are no ratings for a page
* tidy documentation
Modified Paths:
--
trunk/extensions/ArticleFeedback/api/ApiQueryArticleFeedback.php
Modified: trunk/extensions/ArticleFeedback/api/ApiQueryArticleFeedback.php
===
--- trunk/extensions/ArticleFeedback/api/ApiQueryArticleFeedback.php
2011-06-11 20:27:50 UTC (rev 89892)
+++ trunk/extensions/ArticleFeedback/api/ApiQueryArticleFeedback.php
2011-06-11 21:01:08 UTC (rev 89893)
@@ -111,7 +111,10 @@
}
foreach ( $ratings as $rat ) {
- $result-setIndexedTagName( $rat['ratings'], 'r' );
+ if ( isset( $rat['ratings'] ) ) {
+ $result-setIndexedTagName( $rat['ratings'],
'r' );
+ }
+
$result-addValue( array( 'query',
$this-getModuleName() ), null, $rat );
}
@@ -263,15 +266,15 @@
public function getParamDescription() {
return array(
- 'pageid' = 'Page ID to get feedbacks for',
- 'userrating' = Whether to get the current user's
ratings for the specific rev/article,
+ 'pageid' = 'Page ID to get feedback ratings for',
+ 'userrating' = Whether to get the current user's
ratings for the specified page,
'anontoken' = 'Token for anonymous users',
);
}
public function getDescription() {
return array(
- 'List all article feedbacks'
+ 'List article feedback ratings for a specified page'
);
}
@@ -285,7 +288,6 @@
protected function getExamples() {
return array(
- 'api.php?action=querylist=articlefeedback',
'api.php?action=querylist=articlefeedbackafpageid=1',
'api.php?action=querylist=articlefeedbackafpageid=1afuserrating=1',
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89894] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89894 Revision: 89894 Author: bawolff Date: 2011-06-11 21:10:26 + (Sat, 11 Jun 2011) Log Message: --- Remove $wgCheckCopyrightUpload from DefaultSettings.php since the feature was removed about 5 years ago Looks like the feature was partially removed back in r10168. In any case, its long gone out of trunk now. Modified Paths: -- trunk/phase3/RELEASE-NOTES-1.19 trunk/phase3/includes/DefaultSettings.php Modified: trunk/phase3/RELEASE-NOTES-1.19 === --- trunk/phase3/RELEASE-NOTES-1.19 2011-06-11 21:01:08 UTC (rev 89893) +++ trunk/phase3/RELEASE-NOTES-1.19 2011-06-11 21:10:26 UTC (rev 89894) @@ -23,6 +23,8 @@ http://www.mediawiki.org/wiki/Extension:DublinCoreRdf and http://www.mediawiki.org/wiki/Extension:CreativeCoreRdf as appropriate * (bug 21107) Split error customcssjsprotected into separate messages for JS and CSS +* Removed $wgCheckCopyrightUpload from DefaultSettings, since the relevant feature + was removed in about 1.5. === New features in 1.19 === * BREAKING CHANGE: action=watch / action=unwatch now requires a token. Modified: trunk/phase3/includes/DefaultSettings.php === --- trunk/phase3/includes/DefaultSettings.php 2011-06-11 21:01:08 UTC (rev 89893) +++ trunk/phase3/includes/DefaultSettings.php 2011-06-11 21:10:26 UTC (rev 89894) @@ -4428,10 +4428,6 @@ /** Set this to true if you want detailed copyright information forms on Upload. */ $wgUseCopyrightUpload = false; -/** Set this to false if you want to disable checking that detailed copyright - * information values are not empty. */ -$wgCheckCopyrightUpload = true; - /** * Set this to the number of authors that you want to be credited below an * article text. Set it to zero to hide the attribution block, and a negative ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89895] trunk/extensions/Lingo
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89895
Revision: 89895
Author: foxtrott
Date: 2011-06-11 21:38:48 + (Sat, 11 Jun 2011)
Log Message:
---
* followup r89860: magic word renamed and internationalized
* fixes (magic word registration, loading css and js, return ParserOutput as
error message)
Modified Paths:
--
trunk/extensions/Lingo/Lingo.i18n.php
trunk/extensions/Lingo/Lingo.php
trunk/extensions/Lingo/LingoHooks.php
trunk/extensions/Lingo/LingoMessageLog.php
trunk/extensions/Lingo/LingoParser.php
Modified: trunk/extensions/Lingo/Lingo.i18n.php
===
--- trunk/extensions/Lingo/Lingo.i18n.php 2011-06-11 21:10:26 UTC (rev
89894)
+++ trunk/extensions/Lingo/Lingo.i18n.php 2011-06-11 21:38:48 UTC (rev
89895)
@@ -13,13 +13,14 @@
'lingo-terminologypagename' = 'Terminology',
'lingo-noterminologypage' = Page '$1' does not exist.,
'lingo-terminologypagenotlocal' = Page '$1' is not a local page.,
-
+ 'lingo-noglossary' = 'NOGLOSSARY',
);
/** Message documentation (Message documentation) */
$messages['qqq'] = array(
'lingo-desc' = '{{desc}}',
'lingo-terminologypagename' = 'Name of the page where the terms and
definitions of the glossary are stored',
+ 'lingo-noglossary' = 'The magic word which will suppress the
application of the glossary for a page.',
);
/** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
@@ -41,6 +42,7 @@
'lingo-terminologypagename' = 'Glossar',
'lingo-noterminologypage' = 'Seite „$1“ ist nicht vorhanden.',
'lingo-terminologypagenotlocal' = 'Seite „$1“ befindet sich nicht auf
diesem Wiki.',
+ 'lingo-noglossary' = 'KEIN_GLOSSAR',
);
/** French (Français)
Modified: trunk/extensions/Lingo/Lingo.php
===
--- trunk/extensions/Lingo/Lingo.php2011-06-11 21:10:26 UTC (rev 89894)
+++ trunk/extensions/Lingo/Lingo.php2011-06-11 21:38:48 UTC (rev 89895)
@@ -47,7 +47,7 @@
// register hook handlers
$wgHooks['SpecialVersionExtensionTypes'][] = 'LingoHooks::setCredits'; // set
credits
$wgHooks['ParserAfterTidy'][] = 'LingoHooks::parse'; // parse page
-$wgHooks['ParserFirstCallInit'][] = 'LingoHooks::setup'; // do late setup
+//$wgHooks['ParserFirstCallInit'][] = 'LingoHooks::setup'; // do late setup
$wgHooks['LanguageGetMagic'][] = 'LingoHooks::setMagicWords'; // set magic
words
// register resource modules with the Resource Loader
@@ -69,5 +69,7 @@
// 'dependencies' = array( 'jquery.ui.datepicker' ),
);
+MagicWord::$mDoubleUnderscoreIDs[] = 'noglossary';
+
unset( $dir );
Modified: trunk/extensions/Lingo/LingoHooks.php
===
--- trunk/extensions/Lingo/LingoHooks.php 2011-06-11 21:10:26 UTC (rev
89894)
+++ trunk/extensions/Lingo/LingoHooks.php 2011-06-11 21:38:48 UTC (rev
89895)
@@ -18,21 +18,14 @@
*/
class LingoHooks {
- static function setup( $parser ) {
- # Set a function hook associating the noglossary with
fnLingoNoGlossary
- MagicWord::getDoubleUnderscoreArray()-add( 'nolingo' );
- return true;
- }
-
static function setMagicWords( $magicWords, $langCode ) {
- # Add the magic word
- $magicWords['nolingo'] = array( 0, '__nolingo__' );
+ $magicWords['noglossary'] = array( 0, '__NOGLOSSARY__', '__' .
wfMsgGetKey( 'lingo-noglossary', true, $langCode ) . '__' );
return true;
}
static function parse( $parser, $text ) {
- if ( !isset( $parser-mDoubleUnderscores['nolingo'] ) ) {
+ if ( !isset( $parser-mDoubleUnderscores['noglossary'] ) ) {
LingoParser::parse( $parser, $text );
}
Modified: trunk/extensions/Lingo/LingoMessageLog.php
===
--- trunk/extensions/Lingo/LingoMessageLog.php 2011-06-11 21:10:26 UTC (rev
89894)
+++ trunk/extensions/Lingo/LingoMessageLog.php 2011-06-11 21:38:48 UTC (rev
89895)
@@ -75,9 +75,13 @@
}
$ret = Html::rawElement( 'div', array('class' =
'messages'),
- $header .
- $parser-parse( $ret, $wgTitle,
ParserOptions::newFromUser( $wgUser ) )-getText()
+ $header . \n .
+ $ret
);
+
+ $ret = $parser-parse( $ret, $wgTitle,
ParserOptions::newFromUser( $wgUser ) );
+ } else {
+ $ret = null;
}
return $ret;
Modified: trunk/extensions/Lingo/LingoParser.php
[MediaWiki-CVS] SVN: [89896] trunk/extensions/SemanticGlossary/ SpecialSemanticGlossaryBrowser.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89896
Revision: 89896
Author: foxtrott
Date: 2011-06-11 21:40:11 + (Sat, 11 Jun 2011)
Log Message:
---
use returned ParserOutput from MessageLog
Modified Paths:
--
trunk/extensions/SemanticGlossary/SpecialSemanticGlossaryBrowser.php
Modified: trunk/extensions/SemanticGlossary/SpecialSemanticGlossaryBrowser.php
===
--- trunk/extensions/SemanticGlossary/SpecialSemanticGlossaryBrowser.php
2011-06-11 21:38:48 UTC (rev 89895)
+++ trunk/extensions/SemanticGlossary/SpecialSemanticGlossaryBrowser.php
2011-06-11 21:40:11 UTC (rev 89896)
@@ -110,10 +110,13 @@
}
// From here on no more errors should occur. Create list of
errors.
- $errorsFragment = $this-mMessages-getMessagesFormatted(
LingoMessageLog::MESSAGE_NOTICE, wfMsg( 'semanticglossary-messageheader' ) );
+ $errors = $this-mMessages-getMessagesFormatted(
LingoMessageLog::MESSAGE_NOTICE, wfMsg( 'semanticglossary-messageheader' ) );
- if ( $errorsFragment ) {
- $errorsFragment .= Html::rawElement( 'hr' );
+ if ( $errors !== null ) {
+ $wgOut-addParserOutputNoText( $errors );
+ $errorsFragment = $errors-getText() .
Html::rawElement( 'hr' );
+ } else {
+ $errorsFragment = '';
}
if ( $hasEditRights ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89897] trunk/extensions/TimedMediaHandler
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89897
Revision: 89897
Author: dale
Date: 2011-06-11 21:47:06 + (Sat, 11 Jun 2011)
Log Message:
---
renamed $tmhFileExtensions global to include standard $wg prefix :
$wgTmhFileExtensions
Modified Paths:
--
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-11 21:40:11 UTC (rev 89896)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2011-06-11 21:47:06 UTC (rev 89897)
@@ -12,7 +12,7 @@
static function register(){
global $wgParserOutputHooks, $wgHooks, $wgJobClasses,
$wgJobTypesExcludedFromDefaultQueue,
$wgMediaHandlers, $wgResourceModules,
$wgExcludeFromThumbnailPurge, $wgExtraNamespaces,
- $tmhFileExtensions, $wgParserOutputHooks, $wgOut,
$wgAPIPropModules, $wgTimedTextNS;
+ $wgTmhFileExtensions, $wgParserOutputHooks, $wgOut,
$wgAPIPropModules, $wgTimedTextNS;
// Register the Timed Media Handler javascript resources (
MwEmbed modules )
MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
@@ -66,7 +66,7 @@
// Exclude transcoded assets from normal thumbnail purging
// ( a maintenance script could handle transcode asset purging)
- $wgExcludeFromThumbnailPurge = array_merge(
$wgExcludeFromThumbnailPurge, $tmhFileExtensions );
+ $wgExcludeFromThumbnailPurge = array_merge(
$wgExcludeFromThumbnailPurge, $wgTmhFileExtensions );
// Also add the .log file ( used in two pass encoding )
// ( probably should move in-progress encodes out of web
accessible directory )
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php2011-06-11
21:40:11 UTC (rev 89896)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php2011-06-11
21:47:06 UTC (rev 89897)
@@ -97,9 +97,9 @@
// List of extensions handled by Timed Media Handler since its referenced in a
few places.
// you should not modify this variable
-$tmhFileExtensions = array( 'ogg', 'ogv', 'oga', 'webm');
+$wgTmhFileExtensions = array( 'ogg', 'ogv', 'oga', 'webm');
-$wgFileExtensions = array_merge($wgFileExtensions, $tmhFileExtensions);
+$wgFileExtensions = array_merge( $wgFileExtensions, $wgTmhFileExtensions );
// Timed Media Handler AutoLoad Classes:
$wgAutoloadClasses['TimedMediaHandler'] =
$timedMediaDir/TimedMediaHandler_body.php;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89898] trunk/extensions/Interwiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89898
Revision: 89898
Author: robin
Date: 2011-06-11 22:14:03 + (Sat, 11 Jun 2011)
Log Message:
---
Show an error when prefix or URL is empty, instead of adding it.
Various other small fixes, including:
* Show return to Special:Interwiki always when on the submit form
* Use nice url Special:Interwiki/add instead of ...action=add
* Move inline css to css file
Modified Paths:
--
trunk/extensions/Interwiki/Interwiki.css
trunk/extensions/Interwiki/Interwiki.i18n.php
trunk/extensions/Interwiki/Interwiki.php
trunk/extensions/Interwiki/Interwiki_body.php
Modified: trunk/extensions/Interwiki/Interwiki.css
===
--- trunk/extensions/Interwiki/Interwiki.css2011-06-11 21:47:06 UTC (rev
89897)
+++ trunk/extensions/Interwiki/Interwiki.css2011-06-11 22:14:03 UTC (rev
89898)
@@ -1,6 +1,10 @@
/**
* CSS for Special:Interwiki
*/
+table.mw-interwikitable {
+ width: 100%;
+}
+
table.mw-interwikitable.intro th {
padding-right: 1.4ex;
vertical-align: top;
Modified: trunk/extensions/Interwiki/Interwiki.i18n.php
===
--- trunk/extensions/Interwiki/Interwiki.i18n.php 2011-06-11 21:47:06 UTC
(rev 89897)
+++ trunk/extensions/Interwiki/Interwiki.i18n.php 2011-06-11 22:14:03 UTC
(rev 89898)
@@ -46,7 +46,7 @@
'interwiki_trans_intro' = 'If wikitext syntax code{nowiki
/{prefix:ipagename/i}}/code is used, then:',
'interwiki_trans_1_intro' = 'allow transclusion from the foreign wiki,
if interwiki transclusions are generally permitted in this wiki,',
'interwiki_trans_0_intro' = 'do not allow it, rather look for a page
in the template namespace.',
- 'interwiki_intro_footer' = 'See
[http://www.mediawiki.org/wiki/Interwiki_table MediaWiki.org] for more
information about the interwiki table.
+ 'interwiki_intro_footer' = 'See
[http://www.mediawiki.org/wiki/Manual:Interwiki_table MediaWiki.org] for more
information about the interwiki table.
There is a [[Special:Log/interwiki|log of changes]] to the interwiki table.',
'interwiki_1' = 'yes',
'interwiki_0' = 'no',
@@ -70,16 +70,17 @@
'interwiki_added' = 'Prefix $1 was successfully added to the
interwiki table.',
'interwiki_addfailed' = 'Prefix $1 could not be added to the
interwiki table.
Possibly it already exists in the interwiki table.',
- 'interwiki_defaulturl' = 'http://www.example.com/$1', # do not
translate or duplicate this message to other languages
+ 'interwiki-defaulturl' = 'http://www.example.com/$1', # do not
translate or duplicate this message to other languages
# editing a prefix
'interwiki_edittext' = 'Editing an interwiki prefix',
'interwiki_editintro' = 'You are editing an interwiki prefix.
Remember that this can break existing links.',
'interwiki_edited' = 'Prefix $1 was successfully modified in the
interwiki table.',
- 'interwiki_editerror' = 'Prefix $1 can not be modified in the
interwiki table.
+ 'interwiki_editerror' = 'Prefix $1 could not be modified in the
interwiki table.
Possibly it does not exist.',
'interwiki-badprefix' = 'Specified interwiki prefix $1 contains
invalid characters',
+ 'interwiki-submit-empty' = 'The prefix and URL cannot be empty.',
# interwiki log
'interwiki_logpagename' = 'Interwiki table log',
Modified: trunk/extensions/Interwiki/Interwiki.php
===
--- trunk/extensions/Interwiki/Interwiki.php2011-06-11 21:47:06 UTC (rev
89897)
+++ trunk/extensions/Interwiki/Interwiki.php2011-06-11 22:14:03 UTC (rev
89898)
@@ -9,7 +9,7 @@
* @ingroup Extensions
* @version 1.3
* @author Stephanie Amanda Stevens phroz...@gmail.com
- * @author SPQRobin robin_1...@hotmail.com
+ * @author SPQRobin robinp.1...@gmail.com
* @copyright Copyright © 2005-2007 Stephanie Amanda Stevens
* @copyright Copyright © 2007 SPQRobin
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
@@ -26,7 +26,7 @@
'path' = __FILE__,
'name' = 'SpecialInterwiki',
'author' = array( 'Stephanie Amanda Stevens', 'SPQRobin', '...' ),
- 'version' = '1.3.2',
+ 'version' = '1.4.0',
'url' = 'http://www.mediawiki.org/wiki/Extension:SpecialInterwiki',
'descriptionmsg' = 'interwiki-desc',
);
Modified: trunk/extensions/Interwiki/Interwiki_body.php
===
--- trunk/extensions/Interwiki/Interwiki_body.php 2011-06-11 21:47:06 UTC
(rev 89897)
+++ trunk/extensions/Interwiki/Interwiki_body.php 2011-06-11 22:14:03 UTC
(rev 89898)
@@ -38,40 +38,37 @@
$admin = $wgUser-isAllowed( 'interwiki' );
[MediaWiki-CVS] SVN: [89899] trunk/extensions/WikimediaIncubator
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89899
Revision: 89899
Author: robin
Date: 2011-06-11 23:02:13 + (Sat, 11 Jun 2011)
Log Message:
---
* Ability to choose which test wiki for RandomByTest
* Small fixes for ViewUserLang
* Validate prefix in recent changes (if invalid, show all recent changes)
Modified Paths:
--
trunk/extensions/WikimediaIncubator/IncubatorTest.php
trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php
trunk/extensions/WikimediaIncubator/SpecialViewUserLang.php
trunk/extensions/WikimediaIncubator/TestWikiRC.php
trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
Modified: trunk/extensions/WikimediaIncubator/IncubatorTest.php
===
--- trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-06-11
22:14:03 UTC (rev 89898)
+++ trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-06-11
23:02:13 UTC (rev 89899)
@@ -104,7 +104,7 @@
*/
static function validatePrefix( $title, $onlyprefix = false ) {
$data = self::analyzePrefix( $title, $onlyprefix );
- if( isset( $data['error'] ) ) { return true; }
+ if( !isset( $data['error'] ) ) { return true; }
return false;
}
@@ -252,7 +252,7 @@
static function efLoadViewUserLangLink( $id, $nt, $links ) {
global $wgUser;
if ( $wgUser-isAllowed( 'viewuserlang' ) ) {
- $user = wfUrlencode( $nt-getText() );
+ $user = $nt-getText();
$links[] = $wgUser-getSkin()-link(
SpecialPage::getTitleFor( 'ViewUserLang', $user
),
wfMsgHtml( 'wminc-viewuserlang' )
Modified: trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php
===
--- trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php 2011-06-11
22:14:03 UTC (rev 89898)
+++ trunk/extensions/WikimediaIncubator/SpecialRandomByTest.php 2011-06-11
23:02:13 UTC (rev 89899)
@@ -7,11 +7,15 @@
class SpecialRandomByTest extends RandomPage
{
public function __construct() {
- global $wgUser, $wmincPref, $wmincProjectSite;
- if( IncubatorTest::isContentProject() ) {
+ global $wgUser, $wgRequest, $wmincPref, $wmincProjectSite;
+ $target = $wgRequest-getVal( 'testwiki' );
+ $target = IncubatorTest::analyzePrefix( $target );
+ $project = ( isset( $target['project'] ) ? $target['project'] :
'' );
+ $lang = ( isset( $target['lang'] ) ? $target['lang'] : '' );
+ if( IncubatorTest::isContentProject() || ($project $lang) ) {
$dbr = wfGetDB( DB_SLAVE );
$this-extra[] = 'page_title' .
- $dbr-buildLike( IncubatorTest::displayPrefix()
. '/', $dbr-anyString() );
+ $dbr-buildLike( IncubatorTest::displayPrefix(
$project, $lang ) . '/', $dbr-anyString() );
} elseif($wgUser-getOption($wmincPref . '-project') ==
$wmincProjectSite['short'] ) {
global $wgVersion;
// only works above MW 1.17
Modified: trunk/extensions/WikimediaIncubator/SpecialViewUserLang.php
===
--- trunk/extensions/WikimediaIncubator/SpecialViewUserLang.php 2011-06-11
22:14:03 UTC (rev 89898)
+++ trunk/extensions/WikimediaIncubator/SpecialViewUserLang.php 2011-06-11
23:02:13 UTC (rev 89899)
@@ -70,12 +70,15 @@
global $wgOut, $wmincPref, $wmincProjectSite, $wgUser;
$sk = $wgUser-getSkin();
$user = User::newFromName( $target );
+ $name = $user-getName();
+ $id = $user-getId();
$langNames = Language::getLanguageNames();
- if ( $user == null || $user-getId() == 0 ) {
+ if ( $user == null || $id == 0 ) {
// show error if a user with that name does not exist
$wgOut-addHTML( Xml::span( wfMsg(
'wminc-userdoesnotexist', $target ), 'error' ) );
} else {
$userproject = $user-getOption( $wmincPref .
'-project' );
+ $userproject = ($userproject ? $userproject : 'none');
$usercode = $user-getOption( $wmincPref . '-code' );
$prefix = IncubatorTest::displayPrefix( $userproject,
$usercode );
if ( IncubatorTest::isContentProject( $userproject ) ) {
@@ -85,11 +88,10 @@
} else {
$testwiki = wfMsgHtml( 'wminc-testwiki-none' );
}
- $name = $user-getName();
[MediaWiki-CVS] SVN: [89900] trunk/extensions/Vector/modules/ext.vector.simpleSearch.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89900
Revision: 89900
Author: wikinaut
Date: 2011-06-11 23:13:39 + (Sat, 11 Jun 2011)
Log Message:
---
expressly set opensearch limit. Found a reproducible problem that on a large
wiki a few case-insensitive matches were not shown when limit was not set to a
meaningful value. But api.php has been found working by testing that via manual
call from url. Perhaps a jQuery problem. Set limit to an value solved that
problem immediately.
Modified Paths:
--
trunk/extensions/Vector/modules/ext.vector.simpleSearch.js
Modified: trunk/extensions/Vector/modules/ext.vector.simpleSearch.js
===
--- trunk/extensions/Vector/modules/ext.vector.simpleSearch.js 2011-06-11
23:02:13 UTC (rev 89899)
+++ trunk/extensions/Vector/modules/ext.vector.simpleSearch.js 2011-06-11
23:13:39 UTC (rev 89900)
@@ -48,6 +48,7 @@
data: {
action: 'opensearch',
search: query,
+ limit: 10,
namespace: 0,
suggest: ''
},
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89901] trunk/phase3/resources/jquery/jquery.makeCollapsible.css
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89901
Revision: 89901
Author: krinkle
Date: 2011-06-12 00:17:02 + (Sun, 12 Jun 2011)
Log Message:
---
Remove resize/arrow cursors from jquery.makeCollapsible
* In Safari they look nice (a visual clue which direction we're heading
on-click) but on other browsers there is only a general arrow-icon that points
both up and down, and other browsers have an even weirder cursor for this.
Summarized: It's inconsistent and redundant with the text-label we already have.
(Poke r79083 CR)
Modified Paths:
--
trunk/phase3/resources/jquery/jquery.makeCollapsible.css
Modified: trunk/phase3/resources/jquery/jquery.makeCollapsible.css
===
--- trunk/phase3/resources/jquery/jquery.makeCollapsible.css2011-06-11
23:13:39 UTC (rev 89900)
+++ trunk/phase3/resources/jquery/jquery.makeCollapsible.css2011-06-12
00:17:02 UTC (rev 89901)
@@ -1,20 +1,14 @@
/* See also jquery.makeCollapsible.js */
.mw-collapsible-toggle {
- float:right;
+ float: right;
}
-.mw-collapsible-toggle-expanded,
-.mw-collapsible-toggle-expanded a {
- cursor:n-resize;
-}
-.mw-collapsible-toggle-collapsed,
-.mw-collapsible-toggle-collapsed a {
- cursor:s-resize;
-}
+
/* list-items go as wide as their parent element, don't float them inside list
items */
li .mw-collapsible-toggle {
- float:none;
+ float: none;
}
+
/* the added list item should have no list-style */
.mw-collapsible-toggle-li {
- list-style:none;
-}
\ No newline at end of file
+ list-style: none;
+}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89902] trunk/fundraiser-statistics/fundraiser-scripts/classes/ FundraiserDataThreading.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89902
Revision: 89902
Author: rfaulk
Date: 2011-06-12 01:42:26 + (Sun, 12 Jun 2011)
Log Message:
---
Module added for handling multithreading of analytics processing. Wrote
MinerThread class which performs the simple function of executing log mining in
a separate thread for web reporting. Some refactoring to decouple this module
from the DataMapper may be necessary.
Added Paths:
---
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataThreading.py
Added:
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataThreading.py
===
---
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataThreading.py
(rev 0)
+++
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataThreading.py
2011-06-12 01:42:26 UTC (rev 89902)
@@ -0,0 +1,51 @@
+
+
+This module provides access to the threading classes for Fundraiser Analytics
related tasks.
+This is configured as a set of classes that extend the python threading
classes to build
+containers for multi-threading where needed
+
+
+
+__author__ = Ryan Faulkner
+__revision__ = $Rev$
+__date__ = June 10th, 2011
+
+import threading
+import re
+import Fundraiser_Tools.classes.DataMapper as DM
+
+
+This class handles executing a log mining process in a new thread
+
+class MinerThread ( threading.Thread ):
+
+_fdm_ = None
+_log_name_ = None
+
+def __init__(self, log_name):
+threading.Thread.__init__(self)
+self._fdm_ = DM.FundraiserDataMapper()
+self._log_name_ = log_name
+
+def run( self ):
+ self.call_mine_log()
+
+def call_mine_log(self):
+
+if re.search('bannerImpressions', self._log_name_):
+print 'New Thread: Mining banner impressions from ' +
self._log_name_
+
+try:
+self._fdm_.mine_squid_impression_requests(self._log_name_ +
'.log.gz')
+except:
+self._fdm_.mine_squid_impression_requests(self._log_name_ +
'.log')
+
+elif re.search('landingpages', self._log_name_):
+print 'New Thread: Mining landing page views from ' +
self._log_name_
+
+try:
+self._fdm_.mine_squid_landing_page_requests(self._log_name_ +
'.log.gz')
+except:
+self._fdm_.mine_squid_landing_page_requests(self._log_name_ +
'.log')
+
+
\ No newline at end of file
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89903] trunk/fundraiser-statistics/fundraiser-scripts/classes/ DataLoader.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89903 Revision: 89903 Author: rfaulk Date: 2011-06-12 01:45:00 + (Sun, 12 Jun 2011) Log Message: --- Modification that emits the query name whenever a query is executed some new fields added to the squid log record table loader Modified Paths: -- trunk/fundraiser-statistics/fundraiser-scripts/classes/DataLoader.py Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/DataLoader.py === --- trunk/fundraiser-statistics/fundraiser-scripts/classes/DataLoader.py 2011-06-12 01:42:26 UTC (rev 89902) +++ trunk/fundraiser-statistics/fundraiser-scripts/classes/DataLoader.py 2011-06-12 01:45:00 UTC (rev 89903) @@ -1,7 +1,7 @@ This module provides access to the datasource and enables querying. The class -atructure defined has DataLoader as the base which outlines the basic members +structure defined has DataLoader as the base which outlines the basic members and functionality. This interface is extended for interaction with specific sources of data. @@ -228,6 +228,7 @@ self.init_db() query_name = self.get_sql_filename_for_query() +print sys.stdout, 'Using query: ' + query_name metrics = Hlp.AutoVivification() times = Hlp.AutoVivification() @@ -255,7 +256,7 @@ metric_index = QD.get_metric_index(query_name, metric_name) time_index = QD.get_time_index(query_name) - + Compose the data for each separate donor pipeline artifact try: # err_msg = sql_stmnt @@ -324,6 +325,11 @@ for key in metrics.keys(): metrics_new = list() for i in range(len(metrics[key])): + + Change null values to 0 +if metrics[key][i] == None or metrics[key][i] == 'NULL': + metrics[key][i] = 0 + metrics_new.append(float(metrics[key][i])) metrics[key] = metrics_new @@ -343,6 +349,7 @@ def combine_rows(self): query_name = self.get_sql_filename_for_query() +print sys.stdout, 'Using query: ' + query_name col_types = self._data_handler_.get_col_types(self._query_type_) key_index = QD.get_key_index(query_name) @@ -361,7 +368,7 @@ key = row[key_index] try: -data_dict[key] == None +data_dict[key] == None # check for a Index Error except KeyError as e: data_dict[key] = dict() @@ -370,6 +377,10 @@ col_type = col_types[i] field = row[i] + Change null values to 0 +if field == None or field == 'NULL': +field = 0.0 + if col_type == self._data_handler_._COLTYPE_RATE_: try: @@ -737,10 +748,11 @@ end_time = params['end_time'] query_name = self.get_sql_filename_for_query() +print sys.stdout, 'Using query: ' + query_name Load the SQL File Format filename = self._sql_path_+ query_name + '.sql' -sql_stmnt = Hlp.read_sql(filename) +sql_stmnt = Hlp.read_sql(filename) sql_stmnt = QD.format_query(query_name, sql_stmnt, [start_time, end_time]) Get Indexes into Query @@ -789,6 +801,7 @@ end_time = params['end_time'] query_name = self.get_sql_filename_for_query() +print sys.stdout, 'Using query: ' + query_name Load the SQL File Format filename = self._sql_path_+ query_name + '.sql' @@ -1250,7 +1263,8 @@ def get_all_rows_unique_start_time(self): select_stmnt = 'select type, log_copy_time, start_time, end_time, log_completion_pct, total_rows from ' \ -'(select max(log_copy_time) as max_copy_time from squid_log_record group by start_time) as temp join squid_log_record on max_copy_time = squid_log_record.log_copy_time' +'(select type as temp_type, max(log_copy_time) as max_copy_time from squid_log_record group by type, start_time) as temp join ' \ +'squid_log_record on (max_copy_time = squid_log_record.log_copy_time and temp_type = type)' self.init_db() @@ -1260,7 +1274,7 @@ except: self._db_.rollback() self.close_db() -print sys.stderr, 'Could not execute: ' + update_stmnt +print sys.stderr, 'Could not execute: ' + select_stmnt return -1 else: self.close_db() ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org
[MediaWiki-CVS] SVN: [89904] trunk/fundraiser-statistics/fundraiser-scripts/classes/ DataMapper.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89904
Revision: 89904
Author: rfaulk
Date: 2011-06-12 01:49:53 + (Sun, 12 Jun 2011)
Log Message:
---
Additions:
copy_logs method copies all logs available for the current hour - this will
require synchronization with the logging scripts when in production
get_list_of_logs method for pulling a list of log names for a given hour
abstracted log opening source to its own method open_logfile
abstracted log timestamp parsing to new method get_first_timestamp_from_log
refactored and added comments to both mine_squid_landing_page_requests and
mine_squid_impression_requests
Modified Paths:
--
trunk/fundraiser-statistics/fundraiser-scripts/classes/DataMapper.py
Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/DataMapper.py
===
--- trunk/fundraiser-statistics/fundraiser-scripts/classes/DataMapper.py
2011-06-12 01:45:00 UTC (rev 89903)
+++ trunk/fundraiser-statistics/fundraiser-scripts/classes/DataMapper.py
2011-06-12 01:49:53 UTC (rev 89904)
@@ -47,33 +47,76 @@
class DataMapper(object):
-Copies mining logs from remote site
+Copies mining logs from remote site for a given hour
-def copy_logs(self, type):
+def copy_logs(self, type, **kwargs):
-# '/archive/udplogs'
+if type == FDH._TESTTYPE_BANNER_:
+# prefix = 'bannerImpressions-2011-06-01-11PM*'
+prefix = 'bannerImpressions'
+elif type == FDH._TESTTYPE_LP_:
+# prefix = 'landingpages-2011-06-01-11PM*'
+prefix = 'landingpages'
+filename = prefix
+
now = datetime.datetime.now()
+year = str(now.year)
+month = str(now.month)
+day = str(now.day)
+hour = now.hour
-
-if type == FDH._TESTTYPE_BANNER_:
-prefix = 'bannerImpressions-'
-elif type == FDH._TESTTYPE_LP_:
-prefix = 'landingpages-'
+ If specified change the timestamp Assume each arg is a string
+for key in kwargs:
+
+if key == 'year':
+year = kwargs[key]
+elif key == 'month':
+month = kwargs[key]
+elif key == 'day':
+day = kwargs[key]
+elif key == 'hour':
+hour = int(kwargs[key])
-if now.hour 12:
-filename = prefix + str(now.year) + '-' + str(now.month) + '-' +
str(now.day) + '-' + str(now.hour - 12) + 'PM*'
+if int(month) 10:
+month = '0' + str(int(month))
+if int(day) 10:
+day = '0' + str(int(day))
+
+ adjust the hour based on time of day
+if hour 12:
+hour = str(hour-12)
+day_part = 'PM*'
else:
-filename = prefix + str(now.year) + '-' + str(now.month) + '-' +
str(now.day) + '-' + str(now.hour) + 'AM*'
+hour = str(hour)
+day_part = 'AM*'
-filename = 'bannerImpressions-2011-05-27-11PM--25*'
-
+if int(hour) 10:
+hour = '0' + str(int(hour))
+
+filename = filename + '-' + year + '-' + month + '-' + day + '-' +
hour + day_part
+#filename = 'bannerImpressions-2011-05-27-11PM--25*'
+# filename = prefix + '-2011-06-01-11PM*'
cmd = 'sftp ' + projSet.__user__ + '@' + projSet.__squid_log_server__
+ ':' + projSet.__squid_log_home__ + filename + ' ' +
projSet.__squid_log_local_home__
os.system(cmd)
-
+
return filename
+
+Return a listing of all of the squid logs
+
+def get_list_of_logs(self):
+
+files = os.listdir(projSet.__squid_log_local_home__)
+files.sort()
+
+new_files = list()
+for f in files:
+new_files.append(f.split('.')[0])
+
+return new_files[1:]
+
CLASS :: FundraiserDataMapper
@@ -91,7 +134,6 @@
_db = None
_cur = None
-_squid_log_directory_ = projSet.__project_home__ + 'logs/'
_impression_table_name_ = 'banner_impressions'
_landing_page_table_name_ = 'landing_page_requests'
@@ -135,32 +177,34 @@
+Given the name of a log file extract the squid requests corresponding
to banner impressions.
+Squid logs can be found under hume:/a/static/uncompressed/udplogs. A
sample request is documented in the source below.
+
def mine_squid_impression_requests(self, logFileName):
-
+
self._init_db()
sltl = DL.SquidLogTableLoader()
itl = DL.ImpressionTableLoader()
Retrieve the log timestamp from the filename
-time_stamps = Hlp.get_timestamps(logFileName)
[MediaWiki-CVS] SVN: [89905] trunk/fundraiser-statistics/fundraiser-scripts/classes/ DataReporting.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89905 Revision: 89905 Author: rfaulk Date: 2011-06-12 01:51:11 + (Sun, 12 Jun 2011) Log Message: --- Adjusted height of plots relative to max datapoint added comments Modified Paths: -- trunk/fundraiser-statistics/fundraiser-scripts/classes/DataReporting.py Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/DataReporting.py === --- trunk/fundraiser-statistics/fundraiser-scripts/classes/DataReporting.py 2011-06-12 01:49:53 UTC (rev 89904) +++ trunk/fundraiser-statistics/fundraiser-scripts/classes/DataReporting.py 2011-06-12 01:51:11 UTC (rev 89905) @@ -23,6 +23,7 @@ import datetime import MySQLdb import pylab +from matplotlib.lines import Line2D import HTML import math @@ -229,8 +230,6 @@ class IntervalReporting(DataReporting): - - Constructor for IntervalReporting @@ -257,7 +256,7 @@ -description +Usage instructions for executing a report via the IntervalReporting class def usage(self): @@ -297,9 +296,7 @@ Protected method. Execute reporting query and generate plots. -INPUT: - -RETURN: +INPUT:The inputs define the plot arguments def _gen_plot(self, metrics, times, title, xlabel, ylabel, ranges, subplot_index, fname, labels): @@ -313,9 +310,9 @@ count = 0 for key in metrics.keys(): if self._plot_type_ == 'step': -pylab.step(times[key], metrics[key], line_types[count]) +pylab.step(times[key], metrics[key], line_types[count], linewidth=3.0) elif self._plot_type_ == 'line': -pylab.plot(times[key][1:], metrics[key][1:], line_types[count]) +pylab.plot(times[key][1:], metrics[key][1:], line_types[count], linewidth=3.0) count = count + 1 Set the figure and font size @@ -346,6 +343,9 @@ else: pylab.legend(metrics.keys(),loc=2) +# add_line(Line2D([0.5, 0.5], [0, 1], transform=a.transAxes, linewidth=2, color='b')) + + pylab.xlabel(xlabel) pylab.ylabel(ylabel) @@ -404,13 +404,7 @@ generate state - post processing of state data - generate plot INPUT: -start_time - -end_time - -interval - -query_type - -metric_name- -campaign - -labels - +The inputs serve as query arguments def run(self, start_time, end_time, interval, metric_name, campaign, labels): @@ -424,10 +418,10 @@ if len(self._item_keys_) 0: self._counts_ = self.select_metric_keys(self._counts_) self._times_ = self.select_metric_keys(self._times_) - +print self._counts_ Convert Times to Integers that indicate relative times AND normalize the intervals in case any are missing for key in self._times_.keys(): -self._times_[key] = TP.normalize_timestamps(self._times_[key], False, 2) +self._times_[key] = TP.normalize_timestamps(self._times_[key], False, 3) self._times_[key], self._counts_[key] = TP.normalize_intervals(self._times_[key], self._counts_[key], interval) Normalize times @@ -461,7 +455,7 @@ ranges.append(0.0) ranges.append(times_max * 1.1) ranges.append(0.0) -ranges.append(metrics_max * 1.1) +ranges.append(metrics_max * 1.5) Generate plots given data self._gen_plot(self._counts_, self._times_, title, xlabel, ylabel, ranges, subplot_index, fname, labels) @@ -576,13 +570,11 @@ def _gen_box_plot(self, data, title, ylabel, subplot_index, labels, fname): -print data -print labels pylab.subplot(subplot_index) pylab.figure(num=None,figsize=[26,14]) -bp = pylab.boxplot(data) +bp = pylab.boxplot(data, sym='b+') pylab.xticks(range(1, len(labels) + 1), labels) Set the figure and font size @@ -652,7 +644,7 @@ winner = labels[0] else: winner = labels[1] - + win_str = '\nThe winner ' + winner + ' had a %.2f%s increase.' win_str = win_str % (percent_increase, '%') @@ -741,7 +733,7 @@ max_mean = max(max(means_1),max(means_2)) max_sd = max(max(std_devs_1),max(std_devs_2)) max_y = float(max_mean) + float(max_sd) -max_y = max_y + 0.1 * max_y +max_y = max_y + 0.5 *
[MediaWiki-CVS] SVN: [89906] trunk/fundraiser-statistics/fundraiser-scripts/classes/Helper. py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89906
Revision: 89906
Author: rfaulk
Date: 2011-06-12 01:52:52 + (Sun, 12 Jun 2011)
Log Message:
---
removed redundant methods: get_timestamps, getPrevHour, getNextHour
convert_Decimal_list_to_float method converts NULL values to 0
Modified Paths:
--
trunk/fundraiser-statistics/fundraiser-scripts/classes/Helper.py
Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/Helper.py
===
--- trunk/fundraiser-statistics/fundraiser-scripts/classes/Helper.py
2011-06-12 01:51:11 UTC (rev 89905)
+++ trunk/fundraiser-statistics/fundraiser-scripts/classes/Helper.py
2011-06-12 01:52:52 UTC (rev 89906)
@@ -42,8 +42,11 @@
new_lst = list()
for i in lst:
-new_lst.append(float(i))
-
+if i == None or i == 'NULL':
+new_lst.append(0.0)
+else:
+new_lst.append(float(i))
+
return new_lst
@@ -69,55 +72,8 @@
- Determines the following hour based on the precise date to the hour
-def getNextHour(year, month, day, hour):
-lastDayofMonth = cal.monthrange(year,month)[1]
-next_year = year
-next_month = month
-next_day = day
-next_hour = hour + 1
-
-if hour == 23:
-next_hour = 0
-if day == lastDayofMonth:
-next_day = 1
-if month == 12:
-next_month = 1
-next_year = year + 1
-
-return [next_year, next_month, next_day, next_hour]
-
- Determines the previous hour based on the precise date to the hour
-def getPrevHour(year, month, day, hour):
-
-if month == 1:
-last_year = year - 1
-last_month = 12
-else:
-last_year = year
-last_month = month - 1
-
-lastDayofPrevMonth = cal.monthrange(year,last_month)[1]
-
-prev_year = year
-prev_month = month
-prev_day = day
-prev_hour = hour - 1
-
-if prev_hour == -1:
-prev_hour = 23
-if day == 1:
-prev_day = lastDayofPrevMonth
-prev_month = last_month
-prev_year = last_year
-else:
-prev_day = day - 1
-
-return [prev_year, prev_month, prev_day, prev_hour]
-
-
class AutoVivification(dict):
Implementation of perl's autovivification feature.
def __getitem__(self, item):
@@ -153,49 +109,9 @@
def mod_list(lst, modulus):
return [x % modulus for x in lst]
-
- Extract a timestamp from the filename
-def get_timestamps(logFileName):
-
-fname_parts = logFileName.split('-')
-year = int(fname_parts[1])
-month = int(fname_parts[2])
-day = int(fname_parts[3])
-hour = int(fname_parts[4][0:2])
-# Is this an afternoon log?
-afternoon = (fname_parts[4][2:4] == 'PM')
-
-# Adjust the hour as necessary if == 12AM or *PM
-if afternoon and hour 12:
-hour = hour + 12
-
-if not(afternoon) and hour == 12:
-hour = 0
-prev_hr = getPrevHour(year, month, day, hour)
-
-str_month = '0' + str(month) if month 10 else str(month)
-str_day = '0' + str(day) if day 10 else str(day)
-str_hour = '0' + str(hour) if hour 10 else str(hour)
-
-prev_month = prev_hr[1]
-prev_day = prev_hr[2]
-prev_hour = prev_hr[3]
-str_prev_month = '0' + str(prev_month) if prev_month 10 else
str(prev_month)
-str_prev_day = '0' + str(prev_day) if prev_day 10 else str(prev_day)
-str_prev_hour = '0' + str(prev_hour) if prev_hour 10 else str(prev_hour)
-
-log_end = str(year) + str_month + str_day + str_hour + '5500'
-log_start = str(prev_hr[0]) + str_prev_month + str_prev_day +
str_prev_hour + '5500'
-
-#log_start = str(year) + str(month) + str(day) + str(hour) + '5500'
-#log_end = str(prev_hr[0]) + str(prev_hr[1]) + str(prev_hr[2]) +
str(prev_hr[3]) + '5500'
-
-return [log_start, log_end]
-
-
Compute the difference among two timestamps
def get_timestamps_diff(timestamp_start, timestamp_end):
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89907] trunk/fundraiser-statistics/fundraiser-scripts/classes/ HypothesisTest.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89907 Revision: 89907 Author: rfaulk Date: 2011-06-12 01:55:23 + (Sun, 12 Jun 2011) Log Message: --- Fixed bug associated with TTest where the lower estimate of the confidence interval is NULL. This is set to 0 (lower_p = 1 where conf = 1 - lower_p) instead. Modified Paths: -- trunk/fundraiser-statistics/fundraiser-scripts/classes/HypothesisTest.py Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/HypothesisTest.py === --- trunk/fundraiser-statistics/fundraiser-scripts/classes/HypothesisTest.py 2011-06-12 01:52:52 UTC (rev 89906) +++ trunk/fundraiser-statistics/fundraiser-scripts/classes/HypothesisTest.py 2011-06-12 01:55:23 UTC (rev 89907) @@ -301,6 +301,7 @@ prob_diffs = [math.fabs(i-p) for i in probs] min_index = min((n, i) for i, n in enumerate(prob_diffs))[1] +lower_p = 1 if min_index 0: lower_p = probs[min_index - 1] ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89908] trunk/fundraiser-statistics/fundraiser-scripts/classes/ QueryData.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89908
Revision: 89908
Author: rfaulk
Date: 2011-06-12 01:56:17 + (Sun, 12 Jun 2011)
Log Message:
---
modification of report_banner_metrics_minutely and report_LP_metrics_minutely
query formatting
Modified Paths:
--
trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py
Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py
===
--- trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py
2011-06-12 01:55:23 UTC (rev 89907)
+++ trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py
2011-06-12 01:56:17 UTC (rev 89908)
@@ -162,7 +162,7 @@
imp_start_time_obj_str = TP.timestamp_from_obj(imp_start_time_obj, 1,
3)
sql_stmnt = sql_stmnt % ('%', '%', '%', '%', interval, interval,
imp_start_time_obj_str, end_time, '%', '%', '%', '%', interval, interval,
start_time, end_time, campaign, \
-'%', '%', '%', '%', interval, interval,
start_time, end_time, '%', '%', '%', '%', interval, interval, start_time,
end_time, campaign)
+'%', '%', '%', '%', interval, interval,
start_time, end_time, '%', '%', '%', '%', interval, interval, start_time,
end_time, campaign, campaign)
elif query_name == 'report_LP_metrics_minutely':
start_time = args[0]
@@ -170,7 +170,7 @@
campaign = args[2]
interval = args[3]
-sql_stmnt = sql_stmnt % ('%', '%', '%', '%', interval, interval,
start_time, end_time, campaign, '%', '%', '%', '%', interval, interval,
start_time, end_time, campaign)
+sql_stmnt = sql_stmnt % ('%', '%', '%', '%', interval, interval,
start_time, end_time, campaign, '%', '%', '%', '%', interval, interval,
start_time, end_time, campaign, campaign)
elif query_name == 'report_campaign_metrics_minutely':
start_time = args[0]
@@ -421,7 +421,7 @@
return 2
elif metric_name == 'name':
return 0
-elif metric_name == 'timestamp':
+elif metric_name == 'earliest_timestamp':
return 3
else:
return -1
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89909] trunk/extensions/SemanticForms/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89909
Revision: 89909
Author: yaron
Date: 2011-06-12 02:33:36 + (Sun, 12 Jun 2011)
Log Message:
---
Moved code to display Yes or No language value into a new method,
SFUtils::getWordForYesOrNo()
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
trunk/extensions/SemanticForms/includes/SF_Utils.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
===
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2011-06-12
01:56:17 UTC (rev 89908)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2011-06-12
02:33:36 UTC (rev 89909)
@@ -886,42 +886,9 @@
// - this
handling will have to get more complex if other
//
possibilities get added
if ( count(
$cur_value ) == 1 ) {
- //
manually load SMW's message values here, in case they
- //
didn't get loaded before
- global
$wgVersion;
- if (
version_compare( $wgVersion, '1.16', '' ) ) {
-
wfLoadExtensionMessages( 'SemanticMediaWiki' );
- }
-
$words_for_false = explode( ',', wfMsgForContent( 'smw_false_words' ) );
- // for
each language, there's a series of words that are
- //
equal to false - get the word in the series that matches
- //
no; generally, that's the third word
-
$index_of_no = 2;
- if (
count( $words_for_false ) $index_of_no ) {
-
$no = ucwords( $words_for_false[$index_of_no] );
- }
elseif ( count( $words_for_false ) == 0 ) {
-
$no = 0; // some safe value if no words are found
- } else {
-
$no = ucwords( $words_for_false[0] );
- }
-
$cur_value_in_template = $no;
+
$cur_value_in_template = SFUtils::getWordForYesOrNo( false );
} elseif (
count( $cur_value ) == 2 ) {
- global
$wgVersion;
- if (
version_compare( $wgVersion, '1.16', '' ) ) {
-
wfLoadExtensionMessages( 'SemanticMediaWiki' );
- }
-
$words_for_true = explode( ',', wfMsgForContent( 'smw_true_words' ) );
- // get
the value in the 'true' series that tends to be yes,
- // and
go with that one - generally, that's the third word
-
$index_of_yes = 2;
- if (
count( $words_for_true ) $index_of_yes ) {
-
$yes = ucwords( $words_for_true[$index_of_yes] );
- }
elseif ( count( $words_for_true ) == 0 ) {
-
$yes = 1; // some safe value if no words are found
- } else {
-
[MediaWiki-CVS] SVN: [89910] trunk/extensions/SemanticForms/includes/SF_FormInputs.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89910
Revision: 89910
Author: yaron
Date: 2011-06-12 02:35:52 + (Sun, 12 Jun 2011)
Log Message:
---
Boolean properties can now also be handled by 'dropdown' and 'radiobutton', not
just 'checkbox'
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_FormInputs.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormInputs.php
===
--- trunk/extensions/SemanticForms/includes/SF_FormInputs.php 2011-06-12
02:33:36 UTC (rev 89909)
+++ trunk/extensions/SemanticForms/includes/SF_FormInputs.php 2011-06-12
02:35:52 UTC (rev 89910)
@@ -90,7 +90,7 @@
*/
class SFEnumInput extends SFFormInput {
public static function getOtherPropTypesHandled() {
- return array( 'enumeration' );
+ return array( 'enumeration', '_boo' );
}
public static function getValuesParameters() {
@@ -451,7 +451,7 @@
}
public static function getOtherPropTypesHandled() {
- return array();
+ return array( '_boo' );
}
public static function getHTML( $cur_value, $input_name, $is_mandatory,
$is_disabled, $other_args ) {
@@ -481,7 +481,16 @@
$innerDropdown .= option value=\\/option\n;
}
if ( ( $possible_values = $other_args['possible_values'] ) ==
null ) {
- $possible_values = array();
+ // If it's a Boolean property, display 'Yes' and 'No'
+ // as the values.
+ if ( $other_args['property_type'] == '_boo' ) {
+ $possible_values = array(
+ SFUtils::getWordForYesOrNo( true ),
+ SFUtils::getWordForYesOrNo( false ),
+ );
+ } else {
+ $possible_values = array();
+ }
}
foreach ( $possible_values as $possible_value ) {
$optionAttrs = array( 'value' = $possible_value );
@@ -523,8 +532,18 @@
public static function getHTML( $cur_value, $input_name, $is_mandatory,
$is_disabled, $other_args ) {
global $sfgTabIndex, $sfgFieldNum, $sfgShowOnSelect;
- if ( ( $possible_values = $other_args['possible_values'] ) ==
null )
- $possible_values = array();
+ if ( ( $possible_values = $other_args['possible_values'] ) ==
null ) {
+ // If it's a Boolean property, display 'Yes' and 'No'
+ // as the values.
+ if ( $other_args['property_type'] == '_boo' ) {
+ $possible_values = array(
+ SFUtils::getWordForYesOrNo( true ),
+ SFUtils::getWordForYesOrNo( false ),
+ );
+ } else {
+ $possible_values = array();
+ }
+ }
// Add a None value at the beginning, unless this is a
// mandatory field and there's a current value in place (either
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89911] trunk/extensions/SemanticForms/includes/SF_FormInputs.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89911
Revision: 89911
Author: yaron
Date: 2011-06-12 02:51:53 + (Sun, 12 Jun 2011)
Log Message:
---
Follow-up to r89910 - added in necessary check
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_FormInputs.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormInputs.php
===
--- trunk/extensions/SemanticForms/includes/SF_FormInputs.php 2011-06-12
02:35:52 UTC (rev 89910)
+++ trunk/extensions/SemanticForms/includes/SF_FormInputs.php 2011-06-12
02:51:53 UTC (rev 89911)
@@ -483,7 +483,7 @@
if ( ( $possible_values = $other_args['possible_values'] ) ==
null ) {
// If it's a Boolean property, display 'Yes' and 'No'
// as the values.
- if ( $other_args['property_type'] == '_boo' ) {
+ if ( array_key_exists( 'property_type', $other_args )
$other_args['property_type'] == '_boo' ) {
$possible_values = array(
SFUtils::getWordForYesOrNo( true ),
SFUtils::getWordForYesOrNo( false ),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89912] trunk/extensions/SemanticForms/includes/SF_FormField.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89912
Revision: 89912
Author: yaron
Date: 2011-06-12 02:58:13 + (Sun, 12 Jun 2011)
Log Message:
---
Added setting of 'property_type' field, passed in to form inputs (currently
used only by dropdown and radiobutton, to check for boolean properties)
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_FormField.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormField.php
===
--- trunk/extensions/SemanticForms/includes/SF_FormField.php2011-06-12
02:51:53 UTC (rev 89911)
+++ trunk/extensions/SemanticForms/includes/SF_FormField.php2011-06-12
02:58:13 UTC (rev 89912)
@@ -268,8 +268,11 @@
$other_args['value_labels'] =
$this-template_field-value_labels;
}
$other_args['is_list'] = ( $this-is_list ||
$this-template_field-is_list );
- if ( $this-template_field-semantic_property != '' !
array_key_exists( 'semantic_property', $other_args ) )
+ if ( $this-template_field-semantic_property != ''
+ ! array_key_exists( 'semantic_property', $other_args )
) {
$other_args['semantic_property'] =
$this-template_field-semantic_property;
+ $other_args['property_type'] =
$this-template_field-property_type;
+ }
// If autocompletion hasn't already been hardcoded in the form,
// and it's a property of type page, or a property of another
// type with 'autocomplete' specified, set the necessary
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89913] trunk/extensions/UploadWizard/resources/jquery/jquery.pubsub. js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89913
Revision: 89913
Author: neilk
Date: 2011-06-12 05:13:59 + (Sun, 12 Jun 2011)
Log Message:
---
readiness events, that can occur only once, and can be subscribed to even if
already occured
Modified Paths:
--
trunk/extensions/UploadWizard/resources/jquery/jquery.pubsub.js
Modified: trunk/extensions/UploadWizard/resources/jquery/jquery.pubsub.js
===
--- trunk/extensions/UploadWizard/resources/jquery/jquery.pubsub.js
2011-06-12 02:58:13 UTC (rev 89912)
+++ trunk/extensions/UploadWizard/resources/jquery/jquery.pubsub.js
2011-06-12 05:13:59 UTC (rev 89913)
@@ -2,6 +2,9 @@
* Minimal pubsub framework
*
* Loosely based on
https://github.com/phiggins42/bloody-jquery-plugins/pubsub.js, which is itself
BSD-licensed.
+ * Concept of 'ready' events is new, though.
+ *
+ * @author Neil Kandalgaonkar ne...@wikimedia.org
*/
( function( $ ) {
@@ -9,6 +12,11 @@
* Store of events - array of listener callbacks
*/
var subs = {};
+
+ /**
+* Store of ready events, as object of event name - argument array
+*/
+ var ready = {};
/**
* Publish an event
@@ -18,27 +26,60 @@
*/
$.publish = function( name /* , args... */ ) {
var args = [].slice.call( arguments, 1 );
- $.each( subs[name], function( i, sub ) {
- sub.apply( null, args );
- } );
- return subs[name].length;
+ if ( typeof subs[name] !== 'undefined' subs[name] instanceof
Array ) {
+ $.each( subs[name], function( i, sub ) {
+ sub.apply( null, args );
+ } );
+ return subs[name].length;
+ }
+ return 0;
};
/**
+* Publish a ready event. Ready events occur once only, so
+* subscribers will be called even if they subscribe later.
+* Additional variadic arguments after the event name are passed as
arguments to the subscriber functions
+* @param {String} name of event
+* @return {Number} number of subscribers
+*/
+ $.publishReady = function( name /*, args... */ ) {
+ if ( typeof ready[name] === 'undefined' ) {
+ var args = [].slice.call( arguments, 1 );
+ ready[name] = args;
+ $.publish.apply( null, arguments );
+ }
+ };
+
+ /**
* Subscribe to an event.
* @param {String} name of event to listen for
* @param {Function} callback to run when event occurs
* @return {Array} returns handle which can be used as argument to
unsubscribe()
*/
$.subscribe = function( name, fn ) {
- if (!subs[name]) {
+ if ( typeof subs[name] === 'undefined' ) {
subs[name] = [];
}
- subs[name].push(fn);
+ subs[name].push( fn );
return [ name, fn ];
};
/**
+* Subscribe to a ready event. See publishReady().
+* Subscribers will be called even if they subscribe long after the
event fired.
+* @param {String} name of event to listen for
+* @param {Function} callback to run now (if event already occurred) or
when event occurs
+* @return {Array} returns handle which can be used as argument to
unsubscribe()
+*/
+ $.subscribeReady = function( name, fn ) {
+ if ( ready[name] ) {
+ fn.apply( null, ready[name] );
+ } else {
+ $.subscribe( name, fn );
+ }
+ };
+
+ /**
* Given the handle of a particular subscription, remove it
* @param {Array} object returned by subscribe ( array of event name
and callback )
* @return {Boolean} success
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89914] trunk/extensions/UploadWizard/resources/mw.Uri.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89914
Revision: 89914
Author: neilk
Date: 2011-06-12 05:15:18 + (Sun, 12 Jun 2011)
Log Message:
---
fix for missing param values, linting
Modified Paths:
--
trunk/extensions/UploadWizard/resources/mw.Uri.js
Modified: trunk/extensions/UploadWizard/resources/mw.Uri.js
===
--- trunk/extensions/UploadWizard/resources/mw.Uri.js 2011-06-12 05:13:59 UTC
(rev 89913)
+++ trunk/extensions/UploadWizard/resources/mw.Uri.js 2011-06-12 05:15:18 UTC
(rev 89914)
@@ -161,7 +161,7 @@
uri.query.replace(
/(?:^|)([^=]*)(?:(=)([^]*))?/g, function ($0, $1, $2, $3) {
if ( $1 ) {
var k = mw.Uri.decode( $1 );
- var v = ($2 == '') ? null :
mw.Uri.decode( $3 );
+ var v = ( $2 === '' || typeof
$2 === 'undefined' ) ? null : mw.Uri.decode( $3 );
if ( typeof q[ k ] === 'string'
) {
q[ k ] = [ q[ k ] ];
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89915] trunk/extensions/UploadWizard/resources/mw.fileApi.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89915
Revision: 89915
Author: neilk
Date: 2011-06-12 05:17:38 + (Sun, 12 Jun 2011)
Log Message:
---
this is taken from mediawiki.special.upload.js -- should be its own lib
Added Paths:
---
trunk/extensions/UploadWizard/resources/mw.fileApi.js
Added: trunk/extensions/UploadWizard/resources/mw.fileApi.js
===
--- trunk/extensions/UploadWizard/resources/mw.fileApi.js
(rev 0)
+++ trunk/extensions/UploadWizard/resources/mw.fileApi.js 2011-06-12
05:17:38 UTC (rev 89915)
@@ -0,0 +1,31 @@
+/* miscellaneous fileApi routines -- partially copied from
mediawiki.special.upload.js, must refactor... */
+
+( function( $, mw ) {
+
+ /**
+* Is the FileAPI available with sufficient functionality?
+*/
+ mw.fileApi = {
+
+ isAvailable: function() {
+ return typeof window.FileReader !== 'undefined';
+ },
+
+ /**
+* Check if this is a recognizable image type...
+* Also excludes files over 10M to avoid going insane on memory
usage.
+*
+* @todo is there a way we can ask the browser what's supported
in imgs?
+*
+* @param {File} file
+* @return boolean
+*/
+ isPreviewableFile: function( file ) {
+ var known = [ 'image/png', 'image/gif',
'image/jpeg', 'image/svg+xml'],
+ tooHuge = 10 * 1024 * 1024;
+ return ( $.inArray( file.type, known ) !== -1 )
file.size 0 file.size tooHuge;
+ }
+
+ };
+
+} )( jQuery, mediaWiki );
Property changes on: trunk/extensions/UploadWizard/resources/mw.fileApi.js
___
Added: svn:eol-style
+ native
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89916] trunk/extensions/UploadWizard/test/jasmine
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89916
Revision: 89916
Author: neilk
Date: 2011-06-12 05:20:28 + (Sun, 12 Jun 2011)
Log Message:
---
tests for pubsub and units.bytes
Modified Paths:
--
trunk/extensions/UploadWizard/test/jasmine/SpecRunner.html
trunk/extensions/UploadWizard/test/jasmine/spec/mw.units.spec.js
Added Paths:
---
trunk/extensions/UploadWizard/test/jasmine/spec/mw.pubsub.spec.js
Modified: trunk/extensions/UploadWizard/test/jasmine/SpecRunner.html
===
--- trunk/extensions/UploadWizard/test/jasmine/SpecRunner.html 2011-06-12
05:17:38 UTC (rev 89915)
+++ trunk/extensions/UploadWizard/test/jasmine/SpecRunner.html 2011-06-12
05:20:28 UTC (rev 89916)
@@ -20,6 +20,7 @@
script type=text/javascript src=../../resources/mw.Api.edit.js/script
script type=text/javascript src=../../resources/mw.Title.js/script
script type=text/javascript src=../../resources/mw.units.js/script
+ script type=text/javascript
src=../../resources/jquery/jquery.pubsub.js/script
script type=text/javascript
src=spec/mediawiki.language.parser.spec.data.js/script
@@ -33,6 +34,7 @@
script type=text/javascript src=spec/mw.Title.spec.js/script
script type=text/javascript src=spec/mw.units.spec.js/script
+ script type=text/javascript src=spec/mw.pubsub.spec.js/script
/head
body
Added: trunk/extensions/UploadWizard/test/jasmine/spec/mw.pubsub.spec.js
===
--- trunk/extensions/UploadWizard/test/jasmine/spec/mw.pubsub.spec.js
(rev 0)
+++ trunk/extensions/UploadWizard/test/jasmine/spec/mw.pubsub.spec.js
2011-06-12 05:20:28 UTC (rev 89916)
@@ -0,0 +1,52 @@
+( function( mw, $ ) {
+ describe( mw.pubsub, function() {
+
+ it( should allow subscription, function() {
+ var sub1data = [ 'foo', 'bar' ];
+ var result;
+ $.subscribe( 'sub1', function( arg ) {
+ result = arg;
+ } );
+ $.publish( 'sub1', sub1data );
+ expect( result ).toBe( sub1data );
+ } );
+
+ it( should allow multiple subscription, function() {
+ var sub1data = [ 'foo', 'bar' ];
+ var result;
+ var result2;
+ $.subscribe( 'sub1', function( arg ) {
+ result = arg;
+ } );
+ $.subscribe( 'sub1', function( arg ) {
+ result2 = arg;
+ } );
+ $.publish( 'sub1', sub1data );
+ expect( result ).toBe( sub1data );
+ expect( result2 ).toBe( sub1data );
+ } );
+
+ it( should allow timeline subscription with publishing after
subscription, function() {
+ var sub2data = [ 'quux', 'pif' ];
+ var result;
+ $.subscribeTimeline( 'sub2', function( arg ) {
+ result = arg;
+ } );
+ $.publishTimeline( 'sub2', sub2data );
+ expect( result ).toBe( sub2data );
+ } );
+
+
+ it( should allow timeline subscription with subscription after
publishing, function() {
+ var sub3data = [ 'paf', 'klortho' ];
+ var result;
+ $.publishTimeline( 'sub3', sub3data );
+ $.subscribeTimeline( 'sub3', function( arg ) {
+ result = arg;
+ } );
+ expect( result ).toBe( sub3data );
+ } );
+
+ } );
+
+} )( mediaWiki, jQuery );
Property changes on:
trunk/extensions/UploadWizard/test/jasmine/spec/mw.pubsub.spec.js
___
Added: svn:eol-style
+ native
Modified: trunk/extensions/UploadWizard/test/jasmine/spec/mw.units.spec.js
===
--- trunk/extensions/UploadWizard/test/jasmine/spec/mw.units.spec.js
2011-06-12 05:17:38 UTC (rev 89915)
+++ trunk/extensions/UploadWizard/test/jasmine/spec/mw.units.spec.js
2011-06-12 05:20:28 UTC (rev 89916)
@@ -16,28 +16,44 @@
expect( mw.units.bytes( 0 ) ).toEqual( '0 bytes' );
} );
- it( should say 7 bytes, function() {
+ it( should say bytes, function() {
expect( mw.units.bytes( 7 ) ).toEqual( '7 bytes' );
} );
- it( should say 900 bytes, function() {
+ it( should say bytes (900),
[MediaWiki-CVS] SVN: [89917] trunk/extensions/UploadWizard/UploadWizard.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89917
Revision: 89917
Author: neilk
Date: 2011-06-12 05:22:54 + (Sun, 12 Jun 2011)
Log Message:
---
messages for mw.units.bytes
Modified Paths:
--
trunk/extensions/UploadWizard/UploadWizard.i18n.php
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-06-12 05:20:28 UTC
(rev 89916)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-06-12 05:22:54 UTC
(rev 89917)
@@ -268,8 +268,15 @@
'mwe-upwiz-feedback-adding' = 'Adding feedback to page...',
'mwe-upwiz-feedback-error1' = 'Error: Unrecognized result from API',
'mwe-upwiz-feedback-error2' = 'Error: Edit failed',
- 'mwe-upwiz-feedback-error3' = 'Error: No response from API'
-
+ 'mwe-upwiz-feedback-error3' = 'Error: No response from API',
+
+ // similar to mediawiki.special.upload.js
+ 'size-terabytes' = '$1 TB',
+ 'size-gigabytes' = '$1 GB',
+ 'size-megabytes' = '$1 MB',
+ 'size-kilobytes' = '$1 K',
+ 'size-bytes' = '$1 bytes'
+
);
/** Message documentation (Message documentation)
@@ -393,7 +400,7 @@
'mwe-upwiz-feedback-cancel' = 'Button label
{{Identical|Cancel}}',
'mwe-upwiz-feedback-submit' = 'Button label',
- 'mwe-upwiz-feedback-adding' = 'Progress notice',
+ 'mwe-upwiz-feedback-adding' = 'Progress notice'
);
/** Afrikaans (Afrikaans)
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [89918] trunk/extensions/UploadWizard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89918
Revision: 89918
Author: neilk
Date: 2011-06-12 05:28:16 + (Sun, 12 Jun 2011)
Log Message:
---
Use FileAPI for previews when possible.
This complicates the situation of when a thumbnail may be generated. Depending
on config or layout, it could be any of:
1) Thumbnail wanted before ready
2) Thumbnail wanted after ready
multiplied by
1) FileAPI, locally scaled
2) Stashed Image API, remotely scaled, with exponential backoff retries
3) Image API, remotely scaled, with exponential backoff retries
And of course all the error conditions!
So, I have moved to a different model for obtaining thumbnails, where you just
declare that a certain HTML element needs a thumbnail with
setThumbnail(), and the framework figures out what it's supposed to do, and the
thumbnail should show up eventually (or finally
give you a broken image and an error condition).
The thumbnail framework is now using a pub/sub model with a twist; certain
events can happen only once, and you can subscribe to them
in the past. This is a little bit like the 'ready' state of some DOM elements,
so these are called by 'publishReady' and 'subscribeReady'.
Think of it as publish that we are now ready to show this thumbnail or do
this action when the thumbnail is ready (or right away if
it already is).
Modified Paths:
--
trunk/extensions/UploadWizard/UploadWizardHooks.php
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js
Modified: trunk/extensions/UploadWizard/UploadWizardHooks.php
===
--- trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-06-12 05:22:54 UTC
(rev 89917)
+++ trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-06-12 05:28:16 UTC
(rev 89918)
@@ -46,6 +46,8 @@
'resources/jquery/jquery.validate.wmCommonsBlacklist.js',
// common utilities
+ 'resources/mw.fileApi.js',
+ 'resources/mw.units.js',
'resources/mw.Log.js',
'resources/mw.Utilities.js',
'resources/mw.UtilitiesTime.js',
@@ -333,7 +335,12 @@
'mwe-upwiz-feedback-adding',
'mwe-upwiz-feedback-error1',
'mwe-upwiz-feedback-error2',
- 'mwe-upwiz-feedback-error3'
+ 'mwe-upwiz-feedback-error3',
+ 'size-terabytes',
+ 'size-gigabytes',
+ 'size-megabytes',
+ 'size-kilobytes',
+ 'size-bytes'
),
'group' = 'ext.uploadWizard'
),
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-06-12
05:22:54 UTC (rev 89917)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-06-12
05:28:16 UTC (rev 89918)
@@ -8,6 +8,10 @@
( function( $j ) {
mw.UploadWizardUpload = function( api, filesDiv ) {
+
+ this.index = mw.UploadWizardUpload.prototype.count;
+ mw.UploadWizardUpload.prototype.count++;
+
this.api = api;
this.state = 'new';
this.thumbnails = {};
@@ -20,8 +24,8 @@
this.sessionKey = undefined;
// this should be moved to the interface, if we even keep this
- this.transportWeight = 1; // default
- this.detailsWeight = 1; // default
+ this.transportWeight = 1; // default all same
+ this.detailsWeight = 1; // default all same
// details
this.ui = new mw.UploadWizardUploadInterface( this, filesDiv );
@@ -32,8 +36,6 @@
this.handler = this.getUploadHandler();
- this.index = mw.UploadWizardUpload.prototype.count;
- mw.UploadWizardUpload.prototype.count++;
};
mw.UploadWizardUpload.prototype = {
@@ -231,32 +233,18 @@
* @param {Mixed} result -- result of AJAX call
*/
setSuccess: function( result ) {
- var _this = this; // was a triumph
+ var _this = this;
_this.state = 'transported';
_this.transportProgress = 1;
- // I'm making a note here
_this.ui.setStatus( 'mwe-upwiz-getting-metadata' );
if ( result.upload ) {
_this.extractUploadInfo( result.upload );
- _this.getThumbnail(
- function( image ) {
- // n.b. if server
[MediaWiki-CVS] SVN: [89919] trunk/extensions/SemanticMediaWiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89919
Revision: 89919
Author: devayon
Date: 2011-06-12 05:48:07 + (Sun, 12 Jun 2011)
Log Message:
---
Creating a Query Creator interface to seperate use cases of Special:Ask
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
Added Paths:
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2011-06-12
05:28:16 UTC (rev 89918)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2011-06-12
05:48:07 UTC (rev 89919)
@@ -238,6 +238,10 @@
$wgSpecialPages['Ask'] = 'SMWAskPage';
$wgSpecialPageGroups['Ask'] = 'smw_group';
+$wgAutoloadClasses['SMWQueryCreatorPage'] = $smwgIP .
'specials/AskSpecial/SMW_SpecialQueryCreator.php';
+$wgSpecialPages['QueryCreator'] =
'SMWQueryCreatorPage';
+$wgSpecialPageGroups['QueryCreator']= 'smw_group';
+
$wgAutoloadClasses['SMWSpecialBrowse'] = $smwgIP .
'specials/SearchTriple/SMW_SpecialBrowse.php';
$wgSpecialPages['Browse'] = 'SMWSpecialBrowse';
$wgSpecialPageGroups['Browse'] = 'smw_group';
Modified: trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
===
--- trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
2011-06-12 05:28:16 UTC (rev 89918)
+++ trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
2011-06-12 05:48:07 UTC (rev 89919)
@@ -212,6 +212,7 @@
// Messages for ask Special
'ask' = 'Semantic search',
+ 'querycreator' = 'Query creator',
'smw_ask_doculink' =
'http://semantic-mediawiki.org/wiki/Help:Semantic_search',
'smw_ask_sortby'= 'Sort by column (optional)',
'smw_ask_ascorder' = 'Ascending',
Added:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
(rev 0)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
2011-06-12 05:48:07 UTC (rev 89919)
@@ -0,0 +1,42 @@
+?php
+
+/**
+ * This special page for Semantic MediaWiki implements a customisable form for
+ * executing queries outside of articles. Results are generated by
+ * SMW_SpecialAsk.php. This page is currently under development as part of
+ * the Google Summer of Code 2011 Program.
+ *
+ * @file SMW_SpecialQueryCreator.php
+ * @ingroup SMWSpecialPage
+ * @ingroup SpecialPage
+ *
+ * @author Markus Krötzsch
+ * @author Yaron Koren
+ * @author Sanyam Goyal
+ * @author Jeroen De Dauw
+ * @author Devayon Das
+ *
+ */
+class SMWQueryCreatorPage extends SpecialPage {
+
+ /**
+* Constructor.
+*/
+ public function __construct() {
+ parent::__construct( 'QueryCreator' );
+ smwfLoadExtensionMessages( 'SemanticMediaWiki' );
+ }
+
+ /**
+* Main entrypoint for the special page.
+*
+* @param string $p
+*/
+ public function execute( $p ) {
+ global $wgOut, $wgRequest, $smwgQEnabled;
+$this-setHeaders();
+$wgOut-addWikiText( Hi. This page isn't ready for viewing
yet. May I suggest you view [[Special:Ask]]);
+ }
+
+}
+
Property changes on:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
___
Added: svn:eol-style
+ native
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
