AutoCommit Fre Jul 10 11:03:02 CEST 2015

This commit is contained in:
Andreas Stephanides
2015-07-10 11:03:02 +02:00
parent b399a961a3
commit 5d9571b03a
3 changed files with 24 additions and 7 deletions

View File

@@ -12,11 +12,16 @@
<div class="span6"> <div class="span6">
<%= f.input :flag_important, :placeholder=> "Titel" %> <%= f.input :flag_important, :placeholder=> "Titel" %>
</div> </div>
<div class="span12"> <div class="row-fluid">
<div class="span8">
<%= f.input :text, :as=> :tinymce_text %> <%= f.input :text, :as=> :tinymce_text %>
</div> </div>
<div class="span4">
</div> <%= if I18n.locale == :en %>
</div>
</div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<% f.input :datum, :as=> :datepicker %> <% f.input :datum, :as=> :datepicker %>

View File

@@ -31,12 +31,13 @@
end end
devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
scope '(:locale)', constraints: {:locale=>/en|de/i} do scope '(:locale)', constraints: {:locale=>/en|de/i} do
get 't/:theme/:url', to: redirect('/%{url}')
scope '(t/:theme)' do scope '(t/:theme)' do
get "" , controller: :home, action: :index get "" , controller: :home, action: :index
get "intern" , controller: :home, action: :intern get "intern" , controller: :home, action: :intern
get "beispielsammlung", to: redirect('/studien')
scope '(:ansicht)' do scope '(:ansicht)' do
resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do
member do member do
@@ -101,13 +102,18 @@
get 'verwalten' get 'verwalten'
end end
end end
resources :fetprofiles do resources :fetprofiles, as: :fetprofiles_bak do
collection do collection do
get 'verwalten' get 'verwalten'
get 'internlist' get 'internlist'
end end
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] resources :fragen, :only =>[:new, :edit, :update, :destroy, :create]

View File

@@ -0,0 +1,6 @@
class AddSidToThemen < ActiveRecord::Migration
def change
add_column :themen,:sid, :string
add_index :themen,:sid, unique: true
end
end