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

Gemfile.lock

@@ -123,6 +123,7 @@ GEM
     httpclient (2.4.0)
     i18n (0.6.1)
     journey (1.0.4)
+    jquery-datetimepicker-rails (2.2.5.0)
     jquery-fileupload-rails (0.4.1)
       actionpack (>= 3.1)
       railties (>= 3.1)
@@ -248,7 +249,7 @@ GEM
       ref
     thor (0.18.1)
     tilt (1.4.1)
-    tinymce-rails (3.5.8)
+    tinymce-rails (4.1.0)
       railties (>= 3.1.1)
     treetop (1.4.15)
       polyglot
@@ -289,6 +290,7 @@ DEPENDENCIES
   globalize-versioning
   gollum-lib
   haml
+  jquery-datetimepicker-rails
   jquery-fileupload-rails
   jquery-rails
   jquery-ui-rails (~> 4.1.1)
@@ -310,7 +312,7 @@ DEPENDENCIES
   sqlite3
   themes_for_rails
   therubyracer
-  tinymce-rails (~> 3.5.8)
+  tinymce-rails (~> 4.1.0)
   uglifier (>= 1.0.3)
   webrick (= 1.3.1)
   wikicloth

app/views/home/_search_results.html.erb

@@ -27,12 +27,16 @@
 <h2>Themen</h2>
 <% end %>
 
-<% @themen.each do |thema| %>
 <ul class="unstyled content-list" style="max-width:70em">
+
+<% @themen.each do |thema| %>
+<% if can? :show, thema %>
   <li><%= link_to thema.title,thema %>
 <div class="contentbox">
       <%= render :partial=>"themen/small", :object=>thema %>
 </div>
   </li>
-</ul>
 <% end %>
+
+<% end %>
+</ul>

app/views/themen/_form.html.erb

@@ -31,21 +31,38 @@
       <%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %>
     </div> 
   </div> 
-</div>
-<% unless I18n.locale == :de %>
-<% I18n.with_locale(:de) do %>
-<%= raw(@thema.text) %>
-<% end %><% end %>
 
-  <%= f.actions do %>
-  <%= f.action :submit, :as => :button, :label=> I18n.t("thema.save" ) %> 
-  <%= f.action :submit, :as => :button, :label=> I18n.t("thema.savecont"), :button_html=>{:value=>"continue"} %> 
-  <%= f.action :cancel, :as => :link %>
-  <% end %> 
-  <% end %><% end %>
+  <div class="row-fluid"> 
+    <div class="span12"> 
+
+<% unless I18n.locale == :de  %>
+  <% I18n.with_locale(:de) do %>
+    <%= raw(@thema.text) %>
+  <% end %>
+<% end %>
+    </div> 
+  </div> 
+
+  <div class="row-fluid"> 
+    <div class="span12"> 
+
+      <%= f.actions do %>
+      <%= f.action :submit, :as => :button, :label=> I18n.t("thema.save" ) %> 
+      <%= f.action :submit, :as => :button, :label=> I18n.t("thema.savecont"), :button_html=>{:value=>"continue"} %> 
+      <%= f.action :cancel, :as => :link %>
+      <% end %> 
+    </div> 
+  </div> 
+
+  <% end %>
+  <% end %>
   <%= tinymce %>
-  <%= tinymce_icon_choice %>
-  <h2>Attachments:</h2>
-  <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>
+
+</div>
+
+<%= tinymce_icon_choice %>
+<h2>Attachments:</h2>
+<%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>
+