helpdesk 0.0.2 → 0.0.3

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

@@ -0,0 +1,32 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        #{@comment.author.send Helpdesk.display_user.to_sym}, dziękujemy za przesłanie odpowiedzi do zgłoszenia
+      %div
+        %p
+          Odpowiedź dotyczyła Twojego zgłoszenia - 
+          = @comment.ticket.subject
+        %p
+          Treść odpowiedzi:
+          %br
+          = simple_format(@comment.comment)
+        %p
+          Pod tym adresem możesz śledzić zgłoszenie:
+          %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)}<>
+            = ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)
+          %br
+          Cenimy Twój czas, dlatego staramy się odpowiadać, tak szybko jak to możliwe.
+        %p
+          Życzymy miłego dnia!
+          %br
+            = Helpdesk.site_name
+          %br
+            %a{:href=>Helpdesk.site_address}
+              = Helpdesk.site_address
+        %div
+          Ta wiadomość została wygenrowana automatycznie. Nie odpowiadaj na nią. Jeśli nie zainicjowałeś akcji wysyłania tej wiadomości zgłoś to nam
+          %a{:href=>root_url}
+            klikając tutaj.
+  

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

@@ -0,0 +1,42 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        Pojawiła się nowa odpowiedź do zgłoszenie:
+        = @comment.ticket.ticket_type.title
+      %div.content
+        %p
+          Treść wysłana:
+          %br
+          = simple_format(@comment.comment)
+        %br
+        %br
+        %p
+          Zgłaszający:
+          %br
+          = @comment.author.send Helpdesk.display_user.to_sym
+          = @comment.author.email
+        %br
+        %br
+      %p
+        Pod tym adresem możesz zobaczyć tą odpowiedź na zgłoszenie:
+        %a{:href=>admin_ticket_url(:locale=>I18n.locale, :id=>@comment.ticket, :anchor=>"comment#{@comment.id}")}<>
+          = admin_ticket_url(:locale=>I18n.locale, :id=>@comment.ticket,:anchor=>"comment#{@comment.id}")
+      %p
+        Życzymy miłego dnia!
+        %br
+          = Helpdesk.site_name
+        %br
+          %a{:href=>Helpdesk.site_address}
+            = Helpdesk.site_address
+      %div
+        Ta wiadomość została wygenrowana automatycznie. Nie odpowiadaj na nią. Jeśli nie zainicjowałeś akcji wysyłania tej wiadomości zgłoś to nam
+        %a{:href=>root_url}
+          klikając tutaj.
+
+    
+
+
+
+

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

@@ -0,0 +1,34 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        #{@ticket.requester.send Helpdesk.display_user.to_sym}, dziękujemy za przesłanie zgłoszenia
+      %div
+        %p
+          Temat Twojego zgłoszenia to
+          = @ticket.subject
+        %p
+          Treść zgłoszenia:
+          %br
+          = simple_format(@ticket.description)
+        %br
+        %br
+        %p
+          Pod tym adresem możesz śledzić status zgłoszenia:
+          %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@ticket)}<>
+            = ticket_url(:locale=>I18n.locale, :id=>@ticket)
+          %br
+          Cenimy Twój czas, dlatego staramy się odpowiadać, tak szybko jak to możliwe.
+        %p
+          Życzymy miłego dnia!
+          %br
+            = Helpdesk.site_name
+          %br
+            %a{:href=>Helpdesk.site_address}
+              = Helpdesk.site_address
+        %div
+          Ta wiadomość została wygenrowana automatycznie. Nie odpowiadaj na nią. Jeśli nie zainicjowałeś akcji wysyłania tej wiadomości zgłoś to nam
+          %a{:href=>root_url}
+            klikając tutaj.
+  

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

@@ -0,0 +1,42 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        Pojawiło się nowe zgłoszenie:
+        = @ticket.ticket_type.title
+      %div.content
+        %p
+          Treść wysłana:
+          %br
+          = simple_format(@ticket.description)
+        %br
+        %br
+        %p
+          Zgłaszający:
+          %br
+          = @ticket.requester.name
+          = @ticket.requester.email
+        %br
+        %br
+        %p
+          Pod tym adresem możesz zobaczyć to zgłoszenie:
+          %a{:href=>admin_ticket_url(:locale=>I18n.locale, :id=>@ticket)}<>
+            = admin_ticket_url(:locale=>I18n.locale, :id=>@ticket)
+      %p
+        Życzymy miłego dnia!
+        %br
+          = Helpdesk.site_name
+        %br
+          %a{:href=>Helpdesk.site_address}
+            = Helpdesk.site_address
+      %div
+        Ta wiadomość została wygenrowana automatycznie. Nie odpowiadaj na nią. Jeśli nie zainicjowałeś akcji wysyłania tej wiadomości zgłoś to nam
+        %a{:href=>root_url}
+          klikając tutaj.
+
+    
+
+
+
+

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

@@ -8,29 +8,29 @@
           - @ticket.errors.full_messages.each do |msg|
             %li
               = msg
-    / = f.input :subject
+    / = f.input :subject 
     / = f.input :ticket_type_id, collection: Helpdesk::TicketType.active, include_blank: false
     %div.subject
       %input{:value=>@ticket.subject,:name=>"ticket[subject]",:type => "text",:placeholder => t('helpdesk.tickets.subject')}
       %select{:name=>"ticket[ticket_type_id]"}
