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

reverse bootstrap upgrade

Browse Source
This commit is contained in:
Andreas Stephanides
2019-05-13 20:29:53 +02:00
parent 5fd5ab51f8
commit 38e26de48c
15 changed files with 238 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@@ -12,7 +12,7 @@
//
//= require jquery
//= require jquery_ujs
//= require jquery-ui/core
//= require jquery-ui
// require jquery.ui.draggable
// require jquery.ui.sortable
// require jquery.ui.gallery

67
app/helpers/html_helper.rb Normal file
View File

@@ -0,0 +1,67 @@
require 'nokogiri'
module HtmlHelper
def wrapper_html(tag,&block)
content_tag(tag,nil, class:"test_wrapper", &block)
end
# make a ul with <li><a> structure a bootstrap nav list
def bs_make_ul_nav(options={},&block)
r=capture(&block)
n=Nokogiri.XML(r)
u= n.xpath("/ul").first
u['class']=u['class'].to_s + " nav"
n.xpath("/ul/li").each do |l|
l['class'] = l['class'].to_s + " nav-item hello"
l.xpath("a").each do |a|
a['class']=a['class'].to_s+" nav-link"
end
end
return raw(n.to_html)
end
# Generate Bootstrap Dropdown with toggler as the main button. and a block containing links
def bs_dropdown_menu(toggler="",options={}, &block)
id=options[:id] || SecureRandom.hex(12)
if options[:nav]
tag=:li
toggler=content_tag(:a, toggler, {:role => "button","id"=>id, "aria-haspopup"=>"true", "aria-expanded"=>"false", "data-toggle"=> "dropdown", "href"=>"#","class"=>"dropdown-toggle nav-link"})
c = "dropdown nav-item"
else
toggler=content_tag(:a, toggler, {:role => "button","id"=>id, "aria-haspopup"=>"true", "aria-expanded"=>"false", "data-toggle"=> "dropdown", "href"=>"#","class"=>"btn dropdown-toggle"})
c="dropdown"
tag=(options[:tag].nil? ? :div : options[:tag])
end
ctn= content_tag(:div, capture(&block), {class:"dropdown-menu", "aria-labelledby": id} )
ctn=inject_html_class(:to_links,ctn, "dropdown-item")
content_tag(tag, toggler+ ctn.html_safe, class: c)
end
def bs_modal(toggler="", options={}, &block)
id=options[:id] || SecureRandom.hex(12)
title=options[:title]|| "Hello World!"
ctn=capture(&block)
toggler=content_tag(:button, toggler,{type: "button", class: "btn", "data-toggle": "modal", "data-target":"#"+id})
close_btn=content_tag(:button, content_tag(:span,"&times;".html_safe, {"aria-hidden": "true"}), {type: "button", class: "close", "data-dismiss":"modal", "aria-label": "Close"})
ctn=content_tag(:div,content_tag(:div, content_tag(:h5,title,{class: "modal-title"})+close_btn,{class: "modal-header"})+content_tag(:div, ctn,{class: "modal-body"}), {class: "modal-content"})
toggler+content_tag(:div , content_tag(:div, ctn, {role: "document", class: "modal-dialog"}),{class: "modal fade", id: id, tabindex: "-1", role: "dialog", "aria-labelledby": id+"Label", "aria-hidden": "true"})
end
private
def inject_html_class(mode,html,c)
n=Nokogiri.XML(html)
if mode==:to_links
n.xpath("//a").each do |e|
e['class'] = e['class'].to_s+" " + c
end
return n.to_html
end
raise Error("wrong options for inject_html_class")
end
end

6
app/models/ability.rb
View File

@@ -104,9 +104,9 @@ end
can [:index, :faqs, :show,:new,:edit, :verwalten_all, :verwalten, :sort_themengruppen, :sort_themen, :create, :update ], Themengruppe
can :manage, Attachment
end
can [:update,:edit,:verwalten, :showdraft], Thema, :id=>Thema.with_role(:editor, user).pluck(:id)
can [:index, :faqs, :show,:new,:edit, :verwalten_all, :verwalten, :sort_themengruppen, :sort_themen, :create, :update, :delete], Thema, :themengruppe_id=>Themengruppe.with_role(:admin,user).pluck(:id)
can :delete, Themengruppe, :id=>Themengruppe.with_role(:admin,user).pluck(:id)
# can [:update,:edit,:verwalten, :showdraft], Thema, :id=>Thema.with_role(:editor, user).pluck(:id)
# can [:index, :faqs, :show,:new,:edit, :verwalten_all, :verwalten, :sort_themengruppen, :sort_themen, :create, :update, :delete], Thema, :themengruppe_id=>Themengruppe.with_role(:admin,user).pluck(:id)
# can :delete, Themengruppe, :id=>Themengruppe.with_role(:admin,user).pluck(:id)
if user.has_role?("fetadmin")
can :delete, Themengruppe
can :delete, Thema

