Merge branch 'kalender'

Conflicts:
	config/locales/de.yml

Gemfile

@@ -12,9 +12,9 @@ gem 'rails', '3.2.9'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', '~> 3.2.3'
+  gem 'sass-rails', '~> 3.2'
   gem 'coffee-rails', '~> 3.2.1'
-  gem 'bootstrap-sass','~> 2.2.0'
+  gem 'bootstrap-sass','~> 2.3.2.1'
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer', :platforms => :ruby
   gem 'uglifier', '>= 1.0.3'
@@ -75,3 +75,6 @@ group :development, :test do
 gem 'factory_girl_rails'
 gem 'rspec-rails'
 end
+
+gem "simple_calendar", "~> 0.1.9"
+gem 'rmagick'

Gemfile.lock

@@ -35,7 +35,7 @@ GEM
       activerecord (>= 3.0.0)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-x86-mingw32)
-    bootstrap-sass (2.2.2.0)
+    bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
     builder (3.0.4)
     cancan (1.6.9)
@@ -128,6 +128,7 @@ GEM
     rdoc (3.12.1)
       json (~> 1.4)
     ref (1.0.2)
+    rmagick (2.13.2)
     rolify (3.2.0)
     rspec-core (2.14.4)
     rspec-expectations (2.14.0)
