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

This commit is contained in:
Felix Niklas 2014-07-19 01:09:43 +02:00
commit 6da7108e33
8 changed files with 16 additions and 22 deletions

View file

@ -452,13 +452,14 @@ class App.Controller extends Spine.Controller
class App.ControllerPermanent extends App.Controller
constructor: ->
super
$('#content_permanent').show()
@el.find('#content').empty()
$('.content').hide()
class App.ControllerContent extends App.Controller
constructor: ->
super
$('#content_permanent').hide()
$('.content').hide()
$('#content').show()
class App.ControllerModal extends App.Controller
className: 'modal fade',

View file

@ -1,6 +1,4 @@
class Index extends App.ControllerContent
className: 'login fit'
events:
'submit #login': 'login'

View file

@ -1,5 +1,5 @@
class App.Navigation extends App.Controller
className: 'navigation flex vertical'
className: 'navigation vertical'
events:
'click .empty-search': 'emptySearch'

View file

@ -22,7 +22,7 @@ class App.Run extends App.Controller
App.Auth.loginCheck()
# start navbars
@setupWidget( 'Navigations', 'nav', @el.find('#nav') )
@setupWidget( 'Navigations', 'nav', @el )
# start widgets
@setupWidget( 'Widgets', 'widget', @el )
@ -47,7 +47,7 @@ class App.Run extends App.Controller
App.Event.trigger( event + ':ready')
class App.Content extends App.Controller
className: 'content flex horizontal stretch'
className: 'content flex'
constructor: ->
super

View file

@ -145,22 +145,18 @@ class _taskManagerSingleton extends App.Controller
ui.allTasks[taskPosition] = task
)
# create div for permanent content
if !$("#content_permanent")[0]
$('#app').append('<div id="content_permanent" class="content"></div>')
# empty static content if task is shown
if active
@activeTask = key
$('#content').empty()
# hide all tasks
$('.content_permanent').hide()
$('.content_permanent').removeClass('active')
$('.content').hide()
$('.content').removeClass('active')
# create div for task if not exists
if !$("#content_permanent_#{key}")[0]
$('#content_permanent').append('<div id="content_permanent_' + key + '" class="content_permanent"></div>')
$('#app').append('<div id="content_permanent_' + key + '" class="content flex"></div>')
# set task to shown and active
if @activeTask is key

View file

@ -1,5 +1,5 @@
<div class="fullHeight vertical center justified">
<p>Login with zeughaus.znuny.com:</p> <!-- how do you pass @T a parameter? @T( 'Login with %s', zeughaus.znuny.com )? -->
<div class="fullHeight vertical center justified login fit">
<p><%- @T( 'Login with %s', @C( 'fqdn' ) ) %></p>
<div class="hero-unit">
<img class="logo" src="http://znuny.com/assets/logo_small.png" alt="<%= @C( 'product_name' ) %>">
@ -8,7 +8,7 @@
<label for="username"><%- @Ti( 'Username / email' ) %></label>
<input id="username" name="username" type="text" class="form-control" value="<%= @item.username %>" autocapitalize="off" />
</div>
<div class="form-group">
<label for="password"><%- @Ti( 'Password' ) %></label>
<input id="password" name="password" type="password" class="form-control"/>
@ -49,7 +49,7 @@
</div>
<p>
<%- @T( "You're already registered with your E-Mail 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>.
</p>

View file

@ -573,6 +573,7 @@ label {
.login, .getstarted, .reset_password, .signup {
padding: 10px;
height: auto;
}
.login .hero-unit {

View file

@ -1,6 +1,4 @@
<div id="app" class="fit horizontal">
<div id="nav" class="vertical"></div>
</div>
<div id="app" class="fit flex horizontal"></div>
<div id="splash">
<div class="logo">booting...</div>
</div>