bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2014-10-19 16:35:42 +02:00
parent b8013a47fd e81c263ba0
commit cea69a84fb
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/themen_controller.rb
View File

@@ -65,10 +65,7 @@ class ThemenController < ApplicationController
def edit def edit
@thema = Thema.find(params[:id]) @thema = Thema.find(params[:id])
if @thema.is_wiki?
redirect_to edit_wiki_path(Wiki.find(@thema.id))
return
end
respond_to do |format| respond_to do |format|
format.html format.html
format.js { @themen= @thema.themengruppe.themen } format.js { @themen= @thema.themengruppe.themen }

2
app/views/beispiele/_beispiel.html.erb
View File

@@ -2,7 +2,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div class="span8">
<b><%=link_to ffi1_icon("note20")+" " + beispiel.name, beispiel.beispieldatei.url, title: beispiel.desc %></b> <b><%=link_to ffi1_icon("note20")+" " + beispiel.name + " " + I18n.l(beispiel.datum), beispiel.beispieldatei.url, title: beispiel.desc %></b>
<%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB <br> <%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB <br>
<span class="linklist"> <span class="linklist">