http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71780
Revision: 71780
Author: questpc
Date: 2010-08-27 07:57:12 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
v0.2.1 Fixing some messages. Refactoring of MVC. Separate settings for amount
of elements in page per pager.
Modified Paths:
--------------
trunk/extensions/CategoryBrowser/CategoryBrowser.php
trunk/extensions/CategoryBrowser/CategoryBrowserBasic.php
trunk/extensions/CategoryBrowser/CategoryBrowserPage.php
trunk/extensions/CategoryBrowser/CategoryBrowser_i18n.php
trunk/extensions/CategoryBrowser/INSTALL
trunk/extensions/CategoryBrowser/README
trunk/extensions/CategoryBrowser/category_browser.js
Modified: trunk/extensions/CategoryBrowser/CategoryBrowser.php
===================================================================
--- trunk/extensions/CategoryBrowser/CategoryBrowser.php 2010-08-27
04:55:27 UTC (rev 71779)
+++ trunk/extensions/CategoryBrowser/CategoryBrowser.php 2010-08-27
07:57:12 UTC (rev 71780)
@@ -27,7 +27,7 @@
* * Add this line at the end of your LocalSettings.php file :
* require_once "$IP/extensions/CategoryBrowser/CategoryBrowser.php";
*
- * @version 0.2.0
+ * @version 0.2.1
* @link http://www.mediawiki.org/wiki/Extension:CategoryBrowser
* @author Dmitriy Sintsov <[email protected]>
* @addtogroup Extensions
@@ -39,6 +39,8 @@
/* default minimal count of DB rows to start paging */
define( 'CB_PAGING_ROWS', 20 );
+/* minimal count of rows in image gallery (not DB rows!) pager */
+define( 'CB_FILES_ROWS', 3 );
/* maximal number of logical operations in SQL filter (condition) */
define( 'CB_MAX_LOGICAL_OP', 5 );
@@ -46,7 +48,7 @@
class CB_Setup {
- static $version = '0.2.0';
+ static $version = '0.2.1';
static $ExtDir; // filesys path with windows path fix
static $ScriptPath; // apache virtual path
static $cat_pages_ranges; // ???
@@ -62,6 +64,11 @@
// number of files to show in gallery row
static $imageGalleryPerRow = 4;
+ // default limits of different pagers
+ static $categoriesLimit = CB_PAGING_ROWS;
+ static $pagesLimit = CB_PAGING_ROWS;
+ static $filesLimit = CB_FILES_ROWS;
+
/**
* Add this extension to the mediawiki's extensions list.
*/
@@ -78,12 +85,19 @@
$top_dir = array_pop( explode( '/', self::$ExtDir ) );
self::$ScriptPath = $wgScriptPath . '/extensions' . ( (
$top_dir == 'extensions' ) ? '' : '/' . $top_dir );
$wgExtensionMessagesFiles['CategoryBrowser'] = self::$ExtDir .
'/CategoryBrowser_i18n.php';
+
// do not forget to autoload all the required classes (for AJAX
to work correctly)
$wgAutoloadClasses['CB_XML'] =
$wgAutoloadClasses['CB_SqlCond'] = self::$ExtDir .
'/CategoryBrowserBasic.php';
+
$wgAutoloadClasses['CB_RootPager'] =
- $wgAutoloadClasses['CB_SubPager'] =
- $wgAutoloadClasses['CategoryBrowser'] = self::$ExtDir .
'/CategoryBrowserMain.php';
+ $wgAutoloadClasses['CB_SubPager'] = self::$ExtDir .
'/CategoryBrowserModel.php';
+
+ $wgAutoloadClasses['CB_CategoriesView'] =
+ $wgAutoloadClasses['CB_PagesView'] =
+ $wgAutoloadClasses['CB_FilesView'] = self::$ExtDir .
'/CategoryBrowserView.php';
+
+ $wgAutoloadClasses['CategoryBrowser'] = self::$ExtDir .
'/CategoryBrowserCtrl.php';
$wgAutoloadClasses['CategoryBrowserPage'] = self::$ExtDir .
'/CategoryBrowserPage.php';
$wgExtensionCredits['specialpage'][] = array(
@@ -94,6 +108,7 @@
);
$wgSpecialPages['CategoryBrowser'] = array(
'CategoryBrowserPage' );
$wgSpecialPageGroups['CategoryBrowser'] = 'pages';
+
$wgAjaxExportList[] = 'CategoryBrowser::getRootOffsetHtml';
$wgAjaxExportList[] = 'CategoryBrowser::getSubOffsetHtml';
$wgAjaxExportList[] = 'CategoryBrowser::applyEncodedQueue';
Modified: trunk/extensions/CategoryBrowser/CategoryBrowserBasic.php
===================================================================
--- trunk/extensions/CategoryBrowser/CategoryBrowserBasic.php 2010-08-27
04:55:27 UTC (rev 71779)
+++ trunk/extensions/CategoryBrowser/CategoryBrowserBasic.php 2010-08-27
07:57:12 UTC (rev 71780)
@@ -27,7 +27,7 @@
* * Add this line at the end of your LocalSettings.php file :
* require_once "$IP/extensions/CategoryBrowser/CategoryBrowser.php";
*
- * @version 0.2.0
+ * @version 0.2.1
* @link http://www.mediawiki.org/wiki/Extension:CategoryBrowser
* @author Dmitriy Sintsov <[email protected]>
* @addtogroup Extensions
Modified: trunk/extensions/CategoryBrowser/CategoryBrowserPage.php
===================================================================
--- trunk/extensions/CategoryBrowser/CategoryBrowserPage.php 2010-08-27
04:55:27 UTC (rev 71779)
+++ trunk/extensions/CategoryBrowser/CategoryBrowserPage.php 2010-08-27
07:57:12 UTC (rev 71780)
@@ -27,7 +27,7 @@
* * Add this line at the end of your LocalSettings.php file :
* require_once "$IP/extensions/CategoryBrowser/CategoryBrowser.php";
*
- * @version 0.2.0
+ * @version 0.2.1
* @link http://www.mediawiki.org/wiki/Extension:CategoryBrowser
* @author Dmitriy Sintsov <[email protected]>
* @addtogroup Extensions
@@ -111,8 +111,8 @@
);
if ( CB_Setup::$cat_title_CI != '' ) {
// case insensitive search is possible
- $checkbox = array( '__tag' => 'input', 'type' =>
'checkbox', 'onchange' => $js_setNameFilter, 'id' => 'cb_cat_name_filter_ci',
'checked' => null );
- $nameFilterFields[] = wfMsg( 'cb_cat_name_filter_ci',
CB_XML::toText( $checkbox ) );
+ $nameFilterFields[] = wfMsg( 'cb_cat_name_filter_ci' );
+ $nameFilterFields[] = array( '__tag' => 'input', 'type'
=> 'checkbox', 'onchange' => $js_setNameFilter, 'id' =>
'cb_cat_name_filter_ci', 'checked' => null );
}
$top_tpl =
array( '__tag' => 'table', 'class' =>
'cb_top_container', '__end' => "\n",
@@ -122,19 +122,19 @@
array( '__tag' => 'tr', '__end' => "\n",
array( '__tag' => 'td', 'class' =>
'cb_toolbox_bottom', '__end' => "\n",
array( wfMsg(
'cb_cat_name_filter' ) ),
- $nameFilterFields,
+ &$nameFilterFields,
)
),
array( '__tag' => 'tr', '__end' => "\n",
array( '__tag' => 'td', 'class' =>
'cb_toolbox', 'style' => 'display:none; ', '__end' => "\n",
- array( '__tag' => 'div', 'id'
=> 'cb_editor_container', 0 => '' ),
+ array( '__tag' => 'div', 'id'
=> 'cb_editor_container', 0 => '' /* holder of condition line */ ),
array( '__tag' => 'div',
'class' => 'cb_separate_container', 0 => '' /* holder of apply button */ )
)
),
array( '__tag' => 'tr', '__end' => "\n",
array( '__tag' => 'td', 'class' =>
'cb_toolbox', 'style' => 'display:none; ', '__end' => "\n",
array( '__tag' => 'div',
'class' => 'cb_copy_line_hint', 0 => wfMsg( 'cb_copy_line_hint' ) ),
- array( '__tag' => 'div', 'id'
=> 'cb_editor_controls', 0 => '' )
+ array( '__tag' => 'div', 'id'
=> 'cb_samples_container', 0 => '' /* holder of samples line */ )
)
),
array( '__tag' => 'tr', '__end' => "\n",
@@ -145,7 +145,8 @@
);
# }}}
$condSelector = CategoryBrowser::generateSelector(
$this->ranges, $rootPager );
- $catlist = $cb->generateCatList( $rootPager );
+ $pagerView = new CB_CategoriesView( $rootPager );
+ $catlist = $pagerView->generateList();
$wgOut->addHTML( CB_XML::toText( $top_tpl ) );
}
Modified: trunk/extensions/CategoryBrowser/CategoryBrowser_i18n.php
===================================================================
--- trunk/extensions/CategoryBrowser/CategoryBrowser_i18n.php 2010-08-27
04:55:27 UTC (rev 71779)
+++ trunk/extensions/CategoryBrowser/CategoryBrowser_i18n.php 2010-08-27
07:57:12 UTC (rev 71780)
@@ -27,7 +27,7 @@
* * Add this line at the end of your LocalSettings.php file :
* require_once "$IP/extensions/CategoryBrowser/CategoryBrowser.php";
*
- * @version 0.2.0
+ * @version 0.2.1
* @link http://www.mediawiki.org/wiki/Extension:CategoryBrowser
* @author Dmitriy Sintsov <[email protected]>
* @addtogroup Extensions
@@ -50,7 +50,7 @@
However, browsing of pre-defined conditions should work normally.
Please change or upgrade your browser, if possible.',
'cb_cat_name_filter' => 'Search for category by name:',
- 'cb_cat_name_filter_ci' => '(case insensitive) $1',
+ 'cb_cat_name_filter_ci' => '(case insensitive)',
'cb_copy_line_hint' => 'Use the [+] and [>+] buttons to copy and paste
operators into the selected expression',
'cb_has_subcategories' => '$1 {{PLURAL:$1|subcategory|subcategories}}',
'cb_has_pages' => '$1 {{PLURAL:$1|page|pages}}',
@@ -89,17 +89,17 @@
* @author QuestPC
*/
$messages['qqq'] = array(
- 'cb_cat_name_filter_ci' => 'Dialog for case insensitive category name
search. Argument 1 is a script-generated html input checkbox.',
+ 'cb_cat_name_filter_ci' => 'Dialog string for case insensitive category
name search.',
'cb_op1_template' => 'One operand operation visualisation template.
Argument 1 is an operator name. Argument 2 is operation\'s parameter.',
'cb_op2_template' => 'Two operands operation visualisation template.
Argument 1 is first parameter. Argument 2 is operator name. Argument 3 is
second parameter.',
'cb_all_op' => 'Operator to select all categories available.',
'cb_lbracket_op' => 'Opening bracket, allows to change execution
order.',
'cb_rbracket_op' => 'Closing bracket, allows to change execution
order.',
- 'cb_or_op' => 'Logical "or" operator name in your language. Short
(mathematical) form is preferred.',
- 'cb_and_op' => 'Logical "and" operator name in your language. Short
(mathematical) form is preferred.',
- 'cb_ge_op' => 'Comparsion operator "greater or equal" name in your
language. Short (mathematical) form is preferred.',
- 'cb_le_op' => 'Comparsion operator "less or equal" name in your
language. Short (mathematical) form is preferred.',
- 'cb_eq_op' => 'Comparsion operator "equal" name in your language. Short
(mathematical) form is preferred.',
+ 'cb_or_op' => 'Name of logical "or" operator in your language. Short
(mathematical) form is preferred.',
+ 'cb_and_op' => 'Name of logical "and" operator in your language. Short
(mathematical) form is preferred.',
+ 'cb_ge_op' => 'Name of comparsion operator "greater or equal" in your
language. Short (mathematical) form is preferred.',
+ 'cb_le_op' => 'Name of comparsion operator "less or equal" in your
language. Short (mathematical) form is preferred.',
+ 'cb_eq_op' => 'Name of comparsion operator "equal" in your language.
Short (mathematical) form is preferred.',
);
/** Russian (Русский)
@@ -113,7 +113,7 @@
Возможен лишь просмотр предопределенных выражений.
Пожалуйста поменяйте или обновите ваш браузер.',
'cb_cat_name_filter' => 'Поиск категории по имени:',
- 'cb_cat_name_filter_ci' => '(без учёта регистра) $1',
+ 'cb_cat_name_filter_ci' => '(без учёта регистра)',
'cb_copy_line_hint' => 'Используйте кнопки [+] и [>+] для копирования
оператора в выбранное выражение',
'cb_has_subcategories' => '$1
{{PLURAL:$1|подкатегория|подкатегории|подкатегорий}}',
'cb_has_pages' => '$1 {{PLURAL:$1|страница|страницы|страниц}}',
Modified: trunk/extensions/CategoryBrowser/INSTALL
===================================================================
--- trunk/extensions/CategoryBrowser/INSTALL 2010-08-27 04:55:27 UTC (rev
71779)
+++ trunk/extensions/CategoryBrowser/INSTALL 2010-08-27 07:57:12 UTC (rev
71780)
@@ -1,4 +1,4 @@
-MediaWiki extension CategoryBrowser, version 0.2.0
+MediaWiki extension CategoryBrowser, version 0.2.1
* download the latest available version and extract it to your wiki extension
directory.
* add the following line to LocalSettings.php
Modified: trunk/extensions/CategoryBrowser/README
===================================================================
--- trunk/extensions/CategoryBrowser/README 2010-08-27 04:55:27 UTC (rev
71779)
+++ trunk/extensions/CategoryBrowser/README 2010-08-27 07:57:12 UTC (rev
71780)
@@ -1,4 +1,4 @@
-MediaWiki extension CategoryBrowser, version 0.2.0
+MediaWiki extension CategoryBrowser, version 0.2.1
CategoryBrowser is an AJAX-enabled category filter and browser for MediaWiki.
Categories can be filtered with pre-defined and also with used-defined
conditions.
Modified: trunk/extensions/CategoryBrowser/category_browser.js
===================================================================
--- trunk/extensions/CategoryBrowser/category_browser.js 2010-08-27
04:55:27 UTC (rev 71779)
+++ trunk/extensions/CategoryBrowser/category_browser.js 2010-08-27
07:57:12 UTC (rev 71780)
@@ -26,7 +26,7 @@
* * Add this line at the end of your LocalSettings.php file :
* require_once "$IP/extensions/CategoryBrowser/CategoryBrowser.php";
*
- * @version 0.2.0
+ * @version 0.2.1
* @link http://www.mediawiki.org/wiki/Extension:CategoryBrowser
* @author Dmitriy Sintsov <[email protected]>
* @addtogroup Extensions
@@ -1584,7 +1584,7 @@
createEditSamples : function() {
var i = 0;
- var cbEditorControls = document.getElementById(
'cb_editor_controls' );
+ var cbEditorControls = document.getElementById(
'cb_samples_container' );
// show previousely hidden toolbox cell
cbEditorControls.parentNode.style.display = (CB_Setup.isIE > 7)
? 'table-cell' : 'block';
this.samplesLine = new CB_EditLine( 'samples',
cbEditorControls, 'samplesLine' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
