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

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb

app/assets/stylesheets/application.css.scss

@@ -10,7 +10,7 @@
  *
  *= require_self
  *= require_tree .
- *= require 'bootstrap'
+ * require 'bootstrap'
  */
 $linkColor: #03006E;
 @import 'bootstrap';

app/assets/stylesheets/formtastic-changes.css.scss

@@ -8,7 +8,6 @@ form.formtastic textarea {
 width:90%;
 height:20em;
 }
-
 form.formtastic .input label.control-label {
 font-weight:bold;
 font-size:125%;

app/controllers/beispiele_controller.rb

@@ -45,10 +45,6 @@ class BeispieleController < ApplicationController
     lvaid=params[:lva_id]
     params.delete(:lva_id)
     @beispiel = Beispiel.new(params[:beispiel])
-<<<<<<< HEAD
-    
-=======
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
     respond_to do |format|
       if @beispiel.save
         format.html { redirect_to @beispiel, notice: 'Beispiel was successfully created.' }

app/models/calentry.rb

@@ -11,6 +11,9 @@ class Calentry < ActiveRecord::Base
   def start_time
     start
   end
+  def start1
+    start.to_date
+  end
   def name
 	summary
   end

app/views/calendars/show.html.erb

@@ -10,7 +10,7 @@
 <ul class="list-group">
 <% @calendar.calentries.each do |entry| %>
 <li class="list-group-item">
-<%= link_to entry.summary+ " - " + I18n.l(entry.start), entry %>
+<%= link_to entry.summary+ " - " + I18n.l(entry.start1), entry %>
 </li>
 <% end %>
 </ul>

app/views/home/index.html.erb

@@ -1,3 +1,13 @@
 <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,
+volle Funktionsfähigkeit ist noch nicht erreicht. Bitte Featurerequests und
+Fehlermeldungen auf GitHub melden.
+</p>
+<p>
+<%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>
+</p>
+</div>
 <%= link_to "Entwicklungsstatus" , home_dev_path %>

app/views/lvas/show.html.erb

@@ -18,7 +18,13 @@
       </div>
       <div class="row-fluid">
 	<h2>Beispiele</h2>
+  <p><h4>Beschreibung</h4>
+  <%= @lva.desc %>
 
+<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %>
+</p>
+<h4>Beispiele</h4>
+<ul>
   <% @lva.beispiele.each do |b|%>
 
 	  <%= render b%>

app/views/studien/_form.html.erb

@@ -1,14 +1,9 @@
 <div class="container-fluid">
   <%= tinymce_assets %>
   <%= semantic_form_for @studium do |f| %>
-<<<<<<< HEAD
 
   <%= f.inputs do %>
-=======
-  <div class="span9">
-  <%= f.inputs do %>
 
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
   <div class="row-fluid">
     <div class="span6">
       <%= f.input :name,:append=>"NAME" %>
@@ -23,19 +18,10 @@
   <div class="row-fluid">
     <%= f.input :desc, :as=>:tinymce_text %>
   </div>
-<<<<<<< HEAD
 
-=======
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
   <% end %>
   <%= tinymce %>
   <%= f.actions do %>
   <%= f.action :submit, :as => :input %>
-  <% end %>
-<<<<<<< HEAD
-
-=======
-  </div>
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca
-  <% end %>
+<% end %>
 </div>

config/locales/de.yml

@@ -119,7 +119,6 @@ de:
             modulgruppen:
               blank: "Wählen Sie zumindest eine Modulgruppe aus"
   filter:
-    
     studium: "Studium"
     modulgruppe: "Modulgruppe"
     modul: "Modul"
@@ -327,4 +326,3 @@ de:
       long: ! '%A, %d. %B %Y, %H:%M Uhr'
       short: ! '%d.%m.%Y, %H:%M Uhr'
     pm: nachmittags
-

config/routes.rb

@@ -1,10 +1,5 @@
  Fetsite::Application.routes.draw do
     
-  resources :calendars
-
-
-  resources :calentries
-
    devise_for :users
    resources :home, :only=>[:index]
    #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
@@ -51,6 +46,8 @@
      get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
      resources :beispiele
  
+  resources :calendars
+  resources :calentries
    end
 
    # The priority is based upon order of creation:

db/schema.rb

@@ -16,8 +16,6 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
   create_table "attachments", :force => true do |t|
     t.string   "name"
     t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-<<<<<<< HEAD
   end
 
   create_table "beispiel_translations", :force => true do |t|
@@ -32,7 +30,11 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
 =======
     t.integer  "thema_id"
   end
+<<<<<<< HEAD
 >>>>>>> master
+=======
+>>>>>>> thomasb/master
+>>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
 
   create_table "beispiele", :force => true do |t|
     t.string   "name"
@@ -81,7 +83,11 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
 
   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"
@@ -90,7 +96,11 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
 <<<<<<< HEAD
 =======
     t.integer  "thema_id"
+<<<<<<< HEAD
 >>>>>>> master
+=======
+>>>>>>> thomasb/master
+>>>>>>> 4aca98c0f53d92273c1efb7ae217fa7a89630d57
   end
 
   create_table "lva_translations", :force => true do |t|
@@ -238,22 +248,17 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
 
   add_index "studium_translations", ["locale"], :name => "index_studium_translations_on_locale"
 
-<<<<<<< HEAD
   create_table "themen", :force => true do |t|
-=======
+      t.integer  "themen_id"
+  end
   create_table "thema_translations", :force => true do |t|
     t.string   "locale"
->>>>>>> master
     t.string   "title"
     t.text     "text"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-<<<<<<< HEAD
   end
 
-=======
-    t.integer  "themen_id"
-  end
 
   add_index "thema_translations", ["locale"], :name => "index_thema_translations_on_locale"
 
@@ -275,8 +280,6 @@ ActiveRecord::Schema.define(:version => 20130812070544) do
   end
 
   add_index "themengruppe_translations", ["locale"], :name => "index_themengruppe_translations_on_locale"
-
->>>>>>> master
   create_table "themengruppen", :force => true do |t|
     t.string   "title"
     t.text     "text"