Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] messageBox: put "joinCodeRequired" back #6600

Merged
merged 3 commits into from
Apr 5, 2017
Merged

[FIX] messageBox: put "joinCodeRequired" back #6600

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5653ca0
Merge branch 'tgxn-better-mb' into develop
karlprieb Apr 3, 2017
6d0a404
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
karlprieb Apr 4, 2017
b784e51
FIX messageBox code require and room info
karlprieb Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 79 additions & 62 deletions packages/rocketchat-ui-message/client/messageBox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,76 +3,87 @@
<form class="message-form" method="post" action="/">
{{> messagePopupConfig getPopupConfig}}

<div class="message-input border-component-color">
{{#if allowedToSend}}
<div class="message-input border-component-color">

<div class="input-message-container">
<div class="input-message-container">

<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>

<div class="inner-left-toolbar">
<i class="emoji-picker-icon icon-people"></i>
</div>
<div class="inner-left-toolbar">
<i class="emoji-picker-icon icon-people secondary-font-color"></i>
</div>

</div>
</div>

{{#unless showSend}}
{{#unless showSend}}

<div class="share-items {{groupAttachHidden}}">
<div class="share-items {{groupAttachHidden}}">

{{#if fileUploadEnabled}}
{{#if fileUploadEnabled}}

<div class="message-buttons file">
<i class="icon-attach file"></i>
<input type="file" accept="{{fileUploadAllowedMediaTypes}}">
</div>
<div class="message-buttons file">
<i class="icon-attach file"></i>
<input type="file" accept="{{fileUploadAllowedMediaTypes}}">
</div>

{{#if showMic}}
<div class="message-buttons mic-button">
<div class="mic">
<i class="icon-mic" aria-label="{{_ "Record"}}"></i>
{{#if showMic}}
<div class="message-buttons mic-button">
<div class="mic">
<i class="icon-mic" aria-label="{{_ "Record"}}"></i>
</div>
<div class="stop-mic hidden">
<i class="icon-stop" aria-label="{{_ "Stop_Recording"}}"></i>
</div>
</div>
<div class="stop-mic hidden">
<i class="icon-stop" aria-label="{{_ "Stop_Recording"}}"></i>
{{/if}}

{{#if showVRec}}
<div class="message-buttons video-button">
<i class="icon-videocam" aria-label="{{_ "Record"}}"></i>
</div>
</div>
{{/if}}

{{/if}}

{{#if showVRec}}
<div class="message-buttons video-button">
<i class="icon-videocam" aria-label="{{_ "Record"}}"></i>
{{#if showLocation}}
<div class="message-buttons location-button">
<i class="icon-location"></i>
</div>
{{/if}}

{{/if}}
{{#if showSandstorm}}
<div class="message-buttons sandstorm-offer">
<i class="icon-plus" title="{{_ "Sandstorm_Powerbox_Share"}}"></i>
</div>
{{/if}}

{{#if showLocation}}
<div class="message-buttons location-button">
<i class="icon-location"></i>
</div>
{{/if}}
</div>

{{#if showSandstorm}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this removed?

<div class="message-buttons sandstorm-offer">
<i class="icon-plus" title="{{_ "Sandstorm_Powerbox_Share"}}"></i>
{{#if groupAttachHidden}}
<div class="message-buttons share">
<i class="icon-plus"></i>
</div>
{{/if}}

</div>
{{/unless}}

{{#if groupAttachHidden}}
<div class="message-buttons share">
<i class="icon-plus"></i>
{{#if showSend}}
<div class="message-buttons send-button">
<i class="icon-paper-plane" aria-label="{{_ "Send"}}"></i>
</div>
{{/if}}
</div>
{{else}}
<div class="stream-info">
{{#if isBlockedOrBlocker}}
{{_ "room_is_blocked"}}
{{else}}
{{_ "room_is_read_only"}}
{{/if}}
</div>
{{/if}}

{{/unless}}

{{#if showSend}}
<div class="message-buttons send-button">
<i class="icon-paper-plane" aria-label="{{_ "Send"}}"></i>
</div>
{{/if}}
</div>
<div class="users-typing">
{{#with usersTyping}}
<strong>{{users}}</strong>
Expand All @@ -92,25 +103,28 @@
{{/with}}
</div>

{{#if showFormattingTips}}
<div class="formatting-tips" aria-hidden="true" dir="auto">
{{#if showMarkdown}}
<b>*{{_ "bold"}}*</b>
<i>_{{_ "italics"}}_</i>
<span>~<strike>{{_ "strike"}}</strike>~</span>
{{/if}}
{{#if showMarkdownCode}}
<code class="code-colors inline">`{{_ "inline_code"}}`</code>
<code class="code-colors inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
{{/if}}
{{#if katexSyntax}}
<span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span>
{{/if}}
{{#if showMarkdown}}
<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
{{#if allowedToSend}}
{{#if showFormattingTips}}
<div class="formatting-tips" aria-hidden="true" dir="auto">
{{#if showMarkdown}}
<b>*{{_ "bold"}}*</b>
<i>_{{_ "italics"}}_</i>
<span>~<strike>{{_ "strike"}}</strike>~</span>
{{/if}}
{{#if showMarkdownCode}}
<code class="code-colors inline">`{{_ "inline_code"}}`</code>
<code class="code-colors inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
{{/if}}
{{#if katexSyntax}}
<span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span>
{{/if}}
{{#if showMarkdown}}
<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
{{/if}}
</div>
{{/if}}
</div>
{{/if}}

<div class="editing-commands" aria-hidden="true" dir="auto">
<div class="editing-commands-cancel">{{_ 'Esc_to'}} <button type="button">{{_ 'Cancel_message_input'}}</button></div>
<div class="editing-commands-save">{{_ 'Enter_to'}} <button type="button">{{_ 'Save_changes'}}</button></div>
Expand All @@ -123,6 +137,9 @@
{{#if canJoin}}
<div>
{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
{{#if joinCodeRequired}}
<input type="text" name="joinCode" placeholder="{{_ 'Code'}}" style="width: 100px">
{{/if}}
<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
</div>
{{/if}}
Expand Down