@@ -145,6 +146,8 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    simple_calendar (0.1.9)
+      rails (>= 3.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -176,7 +179,7 @@ PLATFORMS
 DEPENDENCIES
   annotate (>= 2.5.0)
   awesome_nested_set
-  bootstrap-sass (~> 2.2.0)
+  bootstrap-sass (~> 2.3.2.1)
   cancan
   carrierwave
   coffee-rails (~> 3.2.1)
@@ -192,9 +195,11 @@ DEPENDENCIES
   paper_trail (>= 2.7.0)
   paperclip (~> 3.4.0)
   rails (= 3.2.9)
+  rmagick
   rolify
   rspec-rails
-  sass-rails (~> 3.2.3)
+  sass-rails (~> 3.2)
+  simple_calendar (~> 0.1.9)
   sqlite3
   therubyracer
   tinymce-rails (>= 3.5.8)

app/assets/javascripts/calendars.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/calentries.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

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/calendars.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the calendars controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/calentries.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the calentries controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

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

@@ -0,0 +1,20 @@
+form.formtastic .stringish input {
+width:90%;
+}
+form.formtastic textarea {
+width:90%;
+height:20em;
+}
+
+
+div.form-group {
+border-width: 1px;
+border-style: none;
+padding: 10px;
+// border-radius: 10px;
+}
+div.verwalten-block {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+}

app/controllers/calendars_controller.rb

@@ -0,0 +1,83 @@
+class CalendarsController < ApplicationController
+  # GET /calendars
+  # GET /calendars.json
+  def index
+    @calendars = Calendar.all
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @calendars }
+    end
+  end
+
+  # GET /calendars/1
+  # GET /calendars/1.json
+  def show
+    @calendar = Calendar.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @calendar }
+      format.ics  { render 'show.ics.erb'}
+    end
+  end
+
+  # GET /calendars/new
+  # GET /calendars/new.json
+  def new
+    @calendar = Calendar.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @calendar }
+    end
+  end
+
+  # GET /calendars/1/edit
+  def edit
+    @calendar = Calendar.find(params[:id])
+  end
+
+  # POST /calendars
+  # POST /calendars.json
+  def create
+    @calendar = Calendar.new(params[:calendar])
+
+    respond_to do |format|
+      if @calendar.save
+        format.html { redirect_to @calendar, notice: 'Calendar was successfully created.' }
+        format.json { render json: @calendar, status: :created, location: @calendar }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @calendar.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /calendars/1
+  # PUT /calendars/1.json
+  def update
+    @calendar = Calendar.find(params[:id])
+
+    respond_to do |format|
+      if @calendar.update_attributes(params[:calendar])
+        format.html { redirect_to @calendar, notice: 'Calendar was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @calendar.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /calendars/1
+  # DELETE /calendars/1.json
+  def destroy
+    @calendar = Calendar.find(params[:id])
+    @calendar.destroy
+
+    respond_to do |format|
+      format.html { redirect_to calendars_url }
+      format.json { head :no_content }
+    end
+  end
+end

app/controllers/calentries_controller.rb

@@ -0,0 +1,84 @@
+class CalentriesController < ApplicationController
+  # GET /calentries
+  # GET /calentries.json
+  def index
+    @calentries = Calentry.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @calentries }
+    end
+  end
+
+  # GET /calentries/1
+  # GET /calentries/1.json
+  def show
+    @calentry = Calentry.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @calentry }
+      format.ics  { render 'show.ics.erb'}
+    end
+  end
+
+  # GET /calentries/new
+  # GET /calentries/new.json
+  def new
+    @calentry = Calentry.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @calentry }
+    end
+  end
+
+  # GET /calentries/1/edit
+  def edit
+    @calentry = Calentry.find(params[:id])
+  end
+
+  # POST /calentries
+  # POST /calentries.json
+  def create
+    @calentry = Calentry.new(params[:calentry])
+
+    respond_to do |format|
+      if @calentry.save
+        format.html { redirect_to @calentry, notice: 'Calentry was successfully created.' }
+        format.json { render json: @calentry, status: :created, location: @calentry }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @calentry.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /calentries/1
+  # PUT /calentries/1.json
+  def update
+    @calentry = Calentry.find(params[:id])
+
+    respond_to do |format|
+      if @calentry.update_attributes(params[:calentry])
+        format.html { redirect_to @calentry, notice: 'Calentry was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @calentry.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /calentries/1
+  # DELETE /calentries/1.json
+  def destroy
+    @calentry = Calentry.find(params[:id])
+    @calentry.destroy
+
+    respond_to do |format|
+      format.html { redirect_to calentries_url }
+      format.json { head :no_content }
+    end
+  end
+end

app/helpers/calendars_helper.rb

@@ -0,0 +1,2 @@
+module CalendarsHelper
+end

app/helpers/calentries_helper.rb

@@ -0,0 +1,2 @@
+module CalentriesHelper
+end

app/inputs/date_string_input.rb

@@ -0,0 +1,7 @@
+class DateStringInput < FormtasticBootstrap::Inputs::StringInput
+	def input_html_options
+		value = (@object.send(method.to_sym))
+		super.merge(:class => "datetext", :onclick =>"beep", :value=>I18n.l((value.is_a?(Time)||value.is_a?(Date)||value.is_a?(DateTime)) ? value : Time.now))
+	end
+	
+end

app/models/calendar.rb

@@ -0,0 +1,5 @@
+class Calendar < ActiveRecord::Base
+  attr_accessible :name, :public, :picture
+  has_and_belongs_to_many :calentries
+  mount_uploader :picture, PictureUploader
+end

app/models/calentry.rb

@@ -0,0 +1,20 @@
+class Calentry < ActiveRecord::Base
+  attr_accessible :ende, :start, :summary, :typ,:calendar_ids
+  has_and_belongs_to_many :calendars
+  validates :start, :presence => true
+  validates :typ, :presence => true
+  validate do |entry|
+	if entry.ende.nil? 
+		errors.add(:ende, "Es muss ein Endzeitpunkt vorhanden sein")
+	end
+  end
+  def start_time
+    start
+  end
+  def start1
+    start.to_date
+  end
+  def name
+	summary
+  end
+end

app/uploaders/picture_uploader.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+class PictureUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+   include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+   version :thumb do
+     process :resize_to_fill => [64, 64]
+   end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+   def extension_white_list
+     %w(jpg jpeg gif png)
+   end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

app/views/calendars/_form.html.erb

@@ -0,0 +1,11 @@
+<%= semantic_form_for @calendar do |f| %>
+  <%= f.inputs do %>
+    <%= f.input :name %>
+    <%= f.input :public %>
+    <%= f.input :picture, :as => :file %>
+  <% end %>
+
+  <%= f.actions do %>
+    <%= f.action :submit, :as => :input %>
+  <% end %>
+<% end %>

app/views/calendars/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing calendar</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @calendar %> |
+<%= link_to 'Back', calendars_path %>

app/views/calendars/index.html.erb

@@ -0,0 +1,14 @@
+<h1>Listing calendars</h1>
+
+<% @calendars.each do |calendar| %>
+    <div class="media">
+	<a class="pull-left" href="#">
+	    <img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
+	</a>
+	<div class="media-body">
+	    <h4><%= link_to calendar.name, calendar %></h4>
+	</div>
+    </div>
+<% end %>
+
+<%= link_to 'New Calendar', new_calendar_path %>

app/views/calendars/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New calendar</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', calendars_path %>

app/views/calendars/show.html.erb

@@ -0,0 +1,30 @@
+<div class="container-fluid">
+ <div class="row-fluid">
+<p id="notice"><%= notice %></p>
+
+<h1>
+  <%= '<i class="icon-globe"></i>'.html_safe unless !@calendar.public%>
+  <%=  @calendar.name %>
+</h1>
+ <div class="row-fluid">
+<ul class="list-group">
+<% @calendar.calentries.each do |entry| %>
+<li class="list-group-item">
+<%= link_to entry.summary+ " - " + I18n.l(entry.start1), entry %>
+</li>
+<% end %>
+</ul>
+</div>
+ <div class="row-fluid">
+<%= calendar @calendar.calentries do |entry| %>
+  <div><%= link_to entry.name, entry %></div>
+<% end %>
+</div>
+ <div class="row-fluid">
+<div class="btn-group">
+<%= link_to 'New Entry', new_calentry_path, {:class=>"btn"} %>
+<%= link_to 'Edit', edit_calendar_path(@calendar), {:class=>"btn"} %>
+<%= link_to 'Back', calendars_path, {:class=>"btn"} %>
+</div>
+</div>
+</div>

app/views/calendars/show.ics.erb

@@ -0,0 +1,3 @@
+<% @calendar.calentries.each do |entry| %>
+<%= render entry %>
+<% end %>

app/views/calentries/_calentry.ics.erb

@@ -0,0 +1,5 @@
+  <%= calentry.start %>
+  <%= calentry.ende %>
+  <%= calentry.summary %>
+  <%= calentry.typ %>
+

app/views/calentries/_form.html.erb

@@ -0,0 +1,34 @@
+<div class="container-fluid">
+<%= semantic_form_for @calentry do |f| %>
+  <%= f.inputs do %>
+ <div class="row-fluid">
+ <div class="span6">
+    <%= f.input :start , :as => :date_string %>
+ </div>
+ <div class="span6">
+    <%= f.input :ende , :as => :date_string %>
+ </div>   
+ </div>
+ <div class="row-fluid">  
+ <div class="span12">
+    <%= f.input :summary %>
+ </div>
+ </div>
+ <div class="row-fluid">
+ <div class="span6">
+    <%= f.input :calendars, :as=> :radio %>
+ </div>
+ <div class="span6">
+    <%= f.input :typ %>
+ </div>
+ </div>
+  <% end %>
+  <div class="row-fluid">
+  <div class="span12">
+  <%= f.actions do %>
+    <%= f.action :submit, :as => :input %>
+  <% end %>
+  </div>
+  </div>
+<% end %>
+</div>

app/views/calentries/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing calentry</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @calentry %> |
+<%= link_to 'Back', calentries_path %>

app/views/calentries/index.html.erb

@@ -0,0 +1,29 @@
+<h1>Listing calentries</h1>
+
+<table>
+  <tr>
+    <th>Start</th>
+    <th>Ende</th>
+    <th>Summary</th>
+    <th>Typ</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @calentries.each do |calentry| %>
+  <tr>
+    <td><%= calentry.start %></td>
+    <td><%= calentry.ende %></td>
+    <td><%= calentry.summary %></td>
+    <td><%= calentry.typ %></td>
+    <td><%= link_to 'Show', calentry %></td>
+    <td><%= link_to 'Edit', edit_calentry_path(calentry) %></td>
+    <td><%= link_to 'Destroy', calentry, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Calentry', new_calentry_path %>

app/views/calentries/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New calentry</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', calentries_path %>

app/views/calentries/show.html.erb

@@ -0,0 +1,25 @@
+<p id="notice"><%= notice %></p>
+<div class="container-fluid">
+<div class="row-fluid">
+<div class="span12">
+  <b>
+  <%= @calentry.summary %>
+  </b>
+
+</div>
+</div>
+<div class="row-fluid">
+<div class="span9">
+  <%= I18n.l @calentry.start %>
+  <%= " bis " unless @calentry.ende.nil? %>
+  <%= I18n.l @calentry.ende %>
+  </div>
+  <div class="span3">
+  <%= @calentry.typ %>
+</div></div>
+
+ <div class="row-fluid">
+ <div class="span12">
+<%= link_to 'Edit', edit_calentry_path(@calentry) %> |
+<%= link_to 'Back', calentries_path %>
+</div></div></div>

app/views/calentries/show.ics.erb

@@ -0,0 +1,25 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Start:</b>
+  <%= @calentry.start %>
+</p>
+
+<p>
+  <b>Ende:</b>
+  <%= @calentry.ende %>
+</p>
+
+<p>
+  <b>Summary:</b>
+  <%= @calentry.summary %>
+</p>
+
+<p>
+  <b>Typ:</b>
+  <%= @calentry.typ %>
+</p>
+
+
+<%= link_to 'Edit', edit_calentry_path(@calentry) %> |
+<%= link_to 'Back', calentries_path %>

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/layouts/menu.html.erb

@@ -4,8 +4,8 @@
 </li>
 <li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
 <li><%= link_to I18n.t(:info,:scope=>'home' ) %></li>
-<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
-</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>
 </ul>

app/views/moduls/_form.html.erb

@@ -1,15 +1,30 @@
+<div class="container-fluid">
+  <%= semantic_form_for @modul do |f| %>
 
-<%= semantic_form_for @modul do |f| %>
   <%= f.inputs do %>
-   <% # f.input :modulgruppen,:as => :select,      :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}] %>
-   <%= f.input :modulgruppen %>
-    <%= f.input :name ,:hint=>true%>
-    <%= f.input :desc, :as=>:tinymce_text %>
-    <%= f.input :depend %>
+  <div class="row-fluid">
+    <div class="span9">
+      <%= f.input :name ,:hint=>true%>
+       <div class="row-fluid">
+    <div class="span8">
+      <%= f.input :desc, :as=>:tinymce_text %>
+    </div>
+    <div class="span4">
+      <%= f.input :depend %>
+    </div>
+  </div>
+    </div>
+    <div class="span3">
+      <%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
+    </div>
+  </div>
+ 
   <% end %>
 
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
   <% end %>
-<% end %>
+
+  <% end %>
+</div>
 <%= tinymce %>

app/views/studien/_form.html.erb

@@ -1,13 +1,28 @@
+<div class="container-fluid">
   <%= tinymce_assets %>
-<%= semantic_form_for @studium do |f| %>
+  <%= semantic_form_for @studium do |f| %>
+  <div class="span9">
   <%= f.inputs do %>
-    <%= f.input :zahl %>
-    <%= f.input :name,:append=>"NAME" %>
+
+  <div class="row-fluid">
+    <div class="span6">
+      <%= f.input :name,:append=>"NAME" %>
+    </div>
+    <div class="span3">
+      <%= f.input :zahl %>
+    </div>
+    <div class="span3">
+      <%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"]%>
+    </div>
+  </div>
+  <div class="row-fluid">
     <%= f.input :desc, :as=>:tinymce_text %>
-    <%= f.input :typ, :as=>:radio, :collection=>["Bachelor","Master"]%>
+  </div>
   <% end %>
-<%= tinymce %>
+  <%= tinymce %>
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
   <% end %>
-<% end %>
+  </div>
+  <% end %>
+</div>

config/locales/de.yml

@@ -294,7 +294,7 @@ de:
   time:
     am: vormittags
     formats:
-      default: ! '%A, %d. %B %Y, %H:%M Uhr'
+      default: ! '%d.%m.%Y, %H:%M Uhr'
       long: ! '%A, %d. %B %Y, %H:%M Uhr'
-      short: ! '%d. %B, %H:%M Uhr'
+      short: ! '%d.%m.%Y, %H:%M Uhr'
     pm: nachmittags

config/routes.rb

@@ -1,5 +1,8 @@
 Fetsite::Application.routes.draw do
   
+ 
+
+
   devise_for :users
   resources :home, :only=>[:index]
   #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
@@ -42,7 +45,8 @@ Fetsite::Application.routes.draw do
     resources :home, :only=>[:index]
     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/migrate/20130805191709_create_calentries.rb

@@ -0,0 +1,12 @@
+class CreateCalentries < ActiveRecord::Migration
+  def change
+    create_table :calentries do |t|
+      t.timestamp :start
+      t.timestamp :ende
+      t.string :summary
+      t.integer :typ
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130805191817_create_calendars.rb

@@ -0,0 +1,10 @@
+class CreateCalendars < ActiveRecord::Migration
+  def change
+    create_table :calendars do |t|
+      t.string :name
+      t.boolean :public
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20130808062732_create_calendar_calentries_join_table.rb

@@ -0,0 +1,13 @@
+class CreateCalendarCalentriesJoinTable < ActiveRecord::Migration
+  def up
+  create_table :calendars_calentries, :id=>false do |t|
+      t.integer  :calentry_id
+      t.integer  :calendar_id
+    end
+    add_index :calendars_calentries, [:calentry_id, :calendar_id]
+    add_index :calendars_calentries, :calendar_id
+  end
+
+  def down
+  end
+end

db/migrate/20130810214456_add_picture_to_calendars.rb

@@ -0,0 +1,5 @@
+class AddPictureToCalendars < ActiveRecord::Migration
+  def change
+    add_column :calendars, :picture, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,23 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130729085446) do
+ActiveRecord::Schema.define(:version => 20130810214456) do
+
+  create_table "attachments", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "beispiel_translations", :force => true do |t|
+    t.string   "locale"
+    t.text     "desc"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+    t.integer  "beispiele_id"
+  end
+
+  add_index "beispiel_translations", ["locale"], :name => "index_beispiel_translations_on_locale"
 
   create_table "beispiele", :force => true do |t|
     t.string   "name"
