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

Conflicts: app/views/themen/_form.html.erb
2014-07-09 20:18:07 +02:00
parent 6a730c7411 4bc7c4b001
commit 397721f89e
47 changed files with 1354 additions and 94 deletions
--- a/app/views/themen/_attachment_list.html.erb
+++ b/app/views/themen/_attachment_list.html.erb
@@ -1,4 +1,4 @@
-<table>
+<table class="table-striped">
 <% attachment_list.each do |a| %>
 <tr>
 <td>
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -57,8 +57,12 @@
  <% end %>
  <% end %>
  <%= tinymce %>
+
 </div>
+
+<%= tinymce_icon_choice %>
 <h2>Attachments:</h2>
 <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>


+
--- a/app/views/themen/_small.html.erb
+++ b/app/views/themen/_small.html.erb
@@ -15,7 +15,7 @@
 <br/>
 <% small.fragen.each do |frage| %>
 <p>
-  <b> <%= frage.title %> </b> <br/>
+<b> <%= frage.title %> </b> <br/>
  <%= raw(frage.text) %>
 </p>
 <% end %>