[MediaWiki-CVS] SVN: [52535] trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/ wikiword/integrator
Revision: 52535
Author: daniel
Date: 2009-06-29 08:53:13 + (Mon, 29 Jun 2009)
Log Message:
---
allow bad csv lines to be skipped
Modified Paths:
--
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/TsvFeatureSetCursor.java
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
2009-06-28 22:43:38 UTC (rev 52534)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
2009-06-29 08:53:13 UTC (rev 52535)
@@ -9,6 +9,7 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -22,10 +23,12 @@
import de.brightbyte.db.DatabaseSchema;
import de.brightbyte.db.SqlDialect;
import de.brightbyte.db.SqlScriptRunner;
+import de.brightbyte.io.ChunkingCursor;
import de.brightbyte.io.IOUtil;
import de.brightbyte.io.LineCursor;
import de.brightbyte.text.Chunker;
import de.brightbyte.util.BeanUtils;
+import de.brightbyte.util.LoggingErrorHandler;
import de.brightbyte.util.PersistenceException;
import de.brightbyte.wikiword.DatasetIdentifier;
import de.brightbyte.wikiword.StoreBackedApp;
@@ -278,6 +281,8 @@
fsc = new TsvFeatureSetCursor(lines, chunker);
+ if (sourceDescriptor.getSkipBadRows())
((TsvFeatureSetCursor)fsc).setParseErrorHandler( new
LoggingErrorHandlerChunkingCursor, ParseException, PersistenceException(out));
+
if (fields!=null) {
if (sourceDescriptor.getSkipHeader())
((TsvFeatureSetCursor)fsc).readFields();
((TsvFeatureSetCursor)fsc).setFields(fields);
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
2009-06-28 22:43:38 UTC (rev 52534)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
2009-06-29 08:53:13 UTC (rev 52535)
@@ -106,7 +106,7 @@
}
public boolean getSkipHeader() {
- return getTweak(skip-header, false);
+ return getTweak(csv-skip-header, false);
}
public String getSourceFileFormat() {
@@ -155,4 +155,8 @@
return getTweak(source-table, null);
}
+ public boolean getSkipBadRows() {
+ return getTweak(csv-skip-bad-rows, false);
+ }
+
}
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/TsvFeatureSetCursor.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/TsvFeatureSetCursor.java
2009-06-28 22:43:38 UTC (rev 52534)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/TsvFeatureSetCursor.java
2009-06-29 08:53:13 UTC (rev 52535)
@@ -4,6 +4,7 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
import java.util.List;
import de.brightbyte.data.cursor.DataCursor;
@@ -11,6 +12,8 @@
import de.brightbyte.io.ChunkingCursor;
import de.brightbyte.text.Chunker;
import de.brightbyte.text.CsvLineChunker;
+import de.brightbyte.util.ErrorHandler;
+import de.brightbyte.util.LoggingErrorHandler;
import de.brightbyte.util.PersistenceException;
public class TsvFeatureSetCursor implements DataCursorFeatureSet {
@@ -46,6 +49,14 @@
this.source = source;
}
+ public void setParseErrorHandler(ErrorHandlerChunkingCursor,
ParseException, PersistenceException errorHandler) {
+ if (source instanceof ChunkingCursor) {
+
((ChunkingCursor)source).setParseErrorHandler(errorHandler);
+ } else {
+ throw new IllegalStateException(source is not a
ChunkingCursor, can't set error handler);
+ }
+ }
+
public void setFields(String[] fields) {
if
[MediaWiki-CVS] SVN: [52536] trunk/extensions/LiquidThreads
Revision: 52536
Author: werdna
Date: 2009-06-29 10:57:30 + (Mon, 29 Jun 2009)
Log Message:
---
Fix bug 19419, force new discussion links to be known.
Modified Paths:
--
trunk/extensions/LiquidThreads/classes/LqtView.php
trunk/extensions/LiquidThreads/pages/TalkpageView.php
Modified: trunk/extensions/LiquidThreads/classes/LqtView.php
===
--- trunk/extensions/LiquidThreads/classes/LqtView.php 2009-06-29 08:53:13 UTC
(rev 52535)
+++ trunk/extensions/LiquidThreads/classes/LqtView.php 2009-06-29 10:57:30 UTC
(rev 52536)
@@ -132,14 +132,15 @@
}
static function talkpageLink( $title, $text = null , $method=null,
$operand=null,
-
$includeFragment=true, $attribs = array() ) {
+
$includeFragment=true, $attribs = array(),
+
$options = array() ) {
list( $title, $query ) = self::talkpageLinkData( $title,
$method, $operand,
$includeFragment );
global $wgUser;
$sk = $wgUser-getSkin();
- return $sk-link( $title, $text, $attribs, $query );
+ return $sk-link( $title, $text, $attribs, $query, $options );
}
static function talkpageLinkData( $title, $method = null, $operand =
null,
Modified: trunk/extensions/LiquidThreads/pages/TalkpageView.php
===
--- trunk/extensions/LiquidThreads/pages/TalkpageView.php 2009-06-29
08:53:13 UTC (rev 52535)
+++ trunk/extensions/LiquidThreads/pages/TalkpageView.php 2009-06-29
10:57:30 UTC (rev 52536)
@@ -239,7 +239,8 @@
$newThreadLink = $this-talkpageLink( $this-title,
wfMsgExt( 'lqt_new_thread', 'parseinline' ),
'talkpage_new_thread', null, true,
-
array( 'class' = 'lqt_start_discussion' ) );
+
array( 'class' = 'lqt_start_discussion' ),
+
array( 'known' ) );
$this-output-addHTML( Xml::tags( 'strong', null,
$newThreadLink ) );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52537] trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/ wikiword/integrator/data/filter
Revision: 52537
Author: daniel
Date: 2009-06-29 11:27:58 + (Mon, 29 Jun 2009)
Log Message:
---
filter FeatureSets by feature value
Added Paths:
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetFeatureValueFilter.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetHasFeatureFilter.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateFeatureSetFilter.java
Added:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetFeatureValueFilter.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetFeatureValueFilter.java
(rev 0)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetFeatureValueFilter.java
2009-06-29 11:27:58 UTC (rev 52537)
@@ -0,0 +1,85 @@
+package de.brightbyte.wikiword.integrator.data.filter;
+
+import java.util.Collection;
+import java.util.regex.Pattern;
+
+import de.brightbyte.data.filter.Filter;
+import de.brightbyte.wikiword.integrator.data.FeatureSet;
+
+/**
+ * Filter that matches any FeatureSet with a given feature, where one of the
feature's values
+ * matches a given value filter. Some default filters for feature values are
given as static
+ * inner classes of FeatureSetFeatureValueFilter.
+ *
+ * @author daniel
+ *
+ * @param T The type of the feature values
+ */
+public class FeatureSetFeatureValueFilterT implements FilterFeatureSet {
+
+ /**
+* Filter matching one specific value.
+*
+* @author daniel
+*
+* @param V The type of the values to filter
+*/
+ public static class ValueFilterV implements FilterV {
+ protected V value;
+
+ public ValueFilter(V value) {
+ this.value = value;
+ }
+
+ public boolean matches(V obj) {
+ if (obj==value) return true;
+ if (obj==null) return false;
+ return obj.equals(value);
+ }
+ }
+
+ /**
+* Filter matching any String or other CharSequence that matches a
given regular expression.
+*
+* @author daniel
+*/
+ public static class PatternFilter implements FilterCharSequence {
+ protected Pattern pattern;
+
+ public PatternFilter(String pattern, int flags) {
+ this(Pattern.compile(pattern, flags));
+ }
+
+ public PatternFilter(Pattern pattern) {
+ if (pattern==null) throw new NullPointerException();
+ this.pattern = pattern;
+ }
+
+ public boolean matches(CharSequence obj) {
+ if (obj==null) return false;
+ return pattern.matcher(obj).matches();
+ }
+ }
+
+ protected String feature;
+ protected FilterT filter;
+
+ public FeatureSetFeatureValueFilter(String feature, FilterT filter) {
+ if (feature==null) throw new NullPointerException();
+ if (filter==null) throw new NullPointerException();
+ this.feature = feature;
+ this.filter = filter;
+ }
+
+ public boolean matches(FeatureSet fs) {
+ CollectionObject values = fs.get(feature);
+ if (values==null) return false;
+
+ for (Object v: values) {
+ if (filter.matches((T)v)) return true;
+ }
+
+ return false;
+ }
+
+}
Added:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetHasFeatureFilter.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetHasFeatureFilter.java
(rev 0)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/FeatureSetHasFeatureFilter.java
2009-06-29 11:27:58 UTC (rev 52537)
@@ -0,0 +1,26 @@
+package de.brightbyte.wikiword.integrator.data.filter;
+
+import de.brightbyte.data.filter.Filter;
+import de.brightbyte.wikiword.integrator.data.FeatureSet;
+
+/**
+ * Filter matching any FeatureSet which has a value for a given feature. That
is, the condition for
+ * matching is that a specific feature be defined.
+ *
+ * @author daniel
+ *
+ */
+public class FeatureSetHasFeatureFilter implements
[MediaWiki-CVS] SVN: [52538] trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/ wikiword/integrator
Revision: 52538
Author: daniel
Date: 2009-06-29 11:29:14 + (Mon, 29 Jun 2009)
Log Message:
---
documenting filter architecture
Modified Paths:
--
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FilterConceptAssociations.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FilterConceptMappings.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/FilteredAssociationCursor.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/FilteredMappingCandidateCursor.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/BestMappingCandidateSelector.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateFilter.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateMultiScorer.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateScorer.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateSelector.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateSelectorFilter.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateThresholdFilter.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/UniqueMappingCandidateSelector.java
Added Paths:
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidateFeatureScorer.java
Removed Paths:
-
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/ConceptAssociationFilter.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/filter/MappingCandidatePropertyScorer.java
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
2009-06-29 11:27:58 UTC (rev 52537)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
2009-06-29 11:29:14 UTC (rev 52538)
@@ -281,7 +281,9 @@
fsc = new TsvFeatureSetCursor(lines, chunker);
- if (sourceDescriptor.getSkipBadRows())
((TsvFeatureSetCursor)fsc).setParseErrorHandler( new
LoggingErrorHandlerChunkingCursor, ParseException, PersistenceException(out));
+ if (sourceDescriptor.getSkipBadRows()) {
+
((TsvFeatureSetCursor)fsc).setParseErrorHandler( new
LoggingErrorHandlerChunkingCursor, ParseException, PersistenceException(out));
+ }
if (fields!=null) {
if (sourceDescriptor.getSkipHeader())
((TsvFeatureSetCursor)fsc).readFields();
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FilterConceptAssociations.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FilterConceptAssociations.java
2009-06-29 11:27:58 UTC (rev 52537)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FilterConceptAssociations.java
2009-06-29 11:29:14 UTC (rev 52538)
@@ -1,9 +1,9 @@
package de.brightbyte.wikiword.integrator;
import de.brightbyte.data.cursor.DataCursor;
+import de.brightbyte.data.filter.Filter;
import de.brightbyte.wikiword.integrator.data.Association;
import de.brightbyte.wikiword.integrator.data.FilteredAssociationCursor;
-import de.brightbyte.wikiword.integrator.data.filter.ConceptAssociationFilter;
import de.brightbyte.wikiword.integrator.store.AssociationFeatureStoreBuilder;
public class FilterConceptAssociations extends BuildConceptAssociations {
@@ -28,7 +28,7 @@
}
- protected ConceptAssociationFilter
createAssociationFilter(FeatureSetSourceDescriptor sourceDescriptor) {
+ protected FilterAssociation
createAssociationFilter(FeatureSetSourceDescriptor sourceDescriptor) {
throw new UnsupportedOperationException(no implementations of
ConceptAssociationFilter are implemented yet.); //TODO:
[MediaWiki-CVS] SVN: [52540] trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/ wikiword/integrator
Revision: 52540
Author: daniel
Date: 2009-06-29 12:10:06 + (Mon, 29 Jun 2009)
Log Message:
---
documenting integrator defaults/built-ins
Modified Paths:
--
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/ambiguous.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/build-mappings.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/buildConceptAssociations.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/buildConceptMappings.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/definitions.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/drop.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/exclusive-mappings.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/filterConceptMappings.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/list.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/loadForeignProperties.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/match-properties.properties
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/match-single-property.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/match-terms.properties
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/match-terms.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/newIntegratorApp.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/runSql.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/scriptURL.bsh
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/terms.sql
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/unique-mappings.properties
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/unmapped.sql
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
2009-06-29 12:09:21 UTC (rev 52539)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
2009-06-29 12:10:06 UTC (rev 52540)
@@ -359,6 +359,7 @@
String def = d.getTweak(defaults, (String)null);
if (def!=null) {
+ if (!def.endsWith(.properties)) def += .properties;
FeatureSetSourceDescriptor dd =
loadSourceDescriptor(def, false, true, null);
dd.setTweaks(d);
d = dd;
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/ambiguous.sql
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/ambiguous.sql
2009-06-29 12:09:21 UTC (rev 52539)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/ambiguous.sql
2009-06-29 12:10:06 UTC (rev 52540)
@@ -1,3 +1,10 @@
+-- This script lists all ambiguous mappings, that is, all mappings that map a
single foreign concept
+-- to multiple WikiWord concepts
+--
+-- Parameters:
+-- * wikiword_prefix: the global table prefix. Provided automatically
+-- * wikiword_mapping_table: the mapping table to process
+
SELECT foreign_authority, foreign_id, foreign_name,
COUNT(distinct concept) as c, group_concat(concept_name separator |) as
concept_names
FROM /* wikiword_prefix *//* wikiword_mapping_table */ as M
Modified:
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
===
---
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
2009-06-29 12:09:21 UTC (rev 52539)
+++
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
2009-06-29 12:10:06 UTC (rev 52540)
@@ -1,3 +1,5 @@
+# default settings for disambiguating mappings using the mest-match method
+
[MediaWiki-CVS] SVN: [52541] trunk/extensions/ProofreadPage/ProofreadPage.i18n.php
Revision: 52541 Author: siebrand Date: 2009-06-29 12:26:43 + (Mon, 29 Jun 2009) Log Message: --- Update casing Modified Paths: -- trunk/extensions/ProofreadPage/ProofreadPage.i18n.php Modified: trunk/extensions/ProofreadPage/ProofreadPage.i18n.php === --- trunk/extensions/ProofreadPage/ProofreadPage.i18n.php 2009-06-29 12:10:06 UTC (rev 52540) +++ trunk/extensions/ProofreadPage/ProofreadPage.i18n.php 2009-06-29 12:26:43 UTC (rev 52541) @@ -20,8 +20,8 @@ 'proofreadpage_badpagetext' = 'The format of the page you attempted to save is incorrect.', 'proofreadpage_nologin' = 'Not logged in', 'proofreadpage_nologintext' = 'You must be [[Special:UserLogin|logged in]] to modify the proofreading status of pages.', - 'proofreadpage_notallowed'= 'Not Allowed', - 'proofreadpage_notallowedtext'= 'Not Allowed.', + 'proofreadpage_notallowed'= 'Not allowed', + 'proofreadpage_notallowedtext'= 'Not allowed.', 'proofreadpage_number_expected' = 'Error: numeric value expected', 'proofreadpage_interval_too_large'= 'Error: interval too large', 'proofreadpage_invalid_interval' = 'Error: invalid interval', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52542] trunk/tools/planet/ru/config.ini
Revision: 52542 Author: vasilievvv Date: 2009-06-29 13:16:43 + (Mon, 29 Jun 2009) Log Message: --- Update Russian planet. Modified Paths: -- trunk/tools/planet/ru/config.ini Modified: trunk/tools/planet/ru/config.ini === --- trunk/tools/planet/ru/config.ini2009-06-29 12:26:43 UTC (rev 52541) +++ trunk/tools/planet/ru/config.ini2009-06-29 13:16:43 UTC (rev 52542) @@ -8,9 +8,9 @@ # Link to the main page link=http://ru.planet.wikimedia.org # Your name -owner_name=Brion Vibber +owner_name=Victor Vasiliev # Your e-mail address -owner_email=br...@wikimedia.org +owner_email=vasi...@gmail.com # cache_directory: Where cached feeds are stored # new_feed_items: Number of items to take from new feeds @@ -75,8 +75,8 @@ [http://community.livejournal.com/vikivestnik/data/rss] name = Викивестник -# [http://community.livejournal.com/rus_wikipedia/data/rss?tag=rss] -# name = ЖЖ-сообщество Русская Википедия +[http://community.livejournal.com/wikipedia_blog/data/rss] +name = ЖЖ-сообщество Википедия на русском языке [http://al-silonov.livejournal.com/data/rss?tag=wiktionary] name = Al Silonov @@ -99,15 +99,18 @@ [http://mitrius.livejournal.com/data/rss?tag=%D0%92%D0%B8%D0%BA%D0%B8%D0%BF%D0%B5%D0%B4%D0%B8%D1%8F] name = Mitrius +[http://mstislavl.livejournal.com/data/rss?tag=rwiki] +name = Mstislavl + +[http://skybon.livejournal.com/data/rss?tag=RuWiki] +name = SkyBon + [http://wind77.livejournal.com/data/rss?tag=Wikipedia] name = Wind [http://ajvol2.livejournal.com/data/rss?tag=vikipedio] name = Александр Сигачёв -[http://vasilievvv.blogspot.com/feeds/posts/default?alt=rss] -name = ВасильевВВ - [http://kaliy-linux.livejournal.com/data/rss/?tag=Википедия] name = Калий ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52548] trunk/extensions
Revision: 52548 Author: shinjiman Date: 2009-06-29 16:14:05 + (Mon, 29 Jun 2009) Log Message: --- tweak some credit messages to use the language class to parse the author details. Modified Paths: -- trunk/extensions/TreeAndMenu/TreeAndMenu.php trunk/extensions/uniwiki/Authors/Authors.php trunk/extensions/uniwiki/AutoCreateCategoryPages/AutoCreateCategoryPages.php trunk/extensions/uniwiki/CatBoxAtTop/CatBoxAtTop.php trunk/extensions/uniwiki/CreatePage/CreatePage.php trunk/extensions/uniwiki/CssHooks/CssHooks.php trunk/extensions/uniwiki/FormatChanges/FormatChanges.php trunk/extensions/uniwiki/FormatSearch/FormatSearch.php trunk/extensions/uniwiki/GenericEditPage/GenericEditPage.php trunk/extensions/uniwiki/Javascript/Javascript.php trunk/extensions/uniwiki/Layouts/Layouts.php trunk/extensions/uniwiki/MooTools12core/MooTools12core.php Modified: trunk/extensions/TreeAndMenu/TreeAndMenu.php === --- trunk/extensions/TreeAndMenu/TreeAndMenu.php2009-06-29 15:35:18 UTC (rev 52547) +++ trunk/extensions/TreeAndMenu/TreeAndMenu.php2009-06-29 16:14:05 UTC (rev 52548) @@ -28,7 +28,7 @@ $wgExtensionCredits['parserhook'][] = array( 'path'= __FILE__, 'name'= 'TreeAndMenu', - 'author' = '[http://www.organicdesign.co.nz/nad Nad], [http://www.organicdesign.co.nz/User:Sven Sven]', + 'author' = array( '[http://www.organicdesign.co.nz/User:Nad Nad]', '[http://www.organicdesign.co.nz/User:Sven Sven]' ), 'url' = 'http://www.mediawiki.org/wiki/Extension:Treeview', 'description' = 'Adds #tree and #menu parser functions which contain bullet-lists to be rendered as collapsible treeview\'s or dropdown menus. The treeview\'s use the [http://www.destroydrop.com/javascripts/tree dTree] JavaScript tree menu, Modified: trunk/extensions/uniwiki/Authors/Authors.php === --- trunk/extensions/uniwiki/Authors/Authors.php2009-06-29 15:35:18 UTC (rev 52547) +++ trunk/extensions/uniwiki/Authors/Authors.php2009-06-29 16:14:05 UTC (rev 52548) @@ -13,7 +13,7 @@ $wgExtensionCredits['other'][] = array( 'path' = __FILE__, 'name' = 'Authors', - 'author' = 'Merrick Schaefer, Mark Johnston, Evan Wheeler and Adam Mckaig (at UNICEF)', + 'author' = array( 'Merrick Schaefer', 'Mark Johnston', 'Evan Wheeler', 'Adam Mckaig (at UNICEF)' ), 'description'= 'Appends a list of contributors to articles', 'url'= 'http://www.mediawiki.org/wiki/Extension:Uniwiki_Authors', 'descriptionmsg' = 'authors-desc', Modified: trunk/extensions/uniwiki/AutoCreateCategoryPages/AutoCreateCategoryPages.php === --- trunk/extensions/uniwiki/AutoCreateCategoryPages/AutoCreateCategoryPages.php 2009-06-29 15:35:18 UTC (rev 52547) +++ trunk/extensions/uniwiki/AutoCreateCategoryPages/AutoCreateCategoryPages.php 2009-06-29 16:14:05 UTC (rev 52548) @@ -10,7 +10,7 @@ $wgExtensionCredits['other'][] = array( 'path' = __FILE__, 'name' = 'AutoCreateCategoryPages', - 'author' = 'Merrick Schaefer, Mark Johnston, Evan Wheeler and Adam Mckaig (at UNICEF)', + 'author' = array ( 'Merrick Schaefer', 'Mark Johnston', 'Evan Wheeler', 'Adam Mckaig (at UNICEF)' ), 'description'= 'Create stub Category pages automatically', 'url'= 'http://www.mediawiki.org/wiki/Extension:Uniwiki_Auto_Create_Category_Pages', 'descriptionmsg' = 'autocreatecategorypages-desc', Modified: trunk/extensions/uniwiki/CatBoxAtTop/CatBoxAtTop.php === --- trunk/extensions/uniwiki/CatBoxAtTop/CatBoxAtTop.php2009-06-29 15:35:18 UTC (rev 52547) +++ trunk/extensions/uniwiki/CatBoxAtTop/CatBoxAtTop.php2009-06-29 16:14:05 UTC (rev 52548) @@ -11,7 +11,7 @@ $wgExtensionCredits['other'][] = array( 'path' = __FILE__, 'name' = 'CatBoxAtTop', - 'author' = 'Merrick Schaefer, Mark Johnston, Evan Wheeler and Adam Mckaig (at UNICEF)', + 'author' = array( 'Merrick Schaefer', 'Mark Johnston', 'Evan Wheeler', 'Adam Mckaig (at UNICEF)' ), 'description'= 'Adds a category box to the top right of pages', 'url'= 'http://www.mediawiki.org/wiki/Extension:Uniwiki_Category_Box_at_Top', 'descriptionmsg' = 'catboxattop-desc', Modified: trunk/extensions/uniwiki/CreatePage/CreatePage.php === --- trunk/extensions/uniwiki/CreatePage/CreatePage.php 2009-06-29 15:35:18 UTC (rev
[MediaWiki-CVS] SVN: [52549] trunk/WikiWord/WikiWordIntegrator/src/docbook/Manual.xml
Revision: 52549 Author: daniel Date: 2009-06-29 16:16:10 + (Mon, 29 Jun 2009) Log Message: --- documenting Modified Paths: -- trunk/WikiWord/WikiWordIntegrator/src/docbook/Manual.xml Modified: trunk/WikiWord/WikiWordIntegrator/src/docbook/Manual.xml === --- trunk/WikiWord/WikiWordIntegrator/src/docbook/Manual.xml2009-06-29 16:14:05 UTC (rev 52548) +++ trunk/WikiWord/WikiWordIntegrator/src/docbook/Manual.xml2009-06-29 16:16:10 UTC (rev 52549) @@ -3,10 +3,13 @@ article lang=en-US titleWikiWord: Integrator/title +sect1 + titleIntro/title paraWikiWord is a system for extracting a theraurus from Wikipedia. The Integrator module is desigend top use this data as a glue between different data sets, that is, to map between different vocabularies, - standardized or natural./param + standardized or natural./para +/sect1 sect1 titleProcess/title @@ -57,9 +60,10 @@ paraSometimes, it is desired to only get emphasisexact, exclusive/emphasis matches mdash; that is, not only to exclude any foreign concept for which there exists more than one mapping to WikiWord, but to also to exclude all WikiWord concepts mapped to more than one foreign concept. This yields a strict 1:1 relationship and avoids any mismatches in scope or granularity. This is particularly useful when transferring definitions from one authority to another./para /sect3 /sect2 +/sect1 sect1 -titleArchitecture/title + titleArchitecture/title sect2 titleClasses/title @@ -76,26 +80,53 @@ listitem paraThe Processor fetches on entry after another from the DataCursor and passes it to the StoreBuilder. Note that any logic for filtering, grouping and converting of entries is usually implemented in the DataCursor, not in the Processor./para /listitem -/orderedlist +listitem paraApplication/para +/listitem +listitem paraDB Configuration, Tweaks, SourceDescriptor/para +/listitem +listitem paraStore, StoreBuilder/para +/listitem +listitem paraFeatureSet/para +/listitem +listitem paraDataCursor/para +/listitem +listitem paraFeatureSetSourceDescriptor/para +/listitem +listitem paraProcessor/para +/listitem +listitem paraAssociations/para +/listitem +listitem paraMappingCandidates/para +/listitem +listitem paraFilter, Selector/para +/listitem +listitem paraScorer/para +/listitem +listitem paraAggregator, Accessor/para +/listitem +listitem +paraAggregator, Accessor/para +/listitem +/orderedlist /sect2 sect2 titleDatabase/title +para.../para /sect2 - /sect1 sect1 @@ -103,14 +134,17 @@ sect2 titleConfiguration files/title +para.../para /sect2 sect2 titleCommand Line/title +para.../para /sect2 sect2 titleBeanShell Commands/title +para.../para /sect2 sect2 @@ -118,27 +152,440 @@ sect3 titleDatabase/title +para.../para /sect3 sect3 titleTweaks/title +para.../para /sect3 sect3 titleSource Descriptor/title +para...syntax.../para +para...syntax in beanshell.../para + noteparaIn parameter names, - and _ are interchangable./para/note + variablelisttitleSource Descriptor Parameters/title + + varlistentry + term + parameterassociation-annotation-field/parameter + /term + listitem + paraThe field/column that contains the annotation string. The annotation could be any additional info attached to a mapping. Used with classnameBuildConceptMappings/classname./para + /listitem + /varlistentry + + varlistentry + term + parameterassociation-value-field/parameter + /term + listitem + paraThe field/column that contains the association value. That is the value that was used to derive the association. Used with classnameBuildConceptAssociations/classname./para + /listitem + /varlistentry + + varlistentry + term + parameterassociation-weight-field/parameter + /term + listitem + paraThe field/column that contains the association weight. The weight may be used for filtering. Used with classnameBuildConceptAssociations/classname as well as classnameBuildConceptMappings/classname and classnameFilterConceptMappings/classname./para + /listitem + /varlistentry + + varlistentry + term + parameterauthority/parameter + /term + listitem + paraThe name of an external authority; the authority name serves as the namespace for foreign property names and foreign entity IDs. Instead of setting parameterauthority/parameter to a fixed value, it can also be taken from a data field/column spcified by parameterforeign-authority-field/parameter./para + /listitem + /varlistentry + + varlistentry + term + parameterconcept-fields/parameter + /term + listitem + paraThe list of fields names that will be taken to belong to the concept (mapping target resp. object) when building an classnameAssociation/classname
[MediaWiki-CVS] SVN: [52550] trunk/extensions/SyntaxHighlight_GeSHi
Revision: 52550
Author: shinjiman
Date: 2009-06-29 16:29:43 + (Mon, 29 Jun 2009)
Log Message:
---
tweak for r52546, use require_once() to make the class file only load once.
Modified Paths:
--
trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
Modified: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
===
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
2009-06-29 16:16:10 UTC (rev 52549)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
2009-06-29 16:29:43 UTC (rev 52550)
@@ -306,7 +306,7 @@
if( !self::$initialised ) {
wfLoadExtensionMessages( 'SyntaxHighlight_GeSHi' );
if( !class_exists( 'GeSHi' ) )
- require( 'geshi/geshi.php' );
+ require_once( 'geshi/geshi.php' );
self::$initialised = true;
}
return true;
Modified: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
===
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
2009-06-29 16:16:10 UTC (rev 52549)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
2009-06-29 16:29:43 UTC (rev 52550)
@@ -62,7 +62,7 @@
}
if ( file_exists( $dir . 'geshi/geshi.php' ) ) {
- require( 'geshi/geshi.php' );
+ require_once( 'geshi/geshi.php' );
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] =
GESHI_VERSION;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52551] trunk/extensions/LiquidThreads/classes/LqtThread.php
Revision: 52551
Author: werdna
Date: 2009-06-29 16:33:56 + (Mon, 29 Jun 2009)
Log Message:
---
Fix bizarre handling of $thread-article() calls, wasn't considering the
possibility of new threads properly.
Modified Paths:
--
trunk/extensions/LiquidThreads/classes/LqtThread.php
Modified: trunk/extensions/LiquidThreads/classes/LqtThread.php
===
--- trunk/extensions/LiquidThreads/classes/LqtThread.php2009-06-29
16:29:43 UTC (rev 52550)
+++ trunk/extensions/LiquidThreads/classes/LqtThread.php2009-06-29
16:33:56 UTC (rev 52551)
@@ -557,14 +557,18 @@
function article() {
if ( $this-article ) return $this-article;
- $title = Title::newFromID( $this-articleId );
- if ( $title ) {
- $a = new Article( $title );
+ if ( !is_null( $this-articleId ) ) {
+ $title = Title::newFromID( $this-articleId );
+ if ( $title ) {
+ $article = new Article( $title );
+ }
}
- if ( isset( $a ) $a-exists() ) {
- return $a;
+ if ( isset( $article ) $article-exists() ) {
+ $this-article = $article;
+ return $article;
} else {
- return new Article( Title::makeTitle(
$this-articleNamespace, $this-articleTitle ) );
+ $title = Title::makeTitle( $this-articleNamespace,
$this-articleTitle );
+ return new Article( $title );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52552] trunk/extensions/LiquidThreads/lqt.css
Revision: 52552
Author: werdna
Date: 2009-06-29 16:34:54 + (Mon, 29 Jun 2009)
Log Message:
---
Fix jumping menu trigger
Modified Paths:
--
trunk/extensions/LiquidThreads/lqt.css
Modified: trunk/extensions/LiquidThreads/lqt.css
===
--- trunk/extensions/LiquidThreads/lqt.css 2009-06-29 16:33:56 UTC (rev
52551)
+++ trunk/extensions/LiquidThreads/lqt.css 2009-06-29 16:34:54 UTC (rev
52552)
@@ -499,7 +499,7 @@
.lqt-thread-actions-trigger {
padding: 0.5em;
- border: 1px transparent;
+ border: 1px transparent solid;
}
.lqt-thread-header-commands:hover .lqt-thread-actions-trigger {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52553] trunk/extensions/LiquidThreads/classes/LqtNewMessages.php
Revision: 52553
Author: werdna
Date: 2009-06-29 16:35:41 + (Mon, 29 Jun 2009)
Log Message:
---
Replace weird SQL with a single abstracted replace call, and remove unnecessary
globals.
Modified Paths:
--
trunk/extensions/LiquidThreads/classes/LqtNewMessages.php
Modified: trunk/extensions/LiquidThreads/classes/LqtNewMessages.php
===
--- trunk/extensions/LiquidThreads/classes/LqtNewMessages.php 2009-06-29
16:34:54 UTC (rev 52552)
+++ trunk/extensions/LiquidThreads/classes/LqtNewMessages.php 2009-06-29
16:35:41 UTC (rev 52553)
@@ -12,28 +12,28 @@
}
private static function writeUserMessageState( $thread, $user,
$timestamp ) {
- global $wgDBprefix;
- if ( is_object( $thread ) ) $thread_id = $thread-id();
- else if ( is_integer( $thread ) ) $thread_id = $thread;
- else throw new MWException( writeUserMessageState expected
Thread or integer but got $thread );
+ if ( is_object( $thread ) ) {
+ $thread_id = $thread-id();
+ } else if ( is_integer( $thread ) ) {
+ $thread_id = $thread;
+ } else {
+ throw new MWException( writeUserMessageState expected
Thread or integer but got $thread );
+ }
- if ( is_object( $user ) ) $user_id = $user-getID();
- else if ( is_integer( $user ) ) $user_id = $user;
- else throw new MWException( writeUserMessageState expected
User or integer but got $user );
+ if ( is_object( $user ) ) {
+ $user_id = $user-getID();
+ } else if ( is_integer( $user ) ) {
+ $user_id = $user;
+ } else {
+ throw new MWException( writeUserMessageState expected
User or integer but got $user );
+ }
- if ( $timestamp === null ) $timestamp = NULL;
-
// use query() directly to pass in 'true' for
don't-die-on-errors.
- $dbr = wfGetDB( DB_MASTER );
- $success = $dbr-query( insert into
{$wgDBprefix}user_message_state values ($user_id, $thread_id, $timestamp),
- __METHOD__, true );
-
- if ( !$success ) {
- // duplicate key; update.
- $dbr-query( update {$wgDBprefix}user_message_state
set ums_read_timestamp = $timestamp .
-where ums_thread = $thread_id and ums_user =
$user_id,
- __METHOD__ );
- }
+ $dbw = wfGetDB( DB_MASTER );
+
+ $dbw-replace( 'user_message_state', array( array( 'ums_user',
'ums_thread' ) ),
+ array( 'ums_user' = $user_id,
'ums_thread' = $thread_id,
+
'ums_read_timestamp' = $timestamp ), __METHOD__ );
}
/**
@@ -41,7 +41,7 @@
* If the thread is on a user's talkpage, set that user's newtalk.
*/
static function writeMessageStateForUpdatedThread( $t, $type,
$changeUser ) {
- global $wgDBprefix, $wgUser;
+ global $wgUser;
wfDebugLog( 'LiquidThreads', 'Doing notifications' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52555] trunk/extensions/SyntaxHighlight_GeSHi
Revision: 52555
Author: shinjiman
Date: 2009-06-29 17:06:59 + (Mon, 29 Jun 2009)
Log Message:
---
revert r52546 and r52550 for slow loading for the class, per CodeReview.
Modified Paths:
--
trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
Modified: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
===
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
2009-06-29 17:03:58 UTC (rev 52554)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
2009-06-29 17:06:59 UTC (rev 52555)
@@ -306,7 +306,7 @@
if( !self::$initialised ) {
wfLoadExtensionMessages( 'SyntaxHighlight_GeSHi' );
if( !class_exists( 'GeSHi' ) )
- require_once( 'geshi/geshi.php' );
+ require( 'geshi/geshi.php' );
self::$initialised = true;
}
return true;
Modified: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
===
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
2009-06-29 17:03:58 UTC (rev 52554)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
2009-06-29 17:06:59 UTC (rev 52555)
@@ -61,11 +61,6 @@
$wgExtensionFunctions[] = 'efSyntaxHighlight_GeSHiSetup';
}
-if ( file_exists( $dir . 'geshi/geshi.php' ) ) {
- require_once( 'geshi/geshi.php' );
- $wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] =
GESHI_VERSION;
-}
-
/**
* Register parser hook
*/
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52556] trunk/extensions/FlaggedRevs
Revision: 52556
Author: aaron
Date: 2009-06-29 17:19:24 + (Mon, 29 Jun 2009)
Log Message:
---
Added reviewedpages to api
Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedRevs.php
Added Paths:
---
trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php2009-06-29 17:06:59 UTC
(rev 52555)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php2009-06-29 17:19:24 UTC
(rev 52556)
@@ -371,8 +371,13 @@
$wgAutoloadClasses['FlaggedRevsApiHooks'] =
$dir.'api/FlaggedRevsApi.hooks.php';
$wgAutoloadClasses['ApiQueryOldreviewedpages'] = $dir .
'api/ApiQueryOldreviewedpages.php';
$wgAPIListModules['oldreviewedpages'] = 'ApiQueryOldreviewedpages';
+
+$wgAutoloadClasses['ApiQueryReviewedpages'] = $dir .
'api/ApiQueryReviewedpages.php';
+$wgAPIListModules['reviewedpages'] = 'ApiQueryReviewedpages';
+
$wgAutoloadClasses['ApiQueryFlagged'] = $dir . 'api/ApiQueryFlagged.php';
$wgAPIPropModules['flagged'] = 'ApiQueryFlagged';
+
$wgAutoloadClasses['ApiReview'] = $dir.'api/ApiReview.php';
$wgAPIModules['review'] = 'ApiReview';
Added: trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php
===
--- trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php
(rev 0)
+++ trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php 2009-06-29
17:19:24 UTC (rev 52556)
@@ -0,0 +1,196 @@
+?php
+
+/*
+ * Created on June 29, 2009
+ *
+ * API module for MediaWiki's FlaggedRevs extension
+ *
+ * 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.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/**
+ * Query module to list pages reviewed pages
+ *
+ * @ingroup FlaggedRevs
+ */
+class ApiQueryReviewedpages extends ApiQueryGeneratorBase {
+
+ public function __construct( $query, $moduleName ) {
+ parent::__construct( $query, $moduleName, 'rp' );
+ }
+
+ public function execute() {
+ $this-run();
+ }
+
+ public function executeGenerator( $resultPageSet ) {
+ $this-run( $resultPageSet );
+ }
+
+ private function run( $resultPageSet = null ) {
+ $params = $this-extractRequestParams();
+
+ // Construct SQL Query
+ $this-addTables( array( 'page', 'flaggedpages' ) );
+ $this-addWhereFld( 'page_namespace', $params['namespace'] );
+ if( $params['filterredir'] == 'redirects' )
+ $this-addWhereFld( 'page_is_redirect', 1 );
+ if( $params['filterredir'] == 'nonredirects' )
+ $this-addWhereFld( 'page_is_redirect', 0 );
+ $this-addWhereRange(
+ 'fp_page_id',
+ $params['dir'],
+ $params['start'],
+ $params['end']
+ );
+ $this-addWhere( 'page_id=fp_page_id' );
+ $this-addOption(
+ 'USE INDEX',
+ array( 'flaggedpages' = 'PRIMARY' )
+ );
+
+ if ( is_null( $resultPageSet ) ) {
+ $this-addFields( array (
+ 'page_id',
+ 'page_namespace',
+ 'page_title',
+ 'page_len',
+ 'page_latest',
+ 'fp_page_id',
+ 'fp_quality',
+ 'fp_stable'
+ ) );
+ } else {
+ $this-addFields( $resultPageSet-getPageTableFields()
);
+ $this-addFields ( 'fp_page_id' );
+ }
+
+ $limit = $params['limit'];
+ $this-addOption( 'LIMIT', $limit+1 );
+ $res = $this-select( __METHOD__ );
+
+ $data = array ();
+ $count = 0;
+ $db = $this-getDB();
+ while ( $row = $db-fetchObject( $res ) ) {
+ if ( ++$count $limit ) {
[MediaWiki-CVS] SVN: [52558] trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body .php
Revision: 52558 Author: aaron Date: 2009-06-29 17:28:55 + (Mon, 29 Jun 2009) Log Message: --- Tweaked generalQueryOK() Modified Paths: -- trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php Modified: trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php === --- trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php 2009-06-29 17:26:52 UTC (rev 52557) +++ trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php 2009-06-29 17:28:55 UTC (rev 52558) @@ -183,7 +183,7 @@ __METHOD__ ); $ratio = $pages/($pages - $reviewedpages); # If dist. is equal, # of rows scanned = $ratio * LIMIT (or until list runs out) - return ($ratio = 500); + return ($ratio = 400); } } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52560] trunk/extensions/Translate/groups/mediawiki-defines.txt
Revision: 52560 Author: siebrand Date: 2009-06-29 17:34:59 + (Mon, 29 Jun 2009) Log Message: --- Optional for 'edittoolbar-tool-table-example' Modified Paths: -- trunk/extensions/Translate/groups/mediawiki-defines.txt Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt === --- trunk/extensions/Translate/groups/mediawiki-defines.txt 2009-06-29 17:31:14 UTC (rev 52559) +++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2009-06-29 17:34:59 UTC (rev 52560) @@ -950,7 +950,7 @@ id = ext-ui-edittoolbar file = UsabilityInitiative/EditToolbar/EditToolbar.i18n.php descmsg = edittoolbar-desc -optional = edittoolbar-help-content-rereference-syntax +optional = edittoolbar-help-content-rereference-syntax, edittoolbar-tool-table-example ignored = edittoolbar-help-content-signaturetimestamp-syntax, edittoolbar-help-content-signature-syntax Usability Initiative - Edit Warning ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52562] trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php
Revision: 52562 Author: werdna Date: 2009-06-29 17:58:06 + (Mon, 29 Jun 2009) Log Message: --- Read -- Mark as read for clarity Modified Paths: -- trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php Modified: trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php === --- trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php2009-06-29 17:40:54 UTC (rev 52561) +++ trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php2009-06-29 17:58:06 UTC (rev 52562) @@ -126,7 +126,7 @@ 'lqt-older' = 'older', 'lqt-newer' = 'newer', 'lqt-searching' = 'Searching for threads', - 'lqt-read-message'= 'Read', + 'lqt-read-message'= 'Mark as read', 'lqt-read-message-tooltip' = 'Remove this thread from new messages. It will still be visible on its original talk page.', 'lqt-read-all'= 'Mark all as read', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52566] trunk/extensions/FlaggedRevs
Revision: 52566
Author: aaron
Date: 2009-06-29 19:43:01 + (Mon, 29 Jun 2009)
Log Message:
---
Added unreviewedpages to api
Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedRevs.php
Added Paths:
---
trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php2009-06-29 19:17:03 UTC
(rev 52565)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php2009-06-29 19:43:01 UTC
(rev 52566)
@@ -369,12 +369,16 @@
$wgSpecialPageGroups['ValidationStatistics'] = 'quality';
# API Modules
$wgAutoloadClasses['FlaggedRevsApiHooks'] =
$dir.'api/FlaggedRevsApi.hooks.php';
+# OldReviewedPages for API
$wgAutoloadClasses['ApiQueryOldreviewedpages'] = $dir .
'api/ApiQueryOldreviewedpages.php';
$wgAPIListModules['oldreviewedpages'] = 'ApiQueryOldreviewedpages';
-
+# UnreviewedPages for API
+$wgAutoloadClasses['ApiQueryUnreviewedpages'] = $dir .
'api/ApiQueryUnreviewedpages.php';
+$wgAPIListModules['unreviewedpages'] = 'ApiQueryUnreviewedpages';
+# ReviewedPages for API
$wgAutoloadClasses['ApiQueryReviewedpages'] = $dir .
'api/ApiQueryReviewedpages.php';
$wgAPIListModules['reviewedpages'] = 'ApiQueryReviewedpages';
-
+# Flag meta-data for pags
$wgAutoloadClasses['ApiQueryFlagged'] = $dir . 'api/ApiQueryFlagged.php';
$wgAPIPropModules['flagged'] = 'ApiQueryFlagged';
Added: trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
===
--- trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
(rev 0)
+++ trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
2009-06-29 19:43:01 UTC (rev 52566)
@@ -0,0 +1,188 @@
+?php
+
+/*
+ * Created on June 29, 2009
+ *
+ * API module for MediaWiki's FlaggedRevs extension
+ *
+ * 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.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/**
+ * Query module to list pages unreviewed pages
+ *
+ * @ingroup FlaggedRevs
+ */
+class ApiQueryUnreviewedpages extends ApiQueryGeneratorBase {
+
+ public function __construct( $query, $moduleName ) {
+ parent::__construct( $query, $moduleName, 'ur' );
+ }
+
+ public function execute() {
+ $this-run();
+ }
+
+ public function executeGenerator( $resultPageSet ) {
+ $this-run( $resultPageSet );
+ }
+
+ private function run( $resultPageSet = null ) {
+ $params = $this-extractRequestParams();
+
+ // Construct SQL Query
+ $this-addTables( array( 'page', 'flaggedpages' ) );
+ $this-addWhereFld( 'page_namespace', $params['namespace'] );
+ if( $params['filterredir'] == 'redirects' )
+ $this-addWhereFld( 'page_is_redirect', 1 );
+ if( $params['filterredir'] == 'nonredirects' )
+ $this-addWhereFld( 'page_is_redirect', 0 );
+ $this-addWhereRange(
+ 'page_title',
+ 'newer',
+ $params['start'],
+ $params['end']
+ );
+ $this-addJoinConds(
+ array('flaggedpages' = array ('LEFT
JOIN','fp_page_id=page_id') )
+ );
+ $this-addWhere( 'fp_page_id IS NULL OR
+ fp_quality '.intval($params['filterlevel']) );
+ $this-addOption(
+ 'USE INDEX',
+ array( 'page' = 'name_title', 'flaggedpages' =
'PRIMARY' )
+ );
+
+ if ( is_null( $resultPageSet ) ) {
+ $this-addFields( array (
+ 'page_id',
+ 'page_namespace',
+ 'page_title',
+ 'page_len',
+ 'page_latest',
+ ) );
+ } else {
+ $this-addFields( $resultPageSet-getPageTableFields()
);
+ }
+
+ $limit = $params['limit'];
+
[MediaWiki-CVS] SVN: [52567] trunk/extensions/FlaggedRevs/FlaggedRevs.php
Revision: 52567 Author: aaron Date: 2009-06-29 19:44:21 + (Mon, 29 Jun 2009) Log Message: --- comment typo Modified Paths: -- trunk/extensions/FlaggedRevs/FlaggedRevs.php Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php === --- trunk/extensions/FlaggedRevs/FlaggedRevs.php2009-06-29 19:43:01 UTC (rev 52566) +++ trunk/extensions/FlaggedRevs/FlaggedRevs.php2009-06-29 19:44:21 UTC (rev 52567) @@ -378,7 +378,7 @@ # ReviewedPages for API $wgAutoloadClasses['ApiQueryReviewedpages'] = $dir . 'api/ApiQueryReviewedpages.php'; $wgAPIListModules['reviewedpages'] = 'ApiQueryReviewedpages'; -# Flag meta-data for pags +# Flag meta-data for pages $wgAutoloadClasses['ApiQueryFlagged'] = $dir . 'api/ApiQueryFlagged.php'; $wgAPIPropModules['flagged'] = 'ApiQueryFlagged'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52568] trunk/phase3/maintenance/tables.sql
Revision: 52568 Author: werdna Date: 2009-06-29 19:44:52 + (Mon, 29 Jun 2009) Log Message: --- Document tag_summary and change_tags tables Modified Paths: -- trunk/phase3/maintenance/tables.sql Modified: trunk/phase3/maintenance/tables.sql === --- trunk/phase3/maintenance/tables.sql 2009-06-29 19:44:21 UTC (rev 52567) +++ trunk/phase3/maintenance/tables.sql 2009-06-29 19:44:52 UTC (rev 52568) @@ -1278,11 +1278,11 @@ -- A table to track tags for revisions, logs and recent changes. CREATE TABLE /*_*/change_tag ( - ct_rc_id int NULL, - ct_log_id int NULL, - ct_rev_id int NULL, - ct_tag varchar(255) NOT NULL, - ct_params blob NULL + ct_rc_id int NULL, -- RCID for the change + ct_log_id int NULL, -- LOGID for the change + ct_rev_id int NULL, -- REVID for the change + ct_tag varchar(255) NOT NULL, -- Tag applied + ct_params blob NULL -- Parameters for the tag, presently unused. ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/change_tag_rc_tag ON /*_*/change_tag (ct_rc_id,ct_tag); @@ -1295,10 +1295,10 @@ -- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT -- that only works on MySQL 4.1+ CREATE TABLE /*_*/tag_summary ( - ts_rc_id int NULL, - ts_log_id int NULL, - ts_rev_id int NULL, - ts_tags blob NOT NULL + ts_rc_id int NULL, -- RCID for the change + ts_log_id int NULL, -- LOGID for the change + ts_rev_id int NULL, -- REVID for the change + ts_tags blob NOT NULL -- Comma-separated list of tags. ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/tag_summary_rc_id ON /*_*/tag_summary (ts_rc_id); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52582] trunk/phase3/skins/Vector.php
Revision: 52582
Author: tparscal
Date: 2009-06-29 21:38:06 + (Mon, 29 Jun 2009)
Log Message:
---
Divided stylesheets into LTR and RTL versions, but also reverted strange hacks
to make things sort of work in may browsers. Still need to solve RTL problems
in browsers with certain CSS limitations.
Modified Paths:
--
trunk/phase3/skins/Vector.php
Modified: trunk/phase3/skins/Vector.php
===
--- trunk/phase3/skins/Vector.php 2009-06-29 21:32:31 UTC (rev 52581)
+++ trunk/phase3/skins/Vector.php 2009-06-29 21:38:06 UTC (rev 52582)
@@ -35,8 +35,13 @@
* @param object $out Output page to add styles to
*/
public function setupSkinUserCss( OutputPage $out ) {
+ global $wgContLang;
// Append to the default screen common print styles...
- $out-addStyle( 'vector/main.css', 'screen' );
+ if ( $wgContLang-isRTL() ) {
+ $out-addStyle( 'vector/main-rtl.css', 'screen' );
+ } else {
+ $out-addStyle( 'vector/main-ltr.css', 'screen' );
+ }
// Add common styles
parent::setupSkinUserCss( $out );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52583] branches/new-upload/phase3/js2/mwEmbed
Revision: 52583
Author: dale
Date: 2009-06-29 21:39:56 + (Mon, 29 Jun 2009)
Log Message:
---
include remoteSearchDriver in callback for application based invocation
Modified Paths:
--
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
Modified:
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
===
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
2009-06-29 21:38:06 UTC (rev 52582)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
2009-06-29 21:39:56 UTC (rev 52583)
@@ -340,7 +340,7 @@
//set up the target invocation:
if( $j(this.target_invocation).length==0 ){
- js_log(RemoteSearchDriver:: no target invocation
provided)
+ js_log(RemoteSearchDriver:: no target invocation
provided (will have to run your own doInitDisplay() ));
}else{
$j(this.target_invocation).css('cursor','pointer').attr('title',
gM('add_media_wizard')).click(function(){
_this.doInitDisplay();
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
===
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-29 21:38:06 UTC (rev 52582)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-29 21:39:56 UTC (rev 52583)
@@ -2404,10 +2404,8 @@
this.default_players['video/h264'] = ['flash', 'vlc'];
this.default_players['video/ogg'] = ['native','vlc','java',
'generic'];
- this.default_players['application/ogg'] =
['native','vlc','java', 'generic'];
-
- this.default_players['audio/ogg'] = ['native','vlc', 'omtk',
'java' ];
-
+ this.default_players['application/ogg'] =
['native','vlc','java', 'generic'];
+ this.default_players['audio/ogg'] = ['native','vlc', 'java',
'omtk' ];
this.default_players['video/mp4'] = ['vlc'];
this.default_players['text/html'] = ['html'];
Modified: branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
===
--- branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-29 21:38:06 UTC
(rev 52582)
+++ branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-29 21:39:56 UTC
(rev 52583)
@@ -112,10 +112,12 @@
path = '';
if(gClasses.length){
//do array loop:
- for(var i=0;igClasses.length;i++){
- //setup normal replacement of j with jquery
- var jsName = ( gClasses[i].substr(0,3) == '$j.' ) ?
opt['j_replace'] + gClasses[i].substr(3) : gClasses[i];
- mvClassPaths[ gClasses[i] ] = path + jsName + '.js';
+ for(var i=0; igClasses.length; i++){
+ if(typeof gClasses[i] != 'undefined'){
+ //setup normal replacement of j with jquery
+ var jsName = ( gClasses[i].substr(0,3) == '$j.'
) ? opt['j_replace'] + gClasses[i].substr(3) : gClasses[i];
+ mvClassPaths[ gClasses[i] ] = path + jsName +
'.js';
+ }
}
}else{
//do object loop:
@@ -773,8 +775,9 @@
], function(){
iObj['instance_name']= 'rsdMVRS';
_global['rsdMVRS'] = new
remoteSearchDriver( iObj );
- if( callback )
- callback();
+ if( callback ){
+ callback( _global['rsdMVRS'] );
+ }
});
});
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52584] trunk/phase3/skins/common/shared.css
Revision: 52584
Author: rainman
Date: 2009-06-29 21:59:22 + (Mon, 29 Jun 2009)
Log Message:
---
Tune spacing for did you mean link...
Modified Paths:
--
trunk/phase3/skins/common/shared.css
Modified: trunk/phase3/skins/common/shared.css
===
--- trunk/phase3/skins/common/shared.css2009-06-29 21:39:56 UTC (rev
52583)
+++ trunk/phase3/skins/common/shared.css2009-06-29 21:59:22 UTC (rev
52584)
@@ -275,8 +275,7 @@
div.searchdidyoumean {
font-size: 127%;
- margin-bottom: 1ex;
- margin-top: 1ex;
+ margin-top: 0.8em;
/* Note that this color won't affect the link, as desired. */
color: #c00;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [52585] trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar. js
Revision: 52585
Author: tparscal
Date: 2009-06-29 22:01:38 + (Mon, 29 Jun 2009)
Log Message:
---
Solved problems with cookie-stored state of booklets not being handled by pages
Modified Paths:
--
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-06-29 21:59:22 UTC (rev 52584)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-06-29 22:01:38 UTC (rev 52585)
@@ -220,16 +220,20 @@
var indexDiv = $( 'div /' )
.attr( 'class', 'index' )
.appendTo( $(this) );
-
+ // Builds name name of booklet state
cookie
var bookletCookie = 'edittoolbar-' +
$(this).attr( 'id' ) + '-booklet-' + id;
+ // Gets ID of selected page
var selectedID = $.cookie(
bookletCookie );
-
// Loops over each page
for ( page in section.pages ) {
+ // Fallback to current (first)
page for selectedID
+ if ( selectedID === null ) {
+ selectedID = page;
+ }
// Appends index entry
indexDiv.append(
$( 'div /' )
- .attr( 'class',
page == selectedID ? 'current' : null )
+ .attr( 'class',
page === selectedID ? 'current' : null )
.text( msg(
section.pages[page], 'label' ) )
.data( 'page',
page )
.data(
'cookie', bookletCookie )
@@ -252,6 +256,7 @@
// Appends page
var pageDiv = $( 'div /' )
.attr( 'class', 'page
page-' + page )
+ .css( 'display', page
=== selectedID ? 'block' : 'none' )
.appendTo( pagesDiv );
// Checks if there's content
for this page
switch (
section.pages[page].layout ) {
@@ -721,27 +726,27 @@
}
}
},
- 'newline': {
- labelMsg:
'edittoolbar-tool-newline',
+ 'table': {
+ labelMsg:
'edittoolbar-tool-table',
type: 'button',
- icon: 'insert-newline.png',
+ icon: 'insert-table.png',
action: {
type: 'encapsulate',
options: {
- pre: br /\n
+ pre: {|
class=\wikitable\ border=\1\\n|,
+ periMsg:
'edittoolbar-tool-table-example',
+ post: \n|}
}
}
},
- 'table': {
- labelMsg:
'edittoolbar-tool-table',
+ 'newline': {
+ labelMsg:
'edittoolbar-tool-newline',
type: 'button',
- icon: 'insert-table.png',
+ icon: 'insert-newline.png',
