radesk 0.3.0 → 1.0.0

data/app/models/radesk/upload.rb

@@ -0,0 +1,9 @@
+module Radesk
+  class Upload < ActiveRecord::Base
+    belongs_to :answer
+    
+    has_attached_file :file
+
+    validates_attachment_content_type :file, :content_type => /\Aimage\/.*\Z/
+  end
+end

data/app/views/layouts/radesk/application.html.haml

@@ -14,11 +14,12 @@
             = flash[:notice]
       .nav
         .wrap
-          = link_to 'Home', '/'
-          = link_to 'Tickets', tickets_path
+          = link_to t('radesk.ui.home'), Radesk.home_path
+          = link_to t('radesk.ui.tickets.index'), tickets_path
           - if radesk_current_user.try(:radesk_admin?)
-            = link_to 'Categories', admin_categories_path
+            = link_to t('radesk.ui.categories.index'), admin_categories_path
+            = link_to t('radesk.ui.activities.index'), admin_activities_path
             %span.pull-right
-              Logged as administrator
+              = t('radesk.ui.logged_as_admin')
       .wrap
-        = yield
+        = yield

data/app/views/radesk/admin/activities/_answer.html.haml

@@ -0,0 +1 @@
+= link_to object.ticket.title, ticket_path(object.ticket)

data/app/views/radesk/admin/activities/_ticket.html.haml

@@ -0,0 +1 @@
+= link_to object.title, ticket_path(object)

data/app/views/radesk/admin/activities/index.html.haml

@@ -0,0 +1,16 @@
+%h1
+  = t('radesk.ui.activities.index')
+%table.table
+  - @activities.each do |activity|
+    %tr
+      %td
+        %strong
+          = link_to activity.trackable.user.email, admin_user_path(activity.trackable.user)
+        = t("radesk.ui.activities.#{activity.trackable.class.name.split('::').last.downcase}.#{activity.action}")
+        %strong
+          = render "radesk/admin/activities/#{activity.trackable.class.name.split('::').last.downcase}", :object => activity.trackable
+        = time_ago_in_words(activity.created_at)
+        = t('radesk.ui.ago')
+
+
+= paginate @activities

data/app/views/radesk/admin/categories/_form.html.haml

@@ -4,4 +4,6 @@
       = f.label :title
       = f.text_field :title, :class => 'form-control', :required => true
     .form-group.text-right
-      = f.submit 'Save Category', :class => 'btn'
+      - if params[:action] == :edit
+        = link_to t('radesk.ui.delete'), admin_category_path(@category), :class => 'btn btn-clear', :method => :delete
+      = f.submit t('radesk.ui.categories.save'), :class => 'btn'

data/app/views/radesk/admin/categories/edit.html.haml

@@ -1,3 +1,2 @@
-%h1
-  Edit category
+%h1= t('radesk.ui.categories.edit')
 = render 'form'

data/app/views/radesk/admin/categories/index.html.haml

@@ -1,14 +1,16 @@
-%h1
-  Categories
-  = link_to "New Category", new_admin_category_path, :class => 'btn pull-right'
 - if @categories.any?
+  %h1
+    = t('radesk.ui.categories.index')
+    = link_to t('radesk.ui.categories.new'), new_admin_category_path, :class => 'btn pull-right'
   %table.table
     - @categories.each do |category|
       %tr
         %td
-          = category.title
-        %td.text-right
-          = link_to edit_admin_category_path(category) do
-            %i.fa.fa-pencil.light
-          = link_to admin_category_path(category), :method => :delete do
-            %i.fa.fa-close.light
+          = link_to category.title, edit_admin_category_path(category)
+- else
+  .add-something.text-center
+    .title
+      = t('radesk.ui.categories.not_found')
+    .description
+      = t('radesk.ui.but_you_can_create')
+    = link_to t('radesk.ui.categories.new'), new_admin_category_path, :class => 'btn'

data/app/views/radesk/admin/categories/new.html.haml

@@ -1,4 +1,3 @@
-%h1
-  New category
+%h1= t('radesk.ui.categories.new')
 .form
   = render 'form'

