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

app/views/calendars/index.html.erb

@@ -17,7 +17,7 @@
 	    <span class="pull-left" >
 	      <img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
 	    </span>
-	    y<div class="media-body">
+	    <div class="media-body">
 	      <h4><%= calendar.name %></h4>
 	    </div>
 	  </div>

app/views/calendars/show.html.erb

@@ -24,7 +24,7 @@
 </div>
  <div class="row-fluid">
 <%= calendar @calendar.calentries do |entry| %>
-  <div><%= link_to entry.name.to_s, entry %></div>
+  <div><%= link_to entry.name.to_s, polymorphic_path(entry.object) %></div>
 <% end %>
 </div>
  <div class="row-fluid">

app/views/calentries/_calentry.html.erb

@@ -0,0 +1,9 @@
+<div class="contentbox">
+<%= image_tag("/icon_kalender_small.png")  %>
+<% if calentry.start.to_date == calentry.ende.to_date 
+format=:timeonly
+else
+format =:default
+end%>
+<%= link_to I18n.l(calentry.start) +" bis "+ I18n.l(calentry.ende,:format=>format), calendar_path(calentry.calendar) %>
+</div>

app/views/calentries/_nested_fields.html.erb

@@ -0,0 +1,9 @@
+<div class="row-fluid">
+<div class="span1"></div><div class="span1">
+<%= image_tag("/icon_kalender_small.png")  %>
+</div>
+<div class="span4">
+  <%= f.input :start, :as => :datepicker  %></div><div class="span4">
+	<%= f.input :dauer , :as => :string, :append=>"h"  %></div><div class="span1">
+	<% f.input :typ %></div> <div class="span1"><%= f.check_box :_destroy %> <%= I18n.t 'common.delete' %></div>
+     </div>

app/views/fetprofiles/_form.html.erb

@@ -22,15 +22,19 @@
 	<%= f.hidden_field :picture_cache %>
 	<label>
 	  <%= f.check_box :remove_picture %>
-	  Bild Entfernen
+	  <%= I18n.t('profile.remove_picture') %>
 	</label>
       </div>
       <div class="span4">  <%= f.input :fetmailalias %></div> 
     </div>
     
-    <%= f.inputs :for => :memberships do |membership,i| %> 
+<% @memberships.each do |m| %>
+
+    <%= f.semantic_fields_for :memberships, m do |membership| %>
+  
     <div class="row-fluid">
       <div class="span1"></div>
+ 
       <div class="span3"><%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%></div>
       <div class="span3"><%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %></div>
     <div class="span2"><%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %></div>
@@ -39,7 +43,7 @@
       
     </div>  
     <% end %>
-    <% end %>
+  <% end %>  <% end %>  
     <div class="row-fluid">
       <div class="span12">
 	<%= f.actions do %>

app/views/fetprofiles/_tabs.html.erb

@@ -1,9 +1,9 @@
 <ul class="nav nav-tabs">
   <li <%= (request.fullpath == fetprofiles_path(filter: "active")|| request.fullpath == fetprofiles_path) ? 'class="active"'.html_safe : ''%> >
-    <%= link_to "Aktive Mitglieder" , fetprofiles_path( filter: "active") %> 
+    <%= link_to I18n.t('profile.active_members') , fetprofiles_path( filter: "active") %> 
   </li>
   <li>
-    <%= link_to "Alle Gremien und Gruppen", gremien_path %>
+    <%= link_to I18n.t('profile.all_groups'), gremien_path %>
   </li> 
   <% for g in @gremientabs %>
   <li <%= (!@gremium.nil? && g == @gremium) ? 'class="active"'.html_safe : '' %> title="<%= g.name %>">
@@ -11,7 +11,7 @@
   </li>
   <% end %>
   <li <%= (request.fullpath == fetprofiles_path(filter: "all")) ? 'class="active"'.html_safe : ''%> >
-    <%= link_to "Alle Mitglieder" , fetprofiles_path( filter: "all") %> 
+    <%= link_to I18n.t('profile.all_members') , fetprofiles_path( filter: "all") %> 
   </li>
   <% if can?(:verwalten,Gremium) %>
   <% if request.fullpath == verwalten_gremien_path %>
@@ -19,7 +19,7 @@
   <% else %>
   <li class="pull-right">
   <% end %>
-    <%= link_to "Verwaltung", verwalten_gremien_path %>
+    <%= link_to I18n.t('common.verwalten'), verwalten_gremien_path %>
   </li>
   <% end %>
 </ul>

app/views/fetprofiles/index.html.erb

@@ -2,8 +2,8 @@
 <%= render 'fetprofiles/tabs' %>
 
 <h1>
-  <%=	I18n.t 'fetprofiles.all' if params[:filter] == "all" %>
-  <%=	I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active"
+  <%=	I18n.t 'profile.all_members' if params[:filter] == "all" %>
+  <%=	I18n.t 'profile.active_members' if params[:filter].nil? || params[:filter]== "active"
 	%>
 </h1>
 