-        - Helpdesk::TicketType.includes(:translations).all.each do |type|
+        - SugestionType.all.each do |type|
           %option{:value=>type.id, selected: type.id == @ticket.ticket_type_id}
-            = type.title
-
+            = type.get_name
+    
     - if @ticket.new_record?
       %div.content
         %textarea{:value=>@ticket.description,:name=>"ticket[description]",:type => "text",:placeholder => t('helpdesk.tickets.description')}
     - else
       = @ticket.description
-
+      
       = f.simple_fields_for :comments do |tickets_form|
         - unless tickets_form.object.persisted?
-          = tickets_form.input :comment
-          = tickets_form.input :public, :hint => 'Requester can see this comment (public comment)'
-          = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
+          = tickets_form.input :comment 
+          = tickets_form.input :public, :hint => 'Requester can see this comment (public comment)' 
+          = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id } 
     %hr
     %div.textRight
-      %a.class.btn.btn-default{href: root_path }
-        = t('helpdesk.tickets.cancel')
-      %input{:type => "submit",:value => t('helpdesk.tickets.send'), :class=>"btn btn-primary"}
+      %a#feedbackCancel{:class=>"btn white"}
+        Anuluj
+      %input{:type => "submit",:value => 'Wyślij', :class=>"btn"}
     %div.clearBoth

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

@@ -2,10 +2,10 @@
   %tbody
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
-        %h4
+        %h4  
           ="##{ticket.subject}"
     %tr
-      %td{style:'width:100px'}
+      %td{style:'width:100px'}  
         = I18n::l(ticket.created_at, :format=>:short)
         - if ticket.requester
           = ticket.requester.send Helpdesk.display_user.to_sym
@@ -13,7 +13,7 @@
         = status_label Helpdesk::Ticket::STATUS_BY_KEY[ticket.status.to_sym], Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
         = ticket.ticket_type.title
 
-        = auto_link(simple_format(ticket.description), :html => { :target => "_blank" })
+        = simple_format ticket.description
     %tr
       %td
         - if ticket.assignee
@@ -22,7 +22,7 @@
     %tr
       %td
         %span.btn.disabled
-          = ico('comment')
+          = ico('comment') 
           = ticket.comments.pub.size
       %td
         %ul.comments.unstyled
@@ -31,7 +31,7 @@
               %li.comment{:id=>"comment#{comment.id}"}
                 %div.comment-left
                   - if comment.public
-                    = status_label ico('envelope') + t('helpdesk.comments.send') ,'label-success'
+                    = status_label ico('envelope','white') + t('helpdesk.comments.send') ,'label-success'
                   - else
                     = status_label t('helpdesk.comments.note'),''
                   %br
@@ -39,16 +39,16 @@
                     = "#"
                 %div.comment-header
                   -if comment.author != ticket.requester
-                    = status_label ico('user')+ t('helpdesk.comments.helpdesk'),'label-info'
-
+                    = status_label ico('user','white')+ t('helpdesk.comments.helpdesk'),'label-info'
+                    
                   = comment.author.send Helpdesk.display_user.to_sym
                   %small
                     = time_ago_in_words(comment.created_at)
                     temu
                 %div.comment-body
-                  = auto_link(simple_format(comment.comment), :html => { :target => "_blank" })
-
+                  = simple_format comment.comment
+  
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
         - if show_button
-          = link_to ticket.subject, ticket_url(I18n.locale,ticket), class: 'btn btn-block'
+          = link_to ticket.subject, ticket_url(ticket), class: 'btn btn-block'

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

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

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

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

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

@@ -2,20 +2,16 @@
 
 = render 'ticket', :ticket=>@ticket, show_button:false
 
+%table.table
+  %tbody
+    %tr{:class=>@ticket.ticket_type.tr_class}
+      %td{style:'width:100px'}  
 
-- unless @ticket.open?
-  %table.table
-    %tbody
-      %tr{:class=>@ticket.ticket_type.tr_class}
-        %td{style:'width:100px'}
-        %td
+      %td
+
+        - unless @ticket.open?
           = t('helpdesk.tickets.ticket_closed')
-- if @ticket.open? || helpdesk_user == @ticket.requester
-  %table.table
-    %tbody
-      %tr{:class=>@ticket.ticket_type.tr_class}
-        %td{style:'width:100px'}
-        %td
+        -else
           = simple_form_for(@ticket, :html => {:class => 'form-vertical' }) do |f|
             - if @ticket.errors.any?
               %div.error_explanation
@@ -28,11 +24,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',rows: 5}
+                = tickets_form.input :comment, :input_html=>{class: 'comment-textarea'}
                 / , :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 }
+                = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id } 
             %div
-              = f.button :submit, :class => 'btn btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-default"
+              = f.button :submit, :class => 'btn-primary'
+              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"    

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

@@ -1,28 +1,22 @@
-%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
-      = 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
+.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
 
-    %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})
+          %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,32 +1,9 @@
-%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
-
-    %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})
-
-
-
-
-
-
+.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
+    

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

@@ -13,23 +13,15 @@
       = render 'layouts/helpdesk/topmenu'
       .content
         .row
-          .col.col-md-3#site_leftmenu
+          .span3
             =yield :left
-          .col.col-md-9#site_leftmenu
+          .span9
             .flash
             - flash.each do |type, message|
               %div{:class => "alert alert-#{type}", "data-alert"=>"alert"}
-                =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
+                =link_to "x",'#', :class=>'close', :'data-dismiss'=>"alert" 
+                %p= message  
+            =yield
+  =yield :scripts