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

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

Browse source
This commit is contained in:
Felix Niklas 2014-07-20 23:26:39 +02:00
commit 9c0684a5dc
12 changed files with 79 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/login.js.coffee
View file

@ -20,21 +20,25 @@ class Index extends App.ControllerContent
url: '/auth/facebook', url: '/auth/facebook',
name: 'Facebook', name: 'Facebook',
config: 'auth_facebook', config: 'auth_facebook',
class: 'facebook',
}, },
twitter: { twitter: {
url: '/auth/twitter', url: '/auth/twitter',
name: 'Twitter', name: 'Twitter',
config: 'auth_twitter', config: 'auth_twitter',
class: 'twitter',
}, },
linkedin: { linkedin: {
url: '/auth/linkedin', url: '/auth/linkedin',
name: 'LinkedIn', name: 'LinkedIn',
config: 'auth_linkedin', config: 'auth_linkedin',
class: 'linkedin',
}, },
google_oauth2: { google_oauth2: {
url: '/auth/google_oauth2', url: '/auth/google_oauth2',
name: 'Google', name: 'Google',
config: 'auth_google_oauth2', config: 'auth_google_oauth2',
class: 'google',
}, },
} }
auth_providers = [] auth_providers = []

1
app/assets/javascripts/app/controllers/navigation.js.coffee
View file

@ -155,6 +155,7 @@ class App.Navigation extends App.Controller
display: "#{user.displayName()}" display: "#{user.displayName()}"
id: user.id id: user.id
class: "user user-popover" class: "user user-popover"
url: user.uiUrl()
iconClass: "user" iconClass: "user"
area.result.push data area.result.push data
else if area.name is 'Organization' else if area.name is 'Organization'

15
app/assets/javascripts/app/controllers/reset_password.js.coffee
View file

@ -1,10 +1,8 @@
class Index extends App.ControllerContent class Index extends App.ControllerContent
className: 'reset_password fit'
events: events:
'submit form': 'submit' 'submit form': 'submit'
'click .submit': 'submit' 'click .submit': 'submit'
'click .retry': 'rerender' 'click .retry': 'retry'
constructor: -> constructor: ->
super super
@ -28,14 +26,14 @@ class Index extends App.ControllerContent
@html App.view('password/reset')(params) @html App.view('password/reset')(params)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#form-password-item') el: @el.find('.form-password-item')
model: { configure_attributes: configure_attributes } model: { configure_attributes: configure_attributes }
autofocus: true autofocus: true
) )
rerender: (e) -> retry: (e) ->
e.preventDefault() e.preventDefault()
@el.find('#form-password').show() @render()
submit: (e) -> submit: (e) ->
e.preventDefault() e.preventDefault()
@ -55,20 +53,17 @@ class Index extends App.ControllerContent
success: (data, status, xhr) => success: (data, status, xhr) =>
@render( sent: true ) @render( sent: true )
@el.find('#form-password').hide()
error: (data, status, xhr) => error: (data, status, xhr) =>
@notify( @notify(
type: 'error' type: 'error'
msg: App.i18n.translateContent( 'Username or email address invalid, please try again.' ) msg: App.i18n.translateContent( 'Username or email address invalid, please try again.' )
) )
@formEnable( @el.find('#form-password') ) @formEnable( @el.find('.form-password') )
App.Config.set( 'reset_password', Index, 'Routes' ) App.Config.set( 'reset_password', Index, 'Routes' )
class Verify extends App.ControllerContent class Verify extends App.ControllerContent
className: 'container'
events: events:
'submit form': 'submit' 'submit form': 'submit'
'click .submit': 'submit' 'click .submit': 'submit'

2
app/assets/javascripts/app/controllers/signup.js.coffee
View file

@ -1,6 +1,4 @@
class Index extends App.ControllerContent class Index extends App.ControllerContent
className: 'signup fit'
events: events:
'submit form': 'submit' 'submit form': 'submit'
'click .submit': 'submit' 'click .submit': 'submit'

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

