andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-07 12:38:02 +02:00
parent a60bdf5149 30056a0d9f
commit 0b42db42e8
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/themen_controller.rb
View File

@@ -15,7 +15,7 @@ class ThemenController < ApplicationController
def show
@thema = Thema.find(params[:id])
@toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>edit_thema_path(@thema)}]
@toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>themengruppe_thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
@toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('thema.remove'), :path=>thema_path(@thema), :method=>:delete, :confirm=>I18n.t('thema.sure')}
respond_to do |format|
format.html # show.html.erb
@@ -78,7 +78,7 @@ class ThemenController < ApplicationController
@thema.destroy
respond_to do |format|
format.html { redirect_to themen_url }
format.html { redirect_to themengruppe_path(@thema.themengruppe) }
format.json { head :no_content }
end
end

5
app/views/themen/_select.html.erb
View File

@@ -23,10 +23,9 @@
</div>
</br>
<% unless @thema.id.nil? %>
<% @att_elements = [{:icon=>:plus, :hicon=>'icon-plus', :text=>I18n.t('attachment.add'), :path=>new_thema_attachment_path(@thema)}] %>
<%= render :partial=>'layouts/pretty_toolbar', :object=>@att_elements %>
<!--
<%= link_to 'Neues Attachment', new_thema_attachment_path(@thema) %>
-->
<% end %>
<br/>