neuigkeiten form

app/views/neuigkeiten/_form.html.erb

@@ -1,37 +1,40 @@
 <%= tinymce_assets %>
 <div class="container-fluid">
-<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
+  <%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
   <%= f.inputs do %>
-<div class="row-fluid">
-<div class="span12">
-    <%= f.input :title,   :placeholder=> "Titel" %>
-    <%= f.input :text,    :as=> :tinymce_text    %>
-</div>  
-</div>
-<div class="row-fluid">
-  <div class="span6">
-    <%  f.input :datum,   :as=> :datepicker      %>
-    <%= f.input :rubrik,  :as=> :radio, :collection=>Rubrik.all %>
+  <div class="row-fluid">
+    <div class="span12">
+      <%= f.input :title,   :placeholder=> "Titel" %>
+      <%= f.input :text,    :as=> :tinymce_text    %>
+    </div>  
+  </div>
+  <div class="row-fluid">
+    <div class="span6">
+      <%  f.input :datum,   :as=> :datepicker      %>
+      <%= f.input :rubrik,  :as=> :radio, :collection=>Rubrik.all %>
+    </div>  
+    <div class="span6">  
+      <%= f.input :author,  :as=> :select           %>
+    </div>  
   </div>  
-  <div class="span6">  
-    <%= f.input :author,  :as=> :select           %>
+  <div class="row-fluid">
+    <div class="span12"> 
+      <%= f.input :picture, :as=> :file %>
+    </div>  
   </div>  
-</div>  
-<div class="row-fluid">
-  <div class="span12"> 
-    <%= f.input :picture, :as=> :file            %>
-  </div>  
-</div>  
-
-<%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
-<%= render 'calentries/nested_fields', :f => calentry %> 
-      <% end %>
-   
+  
+  <%= f.semantic_fields_for :calentries , @calentries do |calentry| %>
+  <%= render 'calentries/nested_fields', :f => calentry %> 
+  <% end %>
+      
   <% end %>
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
+  <% end %>
   <% end %>
-<% end %>
 </div>
-<script>$('.datetimepicker').datetimepicker({format: 'd.m.Y H:i'})</script>
+<script>
+$(document).ready(function(){
+$('.datetimepicker').map($(this).datetimepicker({format: 'd.m.Y H:i', startDate: (!($(this).attr("value")==undefined))? $(this).attr("value"): ""}))
+})</script>
 <%= tinymce %>

app/views/neuigkeiten/_nlink_list_search.html.erb

@@ -1,7 +1,7 @@
 
 <li>
   <%= link_to nlink_list_search.title, nlink_list_search %>
-<%= link_to "add:"+nlink_list_search.title, create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s) %>
+  <%= link_to "add:"+nlink_list_search.title, create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s) %>
   <div class="contentbox" >
     <% p = nlink_list_search.class.to_s.downcase.pluralize+"/nlink" %>
     <%= render :partial=>p, :object=>nlink_list_search %>

app/views/neuigkeiten/edit.html.erb

@@ -1,4 +1,4 @@
-<h1>Editing neuigkeit</h1>
+<h1><%= I18n.t("neuigkeit.edit") %></h1>
 <%= %>
 <%= render 'form' %>
 <%= render 'layouts/pretty_toolbar' %>

app/views/neuigkeiten/show.html.erb

@@ -28,7 +28,7 @@
 <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 </div>
 
-<%= I18n.t("neuigekeit.sieheauch") %>
+<%= I18n.t("neuigkeit.sieheauch") %>
 <ul class="unstyled">
   <div id="nlink_list">
     <%= render partial: "nlink_list", collection: @neuigkeit.nlinks %>

app/views/themen/update.js.erb

@@ -1,4 +1,4 @@
 
-$("#themaview").html("<%= escape_javascript(raw("<h2>Bearbeiten</h2>")+render(:partial=>"themen/small", :object=>@thema) )%>");
+$("#themaview").html("<%= escape_javascript(raw("<h2>"+I18n.t("thema.edit")+"</h2>")+render(:partial=>"themen/small", :object=>@thema) )%>");
 
 $("#themen").html("<%= escape_javascript(render(:partial=>"themen/verw_liste", :object=>@themen) )%>");