helpdesk 0.0.33 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48373a459e577552fd36a0b6f2deaedfa1bdf7be
-  data.tar.gz: 350db9f237728a1ca2558c9171fc1e1a23fc9595
+  metadata.gz: 12c0e66f13ed7814e3f3566881e301eee568ce6e
+  data.tar.gz: 4de4f2e1c8f6075ffccb749f4e051a36a95f7ce6
 SHA512:
-  metadata.gz: 05288f0b29bab44078a9ad5b0bb9554dc9006c49cf431b1428a7699088e88650c9251dc4772f9541ca3f44c59a59a53566fa366001912b091fbedb81dfec5d31
-  data.tar.gz: d5e44cf9927b50d8142bcc576394a0e8c8c320cb478447ad418eb9875448486ae7950eaa683de84e0dfa4f3679252c424b6fc49ef3c3b1e9484bcf5f6eb45158
+  metadata.gz: d2e885773eed59eda943a75aeefe988047304b14bbe08b59b4e041f7fe4920145443abbd84eea865516e9f134a6af8ec749122fd81a7348b0be169d6e7c82de1
+  data.tar.gz: 84c9e330b42748d87b5714c3017a2aa4577079c5cd729366141f7a1d2295b4579bc7e68f207cc3f79f59abe5675886bcafb651ad1f8a7e4335952b8795dc4b47

data/app/assets/javascripts/helpdesk/admin/tickets.js

@@ -1,6 +1,12 @@
 // Place all the behaviors and hooks related to the matching controller here.
+
 // All this logic will automatically be available in application.js.
 
