github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Henry Oswald 2014-03-25 11:27:39 +00:00
commit 76f0acd49d
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/Features/Subscription/SubscriptionController.coffee
View file

@ -173,7 +173,7 @@ module.exports = SubscriptionController =
gaExperimentCode = '''
<!-- Google Analytics Content Experiment code -->
<script>function utmx_section(){}function utmx(){}(function(){var
k='51652689-0',d=document,l=d.location,c=d.cookie;
k='51652689-2',d=document,l=d.location,c=d.cookie;
if(l.search.indexOf('utm_expid='+k)>0)return;
function f(n){if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.
indexOf(';',i);return escape(c.substring(i+n.length+1,j<0?c.
@ -185,4 +185,5 @@ valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+
'" type="text/javascript" charset="utf-8"><\/sc'+'ript>')})();
</script><script>utmx('url','A/B');</script>
<!-- End of Google Analytics Content Experiment code -->
'''

6
services/web/app/coffee/infrastructure/ExpressLocals.coffee
View file

@ -57,9 +57,9 @@ module.exports = (app)->
Settings.siteUrl.substring(Settings.siteUrl.indexOf("//")+2)
next()
app.use (req, res, next)->
res.locals.formatPrivlageLevel = (privlageLevel)->
formatedPrivlages = private:"Private", readOnly:"Read Only", readAndWrite:"Read and Write"
app.use (req, res, next)->
res.locals.formatProjectPublicAccessLevel = (privlageLevel)->
formatedPrivlages = private:"Private", readOnly:"Public: Read Only", readAndWrite:"Public: Read and Write"
return formatedPrivlages[privlageLevel] || "Private"
next()

2
services/web/app/views/project/list.jade
View file

@ -40,7 +40,7 @@ block content
span Last modified on
span.isoDate #{project.lastUpdated.toISOString()}
span &nbsp; - &nbsp;
span #{formatPrivlageLevel(project.publicAccesLevel)}
span #{formatProjectPublicAccessLevel(project.publicAccesLevel)}
span &nbsp; - &nbsp;
mixin formatAccessLevel(project.accessLevel)
.project-tags(data-project-id=project_id)