helpdesk 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cb3f72d7a03c39c62da16e28615e741fdcd7b62
-  data.tar.gz: b641bf423b7570a5a37b475214e7d554f65b1ab4
+  metadata.gz: 9c4d9893e06be1d15b031e7f6d9173555ab769d4
+  data.tar.gz: b4ac33e3c1c387151fb68470a7d627d440d3adc0
 SHA512:
-  metadata.gz: 9b15157ca00a0e6a97f3284a11148353c68e1df2095e296f57ee0b8c0720db372db89d74353b259aae2d7e0c9adeefa9ec4d3f295227efe479ee07c3cb4df824
-  data.tar.gz: 859e437996426672a8e52db55837e4aeea6562985d51e3a83ca7232e3f756946feb0c74269f6585a4f669e36a99c65ab4d9ba4371b1c7a85585d13e1ce551458
+  metadata.gz: a7161256c228129353ba48bcf13b7de5f4d5fe6e8942473f0bc56484a7b96575b62e3e0cdb5a9f59976e1b9d41062c4bc0e65c081100421c1c8e5a98eb4d0ca5
+  data.tar.gz: e9c027cd5ed06c939516d5f5963963573e67e10bd3729134e425195d038660b4fd128f17fce1e6caa9c60fed53ea50bd98f537c41f4b43519aace308429018e8

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

@@ -3,5 +3,6 @@
  *= require helpdesk/imports
  *= require helpdesk/admin/bootstrap_overrides
  *= require helpdesk/admin/tickets
+ *= require bootstrap
  *= require chosen
 */

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

@@ -8,11 +8,14 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
     elsif params[:tickets] == 'active'
       @tickets = Helpdesk::Ticket.active.scoped
     elsif params[:tickets] == 'all'
-      @tickets = Helpdesk::Ticket.all.scoped
+      @tickets = Helpdesk::Ticket.scoped
     else
       @tickets = my_tickets.active.scoped
     end
-    @tickets = @tickets.page(params[:page])
+    @tickets = @tickets.includes(:requester)
+                        .includes(:assignee)
+                        .includes(:ticket_type)
+                        .page(params[:page])
 
     render 'list'
   end

data/app/controllers/helpdesk/tickets_controller.rb

@@ -4,10 +4,10 @@ module Helpdesk
     # GET /tickets.json
     def index
       if params[:tickets] == 'closed'
-        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).closed
+        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).closed.page(params[:page])
         @tickets_count = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.count
       else
-        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active
+        @tickets = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.page(params[:page])
         @tickets_count = @tickets.size
       end
 

data/app/helpers/helpdesk/helpdesk_helper.rb

@@ -1,11 +1,31 @@
 module Helpdesk
   module HelpdeskHelper
+
+
     def menu_left(title,&block)
-      content_tag(:fieldset) do
-        content_tag(:legend ,title) +
-        content_tag( :ul, class: 'nav nav-list') do
+      panel_menu(title,'default',&block)
+    end
+
+
+    def panel_menu(title,type,&block)
+      content_tag(:div,class: "panel panel-#{type}") do
+        content_tag(:div ,class: 'panel-heading') do
+          content_tag(:h3 ,title,class:'panel-title')
+        end +
+        content_tag( :ul, class: 'nav nav-pills nav-stacked ') do
           capture(&block)
+        end
+      end
+    end
+
 
+    def panel(title,type,&block)
+      content_tag(:div,class: "panel panel-#{type}") do
+        content_tag(:div ,class: 'panel-heading') do
+          content_tag(:h3 ,title,class:'panel-title')
+        end +
+        content_tag( :div, class: 'panel-body') do
+          capture(&block)
         end
       end
     end
@@ -23,8 +43,12 @@ module Helpdesk
       end
     end
 
-    def ico(name,color='black')
-      raw("<i class=\"icon-#{name} icon-#{color}\"></i> ")
+    def badge(num,css='pull-right')
+      raw("<span class=\"badge #{css}\">#{num}</span> ")
+    end
+
+    def ico(name)
+      raw("<i class=\"glyphicon glyphicon-#{name}\"></i> ")
     end
 
     def parent_layout(layout)

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

