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

Removed not necessary markup.

Browse source
This commit is contained in:
Martin Edenhofer 2014-07-21 23:17:48 +02:00
parent fb41e72b77
commit 44c13eebdc
26 changed files with 375 additions and 429 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -462,14 +462,13 @@ class App.Controller extends Spine.Controller
class App.ControllerPermanent extends App.Controller class App.ControllerPermanent extends App.Controller
constructor: -> constructor: ->
super super
$('.content').hide() $('.content').attr('style', 'display: none!important')
class App.ControllerContent extends App.Controller class App.ControllerContent extends App.Controller
constructor: -> constructor: ->
super super
$('.content').hide() $('.content').attr('style', 'display: none!important')
$('#content').show() $('#content').attr('style', 'display: flex!important')
@navShow() @navShow()
class App.ControllerModal extends App.Controller class App.ControllerModal extends App.Controller

10
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -178,7 +178,7 @@ class App.TicketZoom extends App.Controller
new ArticleView( new ArticleView(
ticket: @ticket ticket: @ticket
ticket_article_ids: @ticket_article_ids ticket_article_ids: @ticket_article_ids
el: @el.find('.article-view') el: @el.find('.ticket-article')
ui: @ ui: @
) )
@ -186,7 +186,7 @@ class App.TicketZoom extends App.Controller
# show edit # show edit
new Edit( new Edit(
ticket: @ticket ticket: @ticket
el: @el.find('.edit') el: @el.find('.ticket-edit')
edit_form: @edit_form edit_form: @edit_form
task_key: @task_key task_key: @task_key
ui: @ ui: @
@ -433,9 +433,9 @@ class Edit extends App.Controller
if !@autosaveLast || ( diff && !_.isEmpty( diff ) ) if !@autosaveLast || ( diff && !_.isEmpty( diff ) )
@autosaveLast = currentData @autosaveLast = currentData
@log 'notice', 'form hash changed', diff, currentData @log 'notice', 'form hash changed', diff, currentData
@el.find('.ticket-edit').addClass('form-changed') @el.find('.edit').addClass('form-changed')
@el.find('.ticket-edit').find('.reset-message').show() @el.find('.edit').find('.reset-message').show()
@el.find('.ticket-edit').find('.reset-message').removeClass('hide') @el.find('.edit').find('.reset-message').removeClass('hide')
App.TaskManager.update( @task_key, { 'state': currentData }) App.TaskManager.update( @task_key, { 'state': currentData })
@interval( update, 3000, 'autosave' ) @interval( update, 3000, 'autosave' )

10
app/assets/javascripts/app/lib/app_post/browser.coffee
View file

@ -9,31 +9,31 @@ class App.Browser
data = @detection() data = @detection()
# disable Crome 13 and older # disable Crome 13 and older
if data.browser == 'Chrome' && data.version <= 13 if data.browser == 'Chrome' && data.version <= 20
@message(data) @message(data)
console.log('Browser not supported') console.log('Browser not supported')
return false return false
# disable Firefox 9 and older # disable Firefox 9 and older
else if data.browser == 'Firefox' && data.version <= 9 else if data.browser == 'Firefox' && data.version <= 27
@message(data) @message(data)
console.log('Browser not supported') console.log('Browser not supported')
return false return false
# disable IE 8 and older # disable IE 8 and older
else if data.browser == 'Explorer' && data.version <= 8 else if data.browser == 'Explorer' && data.version <= 9
@message(data) @message(data)
console.log('Browser not supported') console.log('Browser not supported')
return false return false
# disable Safari 3 and older # disable Safari 3 and older
else if data.browser == 'Safari' && data.version <= 3 else if data.browser == 'Safari' && data.version <= 6
@message(data) @message(data)
console.log('Browser not supported') console.log('Browser not supported')
return false return false
# disable Opera 10 and older # disable Opera 10 and older
else if data.browser == 'Opera' && data.version <= 10 else if data.browser == 'Opera' && data.version <= 21
@message(data) @message(data)
console.log('Browser not supported') console.log('Browser not supported')
return false return false

2
app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee
View file

@ -47,7 +47,7 @@ class App.Run extends App.Controller
App.Event.trigger( event + ':ready') App.Event.trigger( event + ':ready')
class App.Content extends App.Controller class App.Content extends App.Controller
className: 'content flex' className: 'content flex horizontal'
constructor: -> constructor: ->
super super

9
app/assets/javascripts/app/lib/app_post/task_manager.js.coffee
View file

@ -151,7 +151,8 @@ class _taskManagerSingleton extends App.Controller
$('#content').empty() $('#content').empty()
# hide all tasks # hide all tasks
$('.content').hide() $('.content').attr('style', 'display: none!important')
#$('.content').hide()
$('.content').removeClass('active') $('.content').removeClass('active')
# create div for task if not exists # create div for task if not exists
@ -160,10 +161,12 @@ class _taskManagerSingleton extends App.Controller
# set task to shown and active # set task to shown and active
if @activeTask is key if @activeTask is key
$('#content_permanent_' + key ).show() #$('#content_permanent_' + key ).show()
$('#content_permanent_' + key).attr('style', 'display: flex!important')
$('#content_permanent_' + key ).addClass('active') $('#content_permanent_' + key ).addClass('active')
else else
$('#content_permanent_' + key ).hide() #$('#content_permanent_' + key ).hide()
$('#content_permanent_' + key).attr('style', 'display: none!important')
$('#content_permanent_' + key ).removeClass('active') $('#content_permanent_' + key ).removeClass('active')
# set all tasks to active false, only new/selected one to active # set all tasks to active false, only new/selected one to active

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

@ -1,26 +1,24 @@
<div class="horizontal"> <div class="sidebar">
<div class="sidebar"> <div class="widgets">
<div class="widgets"> <div class="customer_info"></div>
<div class="customer_info"></div> <div class="ticket_template"></div>
<div class="ticket_template"></div> <div class="text_module"></div>
<div class="text_module"></div>
</div>
</div>
<div class="main flex">
<div class="page-header">
<h1><%- @T( 'New Ticket' ) %> <small>(<%- @T( @title ) %>)<% if @admin: %> <a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a><% end %></small></h1>
</div>
<form class="form-horizontal form-large ticket-create">
<input type="hidden" value="" name="article_type"/>
<div class="span9 ticket_create"></div>
<div class="form-actions">
<button type="reset" class="btn cancel"><%- @T( 'Cancel' ) %></button>&nbsp;<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>
</div>
</div> </div>
</div> </div>
<div class="main flex">
<div class="page-header">
<h1><%- @T( 'New Ticket' ) %> <small>(<%- @T( @title ) %>)<% if @admin: %> <a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a><% end %></small></h1>
</div>
<form class="form-horizontal form-large ticket-create">
<input type="hidden" value="" name="article_type"/>
<div class="ticket_create"></div>
<div class="form-actions">
<button type="reset" class="btn cancel"><%- @T( 'Cancel' ) %></button>&nbsp;<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>
</div>
</div>

6
app/assets/javascripts/app/views/agent_ticket_view.jst.eco
View file

@ -1,4 +1,2 @@
<div class="horizontal"> <div class="sidebar"></div>
<div class="sidebar"></div> <div class="main flex"></div>
<div class="main flex"></div>
</div>

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

@ -1,4 +1,4 @@
<div class="page-header clearfix"> <div class="page-header">
<div class="page-header-title"> <div class="page-header-title">
<h1><%- @T( @overview.name ) %> <% if @edit: %><small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small><% end %></h1> <h1><%- @T( @overview.name ) %> <% if @edit: %><small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small><% end %></h1>
</div> </div>

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

@ -1,26 +1,23 @@
<div class="horizontal"> <div class="sidebar">
<div class="sidebar"> </div>
</div> <div class="main flex">
<div class="main flex">
<div class="ticket-create"> <div class="ticket-create">
<div class="page-header clearfix"> <div class="page-header">
<div class="page-header-title"> <div class="page-header-title">
<h1 class="pull-left"><%- @T( 'New Ticket' ) %></h1> <h1 class="pull-left"><%- @T( 'New Ticket' ) %></h1>
</div>
</div>
<div class="page-content">
<form class="form-horizontal form-large">
<input type="hidden" value="" name="article_type"/>
<div id="form_create"></div>
<div class="form-actions">
<button type="reset" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></button>
<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>
</div> </div>
</div> </div>
<div class="page-content">
<form class="form-horizontal form-large">
<input type="hidden" value="" name="article_type"/>
<div id="form_create"></div>
<div class="form-actions">
<button type="reset" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></button>
<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>
</div>
</div> </div>
</div>
</div>

220
app/assets/javascripts/app/views/dashboard.jst.eco
View file

@ -1,126 +1,124 @@
<div class="horizontal reverse"> <div class="main flex center">
<div class="activity sidebar"> <div class="tabs wide-tabs horizontal">
<div class="side-overviews" id="sortable-sidebar"></div> <div class="tab my-stats active">My Stats</div>
<div class="tab my-groups">My Group</div>
<div class="tab all-stats">All</div>
</div> </div>
<div class="main flex center">
<div class="tabs wide-tabs horizontal">
<div class="tab my-stats active">My Stats</div>
<div class="tab my-groups">My Group</div>
<div class="tab all-stats">All</div>
</div>
<div class="stat-widgets three-columns horizontal"> <div class="stat-widgets three-columns horizontal">
<div class="column"> <div class="column">
<div class="time stat-widget vertical"> <div class="time stat-widget vertical">
<h3>∅ Waiting time today</h3> <h3>∅ Waiting time today</h3>
<div class="stat-graphic flex horizontal centered"> <div class="stat-graphic flex horizontal centered">
<div class="stopwatch icon centered"> <div class="stopwatch icon centered">
<canvas class="stat-dial"></canvas> <canvas class="stat-dial"></canvas>
<div class="stat-amount"></div> <div class="stat-amount"></div>
</div>
</div>
<div class="stat-label contain-text">My handling time: 25 minutes</div>
<div class="stat-detail contain-text">Average: 13%</div>
</div>
</div>
<div class="column">
<div class="mood stat-widget vertical">
<h3>Mood</h3>
<div class="stat-graphic flex horizontal centered">
<div class="mood icon bad-state"></div>
</div>
<div class="stat-label contain-text">3% of my tickets escalated.</div>
<div class="stat-detail contain-text">Average: 17%</div>
</div>
</div>
<div class="column">
<div class="channel-distribution stat-widget vertical centered">
<h3>Channel Distribution</h3>
<div class="stat-graphic flex horizontal centered">
<div class="stats-channel email-channel vertical center">
<div class="email channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 80%"></div>
<div class="channel-bar secondary" style="height: 100%"></div>
</div>
<div class="channel-percentage">34%</div>
</div>
<div class="stats-channel received-calls-channel vertical center">
<div class="received-calls channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 53%"></div>
<div class="channel-bar secondary" style="height: 47%"></div>
</div>
<div class="channel-percentage">26%</div>
</div>
<div class="stats-channel outbound-calls-channel vertical center">
<div class="outbound-calls channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 46%"></div>
<div class="channel-bar secondary" style="height: 53%"></div>
</div>
<div class="channel-percentage">24%</div>
</div>
<div class="stats-channel facebook-channel vertical center">
<div class="facebook channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 24%"></div>
<div class="channel-bar secondary" style="height: 18%"></div>
</div>
<div class="channel-percentage">12%</div>
</div>
<div class="stats-channel twitter-channel vertical center">
<div class="twitter channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 13%"></div>
<div class="channel-bar secondary" style="height: 16%"></div>
</div>
<div class="channel-percentage">4%</div>
</div>
</div> </div>
</div> </div>
<div class="stat-label contain-text">My handling time: 25 minutes</div>
<div class="stat-detail contain-text">Average: 13%</div>
</div> </div>
<div class="column"> </div>
<div class="status stat-widget vertical"> <div class="column">
<h3>Status</h3> <div class="mood stat-widget vertical">
<div class="stat-graphic flex horizontal centered"> <h3>Mood</h3>
<div class="stat-tickets vertical reverse end"> <div class="stat-graphic flex horizontal centered">
<div class="stat-ticket icon supergood-state"></div> <div class="mood icon bad-state"></div>
<div class="stat-ticket icon supergood-state"></div> </div>
<div class="stat-ticket icon supergood-state"></div> <div class="stat-label contain-text">3% of my tickets escalated.</div>
<div class="stat-ticket icon supergood-state"></div> <div class="stat-detail contain-text">Average: 17%</div>
<div class="stat-ticket icon supergood-state"></div> </div>
<div class="stat-ticket icon supergood-state"></div> </div>
<div class="column">
<div class="channel-distribution stat-widget vertical centered">
<h3>Channel Distribution</h3>
<div class="stat-graphic flex horizontal centered">
<div class="stats-channel email-channel vertical center">
<div class="email channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 80%"></div>
<div class="channel-bar secondary" style="height: 100%"></div>
</div> </div>
<div class="stat-all-tickets icon"></div> <div class="channel-percentage">34%</div>
</div> </div>
<div class="stat-label contain-text">Tickets of my Group: 78 of 234</div> <div class="stats-channel received-calls-channel vertical center">
<div class="stat-detail contain-text">Average: 22%</div> <div class="received-calls channel icon"></div>
</div> <div class="channel-bars flex horizontal end justify-center">
</div> <div class="channel-bar primary" style="height: 53%"></div>
<div class="column"> <div class="channel-bar secondary" style="height: 47%"></div>
<div class="in-process stat-widget vertical"> </div>
<h3>Tickets in process</h3> <div class="channel-percentage">26%</div>
<div class="stat-graphic flex horizontal centered">
<div class="in-process icon supergood-state"></div>
</div> </div>
<div class="stat-label contain-text">74% are currently in process</div> <div class="stats-channel outbound-calls-channel vertical center">
<div class="stat-detail contain-text">Average: 62%</div> <div class="outbound-calls channel icon"></div>
</div> <div class="channel-bars flex horizontal end justify-center">
</div> <div class="channel-bar primary" style="height: 46%"></div>
<div class="column"> <div class="channel-bar secondary" style="height: 53%"></div>
<div class="reopening stat-widget vertical"> </div>
<h3>Reopening rate</h3> <div class="channel-percentage">24%</div>
<div class="stat-graphic flex horizontal centered"> </div>
<div class="reopening icon ok-state"></div> <div class="stats-channel facebook-channel vertical center">
<div class="facebook channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 24%"></div>
<div class="channel-bar secondary" style="height: 18%"></div>
</div>
<div class="channel-percentage">12%</div>
</div>
<div class="stats-channel twitter-channel vertical center">
<div class="twitter channel icon"></div>
<div class="channel-bars flex horizontal end justify-center">
<div class="channel-bar primary" style="height: 13%"></div>
<div class="channel-bar secondary" style="height: 16%"></div>
</div>
<div class="channel-percentage">4%</div>
</div> </div>
<div class="stat-label contain-text">7% are being reopened</div>
<div class="stat-detail contain-text">Average: 6%</div>
</div> </div>
</div> </div>
</div> </div>
<div class="column">
<div class="container-fluid main-overviews" id="sortable"> <div class="status stat-widget vertical">
<h3>Status</h3>
<div class="stat-graphic flex horizontal centered">
<div class="stat-tickets vertical reverse end">
<div class="stat-ticket icon supergood-state"></div>
<div class="stat-ticket icon supergood-state"></div>
<div class="stat-ticket icon supergood-state"></div>
<div class="stat-ticket icon supergood-state"></div>
<div class="stat-ticket icon supergood-state"></div>
<div class="stat-ticket icon supergood-state"></div>
</div>
<div class="stat-all-tickets icon"></div>
</div>
<div class="stat-label contain-text">Tickets of my Group: 78 of 234</div>
<div class="stat-detail contain-text">Average: 22%</div>
</div>
</div>
<div class="column">
<div class="in-process stat-widget vertical">
<h3>Tickets in process</h3>
<div class="stat-graphic flex horizontal centered">
<div class="in-process icon supergood-state"></div>
</div>
<div class="stat-label contain-text">74% are currently in process</div>
<div class="stat-detail contain-text">Average: 62%</div>
</div>
</div>
<div class="column">
<div class="reopening stat-widget vertical">
<h3>Reopening rate</h3>
<div class="stat-graphic flex horizontal centered">
<div class="reopening icon ok-state"></div>
</div>
<div class="stat-label contain-text">7% are being reopened</div>
<div class="stat-detail contain-text">Average: 6%</div>
</div>
</div> </div>
</div> </div>
<div class="container-fluid main-overviews" id="sortable">
</div>
</div>
<div class="activity sidebar">
<div class="side-overviews" id="sortable-sidebar"></div>
</div> </div>

58
app/assets/javascripts/app/views/dashboard/ticket.jst.eco
View file

@ -1,31 +1,31 @@
<div class="span9"> <div>
<div class="page-header clearfix"> <div class="page-header">
<div class="page-header-title"> <div class="page-header-title">
<h2 class="can-move"><%- @T( @overview.name ) %> <small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small></h2> <h2 class="can-move"><%- @T( @overview.name ) %> <small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small></h2>
</div> </div>
<div class="page-header-meta"> <div class="page-header-meta">
<ul class="pagination"> <ul class="pagination">
<li> <li>
<% if @start_page != 1: %> <% if @start_page != 1: %>
<a href="#" data-id="<%= @start_page - 1 %>" data-type="page">«</a> <a href="#" data-id="<%= @start_page - 1 %>" data-type="page">«</a>
<% else: %> <% else: %>
<a href="#" data-id="<%= @start_page %>" data-type="page">«</a> <a href="#" data-id="<%= @start_page %>" data-type="page">«</a>
<% end %> <% end %>
</li> </li>
<% for item in [1..@pages_total]: %> <% for item in [1..@pages_total]: %>
<li class="page"> <li class="page">
<a href="#" data-id="<%= item %>" data-type="page"><%= item %></a> <a href="#" data-id="<%= item %>" data-type="page"><%= item %></a>
</li> </li>
<% end %> <% end %>
<li> <li>
<% if @start_page != @pages_total: %> <% if @start_page != @pages_total: %>
<a href="#" data-id="<%= @start_page + 1 %>" data-type="page">»</a> <a href="#" data-id="<%= @start_page + 1 %>" data-type="page">»</a>
<% else: %> <% else: %>
<a href="#" data-id="<%= @start_page %>" data-type="page">»</a> <a href="#" data-id="<%= @start_page %>" data-type="page">»</a>
</li> </li>
<% end %> <% end %>
</ul> </ul>
</div>
</div> </div>
<div class="table-overview"></div>
</div> </div>
<div class="table-overview"></div>
</div>

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

@ -1,4 +1,4 @@
<div class="page-header clearfix"> <div class="page-header">
<div class="page-header-title"> <div class="page-header-title">
<h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1> <h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
</div> </div>

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

@ -1,21 +1,19 @@
<div class="horizontal"> <div class="sidebar">
<div class="sidebar">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<% if @menus: %> <% if @menus: %>
<% for menu in @menus: %> <% for menu in @menus: %>
<li class="<%= menu['class'] %>"><a href="<%= @page.nav %>/<%= menu.target %>" data-toggle="tabnav" data-target="<%= menu['target'] %>" ><%- @T( menu.name ) %></a></li> <li class="<%= menu['class'] %>"><a href="<%= @page.nav %>/<%= menu.target %>" data-toggle="tabnav" data-target="<%= menu['target'] %>" ><%- @T( menu.name ) %></a></li>
<% end %>
<% end %> <% end %>
</ul> <% end %>
</ul>
</div>
<div class="main flex">
<div class="page-header">
<h1><%- @T( @page.head ) %> <small><%- @T( @page.sub_head ) %></small></h1>
</div>
<div class="nav-tab-content"></div>
</div>
</div> </div>
<div class="main flex">
<div class="page-header">
<h1><%- @T( @page.head ) %> <small><%- @T( @page.sub_head ) %></small></h1>
</div>
<div class="nav-tab-content"></div>
</div>

8
app/assets/javascripts/app/views/generic/content_two.jst.eco
View file

@ -1,6 +1,4 @@
<div class="horizontal"> <div class="sidebar">
<div class="sidebar">
</div>
<div class="main flex">
</div>
</div> </div>
<div class="main flex">
</div>

16
app/assets/javascripts/app/views/generic/content_two_title.jst.eco
View file

@ -1,10 +1,8 @@
<div class="horizontal"> <div class="sidebar">
<div class="sidebar">
</div>
<div class="main flex">
<div class="page-header">
<h1><%- @T( @head ) %> <small><%- @T( @sub_head ) %></small></h1>
</div>
<div class="page-content"></div>
</div>
</div> </div>
<div class="main flex">
<div class="page-header">
<h1><%- @T( @head ) %> <small><%- @T( @sub_head ) %></small></h1>
</div>
<div class="page-content"></div>
</div>

28
app/assets/javascripts/app/views/generic/navbar_l2.jst.eco
View file

@ -1,19 +1,17 @@
<div class="horizontal"> <div class="sidebar <%= @className %>">
<div class="sidebar <%= @className %>">
<% if @groups: %> <% if @groups: %>
<% for group in @groups: %> <% for group in @groups: %>
<h2><%- @T(group.name) %></h2> <h2><%- @T(group.name) %></h2>
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<% if group.items: %> <% if group.items: %>
<% for item in group.items: %> <% for item in group.items: %>
<li <% if item.active: %>class="active"<% end %>><a href="<%= item.target %>"><%- @T(item.name) %></a></li> <li <% if item.active: %>class="active"<% end %>><a href="<%= item.target %>"><%- @T(item.name) %></a></li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>
</div>
<div class="main flex"></div>
</div> </div>
<div class="main flex"></div>

4
app/assets/javascripts/app/views/getting_started.jst.eco
View file

@ -7,13 +7,13 @@
</ol> </ol>
<% if @master_user: %> <% if @master_user: %>
<div class="master_user hero-left"> <div class="master_user hero-left">
<form class="form-stacked clearfix" id="form-master"> <form class="form-stacked" id="form-master">
<button type="submit" class="btn btn-primary submit pull-right"><%- @T( 'Next Step' ) %></button> <button type="submit" class="btn btn-primary submit pull-right"><%- @T( 'Next Step' ) %></button>
</form> </form>
</div> </div>
<% end %> <% end %>
<div class="agent_user hero-left hide"> <div class="agent_user hero-left hide">
<form class="form-stacked clearfix" id="form-agent"> <form class="form-stacked" id="form-agent">
<div class="form-controls"> <div class="form-controls">
<button type="submit" class="btn btn-primary submit pull-right"><%- @T( 'Send Invitation' ) %></button> <button type="submit" class="btn btn-primary submit pull-right"><%- @T( 'Send Invitation' ) %></button>
</div> </div>

2
app/assets/javascripts/app/views/network.jst.eco
View file

@ -3,7 +3,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="span9"> <div class="">
<% for network in @networks: %> <% for network in @networks: %>
<div class="row"> <div class="row">

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

@ -18,29 +18,27 @@
</p> </p>
</div> </div>
<div class="span9"> <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>
</div> </div>

2
app/assets/javascripts/app/views/scheduler.jst.eco
View file

@ -8,7 +8,7 @@
<li><a href="#">Jobs</a></li> <li><a href="#">Jobs</a></li>
</ul> </ul>
</div> </div>
<div class="span9 table-overview"> <div class="table-overview">
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">

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

@ -1,33 +1,27 @@
<div class="horizontal"> <div class="main flex">
<div class="sidebar">
<div class="widgets"></div>
<div class="action"></div>
</div>
<div class="main flex">
<div class="page-header ticket-zoom clearfix"> <div class="page-header ticket-zoom">
<div class="page-header-title"> <h1 class="ticket-title"></h1>
<div class="ticket-title"></div> <div class="page-header-meta">
</div> <% if @C( 'LastOverview' ) && @nav: %>
<div class="page-header-meta"> <div class="pull-right">
<% if @C( 'LastOverview' ) && @nav: %> <span class="pagination-count"><%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %></span>
<div class="pull-right"> <% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %>
<span class="pagination-count"><%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %></span> <ul class="pagination pagination-sm">
<% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %> <li class="<% if @C('LastOverviewPosition') <= 1: %>disabled<% end %>"><a href="<%- base_url %>previous" title="<%- @Ti( 'previous Ticket in Overview' ) %>">«</a></li>
<ul class="pagination pagination-sm"> <li class="<% if @C('LastOverviewPosition') is @C('LastOverviewTotal'): %>disabled<% end %>"><a href="<%- base_url %>next" title="<%- @Ti( 'next Ticket in Overview' ) %>">»</a></li>
<li class="<% if @C('LastOverviewPosition') <= 1: %>disabled<% end %>"><a href="<%- base_url %>previous" title="<%- @Ti( 'previous Ticket in Overview' ) %>">«</a></li> </ul>
<li class="<% if @C('LastOverviewPosition') is @C('LastOverviewTotal'): %>disabled<% end %>"><a href="<%- base_url %>next" title="<%- @Ti( 'next Ticket in Overview' ) %>">»</a></li> </div>
</ul> <% end %>
</div>
<% end %>
</div>
</div> </div>
<div class="ticket-answer">
<div class="article-view"></div>
<div class="edit"></div>
</div>
</div> </div>
<div class="ticket-article"></div>
<div class="ticket-edit"></div>
</div> </div>
<div class="sidebar">
<div class="widgets"></div>
<div class="action"></div>
</div>

81
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -1,44 +1,41 @@
<div class="ticket-article-view">
<% for article in @articles: %> <% for article in @articles: %>
<div class="ticket-article ticket-article-item <% if article.internal is true: %> internal<% end %>" data-id="<%= article.id %>" id="article-<%= article.id %>"> <div class="horizontal ticket-article-item <% if article.internal is true: %> internal<% end %>" data-id="<%= article.id %>" id="article-<%= article.id %>">
<div class="avatar"> <div class="avatar">
<img class="thumbnail user-popover" data-id="<%= article.created_by_id %>" src="<%= article.created_by.image %>" alt=""> <img class="thumbnail user-popover" data-id="<%= article.created_by_id %>" src="<%= article.created_by.image %>" alt="">
<ul> <ul>
<li style="font-size: 10px;"><%- @T(article.type.name) %></li> <li style="font-size: 10px;"><%- @T(article.type.name) %></li>
<% if article.type.name is 'email': %><li style="font-size: 10px;"><a href="<%= App.Config.get('api_path') %>/ticket_article_plain/<%= article.id %>"><%- @T( 'raw' ) %></a></li><% end %> <% if article.type.name is 'email': %><li style="font-size: 10px;"><a href="<%= App.Config.get('api_path') %>/ticket_article_plain/<%= article.id %>"><%- @T( 'raw' ) %></a></li><% end %>
</ul> </ul>
</div>
<div class="ticket-article-message">
<div class="ticket-article-meta">
<% if article.from: %>
<strong title="<%- @Ti( 'From' ) %>: <%= article.from %>"><%= article.from %></strong>
<% if article.actions: %>
<% for action in article.actions: %>
-
<a href="<%= action.href %>" data-type="<%= action.type %>" class="<% if action.class: %><%= action.class %><% end %>"><%- @T( action.name ) %></a>
<% end %>
<% end %>
- <span class="humanTimeFromNow" data-time="<%- article.created_at %>">?</span>
<% end %>
<% if article.to: %>
<div title="<%- @Ti( 'To' ) %>: <%= article.to %>"><%= article.to %></div>
<% end %>
<% if article.cc: %>
<div title="<%- @Ti( 'Cc' ) %>: <%= article.cc %>"><%= article.cc %></div>
<% end %>
<% if article.subject: %>
<div title="<%- @Ti( 'Subject' ) %>: <%= article.subject %>"><%= article.subject %></div>
<% end %>
<% if article.attachments: %>
<div>
<% for attachment in article.attachments: %>
<a href="<%= App.Config.get('api_path') %>/ticket_attachment/<%= article.ticket_id %>/<%= article.id %>/<%= attachment.id %>" target="_blank" data-type="attachment" class="attachment" title="<%= attachment.size %>"><%= attachment.filename %></a>
<% end %>
</div>
<% end %>
</div>
<div style="white-space:pre-wrap;" class="message"><%- article.html %></div>
</div>
</div> </div>
<% end %> <div class="ticket-article-message flex">
</div> <% if article.from: %>
<strong title="<%- @Ti( 'From' ) %>: <%= article.from %>"><%= article.from %></strong>
<% if article.actions: %>
<% for action in article.actions: %>
-
<a href="<%= action.href %>" data-type="<%= action.type %>" class="<% if action.class: %><%= action.class %><% end %>"><%- @T( action.name ) %></a>
<% end %>
<% end %>
- <span class="humanTimeFromNow" data-time="<%- article.created_at %>">?</span>
<% end %>
<% if article.to: %>
<div title="<%- @Ti( 'To' ) %>: <%= article.to %>"><%= article.to %></div>
<% end %>
<% if article.cc: %>
<div title="<%- @Ti( 'Cc' ) %>: <%= article.cc %>"><%= article.cc %></div>
<% end %>
<% if article.subject: %>
<div title="<%- @Ti( 'Subject' ) %>: <%= article.subject %>"><%= article.subject %></div>
<% end %>
<% if article.attachments: %>
<div>
<% for attachment in article.attachments: %>
<a href="<%= App.Config.get('api_path') %>/ticket_attachment/<%= article.ticket_id %>/<%= article.id %>/<%= attachment.id %>" target="_blank" data-type="attachment" class="attachment" title="<%= attachment.size %>"><%= attachment.filename %></a>
<% end %>
</div>
<% end %>
<div style="white-space:pre-wrap;" class="message"><%- article.html %></div>
</div>
</div>
<hr>
<% end %>

38
app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
View file

@ -1,23 +1,21 @@
<div class="ticket-article-view"> <div class="horizontal well edit <% if @formChanged: %>form-changed<% end %>">
<div class="ticket-article well ticket-edit <% if @formChanged: %>form-changed<% end %>"> <div class="avatar">
<div class="avatar"> <img class="thumbnail user-popover" data-id="<%= @S('id') %>" src="<%- @S('image') %>" alt="">
<img class="thumbnail user-popover" data-id="<%= @S('id') %>" src="<%- @S('image') %>" alt=""> </div>
</div> <div class="ticket-article-message flex">
<div class="ticket-article-message"> <div class="edit-title">
<div class="edit-title"> <h4><%- @T('Edit') %>
<h4><%- @T('Edit') %> <small class="reset-message<% if !@formChanged: %> hide<% end %>">
<small class="reset-message<% if !@formChanged: %> hide<% end %>"> <a href="#" data-type="reset"><%- @T('Discard your unsaved changes.') %></a> <href="#" class="glyphicon glyphicon-repeat" data-type="reset"></a>
<a href="#" data-type="reset"><%- @T('Discard your unsaved changes.') %></a> <href="#" class="glyphicon glyphicon-repeat" data-type="reset"></a> </small>
</small> </h4>
</h4>
</div>
<div class="edit-content">
<form class="form-stacked ticket-update">
<div class="form-ticket-update"></div>
<div class="form-article-update"></div>
<button type="submit" class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
</form>
<div>
</div> </div>
<div class="edit-content">
<form class="form-stacked ticket-update">
<div class="form-ticket-update"></div>
<div class="form-article-update"></div>
<button type="submit" class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
</form>
<div>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/trigger.jst.eco
View file

@ -9,7 +9,7 @@
<li><a href="#">Actions</a></li> <li><a href="#">Actions</a></li>
</ul> </ul>
</div> </div>
<div class="span9 table-overview"> <div class="table-overview">
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">

35
app/assets/javascripts/app/views/user_zoom.jst.eco
View file

@ -1,21 +1,18 @@
<div class="horizontal"> <div class="sidebar">
<div class="sidebar"> <div class="widgets"></div>
<div class="widgets"></div> <div class="action"></div>
<div class="action"></div>
</div>
<div class="main flex">
<div class="page-header user-zoom clearfix">
<div class="page-header-title">
<div class="ticket-title"></div>
</div>
</div>
<div class="ticket-answer">
<div class="article-view"></div>
<div class="edit"></div>
</div>
</div>
</div> </div>
<div class="main flex">
<div class="page-header user-zoom">
<div class="page-header-title">
<div class="ticket-title"></div>
</div>
</div>
<div class="ticket-answer">
<div class="article-view"></div>
<div class="edit"></div>
</div>
</div>

47
app/assets/stylesheets/zzz.css.erb
View file

@ -1200,41 +1200,6 @@ footer {
} }
} }
.ticket-article-view {
max-width: 750px;
}
.ticket-article {
padding: 8px 0 6px 2px;
min-height: 116px;
margin: 2px 0;
}
.ticket-article-item {
border-bottom: 1px solid #eeeeee;
}
.ticket-article-item:last-child {
border-bottom: none;
}
.ticket-article h4 {
margin-top: 2px;
margin-bottom: 6px;
}
.ticket-article.well {
padding: 4px 0 20px 2px;
margin-top: 4px;
}
.ticket-article-meta {
border-bottom: 1px solid #eeeeee;
padding-bottom: 10px;
}
.ticket-article-message {
padding-left: 6px;
padding-top: 4px;
margin-left: 70px;
}
.ticket-edit .ticket-article-message {
padding-right: 40px;
}
.message { .message {
padding-top: 6px; padding-top: 6px;
padding-bottom: 6px; padding-bottom: 6px;
@ -1252,6 +1217,18 @@ footer {
width: 160px; width: 160px;
} }
.ticket-article .avatar {
width: 80px;
}
.ticket-article .avatar ul {
margin-left: -22px;
}
.ticket-article-item {
min-height: 100px;
}
.show_toogle { .show_toogle {
font-size: 10px; font-size: 10px;