diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index 55c753ccf..89f87ead2 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -111,7 +111,11 @@ class App.Controller extends Spine.Controller App.Event.trigger 'notifyDesktop', data # add @navupdate methode to update navigation - navupdate: (url) -> + navupdate: (url, force = false) -> + + # ignore navupdate untill #clues are gone + return if !force && window.location.hash is '#clues' + App.Event.trigger 'navupdate', url # show navigation diff --git a/app/assets/javascripts/app/controllers/_dashboard/first_steps.coffee b/app/assets/javascripts/app/controllers/_dashboard/first_steps.coffee new file mode 100644 index 000000000..92cd98b55 --- /dev/null +++ b/app/assets/javascripts/app/controllers/_dashboard/first_steps.coffee @@ -0,0 +1,33 @@ +class App.DashboardFirstSteps extends App.Controller + events: + 'click a': 'scrollIntoView' + + constructor: -> + super + + @load() + + load: => + + @ajax( + id: 'first_steps' + type: 'GET' + url: @apiPath + '/first_steps' + success: (data) => + @render(data) + ) + + render: (data) -> + @html App.view('dashboard/first_steps')( + data: data + ) + + scrollIntoView: (e) -> + href = $(e.currentTarget).attr('href') + return if !href + return if href is '#' + delay = -> + element = $("[href='#{href}']").get(0) + return if !element + element.scrollIntoView() + @delay(delay, 20) diff --git a/app/assets/javascripts/app/controllers/clues.coffee b/app/assets/javascripts/app/controllers/clues.coffee new file mode 100644 index 000000000..48c31fd25 --- /dev/null +++ b/app/assets/javascripts/app/controllers/clues.coffee @@ -0,0 +1,21 @@ +class Index extends App.Controller + constructor: -> + super + @navupdate '#', true + @clues() + + clues: => + new App.FirstStepsClues( + el: @el + onComplete: => + @ajax( + id: 'preferences' + type: 'PUT' + url: @apiPath + '/users/preferences' + data: JSON.stringify({user:{intro:true}}) + processData: true + ) + @navigate '#' + ) + +App.Config.set( 'clues', Index, 'Routes' ) diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee index 4152ecc58..bae51c7a3 100644 --- a/app/assets/javascripts/app/controllers/dashboard.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.coffee @@ -23,23 +23,30 @@ class App.Dashboard extends App.Controller render: -> - @html App.view('dashboard')( + localEl = $( App.view('dashboard')( head: 'Dashboard' isAdmin: @isRole('Admin') - ) + ) ) new App.DashboardStats( - el: @$('.stat-widgets') + el: localEl.find('.stat-widgets') ) new App.DashboardActivityStream( - el: @$('.sidebar') + el: localEl.find('.sidebar') limit: 25 ) + new App.DashboardFirstSteps( + el: localEl.find('.first-steps-widgets') + ) + + @html localEl + mayBeClues: => return if !@clueAccess return if !@activeState + return if @Config.get('switch_back_to_possible') preferences = @Session.get('preferences') @clueAccess = false return if preferences['intro'] @@ -49,17 +56,7 @@ class App.Dashboard extends App.Controller @clueAccess = false if e e.preventDefault() - new App.FirstStepsClues( - el: @el - onComplete: => - @ajax( - id: 'preferences' - type: 'PUT' - url: @apiPath + '/users/preferences' - data: JSON.stringify({user:{intro:true}}) - processData: true - ) - ) + @navigate '#clues' active: (state) => @activeState = state diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index 2757b71cf..4020add13 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -3,69 +3,8 @@
<%- @T('My Stats') %>
<%- @T('First Steps') %>
- - - +
-

<%- @T('Activity Stream') %>

diff --git a/app/assets/javascripts/app/views/dashboard/first_steps.jst.eco b/app/assets/javascripts/app/views/dashboard/first_steps.jst.eco new file mode 100644 index 000000000..1ca2b393f --- /dev/null +++ b/app/assets/javascripts/app/views/dashboard/first_steps.jst.eco @@ -0,0 +1,15 @@ +
+ <% for area in @data: %> +

