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

AutoCommit Mon Sep 14 12:03:04 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-14 12:03:04 +02:00
parent 168b4d9e4c
commit 1d8bae3aee
8 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/home/intern.html.erb
View File

@@ -7,7 +7,9 @@
<%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
<li> <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li>
</ul>
<li>
<%= link_to ff_icon("ffi1-setting")+"Neue Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue2"}), class: :linkbox if can? :set_preferred_theme , current_user %>
</li></ul>
<ul class="unstyled linkbox-list">
<li>
<% @themengruppen.each do |themengruppe| %>

6
app/views/themes/blue2/home/intern.html.erb
View File

@@ -3,7 +3,7 @@
<div class="row-fluid">
<div class="span6">
<div>
<ul class="linklist_block">
<ul class="linklist">
<li>
<%= link_to fa_icon("list")+"Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
</li>
@@ -19,6 +19,10 @@
<li>
<%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li>
<li>
<%= link_to ff_icon("ffi1-setting")+"Alte Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue1"}), class: :linkbox if can? :set_preferred_theme, current_user %>
</li>
</ul><br>
</div>
<div>Suche nach Protokollen

3
app/views/themes/blue2/neuigkeiten/show.html.erb
View File

@@ -41,8 +41,9 @@
</div>
<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
<%= render_comments_for(@neuigkeit) %>
<%= link_to fa_icon("link") + "Neue Verknüpfung" , "#", id: "findlink-open" if can? :find_link, @neuigkeit %>
<%# link_to fa_icon("link") + "Neue Verknüpfung" , "#", id: "findlink-open" if can? :find_link, @neuigkeit %>
<% cache(cache_array_key(@neuigkeit.nlinks, "NLinks")) do %>
<%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %>