helpdesk 0.0.14 → 0.0.20

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

@@ -9,8 +9,8 @@
             = msg
   = f.input :requester_id, :collection => (Helpdesk.user_class).all,:label_method=>Helpdesk.display_user_uniq_info.to_sym, input_html: { class: 'chosen-select' }
   = f.input :subject
-  = f.input :status, :collection => Helpdesk::Ticket::STATUS_OPTIONS, include_blank: false
-  = f.input :assignee_id, :collection => User.where('helpdesk_admin = ?', true)
+  = f.input :status, :collection => tickets_statuses_for_select, include_blank: false
+  = f.input :assignee_id, :collection => helpdesk_admin_collection
   = f.input :ticket_type_id, :collection => Helpdesk::TicketType.active,include_blank: false
   - if @ticket.new_record?
     = f.input :description,input_html:{rows:4}

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

@@ -10,7 +10,8 @@
         - if ticket.requester
           = ticket.requester.send Helpdesk.display_user_uniq_info.to_sym
       %td{rowspan:2}
-        = status_label Helpdesk::Ticket::STATUS_BY_KEY[ticket.status.to_sym], Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
+        = status_label humanize_with_i18n(ticket.status,'helpdesk.tickets.statuses'), Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
+
         = ticket.ticket_type.title
         = auto_link(simple_format(ticket.description), :html => { :target => "_blank" })
     %tr

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

@@ -20,8 +20,8 @@
                   - @ticket.errors.full_messages.each do |msg|
                     %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 :status, :collection => tickets_statuses_for_select, include_blank: false
+            = f.input :assignee_id, :collection => helpdesk_admin_collection
 
 
             = f.simple_fields_for :comments,@ticket.comments.build do |tickets_form|

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

@@ -1,7 +1,7 @@
 %div.content
   %div.pageContainer
     %h1
-      Często zadawane pytania
+      = t('helpdesk.faqs.title_s')
     %ol#faq
       - @faqs.each do |faq|
         %li{:id=>"link#{faq.id}"}

data/app/views/helpdesk/notifications_mailer/comment_by_helpdesk_confirmation.html.haml

@@ -0,0 +1,15 @@
+- content_for :title do
+  = t('helpdesk.mailer.comment_by_helpdesk_confirmation.title')
+%p
+  = t('helpdesk.mailer.comment_by_helpdesk_confirmation.re_ticket')
+  = @comment.ticket.subject
+%p
+  = t('helpdesk.mailer.comment_by_helpdesk_confirmation.response_content')
+  %br
+  = simple_format(@comment.comment)
+%br
+%p
+  = t('helpdesk.mailer.ticket_url_title')
+  %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)}<>
+    = ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)
+  %br

data/app/views/helpdesk/notifications_mailer/comment_by_helpdesk_notification.html.haml

@@ -0,0 +1,19 @@
+- content_for :title do
+  = t('helpdesk.mailer.comment_by_helpdesk_notification.title', user: @comment.ticket.requester.send Helpdesk.display_user.to_sym)
+  = @comment.ticket.subject
+
+%p
+  = t('helpdesk.mailer.comment_by_helpdesk_notification.comment_content'_
+  %br
+  = simple_format(@comment.comment)
+%br
+%p
+= t('helpdesk.mailer.ticket_url_title')
+  %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@comment.ticket, :anchor=>"comment#{@comment.id}")}<>
+
+
+
+
+
+
+

data/app/views/helpdesk/notifications_mailer/comment_by_requester_confirmation.html.haml

@@ -0,0 +1,16 @@
+- content_for :title do
+  = t('helpdesk.mailer.comment_by_requester_confirmation.title', user: @comment.ticket.requester.send(Helpdesk.display_user.to_sym))
+%p
+  = t('helpdesk.mailer.comment_by_requester_confirmation.subject', subject: @comment.ticket.subject)
+%p
+  = t('helpdesk.mailer.comment_by_requester_confirmation.comment_content')
+  %br
+  = simple_format(@comment.comment)
+%br
+%p
+  = t('helpdesk.mailer.ticket_url_title')
+  %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)}<>
+    = ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)
+  %br
+  = t('helpdesk.mailer.ticket_created_confirmation.info_time')
+

