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

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

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-30 11:20:54 +02:00
parent fe65602b7e 7000870853
commit 69c9e346d7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/lvas/show.html.erb
View File

@@ -74,6 +74,7 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
@@ -82,11 +83,12 @@
</p> </p>
<%= link_to t("beispiel.zip") , beispiel_sammlung_lva_path(@lva), class: :linkbox %> <%= link_to t("beispiel.zip") , beispiel_sammlung_lva_path(@lva), class: :linkbox %>
<% @lva.beispiele.order(:datum).each do |b| %> <% @lva.beispiele.order(:datum).each do |b| %>
<% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b)+"_"+can?(:edit,b) + "_" + b.updated_at.try(:utc).try(:to_s)) do %> <% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + b.updated_at.try(:utc).try(:to_s)) do %>
<%= render b%> <%= render b%>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">

10
public/404.html
View File

@@ -5,15 +5,17 @@
<style type="text/css"> <style type="text/css">
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; } body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
div.dialog { div.dialog {
width: 25em; max-width:100%;
padding: 0 4em; padding: 0 1em;
margin: 4em auto 0 auto; margin: 1em auto 0 auto;
border: 1px solid #ccc; border: 1px solid #ccc;
border-right-color: #999; border-right-color: #999;
border-bottom-color: #999; border-bottom-color: #999;
} }
h1 { font-size: 100%; color: #f00; line-height: 1.5em; } h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
</style> </style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>
@@ -21,6 +23,8 @@
<div class="dialog"> <div class="dialog">
<h1>The page you were looking for doesn't exist.</h1> <h1>The page you were looking for doesn't exist.</h1>
<p>You may have mistyped the address or the page may have moved.</p> <p>You may have mistyped the address or the page may have moved.</p>
<p><a href="/">return to main page</a>
</div> </div>
</body> </body>
</html> </html>