@@ -7,14 +7,14 @@
           %li= msg
   = f.input :active
 
- 
+
 
   - 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 => {:toolbar => 'Full'} } 
+        = g.input :text, :as => :ckeditor, :input_html => { :ckeditor => {:width=>'100%',:height => 200,:toolbar => 'Full'} }
 
 
   = f.submit 'Save', :class=>'btn btn-primary'

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

@@ -1,14 +1,11 @@
 = render 'menu'
 
-.row
-  .span3
-    %br
-  .span11
 
-    %h1 Edycja pytania
+- content_for :title do
+  Edycja pytania
 
-    = render 'form'
+= render 'form'
 
-    = link_to 'Show', [:admin,@faq]
-    \|
-    = link_to 'Back', admin_faqs_path
+= link_to 'Show', [:admin,@faq]
+\|
+= link_to 'Back', admin_faqs_path

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

@@ -1,6 +1,6 @@
 = render 'menu'
 
-%h1
+- content_for :title do
   -if params[:faqs] && params[:faqs] == 'active'
     = t('helpdesk.faqs.active')
   -elsif params[:faqs] && params[:faqs] == 'inactive'
@@ -27,7 +27,7 @@
             = t('helpdesk.faqs.faq.inactive')
       %div.span5
         = faq.title
-      %div.span2  
+      %div.span2
         = link_to t('helpdesk.show'), admin_faq_path(faq), class: 'btn btn-info btn-mini'
         = link_to t('helpdesk.edit'), edit_admin_faq_path(faq),class: 'btn btn-primary btn-mini'
         = link_to t('helpdesk.destroy'), admin_faq_path(faq), method: :delete, data: { confirm: 'Are you sure?' },class: 'btn btn-danger btn-mini'

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

@@ -1,5 +1,6 @@
 = render 'menu'
-%h1 New faq
+- content_for :title do
+  New faq
 
 = render 'form'
 

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

@@ -1,6 +1,7 @@
 = render 'menu'
 
-%h1 Editing sub
+- content_for :title do
+  Editing sub
 
 = render 'form'
 

data/app/views/helpdesk/admin/subscribers/index.html.haml

@@ -1,6 +1,7 @@
 = render 'menu'
 
-%h1  Subscribers
+- content_for :title do
+  Subscribers
 
 %table.table.table-hover
   %tr
@@ -19,7 +20,7 @@
           = ico('ok')
       %td= subscriber.send Helpdesk.display_user.to_sym
       %td= subscriber.email
-      
+
       %td= subscriber.lang
       %td= I18n::l(subscriber.created_at, :format=>:short)
       / %td= link_to 'Show', admin_subscriber_path(subscriber)

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

@@ -1,4 +1,5 @@
-%h1 New subscriber
+- content_for :title do
+  New subscriber
 
 = render 'form'
 

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

@@ -1,6 +1,7 @@
 = render 'menu'
 
-%h1 Editing ticket_type
+- content_for :title do
+  Editing ticket_type
 
 = render 'form'
 

data/app/views/helpdesk/admin/ticket_types/index.html.haml

@@ -1,6 +1,6 @@
 = render 'menu'
 
-%h1
+- content_for :title do
   -if params[:ticket_types] && params[:ticket_types] == 'active'
     = t('helpdesk.ticket_types.active')
   -elsif params[:ticket_types] && params[:ticket_types] == 'inactive'

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

@@ -1,6 +1,7 @@
 = render 'menu'
 
-%h1 New ticket_type
+- content_for :title do
+  New ticket_type
 
 = render 'form'
 

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

@@ -1,4 +1,4 @@
-= simple_form_for([:admin, @ticket], :html => {:class => 'form-horizontal' }) do |f|
+= simple_form_for([:admin, @ticket]) do |f|
   - if @ticket.errors.any?
     %div.error_explanation
       %h2
@@ -13,11 +13,11 @@
   = f.input :assignee_id, :collection => User.where('helpdesk_admin = ?', true)
   = f.input :ticket_type_id, :collection => Helpdesk::TicketType.active,include_blank: false
   - if @ticket.new_record?