50
app/themes/blue2/assets/stylesheets/application.css.scss
View File

@@ -12,26 +12,19 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
* ---require_tree .
*= require blueimp-gallery-all
* require_tree .
*= require jquery.fileupload-ui
*= require jquery.datetimepicker
*= require jquery-ui/dialog
*= require jquery-ui/autocomplete
*= require jquery-ui/progressbar
*= require jquery.datetimepicker
*= require jquery-ui/dialog
*= require jquery-ui/tabs
*= require jquery-ui/progressbar
* require 'bootstrap'
* require 'neuigkeiten'
*/
//
//Primary blue of this schema
$color_schema_1: darken(#006599,10%);
$color_schema_1: #006599;
$color_schema_2: #630CE8;
$color_schema_3: #FF0021;
$color_schema_4: #E8820C;
@@ -43,8 +36,7 @@ $color_schema_3_dark: darken($color_schema_3, 10%);
$color_schema_4_dark: darken($color_schema_4, 10%);
$color_schema_5_dark: darken($color_schema_5, 10%);
// Primary Color is color number 1
$color_prim: $color_schema_1; // #006599; //071672;
$color_prim: $color_schema_1_dark; // #006599; //071672;
$color_prim_light: lighten($color_prim ,10%);
$color_prim_vlight: lighten($color_prim ,30%);
$color_prim_dark: darken($color_prim ,10%);
@@ -52,45 +44,42 @@ $color_prim_vdark: darken($color_prim ,30%);
$color_cont: $color_schema_3;
$color_cont_light:lighten($color_cont ,10%);
$link-color: $color_prim;
$link-hover-color: $color_prim_vlight;
$link-decoration: none;
$linkColor: $color_prim;
$linkColorHover: $color_schema_1;
$white: #FFFFFF;
$bodyBackground: #FFF; //#FEFEFE;
$navbarBackground: #FFF; //$color_prim;
$navbarText: $color_prim;
$navbarLinkColor: $color_prim;
$navbarLinkColorHover: $color_prim_vlight;
$navbarLinkColorHover: $color_schema_1;
$dropdownLinkColor: black;
$navbar-default-brand-color: black;
$navbarBrandColor:black;
$navbarLinkBackgroundHover: darken($navbarBackground,10%);
$navbarBackgroundHighlight: #FFF;
//$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover: darken($navbarBackground,10%);
$infoBackground:#65A5D1;
$infoText:#03406A;
$sansFontFamily: Helvetica, Arial;
$font-family-base: Helvetica, Arial;
$font-size-base: 0.9rem;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';
@import 'font-awesome';
@import 'neuigkeiten';
@import 'themengruppen';
.navbar-light .navbar-nav a.nav-link {
color: $color_prim;
}
div.header {
display: block;
// background: url('../../../../header1.png') no-repeat;
@@ -106,7 +95,7 @@ div.header {
}
div.header_span {
background:white;
background:white
}
div.header h1 {
@@ -115,16 +104,13 @@ div.header h1 {
font-size:20px;
line-height:32px;
}
div.header img {
//top:2px;
//position:relative;
}
div.navbar {
border-bottom: $color_prim solid 3px;
}
div.headerrow {
}

41
app/themes/blue2/views/layouts/blue2.html.erb
View File

@@ -18,29 +18,35 @@
<title>Fetsite</title>
<% end %>
</head>
<body>
<div id="maincontainer" class="container-fluid">
<div class="row">
<div class="col-md-10 offset-md-1 header_span">
<% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %>
<div class="header_wrap">
<div class="header d-none d-print-block">
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
Fachschaft Elektrotechnik
<hr/>
</div>
<div id="menudiv" class="d-print-none">
<%= render :template => 'layouts/menu' %>
</div>
<div id="maincontainer" class="container-fluid">
<div class="row-fluid">
<div class="span10 offset1 header_span">
<% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %>
<div class="header_wrap">
<div class="header hidden-print">
<%= link_to home_index_path do %>
<!-- <span class="feticon-fet_logo fa-4x color-1"> </span>-->
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
<% end %>
</div>
<div class="header visible-print">
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
</div>
<div class="visible-print">
Fachschaft Elektrotechnik
<hr/>
</div>
<div id="menudiv" style="margin-top:12px" class="hidden-print">
<%= render :template => 'layouts/menu' %>
</div>
</div>
<% end %>
</div>
</div>
<div class="row">
<div class="col-md-10 offset-md-1" id="contentdiv">
<div class="row-fluid">
<div class="span10 offset1" id="contentdiv">
<%= yield %>
</div>
</div>
@@ -56,4 +62,5 @@
});
</script>
</body>
</html>

88
app/themes/blue2/views/layouts/menu.html.erb
View File

@@ -1,88 +0,0 @@
<div class="navbar navbar-expand-lg navbar-light">
<a class="navbar-brand" href="#"> <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mymenudiv" >
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse" id="mymenudiv">
<ul class="nav navbar-nav mr-auto">
<li class="nav-item"><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path, class: "nav-link" %>
</li>
<li class="nav-item"> <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path, class: "nav-link" %></li>
<li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path , class: "nav-link" %></li>
<li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path, class: "nav-link" %></li>
<% if can? :index, Gallery %>
<li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path, class: "nav-link" %></li>
<% end %>
<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path, class: "nav-link" %></li>
<li> <%= link_to I18n.t("home.search"), search_home_index_path, class: "nav-link" %></li>
<li> <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path, class: "nav-link" %></li>
<% if can?(:seeintern, User) %>
<li>
<%= link_to 'Intern' , intern_home_index_path, class: "nav-link" %>
</li><% end %>
</ul>
<ul class="nav nav-pills nav-stacked pull-right">
<li>
<!-- Split button -->
<div class="btn-group navbar-btn">
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
<%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%>
</button>
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" data-toggle="dropdown" >
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown" role="menu">
<li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li>
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
</ul></div>
</li>
<li>
<% if not user_signed_in? %>
<% if Rails.env.development? %>
<%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path %>
<%= render 'layouts/login' %>
<% else %>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) %>
<% end %>
<% else %>
<%= render 'layouts/login' %>
<% end %>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Dropdown
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
<!--<span class="pull-right"><%if I18n.locale == :en %>
<%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
<% elsif I18n.locale == :de %>
<%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
<%end %>
</span>-->
</div>
</div>