@@ -22,6 +38,38 @@ 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 "fragen", :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 "lva_translations", :force => true do |t|
     t.integer  "lva_id"
     t.string   "locale"
@@ -50,11 +98,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"
@@ -161,6 +212,20 @@ ActiveRecord::Schema.define(:version => 20130729085446) do
 
   add_index "studium_translations", ["locale"], :name => "index_studium_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
+  end
+
+  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

spec/controllers/calendars_controller_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe CalendarsController do
+
+  # This should return the minimal set of attributes required to create a valid
+  # Calendar. As you add validations to Calendar, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) { { "name" => "MyString" } }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # CalendarsController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET index" do
+    it "assigns all calendars as @calendars" do
+      calendar = Calendar.create! valid_attributes
+      get :index, {}, valid_session
+      assigns(:calendars).should eq([calendar])
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested calendar as @calendar" do
+      calendar = Calendar.create! valid_attributes
+      get :show, {:id => calendar.to_param}, valid_session
+      assigns(:calendar).should eq(calendar)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new calendar as @calendar" do
+      get :new, {}, valid_session
+      assigns(:calendar).should be_a_new(Calendar)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested calendar as @calendar" do
+      calendar = Calendar.create! valid_attributes
+      get :edit, {:id => calendar.to_param}, valid_session
+      assigns(:calendar).should eq(calendar)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new Calendar" do
+        expect {
+          post :create, {:calendar => valid_attributes}, valid_session
+        }.to change(Calendar, :count).by(1)
+      end
+
+      it "assigns a newly created calendar as @calendar" do
+        post :create, {:calendar => valid_attributes}, valid_session
+        assigns(:calendar).should be_a(Calendar)
+        assigns(:calendar).should be_persisted
+      end
+
+      it "redirects to the created calendar" do
+        post :create, {:calendar => valid_attributes}, valid_session
+        response.should redirect_to(Calendar.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved calendar as @calendar" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        post :create, {:calendar => { "name" => "invalid value" }}, valid_session
+        assigns(:calendar).should be_a_new(Calendar)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        post :create, {:calendar => { "name" => "invalid value" }}, valid_session
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested calendar" do
+        calendar = Calendar.create! valid_attributes
+        # Assuming there are no other calendars in the database, this
+        # specifies that the Calendar created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        Calendar.any_instance.should_receive(:update_attributes).with({ "name" => "MyString" })
+        put :update, {:id => calendar.to_param, :calendar => { "name" => "MyString" }}, valid_session
+      end
+
+      it "assigns the requested calendar as @calendar" do
+        calendar = Calendar.create! valid_attributes
+        put :update, {:id => calendar.to_param, :calendar => valid_attributes}, valid_session
+        assigns(:calendar).should eq(calendar)
+      end
+
+      it "redirects to the calendar" do
+        calendar = Calendar.create! valid_attributes
+        put :update, {:id => calendar.to_param, :calendar => valid_attributes}, valid_session
+        response.should redirect_to(calendar)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the calendar as @calendar" do
+        calendar = Calendar.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calendar.to_param, :calendar => { "name" => "invalid value" }}, valid_session
+        assigns(:calendar).should eq(calendar)
+      end
+
+      it "re-renders the 'edit' template" do
+        calendar = Calendar.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calendar.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calendar.to_param, :calendar => { "name" => "invalid value" }}, valid_session
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested calendar" do
+      calendar = Calendar.create! valid_attributes
+      expect {
+        delete :destroy, {:id => calendar.to_param}, valid_session
+      }.to change(Calendar, :count).by(-1)
+    end
+
+    it "redirects to the calendars list" do
+      calendar = Calendar.create! valid_attributes
+      delete :destroy, {:id => calendar.to_param}, valid_session
+      response.should redirect_to(calendars_url)
+    end
+  end
+
+end