-    = f.input :description
+    = f.input :description,input_html:{rows:4}
   - else
     = simple_format @ticket.description
 
 
   %div.form-actions
-    = f.button :submit, :class => 'btn-primary'
+    = f.button :submit, :class => 'btn btn-primary'
     = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"

data/app/views/helpdesk/admin/tickets/_ticket.html.haml

@@ -20,7 +20,7 @@
           = ticket.assignee.send Helpdesk.display_user_uniq_info.to_sym
         - else
           = t('helpdesk.tickets.not_assigned')
-          = link_to ico('star','white') + t('helpdesk.tickets.assign_me'), assign_admin_ticket_path(ticket),class: 'btn btn-mini btn-info'
+          = link_to ico('star') + t('helpdesk.tickets.assign_me'), assign_admin_ticket_path(ticket),class: 'btn btn-mini btn-info'
     %tr
       %td
         %span.btn.disabled
@@ -33,7 +33,7 @@
               %li.comment{:id=>"comment#{comment.id}"}
                 %div.comment-left
                   - if comment.public
-                    = status_label ico('envelope','white') + t('helpdesk.comments.send') ,'label-success'
+                    = status_label ico('envelope') + t('helpdesk.comments.send') ,'label-success'
                   - else
                     = status_label t('helpdesk.comments.note'),''
                   %br
@@ -41,7 +41,7 @@
                     = "#"
                 %div.comment-header
                   -if comment.author == ticket.requester
-                    = status_label ico('user','white')+ t('helpdesk.comments.author'),'label-info'
+                    = status_label ico('user')+ t('helpdesk.comments.author'),'label-info'
                   = comment.author.send Helpdesk.display_user_uniq_info.to_sym if comment.author
                   %small
                     = time_ago_in_words(comment.created_at)

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

@@ -1,5 +1,5 @@
 = render 'menu'
-%h2
+- content_for :title do
   = t('helpdesk.ticket')
   = "##{@ticket.subject}"
 = render 'form'
@@ -12,7 +12,7 @@
       %li.comment{:id=>"comment#{comment.id}"}
         %div.comment-left
           - if comment.public
-            = status_label ico('envelope','white') + t('helpdesk.comments.send') ,'label-success'
+            = status_label ico('envelope') + t('helpdesk.comments.send') ,'label-success'
           - else
             = status_label t('helpdesk.comments.note'),''
           %br
@@ -20,8 +20,8 @@
             = "#"
         %div.comment-header
           -if comment.author == @ticket.requester
-            = status_label ico('user','white')+ t('helpdesk.comments.author'),'label-info'
-            
+            = status_label ico('user')+ t('helpdesk.comments.author'),'label-info'
+
           = comment.author.send Helpdesk.display_user.to_sym if comment.author
           %small
             = time_ago_in_words(comment.created_at)

data/app/views/helpdesk/admin/tickets/list.html.haml

@@ -1,6 +1,6 @@
 = render 'menu'
 
-%h1
+- content_for :title do
   -if params[:tickets] && params[:tickets] == 'unassigned'
     = t('helpdesk.tickets.unassigned')
   -elsif params[:tickets] && params[:tickets] == 'closed'

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

@@ -1,4 +1,4 @@
 = render 'menu'
-%h1
+- content_for :title do
   = t('helpdesk.new_ticket')
-= render 'form' 
+= render 'form'

data/app/views/helpdesk/admin/tickets/show.html.haml

@@ -7,11 +7,11 @@
     %tr{:class=>@ticket.ticket_type.tr_class}
 
       %td
-        
+
         - unless @ticket.open?
           = t('helpdesk.tickets.ticket_closed')
         -else
-          = simple_form_for([:admin, @ticket], :html => {:class => 'form-horizontal' }) do |f|
+          = simple_form_for([:admin, @ticket]) do |f|
             - if @ticket.errors.any?
               %div.error_explanation
                 %h2
@@ -21,16 +21,16 @@
                     %li
                       = msg
             = f.input :status, :collection => Helpdesk::Ticket::STATUS_OPTIONS, include_blank: false