@ -33,13 +33,14 @@ class App.TicketZoom extends App.Controller
meta: => meta: =>
meta = meta =
url: @url() url: @url()
id: @ticket_id id: @ticket_id
iconClass: "priority"
if @ticket if @ticket
@ticket = App.Ticket.retrieve( @ticket.id ) @ticket = App.Ticket.retrieve( @ticket.id )
meta.head = @ticket.title meta.head = @ticket.title
meta.title = '#' + @ticket.number + ' - ' + @ticket.title meta.title = '#' + @ticket.number + ' - ' + @ticket.title
meta.class = "level-#{@ticket.priority_id}" meta.class = "level-#{@ticket.priority_id}"
meta meta
url: => url: =>

4
app/assets/javascripts/app/controllers/user_zoom.js.coffee
View file

@ -15,7 +15,9 @@ class App.UserZoom extends App.Controller
meta = meta =
url: @url() url: @url()
id: @user_id id: @user_id
class: "level-1" class: ""
iconClass: "user"
if @user if @user
meta.head = @user.displayName() meta.head = @user.displayName()

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

@ -18,31 +18,23 @@
<button class="btn btn-primary" type="submit"><%- @T( 'Sign in' ) %></button> <button class="btn btn-primary" type="submit"><%- @T( 'Sign in' ) %></button>
<% if @C('user_lost_password'): %> <% if @C('user_lost_password'): %>
<a href="#reset_password" class="subtle-link standalone pull-right"><%- @T( 'Forgot password?' ) %></a> <a href="#reset_password" class="subtle-link standalone pull-right"><%- @T( 'Forgot password?' ) %></a>
<% end %> <% end %>
</div> </div>
<% if true or !_.isEmpty( @auth_providers ): %> <% if !_.isEmpty( @auth_providers ): %>
<div class="separator"> <div class="separator">
<span class="separator-text"><%- @T( 'or sign in using' ) %></span> <span class="separator-text"><%- @T( 'or sign in using' ) %></span>
</div> </div>
<div class="auth_providers horizontal stretch"> <div class="auth_providers horizontal stretch">
<!--<% for auth_provider in @auth_providers: %> <% for auth_provider in @auth_providers: %>
<li><a href="<%= auth_provider.url %>"><%- @T( auth_provider.name ) %></a></li> <a class="auth_provider <%= auth_provider.class %> horizontal" href="<%= auth_provider.url %>">
<% end %>--> <span class="provider_icon"></span>
<a class="auth_provider facebook horizontal"> <span class="provider_name flex"><%- @T( auth_provider.name ) %></span>
<span class="provider_icon"></span> </a>
<span class="provider_name flex">Facebook</span> <li><a href="<%= auth_provider.url %>"></a></li>
</a> <% end %>
<a class="auth_provider google horizontal">
<span class="provider_icon"></span>
<span class="provider_name flex">Google+</span>
</a>
<a class="auth_provider twitter horizontal">
<span class="provider_icon"></span>
<span class="provider_name flex">Twitter</span>
</a>
</div> </div>
<% end %> <% end %>
</form> </form>
@ -50,14 +42,15 @@
<p> <p>
<%- @T( "You're already registered with your email adress if you've been in touch with our support team.") %><br> <%- @T( "You're already registered with your email adress if you've been in touch with our support team.") %><br>
<%- @T( "You can request your password") %> <a href="#"><%- @T( "here") %></a>. <% if @C('user_lost_password'): %>
<%- @T( "You can request your password") %> <a href="#reset_password"><%- @T( "here") %></a>.
<% end %>
</p> </p>
<% if @C('user_create_account'): %> <% if @C('user_create_account'): %>
<hr> <hr>
<p>
<p> <a href="#signup"><%- @T( 'Register as a new customer' ) %></a>
<a href="#signup"><%- @T( 'Register as a new customer' ) %></a> </p>
</p>
<% end %> <% end %>
</div> </div>

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