spec/controllers/calentries_controller_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe CalentriesController do
+
+  # This should return the minimal set of attributes required to create a valid
+  # Calentry. As you add validations to Calentry, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) { { "start" => "2013-08-05 21:17:10" } }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # CalentriesController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET index" do
+    it "assigns all calentries as @calentries" do
+      calentry = Calentry.create! valid_attributes
+      get :index, {}, valid_session
+      assigns(:calentries).should eq([calentry])
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested calentry as @calentry" do
+      calentry = Calentry.create! valid_attributes
+      get :show, {:id => calentry.to_param}, valid_session
+      assigns(:calentry).should eq(calentry)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new calentry as @calentry" do
+      get :new, {}, valid_session
+      assigns(:calentry).should be_a_new(Calentry)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested calentry as @calentry" do
+      calentry = Calentry.create! valid_attributes
+      get :edit, {:id => calentry.to_param}, valid_session
+      assigns(:calentry).should eq(calentry)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new Calentry" do
+        expect {
+          post :create, {:calentry => valid_attributes}, valid_session
+        }.to change(Calentry, :count).by(1)
+      end
+
+      it "assigns a newly created calentry as @calentry" do
+        post :create, {:calentry => valid_attributes}, valid_session
+        assigns(:calentry).should be_a(Calentry)
+        assigns(:calentry).should be_persisted
+      end
+
+      it "redirects to the created calentry" do
+        post :create, {:calentry => valid_attributes}, valid_session
+        response.should redirect_to(Calentry.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved calentry as @calentry" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        post :create, {:calentry => { "start" => "invalid value" }}, valid_session
+        assigns(:calentry).should be_a_new(Calentry)
+      end
+
+      it "re-renders the 'new' template" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        post :create, {:calentry => { "start" => "invalid value" }}, valid_session
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested calentry" do
+        calentry = Calentry.create! valid_attributes
+        # Assuming there are no other calentries in the database, this
+        # specifies that the Calentry created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        Calentry.any_instance.should_receive(:update_attributes).with({ "start" => "2013-08-05 21:17:10" })
+        put :update, {:id => calentry.to_param, :calentry => { "start" => "2013-08-05 21:17:10" }}, valid_session
+      end
+
+      it "assigns the requested calentry as @calentry" do
+        calentry = Calentry.create! valid_attributes
+        put :update, {:id => calentry.to_param, :calentry => valid_attributes}, valid_session
+        assigns(:calentry).should eq(calentry)
+      end
+
+      it "redirects to the calentry" do
+        calentry = Calentry.create! valid_attributes
+        put :update, {:id => calentry.to_param, :calentry => valid_attributes}, valid_session
+        response.should redirect_to(calentry)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the calentry as @calentry" do
+        calentry = Calentry.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calentry.to_param, :calentry => { "start" => "invalid value" }}, valid_session
+        assigns(:calentry).should eq(calentry)
+      end
+
+      it "re-renders the 'edit' template" do
+        calentry = Calentry.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        Calentry.any_instance.stub(:save).and_return(false)
+        put :update, {:id => calentry.to_param, :calentry => { "start" => "invalid value" }}, valid_session
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested calentry" do
+      calentry = Calentry.create! valid_attributes
+      expect {
+        delete :destroy, {:id => calentry.to_param}, valid_session
+      }.to change(Calentry, :count).by(-1)
+    end
+
+    it "redirects to the calentries list" do
+      calentry = Calentry.create! valid_attributes
+      delete :destroy, {:id => calentry.to_param}, valid_session
+      response.should redirect_to(calentries_url)
+    end
+  end
+
+end

