#143 fixed
themen fixed
This commit is contained in:
2014-06-10 18:47:16 +05:30
parent 6451c0f175
commit 67ccecaf51
10 changed files with 49 additions and 24 deletions

View File

@@ -7,7 +7,7 @@
<h2>Prüfungsinformation</h2>
<div class="">
<%= @lva.pruefungsinformation.html_safe %>
<%= @lva.pruefungsinformation.to_s.html_safe %>
</div>
<h2>Lernaufwand</h2>

View File

@@ -6,5 +6,5 @@
<div id="fragenform">
<%= render :partial=>'fragen/rform' %>
</div>
<% @frage_elements = [{:icon=>:plus, :hicon=>'icon-plus', :text=>I18n.t('frage.add'), :path=>new_frage_path}] %>
<%= render :partial=>'layouts/pretty_toolbar', :object=>@frage_elements %>
<% # @frage_elements = [{:icon=>:plus, :hicon=>'icon-plus', :text=>I18n.t('frage.add'), :path=>new_frage_path}] %>
<% # render :partial=>'layouts/pretty_toolbar', :object=>@frage_elements %>

View File

@@ -1,5 +1,5 @@
<a name="thema_<%=small.id%>" href="#<%=small.id%>">
<h2><%= small.title %></h2>
<h2><%= small.title %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %></h2>
</a>
<%= raw(small.text) %>
<br/>

View File

@@ -1,7 +1,10 @@
<div class="content-wrap content-column" >
<%= link_to fa_icon("arrow-circle-left 2x")+" Alle Themengruppen", themengruppen_path, :class=>"linkbox" %>
<%= link_to fa_icon("question 2x")+" Häufige Fragen", faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
<%= render :partial=>'layouts/pretty_toolbar' %>
<h1><%= @themengruppe.title %></h1>
<p>
<%= @themengruppe.text %>
</p>
@@ -10,13 +13,8 @@
<li>
<div class="contentbox">
<%= render :partial => 'themen/small', :object => thema %>
tools:
<%
@small_elements2 = []
@small_elements2 << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('common.verwalten'), :path=>verwalten_thema_path(thema)} if can? :edit, thema
%>
<%= render :partial=>'layouts/pretty_toolbar', :object=>@small_elements2 unless @small_elements2.empty? %>
<ul class="unstyled">
<% unless thema.gremium.nil? %>
@@ -37,5 +35,4 @@
<% end %>
</ul>
<%= render :partial=>'layouts/pretty_toolbar' %>
</div>

View File

@@ -2,6 +2,8 @@
#themen { list-style-type: none; margin: 0; padding: 0; margin-bottom: 15px;zoom: 1; }
#themen li { margin: 0 5px 5px 5px; padding: 5px; font-size: 1.2em; width: 95%; }
</style>
<%= render :partial=>'layouts/pretty_toolbar' %>
<div class="container-fluid">
<div class="row-fluid">
<div class="span4">