http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99526
Revision: 99526
Author: erik
Date: 2011-10-11 18:34:49 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
challange->challenge
Modified Paths:
--------------
trunk/extensions/Contest/Contest.php
trunk/extensions/Contest/Contest.sql
trunk/extensions/Contest/api/ApiQueryChallenges.php
trunk/extensions/Contest/resources/contest.special.welcome.css
trunk/extensions/Contest/resources/contest.special.welcome.js
trunk/extensions/Contest/resources/jquery.contestChallenges.js
trunk/extensions/Contest/specials/SpecialContestWelcome.php
Modified: trunk/extensions/Contest/Contest.php
===================================================================
--- trunk/extensions/Contest/Contest.php 2011-10-11 18:34:06 UTC (rev
99525)
+++ trunk/extensions/Contest/Contest.php 2011-10-11 18:34:49 UTC (rev
99526)
@@ -185,7 +185,7 @@
)
);
-$wgResourceModules['jquery.contestChallanges'] = $moduleTemplate + array(
+$wgResourceModules['jquery.contestChallenges'] = $moduleTemplate + array(
'scripts' => array(
'jquery.contestChallenges.js'
)
@@ -199,7 +199,7 @@
'contest.special.welcome.css',
),
'dependencies' => array(
- 'jquery.contestChallanges',
+ 'jquery.contestChallenges',
),
'messages' => array(
'contest-welcome-select-header'
Modified: trunk/extensions/Contest/Contest.sql
===================================================================
--- trunk/extensions/Contest/Contest.sql 2011-10-11 18:34:06 UTC (rev
99525)
+++ trunk/extensions/Contest/Contest.sql 2011-10-11 18:34:49 UTC (rev
99526)
@@ -49,9 +49,9 @@
challenge_id INT unsigned NOT NULL auto_increment
PRIMARY KEY, -- Challenge id
challenge_contest_id INT unsigned NOT NULL, -- Foreign key on
contests.contest_id
- challenge_text TEXT NOT NULL, -- Full challange
description
- challenge_title VARCHAR(255) NOT NULL, -- Title of the
challange
- challenge_oneline TEXT NOT NULL -- One line
description of the challange
+ challenge_text TEXT NOT NULL, -- Full challenge
description
+ challenge_title VARCHAR(255) NOT NULL, -- Title of the
challenge
+ challenge_oneline TEXT NOT NULL -- One line
description of the challenge
) /*$wgDBTableOptions*/;
-- Judge votes
Modified: trunk/extensions/Contest/api/ApiQueryChallenges.php
===================================================================
--- trunk/extensions/Contest/api/ApiQueryChallenges.php 2011-10-11 18:34:06 UTC
(rev 99525)
+++ trunk/extensions/Contest/api/ApiQueryChallenges.php 2011-10-11 18:34:49 UTC
(rev 99526)
@@ -49,7 +49,7 @@
* @see includes/api/ApiBase#getDescription()
*/
public function getDescription() {
- return 'API module for querying contest challanges';
+ return 'API module for querying contest challenges';
}
/**
Modified: trunk/extensions/Contest/resources/contest.special.welcome.css
===================================================================
--- trunk/extensions/Contest/resources/contest.special.welcome.css
2011-10-11 18:34:06 UTC (rev 99525)
+++ trunk/extensions/Contest/resources/contest.special.welcome.css
2011-10-11 18:34:49 UTC (rev 99526)
@@ -8,19 +8,19 @@
/* dialog type selection */
-/*#mw-codechallenge-dialog*/ #contest-challanges-list {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list {
float: left;
width: 250px;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list ul {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list ul {
list-style: none;
margin: 0;
padding: 0;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list ul li,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
+/*#mw-codechallenge-dialog*/ #contest-challenges-list ul li,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
{
display: block;
width: 250px;
@@ -32,19 +32,19 @@
outline: none;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:hover,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:focus {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:hover,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:focus {
text-decoration:none;
}
/* IGNORED BY IE6 */
-/*#mw-codechallenge-dialog*/ #contest-challanges-list ul > li,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list ul li > a {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list ul > li,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list ul li > a {
display: inline-block;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-left-cap,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-right-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-left-cap,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-right-cap {
padding: 0;
margin: 0;
width: 6px;
@@ -53,56 +53,56 @@
top: 0px;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-l-cap,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-r-cap,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-icon-box {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-l-cap,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-r-cap,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-icon-box {
background-repeat: no-repeat;
height: 66px;
position: absolute;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-l-cap,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-r-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-l-cap,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-r-cap {
width: 6px;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-l-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-l-cap {
/* @noflip */
left: 0px;
/* @embed */
background-image: url(images/icon-box-left-cap.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:hover
.mw-codechallenge-l-cap,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:focus
.mw-codechallenge-l-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:hover
.mw-codechallenge-l-cap,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:focus
.mw-codechallenge-l-cap {
/* @embed */
background-image: url(images/icon-box-hover-left-cap.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a.selected
.mw-codechallenge-l-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a.selected
.mw-codechallenge-l-cap {
/* @embed */
background-image: url(images/icon-box-selected-left-cap.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-r-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-r-cap {
/* @noflip */
right: 0px;
/* @embed */
background-image: url(images/icon-box-right-cap.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:hover
.mw-codechallenge-r-cap,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:focus
.mw-codechallenge-r-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:hover
.mw-codechallenge-r-cap,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:focus
.mw-codechallenge-r-cap {
/* @embed */
background-image: url(images/icon-box-hover-right-cap.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a.selected
.mw-codechallenge-r-cap {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a.selected
.mw-codechallenge-r-cap {
/* @embed */
background-image: url(images/icon-box-selected-right-cap.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-inside {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-inside {
padding: 0;
margin: 0;
width: 238px;
@@ -117,16 +117,16 @@
background-repeat: repeat-x;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:hover
.mw-codechallenge-inside,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:focus
.mw-codechallenge-inside {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:hover
.mw-codechallenge-inside,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:focus
.mw-codechallenge-inside {
background-position: 0px -66px;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a.selected
.mw-codechallenge-inside {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a.selected
.mw-codechallenge-inside {
background-position: 0px -132px;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-icon-box {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-icon-box {
padding: 0;
margin: 0;
width: 53px;
@@ -138,7 +138,7 @@
background-image: url(images/button_arrow.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-icon-box img {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-icon-box img {
padding: 0;
margin: 0;
width: 53px;
@@ -148,18 +148,18 @@
left: 0px;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:hover
.mw-codechallenge-icon-box,
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a:focus
.mw-codechallenge-icon-box {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:hover
.mw-codechallenge-icon-box,
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a:focus
.mw-codechallenge-icon-box {
/* @embed */
background-image: url(images/button_arrow_hover.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a.selected
.mw-codechallenge-icon-box {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a.selected
.mw-codechallenge-icon-box {
/* @embed */
background-image: url(images/icon-box-selected.png);
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-link-text {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-link-text {
padding: 0;
margin: 0;
width: 170px;
@@ -174,7 +174,7 @@
color: white;
}
-/*#mw-codechallenge-dialog*/ #contest-challanges-list a
.mw-codechallenge-no-icon .mw-codechallenge-link-text {
+/*#mw-codechallenge-dialog*/ #contest-challenges-list a
.mw-codechallenge-no-icon .mw-codechallenge-link-text {
left: 3px;
}
Modified: trunk/extensions/Contest/resources/contest.special.welcome.js
===================================================================
--- trunk/extensions/Contest/resources/contest.special.welcome.js
2011-10-11 18:34:06 UTC (rev 99525)
+++ trunk/extensions/Contest/resources/contest.special.welcome.js
2011-10-11 18:34:49 UTC (rev 99526)
@@ -10,8 +10,8 @@
$( document ).ready( function() {
- $( '#contest-challanges' ).contestChallanges(
- mw.config.get( 'ContestChallanges' ),
+ $( '#contest-challenges' ).contestChallenges(
+ mw.config.get( 'ContestChallenges' ),
mw.config.get( 'ContestConfig' )
);
Modified: trunk/extensions/Contest/resources/jquery.contestChallenges.js
===================================================================
--- trunk/extensions/Contest/resources/jquery.contestChallenges.js
2011-10-11 18:34:06 UTC (rev 99525)
+++ trunk/extensions/Contest/resources/jquery.contestChallenges.js
2011-10-11 18:34:49 UTC (rev 99526)
@@ -6,24 +6,24 @@
* @author Jeroen De Dauw <jeroendedauw at gmail dot com>
*/
-( function ( $, mw ) { $.fn.contestChallanges = function( challanges, config )
{
+( function ( $, mw ) { $.fn.contestChallenges = function( challenges, config )
{
- this.challanges = challanges;
+ this.challenges = challenges;
this.config = config;
var _this = this;
var $this = $( this );
- this.challangesList = null;
+ this.challengesList = null;
- this.showChallange = function( challange ) {
- // TODO: show challange pop-up with text and participate button
- window.location = challange.target;
+ this.showChallenge = function( challenge ) {
+ // TODO: show challenge pop-up with text and participate button
+ window.location = challenge.target;
};
- this.addChallange = function( challange ) {
+ this.addChallenge = function( challenge ) {
var item = $( '<a />' ).attr( 'href', '#' ).html( '' ).click(
function() {
- _this.showChallange( challange );
+ _this.showChallenge( challenge );
} );
item.append( $( '<div />' ).attr( 'class',
'mw-codechallenge-l-cap' ) );
@@ -31,8 +31,8 @@
var innerDiv = $( '<div />' ).attr( 'class',
'mw-codechallenge-inside' );
innerDiv.html( $( '<div />' ).attr( 'class',
'mw-codechallenge-link-text' )
- .html( $( '<p />' ).text( challange.title ) )
- .append( $( '<p />' ).text( challange.oneline ) )
+ .html( $( '<p />' ).text( challenge.title ) )
+ .append( $( '<p />' ).text( challenge.oneline ) )
);
innerDiv.append( $( '<div />' ).attr( 'class',
'mw-codechallenge-icon-box' ) );
@@ -40,23 +40,23 @@
item.append( $( '<div />' ).attr( 'class',
'mw-codechallenge-r-cap' ) );
- this.challangesList.append( $( '<li />' ).html( item ) );
+ this.challengesList.append( $( '<li />' ).html( item ) );
}
- this.initChallanges = function() {
- this.challangesList = $( '<ul />' ).attr( 'id',
'contest-challanges-list' );
+ this.initChallenges = function() {
+ this.challengesList = $( '<ul />' ).attr( 'id',
'contest-challenges-list' );
- for ( var i in this.challanges ) {
- this.addChallange( this.challanges[i] );
+ for ( var i in this.challenges ) {
+ this.addChallenge( this.challenges[i] );
}
};
this.init = function() {
$this.html( $( '<h3 />' ).text( mw.msg(
'contest-welcome-select-header' ) ) );
- this.initChallanges();
+ this.initChallenges();
- $this.append( this.challangesList );
+ $this.append( this.challengesList );
};
this.init();
Modified: trunk/extensions/Contest/specials/SpecialContestWelcome.php
===================================================================
--- trunk/extensions/Contest/specials/SpecialContestWelcome.php 2011-10-11
18:34:06 UTC (rev 99525)
+++ trunk/extensions/Contest/specials/SpecialContestWelcome.php 2011-10-11
18:34:49 UTC (rev 99526)
@@ -106,24 +106,24 @@
protected function showChallenges( Contest $contest ) {
$this->showNoJSFallback( $contest );
- $this->getOutput()->addHTML( '<div
id="contest-challanges"></div>' );
+ $this->getOutput()->addHTML( '<div
id="contest-challenges"></div>' );
$this->addContestJS( $contest );
}
protected function addContestJS( Contest $contest ) {
- $challanges = array();
+ $challenges = array();
foreach ( $contest->getChallenges() as /* ContestChallenge */
$challenge ) {
$data = $challenge->toArray();
$data['target'] = $this->getSignupLink(
$contest->getField( 'name' ), $challenge->getId() );
- $challanges[] = $data;
+ $challenges[] = $data;
}
$this->getOutput()->addScript(
Skin::makeVariablesScript(
array(
- 'ContestChallanges' => $challanges,
+ 'ContestChallenges' => $challenges,
'ContestConfig' => array()
)
)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