3
app/views/fotos/show.html.erb
View File

@@ -8,9 +8,10 @@ top: 0" %>
<% #, gallery_foto_path(@foto.gallery, ((@foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil?) ? (@foto.gallery.fotos[0].try(:id).to_i) : @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) ) %>
<div style="position:absolute; bottom:0; ">
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, @foto.datei.url,
:class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title.to_s,:target=>:blank, :style=>"" %>
:class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title,:target=>:blank, :style=>"" %>
<!-- <div class="fb-like" data-href"<%= gallery_foto_path(@foto.gallery,@foto, {fotoid:@foto.id,theme: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>-->
<%= render_shareable :url=>gallery_foto_url(@foto.gallery,@foto, {theme: nil, locale: nil}),:static_link=>true, :buttons=>[:facebook, :twitter, :google_plus] %>
<p id="notice"><%= notice %></p>
</div>

27
app/views/galleries/show.html.erb
View File

@@ -1,7 +1,7 @@
<%= content_for :header do %>
<title>Fet - Fotos: <%= @gallery.name %></title>
<%
<%
if @openfotoid.nil? || @openfotoid==0
@firstfoto= @fotos_p.first
unless @firstfoto.nil?
@@ -70,7 +70,7 @@ end
<!-- <div class="pagination pull_left" style="margin:0px 0px 0px 0px">
<ul>
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==1 ? @page : @page-1)} %>"><%=I18n.t('fotos.prev')%></a></li>
<% # for i in 1..@pages do
<% # for i in 1..@pages do
i=1 %>
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => i} %>"><%=i%></a></li>
<% # end %>
@@ -131,7 +131,7 @@ end
<% @fotos_p.each do |f| %>
<div class="left">
<div id="links">
<% if (@openfotoid.to_i==f.id) %>
<% if (@openfotoid.to_i==f.id) %>
<meta itemprop="image" content="<%= f.datei.resized.url %>"/>
<% end %>
<div <% if (@openfotoid.to_i==f.id) %> itemprop="primaryImageOfPage"<% else %> itemprop="hasPart" <% end %> itemscope itemtype="http://schema.org/ImageObject">
@@ -145,12 +145,9 @@ end
</div>
</div>
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, f.datei.url,
:class=>"btn-small",title: I18n.t('fotos.download').to_s+': '+f.title.to_s, rel: 'tooltip' %>
:class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title.to_s, rel: 'tooltip' %>
<%= link_to ff_icon('icon-remove-circle').html_safe, gallery_foto_path(@gallery, f),
:method => :delete, :class=>"btn-small btn-danger",
title: I18n.t('fotos.delete').to_s+': '+f.title.to_s, rel: 'tooltip',
confirm: I18n.t('fotos.delete').to_s+': '+f.title.to_s+',
Sicher?' if can?(:delete,f) %>
:method => :delete, :class=>"btn-small btn-danger",title: I18n.t('fotos.delete')+': '+f.title, rel: 'tooltip', confirm: I18n.t('fotos.delete')+': '+f.title+', Sicher?' if can?(:delete,f) %>
<p></p>
</div>
<% end %>
@@ -172,21 +169,21 @@ end
<%= link_to ff_icon('icon-remove-circle').html_safe, '',
:class=>"btn-small btn-danger"%>: <%= I18n.t('fotos.delete')%>
<p></p>
</div>
<% end %>
<%= render 'layouts/pretty_toolbar' %>
</div>
</div>
<%= javascript_include_tag "blueimp-gallery-all" %>
<script>
blueimp.Gallery.prototype.textFactory = function (obj, callback) {
var $element = $('<div>')
.addClass('slide-content')
.attr('title', obj.title)
.attr('histItem',obj.getAttribute('histitem'));
$.get(obj.href)
.done(function (result) {
$element.html(result);
@@ -204,13 +201,13 @@ end
return $element[0];
};
$('#openpic').click()
blueimp.Gallery.prototype.onslide = (function(_super) {
return function(index) {
history.pushState({},"Foto",String(this.list[index].getAttribute('histitem')));
return _super.apply(this, arguments);
};
};
})(blueimp.Gallery.prototype.onslide);
</script>
<style>
@@ -224,3 +221,5 @@ end
* html .fb-like{display:inline}/* ie6 inline block fix*/
*+html .fb-like{display:inline}/* ie7 inline block fix*/
</style>

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

@@ -18,10 +18,10 @@
<ul class="linklist">
<li>
<%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path ,class: :linkbox %>
<%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
</li>
<li>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path ,class: :linkbox %>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
</li>
<li>
<%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>

2
app/views/home/infoscreen.html.erb
View File

@@ -3,7 +3,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
<%= stylesheet_link_tag "/iframe/infoscreenframe.css" %>
<%= stylesheet_link_tag "infoscreenframe.css" %>
<%= javascript_include_tag "application" %>
<%= javascript_include_tag "jmpress" %>

40
app/views/layouts/menu.html.erb
View File

@@ -1,9 +1,14 @@
<div class="navbar navbar-expand-lg navbar-light">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="navbar-toggler-icon"></span>
<div class="navbar-collapse collapse">
<ul class="navbar-nav mr-auto nav-pills nav-stacked">
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<div class="nav-collapse collapse">
<ul class="nav nav-pills nav-stacked">
<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
</li>
<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
@@ -23,7 +28,7 @@
</ul>
<ul class="nav nav-pills nav-stacked pull-right">
<li>
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" > <%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>-->
<!-- Split button -->
<div class="btn-group navbar-btn">
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
@@ -38,20 +43,9 @@
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
</ul></div>
</li>
<li>
<% if not user_signed_in? %>
<% if Rails.env.development? %>
<%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path %>
<%= render 'layouts/login' %>
<% else %>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) %>
<% end %>
<% else %>
<%= render 'layouts/login' %>
<% end %>
</li><li>
<%# link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
<%# render 'layouts/login' %>
</li></ul>
<!--<span class="pull-right"><%if I18n.locale == :en %>
@@ -61,7 +55,9 @@
<%end %>
</span>-->
</div>
</div>
</div>
</div>

