Yaron Koren has submitted this change and it was merged.

Change subject: UI improvements for Generate Pages page
......................................................................


UI improvements for Generate Pages page

- add select "All" and "None" buttons to Generate Pages page
- specify utf-8 encoding for xmldocument for saving non-English symbols 
correctly

Change-Id: I123da5f04f9106611b9b75b9aba02f76b0c95dfc
---
M PageSchemas.classes.php
M PageSchemas.php
A generatepages.js
M specials/PS_EditSchema.php
M specials/PS_GeneratePages.php
5 files changed, 32 insertions(+), 0 deletions(-)

Approvals:
  Yaron Koren: Verified; Looks good to me, approved



diff --git a/PageSchemas.classes.php b/PageSchemas.classes.php
index d26155e..636a89b 100644
--- a/PageSchemas.classes.php
+++ b/PageSchemas.classes.php
@@ -243,6 +243,7 @@
                }
                return $object[$key];
        }
+
 }
 
 /**
diff --git a/PageSchemas.php b/PageSchemas.php
index 1c91fb8..d7652fb 100644
--- a/PageSchemas.php
+++ b/PageSchemas.php
@@ -89,6 +89,18 @@
                ),
        ),
 );
+$wgResourceModules += array(
+    'ext.pageschemas.generatepages' => $pageSchemasResourceTemplate + array(
+        'scripts' => array(
+            'generatepages.js',
+        ),
+        'styles' => array(
+        ),
+        'dependencies' => array(
+            'jquery',
+        ),
+    ),
+);
 
 // Page Schemas global variables
 $wgPageSchemasFieldNum = 0;
diff --git a/generatepages.js b/generatepages.js
new file mode 100644
index 0000000..753bc52
--- /dev/null
+++ b/generatepages.js
@@ -0,0 +1,11 @@
+$(document).ready(function(){
+       $('#ps_check_all').click(function(){
+               
$(this).parent().parent().find('input[type="checkbox"]').attr('checked',true);
+               return false;
+       });
+
+       $('#ps_check_none').click(function(){
+               
$(this).parent().parent().find('input[type="checkbox"]').attr('checked',false);
+               return false;
+       });
+});
\ No newline at end of file
diff --git a/specials/PS_EditSchema.php b/specials/PS_EditSchema.php
index 9b5dc7d..15677c6 100644
--- a/specials/PS_EditSchema.php
+++ b/specials/PS_EditSchema.php
@@ -24,6 +24,7 @@
                $domDocument->preserveWhiteSpace = false;
                $domDocument->formatOutput = true;
                $domDocument->loadXML( $xml );
+               $domDocument->encoding="UTF-8";
                return $domDocument->saveXML( $domDocument->documentElement );
        }
 
diff --git a/specials/PS_GeneratePages.php b/specials/PS_GeneratePages.php
index bf3de5b..a9f19ca 100644
--- a/specials/PS_GeneratePages.php
+++ b/specials/PS_GeneratePages.php
@@ -50,6 +50,13 @@
                $text .= '<form method="post">';
                $text .= Html::input( 'param', $category, 'hidden' ) . "\n";
 
+               $text .= '<div id="ps_check_all_check_none">
+               <input type="button" id="ps_check_all" 
value="'.wfMessage('powersearch-toggleall')->text().'" />
+               <input type="button" id="ps_check_none" 
value="'.wfMessage('powersearch-togglenone')->text().'" />
+               </div><br/>';
+
+               $wgOut->addModules('ext.pageschemas.generatepages');
+
                // This hook will set an array of strings, with each value
                // as a title of a page to be created.
                $pageList = array();

-- 
To view, visit https://gerrit.wikimedia.org/r/53866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I123da5f04f9106611b9b75b9aba02f76b0c95dfc
Gerrit-PatchSet: 15
Gerrit-Project: mediawiki/extensions/PageSchemas
Gerrit-Branch: master
Gerrit-Owner: Vedmaka Wakalaka <god.vedm...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: Vedmaka Wakalaka <god.vedm...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yury Katkov <katkov.ju...@gmail.com>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to