helpdesk 0.0.2 → 0.0.3

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

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

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

@@ -1,7 +1,6 @@
 = render 'menu'
 
-- content_for :title do
-  Subscribers
+%h1  Subscribers
 
 %table.table.table-hover
   %tr
@@ -20,7 +19,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,5 +1,4 @@
-- content_for :title do
-  New subscriber
+%h1 New subscriber
 
 = render 'form'
 

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

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

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

@@ -1,6 +1,6 @@
 = render 'menu'
 
-- content_for :title do
+%h1
   -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,7 +1,6 @@
 = render 'menu'
 
-- content_for :title do
-  New ticket_type
+%h1 New ticket_type
 
 = render 'form'
 

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

@@ -1,4 +1,4 @@
-= simple_form_for([:admin, @ticket]) do |f|
+= simple_form_for([:admin, @ticket], :html => {:class => 'form-horizontal' }) do |f|
   - if @ticket.errors.any?
     %div.error_explanation
       %h2
@@ -7,17 +7,17 @@
         - @ticket.errors.full_messages.each do |msg|
           %li
             = 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 => tickets_statuses_for_select, include_blank: false
-  = f.input :assignee_id, :collection => helpdesk_admin_collection
+  = f.input :requester_id, :collection => User.all
+  = 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 :ticket_type_id, :collection => Helpdesk::TicketType.active,include_blank: false
   - if @ticket.new_record?
-    = f.input :description,input_html:{rows:4}
+    = f.input :description 
   - else
     = simple_format @ticket.description
-
-
+    
+  
   %div.form-actions
-    = f.button :submit, :class => 'btn btn-primary'
+    = f.button :submit, :class => 'btn-primary'
     = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"

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

@@ -2,30 +2,30 @@
   %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_uniq_info.to_sym
+          = ticket.requester.send Helpdesk.display_user.to_sym
       %td{rowspan:2}
-        = status_label humanize_with_i18n(ticket.status,'helpdesk.tickets.statuses'), Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
-
+        = 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
           = t('helpdesk.tickets.assignee_to')
-          = ticket.assignee.send Helpdesk.display_user_uniq_info.to_sym
+          = ticket.assignee.send Helpdesk.display_user.to_sym
         - else
           = t('helpdesk.tickets.not_assigned')
-          = link_to ico('star') + t('helpdesk.tickets.assign_me'), assign_admin_ticket_path(ticket),class: 'btn btn-mini btn-info'
+          = link_to ico('star','white') + t('helpdesk.tickets.assign_me'), assign_admin_ticket_path(ticket),class: 'btn btn-mini btn-info'
     %tr
       %td
         %span.btn.disabled
-          = ico('comment')
+          = ico('comment') 
           = ticket.comments.size
       %td
         %ul.comments.unstyled
@@ -34,7 +34,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
@@ -42,18 +42,19 @@
                     = "#"
                 %div.comment-header
                   -if comment.author == ticket.requester
-                    = status_label ico('user')+ t('helpdesk.comments.author'),'label-info'
-                  = comment.author.send Helpdesk.display_user_uniq_info.to_sym if comment.author
+                    = status_label ico('user','white')+ t('helpdesk.comments.author'),'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 'Show', admin_ticket_url(ticket), class: 'btn btn-block'
         -elsif edit_button
           = link_to 'Edit', edit_admin_ticket_url(ticket), class: 'btn btn-primary'
-
+          

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

@@ -1,5 +1,5 @@
 = render 'menu'
-- content_for :title do
+%h2
   = 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') + 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
@@ -20,9 +20,9 @@
             = "#"
         %div.comment-header
           -if comment.author == @ticket.requester
-            = status_label ico('user')+ t('helpdesk.comments.author'),'label-info'
-
-          = comment.author.send Helpdesk.display_user.to_sym if comment.author
+            = status_label ico('user','white')+ t('helpdesk.comments.author'),'label-info'
+            
+          = comment.author.send Helpdesk.display_user.to_sym
           %small
             = time_ago_in_words(comment.created_at)
             temu

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

@@ -8,7 +8,7 @@
 
 %table.table.table-hover
   %thead
-    %tr
+    %tr 
       %th= t('helpdesk.status')
       %th ID
       %th Issue Type
@@ -16,7 +16,7 @@
       %th Requester
       %th Requested
       %th Assignee
-      %th
+      %th 
 
   %tbody
     - @tickets.each do |ticket|
@@ -28,15 +28,13 @@
         %td= ticket.subject
         %td
           - if ticket.requester
-            = ticket.requester.send Helpdesk.display_user.to_sym
-            %br
+            = ticket.requester.name
+            %br 
             = ticket.requester.phone