data/app/views/helpdesk/notifications_mailer/comment_by_requester_notification.html.haml

@@ -0,0 +1,27 @@
+- content_for :title do
+  = t('helpdesk.mailer.comment_by_requester_notification.title')
+  = @comment.ticket.subject
+%p
+  = t('helpdesk.mailer.comment_by_requester_notification.comment_content')
+  %br
+  = simple_format(@comment.comment)
+%br
+%br
+%p
+  = t('helpdesk.mailer.ticket_created_notification.requester_info')
+  %br
+  = @comment.author.send Helpdesk.display_user.to_sym
+  %br
+  = @comment.author.send Helpdesk.display_user_uniq_info.to_sym
+%br
+%p
+  = t('helpdesk.mailer.ticket_url_title')
+  %a{:href=>admin_ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)}<>
+    = admin_ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)
+
+
+
+
+
+
+

data/app/views/helpdesk/notifications_mailer/ticket_created_confirmation.html.haml

@@ -0,0 +1,16 @@
+- content_for :title do
+  = t('helpdesk.mailer.ticket_created_confirmation.title', user: @ticket.requester.send(Helpdesk.display_user.to_sym) )
+%p
+  = t('helpdesk.mailer.ticket_created_confirmation.subject')
+  = @ticket.subject
+%p
+  = t('helpdesk.mailer.ticket_created_confirmation.ticket_content')
+  %br
+  = simple_format(@ticket.description)
+%br
+%p
+  = t('helpdesk.mailer.ticket_url_title')
+  %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@ticket)}<>
+    = ticket_url(:locale=>I18n.locale, :id=>@ticket)
+  %br
+  = t('helpdesk.mailer.ticket_created_confirmation.info_time')

data/app/views/helpdesk/notifications_mailer/ticket_created_notification.html.haml

@@ -0,0 +1,21 @@
+- content_for :title do
+  = t('helpdesk.mailer.ticket_created_notification.title')
+  = @ticket.ticket_type.title
+%p
+  = t('helpdesk.mailer.ticket_created_notification.ticket_content')
+  %br
+  = simple_format(@ticket.description)
+%br
+%br
+%p
+  = t('helpdesk.mailer.ticket_created_notification.requester_info')
+  %br
+  = @ticket.requester.send Helpdesk.display_user.to_sym
+  %br
+  = @ticket.requester.send Helpdesk.display_user_uniq_info.to_sym
+%br
+%p
+  = t('helpdesk.mailer.ticket_url_title')
+  %a{:href=>admin_ticket_url(:locale=>I18n.locale, :id=>@ticket)}<>
+    = admin_ticket_url(:locale=>I18n.locale, :id=>@ticket)
+

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

@@ -30,7 +30,7 @@
           = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
     %hr
     %div.textRight
-      %a#feedbackCancel{:class=>"btn white"}
-        Anuluj
-      %input{:type => "submit",:value => 'Wyślij', :class=>"btn btn-primary"}
+      %a.class.btn.btn-default{href: root_path }
+        = t('helpdesk.tickets.cancel')
+      %input{:type => "submit",:value => t('helpdesk.tickets.send'), :class=>"btn btn-primary"}
     %div.clearBoth

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

@@ -9,18 +9,20 @@
     =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
+      = 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.send(Helpdesk.display_user.to_sym), "#",: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"}
+    %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})

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

@@ -12,6 +12,19 @@
       = menu_li t('helpdesk.tickets.title'),tickets_path
       = menu_li t('helpdesk.faq'),faqs_path
 
+    %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})
+
 
 
 

data/app/views/layouts/mailer_layout.html.haml