14
app/views/rubriken/index.html.erb
View File

@@ -11,18 +11,18 @@
<%= render 'tabs' %>
<p id="notice"><%= notice %></p>
<div class="content-wrap content-column">
<div class="container">
<div class="row">
<div class="col">
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<h1><%= I18n.t("rubrik.title")%></h1>
</div>
</div>
<div class="row">
<div class="row-fluid">
<div class="col-md-9">
<div class="span9">
<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<% @neuigkeiten.each do |n| %>
<li><%= render n %> </li>
<% end %>
@@ -34,7 +34,7 @@
</div>
<% unless @calentries.nil? or @calentries.empty? or true%>
<div class="col-md-3">
<div class="span3">
<% unless @calentries.nil? or @calentries.empty? %>
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
<%= render 'calendars/calentries', :object=>@calentries %>

12
app/views/rubriken/show.html.erb
View File

@@ -17,8 +17,8 @@
<p id="notice"><%= notice %></p>
<div class="content-wrap content-column">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<div class="row-fluid">
<div class="span12">
<h1><%= @rubrik.name %></h1>
<p>
@@ -31,10 +31,10 @@
<% end%>
</i>
</div></div>
<div class="row">
<div class="row-fluid">
<div class="col-md-9">
<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<div class="span9">
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<% @neuigkeiten.each do |neuigkeit| %>
<%= render neuigkeit, wrap_in: "li" %>
<% end %>
@@ -46,7 +46,7 @@
</div>
</div>
<div class="col-md-3">
<div class="span3">
<% unless @calentries.nil? || @calentries.empty? %>
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
<%= render 'calendars/calentries', :object=>@calentries %>