-            = f.input :assignee_id, :collection => User.where('helpdesk_admin = ?', true) 
-                      
+            = f.input :assignee_id, :collection => User.where('helpdesk_admin = ?', true)
+
 
             = f.simple_fields_for :comments,@ticket.comments.build do |tickets_form|
               - unless tickets_form.object.persisted?
                 = tickets_form.input :comment, :input_html=>{class: 'comment-textarea'}
                 / , :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'mini'},:language => I18n.locale}
 
-                = tickets_form.input :public, :hint => t('helpdesk.tickets.visible_to_autor') 
-                = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id } 
+                = tickets_form.input :public, :hint => t('helpdesk.tickets.visible_to_autor')
+                = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
             %div.form-actions
-              = f.button :submit, :class => 'btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"
+              = f.button :submit, :class => 'btn btn-primary'
+              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"

data/app/views/helpdesk/tickets/_form.html.haml

@@ -13,7 +13,7 @@
     %div.subject
       %input{:value=>@ticket.subject,:name=>"ticket[subject]",:type => "text",:placeholder => t('helpdesk.tickets.subject')}
       %select{:name=>"ticket[ticket_type_id]"}
-        - Helpdesk::TicketType.all.each do |type|
+        - Helpdesk::TicketType.includes(:translations).all.each do |type|
           %option{:value=>type.id, selected: type.id == @ticket.ticket_type_id}
             = type.title
 
@@ -32,5 +32,5 @@
     %div.textRight
       %a#feedbackCancel{:class=>"btn white"}
         Anuluj
-      %input{:type => "submit",:value => 'Wyślij', :class=>"btn"}
+      %input{:type => "submit",:value => 'Wyślij', :class=>"btn btn-primary"}
     %div.clearBoth

data/app/views/helpdesk/tickets/_ticket.html.haml

@@ -31,7 +31,7 @@
               %li.comment{:id=>"comment#{comment.id}"}
                 %div.comment-left
                   - if comment.public
-                    = status_label ico('envelope','white') + t('helpdesk.comments.send') ,'label-success'
+                    = status_label ico('envelope') + t('helpdesk.comments.send') ,'label-success'
                   - else
                     = status_label t('helpdesk.comments.note'),''
                   %br
@@ -39,7 +39,7 @@
                     = "#"
                 %div.comment-header
                   -if comment.author != ticket.requester
-                    = status_label ico('user','white')+ t('helpdesk.comments.helpdesk'),'label-info'
+                    = status_label ico('user')+ t('helpdesk.comments.helpdesk'),'label-info'
 
                   = comment.author.send Helpdesk.display_user.to_sym
                   %small

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

@@ -1,4 +1,4 @@
-%h1
+- content_for :title do
   -if params[:tickets] && params[:tickets] == 'closed'
     = t('helpdesk.tickets.closed')
 
@@ -12,4 +12,5 @@
 - if @tickets.size == 0
   = t('helpdesk.tickets.you_have_no_tickets')
 - @tickets.each do |ticket|
-  = render 'ticket', ticket: ticket, show_button:true
+  = render 'ticket', ticket: ticket, show_button:true
+= paginate @tickets

data/app/views/helpdesk/tickets/new.html.haml

@@ -1,4 +1,4 @@
 = render 'menu'
-%h1
+- content_for :title do
   = t('helpdesk.new_ticket')
-= render 'form' 
+= render 'form'

data/app/views/helpdesk/tickets/show.html.haml

@@ -28,11 +28,11 @@
 
             = f.simple_fields_for :comments,@ticket.comments.build do |tickets_form|
               - unless tickets_form.object.persisted?
-                = tickets_form.input :comment, :input_html=>{class: 'comment-textarea'}
+                = tickets_form.input :comment, :input_html=>{class: 'comment-textarea',rows: 5}
                 / , :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'mini'},:language => I18n.locale}
 
                 = tickets_form.input :public, :input_html => {:value=>1},:as=>:hidden
                 = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
             %div
-              = f.button :submit, :class => 'btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"
+              = f.button :submit, :class => 'btn btn-primary'
+              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-default"

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