spec/factories/calendars.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :calendar do
+    name "MyString"
+    public false
+  end
+end

spec/factories/calentries.rb

@@ -0,0 +1,10 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :calentry do
+    start "2013-08-05 21:17:10"
+    ende "2013-08-05 21:17:10"
+    summary "MyString"
+    typ 1
+  end
+end

spec/helpers/calendars_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CalendarsHelper. For example:
+#
+# describe CalendarsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe CalendarsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/calentries_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CalentriesHelper. For example:
+#
+# describe CalentriesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe CalentriesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/calendar_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Calendar do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/calentry_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Calentry do
+ it "should be valid with full data" do
+   e = FactoryGirl.build(:calentry)
+   c = FactoryGirl.create(:calendar)
+   e.calendars<<c
+   e.should be_valid
+ end
+ [:ende,:start,:typ].each do |attr|
+ it "should not be valid without #{attr}" do 
+  e= FactoryGirl.build(:calentry, attr => nil)
+  c=FactoryGirl.create(:calendar)
+    e.calendars<<c
+   e.should_not be_valid 
+   e.should have_at_least(1).errors_on(attr)
+ end
+ end
+ 
+end

spec/requests/calendars_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Calendars" do
+  describe "GET /calendars" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get calendars_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/calentries_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Calentries" do
+  describe "GET /calentries" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get calentries_path
+      response.status.should be(200)
+    end
+  end
+end

