comparison app/controllers/welcome_controller.rb @ 1026:b42553f6df71 bibplugin_bibtex

Merge
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 13 Nov 2012 13:23:29 +0000
parents 3e52bc15dd67
children bb32da3bea34
comparison
equal deleted inserted replaced
953:b52621512b47 1026:b42553f6df71
23 23
24 def index 24 def index
25 @site_project = Project.find_by_identifier "soundsoftware-site" 25 @site_project = Project.find_by_identifier "soundsoftware-site"
26 @site_news = [] 26 @site_news = []
27 @site_news = News.latest_for @site_project if @site_project 27 @site_news = News.latest_for @site_project if @site_project
28 @projects = Project.latest User.current
29 28
30 # tests if user is logged in to generate the tips of the day list 29 # tests if user is logged in to generate the tips of the day list
31 if User.current.logged? 30 if User.current.logged?
32 @tipsoftheday = Setting.tipoftheday_text 31 @tipsoftheday = Setting.tipoftheday_text
33 else 32 else