@ -1,18 +1,18 @@
<div class="fullHeight vertical center justified"> <div class="fullHeight vertical center justified reset_password fit">
<div class="hero-unit"> <div class="hero-unit">
<% if @sent: %> <% if @sent: %>
<h2><%- @T('We\'ve sent password reset instructions to your email address.') %><small></small></h2> <h2><%- @T('We\'ve sent password reset instructions to your email address.') %><small></small></h2>
<p><%- @T('If you don\'t receive instructions within a minute or two, check your email\'s spam and junk filters, or try resending your request.') %></p> <p><%- @T('If you don\'t receive instructions within a minute or two, check your email\'s spam and junk filters, or try resending your request.') %></p>
<a href="#" class="subtle retry">&raquo; <%- @T('again') %> &laquo;</a> <a href="#" class="subtle retry">&raquo; <%- @T('again') %> &laquo;</a>
<% end %> <% else: %>
<div id="form-password">
<h2><%- @T( 'Forgot your password?' ) %><small></small></h2> <h2><%- @T( 'Forgot your password?' ) %><small></small></h2>
<form id="form-password-item"> <form class="form-password">
<div class="form-password-item"></div>
<div class="form-controls"> <div class="form-controls">
<a class="subtle-link standalone pull-left cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a> <a class="subtle-link standalone pull-left cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button class="btn btn-primary submit pull-right"><%- @T( 'Submit' ) %></button> <button class="btn btn-primary submit pull-right"><%- @T( 'Submit' ) %></button>
</div> </div>
</form> </form>
</div> <% end %>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/password/reset_change.jst.eco
View file

@ -1,4 +1,4 @@
<div class="fullHeight vertical center justified"> <div class="fullHeight vertical center justified reset_password fit">
<div class="hero-unit"> <div class="hero-unit">
<h2><%- @T( 'Choose your new password.' ) %><small></small></h2> <h2><%- @T( 'Choose your new password.' ) %><small></small></h2>
<form id="form-password-change"> <form id="form-password-change">

55
app/assets/javascripts/app/views/popover/ticket.jst.eco
View file

@ -1,20 +1,35 @@
<table style="width: 100%;"> <div class="level-2">
<tr> <div class="priority icon"></div>
<td>#<%- @P( @ticket.number ) %></td> eskalierend
<td><%- @P( @ticket.humanTime ) %></td> </div>
</tr> <hr>
<tr> <h3>Personen</h3>
<td><%- @P( @ticket.group ) %></td> <div class="person">
<td><%- @T( @ticket.state.name ) %></td> <%- @P( @ticket.owner ) %>
</tr> </div>
<tr> <div class="person">
<td><%- @T( @ticket.priority.name ) %></td> <%- @P( @ticket.customer ) %>
<td></td> </div>
</tr> <hr>
<tr> <div class="horizontal two-columns wrap">
<td colspan="2"><%- @P( @ticket.owner ) %></td> <div class="column">
</tr> <h3>#</h3>
<tr> <div class="contain-text"><%- @P( @ticket.number ) %></div>
<td colspan="2"><%- @P( @ticket.customer ) %></td> </div>
</tr> <div class="column">
</table> <h3><%- @T( 'State' ) %></h3>
<div class="contain-text"><%- @P( @ticket.state.name ) %></div>
</div>
<div class="column">
<h3><%- @T( 'Priority' ) %></h3>
<div class="contain-text"><%- @T( @ticket.priority.name ) %></div>
</div>
<div class="column">
<h3><%- @T( 'Age' ) %></h3>
<div class="contain-text"><%- @P( @ticket.humanTime ) %></div>
</div>
<div class="column">
<h3><%- @T( 'Group' ) %></h3>
<div class="contain-text"><%- @P( @ticket.group ) %></div>
</div>
</div>

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

@ -1,4 +1,4 @@
<div class="fullHeight vertical center justified"> <div class="fullHeight vertical center justified signup fit">
<div class="hero-unit"> <div class="hero-unit">
<h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1> <h1><%- @T( 'Join' ) %> <%= @C( 'product_name' ) %></h1>
<form> <form>

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

@ -1,7 +1,7 @@
<% for item in @item_list: %> <% for item in @item_list: %>
<a href="<%- item.data.url %>" title="<%= item.data.title %>" class="task <%= item.data.class %> horizontal center <% if item.task.active: %>active<% end %>" data-key="<%- item.task.key %>"> <a href="<%- item.data.url %>" title="<%= item.data.title %>" class="task <%= item.data.class %> horizontal center <% if item.task.active: %>active<% end %>" data-key="<%- item.task.key %>">
<div class="icon-holder centered"> <div class="icon-holder centered">
<div class="priority icon<% if item.task.notify: %> modified<% end %>"></div> <div class="<%= item.data.iconClass %> icon<% if item.task.notify: %> modified<% end %>"></div>
</div> </div>
<div class="name contain-text flex"><%= item.data.head %></div> <div class="name contain-text flex"><%= item.data.head %></div>
<div class="close-task button horizontal centered"> <div class="close-task button horizontal centered">