spec/routing/calendars_routing_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe CalendarsController do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/calendars").should route_to("calendars#index")
+    end
+
+    it "routes to #new" do
+      get("/calendars/new").should route_to("calendars#new")
+    end
+
+    it "routes to #show" do
+      get("/calendars/1").should route_to("calendars#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/calendars/1/edit").should route_to("calendars#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/calendars").should route_to("calendars#create")
+    end
+
+    it "routes to #update" do
+      put("/calendars/1").should route_to("calendars#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/calendars/1").should route_to("calendars#destroy", :id => "1")
+    end
+
+  end
+end

spec/routing/calentries_routing_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe CalentriesController do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/calentries").should route_to("calentries#index")
+    end
+
+    it "routes to #new" do
+      get("/calentries/new").should route_to("calentries#new")
+    end
+
+    it "routes to #show" do
+      get("/calentries/1").should route_to("calentries#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/calentries/1/edit").should route_to("calentries#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/calentries").should route_to("calentries#create")
+    end
+
+    it "routes to #update" do
+      put("/calentries/1").should route_to("calentries#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/calentries/1").should route_to("calentries#destroy", :id => "1")
+    end
+
+  end
+end

spec/views/calendars/edit.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calendars/edit" do
+  before(:each) do
+    @calendar = assign(:calendar, stub_model(Calendar,
+      :name => "MyString",
+      :public => false
+    ))
+  end
+
+  it "renders the edit calendar form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calendar_path(@calendar), "post" do
+      assert_select "input#calendar_name[name=?]", "calendar[name]"
+      assert_select "input#calendar_public[name=?]", "calendar[public]"
+    end
+  end
+end

