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

Jump to bottom

[NEW] Add close button to flex tabs #7529

Merged
merged 1 commit into from
Jul 20, 2017
Merged

[NEW] Add close button to flex tabs #7529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
174 changes: 86 additions & 88 deletions packages/rocketchat-channel-settings/client/views/channelSettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,106 +1,104 @@
<template name="channelSettings">
<div class="content">
<div class="list-view channel-settings">
<div class="title">
<h2>{{_ "Room_Info"}}</h2>
</div>
<form>
<ul class="list clearfix">
{{#let room=getRoom}}
{{#each toArray settings}}
<div class="list-view channel-settings">
<div class="title">
<h2>{{_ "Room_Info"}}</h2>
</div>
<form>
<ul class="list clearfix">
{{#let room=getRoom}}
{{#each toArray settings}}

{{#if $value.canView room}}
{{#let value=(valueOf room $key)}}
<li class="{{$value.type}}">
<label>{{_ $value.label}}</label>
<div class="setting-block">
{{#if $eq $value.type 'text'}}
{{#if editing $key}}
{{#if $value.canEdit room}}
<input type="text" name="{{$key}}" value="{{value}}" class="content-background-color editing" />
{{/if}}
{{else}}
<span class='current-setting' data-edit="{{#if $value.canEdit room}}{{$key}}{{else}}false{{/if}}">{{value}}</span>
{{#if $value.canView room}}
{{#let value=(valueOf room $key)}}
<li class="{{$value.type}}">
<label>{{_ $value.label}}</label>
<div class="setting-block">
{{#if $eq $value.type 'text'}}
{{#if editing $key}}
{{#if $value.canEdit room}}
<input type="text" name="{{$key}}" value="{{value}}" class="content-background-color editing" />
{{/if}}
{{else}}
<span class='current-setting' data-edit="{{#if $value.canEdit room}}{{$key}}{{else}}false{{/if}}">{{value}}</span>
{{/if}}
{{/if}}

{{#if $eq $value.type 'markdown'}}
{{#if editing $key}}
{{#if $value.canEdit room}}
<input type="text" name="{{$key}}" value="{{unscape value}}" class="content-background-color editing" />
{{/if}}
{{else}}
<span class='current-setting' data-edit="{{#if $value.canEdit room}}{{$key}}{{else}}false{{/if}}">{{{RocketChatMarkdown value}}}</span>
{{#if $eq $value.type 'markdown'}}
{{#if editing $key}}
{{#if $value.canEdit room}}
<input type="text" name="{{$key}}" value="{{unscape value}}" class="content-background-color editing" />
{{/if}}
{{else}}
<span class='current-setting' data-edit="{{#if $value.canEdit room}}{{$key}}{{else}}false{{/if}}">{{{RocketChatMarkdown value}}}</span>
{{/if}}
{{/if}}

{{#if $eq $value.type 'select'}}
{{#each toArray $value.options}}
<div class="input radio">
<input type="radio" id="{{$key}}" name="{{../$key}}" value="{{$key}}" checked="{{$eq value $key}}" disabled="{{isDisabled $key room}}" />
<label for="{{$key}}">{{_ $value}}</label>
</div>
{{/each}}
{{/if}}

{{#if $eq $value.type 'boolean'}}
<div class="input checkbox toggle">
<input type="checkbox" id="{{$key}}" name="{{$key}}" value="{{value}}" checked="{{$eq value true}}" disabled="{{isDisabled $key room}}" />
<label for="{{$key}}"></label>
{{#if $eq $value.type 'select'}}
{{#each toArray $value.options}}
<div class="input radio">
<input type="radio" id="{{$key}}" name="{{../$key}}" value="{{$key}}" checked="{{$eq value $key}}" disabled="{{isDisabled $key room}}" />
<label for="{{$key}}">{{_ $value}}</label>
</div>
{{#if $value.canEdit room}}
{{#if $value.processing.get}}
{{> loading}}
{{/if}}
{{/each}}
{{/if}}

{{#if $eq $value.type 'boolean'}}
<div class="input checkbox toggle">
<input type="checkbox" id="{{$key}}" name="{{$key}}" value="{{value}}" checked="{{$eq value true}}" disabled="{{isDisabled $key room}}" />
<label for="{{$key}}"></label>
</div>
{{#if $value.canEdit room}}
{{#if $value.processing.get}}
{{> loading}}
{{/if}}
{{/if}}
{{/if}}

{{#unless $value.isToggle}}
{{#if $value.canEdit room}}
{{#if editing $key}}
<div class="buttons secondary-background-color">
<button type="button" class="button cancel">
<i class="icon-cancel"></i>
</button>
<button type="button" class="button primary save">
<i class="icon-ok success-color"></i>
</button>
</div>
{{else}}
<button type="button" class="button edit">
<i class="icon-pencil" data-edit="{{$key}}"></i>
{{#unless $value.isToggle}}
{{#if $value.canEdit room}}
{{#if editing $key}}
<div class="buttons secondary-background-color">
<button type="button" class="button cancel">
<i class="icon-cancel"></i>
</button>
<button type="button" class="button primary save">
<i class="icon-ok success-color"></i>
</button>
{{/if}}
{{/if}}
{{/unless}}
</div>
</li>
{{# if has $value 'message' }}
{{#let message=($value.message room)}}
{{#if message}}
<li>
<div class="alert alert-warning pending-background pending-border">
{{_ message}}
</div>
</li>
{{else}}
<button type="button" class="button edit">
<i class="icon-pencil" data-edit="{{$key}}"></i>
</button>
{{/if}}
{{/if}}
{{/let}}
{{/if}}
{{/let}}
{{/if}}
{{/each}}
{{/let}}

{{#each channelSettings}}
{{> Template.dynamic template=template data=data}}
{{/unless}}
</div>
</li>
{{# if has $value 'message' }}
{{#let message=($value.message room)}}
{{#if message}}
<li>
<div class="alert alert-warning pending-background pending-border">
{{_ message}}
</div>
</li>
{{/if}}
{{/let}}
{{/if}}
{{/let}}
{{/if}}
{{/each}}
</ul>
</form>
{{#if canDeleteRoom}}
<nav>
<button class="button danger delete" title="{{_ 'Delete'}}"><i class="icon-trash"></i></button>
</nav>
{{/if}}
</div>
{{/let}}

{{#each channelSettings}}
{{> Template.dynamic template=template data=data}}
{{/each}}
</ul>
</form>
{{#if canDeleteRoom}}
<nav>
<button class="button danger delete" title="{{_ 'Delete'}}"><i class="icon-trash"></i></button>
</nav>
{{/if}}
</div>
</template>
130 changes: 64 additions & 66 deletions packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,75 @@
<template name="visitorInfo">
<div class="content">
{{#if editing}}
{{> visitorEdit (editDetails)}}
{{/if}}
{{#if forwarding}}
{{> visitorForward (forwardDetails)}}
{{/if}}
<div class="user-view {{showDetail}}">
<div class="about clearfix">
{{#with user}}
<div class="info">
<h3 title="{{username}}"><i class="status-{{status}}"></i> {{username}}</h3>
<p class="secondary-font-color">{{name}}</p>
{{#if editing}}
{{> visitorEdit (editDetails)}}
{{/if}}
{{#if forwarding}}
{{> visitorForward (forwardDetails)}}
{{/if}}
<div class="user-view {{showDetail}}">
<div class="about clearfix">
{{#with user}}
<div class="info">
<h3 title="{{username}}"><i class="status-{{status}}"></i> {{username}}</h3>
<p class="secondary-font-color">{{name}}</p>

<ul>
{{#if utc}}<li><i class="icon-clock"></i>{{userTime}} (UTC {{utc}})</li>{{/if}}
{{#each visitorEmails}} <li><i class="icon-mail"></i> {{address}}{{#if verified}}&nbsp;<i class="icon-ok success-color"></i>{{/if}}</li> {{/each}}
{{#each phone}} <li><i class="icon-phone"></i> {{phoneNumber}}</li> {{/each}}
{{#if lastLogin}} <li><i class="icon-calendar"></i> {{_ "Created_at"}}: {{createdAt}}</li> {{/if}}
{{#if lastLogin}} <li><i class="icon-calendar"></i> {{_ "Last_login"}}: {{lastLogin}}</li> {{/if}}
{{#if ip}}<li><i class="icon-laptop"></i><span>{{ip}}</span></li>{{/if}}
{{#if os}}<li><i class="{{osIcon}}"></i><span>{{os}}</span></li>{{/if}}
{{#if browser}}<li><i class="{{browserIcon}}"></i><span>{{browser}}</span></li>{{/if}}
</ul>
</div>
{{/with}}
<ul>
{{#if utc}}<li><i class="icon-clock"></i>{{userTime}} (UTC {{utc}})</li>{{/if}}
{{#each visitorEmails}} <li><i class="icon-mail"></i> {{address}}{{#if verified}}&nbsp;<i class="icon-ok success-color"></i>{{/if}}</li> {{/each}}
{{#each phone}} <li><i class="icon-phone"></i> {{phoneNumber}}</li> {{/each}}
{{#if lastLogin}} <li><i class="icon-calendar"></i> {{_ "Created_at"}}: {{createdAt}}</li> {{/if}}
{{#if lastLogin}} <li><i class="icon-calendar"></i> {{_ "Last_login"}}: {{lastLogin}}</li> {{/if}}
{{#if ip}}<li><i class="icon-laptop"></i><span>{{ip}}</span></li>{{/if}}
{{#if os}}<li><i class="{{osIcon}}"></i><span>{{os}}</span></li>{{/if}}
{{#if browser}}<li><i class="{{browserIcon}}"></i><span>{{browser}}</span></li>{{/if}}
</ul>
</div>
{{/with}}

{{#with room}}
<div class="info">
<ul>
{{#if sms}}
<li><i class="icon-mobile"></i>{{_ "SMS_Enabled"}}</li>
{{/if}}
{{#if topic}}
<li><strong>{{_ "Topic"}}</strong>: {{topic}}</li>
{{/if}}
{{#if tags}}
<li><strong>{{_ "Tags"}}</strong>: {{joinTags}}</li>
{{/if}}
</ul>
</div>
{{/with}}
</div>
{{#with room}}
<div class="info">
<ul>
{{#if sms}}
<li><i class="icon-mobile"></i>{{_ "SMS_Enabled"}}</li>
{{/if}}
{{#if topic}}
<li><strong>{{_ "Topic"}}</strong>: {{topic}}</li>
{{/if}}
{{#if tags}}
<li><strong>{{_ "Tags"}}</strong>: {{joinTags}}</li>
{{/if}}
</ul>
</div>
{{/with}}
</div>

{{#if canSeeButtons}}
<nav class="centered-buttons">
<button class='button button-block edit-livechat'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
{{#if roomOpen}}
<button class='button button-block close-livechat'><span><i class='icon-download'></i> {{_ "Close"}}</span></button>
<button class="button button-block forward-livechat"><span><i class="icon-forward"></i> {{_ "Forward"}}</span></button>
{{/if}}
{{#if canSeeButtons}}
<nav class="centered-buttons">
<button class='button button-block edit-livechat'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
{{#if roomOpen}}
<button class='button button-block close-livechat'><span><i class='icon-download'></i> {{_ "Close"}}</span></button>
<button class="button button-block forward-livechat"><span><i class="icon-forward"></i> {{_ "Forward"}}</span></button>
{{/if}}

{{#if guestPool}}
<button class="button button-block return-inquiry"><span><i class="icon-ccw"></i> {{_ "Return"}}</span></button>
{{/if}}
</nav>
{{/if}}
{{#if guestPool}}
<button class="button button-block return-inquiry"><span><i class="icon-ccw"></i> {{_ "Return"}}</span></button>
{{/if}}
</nav>
{{/if}}

{{#if customFields}}
<div class="visitor-custom-fields">
<h4>{{_ "Custom_Fields"}}</h4>
{{#if customFields}}
<div class="visitor-custom-fields">
<h4>{{_ "Custom_Fields"}}</h4>

<div class="visitor-scroll">
<ul>
{{#each customFields}}
<li>{{label}}: {{value}}</li>
{{/each}}
</ul>
</div>
<div class="visitor-scroll">
<ul>
{{#each customFields}}
<li>{{label}}: {{value}}</li>
{{/each}}
</ul>
</div>
{{/if}}
</div>
{{/if}}

{{> visitorNavigation .}}
</div>
{{> visitorNavigation .}}
</div>
</template>
36 changes: 17 additions & 19 deletions packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
<template name="mentionsFlexTab">
<div class="content">
<div class="list-view mentioned-messages-list">
<div class="title">
<h2>{{_ "Mentions"}}</h2>
</div>
{{#if Template.subscriptionsReady}}
{{#unless hasMessages}}
<h2>{{_ "No_mentions_found"}}</h2>
{{/unless}}
{{/if}}
<div class="list-view mentioned-messages-list">
<div class="title">
<h2>{{_ "Mentions"}}</h2>
</div>
<ul class="mentioned-messages-list list clearfix">
{{#each messages}}
{{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
</ul>
{{#if hasMore}}
<div class="load-more">
{{> loading}}
</div>
{{#if Template.subscriptionsReady}}
{{#unless hasMessages}}
<h2>{{_ "No_mentions_found"}}</h2>
{{/unless}}
{{/if}}
</div>
<ul class="mentioned-messages-list list clearfix">
{{#each messages}}
{{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
</ul>
{{#if hasMore}}
<div class="load-more">
{{> loading}}
</div>
{{/if}}
</template>
Loading