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

app/assets/stylesheets/layout.css.scss

@@ -172,4 +172,12 @@ span.linklist a {
 	display:block;
 	float:left;	
 
-}
+}
+
+form.inline div {
+float:left;}
+
+form.inline input {
+}
+form.inline {
+float:clear; }

app/controllers/calendars_controller.rb

@@ -37,6 +37,11 @@ class CalendarsController < ApplicationController
   # GET /calendars/1/edit
   def edit
     @calendar = Calendar.find(params[:id])
+    respond_to do |format|
+      format.html # new.html.erb
+      format.js
+    end
+
   end
 
   # POST /calendars

app/controllers/calentries_controller.rb

@@ -39,6 +39,7 @@ class CalentriesController < ApplicationController
     @calentry = Calentry.find(params[:id])
     respond_to do |format|
       format.html
+      format.js
     end
   end
 
@@ -67,9 +68,11 @@ class CalentriesController < ApplicationController
       if @calentry.update_attributes(params[:calentry])
         format.html { redirect_to @calentry, notice: 'Calentry was successfully updated.' }
         format.json { head :no_content }
+        format.js
       else
         format.html { render action: "edit" }
         format.json { render json: @calentry.errors, status: :unprocessable_entity }
+        format.js { render action: "edit"}
       end
     end
   end

app/views/calentries/_calentry.html.erb

@@ -9,5 +9,5 @@ format =:default
 end%>
 <%= calentry.text %>
 
-<%= link_to "edit", edit_calentry_path(calentry) if can? :edit, calentry %>
+<%= link_to "edit", edit_calentry_path(calentry),:remote=>true if can? :edit, calentry %>
 </div>

app/views/calentries/_nested_form.html.erb

@@ -0,0 +1,10 @@
+<%= fa_icon("calendar 2x") %>
+<%= semantic_form_for @calentry, :remote=>true, :html=>{:class=>"inline"} do |f| %>
+
+ <%= f.input :start, :as => :datetimepicker  %>
+<%= f.input :dauer , :as => :string, :append=>"h"  %>
+
+ 
+    <%= f.action :submit, :as => :input_ %>
+ 
+<% end %>

app/views/calentries/edit.js.erb

@@ -0,0 +1,2 @@
+
+$("#calentry_<%= @calentry.id %>").html("<%=escape_javascript( render :partial=>"nested_form" ,:object=>@calentry)%>");

app/views/calentries/update.js.erb

@@ -0,0 +1 @@
+$("#calentry_<%= @calentry.id %>").replaceWith("<%=escape_javascript( render :partial=>"calentry", :object=>@calentry)%>");

app/views/lvas/show.html.erb

@@ -1,3 +1,13 @@
+<%= content_for :header do %>
+<title>Fetsite - <%=  @lva.full_name %></title>
+<% set_meta_tags :og => {
+  :url=>lva_path(:theme=>nil) }
+%>
+<%= display_meta_tags %>
+<% end %>
+
+
+
 <div class="container-fluid">
   <%= render 'studien/tabs'%>
   <p id="notice"><%= notice %></p>

app/views/themengruppen/_themengruppe.html.erb

@@ -14,7 +14,7 @@
 	<% unless themengruppe.icon.nil? or themengruppe.icon.empty? %>      <i class="<%= themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
       <% end %>
 
-<%=themengruppe.title%> </h3>
+      <%= themengruppe.title%> </h3>
       </div>
     
     </div>
@@ -24,7 +24,7 @@
   <div class="span6">
 
     <p>
-      <%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
+      <%= if themengruppe.text.split.size > Themengruppe::WORD_COUNT
       themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
       else
       themengruppe.text

app/views/themengruppen/edit.js.erb

@@ -1,2 +1,2 @@
-alert("hallo Welt");
+
 $("#themaview").html("<%=escape_javascript( render :action=>:edit, :layout=>false )%>");

public/robots.txt

@@ -1,5 +1,5 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 # To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
+User-Agent: *
-# Disallow: /
+Disallow: /