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

This commit is contained in:
Martin Edenhofer 2015-05-27 18:43:35 +02:00
commit 495868dff8
8 changed files with 40 additions and 28 deletions

View file

@ -158,6 +158,8 @@ class App.ControllerTable extends App.Controller
headerFound = true headerFound = true
header.push attribute header.push attribute
console.log(header)
# execute header callback # execute header callback
if data.callbackHeader if data.callbackHeader
header = data.callbackHeader(header) header = data.callbackHeader(header)

View file

@ -169,7 +169,7 @@ class App.Navigation extends App.Controller
id: ticket.id id: ticket.id
class: "level-1 ticket-popover" class: "level-1 ticket-popover"
url: ticket.uiUrl() url: ticket.uiUrl()
iconClass: ticket.icon() iconClass: "priority"
area.result.push data area.result.push data
else if area.name is 'User' else if area.name is 'User'
area.result = [] area.result = []

View file

@ -17,8 +17,8 @@ class App.Organization extends App.Model
uiUrl: -> uiUrl: ->
'#organization/profile/' + @id '#organization/profile/' + @id
icon: (user) -> icon: ->
"organization" '<svg class="icon-organization"><use xlink:href="#icon-organization" /></svg>'
@_fillUp: (data) -> @_fillUp: (data) ->

View file

@ -28,7 +28,7 @@ class App.Ticket extends App.Model
uiUrl: -> uiUrl: ->
'#ticket/zoom/' + @id '#ticket/zoom/' + @id
level: (user) -> level: ->
state = App.TicketState.find( @state_id ) state = App.TicketState.find( @state_id )
stateType = App.TicketStateType.find( state.state_type_id ) stateType = App.TicketStateType.find( state.state_type_id )
level = 1 level = 1
@ -38,13 +38,13 @@ class App.Ticket extends App.Model
level = 3 level = 3
level level
icon: (user) -> icon: ->
"priority" "icon-priority level-#{ @level() }"
iconTitle: (user) -> iconTitle: ->
App.TicketState.find( @state_id ).displayName() App.TicketState.find( @state_id ).displayName()
iconTextClass: (user) -> iconTextClass: ->
"level-#{ @level() }" "level-#{ @level() }"
iconActivity: (user) -> iconActivity: (user) ->

View file

@ -33,8 +33,8 @@ class App.User extends App.Model
uiUrl: -> uiUrl: ->
'#user/profile/' + @id '#user/profile/' + @id
icon: (user) -> icon: ->
"user" '<svg class="icon-user"><use xlink:href="#icon-user" /></svg>'
initials: -> initials: ->
if @firstname && @lastname && @firstname[0] && @lastname[0] if @firstname && @lastname && @firstname[0] && @lastname[0]

View file

@ -37,7 +37,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% position++ %> <% position++ %>
<tr class="item <% if object.active is false: %>not-active<% end %>" data-id="<%= object.id %>" data-position="<%= position %>" > <tr class="item<% if object.active is false: %> is-inactive<% end %>" data-id="<%= object.id %>" data-position="<%= position %>" >
<% if @checkbox: %> <% if @checkbox: %>
<td class="no-padding"> <td class="no-padding">
<label class="input-replacement"> <label class="input-replacement">
@ -72,11 +72,21 @@
<% end %> <% end %>
<td <% if item.parentClass: %>class="<%= item.parentClass %>"<% end %>> <td <% if item.parentClass: %>class="<%= item.parentClass %>"<% end %>>
<% if item.name is 'icon': %>
<svg class="<%- item.class %>">
<use xlink:href="#icon-priority" />
</svg>
<% else: %>
<% if item.link: %>
<a href="<%- item.link %>" <% if item.target: %>target="<%= item.target %>"<% end %>>
<% end %>
<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>
<% if item.link: %><a href="<%- item.link %>" <% if item.target: %>target="<%= item.target %>"<% end %>><% end %>
<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>
<% if item.link: %></a><% end %> <% if item.link: %></a><% end %>
<% end %>
</td> </td>
<% end %> <% end %>
<% if @destroy: %> <% if @destroy: %>

View file

@ -918,16 +918,6 @@ a {
color: #337ab7; color: #337ab7;
text-decoration: none; text-decoration: none;
} }
a:hover,
a:focus {
color: #23527c;
text-decoration: underline;
}
a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
figure { figure {
margin: 0; margin: 0;
} }

View file

@ -517,6 +517,11 @@ table {
fill: hsl(240,1%,77%); fill: hsl(240,1%,77%);
} }
.table .icon-priority {
vertical-align: middle;
margin-top: -3px;
}
.input-replacement { .input-replacement {
padding: 0; padding: 0;
margin: 0; margin: 0;
@ -1721,21 +1726,24 @@ footer {
.level-1.is-active { .level-1.is-active {
background-color: #38ae6a; background-color: #38ae6a;
} }
.level-1 .priority-icon { .level-1 .priority-icon,
.level-1.icon-priority {
fill: #38ae6a; fill: #38ae6a;
} }
.level-2.is-active { .level-2.is-active {
background-color: #f35910; background-color: #f35910;
} }
.level-2 .priority-icon { .level-2 .priority-icon,
.level-2.icon-priority {
fill: #f35910; fill: #f35910;
} }
.level-3.is-active { .level-3.is-active {
background-color: #faab00; background-color: #faab00;
} }
.level-3 .priority-icon { .level-3 .priority-icon,
.level-3.icon-priority {
fill: #faab00; fill: #faab00;
} }
@ -2182,6 +2190,7 @@ footer {
border-radius: 0; border-radius: 0;
border: none; border: none;
z-index: 1110; z-index: 1110;
color: hsl(206,7%,28%);
box-shadow: 0 1px 14px rgba(0,8,14,.25); box-shadow: 0 1px 14px rgba(0,8,14,.25);
word-wrap: break-word; word-wrap: break-word;
} }
@ -2804,6 +2813,7 @@ footer {
} }
.article-content { .article-content {
color: hsl(60,1%,34%);
position: relative; position: relative;
padding: 0 55px; padding: 0 55px;
} }