Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-11-16 15:05:26 +01:00
commit 84a59f0330
2 changed files with 71 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
View file

@ -43,13 +43,22 @@
<% for channel in @account_channels: %> <% for channel in @account_channels: %>
<div class="action" data-id="<%- channel.id %>"> <div class="action" data-id="<%- channel.id %>">
<div class="action-flow" style="width: 100%;"> <div class="action-flow" style="width: 100%;">
<div class="action-block" style="width: 50%;"> <div class="action-block action-block--flex">
<%- @Icon('status', channel.status_in + " inline") %> <%- @T('Inbound') %>:<br> <div class="horizontal">
<a class="js-editInbound" href="#"> <h3><%- @Icon('status', channel.status_in + " inline") %> <%- @T('Inbound') %></h3>
<%- @T('User') %>: <%= channel.options.inbound.options.user %><br> <div class="js-editInbound btn btn--text space-left"><%- @T('Edit') %></div>
<%- @T('Host') %>: <%= channel.options.inbound.options.host %><br> </div>
<%- @T('Protocol') %>: <%= channel.options.inbound.adapter %> <table class="key-value">
</a> <tr>
<td><%- @T('User') %>
<td><%= channel.options.inbound.options.user %>
<tr>
<td><%- @T('Host') %>
<td><%= channel.options.inbound.options.host %>
<tr>
<td><%- @T('Protocol') %>
<td><%= channel.options.inbound.adapter %>
</table>
<% if !_.isEmpty(channel.last_log_in): %> <% if !_.isEmpty(channel.last_log_in): %>
<div class="alert alert--danger"> <div class="alert alert--danger">
@ -59,21 +68,28 @@
<hr> <hr>
<div> <h3><%- @T('Destination Group') %></h3>
<%- @T('Destination Group') %>:<br> <a href="#" class="js-channelGroupChange"><%= channel.group %></a>
<a href="#" class="js-channelGroupChange"><%= channel.group %></a>
</div>
</div> </div>
<div class="action-block"> <div class="action-block action-block--flex">
<%- @Icon('status', channel.status_out + " inline") %> <%- @T('Outbound') %>:<br> <div class="horizontal">
<a class="js-editOutbound" href="#"> <h3><%- @Icon('status', channel.status_out + " inline") %> <%- @T('Outbound') %></h3>
<% if channel.options.outbound && channel.options.outbound.options: %> <div class="js-editOutbound btn btn--text space-left"><%- @T('Edit') %></div>
<%- @T('User') %>: <%= channel.options.outbound.options.user %><br> </div>
<%- @T('Host') %>: <%= channel.options.outbound.options.host %><br> <table class="key-value">
<% end %> <% if channel.options.outbound && channel.options.outbound.options: %>
<%- @T('Protocol') %>: <%= channel.options.outbound.adapter %> <tr>
</a> <td><%- @T('User') %>
<td><%= channel.options.outbound.options.user %>
<tr>
<td><%- @T('Host') %>
<td><%= channel.options.outbound.options.host %>
<% end %>
<tr>
<td><%- @T('Protocol') %>
<td><%= channel.options.outbound.adapter %>
</table>
<% if !_.isEmpty(channel.last_log_out): %> <% if !_.isEmpty(channel.last_log_out): %>
<div class="alert alert--danger"> <div class="alert alert--danger">
<%= channel.last_log_out %> <%= channel.last_log_out %>
@ -82,14 +98,13 @@
<hr> <hr>
<%- @T('Email Address') %>: <h3><%- @T('Email Address') %></h3>
<ul class="list"> <ul class="list">
<% if !_.isEmpty(channel.email_addresses): %> <% if !_.isEmpty(channel.email_addresses): %>
<% for email_address in channel.email_addresses: %> <% for email_address in channel.email_addresses: %>
<li class="list-item" data-id="<%= email_address.id %>"> <li class="list-item" data-id="<%= email_address.id %>">
<div class="list-item-name"> <div class="list-item-name"><%= email_address.email %></div>
<a href="" class="js-emailAddressEdit"><%= email_address.realname %> &lt;<%= email_address.email %>&gt;</a> <div class="btn btn--text js-emailAddressEdit space-left"><%- @T('Edit') %></div>
</div>
<% if channel.email_addresses.length > 1: %> <% if channel.email_addresses.length > 1: %>
<div class="list-item-delete js-emailAddressDelete"> <div class="list-item-delete js-emailAddressDelete">
<%- @Icon('diagonal-cross') %> <%- @Icon('diagonal-cross') %>
@ -117,17 +132,26 @@
<h2><%- @T('Email Notification') %></h2> <h2><%- @T('Email Notification') %></h2>
<% for channel in @notification_channels: %> <% for channel in @notification_channels: %>
<div class="action" data-id="<%- channel.id %>"> <div class="action" data-id="<%- channel.id %>">
<div class="action-flow" style="width: 100%;"> <div class="action-flow action-flow--row">
<div class="action-block" style="width: 50%;"> <div class="action-block action-block--flex">
<div class="horizontal">
<h3><%- @Icon('status', channel.status_out + " inline") %> <%- @T('Outbound') %></h3>
<div class="btn btn--text js-editNotificationOutbound space-left"><%- @T('Edit') %></div>
</div>
<%- @Icon('status', channel.status_out + " inline") %> <%- @T('Outbound') %>:<br> <table class="key-value">
<a class="js-editNotificationOutbound" href="#"> <% if channel.options.outbound && channel.options.outbound.options: %>
<% if channel.options.outbound && channel.options.outbound.options: %> <tr>
<%- @T('User') %>: <%= channel.options.outbound.options.user %><br> <td><%- @T('User') %>
<%- @T('Host') %>: <%= channel.options.outbound.options.host %><br> <td><%= channel.options.outbound.options.user %>
<% end %> <tr>
<%- @T('Protocol') %>: <%= channel.options.outbound.adapter %> <td><%- @T('Host') %>
</a> <td><%= channel.options.outbound.options.host %>
<% end %>
<tr>
<td><%- @T('Protocol') %>
<td><%= channel.options.outbound.adapter %>
</table>
<% if channel.status_in is 'error': %> <% if channel.status_in is 'error': %>
<div class="alert alert--danger"><%= channel.last_log_in %></div> <div class="alert alert--danger"><%= channel.last_log_in %></div>
@ -135,15 +159,12 @@
<% if channel.status_out is 'error': %> <% if channel.status_out is 'error': %>
<div class="alert alert--danger"><%= channel.last_log_out %></div> <div class="alert alert--danger"><%= channel.last_log_out %></div>
<% end %> <% end %>
</div> </div>
<div class="action-block" style="width: 50%;"> <div class="action-block action-block--flex">
<h3><%- @T('Email Address') %></h3>
<%- @T('Email Address') %>:
<ul class="list"> <ul class="list">
<li class="list-item"><%= @config.notification_sender %> <li class="list-item"><%= @config.notification_sender %>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>

10
app/assets/stylesheets/zammad.scss
View file

@ -697,6 +697,12 @@ blockquote {
} }
} }
.key-value {
td:first-child {
padding-right: 10px;
color: #999;
}
}
table { table {
table-layout: fixed; table-layout: fixed;
@ -7503,6 +7509,10 @@ body.fit {
margin-left: auto; margin-left: auto;
} }
.space-left {
margin-left: 10px;
}
.align-center { .align-center {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;