<%- @T(area.name) %>

+ <% for item in area.items: %> + + <% if item.checked: %> + <%- @Icon('checkmark') %> + <% else: %> + <%- @Icon('small-dot') %> + <% end %> + <%- @T(item.name) %> + + <% end %> + <% end %> +
\ No newline at end of file diff --git a/app/controllers/first_steps_controller.rb b/app/controllers/first_steps_controller.rb new file mode 100644 index 000000000..9a5c12af4 --- /dev/null +++ b/app/controllers/first_steps_controller.rb @@ -0,0 +1,166 @@ +# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ + +class FirstStepsController < ApplicationController + before_action :authentication_check + + def index + result = [] + if !current_user.role?(%w(Agent Admin)) + render json: result + return + end + + invite_agents = false + #if User.of_role('Agent').count > 2 + # invite_agents = true + #end + invite_customers = false + #if User.of_role('Customer').count > 2 + # invite_customers = true + #end + + chat_active = false + if Setting.get('chat') + chat_active = true + end + from_active = false + if Setting.get('form_ticket_create') + from_active = true + end + twitter_active = false + if Channel.where(area: 'Twitter::Account').count > 0 + twitter_active = true + end + facebook_active = false + if Channel.where(area: 'Facebook::Account').count > 0 + facebook_active = true + end + email_active = false + if Channel.where(area: 'Email::Account').count > 0 + email_active = true + end + text_module_active = false + if TextModule.count > 0 + text_module_active = true + end + macro_active = false + if Macro.count > 1 + macro_active = true + end + + if current_user.role?('Admin') + + result = [ + { + name: 'Configuration', + items: [ + { + name: 'Branding', + checked: true, + location: '#settings/branding', + }, + { + name: 'Your Email Configuration', + checked: email_active, + location: '#channels/email', + }, + { + name: 'Invite Agents/Colleges to help working on Tickets', + checked: invite_agents, + location: '#invite_agent', + }, + { + name: 'Invite Customers to create issues in Zammad', + checked: invite_customers, + location: '#invite_customer', + }, + ], + }, + { + name: 'How to use it', + items: [ + { + name: 'Intro', + checked: true, + location: '#clues', + }, + { + name: 'Create a Test Ticket', + checked: false, + location: '#create_test_ticket', + }, + { + name: 'Create Overviews', + checked: false, + location: '#manage/overviews', + }, + { + name: 'Create Text Modues', + checked: text_module_active, + location: '#manage/text_modules', + }, + { + name: 'Create Macros', + checked: macro_active, + location: '#manage/macros', + }, + ], + }, + { + name: 'Additionals Channels', + items: [ + { + name: 'Twitter', + checked: twitter_active, + location: '#channels/twitter', + }, + { + name: 'Facebook', + checked: facebook_active, + location: '#channels/facebook', + }, + { + name: 'Chat', + checked: chat_active, + location: '#channels/chat', + }, + { + name: 'Online Forms', + checked: from_active, + location: '#channels/form', + }, + ], + }, + ] + + render json: result + return + end + + result = [ + { + name: 'How to use it', + items: [ + { + name: 'Intro', + checked: true, + location: '#clues', + }, + { + name: 'Create a Test Ticket', + checked: false, + location: '#create_test_ticket', + }, + { + name: 'Invite Customers to create issues in Zammad', + checked: invite_customers, + location: '#invite_customer', + }, + ], + }, + ] + + render json: result + end + +end diff --git a/config/routes/first_steps.rb b/config/routes/first_steps.rb new file mode 100644 index 000000000..77015674c --- /dev/null +++ b/config/routes/first_steps.rb @@ -0,0 +1,6 @@ +Zammad::Application.routes.draw do + api_path = Rails.configuration.api_path + + match api_path + '/first_steps', to: 'first_steps#index', via: :get + +end