Skip to content
Snippets Groups Projects
Commit b784e51c authored by Karl Prieb's avatar Karl Prieb
Browse files

FIX messageBox code require and room info

parent 6d0a4042
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/rocketchat-ui-message/client/messageBox.html
+ 79
− 62
View file @ b784e51c
...@@ -3,76 +3,87 @@ ...@@ -3,76 +3,87 @@
<form class="message-form" method="post" action="/"> <form class="message-form" method="post" action="/">
{{> messagePopupConfig getPopupConfig}} {{> 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"> <div class="inner-left-toolbar">
<i class="emoji-picker-icon icon-people"></i> <i class="emoji-picker-icon icon-people secondary-font-color"></i>
</div> </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"> <div class="message-buttons file">
<i class="icon-attach file"></i> <i class="icon-attach file"></i>
<input type="file" accept="{{fileUploadAllowedMediaTypes}}"> <input type="file" accept="{{fileUploadAllowedMediaTypes}}">
</div> </div>
{{#if showMic}} {{#if showMic}}
<div class="message-buttons mic-button"> <div class="message-buttons mic-button">
<div class="mic"> <div class="mic">
<i class="icon-mic" aria-label="{{_ "Record"}}"></i> <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>
<div class="stop-mic hidden"> {{/if}}
<i class="icon-stop" aria-label="{{_ "Stop_Recording"}}"></i>
{{#if showVRec}}
<div class="message-buttons video-button">
<i class="icon-videocam" aria-label="{{_ "Record"}}"></i>
</div> </div>
</div> {{/if}}
{{/if}} {{/if}}
{{#if showVRec}} {{#if showLocation}}
<div class="message-buttons video-button"> <div class="message-buttons location-button">
<i class="icon-videocam" aria-label="{{_ "Record"}}"></i> <i class="icon-location"></i>
</div> </div>
{{/if}} {{/if}}
{{/if}} {{#if showSandstorm}}
<div class="message-buttons sandstorm-offer">
<i class="icon-plus" title="{{_ "Sandstorm_Powerbox_Share"}}"></i>
</div>
{{/if}}
{{#if showLocation}} </div>
<div class="message-buttons location-button">
<i class="icon-location"></i>
</div>
{{/if}}
{{#if showSandstorm}} {{#if groupAttachHidden}}
<div class="message-buttons sandstorm-offer"> <div class="message-buttons share">
<i class="icon-plus" title="{{_ "Sandstorm_Powerbox_Share"}}"></i> <i class="icon-plus"></i>
</div> </div>
{{/if}} {{/if}}
</div> {{/unless}}
{{#if groupAttachHidden}} {{#if showSend}}
<div class="message-buttons share"> <div class="message-buttons send-button">
<i class="icon-plus"></i> <i class="icon-paper-plane" aria-label="{{_ "Send"}}"></i>
</div> </div>
{{/if}} {{/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"> <div class="users-typing">
{{#with usersTyping}} {{#with usersTyping}}
<strong>{{users}}</strong> <strong>{{users}}</strong>
...@@ -92,25 +103,28 @@ ...@@ -92,25 +103,28 @@
{{/with}} {{/with}}
</div> </div>
{{#if showFormattingTips}} {{#if allowedToSend}}
<div class="formatting-tips" aria-hidden="true" dir="auto"> {{#if showFormattingTips}}
{{#if showMarkdown}} <div class="formatting-tips" aria-hidden="true" dir="auto">
<b>*{{_ "bold"}}*</b> {{#if showMarkdown}}
<i>_{{_ "italics"}}_</i> <b>*{{_ "bold"}}*</b>
<span>~<strike>{{_ "strike"}}</strike>~</span> <i>_{{_ "italics"}}_</i>
{{/if}} <span>~<strike>{{_ "strike"}}</strike>~</span>
{{#if showMarkdownCode}} {{/if}}
<code class="code-colors inline">`{{_ "inline_code"}}`</code> {{#if showMarkdownCode}}
<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> <code class="code-colors inline">`{{_ "inline_code"}}`</code>
{{/if}} <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 katexSyntax}} {{/if}}
<span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span> {{#if katexSyntax}}
{{/if}} <span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span>
{{#if showMarkdown}} {{/if}}
<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q> {{#if showMarkdown}}
<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
{{/if}}
</div>
{{/if}} {{/if}}
</div>
{{/if}} {{/if}}
<div class="editing-commands" aria-hidden="true" dir="auto"> <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-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> <div class="editing-commands-save">{{_ 'Enter_to'}} <button type="button">{{_ 'Save_changes'}}</button></div>
...@@ -123,6 +137,9 @@ ...@@ -123,6 +137,9 @@
{{#if canJoin}} {{#if canJoin}}
<div> <div>
{{{_ "you_are_in_preview_mode_of" room_name=roomName}}} {{{_ "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> <button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
</div> </div>
{{/if}} {{/if}}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment