Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb

db/schema.rb

@@ -11,7 +11,14 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130729085446) do
+ActiveRecord::Schema.define(:version => 20130813145651) do
+
+  create_table "attachments", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.integer  "thema_id"
+  end
 
   create_table "beispiele", :force => true do |t|
     t.string   "name"
@@ -22,6 +29,50 @@ ActiveRecord::Schema.define(:version => 20130729085446) do
     t.string   "beispieldatei"
   end
 
+  create_table "calendars", :force => true do |t|
+    t.string   "name"
+    t.boolean  "public"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.string   "picture"
+  end
+
+  create_table "calendars_calentries", :id => false, :force => true do |t|
+    t.integer "calentry_id"
+    t.integer "calendar_id"
+  end
+
+  add_index "calendars_calentries", ["calendar_id"], :name => "index_calendars_calentries_on_calendar_id"
+  add_index "calendars_calentries", ["calentry_id", "calendar_id"], :name => "index_calendars_calentries_on_calentry_id_and_calendar_id"
+
+  create_table "calentries", :force => true do |t|
+    t.datetime "start"
+    t.datetime "ende"
+    t.string   "summary"
+    t.integer  "typ"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "frage_translations", :force => true do |t|
+    t.string   "locale"
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.integer  "fragen_id"
+  end
+
+  add_index "frage_translations", ["locale"], :name => "index_frage_translations_on_locale"
+
+  create_table "fragen", :force => true do |t|
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.integer  "thema_id"
+  end
+
   create_table "lva_translations", :force => true do |t|
     t.integer  "lva_id"
     t.string   "locale"
@@ -39,10 +90,13 @@ ActiveRecord::Schema.define(:version => 20130729085446) do
     t.decimal  "ects"
     t.string   "lvanr"
     t.decimal  "stunden"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
     t.integer  "modul_id"
     t.integer  "semester_id"
+    t.text     "pruefungsinformation"
+    t.text     "lernaufwand"
+    t.string   "typ"
   end
 
   create_table "lvas_moduls", :id => false, :force => true do |t|
@@ -50,11 +104,14 @@ ActiveRecord::Schema.define(:version => 20130729085446) do
     t.integer "modul_id"
   end
 
-  create_table "lvas_semesters", :force => true do |t|
+  create_table "lvas_semesters", :id => false, :force => true do |t|
     t.integer "lva_id"
     t.integer "semester_id"
   end
 
+  add_index "lvas_semesters", ["lva_id", "semester_id"], :name => "index_lvas_semesters_on_lva_id_and_semester_id"
+  add_index "lvas_semesters", ["semester_id"], :name => "index_lvas_semesters_on_semester_id"
+
   create_table "modul_translations", :force => true do |t|
     t.integer  "modul_id"
     t.string   "locale"
@@ -148,6 +205,7 @@ ActiveRecord::Schema.define(:version => 20130729085446) do
     t.string   "typ"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.string   "abkuerzung"
   end
 
   create_table "studium_translations", :force => true do |t|
@@ -161,6 +219,43 @@ ActiveRecord::Schema.define(:version => 20130729085446) do
 
   add_index "studium_translations", ["locale"], :name => "index_studium_translations_on_locale"
 
+  create_table "thema_translations", :force => true do |t|
+    t.string   "locale"
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+    t.integer  "theman_id"
+  end
+
+  add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale"
+
+  create_table "themen", :force => true do |t|
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "themengruppe_id"
+  end
+
+  create_table "themengruppe_translations", :force => true do |t|
+    t.string   "locale"
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+    t.integer  "themengruppen_id"
+  end
+
+  add_index "themengruppe_translations", ["locale"], :name => "index_themengruppe_translations_on_locale"
+
+  create_table "themengruppen", :force => true do |t|
+    t.string   "title"
+    t.text     "text"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "email",                  :default => "", :null => false
     t.string   "encrypted_password",     :default => "", :null => false