diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 03f3851c9..83e07e538 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1580,6 +1580,7 @@ class mergeCustomerRef extends App.ControllerContent @html App.view('layout_ref/merge_customer_view') new App.ControllerModal + large: true head: "Merge #{@mergeSource.firstname} #{@mergeSource.lastname}" content: App.view('layout_ref/merge_customer')() button: 'Merge' diff --git a/app/assets/javascripts/app/models/user.js.coffee b/app/assets/javascripts/app/models/user.js.coffee index 14d0ea475..1a883452a 100644 --- a/app/assets/javascripts/app/models/user.js.coffee +++ b/app/assets/javascripts/app/models/user.js.coffee @@ -62,10 +62,13 @@ class App.User extends App.Model if !@image || @image is 'none' || unique return @uniqueAvatar(size, placement, cssClass, avatar) else - if @vip - cssClass += " vip" image = @imageUrl() - "" + + # TODO: don't show vip when its the avatar of the logged-in user + if @vip + return "" + else + return "" uniqueAvatar: (size, placement = '', cssClass = '', avatar) -> width = 300 @@ -83,8 +86,9 @@ class App.User extends App.Model data = "data-avatar-id=\"#{avatar.id}\"" if @vip - cssClass += " vip" - "#{ @initials() }" + return "#{ @initials() }" + else + return "#{ @initials() }" imageUrl: -> return if !@image diff --git a/app/assets/javascripts/app/views/calendar/new.jst.eco b/app/assets/javascripts/app/views/calendar/new.jst.eco index 65755f9b1..92e5a05c9 100644 --- a/app/assets/javascripts/app/views/calendar/new.jst.eco +++ b/app/assets/javascripts/app/views/calendar/new.jst.eco @@ -661,34 +661,71 @@
- - +
+ + + + - - +
<%- @T('Active') %> <%- @T('Date') %> <%- @T('Description') %> <%- @T('Action') %>
+ <%- @Tdate('2015-12-24') %> Some Description - <%- @Icon('diagonal-cross') %> + +
+
+ <%- @Icon('trash') %> <%- @T('Remove') %> +
+
+ <%- @Tdate('2015-12-25') %> Some Description - <%- @Icon('diagonal-cross') %> + +
+
+ <%- @Icon('trash') %> <%- @T('Remove') %> +
+
+ <%- @Tdate('2015-12-26') %> Some Description - ICON FOR ENABLE? -
<%- @T('Add manual hollidays') %>: -
- - <%- @Icon('plus') %> - + +
+
+ <%- @Icon('trash') %> <%- @T('Remove') %> +
+
+
+ + + + + + +
+ <%- @Icon('plus-small') %> Add Date +
diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index 3d73202cb..bce56fd7a 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -3,8 +3,8 @@ <% if @checkbox: %> -