[MediaWiki-commits] [Gerrit] Keep bundled notification compact header on one line - change (mediawiki...Echo)

2016-07-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Keep bundled notification compact header on one line
..


Keep bundled notification compact header on one line

Bug: T139321
Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
(cherry picked from commit db838e42ce7c81dcfe46a6c18b51332b2a680bb1)
---
M includes/formatters/EventPresentationModel.php
M modules/echo.variables.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
3 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/formatters/EventPresentationModel.php 
b/includes/formatters/EventPresentationModel.php
index 56b4d72..3afebc6 100644
--- a/includes/formatters/EventPresentationModel.php
+++ b/includes/formatters/EventPresentationModel.php
@@ -456,7 +456,7 @@
 
return array(
'header' => $this->getHeaderMessage()->parse(),
-   'compactHeader' => 
$this->getCompactHeaderMessage()->parse(),
+   'compactHeader' => 
$this->getCompactHeaderMessage()->escaped(),
'body' => $body ? $body->escaped() : '',
'icon' => $this->getIconType(),
'links' => array(
diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index b962f77..f9eb60c 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -11,6 +11,7 @@
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
+@bundled-notification-header-width: 350px;
 
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 1a8b648..23a67f2 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -134,6 +134,11 @@
display: table-cell;
padding-right: 0.5em;
width: 100%;
+
+   &-header {
+   
.mw-echo-ui-mixin-one-line-truncated;
+   width: 
@bundled-notification-header-width;
+   }
}
 
&-content-actions {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Keep bundled notification compact header on one line - change (mediawiki...Echo)

2016-07-06 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

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

Change subject: Keep bundled notification compact header on one line
..

Keep bundled notification compact header on one line

Bug: T139321
Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
(cherry picked from commit db838e42ce7c81dcfe46a6c18b51332b2a680bb1)
---
M includes/formatters/EventPresentationModel.php
M modules/echo.variables.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
3 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/95/297695/1

diff --git a/includes/formatters/EventPresentationModel.php 
b/includes/formatters/EventPresentationModel.php
index 56b4d72..3afebc6 100644
--- a/includes/formatters/EventPresentationModel.php
+++ b/includes/formatters/EventPresentationModel.php
@@ -456,7 +456,7 @@
 
return array(
'header' => $this->getHeaderMessage()->parse(),
-   'compactHeader' => 
$this->getCompactHeaderMessage()->parse(),
+   'compactHeader' => 
$this->getCompactHeaderMessage()->escaped(),
'body' => $body ? $body->escaped() : '',
'icon' => $this->getIconType(),
'links' => array(
diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index b962f77..f9eb60c 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -11,6 +11,7 @@
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
+@bundled-notification-header-width: 350px;
 
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 1a8b648..23a67f2 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -134,6 +134,11 @@
display: table-cell;
padding-right: 0.5em;
width: 100%;
+
+   &-header {
+   
.mw-echo-ui-mixin-one-line-truncated;
+   width: 
@bundled-notification-header-width;
+   }
}
 
&-content-actions {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Sbisson 

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

[MediaWiki-commits] [Gerrit] Keep bundled notification compact header on one line - change (mediawiki...Echo)

2016-07-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Keep bundled notification compact header on one line
..


Keep bundled notification compact header on one line

Bug: T139321
Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
---
M includes/formatters/EventPresentationModel.php
M modules/echo.variables.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
3 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/formatters/EventPresentationModel.php 
b/includes/formatters/EventPresentationModel.php
index 56b4d72..3afebc6 100644
--- a/includes/formatters/EventPresentationModel.php
+++ b/includes/formatters/EventPresentationModel.php
@@ -456,7 +456,7 @@
 
return array(
'header' => $this->getHeaderMessage()->parse(),
-   'compactHeader' => 
$this->getCompactHeaderMessage()->parse(),
+   'compactHeader' => 
$this->getCompactHeaderMessage()->escaped(),
'body' => $body ? $body->escaped() : '',
'icon' => $this->getIconType(),
'links' => array(
diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index b962f77..f9eb60c 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -11,6 +11,7 @@
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
+@bundled-notification-header-width: 350px;
 
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 1a8b648..23a67f2 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -134,6 +134,11 @@
display: table-cell;
padding-right: 0.5em;
width: 100%;
+
+   &-header {
+   
.mw-echo-ui-mixin-one-line-truncated;
+   width: 
@bundled-notification-header-width;
+   }
}
 
&-content-actions {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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