Merge branch 'master' of github.com:sharelatex/web-sharelatex

This commit is contained in:
James Allen 2014-08-22 12:52:31 +01:00
commit c8ab1bd394
4 changed files with 8 additions and 7 deletions

View file

@ -137,7 +137,7 @@ module.exports = ProjectController =
return next(error) if error?
viewModel = {
title:'Your Projects'
title:'your_projects'
priority_title: true
projects: projects
tags: tags

View file

@ -141,7 +141,7 @@ module.exports = (app)->
app.use (req, res, next)->
subdomain = _.find Settings.i18n.subdomainLang, (subdomain)->
subdomain.lngCode == req.showUserOtherLng
subdomain.lngCode == req.showUserOtherLng and !subdomain.hide
res.locals.recomendSubdomain = subdomain
res.locals.currentLngCode = req.lng
next()

View file

@ -15,7 +15,7 @@ module.exports = SecurityManager =
restricted : (req, res, next)->
if req.session.user?
res.render 'user/restricted',
title:'Restricted'
title:'restricted'
else
logger.log "user not logged in and trying to access #{req.url}, being redirected to login"
res.redirect '/register'

View file

@ -19,10 +19,11 @@ footer.site-footer
ul.dropdown-menu(role="menu")
li.dropdown-header #{translate("language")}
each subdomainDetails, subdomain in settings.i18n.subdomainLang
li.lngOption
a.menu-indent(href=subdomainDetails.url+currentUrl)
img(src="/img/flags/24/#{subdomainDetails.lngCode}.png")
| #{translate(subdomainDetails.lngCode)}
if !subdomainDetails.hide
li.lngOption
a.menu-indent(href=subdomainDetails.url+currentUrl)
img(src="/img/flags/24/#{subdomainDetails.lngCode}.png")
| #{translate(subdomainDetails.lngCode)}
each item in nav.left_footer
li