+$(document).ready(function(){
+    $('a[href*="#"]').click(function(){
+        $($(this).attr("href")).effect("highlight", {}, 1500);
+    });
+});
 
 
 (function() {

data/app/assets/javascripts/helpdesk/ckeditor.js

@@ -1,11 +1,61 @@
-CKEDITOR.config.toolbar_mini =
-    [
-        ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-        ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-        ['NumberedList','BulletedList','-','Outdent','Indent'],
-        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-        ['Link','Unlink'],
-        ['Image','Table','HorizontalRule'],
-        ['Styles','Format','Font','FontSize'],
-        ['TextColor','BGColor']
-    ];
+
+CKEDITOR.config.toolbar = [
+  { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source', '-', 'Save', 'NewPage', 'Preview', 'Print', '-', 'Templates' ] },
+  { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+  { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
+  { name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
+  '/',
+  { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
+  { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl', 'Language' ] },
+  { name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
+  { name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak', 'Iframe' ] },
+  '/',
+  { name: 'styles', items: [ 'Format', 'Font', 'FontSize' ] },
+  { name: 'colors', items: [ 'TextColor'] },
+  { name: 'tools', items: [ 'Maximize', 'ShowBlocks' ] },
+  { name: 'others', items: [ '-' ] },
+  { name: 'about', items: [ 'About' ] }
+];
+
+CKEDITOR.config.allowedContent = true;
+
+/* Filebrowser routes */
+// The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+CKEDITOR.config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
+
+// The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
+CKEDITOR.config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
+
+// The location of a script that handles file uploads in the Flash dialog.
+CKEDITOR.config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
+
+// The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog
+CKEDITOR.config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
+
+// The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
+CKEDITOR.config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
+
+// The location of a script that handles file uploads in the Image dialog.
+CKEDITOR.config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+
+// The location of a script that handles file uploads.
+CKEDITOR.config.filebrowserUploadUrl = "/ckeditor/attachment_files";
+
+CKEDITOR.config.toolbarGroups = [
+{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
+{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
+//{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ] },
+{ name: 'tools' },
+{ name: 'about' },
+'/',
+{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align' ] }, // , 'bidi'
+//{ name: 'forms' },
+'/',
+{ name: 'styles' },
+{ name: 'colors' },
+{ name: 'links' },
+{ name: 'insert' },
+{ name: 'others' }
+];
+

data/app/assets/stylesheets/helpdesk/admin.css.scss

@@ -3,6 +3,7 @@
  *= require select2
  *= require helpdesk/admin/tickets
  *= require_self
+ *= require_tree ./admin
 */
 @import "bootstrap-sprockets";
 @import "bootstrap";

data/app/assets/stylesheets/helpdesk/admin/tickets.css

@@ -17,14 +17,6 @@
   margin-left: 100px;
 }
 
-:target {
-    background-color: #ffa;
-    -webkit-transition: background-color 1s linear;
-    -moz-transition: background-color 1s linear;
-    -o-transition: background-color 1s linear;
-    transition: background-color 1s linear;
-}
-
 a.anchor{
   opacity: 0;
   -moz-transition: opacity .25s linear, visibility .1s linear .5s;

data/app/assets/stylesheets/helpdesk/tickets.css.sass

@@ -1,3 +1,7 @@
+form
+  .checkbox
+    input[type="checkbox"]
+      margin: 4px 5px 0px 0px
 
 body
   div.panel-body

data/app/controllers/helpdesk/admin/base_controller.rb

@@ -4,6 +4,7 @@ module Helpdesk
 
       helper Helpdesk::Engine.helpers
       # helper Helpdesk::ApplicationHelper
+      before_filter :ensure_user
       before_filter :authenticate_helpdesk_admin
       before_filter :my_tickets
 

data/app/controllers/helpdesk/admin/faqs_controller.rb

@@ -47,7 +47,10 @@ class Helpdesk::Admin::FaqsController < Helpdesk::Admin::BaseController
   # GET /faqs/new
   # GET /faqs/new.json
   def new
-    @faq = Helpdesk::Faq.new
+    @faq = Helpdesk::Faq.active.new
+    if params[:faq] && params[:faq][:parent_id]
+      @faq.parent_id = params[:faq][:parent_id]
+    end
 
     respond_to do |format|
       format.html # new.html.erb

data/app/controllers/helpdesk/tickets_controller.rb

@@ -1,6 +1,7 @@
 module Helpdesk
   class TicketsController < Helpdesk::ApplicationController
 
+    before_filter :ensure_user
     helper TicketsHelper
 
     # GET /tickets

data/app/models/helpdesk/faq.rb

@@ -15,7 +15,15 @@ module Helpdesk
     end
 
     def to_param
-      id ? "#{id}-#{title.parameterize}" : nil
+      id ? "#{id}-#{nname}" : nil
+    end
+
+    def nname
+      if parent
+        "#{parent.nname}--#{title.parameterize}"
+      else
+        "#{title.parameterize}"
+      end
     end
 
     def self.search(query, page=1)

data/app/views/helpdesk/admin/faqs/_faq.html.haml

@@ -4,6 +4,7 @@
     %div
       = link_to t('helpdesk.show'), faqs_path(anchor:faq.to_param), class: 'btn btn-info btn-xs', target: :faq_preview
       = link_to t('helpdesk.edit'), edit_admin_faq_path(faq),class: 'btn btn-primary btn-xs'
+      = link_to t('helpdesk.add'), new_admin_faq_path(faq:{parent_id:faq.id}),class: 'btn btn-success btn-xs'
       = link_to t('helpdesk.destroy'), admin_faq_path(faq), method: :delete, data: { confirm: 'Are you sure?' },class: 'btn btn-danger btn-xs'
     - if faq.children.present?
       %ol

data/app/views/helpdesk/admin/faqs/_form.html.haml

@@ -1,21 +1,21 @@
-= simple_form_for [:admin,@faq],:html => {:novalidate => true} do |f|
-  - if @faq.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@faq.errors.count, "error")} prohibited this faq from being saved:"
-      %ul
-        - @faq.errors.full_messages.each do |msg|
-          %li= msg
-  = f.input :active
-  = f.input :parent_id, collection: Helpdesk::Faq.collection,label_method: :name_with_depth
+= simple_form_for [:admin,@faq],html: {novalidate: true} do |f|
+  .form-inputs
+    - if @faq.errors.any?
+      #error_explanation
+        %h2= "#{pluralize(@faq.errors.count, "error")} prohibited this faq from being saved:"
+        %ul
+          - @faq.errors.full_messages.each do |msg|
+            %li= msg
+    = f.input :active, wrapper: :inline_checkbox
+    = f.input :parent_id, collection: Helpdesk::Faq.collection,label_method: :name_with_depth
 
+    - I18n.available_locales.each do |locale|
+      %h1
+        = locale
+      = f.globalize_fields_for locale do |g|
+        = g.input :title
+        = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:width=>'100%',:height => 200,:toolbar => 'Full'} }
 
-
-  - I18n.available_locales.each do |locale|
-    %h1
-      = locale
-    = f.globalize_fields_for locale do |g|
-      = g.input :title
-      = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:width=>'100%',:height => 200,:toolbar => 'Full'} }
-
-
-  = f.submit 'Save', :class=>'btn btn-primary'
+  .form-actions
+    = f.submit 'Save', class:'btn btn-primary'
+    = link_to 'Back', admin_faqs_path,class: 'btn btn-default'

data/app/views/helpdesk/admin/faqs/edit.html.haml

@@ -1,11 +1,6 @@
 = render 'menu'
 
-
 - content_for :title do
   Edycja pytania
 
 = render 'form'
-
-= link_to 'Show', [:admin,@faq]
-\|
-= link_to 'Back', admin_faqs_path

data/app/views/helpdesk/admin/faqs/new.html.haml

@@ -4,4 +4,3 @@
 
 = render 'form'
 
-= link_to 'Back', admin_faqs_path

data/app/views/helpdesk/faqs/_faq.html.haml

@@ -1,8 +1,8 @@
 - faqs.each do |faq|
   %li{:id=>faq.to_param}
     %h3
-      = link_to faq.title, faqs_path(anchor:faq)
+      = link_to faq.title, link_type=='anchor' ? faq.anchor : faqs_path(anchor:faq)
     = raw faq.text
     - if faq.children.present?
       %ul
-        = render partial:'/helpdesk/faqs/faq', locals:{ faqs:faq.children }
+        = render partial:'/helpdesk/faqs/faq', locals:{ faqs:faq.children,link_type:link_type}

data/app/views/helpdesk/faqs/index.html.haml

@@ -4,8 +4,8 @@
       = render partial: 'menu', locals:{faqs:@faqs,link_type:'anchor'}
 
 %div.content
-  %div.pageContainer
+  %div#pageContainer
     %h2
       = t('helpdesk.faqs.title_s')
     %ul#faq
-      = render partial:'/helpdesk/faqs/faq', locals:{faqs:@faqs}
+      = render partial:'/helpdesk/faqs/faq', locals:{faqs:@faqs,link_type:'anchor'}

data/app/views/layouts/helpdesk/_topuser.html.haml

@@ -6,28 +6,34 @@
       %span.icon-bar
       %span.icon-bar
     =link_to Helpdesk.site_address, main_app.root_path, :class=>'navbar-brand', :title => Helpdesk.site_address
-    =link_to Helpdesk.name, root_path, :class=>'navbar-brand', :title => Helpdesk.name
+    =link_to Helpdesk.helpdesk_name, root_path, :class=>'navbar-brand', :title => Helpdesk.helpdesk_name
   #bs-navbar-collapse-1.collapse.navbar-collapse.in
     %ul.nav.navbar-nav
-      = menu_li t('helpdesk.tickets.title'),tickets_path
-      = menu_li t('helpdesk.faq'),faqs_path
-    %form.navbar-form.navbar-left{role:'search',action:search_faqs_url}
-      .form-group
-        %input.form-control{type:'text', placeholder:t('helpdesk.faqs.search_in_faqs'),name:'search',value:params[:search]}
-        %button.btn.btn-default{type:"submit"}
-          = t('helpdesk.faqs.search')
+      = menu_li t('helpdesk.tickets.title'),tickets_path if Helpdesk.menu_items.include?('ticekts')
+      = menu_li t('helpdesk.faqs.title'),faqs_path  if Helpdesk.menu_items.include?('faqs')
+      = menu_li t('helpdesk.subscribers.title'),subscribers_path  if Helpdesk.menu_items.include?('subscribers')
+    - if Helpdesk.menu_items.include?('search')
+      %form.navbar-form.navbar-left{role:'search',action:search_faqs_url}
+        .form-group
+          %input.form-control{type:'text', placeholder:t('helpdesk.faqs.search_in_faqs'),name:'search',value:params[:search]}
+          %button.btn.btn-default{type:"submit"}
+            = t('helpdesk.faqs.search')
+
     %ul.nav.navbar-nav.navbar-right
-      %li.dropdown.user
-        = link_to current_user.send(Helpdesk.display_user.to_sym), "#",:class=>"dropdown-toggle",data:{toggle:"dropdown"}
-        %ul.dropdown-menu
-          %li=link_to 'Home',main_app.root_path
-          %li=link_to t('users.sign_out'),main_app.destroy_user_session_path, :method => :delete, :class => 'icon exit blue'
-
-      %li.dropdown
-        = link_to t('helpdesk.lang'),"#",:class=>"dropdown-toggle",data:{toggle:"dropdown"}
-        %ul.dropdown-menu
-          %li= link_to "English", params.merge({:locale => :en})
-          %li= link_to "Polski", params.merge({:locale => :pl})
+      - if Helpdesk.menu_items.include?('user')
+        - if helpdesk_user
+          %li.dropdown.user
+            = link_to helpdesk_user.send(Helpdesk.display_user.to_sym), "#",:class=>"dropdown-toggle",data:{toggle:"dropdown"}
+            %ul.dropdown-menu
+              %li=link_to 'Home',main_app.root_path
+              %li=link_to t('users.sign_out'),main_app.destroy_user_session_path, :method => :delete, :class => 'icon exit blue'
+
+      - if Helpdesk.menu_items.include?('language')
+        %li.dropdown
+          = link_to t('helpdesk.lang'),"#",:class=>"dropdown-toggle",data:{toggle:"dropdown"}
+          %ul.dropdown-menu
+            %li= link_to "English", params.merge({:locale => :en})
+            %li= link_to "Polski", params.merge({:locale => :pl})
 
 
 

data/config/initializers/simple_form.rb

@@ -94,19 +94,16 @@ SimpleForm.setup do |config|
     end
   end
 
-  config.wrappers :checkbox, tag: :div, class: "checkbox", error_class: "has-error" do |b|
-
-    # Form extensions
+  config.wrappers :inline_checkbox, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
     b.use :html5
-
-    # Form components
-    b.wrapper tag: :label do |ba|
-      ba.use :input
-      ba.use :label_text
+    b.wrapper :tag => 'div', :class => 'controls' do |ba|
+      ba.wrapper :tag => 'label', :class => 'checkbox' do |bb|
+        bb.use :label_text
+        bb.use :input
+      end
+      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
     end
-
-    b.use :hint,  wrap_with: { tag: :p, class: "help-block" }
-    b.use :error, wrap_with: { tag: :span, class: "help-block text-danger" }
   end
 
   # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.

data/config/locales/helpdesk.pl.yml

@@ -55,7 +55,7 @@ pl:
     dashboard: Dashboard
 
     subscribers:
-      title: Subskrybenci
+      title: Subskrybcja
       confirmed: Potwierdzeni subskrynenci
       unconfirmed: Niepotwierdzeni
       all: Wszyscy subskrybenci

data/lib/generators/helpdesk/templates/helpdesk.rb

@@ -34,4 +34,7 @@ require 'helpdesk'
   # Helpdesk root controller for users: faqs or tickets
   config.root_controller = 'faqs'
 
+  # Helpdesk user top menu item
+  config.menu_items = ['app_root','helpdesk_root','tickets','faqs','subscribers','search','user','language']
+
 end

data/lib/helpdesk.rb

@@ -29,6 +29,9 @@ module Helpdesk
   mattr_accessor :root_controller
   @@root_controller = "faqs"
 
+  mattr_accessor :menu_items
+  @@menu_items = ['app_root','helpdesk_root','tickets','faqs','subscribers','search','user','language']
+
   def self.setup
     yield self
   end

data/lib/helpdesk/engine.rb

@@ -17,7 +17,7 @@ module Helpdesk
     isolate_namespace Helpdesk
 
     initializer "Helpdesk precompile hook" do |app|
-      app.config.assets.precompile += ['helpdesk/admin.css','helpdesk/application.css','helpdesk/application.js']
+      app.config.assets.precompile += ['helpdesk/admin.css','helpdesk/application.css','helpdesk/custom.css','helpdesk/application.js']
     end
 
     config.to_prepare do

data/lib/helpdesk/version.rb

@@ -1,3 +1,3 @@
 module Helpdesk
-  VERSION = "0.0.33"
+  VERSION = "0.0.35"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpdesk
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.35
 platform: ruby
 authors:
 - John Beynon Wacław Łuczak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -395,9 +395,9 @@ files:
 - app/assets/stylesheets/helpdesk/admin/dashboard.css
 - app/assets/stylesheets/helpdesk/admin/tickets.css
 - app/assets/stylesheets/helpdesk/application.css
+- app/assets/stylesheets/helpdesk/custom.css
 - app/assets/stylesheets/helpdesk/dashboard.css
 - app/assets/stylesheets/helpdesk/faqs.css.scss
-- app/assets/stylesheets/helpdesk/subscribers.css.scss
 - app/assets/stylesheets/helpdesk/tickets.css.sass
 - app/controllers/helpdesk/admin/base_controller.rb
 - app/controllers/helpdesk/admin/dashboard_controller.rb