diff options
| author | Luc Donnet | 2017-07-17 18:40:20 +0200 | 
|---|---|---|
| committer | Luc Donnet | 2017-07-17 18:40:20 +0200 | 
| commit | d7274985e4f986cea6694b9f2d3f3a3daba8afc6 (patch) | |
| tree | c41d51d24ba47b5f5e51a8e4ab7c4d24e5431e09 /config | |
| parent | cb3e00c7b148505b482d12a6ad0cf92dfd0b4d65 (diff) | |
| parent | 840dc7ee2f51f00cd0b451b7b91fcc462e42a611 (diff) | |
| download | chouette-core-d7274985e4f986cea6694b9f2d3f3a3daba8afc6.tar.bz2 | |
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/workbenches.en.yml | 12 | ||||
| -rw-r--r-- | config/locales/workbenches.fr.yml | 12 | ||||
| -rw-r--r-- | config/routes.rb | 9 | 
3 files changed, 29 insertions, 4 deletions
diff --git a/config/locales/workbenches.en.yml b/config/locales/workbenches.en.yml new file mode 100644 index 000000000..8525a4b9f --- /dev/null +++ b/config/locales/workbenches.en.yml @@ -0,0 +1,12 @@ +en: +  workbenches: +    index: +      title: "%{organisation} dashboard" +      offers: +        title: "Transport offers" +        organisation: "Organisation offers" +        idf: "IDF offers" +        referentials: "Referentials" +        calendars: "Calendars" +        see: "See the list" +        no_content: "No content yet." diff --git a/config/locales/workbenches.fr.yml b/config/locales/workbenches.fr.yml new file mode 100644 index 000000000..1cdc19a13 --- /dev/null +++ b/config/locales/workbenches.fr.yml @@ -0,0 +1,12 @@ +fr: +  workbenches: +    index: +      title: "Tableau de bord %{organisation}" +      offers: +        title: "Offres de transport" +        organisation: "Offres de mon organisation" +        idf: "Offres IDF" +        referentials: "Jeux de données" +        calendars: "Calendriers" +        see: "Voir la liste" +        no_content: "Aucun contenu pour le moment" diff --git a/config/routes.rb b/config/routes.rb index aa6713857..28c092e6a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@  require 'sidekiq/web'  ChouetteIhm::Application.routes.draw do -  resources :workbenches, :only => [:show] do +  resources :workbenches, only: [:show, :index] do      delete :referentials, on: :member, action: :delete_referentials      resources :imports do        get :download, on: :member @@ -14,7 +14,7 @@ ChouetteIhm::Application.routes.draw do    devise_scope :user do      authenticated :user do -      root :to => 'referentials#index', as: :authenticated_root +      root :to => 'workbenches#index', as: :authenticated_root      end      unauthenticated :user do @@ -76,7 +76,7 @@ ChouetteIhm::Application.routes.draw do      get :autocomplete, on: :collection, controller: 'autocomplete_calendars'    end -  resources :referentials do +  resources :referentials, except: :index do      resources :api_keys      resources :autocomplete_stop_areas, only: [:show, :index] do        get 'around', on: :member @@ -213,7 +213,8 @@ ChouetteIhm::Application.routes.draw do        end      end    end -  root :to => "referentials#index" + +  root :to => "workbenches#index"    get '/help/(*slug)' => 'help#show'  | 
