Merge pull request #9241 from RocketChat/show-announcement-modal

[FIX] Show modal with announcement
RocketChat · Dec 26, 2017 · d8886d4 · d8886d4
2 parents c6cf840 + 3084766
commit d8886d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -1728,6 +1728,7 @@
 	height: 40px;
 	padding: 0 20px;
 
+	cursor: pointer;
 	text-align: center;
 	white-space: nowrap;
 	text-overflow: ellipsis;

diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
@@ -51,7 +51,7 @@ <h2>
 					<div class="messages-container-main">
 						{{#unless embeddedVersion}}
 							{{#if showAnnouncement}}
-							<div class="fixed-title announcement" title="{{RocketChatMarkdown roomAnnouncement}}">
+							<div class="fixed-title announcement" aria-label="{{RocketChatMarkdown roomAnnouncement}}">
 								{{{RocketChatMarkdown roomAnnouncement}}}
 							</div>
 							{{/if}}

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -704,6 +704,15 @@ Template.room.events({
 			removeClass.forEach(message => $(`.messages-box #${ message }`).removeClass('selected'));
 			addClass.forEach(message => $(`.messages-box #${ message }`).addClass('selected'));
 		}
+	},
+	'click .announcement'(e) {
+		modal.open({
+			title: t('Announcement'),
+			text: $(e.target).attr('aria-label'),
+			showConfirmButton: false,
+			showCancelButton: true,
+			cancelButtonText: t('Close')
+		});
 	}
 });