data/app/views/radesk/admin/users/show.html.haml

@@ -0,0 +1,3 @@
+%h1
+  = @user.email
+= render 'radesk/tickets/list', :tickets => @tickets

data/app/views/radesk/answers/_form.html.haml

@@ -0,0 +1,24 @@
+= form_for [ticket, answer] do |f|
+  .form-group
+    = f.text_area :message, :class => 'form-control textarea', :rows => 5, :required => true
+  - if answer.uploads.size > 0
+    .form-group
+      .uploads
+        - answer.uploads.each do |upload|
+          .file{ :class => "upload-#{upload.id}" }
+            %i.fa.fa-file-o
+            = link_to upload.file_file_name, upload.file.url, :target => "_blank"
+            = link_to upload_path(upload.id), :method => :delete, :remote => true do
+              %i.fa.fa-close
+  = f.fields_for :uploads, answer.uploads.build do |upload|
+    = render 'radesk/answers/upload_fields', :f => upload
+  .form-group
+    = link_to_add_fields f, :uploads, 'answers/upload_fields' do
+      %i.fa.fa-plus
+      Add file
+  .form-group
+    = f.submit t('radesk.ui.answers.post'), :class => 'btn'
+    - if radesk_current_user.radesk_admin?
+      = f.label :private, :class => 'beside' do
+        = f.check_box :private, :class => 'form-control'
+        = t('radesk.ui.answers.mark_as_private')

data/app/views/radesk/answers/_list.html.haml

@@ -1,19 +1,35 @@
 - answers.each do |answer|
-  .answer{ :class => ('private' if answer.private?) }
+  .answer
     .info
       - if answer.private?
-        %strong
-          Private answer
-      = "#{time_ago_in_words(answer.created_at)} ago"
+        %strong.private
+          %i.fa.fa-lock
+          = t('radesk.ui.answers.private')
+      = time_ago_in_words(answer.created_at)
+      = t('radesk.ui.ago')
       = answer.created_at.strftime("(%-d %b %k:%M)")
-      by
-      = answer.user.email
+      = t('radesk.ui.by')
+      = link_to_if radesk_current_user.try(:radesk_admin?), answer.user.email, admin_user_path(answer.user)
       - if answer.has_access?(radesk_current_user)
-        %span
-          = link_to edit_ticket_answer_path(answer.ticket, answer) do
-            %i.fa.fa-pencil.light
-        %span
-          = link_to ticket_answer_path(answer.ticket, answer), :method => :delete do
-            %i.fa.fa-close.light
+        - if answers.first == answer
+          %span
+            = link_to edit_ticket_path(answer.ticket) do
+              %i.fa.fa-pencil.light
+          %span
+            = link_to ticket_path(answer.ticket), :method => :delete do
+              %i.fa.fa-close.light
+        - else
+          %span
+            = link_to edit_ticket_answer_path(answer.ticket, answer) do
+              %i.fa.fa-pencil.light
+          %span
+            = link_to ticket_answer_path(answer.ticket, answer), :method => :delete do
+              %i.fa.fa-close.light
     .message
-      = answer.message
+      = answer.message
+    - if answer.uploads.size > 0
+      .uploads
+        - answer.uploads.each do |upload|
+          .file
+            %i.fa.fa-file-o
+            = link_to upload.file_file_name, upload.file.url, :target => "_blank"

data/app/views/radesk/answers/_upload_fields.html.haml

@@ -0,0 +1,2 @@
+.form-group
+  = f.file_field :file

data/app/views/radesk/answers/edit.html.haml

@@ -1,7 +1,2 @@
 .form
-  = form_for [@answer.ticket, @answer] do |f|
-    .form-group
-      = f.label :message
-      = f.text_area :message, :class => 'form-control', :rows => 10, :required => true
-    .form-group.text-right
-      = f.submit 'Save Answer', :class => 'btn'
+  = render 'form', :ticket => @answer.ticket, :answer => @answer

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

