diff options
| author | azul <azul@riseup.net> | 2013-07-06 07:51:54 -0700 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-07-06 07:51:54 -0700 |
| commit | a18efa42ddc1cf8692d55f76ca3e92792913f40d (patch) | |
| tree | 00527737a38bdafcd2e175bb6caf5e30b3360de1 /help/config | |
| parent | d03e82b4df5075f796f56fb9568992b0ba0d7c07 (diff) | |
| parent | dc98ad8c6445182d60b3f1909e0260ace6fbfca5 (diff) | |
Merge pull request #55 from elijh/feature/new-ui
Feature/new ui
Diffstat (limited to 'help/config')
| -rw-r--r-- | help/config/locales/en.yml | 22 | ||||
| -rw-r--r-- | help/config/routes.rb | 7 |
2 files changed, 25 insertions, 4 deletions
diff --git a/help/config/locales/en.yml b/help/config/locales/en.yml index 4ea662a..79e745f 100644 --- a/help/config/locales/en.yml +++ b/help/config/locales/en.yml @@ -1,2 +1,22 @@ en: - access_ticket_text: "You can later access this ticket at the url %{full_url}. You might want to bookmark this page to find it again. Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to remove it from the browser history" + access_ticket_text: > + You can later access this ticket at the url %{full_url}. You might want to bookmark this page to find it again. + Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to + remove it from the browser history. + support_tickets: "Support Tickets" + all_tickets: "All Tickets" + my_tickets: "My Tickets" + open_tickets: "Open Tickets" + closed_tickets: "Closed Tickets" + new_ticket: "New Ticket" + tickets: "Tickets" + subject: "Subject" + destroy: "Destroy" + open: "Open" + closed: "Closed" + close: "Close" + post_reply: "Post Reply" + reply_and_close: "Reply and Close" + description: "Description" + ticket: "Ticket" + regarding_account: "Regarding Account"
\ No newline at end of file diff --git a/help/config/routes.rb b/help/config/routes.rb index 86a9201..8f3241c 100644 --- a/help/config/routes.rb +++ b/help/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do - - resources :tickets, :only => [:new, :create, :index, :show, :update, :destroy] - #resources :ticket, :only => [:show] + resources :tickets, :except => :edit + resources :users do + resources :tickets, :except => :edit + end end |