spec/views/calendars/index.html.erb_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "calendars/index" do
+  before(:each) do
+    assign(:calendars, [
+      stub_model(Calendar,
+        :name => "Name",
+        :public => false
+      ),
+      stub_model(Calendar,
+        :name => "Name",
+        :public => false
+      )
+    ])
+  end
+
+  it "renders a list of calendars" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr>td", :text => "Name".to_s, :count => 2
+    assert_select "tr>td", :text => false.to_s, :count => 2
+  end
+end

spec/views/calendars/new.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calendars/new" do
+  before(:each) do
+    assign(:calendar, stub_model(Calendar,
+      :name => "MyString",
+      :public => false
+    ).as_new_record)
+  end
+
+  it "renders new calendar form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calendars_path, "post" do
+      assert_select "input#calendar_name[name=?]", "calendar[name]"
+      assert_select "input#calendar_public[name=?]", "calendar[public]"
+    end
+  end
+end

spec/views/calendars/show.html.erb_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "calendars/show" do
+  before(:each) do
+    @calendar = assign(:calendar, stub_model(Calendar,
+      :name => "Name",
+      :public => false
+    ))
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/Name/)
+    rendered.should match(/false/)
+  end
+end

spec/views/calentries/edit.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calentries/edit" do
+  before(:each) do
+    @calentry = assign(:calentry, stub_model(Calentry,
+      :summary => "MyString",
+      :typ => 1
+    ))
+  end
+
+  it "renders the edit calentry form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calentry_path(@calentry), "post" do
+      assert_select "input#calentry_summary[name=?]", "calentry[summary]"
+      assert_select "input#calentry_typ[name=?]", "calentry[typ]"
+    end
+  end
+end