@@ -1,22 +1,26 @@
-.navbar
-  .navbar-inner
-    / .container
-    =link_to Helpdesk.site_address, main_app.root_path, :class=>'brand', :title => t('helpdesk.name')
-    =link_to t('helpdesk.name'), admin_root_path, :class=>'brand', :title => t('helpdesk.name')
-    %nav
-      %ul.nav
-        -if helpdesk_admin?
-          = menu_li t('helpdesk.tickets.title'),admin_tickets_path
-          / = menu_li t('helpdesk.ticket_types.title'),admin_ticket_types_path
-          = menu_li t('helpdesk.subscribers.title'),admin_subscribers_path
-          = menu_li t('helpdesk.faqs.title'),admin_faqs_path
+%nav.navbar.navbar-default#site_topmmenu{role: 'navigation'}
+  .navbar-header
+    %button.navbar-toggle{"data-target" => "#bs-navbar-collapse-1", "data-toggle" => "collapse", type: "button"}
+      %span.sr-only Toggle navigation
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
+    =link_to Helpdesk.site_address, main_app.root_path, :class=>'navbar-brand', :title => t('helpdesk.name')
+    =link_to t('helpdesk.name'), admin_root_path, :class=>'navbar-brand', :title => t('helpdesk.name')
+  #bs-navbar-collapse-1.collapse.navbar-collapse.in
+    %ul.nav.navbar-nav
+      -if helpdesk_admin?
+        = menu_li t('helpdesk.tickets.title'),admin_tickets_path
+        / = menu_li t('helpdesk.ticket_types.title'),admin_ticket_types_path
+        = menu_li t('helpdesk.subscribers.title'),admin_subscribers_path
+        = menu_li t('helpdesk.faqs.title'),admin_faqs_path
 
-          %li.dropdown.user(data-dropdown="dropdown")
-            = link_to current_user.display_name, "#",:class=>"dropdown-toggle"
-            %ul.dropdown-menu
-              %li.signout
-                =link_to 'Wróć do aplikacji',main_app.root_path
-                =link_to t('users.sign_out'),main_app.destroy_user_session_path, :method => :delete, :class => 'icon exit blue'
-        -else
-          =menu_li t('users.sign_in'),new_user_session_path, {:class => "power"}
-          =menu_li t('users.sign_up'),new_user_registration_path, {:class => "signup"} 
+        %li.dropdown.user(data-dropdown="dropdown")
+          = link_to current_user.display_name, "#",:class=>"dropdown-toggle"
+          %ul.dropdown-menu
+            %li.signout
+              =link_to 'Wróć do aplikacji',main_app.root_path
+              =link_to t('users.sign_out'),main_app.destroy_user_session_path, :method => :delete, :class => 'icon exit blue'
+      -else
+        =menu_li t('users.sign_in'),new_user_session_path, {:class => "power"}
+        =menu_li t('users.sign_up'),new_user_registration_path, {:class => "signup"}

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

@@ -1,10 +1,19 @@
-.navbar
-  .navbar-inner
-    / .container
-    =link_to Helpdesk.site_address, main_app.root_path, :class=>'brand', :title => Helpdesk.site_address
-    =link_to Helpdesk.name, root_path, :class=>'brand', :title => Helpdesk.name
-    %nav
-      %ul.nav
-        = menu_li t('helpdesk.tickets.title'),tickets_path
-        = menu_li t('helpdesk.faq'),faqs_path
+%nav.navbar.navbar-default#site_topmmenu{role: 'navigation'}
+  .navbar-header
+    %button.navbar-toggle{"data-target" => "#bs-navbar-collapse-1", "data-toggle" => "collapse", type: "button"}
+      %span.sr-only Toggle navigation
+      %span.icon-bar
+      %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
+  #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
+
+
+
+
+
 

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

@@ -13,15 +13,23 @@
       = render 'layouts/helpdesk/topmenu'
       .content
         .row
-          .span3
+          .col.col-md-3#site_leftmenu
             =yield :left