@@ -0,0 +1,20 @@
+:plain
+  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+%html
+  %head
+  %body
+    %div{:style=>'margin: 0px; padding: 20px 0px; background-color: #f0f0f0;'}
+      %div{:style=>'margin: 0px auto; width: 600px; background-color: #fafafa; padding: 20px; border-radius: 2px; box-shadow:  0px 1px 3px 0px rgba(0, 0, 0, 0.3);'}
+        %h2
+          =yield :title
+        %div
+          = yield
+          %p
+            = t('helpdesk.mailer.footer_nice')
+            %br
+              = Helpdesk.site_name
+            %br
+              %a{:href=>'http://'+Helpdesk.site_address}
+                = Helpdesk.site_address
+          %div{:style=>'padding: 8px 0px; font-size: 12px; font-family: "Helvetica", "Arial", Sans-serif; text-align: justify; border-top: 0px solid #c0c0c0; color: #808080; '}
+            = t('helpdesk.mailer.footer_info', url: root_url).html_safe

data/config/initializers/globalize.rb

@@ -1,4 +1,4 @@
-Globalize.fallbacks = {
-    :en => [:en, :pl],
-    :pl => [:pl, :en],
-  }
+# Globalize.fallbacks = {
+#     :en => [:en, :pl],
+#     :pl => [:pl, :en],
+#   }

data/config/locales/helpdesk.en.yml

@@ -1,6 +1,7 @@
 en:
 
   helpdesk:
+    lang: Language
     Show: Show
     edit: Edit
     Destroy: Delete
@@ -9,7 +10,7 @@ en:
     tickets:
       new: New Issue
       my: My Issue
-      unassigned: Wnassigned
+      unassigned: Unassigned
       closed: Closed Issues
       all: All issues
       title: Issues
@@ -17,12 +18,14 @@ en:
       assignee_to: Assigned to
       assign_me: I take it
       not_assigned: Not assigned
-      is_now_assigned: "Issue % {subject} has been assigned to you"
+      is_now_assigned: "Issue %{subject} has been assigned to you"
       visible_to_autor: Visible to the author - send an email
       you_have_no_tickets: "No issues "
       ticket_closed: Issues closed
       subject: Subject of
-      Description: Content
+      description: Content
+      cancel: cancel
+      send: Send
     ticket: Issue
     faq: FAQ
     comments:
@@ -51,6 +54,7 @@ en:
 
     faqs:
       title: FAQ
+      title_s: Frequently Asked Questions
       active: Active Questions
       inactive: Inactive questions
       all: All the questions
@@ -60,7 +64,33 @@ en:
         active: active
         inactive: inactive
 
-
+    mailer:
+      comment_by_helpdesk_confirmation:
+        title: "Response to the issue was sent"
+        re_ticket: "New comment for Issue:"
+        response_content: "Content of the comment:"
+      comment_by_helpdesk_notification:
+        title: "%{user}, new reply received for issue:"
+        comment_content: "Content of the comment:"
+      comment_by_requester_notification:
+        title: "New reply received for issue:"
+        comment_content: "Content of the comment:"
+      comment_by_requester_confirmation:
+        title: "%{user}, thank you for submitting a comment to the Issue"
+        subject: "New comment for Issie - %{subject}"
+        comment_content: "Content of the comment:"
+      ticket_created_confirmation:
+        title: "%{user}, thank you for submitting"
+        subject: "Your issue subject is:"
+        ticket_content: "Content of the issue:"
+        info_time: "We appreciate your time, so we will try to respond as quickly as possible."
+      ticket_created_notification:
+        title: "New Issue was created"
+        requester_info: "Author"
+        ticket_content: "The content of the issue:"
+      ticket_url_title: "At this address you can track the issue:"
+      footer_info: "This message has been generated automatically. Do not answer it. If you do not have initiated action to send this message please report it to us <a href=\"%{url}\"> clicking here </a>."
+      footer_nice: "Have a nice day"
 
   activerecord:
     models:

data/config/locales/helpdesk.pl.yml

@@ -1,6 +1,7 @@
 pl:
 
   helpdesk:
+    lang: Język
     show: Pokaż
     edit: Edytuj
     destroy: Usuń
