layout in news und kleiner fix

This commit is contained in:
Andreas Stephanides
2013-02-20 01:03:06 +01:00
parent f17b269458
commit f444707908
10 changed files with 36 additions and 29 deletions

View File

@@ -1,4 +1,9 @@
<h1>Admin Panel</h1>
<% if flash[:notice] %>
<div class="notice alert alert-info"><%= flash[:notice] %></div>
<% end %>
<h1>Admin Panel</h1>
<ul class="nav">
<li>
<%= link_to '<i class="icon-user"></i>'.html_safe + 'Userverwaltung',:controller =>"users",:action => "index" %>

View File

@@ -19,7 +19,7 @@
<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
</div> <div class="span10">
<%= yield %>
<%= yield %>
</div>
</div>
</body>

View File

@@ -1,26 +1,18 @@
<h1>Listing rubriken</h1>
<h1><%= I18n.t("rubriken.title")%></h1>
<table>
<tr>
<th>Name</th>
<th>Desc</th>
<th>Prio</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @rubriken.each do |rubrik| %>
<tr>
<td><%= rubrik.name %></td>
<td><%= rubrik.desc %></td>
<td><%= rubrik.prio %></td>
<td><%= link_to 'Show', rubrik %></td>
<td><%= link_to 'Edit', edit_rubrik_path(rubrik) %></td>
<td><%= link_to 'Destroy', rubrik, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<%=
html="<b>".html_safe + rubrik.name + "</b> <br>".html_safe + rubrik.desc + "<br>".html_safe
link_to( html , rubrik )%>
<% end %>
</table>
<br />

View File

@@ -1,4 +1,4 @@
<p id="notice"><%= notice %></p>
w<p id="notice"><%= notice %></p>
<div class="row-fluid">
<span class="span12">
<h1><%= @rubrik.name %></h1>
@@ -35,5 +35,6 @@
<% end %>
<%= link_to 'Edit', edit_rubrik_path(@rubrik) %> |
<%= link_to 'Back', rubriken_path %>
<%= link_to 'Back', rubriken_path %> |
<%= link_to 'Destroy', @rubrik, method: :delete, data: { confirm: 'Are you sure?' } %>
</span></div>

View File

@@ -3,7 +3,7 @@
<%= link_to "Admin" , :controller =>"config" , :action => "index"%>
</li>
</ul>
<table class="table">
<table class="table table-striped">
<% @users.each do |user|%>
<tr><th>Name</th><th>E-Mail</th><th>Rollen</th>
</tr><tr><td></td>