-          .span9
+          .col.col-md-9#site_leftmenu
             .flash
             - flash.each do |type, message|
               %div{:class => "alert alert-#{type}", "data-alert"=>"alert"}
-                =link_to "x",'#', :class=>'close', :'data-dismiss'=>"alert" 
-                %p= message  
-            =yield
-  =yield :scripts 
+                =link_to "x",'#', :class=>'close', :'data-dismiss'=>"alert"
+                %p= message
+            - if content_for?(:title)
+              .panel.panel-default
+                .panel-heading
+                  %h3.panel-title
+                    = content_for?(:title) ? content_for(:title) : ''
+                .panel-body
+                  = yield
+            - else
+              = yield
+  =yield :scripts
 
 

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

@@ -13,13 +13,21 @@
       = render 'layouts/helpdesk/topuser'
       .content
         .row
-          .span3
+          .col.col-md-3#site_leftmenu
             =yield :left
-          .span9
+          .col.col-md-9#site_leftmenu
             .flash
             - flash.each do |type, message|
               %div{:class => "alert alert-#{type}", "data-alert"=>"alert"}
-                =link_to "x",'#', :class=>'close', :'data-dismiss'=>"alert" 
-                %p= message  
-            =yield
-  =yield :scripts 
+                =link_to "x",'#', :class=>'close', :'data-dismiss'=>"alert"
+                %p= message
+            - if content_for?(:title)
+              .panel.panel-default
+                .panel-heading
+                  %h3.panel-title
+                    = content_for?(:title) ? content_for(:title) : ''
+                .panel-body
+                  = yield
+            - else
+              = yield
+  =yield :scripts

data/config/initializers/simple_form.rb

@@ -1,176 +1,115 @@
+inputs = %w[
+  CollectionSelectInput
+  DateTimeInput
+  FileInput
+  GroupedCollectionSelectInput
+  NumericInput
+  PasswordInput
+  RangeInput
+  StringInput
+  TextInput
+]
+
+
+# Instead of creating top-level custom input classes like TextInput, we wrap it into a module and override
+# mapping in SimpleForm::FormBuilder directly
+#
+SimpleFormBootstrapInputs = Module.new
+inputs.each do |input_type|
+  superclass = "SimpleForm::Inputs::#{input_type}".constantize
+
+  new_class = SimpleFormBootstrapInputs.const_set(input_type, Class.new(superclass) do
+    def input_html_classes
+      super.push('form-control')
+    end
+  end)
+
+  # Now override existing usages of superclass with new_class
+  SimpleForm::FormBuilder.mappings.each do |(type, target_class)|
+    if target_class == superclass
+      SimpleForm::FormBuilder.map_type(type, to: new_class)
+    end
+  end
+end
+# inputs.each do |input_type|
+#   superclass = "SimpleForm::Inputs::#{input_type}".constantize
+
+#   new_class = Class.new(superclass) do
+#     def input_html_classes
+#       super.push('form-control')
+#     end
+#   end
+
+#   Object.const_set(input_type, new_class)
+# end
+
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
-  # Wrappers are used by the form builder to generate a
-  # complete input. You can remove any component from the
-  # wrapper, change the order or even add your own to the
-  # stack. The options given below are used to wrap the
-  # whole input.
-  config.wrappers :default, :class => :input,
-    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
-    ## Extensions enabled by default
-    # Any of these extensions can be disabled for a
-    # given input by passing: `f.input EXTENSION_NAME => false`.
-    # You can make any of these extensions optional by
-    # renaming `b.use` to `b.optional`.
-
-    # Determines whether to use HTML5 (:email, :url, ...)
-    # and required attributes
-    b.use :html5
-
-    # Calculates placeholders automatically from I18n
-    # You can also pass a string as f.input :placeholder => "Placeholder"
-    b.use :placeholder
 
-    ## Optional extensions
-    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
-    # to the input. If so, they will retrieve the values from the model
-    # if any exists. If you want to enable the lookup for any of those
-    # extensions by default, you can change `b.optional` to `b.use`.
+  config.browser_validations = true
 
-    # Calculates maxlength from length validations for string inputs
-    b.optional :maxlength
+  config.boolean_style = :nested
 
