Merge branch 'interface' of github.com:martini/zammad into interface
This commit is contained in:
commit
a9f51ccd0d
3 changed files with 54 additions and 26 deletions
|
@ -1,4 +1,6 @@
|
|||
class Index extends App.Controller
|
||||
elements:
|
||||
'.js-search' : 'searchInput'
|
||||
events:
|
||||
'click [data-type="new"]': 'new'
|
||||
|
||||
|
@ -14,7 +16,7 @@ class Index extends App.Controller
|
|||
@html App.view('user')(
|
||||
head: 'Users'
|
||||
buttons: [
|
||||
{ name: 'New User', 'data-type': 'new', class: 'primary' }
|
||||
{ name: 'New User', 'data-type': 'new', class: 'btn--success' }
|
||||
]
|
||||
roles: App.Role.all()
|
||||
)
|
||||
|
@ -24,14 +26,14 @@ class Index extends App.Controller
|
|||
(e) =>
|
||||
e.preventDefault()
|
||||
$(e.target).toggleClass('active')
|
||||
term = @$('.search').val().trim()
|
||||
term = @searchInput.val().trim()
|
||||
return if !term
|
||||
@delay( @search, 220, 'search' )
|
||||
)
|
||||
|
||||
# start search
|
||||
@$('.search').bind( 'keyup', (e) =>
|
||||
term = @$('.search').val().trim()
|
||||
@searchInput.bind( 'keyup', (e) =>
|
||||
term = @searchInput.val().trim()
|
||||
return if !term
|
||||
return if term is @term
|
||||
@term = term
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
<div class="flex scrollable">
|
||||
<div class="horizontal">
|
||||
<div class="page-header-title">
|
||||
<h1><%- @T( @head ) %> <small><%- @T( 'Management' ) %></small></h1>
|
||||
|
@ -6,19 +5,20 @@
|
|||
<div class="page-header-meta">
|
||||
<% if @buttons: %>
|
||||
<% for button in @buttons: %>
|
||||
<a data-type="<%= button['data-type'] %>" class="btn btn-default <%= button['class'] %>"><%- @T( button.name ) %></a>
|
||||
<a data-type="<%= button['data-type'] %>" class="btn <%= button['class'] %>"><%- @T( button.name ) %></a>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input class="search" name="search" placeholder="<%- @T('Search for users') %>">
|
||||
|
||||
<div class="tabs wide-tabs horizontal" style="width: 100%;">
|
||||
<div class="userSearch horizontal center">
|
||||
<input type="text" class="js-search flex" name="search" placeholder="<%- @T('Search for users') %>">
|
||||
<div class="userSearch-label"><%- @T('Filter') %>:</div>
|
||||
<div class="tabs tabs-wide horizontal">
|
||||
<% for role in @roles: %>
|
||||
<div class="tab" data-id="<%= role.id %>"><%- @T(role.displayName() ) %></div>
|
||||
<div class="tab active" data-id="<%= role.id %>"><%- @T(role.displayName() ) %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="table-overview"></div>
|
||||
</div>
|
|
@ -438,6 +438,15 @@ textarea,
|
|||
border-radius: 3px;
|
||||
transition: none;
|
||||
box-shadow: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
input[type=text]:focus,
|
||||
input[type=password]:focus,
|
||||
input[type=email]:focus,
|
||||
textarea:focus {
|
||||
border-color: hsl(200,71%,59%);
|
||||
box-shadow: 0 0 0 3px hsl(201,62%,90%);
|
||||
}
|
||||
|
||||
.form-control:focus,
|
||||
|
@ -624,8 +633,8 @@ ol.tabs li {
|
|||
}
|
||||
|
||||
.tab {
|
||||
height: 39px;
|
||||
padding: 9px;
|
||||
height: 40px;
|
||||
padding: 10px 20px;
|
||||
text-align: center;
|
||||
border-right: 1px solid rgba(0,8,14,.08);
|
||||
cursor: pointer;
|
||||
|
@ -3447,6 +3456,23 @@ footer {
|
|||
[contenteditable] > .placeholder {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.userSearch {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.userSearch-label {
|
||||
margin: 0 10px 0 20px;
|
||||
}
|
||||
|
||||
.userSearch .tab:not(.active) {
|
||||
background: white;
|
||||
}
|
||||
|
||||
.userSearch .tabs {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
----------------
|
||||
|
|
Loading…
Reference in a new issue