spec/views/calentries/index.html.erb_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "calentries/index" do
+  before(:each) do
+    assign(:calentries, [
+      stub_model(Calentry,
+        :summary => "Summary",
+        :typ => 1
+      ),
+      stub_model(Calentry,
+        :summary => "Summary",
+        :typ => 1
+      )
+    ])
+  end
+
+  it "renders a list of calentries" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr>td", :text => "Summary".to_s, :count => 2
+    assert_select "tr>td", :text => 1.to_s, :count => 2
+  end
+end

spec/views/calentries/new.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "calentries/new" do
+  before(:each) do
+    assign(:calentry, stub_model(Calentry,
+      :summary => "MyString",
+      :typ => 1
+    ).as_new_record)
+  end
+
+  it "renders new calentry form" do
+    render
+
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form[action=?][method=?]", calentries_path, "post" do
+      assert_select "input#calentry_summary[name=?]", "calentry[summary]"
+      assert_select "input#calentry_typ[name=?]", "calentry[typ]"
+    end
+  end
+end

spec/views/calentries/show.html.erb_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "calentries/show" do
+  before(:each) do
+    @calentry = assign(:calentry, stub_model(Calentry,
+      :summary => "Summary",
+      :typ => 1
+    ))
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/Summary/)
+    rendered.should match(/1/)
+  end
+end