-    # Calculates pattern from format validations for string inputs
-    b.optional :pattern
+  config.wrappers :bootstrap3, tag: 'div', class: 'form-group', error_class: 'has-error',
+      defaults: { input_html: { class: 'default_class' } } do |b|
 
-    # Calculates min and max from length validations for numeric inputs
-    b.optional :min_max
+    b.use :html5
+    b.use :min_max
+    b.use :maxlength
+    b.use :placeholder
 
-    # Calculates readonly automatically from readonly attributes
+    b.optional :pattern
     b.optional :readonly
 
-    ## Inputs
     b.use :label_input
-    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    b.use :error, :wrap_with => { :tag => :span, :class => :error }
+    b.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
   end
 
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+  config.wrappers :prepend, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
     b.use :html5
     b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
-      ba.use :input
-      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+    b.wrapper tag: 'div', class: 'controls' do |input|
+      input.wrapper tag: 'div', class: 'input-group' do |prepend|
+    prepend.use :label , class: 'input-group-addon' ###Please note setting class here fro the label does not currently work (let me know if you know a workaround as this is the final hurdle)
+        prepend.use :input
+      end
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
     end
   end
 
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :append, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
     b.use :html5
     b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
+    b.wrapper tag: 'div', class: 'controls' do |input|
+      input.wrapper tag: 'div', class: 'input-group' do |prepend|
         prepend.use :input
+    prepend.use :label , class: 'input-group-addon' ###Please note setting class here fro the label does not currently work (let me know if you know a workaround as this is the final hurdle)
       end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
     end
   end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :checkbox, tag: :div, class: "checkbox", error_class: "has-error" do |b|
+
+    # Form extensions
     b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-append' do |append|
-        append.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+
+    # Form components
+    b.wrapper tag: :label do |ba|
+      ba.use :input
+      ba.use :label_text
     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.
-  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
+  # Check the Bootstrap docs (http://getbootstrap.com/)
   # to learn about the different styles for forms and inputs,
   # buttons and other elements.
-  config.default_wrapper = :bootstrap
-
-  # Define the way to render check boxes / radio buttons with labels.
-  # Defaults to :nested for bootstrap config.
-  #   :inline => input + label
-  #   :nested => label > input
-  config.boolean_style = :nested
-
-  # Default class for buttons
-  config.button_class = 'btn'
-
-  # Method used to tidy up errors.
-  # config.error_method = :first
-
-  # Default tag used for error notification helper.
-  config.error_notification_tag = :div
-
-  # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-error'
-
-  # ID to add for error notification helper.
-  # config.error_notification_id = nil
-
-  # Series of attempts to detect a default label method for collection.
-  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
-
-  # Series of attempts to detect a default value method for collection.
-  # config.collection_value_methods = [ :id, :to_s ]
-
-  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
-  # config.collection_wrapper_tag = nil
-
-  # You can define the class to use on all collection wrappers. Defaulting to none.
-  # config.collection_wrapper_class = nil
-
-  # You can wrap each item in a collection of radio/check boxes with a tag,
-  # defaulting to :span. Please note that when using :boolean_style = :nested,
-  # SimpleForm will force this option to be a label.
-  # config.item_wrapper_tag = :span
-
-  # You can define a class to use in all item wrappers. Defaulting to none.
-  # config.item_wrapper_class = nil
-
-  # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required| "#{required} #{label}" }
-
-  # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'control-label'
-
-  # You can define the class to use on all forms. Default is simple_form.
-  # config.form_class = :simple_form
-
-  # You can define which elements should obtain additional classes
-  # config.generate_additional_classes_for = [:wrapper, :label, :input]
-
-  # Whether attributes are required by default (or not). Default is true.
-  # config.required_by_default = true
-
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
-  config.browser_validations = false
-
-  # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
-
-  # Custom mappings for input types. This should be a hash containing a regexp
-  # to match as key, and the input type that will be used when the field name
-  # matches the regexp as value.
-  # config.input_mappings = { /count/ => :integer }
-
-  # Default priority for time_zone inputs.
-  # config.time_zone_priority = nil
-
-  # Default priority for country inputs.
-  # config.country_priority = nil
-
-  # Default size for text inputs.
-  # config.default_input_size = 50
-
-  # When false, do not use translations for labels.
-  # config.translate_labels = true
-
-  # Automatically discover new inputs in Rails' autoload path.
-  # config.inputs_discovery = true
-
-  # Cache SimpleForm inputs discovery
-  # config.cache_discovery = !Rails.env.development?
+  config.default_wrapper = :bootstrap3
 end

