layout in news und kleiner fix

app/assets/stylesheets/application.css.scss

@@ -24,7 +24,7 @@ body,html
 
 div.header 
 {display: block; 
-background: url('/assets/fet_logo_3.png') rgb(129,97,51) no-repeat;
+background: url('/assets/fet_logo_3.png') rgb(205,204,226) no-repeat;
 background-position:15px center; 
 height:60px; 
 padding-left:160px;
@@ -32,4 +32,9 @@ padding-top:0px;
 overflow:hidden
 }
 
+#menudiv
+{
+
+   width:100%;
+}
 

app/controllers/config_controller.rb

@@ -5,7 +5,7 @@ class ConfigController < ApplicationController
   def get_git_update
     g = Git.open(".")
 
-    flash[:notice] =g.status
+    flash[:notice] ="Test"
 #    flash[:notice] =g.remote("github").fetch
    redirect_to config_url
 

app/models/ability.rb

@@ -29,7 +29,7 @@ class Ability
     # Remove this line in production environment and for testing user management
     can :manage, :all     
     
-    # Rechteverwaltung f<>r Studien Modul
+    # Rechteverwaltung f<>r Studien Modul
     can :read, Modulgruppe
     if user.has_role? "newsadmin"
       can :manage, Modulgruppe
@@ -37,5 +37,9 @@ class Ability
       can :addmoderator, Rubrik
     end
 
+
+    # Rechteverwaltung fuer Neuigkeiten
+    can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik)
+
   end
 end

app/views/config/index.html.erb

@@ -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" %>

app/views/layouts/application.html.erb

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

app/views/rubriken/index.html.erb

@@ -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>
+    html="<b>".html_safe + rubrik.name + "</b> <br>".html_safe + rubrik.desc + "<br>".html_safe
-    <td><%= link_to 'Show', rubrik %></td>
+    
-    <td><%= link_to 'Edit', edit_rubrik_path(rubrik) %></td>
+    link_to( html , rubrik )%>
-    <td><%= link_to 'Destroy', rubrik, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+   
-  </tr>
+
 <% end %>
-</table>
+
+
 
 <br />
 

app/views/rubriken/show.html.erb

@@ -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>

app/views/users/index.html.erb

@@ -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>

config/locales/de.yml

@@ -25,7 +25,7 @@ de:
     hallobeiderfet: "Du bist auf er Seite der Fachschaft Elektrotechnik der TU Wien"
     home: "Startseite"
     studien: "Studien"
-    news: "News"
+    news: "Neuigkeiten"
     info: "Information"
   rubrik:
     moderatoradded: "Neuen Moderator hinzugefügt!"

config/routes.rb

@@ -35,7 +35,7 @@ devise_for :users
     resources :neuigkeiten
     resources :rubriken
 
-put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
+    put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
     resources :home