@@ -4,10 +4,11 @@
       = f.label :title
       = f.text_field :title, :class => 'form-control', :required => true
     .form-group
-      = f.label :message
-      = f.text_area :message, :class => 'form-control textarea', :rows => 10, :required => true
+      = f.fields_for :answers, @ticket.answers.first do |answer_fields|
+        = answer_fields.label :message
+        = answer_fields.text_area :message, :class => 'form-control textarea', :rows => 10, :required => true
     .form-group
       = f.label :category_id
-      = f.select :category_id, Radesk::Category.all.map{ |c| [c.title, c.id] }, {}, :class => 'form-control select'
+      = f.select :category_id, Radesk::Category.all.map{ |c| [c.title, c.id] }, { :prompt => 'No category' }, :class => 'form-control select'
     .form-group.text-right
-      = f.submit 'Save Ticket', :class => 'btn'
+      = f.submit t('radesk.ui.tickets.save'), :class => 'btn'

data/app/views/radesk/tickets/_list.html.haml

@@ -0,0 +1,23 @@
+%table.table
+  %tbody
+    - tickets.each do |ticket|
+      %tr
+        %td.status
+          %span{ :class => "ticket-status-#{ticket.id}"}
+            = render 'radesk/tickets/status', :ticket => ticket
+        %td
+          .title
+            = link_to ticket do
+              %strong
+                = ticket.title.truncate(100)
+              - if ticket.answers.first
+                %span.message
+                  = ticket.answers.first.message.truncate(100)
+        %td
+          - if ticket.category
+            = link_to ticket.category.title, category_tickets_path(ticket.category), :class => 'ticket-category'
+        %td.created_at.text-right
+          = time_ago_in_words(ticket.created_at)
+          = t('radesk.ui.ago')
+          = ticket.created_at.strftime("(%-d %b %k:%M)")
+= paginate tickets

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

@@ -1,26 +1,15 @@
 - if @tickets.any?
   %h1
-    Tickets
-    = link_to "New Ticket", new_ticket_path, :class => 'btn pull-right'
-  %table.table
-    %tbody
-      - @tickets.each do |ticket|
-        %tr
-          %td.status
-            %span{ :class => "ticket-status-#{ticket.id}"}
-              = render 'status', :ticket => ticket
-          %td
-            .title
-              = link_to ticket do
-                %strong
-                  = ticket.title.truncate(100)
-                %span.message
-                  = ticket.message.truncate(100)
-          %td
-            - if ticket.category
-              %span.ticket-category
-                = ticket.category.title
-          %td.created_at.text-right
-            = "#{time_ago_in_words(ticket.created_at)} ago"
-            = ticket.created_at.strftime("(%-d %b %k:%M)")
-  = paginate @tickets
+    = t('radesk.ui.tickets.index')
+    = link_to t('radesk.ui.tickets.new'), new_ticket_path, :class => 'btn pull-right'
+    - if params[:action] == 'category'
+      = t('radesk.ui.tickets.within')
+      = @category.title
+  = render 'list', :tickets => @tickets
+- else
+  .add-something.text-center
+    .title
+      = t('radesk.ui.tickets.not_found')
+    .description
+      = t('radesk.ui.but_you_can_create')
+    = link_to t('radesk.ui.tickets.new'), new_ticket_path, :class => 'btn'

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

@@ -1,4 +1,3 @@
-%h1
-  Have a problem?
+%h1= t('radesk.ui.tickets.new')
 .form
   = render 'form'

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

@@ -2,41 +2,10 @@
   %span{ :class => "ticket-status-#{@ticket.id}"}
     = render 'status', :ticket => @ticket
   = @ticket.title
