jenkins-bot has submitted this change and it was merged.

Change subject: BSPageAssignments: Fixed icons
......................................................................


BSPageAssignments: Fixed icons

Change-Id: I22f689675a068ee36c474f1cc9df95acdffdbb3d
---
M PageAssignments/includes/views/ViewPAStateBarBodyElement.php
M PageAssignments/resources/BS.PageAssignments/panel/Manager.js
M PageAssignments/resources/BS.PageAssignments/panel/Overview.js
M 
PageAssignments/resources/BS.PageAssignments/portlets/PageAssignmentsPortlet.js
M PageAssignments/resources/bluespice.pageassignments.BookshelfPlugin.js
M PageAssignments/resources/ext.bluespice.extjs.overrides.less
6 files changed, 9 insertions(+), 16 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageAssignments/includes/views/ViewPAStateBarBodyElement.php 
b/PageAssignments/includes/views/ViewPAStateBarBodyElement.php
index 22f7875..c50bf6e 100644
--- a/PageAssignments/includes/views/ViewPAStateBarBodyElement.php
+++ b/PageAssignments/includes/views/ViewPAStateBarBodyElement.php
@@ -7,7 +7,7 @@
                $this->sBodyText = '<ul>';
                foreach ( $this->_mData as $oAssignee ) {
                        if( $oAssignee instanceof BSAssignableBase );
-                       $this->sBodyText .= '<li><span 
class="icon-'.$oAssignee->toStdClass()->type.' 
bs-typeicon"></span>'.$oAssignee->toStdClass()->anchor.'</li>';
+                       $this->sBodyText .= '<li><span 
class="bs-icon-'.$oAssignee->toStdClass()->type.' 
bs-typeicon"></span>'.$oAssignee->toStdClass()->anchor.'</li>';
                }
                $this->sBodyText .= '</ul>';
                return parent::execute($params);
diff --git a/PageAssignments/resources/BS.PageAssignments/panel/Manager.js 
b/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
index ce3ce3b..0bf6d55 100644
--- a/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
+++ b/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
@@ -22,7 +22,7 @@
                                renderer: function( value, metaData, record, 
rowIndex, colIndex, store, view ) {
                                        var html = [];
                                        for( var i = 0; i < value.length; i++ ) 
{
-                                               html.push( "<span 
class=\'icon-"+value[i].type+" bs-typeicon\'></span>" + value[i].anchor );
+                                               html.push( "<span 
class=\'bs-icon-"+value[i].type+" bs-typeicon\'></span>" + value[i].anchor );
                                        }
                                        if( html.length === 0 ) {
                                                html.push( '<em>' + 
mw.message('bs-pageassignments-no-assignments').plain() + '</em>' );
diff --git a/PageAssignments/resources/BS.PageAssignments/panel/Overview.js 
b/PageAssignments/resources/BS.PageAssignments/panel/Overview.js
index 09eef4a..c003fde 100644
--- a/PageAssignments/resources/BS.PageAssignments/panel/Overview.js
+++ b/PageAssignments/resources/BS.PageAssignments/panel/Overview.js
@@ -27,7 +27,7 @@
                                                        html.push( '<em>' +  
mw.message('bs-pageassignments-directly-assigned').plain() + '</em>' );
                                                }
                                                else {
-                                                       html.push( "<span 
class=\'icon-"+value[id].type+" bs-typeicon\'></span>" + value[id].anchor );
+                                                       html.push( "<span 
class=\'bs-icon-"+value[id].type+" bs-typeicon\'></span>" + value[id].anchor );
                                                }
                                        }
 
diff --git 
a/PageAssignments/resources/BS.PageAssignments/portlets/PageAssignmentsPortlet.js
 
b/PageAssignments/resources/BS.PageAssignments/portlets/PageAssignmentsPortlet.js
index b985449..19dd2cb 100644
--- 
a/PageAssignments/resources/BS.PageAssignments/portlets/PageAssignmentsPortlet.js
+++ 
b/PageAssignments/resources/BS.PageAssignments/portlets/PageAssignmentsPortlet.js
@@ -44,7 +44,7 @@
                                                        html.push( '<em>' +  
mw.message('bs-pageassignments-directly-assigned').plain() + '</em>' );
                                                }
                                                else {
-                                                       html.push( "<span 
class=\'icon-"+value[id].type+" bs-typeicon\'></span>" + value[id].anchor );
+                                                       html.push( "<span 
class=\'bs-icon-"+value[id].type+" bs-typeicon\'></span>" + value[id].anchor );
                                                }
                                        }
                                        return html.join(', ');
diff --git 
a/PageAssignments/resources/bluespice.pageassignments.BookshelfPlugin.js 
b/PageAssignments/resources/bluespice.pageassignments.BookshelfPlugin.js
index 2bc0b87..8885d3d 100644
--- a/PageAssignments/resources/bluespice.pageassignments.BookshelfPlugin.js
+++ b/PageAssignments/resources/bluespice.pageassignments.BookshelfPlugin.js
@@ -15,7 +15,7 @@
                        }
                        var sOut = "<table>\n";
                        for(var i = 0; i < assignments.length; i++) {
-                               sOut = sOut + "<tr><td><span class=\"icon-" + 
assignments[i]['type'] +"\"></span></td><td>" + assignments[i]['anchor'] + 
"</td></tr>\n";
+                               sOut = sOut + "<tr><td><span class=\"bs-icon-" 
+ assignments[i]['type'] +"\"></span></td><td>" + assignments[i]['anchor'] + 
"</td></tr>\n";
                        }
                        sOut = sOut + "</table>\n";
                        return sOut;
@@ -24,7 +24,7 @@
 
        oConf.actions.push(
                {
-                       iconCls: 'bs-extjs-actioncolumn-icon icon-users 
progressive',
+                       iconCls: 'bs-extjs-actioncolumn-icon bs-icon-group 
progressive',
                        glyph: true,
                        tooltip: mw.message( 'bs-pageassignments-menu-label' 
).plain(),
                        handler: function( grid, rowIndex, colIndex, btn, 
event, record, rowElement ) {
diff --git a/PageAssignments/resources/ext.bluespice.extjs.overrides.less 
b/PageAssignments/resources/ext.bluespice.extjs.overrides.less
index b4ce6af..638bdb6 100644
--- a/PageAssignments/resources/ext.bluespice.extjs.overrides.less
+++ b/PageAssignments/resources/ext.bluespice.extjs.overrides.less
@@ -15,14 +15,7 @@
        }
 }
 
-.icon-user:before {
-       content: "\e7d1";
-}
-.icon-group:before {
-       content: "\e7d2";
-}
-
-.x-list-plain li span[class='icon-*'] {
+.x-list-plain li span[class='bs-icon-*'] {
        margin-right: 0.1em;
 }
 
@@ -32,8 +25,8 @@
 
 body.mediawiki #content {
        .bs-extjs-actioncolumn-icon {
-               &[class*='icon-']:after,
-               &[class*='icon-']:before {
+               &[class*='bs-icon-']:after,
+               &[class*='bs-icon-']:before {
                        color: #999;
                }
        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22f689675a068ee36c474f1cc9df95acdffdbb3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
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