[MediaWiki-commits] [Gerrit] Improvements to display of multiple-instance templates in forms - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/186394

Change subject: Improvements to display of multiple-instance templates in forms
......................................................................

Improvements to display of multiple-instance templates in forms

Patch by Simon Heimler, with some minor changes by Yaron.

Change-Id: I4dfa3cc63ceb63c2a1b6944d5cdcdbdd20f0c657
---
M includes/SF_FormPrinter.php
M libs/SemanticForms.js
M skins/SemanticForms.css
A skins/rearrangeDots.png
D skins/rearranger.png
5 files changed, 19 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/94/186394/1

diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index df9611a..47fad3e 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -288,20 +288,19 @@
                global $sfgScriptPath;
 
                if ( $form_is_disabled ) {
-                       $addAboveButton = $removeButton = $rearranger = '';
+                       $addAboveButton = $removeButton;
                } else {
                        $addAboveButton = Html::element( 'a', array( 'class' => 
"addAboveButton", 'title' => wfMessage( 'sf_formedit_addanotherabove' )->text() 
) );
                        $removeButton = Html::element( 'a', array( 'class' => 
"removeButton", 'title' => wfMessage( 'sf_formedit_remove' )->text() ) );
-                       $rearranger = Html::element( 'img', array( 'src' => 
"$sfgScriptPath/skins/rearranger.png", 'class' => "rearrangerImage" ) );
                }
 
                $text = <<<END
                        <table>
                        <tr>
-                       <td>$mainText</td>
-                       <td>$addAboveButton</td>
-                       <td>$removeButton</td>
-                       <td class="instanceRearranger">$rearranger</td>
+                       <td class="instanceRearranger"></td>
+                       <td class="instanceMain">$mainText</td>
+                       <td class="instanceAddAbove">$addAboveButton</td>
+                       <td class="instanceRemove">$removeButton</td>
                        </tr>
                        </table>
 END;
diff --git a/libs/SemanticForms.js b/libs/SemanticForms.js
index 9c31e58..1058182 100644
--- a/libs/SemanticForms.js
+++ b/libs/SemanticForms.js
@@ -1127,7 +1127,7 @@
        });
        jQuery('.multipleTemplateList').sortable({
                axis: 'y',
-               handle: '.rearrangerImage'
+               handle: '.instanceRearranger'
        });
 
 
diff --git a/skins/SemanticForms.css b/skins/SemanticForms.css
index 5f39883..e402c37 100644
--- a/skins/SemanticForms.css
+++ b/skins/SemanticForms.css
@@ -98,10 +98,11 @@
 }
 
 .multipleTemplateInstance {
-       background-color: #dddddd;
+       background-color: #e9e9e9;
        border: 1px solid #cccccc;
        padding: 5px;
        margin: 10px 0 10px 0;
+       border-radius: 3px;
 }
 
 .multipleTemplateInstance table {
@@ -143,11 +144,18 @@
 }
 
 td.instanceRearranger {
-       max-width: 15px;
-}
-
-img.rearrangerImage {
        cursor: move;
+       background-image: url(rearrangeDots.png);
+       background-repeat: repeat;
+       width: 14px;
+}
+td.instanceMain {
+       padding-left: 7px;
+}
+td.instanceAddAbove, td.instanceRemove {
+       padding: 0;
+       width: 34px;
+       overflow: visible;
 }
 
 .autoGrow {
diff --git a/skins/rearrangeDots.png b/skins/rearrangeDots.png
new file mode 100644
index 0000000..3cff5ee
--- /dev/null
+++ b/skins/rearrangeDots.png
Binary files differ
diff --git a/skins/rearranger.png b/skins/rearranger.png
deleted file mode 100644
index b9ac255..0000000
--- a/skins/rearranger.png
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dfa3cc63ceb63c2a1b6944d5cdcdbdd20f0c657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>

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