diff --git a/app/views/neuigkeiten/_form.html.erb b/app/views/neuigkeiten/_form.html.erb index 6d8f93d..17e3952 100755 --- a/app/views/neuigkeiten/_form.html.erb +++ b/app/views/neuigkeiten/_form.html.erb @@ -12,11 +12,16 @@
<%= f.input :flag_important, :placeholder=> "Titel" %>
-
+
+ +
<%= f.input :text, :as=> :tinymce_text %>
- -
+
+ <%= if I18n.locale == :en %> +
+ +
<% f.input :datum, :as=> :datepicker %> diff --git a/config/routes.rb b/config/routes.rb index 0157db5..c12894e 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,12 +31,13 @@ end devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} - + scope '(:locale)', constraints: {:locale=>/en|de/i} do + get 't/:theme/:url', to: redirect('/%{url}') scope '(t/:theme)' do get "" , controller: :home, action: :index get "intern" , controller: :home, action: :intern - + get "beispielsammlung", to: redirect('/studien') scope '(:ansicht)' do resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do member do @@ -101,13 +102,18 @@ get 'verwalten' end end - resources :fetprofiles do + resources :fetprofiles, as: :fetprofiles_bak do collection do get 'verwalten' get 'internlist' end end - + resources :members , controller: :fetprofiles , as: :fetprofiles do + collection do + get 'verwalten' + get 'internlist' + end + end resources :fragen, :only =>[:new, :edit, :update, :destroy, :create] diff --git a/db/migrate/20150710082704_add_sid_to_themen.rb b/db/migrate/20150710082704_add_sid_to_themen.rb new file mode 100644 index 0000000..66e0abf --- /dev/null +++ b/db/migrate/20150710082704_add_sid_to_themen.rb @@ -0,0 +1,6 @@ +class AddSidToThemen < ActiveRecord::Migration + def change + add_column :themen,:sid, :string + add_index :themen,:sid, unique: true + end +end