@@ -23,6 +24,17 @@ pl:
       ticket_closed: Zgłoszenie zamknięte
       subject: Temat zgłoszenia
       description: Treść
+      cancel: Anuluj
+      send: Wyślij
+      statuses:
+        new: "Nowe"
+        open: "Otwarte"
+        waiting: "Otwarte: oczekujące"
+        solved: "Zamknięte: problem rozwiązany"
+        not_fixable: "Zamknięte: nienaprawialne"
+        unreachable: "Zamknięte: klient nieosiągalny"
+        bug: "Zamknięte: Przeniesione do bug tracker'a"
+
     ticket: Zgłoszenie
     faq: FAQ
     comments:
@@ -51,6 +63,7 @@ pl:
 
     faqs:
       title: FAQ
+      title_s: Często zadawane pytania
       active: Aktywne pytania
       inactive: Nieaktywne pytania
       all: Wszystkie pytania
@@ -60,6 +73,31 @@ pl:
         active: aktywne
         inactive: nieaktywne
 
+    mailer:
+      comment_by_helpdesk_confirmation:
+        title: "Wysłano odpowiedź do zgłoszenia"
+        re_ticket: "Odpowiedź dotyczy zgłoszenia"
+        response_content: "Treść odpowiedzi:"
+      comment_by_requester_notification:
+        title: "Pojawiła się nowa odpowiedź do zgłoszenie:"
+        comment_content: "Treść odpowiedzi:"
+      comment_by_requester_confirmation:
+        title:  "%{user}, dziękujemy za przesłanie odpowiedzi do zgłoszenia"
+        subject: "Odpowiedź dotyczy Twojego zgłoszenia - %{subject}"
+        comment_content: "Treść odpowiedzi:"
+      ticket_created_confirmation:
+        title: "%{user}, dziękujemy za przesłanie zgłoszenia"
+        subject: Temat Twojego zgłoszenia to
+        ticket_content: "Treść zgłoszenia:"
+        info_time: "Cenimy Twój czas, dlatego staramy się odpowiadać, tak szybko jak to możliwe."
+      ticket_created_notification:
+        title: "Pojawiło się nowe zgłoszenie:"
+        requester_info: "Informacje o zgłaszającym:"
+        ticket_content: "Treść zgłoszenia:"
+      ticket_url_title: "Pod tym adresem można śledzić zgłoszenie:"
+      footer_info: "Ta wiadomość została wygenerowana automatycznie. Nie odpowiadaj na nią. Jeśli nie zainicjowałeś akcji wysyłania tej wiadomości zgłoś to nam <a href=\"%{url}\">klikając tutaj</a>."
+      footer_nice: "Życzymy miłego dnia"
+
 
 
   activerecord:

data/config/routes.rb

@@ -16,7 +16,7 @@ Helpdesk::Engine.routes.draw do
 
     resources :faqs, :only => [ :index ]
     resources :tickets, :except => [ :edit, :destroy ]
-    root :to => "tickets#index"
+    root :to => "faqs#index"
 
   end
 end

data/db/migrate/20130521105605_create_helpdesk_ticket_types.rb

@@ -6,6 +6,7 @@ class CreateHelpdeskTicketTypes < ActiveRecord::Migration
       t.string :tr_class
       t.timestamps
     end
+
     Helpdesk::TicketType.create_translation_table! :title => :string
 
 

data/lib/generators/helpdesk/install_generator.rb

@@ -16,21 +16,20 @@ module Helpdesk
         copy_file "../../../../config/locales/helpdesk.pl.yml", "config/locales/helpdesk.pl.yml"
       end
 
-      def show_readme
-        readme "README" if behavior == :invoke
+      def run_rake
+        rake "helpdesk:install:migrations"
+        rake "db:migrate"
       end
 
-
-
       def add_engine_to_route
         route "mount Helpdesk::Engine, :at => '/helpdesk'"
       end
 
-      def run_rake
-        rake "helpdesk:install:migrations"
-        rake "db:migrate"
+      def show_readme
+        readme "README" if behavior == :invoke
       end
 
+
     end
   end
 end