data/config/routes.rb

@@ -11,7 +11,7 @@ Helpdesk::Engine.routes.draw do
         post :sort, on: :collection
       end
       resources :subscribers
-      root :to => "dashboard#index"
+      root :to => "tickets#index"
     end
 
     resources :faqs, :only => [ :index ]

data/lib/helpdesk/version.rb

@@ -1,3 +1,3 @@
 module Helpdesk
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpdesk
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - John Beynon Wacław Łuczak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -136,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bullet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chosen-rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +182,16 @@ dependencies:
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +311,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- Rakefile
 - app/assets/javascripts/helpdesk/admin/dashboard.js
 - app/assets/javascripts/helpdesk/admin/tickets.js
 - app/assets/javascripts/helpdesk/application.js
@@ -304,14 +320,14 @@ files:
 - app/assets/javascripts/helpdesk/dashboard.js
 - app/assets/javascripts/helpdesk/faqs.js
 - app/assets/javascripts/helpdesk/subscribers.js
+- app/assets/stylesheets/helpdesk/admin.css
 - app/assets/stylesheets/helpdesk/admin/bootstrap_overrides.css
 - app/assets/stylesheets/helpdesk/admin/dashboard.css
 - app/assets/stylesheets/helpdesk/admin/tickets.css
-- app/assets/stylesheets/helpdesk/admin.css
 - app/assets/stylesheets/helpdesk/application.css
 - app/assets/stylesheets/helpdesk/dashboard.css
 - app/assets/stylesheets/helpdesk/faqs.css.scss
-- app/assets/stylesheets/helpdesk/imports.css.scss
+- app/assets/stylesheets/helpdesk/imports.css.sass
 - app/assets/stylesheets/helpdesk/subscribers.css.scss
 - app/assets/stylesheets/helpdesk/tickets.css.sass
 - app/controllers/helpdesk/admin/base_controller.rb
@@ -402,15 +418,13 @@ files:
 - db/migrate/20130522085614_create_helpdesk_faqs.rb
 - db/migrate/20130522090420_create_helpdesk_subscribers.rb
 - lib/generators/helpdesk/install_generator.rb
-- lib/generators/helpdesk/templates/helpdesk.rb
 - lib/generators/helpdesk/templates/README
+- lib/generators/helpdesk/templates/helpdesk.rb
+- lib/helpdesk.rb
 - lib/helpdesk/engine.rb
 - lib/helpdesk/version.rb
-- lib/helpdesk.rb
 - lib/tasks/prepare_ci_env.rake
 - lib/templates/erb/scaffold/_form.html.erb
-- MIT-LICENSE
-- Rakefile
 homepage: http://github.com/wacaw/helpdesk
 licenses:
 - MIT
@@ -431,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Rails mountable engine providing basic helpdesk functionality for your applications

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

@@ -1,34 +0,0 @@
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-@import "bootstrap/scaffolding";
-@import "bootstrap/grid";
-@import "bootstrap/layouts";
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/forms";
-@import "bootstrap/tables";
-@import "bootstrap/sprites";
-@import "bootstrap/dropdowns";
-@import "bootstrap/wells";
-@import "bootstrap/component-animations";
-@import "bootstrap/close";
-@import "bootstrap/buttons";
-@import "bootstrap/button-groups";
-@import "bootstrap/alerts";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-@import "bootstrap/thumbnails";
-@import "bootstrap/labels-badges";
-@import "bootstrap/progress-bars";
-@import "bootstrap/accordion";
-@import "bootstrap/carousel";
-@import "bootstrap/hero-unit";
-@import "bootstrap/utilities";
-