Merge branch 'master' into documentmeeting

.gitignore

@@ -1,3 +1,4 @@
+/db/data.yml
 /db/.#initdebug.rb
 /usergroup.ldif
 /newuser.ldif

Gemfile

@@ -113,4 +113,5 @@ gem 'bootstrap-kaminari-views', :git=>'git://github.com/matenia/bootstrap-kamina
 gem 'sunspot_rails'
 gem 'sunspot_solr'
 gem 'sitemap_generator'
-gem 'whenever'
+gem 'whenever'
+gem 'yaml_db'

app/controllers/themen_controller.rb

@@ -32,7 +32,7 @@ class ThemenController < ApplicationController
       Sanitize.node!(node,{:elements=>["span"],:attributes=>{"span"=>["class","style"]},:css=>{:properties=>["color"]}})
       {:node_whitelist=>[node]}
     end
-    @thema.text = Sanitize.fragment(@thema.text, {:elements=>['table','tr','td','p','h3','h4','a','th','img','ul','li','i','b','em'],:attributes=>{'p'=>['class'],'table'=>['class'],'a'=>['href','data'],'img'=>['src','width','height'],:all=>['class']},:css=>{:properties=>['float']},:transformers=>[trans_icons]})
+    @thema.text = Sanitize.fragment(@thema.text, {:elements=>['table','tr','td','p','h1','h2','h3','h4','h5','a','th','img','ul','li','i','b','em','pre','code'],:attributes=>{'p'=>['class'],'table'=>['class'],'a'=>['href','data'],'img'=>['src','width','height'],:all=>['class']},:css=>{:properties=>['float']},:transformers=>[trans_icons]})
     # # #
     # #
     # # 

app/views/themengruppen/faqs.html.erb

@@ -1,13 +1,17 @@
 <h1><%= I18n.t("themengruppe.faqs") %></h1>
 <div class="content-wrap content-column">
+
   <% @themengruppen.each do |tg| %>
+  <% if can?(:show, tg) %>
   <div class="contentbox">
     <a name="themengruppe_<%=tg.id.to_s%>"></a>
     <h2> <%= tg.title%></h2>
     <ul>
       <% tg.themen.order(:priority).reverse.each do |t| %>
+      <% if can?(:show, t) %>
       <li> <%= t.title %>
-	<ul> <% t.fragen.each do |f| %>
+	<ul> 
+	  <% t.fragen.each do |f| %>
 	  <li>
 	    <b> <%= f.title %>?</b>
 	    <p> <%= raw(f.text) %></p>
@@ -18,8 +22,10 @@
 	
       </li>
       <% end %>
+      <% end %>
     </ul>
     
   </div>
   <% end %>
+  <% end %>
 </div>

config/tinymce.yml

@@ -23,7 +23,7 @@ heading_clear_tag: p
 width: "100%"
 content_css: "/assets/tinymce.css"
 toolbar: 
-  - styleselect | bold boldred_btn italic forecolor | list link image table | undo redo | fullscreen code
+  - styleselect removeformat | bold boldred_btn italic forecolor | list link image table | bullist numlist | alignleft aligncenter alignright alignjustify | undo redo | fullscreen code
 formats:
   boldred: {selector: "p",block: "p", classes: "mc-important"}
 setup: function(ed) {