Moved to new search style and implemented switch to user button.
This commit is contained in:
parent
238cc7edd4
commit
73242cd4b8
6 changed files with 27 additions and 17 deletions
|
@ -55,6 +55,7 @@ class App.ControllerTable extends App.Controller
|
|||
groupBy: 'group'
|
||||
checkbox: false
|
||||
radio: false
|
||||
class: 'some-css-class'
|
||||
bindRow:
|
||||
events:
|
||||
'click': rowClick
|
||||
|
@ -170,6 +171,7 @@ class App.ControllerTable extends App.Controller
|
|||
checkbox: data.checkbox
|
||||
radio: data.radio
|
||||
groupBy: data.groupBy
|
||||
class: data.class
|
||||
destroy: destroy
|
||||
callbacks: data.callbackAttributes
|
||||
)
|
||||
|
|
|
@ -48,16 +48,19 @@ class Index extends App.Controller
|
|||
callbackHeader = (header) ->
|
||||
attribute =
|
||||
name: 'switch_to'
|
||||
display: 'Switch to'
|
||||
display: 'Action'
|
||||
translation: true
|
||||
header.push attribute
|
||||
header
|
||||
|
||||
callbackAttributes = (value, object, attribute, header, refObject) ->
|
||||
value = ' <svg class="icon-user"><use xlink:href="#icon-user"></use></svg>'
|
||||
attribute.class = ''
|
||||
attribute.link = '#'
|
||||
attribute.title = App.i18n.translateInline('Switch to')
|
||||
text = App.i18n.translateInline('Show as user')
|
||||
value = ' '
|
||||
attribute.raw = ' <span class="btn btn--primary btn--table switchView"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> ' + text + '</span>'
|
||||
attribute.class = ''
|
||||
attribute.parentClass = 'no-padding'
|
||||
attribute.link = ''
|
||||
attribute.title = App.i18n.translateInline('Switch to')
|
||||
value
|
||||
|
||||
switchTo = (id,e) =>
|
||||
|
@ -75,7 +78,7 @@ class Index extends App.Controller
|
|||
@renderResult(user_ids)
|
||||
|
||||
new App.ControllerGenericEdit(
|
||||
id: item.id
|
||||
id: item.id
|
||||
pageData:
|
||||
title: 'Users'
|
||||
home: 'users'
|
||||
|
@ -96,6 +99,7 @@ class Index extends App.Controller
|
|||
el: @$('.table-overview')
|
||||
model: App.User
|
||||
objects: users
|
||||
class: 'user-list'
|
||||
callbackHeader: callbackHeader
|
||||
callbackAttributes:
|
||||
switch_to: [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<table class="table table-hover">
|
||||
<table class="table table-hover <% if @class: %><%- @class %><% end %>">
|
||||
<thead>
|
||||
<tr>
|
||||
<% if @checkbox: %>
|
||||
|
@ -80,11 +80,13 @@
|
|||
<% if item.link: %>
|
||||
<a href="<%- item.link %>" <% if item.target: %>target="<%= item.target %>"<% end %>>
|
||||
<% end %>
|
||||
|
||||
<% if item.raw: %>
|
||||
<%- item.raw %>
|
||||
<% else: %>
|
||||
<span <% if item.class: %>class="<%= item.class %>"<% end %> <% if item.title: %>title="<%= item.title %>"<% end %> <% if item.data: %><% for data_key, data_item of item.data: %>data-<%- data_key %>="<%= data_item %>" <% end %><% end %>>
|
||||
<%- value %>
|
||||
</span>
|
||||
|
||||
<% end %>
|
||||
<% if item.link: %></a><% end %>
|
||||
<% end %>
|
||||
</td>
|
||||
|
|
|
@ -150,7 +150,7 @@
|
|||
|
||||
<th>Lastname</th>
|
||||
|
||||
<th></th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
@ -168,11 +168,11 @@
|
|||
</tr>
|
||||
|
||||
<tr class="item" data-id="6" data-position="3" style="cursor: pointer;">
|
||||
<td><span>hans@huber.com</span></td>
|
||||
<td><span>hans.sebastian.hubermeyerschmidt@huber.com</span></td>
|
||||
|
||||
<td><span>Hans</span></td>
|
||||
<td><span>Hans Sebastian</span></td>
|
||||
|
||||
<td><span>Huber2</span></td>
|
||||
<td><span>Hubermeyerschmidt</span></td>
|
||||
|
||||
<td class="no-padding">
|
||||
<div class="btn btn--primary btn--table switchView"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
|
||||
|
|
|
@ -11,9 +11,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="userSearch vertical center">
|
||||
<input type="text" class="js-search form-control flex" name="search" placeholder="<%- @Ti('Search for users') %>">
|
||||
<div class="searchfield">
|
||||
<svg class="icon icon-magnifier"><use xlink:href="#icon-magnifier" /></svg>
|
||||
<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 horizontal">
|
||||
|
|
|
@ -900,10 +900,10 @@ textarea,
|
|||
.searchfield {
|
||||
position: relative;
|
||||
margin-bottom: 20px;
|
||||
|
||||
|
||||
.icon {
|
||||
left: 9px;
|
||||
top: 6px;
|
||||
top: 7px;
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
position: absolute;
|
||||
|
|
Loading…
Reference in a new issue