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

app/views/home/index.html.erb

@@ -1,5 +1,4 @@
 <h1><%= t 'home.willkommen' %></h1>
-<p><%= t 'home.hallobeiderfet' %></p>
 <div class="alert alert-info">
 <h2>Alpha Test</h2>
 <p>Die Webseite befindet sich derzeit in einem Entsicklungsstadium,
@@ -9,5 +8,14 @@ Fehlermeldungen auf GitHub melden.
 <p>
 <%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>
 </p>
+<p>
+Folgene Features sind schon soweit, dass Bugreports sinnvoll sind:
+<ul>
+<li>Studien/Beispielsammlung</li>
+</ul>
+alle anderen sind nur zur Voransicht. Bezüglich Design und Steuerung sind Vorschläge erwünscht.
+</p>
+<p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
 </div>
+<p><%= t 'home.hallobeiderfet' %></p>
 <%= link_to "Entwicklungsstatus" , home_dev_path %>

app/views/layouts/menu.html.erb

@@ -15,8 +15,6 @@
 	  <li><%= link_to I18n.t(:info,:scope=>'home' ) %></li>
 	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
 	  <li><%= link_to "Kalender", calendars_path %></li>
-	  <li><%= link_to "wiki intern", page_path(1) %>
-	  </li>
 	  <% if user_signed_in? %>
 	  <li>Logged in as : <%= current_user.email %>
 	    <%= link_to('Logout', destroy_user_session_path, :method => :delete) %>        
@@ -33,7 +31,7 @@
 	    <%end %>
 	  </li>
 	  <li>
-	    <%= link_to 'Admin' , config_url%>
+	    <%= link_to 'Admin' , config_path%>
 	  </li>
 	</ul>
       </div>

db/schema.rb

@@ -13,11 +13,6 @@
 
 ActiveRecord::Schema.define(:version => 20130812070544) do
 
-  create_table "attachments", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at", :null => false
-  end
-
   create_table "beispiel_translations", :force => true do |t|
     t.string   "locale"
     t.text     "desc"
@@ -27,22 +22,17 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
   end
 
   add_index "beispiel_translations", ["locale"], :name => "index_beispiel_translations_on_locale"
-=======
-    t.integer  "thema_id"
-  end
-<<<<<<< HEAD
->>>>>>> master
-=======
->>>>>>> thomasb/master
->>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
 
   create_table "beispiele", :force => true do |t|
     t.string   "name"
     t.text     "desc"
     t.integer  "lva_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-    t.string   "beispieldatei"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+    t.string   "file_file_name"
+    t.string   "file_content_type"
+    t.integer  "file_file_size"
+    t.datetime "file_updated_at"
   end
 
   create_table "calendars", :force => true do |t|
@@ -70,39 +60,6 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
     t.datetime "updated_at", :null => false
   end
 
-<<<<<<< HEAD
-=======
-  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"
-
-<<<<<<< HEAD
->>>>>>> master
-=======
->>>>>>> thomasb/master
->>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
-  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
-<<<<<<< HEAD
-=======
-    t.integer  "thema_id"
-<<<<<<< HEAD
->>>>>>> master
-=======
->>>>>>> thomasb/master
->>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
-  end
-
   create_table "lva_translations", :force => true do |t|
     t.integer  "lva_id"
     t.string   "locale"
@@ -199,6 +156,18 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "pages", :force => true do |t|
+    t.string   "name"
+    t.string   "url"
+    t.integer  "parent_id"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "pages", ["parent_id"], :name => "index_pages_on_parent_id"
+
   create_table "roles", :force => true do |t|
     t.string   "name"
     t.integer  "resource_id"
@@ -248,45 +217,6 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
 
   add_index "studium_translations", ["locale"], :name => "index_studium_translations_on_locale"
 
-  create_table "themen", :force => true do |t|
-      t.integer  "themen_id"
-  end
-  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
-  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