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 https://github.com/sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2016-06-23 16:40:22 +01:00
commit d294117286
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/web/app/views/project/list/side-bar.jade
View file

@ -94,18 +94,7 @@
- if (showUserDetailsArea)
span(ng-controller="LeftHandMenuPromoController", ng-cloak)
.row-spaced(ng-if="showDatajoy")
hr
.card.card-thin
p.text-center.small
| <strong>Python</strong> or <strong>R</strong> user?
p.text-center.small
a(href="https://www.getdatajoy.com/", target="_blank").btn.btn-info.btn-small Try DataJoy
p.text-center.small(style="font-size: 0.8em")
a(href="https://www.getdatajoy.com/", target="_blank") DataJoy
| is a new online Python and R editor from ShareLaTeX.
.row-spaced#userProfileInformation(ng-if="hasProjects && !showDatajoy")
.row-spaced#userProfileInformation(ng-if="hasProjects")
div(ng-controller="UserProfileController")
hr(ng-show="percentComplete < 100")
.text-centered.user-profile(ng-show="percentComplete < 100")

5
services/web/public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
View file

@ -3,8 +3,7 @@ define [
], (App) ->
App.controller 'LeftHandMenuPromoController', ($scope) ->
$scope.showDatajoy = Math.random() < 0.5
$scope.hasProjects = window.data.projects.length > 0
$scope.userHasSubscription = window.userHasSubscription
$scope.randomView = _.shuffle(["default", "dropbox", "github"])[0]
$scope.randomView = _.shuffle(["default", "dropbox", "github"])[0]