Browse Source

Merge pull request #943 from sharelatex/jel-nav-content-pages

Hide content page links in nav when on dash
Jessica Lawshe 8 năm trước cách đây
mục cha
commit
3c3525fae5

+ 9 - 1
services/web/app/views/layout/navbar.pug

@@ -27,8 +27,16 @@ nav.navbar.navbar-default.navbar-main
 
 				// loop over header_extras
 				each item in nav.header_extras
+					-
+						if ((item.only_when_logged_in && getSessionUser())
+							|| (item.only_when_logged_out && (!getSessionUser()))
+							|| (!item.only_when_logged_out && !item.only_when_logged_in && !item.only_content_pages)
+							|| (item.only_content_pages && (typeof(suppressNavContentLinks) == "undefined" || !suppressNavContentLinks))
+						){ 
+							var showNavItem = true
+						}
 
-					if ((item.only_when_logged_in && getSessionUser()) || (item.only_when_logged_out && (!getSessionUser())) || (!item.only_when_logged_out && !item.only_when_logged_in))
+					if showNavItem
 						if item.dropdown
 							li.dropdown(class=item.class, dropdown)
 								a.dropdown-toggle(href, dropdown-toggle)

+ 3 - 0
services/web/app/views/project/list.pug

@@ -1,5 +1,8 @@
 extends ../layout
 
+block vars
+	- var suppressNavContentLinks = true
+
 block content
 	//- We need to do .replace(/\//g, '\\/') do that '</script>' -> '<\/script>'
 	//- and doesn't prematurely end the script tag.