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

admin pages: add page-content and style containing labels

Browse source
This commit is contained in:
Felix Niklas 2015-11-17 12:10:04 +01:00
parent b6c1973e0e
commit 1d3c849187
27 changed files with 419 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
app/assets/javascripts/app/views/agent_ticket_create.jst.eco
View file

@ -6,41 +6,43 @@
<h1><%- @T( @head ) %></h1> <h1><%- @T( @head ) %></h1>
</div> </div>
<ul class="tabs type-tabs"> <div class="page-content">
<ul class="tabs type-tabs">
<li class="tab u-textTruncate" data-type="phone-in"> <li class="tab u-textTruncate" data-type="phone-in">
<%- @Icon('received-calls', 'tab-icon') %> <%- @Icon('received-calls', 'tab-icon') %>
<%- @T('Received Call') %> <%- @T('Received Call') %>
</li> </li>
<li class="tab u-textTruncate" data-type="phone-out"> <li class="tab u-textTruncate" data-type="phone-out">
<%- @Icon('outbound-calls', 'tab-icon') %> <%- @Icon('outbound-calls', 'tab-icon') %>
<%- @T('Outbound Call') %> <%- @T('Outbound Call') %>
</li> </li>
<li class="tab u-textTruncate" data-type="email-out"> <li class="tab u-textTruncate" data-type="email-out">
<%- @Icon('email', 'tab-icon') %> <%- @Icon('email', 'tab-icon') %>
<%- @T('Send Email') %> <%- @T('Send Email') %>
</li> </li>
</ul> </ul>
<form role="form" class="ticket-create"> <form role="form" class="ticket-create">
<input type="hidden" name="formSenderType"/> <input type="hidden" name="formSenderType"/>
<input type="hidden" name="form_id" value="<%= @form_id %>"/> <input type="hidden" name="form_id" value="<%= @form_id %>"/>
<div class="ticket-form-top"></div> <div class="ticket-form-top"></div>
<div class="article-form-top"></div> <div class="article-form-top"></div>
<div class="formset-inset"> <div class="formset-inset">
<div class="ticket-form-middle horizontal two-columns"></div> <div class="ticket-form-middle horizontal two-columns"></div>
<div class="ticket-form-bottom"></div> <div class="ticket-form-bottom"></div>
</div> </div>
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T('Cancel & Go Back') %></a> <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T('Cancel & Go Back') %></a>
<button type="submit" class="btn btn--success js-submit align-right"><%- @T('Create') %></button> <button type="submit" class="btn btn--success js-submit align-right"><%- @T('Create') %></button>
</div> </div>
</form> </form>
</div>
</div> </div>
</div> </div>
</div> </div>

4
app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco
View file

@ -18,4 +18,6 @@
</div> </div>
</div> </div>
<div class="table-overview"></div> <div class="page-content">
<div class="table-overview"></div>
</div>

139
app/assets/javascripts/app/views/calendar/index.jst.eco
View file