-.ticket
-  .info
-    = "#{time_ago_in_words(@ticket.created_at)} ago"
-    = @ticket.created_at.strftime("(%-d %b %k:%M)")
-    by
-    = @ticket.user.email
-    - if radesk_current_user.try(:radesk_admin?)
-      %span
-        = link_to edit_ticket_path(@ticket) do
-          %i.fa.fa-pencil.light
-      %span
-        = link_to ticket_path(@ticket), :method => :delete do
-          %i.fa.fa-close.light
-    - if @ticket.category
-      %span.ticket-category
-        = @ticket.category.title
-  .message
-    = @ticket.message
-
-- if @ticket.answers.any?
-  %h2
-    = pluralize(@answers.count, 'answer')
-  .answers
-    = render 'radesk/answers/list', :answers => @answers
+.answers
+  = render 'radesk/answers/list', :answers => @answers
 %h2
-  Your Answer
+  = t('radesk.ui.answers.your')
 .create_answer
   .form
-    = form_for [@ticket, @ticket.answers.build] do |f|
-      .form-group
-        = f.text_area :message, :class => 'form-control textarea', :rows => 5, :required => true
-      - if radesk_current_user.radesk_admin?
-        .form-group.text-right
-          = f.label :private do
-            = f.check_box :private, :class => 'form-control'
-            Mark as private
-      .form-group.text-right
-        = f.submit 'Post Answer', :class => 'btn'
+    = render 'radesk/answers/form', :ticket => @ticket, :answer => @ticket.answers.build

data/app/views/radesk/uploads/destroy.js.erb

@@ -0,0 +1 @@
+$(".upload-<%= @upload.id %>").hide();

data/config/locales/en.yml

@@ -0,0 +1,51 @@
+en:
+  radesk:
+    ui:
+      home: Home
+      delete: Delete
+      by: by
+      ago: ago
+      logged_as_admin: Logged as administrator
+      but_you_can_create: But you can create a new one
+      tickets:
+        index: Tickets
+        save: Save Ticket
+        new: New Ticket
+        not_found: No tickets found
+        within: within
+      answers:
+        index: Answer
+        private: Private
+        your: Your Answer
+        mark_as_private: Mark as private
+        post: Post Answer
+        save: Save Answer
+      categories: 
+        index: Categories
+        edit: Edit Category
+        save: Save Category
+        new: New Category
+        not_found: No categories found
+      activities:
+        index: Activity Feed
+        ticket:
+          create: created ticket
+          update: updated ticket
+          destroy: destroyed ticket
+          open: opened ticket
+          close: closed ticket
+        answer:
+          create: added answer to ticket
+          update: updated answer to ticket
+          destroy: destroyed answer from ticket
+    activerecord:
+      attributes:
+        ticket:
+          title: Your Question
+          message: Description
+          category_id: Category
+        answer:
+          message: Your Answer
+          private: Private
+        category:
+          title: Title

data/config/locales/zh-CN.yml

@@ -0,0 +1,37 @@
+zh-CN:
+  radesk:
+    ui:
+      home: 主页
+      by: 属于
+      ago: 前制造
+      logged_as_admin: 登录为管理员
+      but_you_can_create: 但是你可以创建新的
+      tickets:
+        index: 票
+        save: 保存票
+        new: 新票
+        not_found: 找不到票
+      answers:
+        index: 答案
+        private: 私有答案
+        your: 您的答案
+        mark_as_private: 标记为私有
+        post: 发表答案
+        save: 保存答案
+      categories: 
+        index: 类别
+        edit: 编辑类别
+        save: 保存类别
+        new: 新类别
+        not_found: 未找到类别
+    activerecord:
+attributes:
+        ticket:
+          title: 您的问题
+          message: 说面
+          category_id: 类别
+        answer:
+          message: 您的答案
+          private: 私有
+        category:
+          title: 标题

data/config/routes.rb

@@ -1,14 +1,23 @@
 Radesk::Engine.routes.draw do
+
   resources :tickets do
     member do
       get 'open'
       get 'close'
     end
+    collection do
+      get 'category/:id' => 'tickets#category', :as => :category
+    end
     resources :answers, :except => [:index, :show, :new]
   end
 
+  resources :uploads, :only => [:destroy]
+
+  
   namespace :admin do
     resources :categories, :except => [:show]
+    resources :users, :only => [:show]
+    resources :activities, :only => :index
   end
 
   root 'tickets#index'