From cd14b0dd52dfa112eca10c028cc107eeaa9ef71f Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Sun, 11 Aug 2013 00:37:13 +0200 Subject: [PATCH] Layout kleinigkeiten --- app/views/lvas/show.html.erb | 2 +- app/views/modulgruppen/show.html.erb | 2 +- app/views/moduls/show.html.erb | 6 ++---- app/views/studien/_form.html.erb | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index ce41a44..b1e0e04 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -1,5 +1,5 @@
-<%= render 'layouts/topbar'%> +<%= render 'studien/tabs'%>

<%= notice %>

diff --git a/app/views/modulgruppen/show.html.erb b/app/views/modulgruppen/show.html.erb index b8a33b3..a127623 100755 --- a/app/views/modulgruppen/show.html.erb +++ b/app/views/modulgruppen/show.html.erb @@ -19,7 +19,7 @@ <% @modulgruppe.moduls.each do |modul| %> -<%= render modul%> +<%= render 'moduls/kurz', :modul=>modul%> <% end %>

diff --git a/app/views/moduls/show.html.erb b/app/views/moduls/show.html.erb index 7e297e7..8253a6b 100755 --- a/app/views/moduls/show.html.erb +++ b/app/views/moduls/show.html.erb @@ -1,8 +1,6 @@ -<%= render 'layouts/topbar'%> + +<%= render 'studien/tabs'%>

<%= notice %>

<%= render @modul %> <%= render 'layouts/pretty_toolbar' %> -<% # link_to 'Add LVA', %> -<% # link_to ''.html_safe+ I18n.t("common.edit") , edit_modul_path(@modul) %> -<% # link_to "Loeschen", [@modul],:method=>:delete ,:data => {:confirm =>"Are you sure" } %> diff --git a/app/views/studien/_form.html.erb b/app/views/studien/_form.html.erb index 0973ef5..3aa4a64 100755 --- a/app/views/studien/_form.html.erb +++ b/app/views/studien/_form.html.erb @@ -1,9 +1,8 @@
<%= tinymce_assets %> <%= semantic_form_for @studium do |f| %> -
- <%= f.inputs do %> + <%= f.inputs do %>
<%= f.input :name,:append=>"NAME" %> @@ -18,11 +17,12 @@
<%= f.input :desc, :as=>:tinymce_text %>
+ <% end %> <%= tinymce %> <%= f.actions do %> <%= f.action :submit, :as => :input %> <% end %> -
+ <% end %>