app/views/fetprofiles/new.html.erb

@@ -1,5 +1,5 @@
-<h1>New fetprofile</h1>
+<h1><%= I18n.t('profile.new_profile')%></h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Back', fetprofiles_path %>
+<%= link_to I18n.t('common.back'), fetprofiles_path %>

app/views/fetprofiles/show.html.erb

@@ -18,8 +18,8 @@
 	<% @fetprofile.memberships.each do |m| %>
 	<li>
 	  <%= render m %>
-	  <%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:delete, m)%>
-	  <%= link_to 'delete', [@fetprofile, m], method: :delete, data: {confirm: 'Sure to delete?'} if params["verwalten"] && can?(:delete, m ) %>
+	  <%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
+	  <%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
 	</li>
 	<% end %>
       </ul>

app/views/gremien/_form.html.erb

@@ -5,6 +5,36 @@
     <%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %>
     <%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %>
     <%= f.input :thema, :as=> :select, :collection => Thema.all %>
+ 
+
+    <% f.inputs :for => :memberships, :objects=>@memberships do |membership,i| %> 
+    <div class="row-fluid">
+      <div class="span1"></div>
+      <div class="span3"><%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%></div>
+      <div class="span3"><%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %></div>
+    <div class="span2"><%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %></div>
+<div class="span3"><%= membership.input :fetprofile, :as=>:select, :label=>false %></div>
+
+      
+    </div>  
+    <% end %>
+
+
+<% @memberships.each do |m| %>
+
+    <%= f.semantic_fields_for :memberships, m do |memberships_attributes| %> 
+    <div class="row-fluid">
+      <div class="span1"></div>
+      <div class="span3"><%= memberships_attributes.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%></div>
+      <div class="span3"><%= memberships_attributes.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %></div>
+    <div class="span2"><%= memberships_attributes.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %></div>
+<div class="span3"><%= memberships_attributes.input :fetprofile, :as=>:select, :label=>false %></div>
+
+      
+    </div>  
+    <% end %>
+<% end %>
+
   <% end %>
 
   <%= f.actions do %>

app/views/neuigkeiten/_form.html.erb

@@ -1,23 +1,38 @@
 <%= tinymce_assets %>
+<div class="container-fluid">
 <%= 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    %>
-    <%  f.input :datum,   :as=> :datepicker      %>
+</div>  
+</div>
+<div class="row-fluid">
+<div class="span6">
+  <%  f.input :datum,   :as=> :datepicker      %>
     <%= f.input :rubrik,  :as=> :radio, :collection=>Rubrik.all %>
-    <%= f.input :author,  :as=> :radio           %>
-    <%= f.input :picture, :as=> :file            %>
-    <% unless @neuigkeit.calentry.nil?          %>
-      <%= f.inputs :for => :calentry do |calentry| %>
-        <%= calentry.input :start, :as => :datepicker  %>
-	<%= calentry.input :ende , :as => :datepicker  %>
-	<%= calentry.input :typ %>
+</div>  
+<div class="span6">  
+  <%= f.input :author,  :as=> :select           %>
+</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 %>
-    <% end %>
+   
   <% end %>
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+</div>
 <script>$('.datepicker').datepicker()</script>
 <%= tinymce %>

app/views/neuigkeiten/show.html.erb

@@ -19,5 +19,7 @@
     <p></p>
   </div>
 </div>
-
+<% @calentries1.each do |ce|%>
+<%= render ce unless ce.nil? %>
+<% end %>
 <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>

app/views/rubriken/_form.html.erb

@@ -3,6 +3,9 @@
     <%= f.input :name %>
     <%= f.input :desc %>
     <%= f.input :prio %>
+    <%= f.input :public %>    
+  
+
   <% end %>
 
   <%= f.actions do %>

app/views/rubriken/show.html.erb

@@ -14,7 +14,7 @@
 </i>
 
 
-<% @rubrik.neuigkeiten.each_slice(1) do |row| %>
+<% @neuigkeiten.each_slice(1) do |row| %>
 <ul class="unstyled" style="max-width:70em">
   <% row.each do |neuigkeit| %>
   <li>
@@ -25,10 +25,9 @@
 <% end %>
 
 
+<br>
 
-    <%= link_to 'Verwalten', verwalten_rubrik_path(@rubrik) %> |
-    <%= link_to '<i class="icon-plus-sign"></i>'.html_safe+"Neuer Artikel", new_rubrik_neuigkeit_path(@rubrik) %> 
+<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 
 
-<%= toolbar_html(@toolbar_elements)%>
 

app/views/studien/show.html.erb

@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="row-fluid">
-    <% if params[:info]==true %>
+    <% if params[:info].true? %>
     <%= raw(@studium.desc) %>
     <% else %>
     <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>