-            %br
+            %br 
             = ticket.requester.email
         %td= I18n::l(ticket.created_at, :format=>:short)
         %td= ticket.assignee if ticket.assignee
         %td= link_to 'Show', admin_ticket_url(ticket)
 %br
 
-= paginate @tickets
-

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

@@ -1,6 +1,6 @@
 = render 'menu'
 
-- content_for :title do
+%h1
   -if params[:tickets] && params[:tickets] == 'unassigned'
     = t('helpdesk.tickets.unassigned')
   -elsif params[:tickets] && params[:tickets] == 'closed'
@@ -14,5 +14,4 @@
 
 - @tickets.each do |ticket|
   = render 'ticket', ticket: ticket, show_button:true
-
-= paginate @tickets
+  

data/app/views/helpdesk/admin/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/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]) do |f|
+          = simple_form_for([:admin, @ticket], :html => {:class => 'form-horizontal' }) do |f|
             - if @ticket.errors.any?
               %div.error_explanation
                 %h2
@@ -20,17 +20,17 @@
                   - @ticket.errors.full_messages.each do |msg|
                     %li
                       = msg
-            = f.input :status, :collection => tickets_statuses_for_select, include_blank: false
-            = f.input :assignee_id, :collection => helpdesk_admin_collection
-
+            = f.input :status, :collection => Helpdesk::Ticket::STATUS_OPTIONS, include_blank: false
+            = 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 btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"
+              = f.button :submit, :class => 'btn-primary'
+              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"

data/app/views/helpdesk/faqs/_form.html.erb

@@ -0,0 +1,33 @@
+<%= form_for(@faq) do |f| %>
+  <% if @faq.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@faq.errors.count, "error") %> prohibited this faq from being saved:</h2>
+
+      <ul>
+      <% @faq.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </div>
+  <div class="field">
+    <%= f.label :text %><br />
+    <%= f.text_area :text %>
+  </div>
+  <div class="field">
+    <%= f.label :position %><br />
+    <%= f.number_field :position %>
+  </div>
+  <div class="field">
+    <%= f.label :active %><br />
+    <%= f.check_box :active %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/helpdesk/faqs/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing faq</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @faq %> |
+<%= link_to 'Back', faqs_path %>

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

@@ -0,0 +1,29 @@
+<h1>Listing faqs</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Text</th>
+    <th>Position</th>
+    <th>Active</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @faqs.each do |faq| %>
+  <tr>
+    <td><%= faq.title %></td>
+    <td><%= faq.text %></td>
+    <td><%= faq.position %></td>
+    <td><%= faq.active %></td>
+    <td><%= link_to 'Show', faq %></td>
+    <td><%= link_to 'Edit', edit_faq_path(faq) %></td>
+    <td><%= link_to 'Destroy', faq, confirm: 'Are you sure?', method: :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Faq', new_faq_path %>

data/app/views/helpdesk/faqs/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New faq</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', faqs_path %>

data/app/views/helpdesk/faqs/show.html.erb

@@ -0,0 +1,25 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Title:</b>
+  <%= @faq.title %>
+</p>
+
+<p>
+  <b>Text:</b>
+  <%= @faq.text %>
+</p>
+
+<p>
+  <b>Position:</b>
+  <%= @faq.position %>
+</p>
+
+<p>
+  <b>Active:</b>
+  <%= @faq.active %>
+</p>
+
+
+<%= link_to 'Edit', edit_faq_path(@faq) %> |
+<%= link_to 'Back', faqs_path %>

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

@@ -0,0 +1,32 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        Wysłano opodiwedź do zgłoszenia
+      %div
+        %p
+          Odpowiedź dotyczy zgłoszenia
+          = @comment.ticket.subject
+        %p
+          Treść odpowiedzi:
+          %br
+          = simple_format(@comment.comment)
+        %br
+        %br
+        %p
+          Pod tym adresem można śledzić zgłoszenie:
+          %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)}<>
+            = ticket_url(:locale=>I18n.locale, :id=>@comment.ticket)
+          %br
+          
+        %p
+          = 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_helpdesk_notification.pl.html.haml

@@ -0,0 +1,28 @@
+!!!
+%html
+  %body
+    %div
+      %h1
+        ="#{@comment.ticket.requester.send Helpdesk.display_user.to_sym}, pojawiła się nowa odpowiedź do zgłoszenia: #{@comment.ticket.subject}"
+      %div
+        %p
+          Pod tym adresem możesz zobaczyć odpowiedź i swoje zgłoszenie:
+          %a{:href=>ticket_url(:locale=>I18n.locale, :id=>@comment.ticket, :anchor=>"comment#{@comment.id}")}<>
+            = 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.
+
+    
+
+
+
+