@ -10,77 +10,80 @@
<a class="btn btn--success js-new"><%- @T('New Calendar') %></a> <a class="btn btn--success js-new"><%- @T('New Calendar') %></a>
</div> </div>
</div> </div>
<div class="page-content">
<% if _.isEmpty(@calendars): %>
<div class="page-description">
<%- @description %>
</div>
<% end %>
<% if _.isEmpty(@calendars): %> <% for calendar in @calendars: %>
<%- @description %> <div class="action" data-id="<%- calendar.id %>">
<% end %> <div class="action-flow action-flow--row">
<div class="action-row">
<% for calendar in @calendars: %> <div class="action-flow action-flow--noWrap">
<div class="action" data-id="<%- calendar.id %>"> <h2><% if !_.isEmpty(calendar.ical_url): %><span title="<%- @T('Last sync at') %>: <%= @Ttimestamp(calendar.last_sync) %><% if calendar.last_log: %>: <%= calendar.last_log %><% end %>">
<div class="action-flow action-flow--row"> <% if calendar.last_log: %>
<div class="action-row"> <%- @Icon('status', 'error inline') %>
<div class="action-flow action-flow--noWrap"> <% else: %>
<h2><% if !_.isEmpty(calendar.ical_url): %><span title="<%- @T('Last sync at') %>: <%= @Ttimestamp(calendar.last_sync) %><% if calendar.last_log: %>: <%= calendar.last_log %><% end %>"> <%- @Icon('status', 'ok inline') %>
<% if calendar.last_log: %> <% end %></span><% end %> <%= calendar.name %></h2>
<%- @Icon('status', 'error inline') %> <% if calendar.default: %>
<% else: %> <div class="action-label">Default</div>
<%- @Icon('status', 'ok inline') %> <% end %>
<% end %></span><% end %> <%= calendar.name %></h2> </div>
<% if calendar.default: %> </div>
<div class="action-label">Default</div> <% if calendar.last_log: %><div class="action-row"><div class="alert alert--danger"><%= calendar.last_log %></div></div><% end %>
<% end %> <div class="action-row">
<div class="label"><%- @T('Time zone') %></div> <%= calendar.timezone %>
</div>
<div class="action-block action-block--flex">
<div class="label"><%- @T('Business Hours') %></div>
<table class="table table-fluid">
<tr>
<td><%- @T('Monday') %></td><td><% if !calendar.business_hours['mon'].active || _.isEmpty(calendar.business_hours['mon'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['mon'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Tuesday') %></td><td><% if !calendar.business_hours['tue'].active || _.isEmpty(calendar.business_hours['tue'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['tue'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Wednesday') %></td><td><% if !calendar.business_hours['wed'].active || _.isEmpty(calendar.business_hours['wed'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['wed'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Thursday') %></td><td><% if !calendar.business_hours['thu'].active || _.isEmpty(calendar.business_hours['thu'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['thu'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Friday') %></td><td><% if !calendar.business_hours['fri'].active || _.isEmpty(calendar.business_hours['fri'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['fri'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Saturday') %></td><td><% if !calendar.business_hours['sat'].active || _.isEmpty(calendar.business_hours['sat'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['sat'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Sunday') %></td><td><% if !calendar.business_hours['sun'].active || _.isEmpty(calendar.business_hours['sun'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['sun'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
</table>
</div>
<div class="action-block action-block--flex">
<div class="label"><%- @T('Holidays') %></div>
<table class="table">
<% if _.isEmpty(calendar.public_holidays_preview): %>-<% end %>
<% for holiday, meta of calendar.public_holidays_preview: %>
<tr <% if !meta.active: %>class="is-inactive"<% end %>>
<td style="width: 96px"><%- @Tdate(holiday) %>
<td><%= meta.summary %>
<% end %>
</table>
</div> </div>
</div> </div>
<% if calendar.last_log: %><div class="action-row"><div class="alert alert--danger"><%= calendar.last_log %></div></div><% end %> <div class="action-controls">
<div class="action-row"> <% if !calendar.default: %>
<div class="label"><%- @T('Time zone') %></div> <%= calendar.timezone %> <div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
</div> <div class="sla-toggle btn btn--secondary js-default"><%- @T('Set as Default') %></div>
<div class="action-block action-block--flex"> <% else: %>
<div class="label"><%- @T('Business Hours') %></div> <div class="btn btn--danger btn--secondary is-disabled"><%- @T('Delete') %></div>
<table class="table table-fluid"> <% end %>
<tr> <div class="sla-edit btn js-edit"><%- @T('Edit') %></div>
<td><%- @T('Monday') %></td><td><% if !calendar.business_hours['mon'].active || _.isEmpty(calendar.business_hours['mon'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['mon'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Tuesday') %></td><td><% if !calendar.business_hours['tue'].active || _.isEmpty(calendar.business_hours['tue'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['tue'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Wednesday') %></td><td><% if !calendar.business_hours['wed'].active || _.isEmpty(calendar.business_hours['wed'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['wed'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Thursday') %></td><td><% if !calendar.business_hours['thu'].active || _.isEmpty(calendar.business_hours['thu'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['thu'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Friday') %></td><td><% if !calendar.business_hours['fri'].active || _.isEmpty(calendar.business_hours['fri'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['fri'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Saturday') %></td><td><% if !calendar.business_hours['sat'].active || _.isEmpty(calendar.business_hours['sat'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['sat'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
<tr>
<td><%- @T('Sunday') %></td><td><% if !calendar.business_hours['sun'].active || _.isEmpty(calendar.business_hours['sun'].timeframes): %>-<% else: %><% for frame in calendar.business_hours['sun'].timeframes: %><%= frame[0] %>-<%= frame[1] %> </td><td><% end %><% end %></td>
</tr>
</table>
</div>
<div class="action-block action-block--flex">
<div class="label"><%- @T('Holidays') %></div>
<table class="table">
<% if _.isEmpty(calendar.public_holidays_preview): %>-<% end %>
<% for holiday, meta of calendar.public_holidays_preview: %>
<tr <% if !meta.active: %>class="is-inactive"<% end %>>
<td style="width: 96px"><%- @Tdate(holiday) %>
<td><%= meta.summary %>
<% end %>
</table>
</div> </div>
</div> </div>
<div class="action-controls"> <% end %>
<% if !calendar.default: %>
<div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
<div class="sla-toggle btn btn--secondary js-default"><%- @T('Set as Default') %></div>
<% else: %>
<div class="btn btn--danger btn--secondary is-disabled"><%- @T('Delete') %></div>
<% end %>
<div class="sla-edit btn js-edit"><%- @T('Edit') %></div>
</div>
</div> </div>
<% end %>

3
app/assets/javascripts/app/views/channel/chat.jst.eco
View file

@ -3,7 +3,7 @@
<h1><%- @T('Chat Widget') %></h1> <h1><%- @T('Chat Widget') %></h1>
</div> </div>
</div> </div>
<div> <div class="page-content">
<p><%- @T('You can embedd this widget into your web page to allow visitors to directly chat with you.') %></p> <p><%- @T('You can embedd this widget into your web page to allow visitors to directly chat with you.') %></p>
<h2><%- @T('Designer') %></h2> <h2><%- @T('Designer') %></h2>
@ -197,6 +197,5 @@ $(function() {
</tbody> </tbody>
</table> </table>
<% end %> <% end %>
<hr>
</div> </div>

2
app/assets/javascripts/app/views/channel/form.jst.eco
View file

@ -3,7 +3,7 @@
<h1><%- @T('Form') %> <small></small></h1> <h1><%- @T('Form') %> <small></small></h1>
</div> </div>
</div> </div>
<div> <div class="page-content">
<p><%- @T('With form you can add a formular to your web page witch directly generates a Ticket for you.') %></p> <p><%- @T('With form you can add a formular to your web page witch directly generates a Ticket for you.') %></p>
<div class="js-settings"></div> <div class="js-settings"></div>

29
app/assets/javascripts/app/views/customer_ticket_create.jst.eco
View file

@ -6,24 +6,25 @@
<h1><%- @T( 'New Ticket' ) %></h1> <h1><%- @T( 'New Ticket' ) %></h1>
</div> </div>
<form role="form" class="ticket-create"> <div class="page-content">
<input type="hidden" name="form_id" value="<%= @form_id %>"/> <form role="form" class="ticket-create">
<input type="hidden" name="form_id" value="<%= @form_id %>"/>
<div class="ticket-form-top"></div> <div class="ticket-form-top"></div>
<div class="article-form-top"></div> <div class="article-form-top"></div>
<div class="formset-inset"> <div class="formset-inset">
<div class="ticket-form-middle horizontal two-columns"></div> <div class="ticket-form-middle horizontal two-columns"></div>
<div class="ticket-form-bottom"></div> <div class="ticket-form-bottom"></div>
</div> </div>
<div class="form-controls"> <div class="form-controls">
<a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a> <a class="btn btn--text btn--subtle js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn--success js-submit align-right"><%- @T( 'Create' ) %></button> <button type="submit" class="btn btn--success js-submit align-right"><%- @T( 'Create' ) %></button>
</div> </div>
</form> </form>
</div>
</div> </div>
</div> </div>
</div> </div>

4
app/assets/javascripts/app/views/generic/admin/index.jst.eco
View file

@ -14,4 +14,6 @@
</div> </div>
</div> </div>
<div class="table-overview"></div> <div class="page-content">
<div class="table-overview"></div>
</div>

5
app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco
View file

@ -16,6 +16,7 @@
<h1><%- @T( @page.head ) %> <small><%- @T( @page.sub_head ) %></small></h1> <h1><%- @T( @page.head ) %> <small><%- @T( @page.sub_head ) %></small></h1>
</div> </div>
</div> </div>
<div class="nav-tab-content"></div> <div class="page-content">
<div class="nav-tab-content"></div>
</div>
</div> </div>

14
app/assets/javascripts/app/views/generic/tabs.jst.eco
View file

@ -3,9 +3,11 @@
<h1><%- @T( @header ) %> <small><%- @T( @subHeader ) %></small></h1> <h1><%- @T( @header ) %> <small><%- @T( @subHeader ) %></small></h1>
</div> </div>
</div> </div>
<ul class="nav nav-tabs" role="tablist"> <div class="page-content">
<% for tab in @tabs: %> <ul class="nav nav-tabs" role="tablist">
<li><a href="#<%= tab.target %>" role="tab" data-toggle="tab"><%- @T( tab.name ) %></a></li> <% for tab in @tabs: %>
<% end %> <li><a href="#<%= tab.target %>" role="tab" data-toggle="tab"><%- @T( tab.name ) %></a></li>
</ul> <% end %>
<div class="tab-content"></div> </ul>
<div class="tab-content"></div>
</div>

45
app/assets/javascripts/app/views/maintenance.jst.eco
View file

@ -1,21 +1,30 @@
<div class="page-header-title"> <div class="page-header">
<h1><%- @T('Maintenance Message') %><small></small></h1> <div class="page-header-title">
<h1><%- @T('Maintenance Message') %><small></small></h1>
</div>
</div> </div>
<form id="maintenanceForm"> <div class="page-content">
<div class="form-group"> <form id="maintenanceForm">
<label for="maintenance-title"><%- @T('Title') %></label> <div class="form-group">
<div class="controls"> <label for="maintenance-title"><%- @T('Title') %></label>
<input type="text" id="maintenance-title" name="head" class="form-control" required> <div class="controls">
<input type="text" id="maintenance-title" name="head" class="form-control" required>
</div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="maintenance-message"><%- @T('Message') %></label>
<label for="maintenance-message"><%- @T('Message') %></label> <div class="controls">
<div class="controls"> <textarea id="maintenance-message" name="message" class="form-control" rows="8" required></textarea>
<textarea id="maintenance-message" name="message" class="form-control" rows="8" required></textarea> </div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label class="inline-label checkbox-replacement">
<label><input name="reload" type="checkbox" value="1"> <%- @T('Reload application') %></label> <input name="reload" type="checkbox" value="1">
</div> <%- @Icon('checkbox', 'icon-unchecked') %>
<button type="submit" class="btn btn--primary submit"><%- @T('Send to clients') %></button> <%- @Icon('checkbox-checked', 'icon-checked') %>
</form> <span class="label-text"><%- @T('Reload application') %></span>
</label>
</div>
<button type="submit" class="btn btn--primary submit"><%- @T('Send to clients') %></button>
</form>
</div>

64
app/assets/javascripts/app/views/object_manager/index.jst.eco
View file

@ -7,37 +7,39 @@
<a class="btn btn--success js-new"><%- @T( 'New Attribute' ) %></a> <a class="btn btn--success js-new"><%- @T( 'New Attribute' ) %></a>
</div> </div>
</div> </div>
<div class="box box--message"> <div class="page-content">
<h2>Database Update required</h2> <div class="box box--message">
<p><%- @T( 'Changes were made that require a database update. This might take some time.' ) %></p> <h2>Database Update required</h2>
<div class="box-controls"> <p><%- @T( 'Changes were made that require a database update. This might take some time.' ) %></p>
<div class="btn btn--text btn--secondary js-discard">Discard Changes</div> <div class="box-controls">
<div class="btn btn--primary js-sync align-right"><%- @T( 'Update Database' ) %></div> <div class="btn btn--text btn--secondary js-discard">Discard Changes</div>
</div> <div class="btn btn--primary js-sync align-right"><%- @T( 'Update Database' ) %></div>
</div>
<div class="box box--message">
<div class="box-progress">
<div class="box-progress-title"><%- @T('Updating Database') %></div>
<div class="box-progress-body">
<progress max="100" value="50"></progress>
</div> </div>
</div> </div>
<div class="box box--message">
<div class="box-progress">
<div class="box-progress-title"><%- @T('Updating Database') %></div>
<div class="box-progress-body">
<progress max="100" value="50"></progress>
</div>
</div>
</div>
<table class="table table-striped table-hover is-disabled">
<thead>
<tr>
<th class=""><%- @T('Display') %></th>
<th class=""><%- @T('Name') %></th>
<th class=""><%- @T('Type') %></th>
</tr>
</thead>
<tbody>
<% for item in @items: %>
<tr class="<% if item.active is false: %>is-inactive<% end %> js-edit u-clickable" data-id="<%- item.id %>">
<td><%= item.display %></td>
<td><%= item.name %></td>
<td><%= item.data_type %></td>
</tr>
<% end %>
</tbody>
</table>
</div> </div>
<table class="table table-striped table-hover is-disabled">
<thead>
<tr>
<th class=""><%- @T('Display') %></th>
<th class=""><%- @T('Name') %></th>
<th class=""><%- @T('Type') %></th>
</tr>
</thead>
<tbody>
<% for item in @items: %>
<tr class="<% if item.active is false: %>is-inactive<% end %> js-edit u-clickable" data-id="<%- item.id %>">
<td><%= item.display %></td>
<td><%= item.name %></td>
<td><%= item.data_type %></td>
</tr>
<% end %>
</tbody>
</table>

70
app/assets/javascripts/app/views/package.jst.eco
View file

@ -2,38 +2,40 @@
<h1><%- @T( 'Package' ) %> <small><%- @T( 'Management' ) %></small></h1> <h1><%- @T( 'Package' ) %> <small><%- @T( 'Management' ) %></small></h1>
</div> </div>
<!-- <div class="page-content">
<ul class="nav nav-tabs nav-stacked"> <!--
<li class=""><a data-type="" ><%- @T( 'Installed' ) %></a></li> <ul class="nav nav-tabs nav-stacked">
<li class=""><a data-type="" ><%- @T( 'Store' ) %></a></li> <li class=""><a data-type="" ><%- @T( 'Installed' ) %></a></li>
</ul> <li class=""><a data-type="" ><%- @T( 'Store' ) %></a></li>
--> </ul>
<p> -->
<form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data" class="horizontal center"> <p>
<input type="file" name="file_upload"/> <form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data" class="horizontal center">
<button class="align-right btn btn--primary" type="submit"><%- @T('Install Package') %></button> <input type="file" name="file_upload"/>
</form> <button class="align-right btn btn--primary" type="submit"><%- @T('Install Package') %></button>
</p> </form>
</p>
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th><%- @T('Name') %></th> <th><%- @T('Name') %></th>
<th><%- @T('Version') %></th> <th><%- @T('Version') %></th>
<th><%- @T('Vendor') %></th> <th><%- @T('Vendor') %></th>
<th><%- @T('State') %></th> <th><%- @T('State') %></th>
<th><%- @T('Action') %></th> <th><%- @T('Action') %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% for item in @packages: %> <% for item in @packages: %>
<tr data-id="<%= item.id %>"> <tr data-id="<%= item.id %>">
<td><%= item.name %></td> <td><%= item.name %></td>
<td><%= item.version %></td> <td><%= item.version %></td>
<td><a href="<%- item.url %>" target="_blank"><%= item.vendor %></a></td> <td><a href="<%- item.url %>" target="_blank"><%= item.vendor %></a></td>
<td><%- @T(item.state) %></td> <td><%- @T(item.state) %></td>
<td><% for action in item.action: %><a href="#" class="action" data-type="<%= action %>"><%- @T(action) %></a><br/><% end %></td> <td><% for action in item.action: %><a href="#" class="action" data-type="<%= action %>"><%- @T(action) %></a><br/><% end %></td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div>

2
app/assets/javascripts/app/views/profile/avatar.jst.eco
View file

@ -9,7 +9,7 @@
<div class="btn btn--success fileUpload"><%- @T('Upload') %><input type="file" class="js-upload" accept="image/*"></div> <div class="btn btn--success fileUpload"><%- @T('Upload') %><input type="file" class="js-upload" accept="image/*"></div>
</div> </div>
</div> </div>
<div class="avatar-gallery"> <div class="page-content avatar-gallery">
<% for avatar in @avatars: %> <% for avatar in @avatars: %>
<div class="avatar-holder"> <div class="avatar-holder">
<% if avatar.initial: %> <% if avatar.initial: %>

80
app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
View file

@ -3,45 +3,47 @@
<h1><%= @T('Calendar') %></h1> <h1><%= @T('Calendar') %></h1>
</div> </div>
</div> </div>
<h2><%= @T('Ticket Subscriptions') %></h2> <div class="page-content">
<h2><%= @T('Ticket Subscriptions') %></h2>
<p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p> <p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
<h3><%= @T('URL') %></h3> <h3><%= @T('URL') %></h3>
<input class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets"> <input class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets">
<h3><%= @T('Subscription Settings') %></h3> <h3><%= @T('Subscription Settings') %></h3>
<table class="settings-list"> <table class="settings-list">
<thead> <thead>
<tr> <tr>
<th style="white-space: nowrap;"><%= @T('Status Type') %> <th style="white-space: nowrap;"><%= @T('Status Type') %>
<th colspan="2"><%= @T('Options') %> <th colspan="2"><%= @T('Options') %>
<th width="100%"><%= @T('Direct URL') %> <th width="100%"><%= @T('Direct URL') %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% for stateType, options of @preferences: %> <% for stateType, options of @preferences: %>
<tr> <tr>
<td style="text-transform: capitalize"> <td style="text-transform: capitalize">
<%= @translationTable[stateType] %> <%= @translationTable[stateType] %>
<td> <td>
<label class="inline-label checkbox-replacement"> <label class="inline-label checkbox-replacement">
<input type="checkbox" name="<%= stateType %>/own"<%= if options.own then ' checked' %>> <input type="checkbox" name="<%= stateType %>/own"<%= if options.own then ' checked' %>>
<%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %> <%- @Icon('checkbox-checked', 'icon-checked') %>
<span class="label-text"><%= @T('own tickets') %></span> <span class="label-text"><%= @T('own tickets') %></span>
</label> </label>
<td> <td>
<label class="inline-label checkbox-replacement"> <label class="inline-label checkbox-replacement">
<input type="checkbox" name="<%= stateType %>/not_assigned"<%= if options.not_assigned then ' checked' %>> <input type="checkbox" name="<%= stateType %>/not_assigned"<%= if options.not_assigned then ' checked' %>>
<%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %> <%- @Icon('checkbox-checked', 'icon-checked') %>
<span class="label-text"><%= @T('not assigned tickets') %></span> <span class="label-text"><%= @T('not assigned tickets') %></span>
</label> </label>
<td> <td>
<div class="btn btn--table btn--text js-showLink"><%= @T('Show') %></div> <div class="btn btn--table btn--text js-showLink"><%= @T('Show') %></div>
<input class="form-control form-control--borderless js-select is-hidden" readonly value="<%= @baseurl %>/ical/tickets/<%= stateType %>"> <input class="form-control form-control--borderless js-select is-hidden" readonly value="<%= @baseurl %>/ical/tickets/<%= stateType %>">
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div>

2
app/assets/javascripts/app/views/profile/devices.jst.eco
View file

@ -2,7 +2,7 @@
<div class="page-header-title"><h1><%- @T( 'Devices' ) %></h1></div> <div class="page-header-title"><h1><%- @T( 'Devices' ) %></h1></div>
</div> </div>
<form> <form class="page-content">
<p><%- @T('All computers and browsers that have access to your Zammad appear here.') %></p> <p><%- @T('All computers and browsers that have access to your Zammad appear here.') %></p>

12
app/assets/javascripts/app/views/profile/language.jst.eco
View file

@ -3,8 +3,10 @@
<h1><%- @T( 'Language' ) %></h1> <h1><%- @T( 'Language' ) %></h1>
</div> </div>
</div> </div>
<p><%- @T( 'Change your language.' ) %></p> <div class="page-content">
<form class="settings-entry horizontal end"> <p><%- @T( 'Change your language.' ) %></p>
<div class="form-item language_item flex"></div> <form class="settings-entry horizontal end">
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button> <div class="form-item language_item flex"></div>
</form> <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
</form>
</div>

20
app/assets/javascripts/app/views/profile/linked_accounts.jst.eco
View file

@ -3,12 +3,14 @@
<h1><%- @T( 'Link Accounts' ) %></h1> <h1><%- @T( 'Link Accounts' ) %></h1>
</div> </div>
</div> </div>
<ul> <div class="page-content">
<% for auth_provider in @auth_providers: %> <ul>
<li> <%- @T( auth_provider.name ) %> <% for auth_provider in @auth_providers: %>
<% if !@user['accounts'] || !@user['accounts'][auth_provider.key]: %><a href="<%= auth_provider.url %>"><%- @T('Add') %></a> <li> <%- @T( auth_provider.name ) %>
<% else: %>"<%= @user['accounts'][auth_provider.key]['username'] %>" <a href="#" data-uid="<%= @user['accounts'][auth_provider.key]['uid'] %>" data-provider="<%= auth_provider.key %>" class="js-remove"><%- @T('remove') %></a> <% if !@user['accounts'] || !@user['accounts'][auth_provider.key]: %><a href="<%= auth_provider.url %>"><%- @T('Add') %></a>
<% end %> <% else: %>"<%= @user['accounts'][auth_provider.key]['username'] %>" <a href="#" data-uid="<%= @user['accounts'][auth_provider.key]['uid'] %>" data-provider="<%= auth_provider.key %>" class="js-remove"><%- @T('remove') %></a>
</li> <% end %>
<% end %> </li>
</ul> <% end %>
</ul>
</div>

2
app/assets/javascripts/app/views/profile/notification.jst.eco
View file

@ -2,7 +2,7 @@
<div class="page-header-title"><h1><%- @T( 'Notifications' ) %></h1></div> <div class="page-header-title"><h1><%- @T( 'Notifications' ) %></h1></div>
</div> </div>
<form> <form div class="page-content">
<h3><%- @T( 'Matrix' ) %></h3> <h3><%- @T( 'Matrix' ) %></h3>

10
app/assets/javascripts/app/views/profile/password.jst.eco
View file

@ -3,7 +3,9 @@
<h1><%- @T( 'Change your password' ) %></h1> <h1><%- @T( 'Change your password' ) %></h1>
</div> </div>
</div> </div>
<form class="settings-entry"> <div class="page-content">
<div class="password_item"></div> <form class="settings-entry">
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button> <div class="password_item"></div>
</form> <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
</form>
</div>

2
app/assets/javascripts/app/views/report/main.jst.eco
View file

@ -11,7 +11,7 @@
<div class="page-main"> <div class="page-main">
<div class="js-timeRangePicker"></div> <div class="js-timeRangePicker"></div>
<div class="page-content"> <div class="well">
<div id="placeholder" class="" style="height:350px;"></div> <div id="placeholder" class="" style="height:350px;"></div>
<span class=" muted" id="download-chart" style="font-size: 8px;"></span> <span class=" muted" id="download-chart" style="font-size: 8px;"></span>

50
app/assets/javascripts/app/views/session.jst.eco
View file

@ -1,27 +1,29 @@
<div class="page-header-title"> <div class="page-header-title">
<h1><%- @T('Sessions') %><small></small></h1> <h1><%- @T('Sessions') %><small></small></h1>
</div> </div>
<table class="table table-striped table-hover"> <div class="page-content">
<thead> <table class="table table-striped table-hover">
<tr> <thead>
<th><%- @T('User') %></th> <tr>
<th><%- @T('Browser') %></th> <th><%- @T('User') %></th>
<th><%- @T('Location') %></th> <th><%- @T('Browser') %></th>
<th><%- @T('Age') %></th> <th><%- @T('Location') %></th>
<th><%- @T('Update') %></th> <th><%- @T('Age') %></th>
<th><%- @T('Action') %></th> <th><%- @T('Update') %></th>
</tr> <th><%- @T('Action') %></th>
</thead> </tr>
<tbody> </thead>
<% for session in @sessions: %> <tbody>
<tr> <% for session in @sessions: %>
<td><% if session.data.user: %><%= session.data.user.displayName() %><% end %></td> <tr>
<td title="<%= session.data.user_agent %>"><%= session.data.user_agent %></td> <td><% if session.data.user: %><%= session.data.user.displayName() %><% end %></td>
<td title="<%= session.data.remote_id %>"><% if session.data.geo && session.data.geo.country_name: %><%= session.data.geo.country_name %> <%= session.data.geo.city_name %><% else: %><%= session.data.remote_id %><% end %></td> <td title="<%= session.data.user_agent %>"><%= session.data.user_agent %></td>
<td><%- @humanTime(session.created_at) %></td> <td title="<%= session.data.remote_id %>"><% if session.data.geo && session.data.geo.country_name: %><%= session.data.geo.country_name %> <%= session.data.geo.city_name %><% else: %><%= session.data.remote_id %><% end %></td>
<td><%- @humanTime(session.updated_at) %></td> <td><%- @humanTime(session.created_at) %></td>
<td><a href="#" data-session-id="<%- session.id %>" data-type="delete" title="<%- @Ti('Delete') %>"><%- @Icon('trash') %></a></td> <td><%- @humanTime(session.updated_at) %></td>
</tr> <td><a href="#" data-session-id="<%- session.id %>" data-type="delete" title="<%- @Ti('Delete') %>"><%- @Icon('trash') %></a></td>
<% end %> </tr>
</tbody> <% end %>
</table> </tbody>
</table>
</div>

2
app/assets/javascripts/app/views/settings/item.jst.eco
View file

@ -1,6 +1,6 @@
<form class="settings-entry" id="<%= @setting.name %>"> <form class="settings-entry" id="<%= @setting.name %>">
<h2><%- @T( @setting.title ) %></h2> <h2><%- @T( @setting.title ) %></h2>
<p><%- @RichText( @setting.description ) %></p> <p class="help-text"><%- @RichText( @setting.description ) %></p>
<div class="horizontal end"> <div class="horizontal end">
<div class="form-item flex"></div> <div class="form-item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button> <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>

80
app/assets/javascripts/app/views/sla/index.jst.eco
View file

@ -11,46 +11,50 @@
</div> </div>
</div> </div>
<% if _.isEmpty(@slas): %> <div class="page-content">
<%- @description %> <% if _.isEmpty(@slas): %>
<% end %> <div class="page-description">
<%- @description %>
</div>
<% end %>
<% for sla in @slas: %> <% for sla in @slas: %>
<div class="action" data-id="<%- sla.id %>"> <div class="action" data-id="<%- sla.id %>">
<div class="action-flow action-flow--row"> <div class="action-flow action-flow--row">
<div class="action-row"> <div class="action-row">
<h2><%= sla.name %></h2> <h2><%= sla.name %></h2>
</div> </div>
<div class="action-block action-block--flex"> <div class="action-block action-block--flex">
<div class="label"><%- @T('Filter') %></div> <div class="label"><%- @T('Filter') %></div>
<% for rule in sla.rules: %> <% for rule in sla.rules: %>
<%- rule %><br> <%- rule %><br>
<% end %> <% end %>
</div> </div>
<%- @Icon('arrow-right', 'action-flow-icon') %> <%- @Icon('arrow-right', 'action-flow-icon') %>
<div class="action-block action-block--flex"> <div class="action-block action-block--flex">
<div class="label"><%- @T('Escalation Times') %></div> <div class="label"><%- @T('Escalation Times') %></div>
<% if sla.first_response_time: %> <% if sla.first_response_time: %>
<%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %> <%- sla.first_response_time_in_text %> <%- @T('hours') %> - <%- @T('First Response Time') %>
<% end %> <% end %>
<% if sla.update_time: %> <% if sla.update_time: %>
<br>
<%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %>
<% end %>
<% if sla.solution_time: %>
<br>
<%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %>
<% end %>
<br> <br>
<%- sla.update_time_in_text %> <%- @T('hours') %> - <%- @T('Update Time') %> </div>
<% end %> </div>
<% if sla.solution_time: %> <div class="action-block">
<br> <div class="label"><%- @T('Calendar') %></div>
<%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %> <%= sla.calendar.displayName() %>
<% end %> </div>
<br> <div class="action-controls">
<div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
<div class="sla-edit btn js-edit"><%- @T('Edit') %></div>
</div> </div>
</div> </div>
<div class="action-block"> <% end %>
<div class="label"><%- @T('Calendar') %></div>
<%= sla.calendar.displayName() %>
</div>
<div class="action-controls">
<div class="sla-toggle btn btn--danger btn--secondary js-delete"><%- @T('Delete') %></div>
<div class="sla-edit btn js-edit"><%- @T('Edit') %></div>
</div>
</div> </div>
<% end %>

6
app/assets/javascripts/app/views/translation/index.jst.eco
View file

@ -9,5 +9,7 @@
<div class="language"></div> <div class="language"></div>
</div> </div>
</div> </div>
<div class="js-ToDo"></div> <div class="page-content">
<div class="js-List"></div> <div class="js-ToDo"></div>
<div class="js-List"></div>
</div>

29
app/assets/javascripts/app/views/user.jst.eco
View file

@ -10,19 +10,20 @@
<% end %> <% end %>
</div> </div>
</div> </div>
<div class="page-content">
<div class="searchfield"> <div class="searchfield">
<%- @Icon('magnifier') %> <%- @Icon('magnifier') %>
<input class="js-search form-control" name="search" placeholder="<%- @Ti('Search for users') %>" type="search"> <input class="js-search form-control" name="search" placeholder="<%- @Ti('Search for users') %>" type="search">
</div>
<div class="userSearch horizontal">
<div class="userSearch-label"><%- @T('Roles') %>:</div>
<div class="tabs tabs-wide">
<% for role in @roles: %>
<div class="tab" data-id="<%= role.id %>"><%- @T(role.displayName() ) %></div>
<% end %>
</div> </div>
</div>
<div class="table-overview"></div> <div class="userSearch horizontal">
<div class="userSearch-label"><%- @T('Roles') %>:</div>
<div class="tabs tabs-wide">
<% for role in @roles: %>
<div class="tab" data-id="<%= role.id %>"><%- @T(role.displayName() ) %></div>
<% end %>
</div>
</div>
<div class="table-overview"></div>
</div>

22
app/assets/stylesheets/bootstrap.css vendored
View file

@ -4168,28 +4168,6 @@ a.list-group-item-danger.active:focus {
.embed-responsive.embed-responsive-4by3 { .embed-responsive.embed-responsive-4by3 {
padding-bottom: 75%; padding-bottom: 75%;
} }
.well {
min-height: 20px;
padding: 19px;
margin-bottom: 20px;
background-color: #f5f5f5;
border: 1px solid #e3e3e3;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
}
.well blockquote {
border-color: #ddd;
border-color: rgba(0, 0, 0, .15);
}
.well-lg {
padding: 24px;
border-radius: 6px;
}
.well-sm {
padding: 9px;
border-radius: 3px;
}
.close { .close {
float: right; float: right;
font-size: 21px; font-size: 21px;

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

@ -40,7 +40,7 @@ use {
} }
p { p {
margin: 14px 0; margin: 12px 0;
&.subtle { &.subtle {
color: hsl(60,1%,74%); color: hsl(60,1%,74%);
@ -1793,6 +1793,21 @@ kbd {
} }
} }
.page-content {
label,
.label {
color: hsl(197,18%,70%);
}
.help-text,
.help-block {
color: hsl(198,19%,72%);
}
}
.page-description p {
color: initial;
}
.page-body--two-column { .page-body--two-column {
display: flex; display: flex;
} }
@ -1810,13 +1825,6 @@ kbd {
flex: 1; flex: 1;
} }
.page-content {
background: white;
border: 1px solid hsl(240,3%,92%);
border-radius: 3px;
padding: 10px;
}
.page-loading { .page-loading {
min-height: 500px; min-height: 500px;
display: flex; display: flex;
@ -1845,7 +1853,7 @@ kbd {
} }
.help-block:not(:empty) { .help-block:not(:empty) {
margin: 6px 2px 10px; margin: 8px 2px 10px;
} }
/* replace music icon with attachment */ /* replace music icon with attachment */
@ -2497,6 +2505,13 @@ footer {
color: #999999; color: #999999;
} }
.well {
background: white;
border: 1px solid hsl(240,3%,92%);
border-radius: 3px;
padding: 10px;
}
.well-muted { .well-muted {
background-color: whiteSmoke; background-color: whiteSmoke;
border: 1px solid #eee; border: 1px solid #eee;
@ -6588,6 +6603,10 @@ output {
color: hsl(198,18%,72%); color: hsl(198,18%,72%);
} }
.inline-label {
color: inherit;
}
.btn--table { .btn--table {
margin: 0; margin: 0;
} }
@ -7417,7 +7436,6 @@ output {
.tab { .tab {
height: 39px; height: 39px;
padding-top: 11px; padding-top: 11px;
color: hsl(199,18%,72%);
&.is-selected { &.is-selected {
background: linear-gradient(hsla(199,30%,40%,.08), hsla(199,30%,40%,.03)); background: linear-gradient(hsla(199,30%,40%,.08), hsla(199,30%,40%,.03));