Revert "Move to sidebar template"

This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.

services/web/app/views/project/list.pug

@@ -60,7 +60,14 @@ block content
 
 			.row.project-list-row(ng-cloak)
 				.project-list-container(ng-if="projects.length > 0")
-					include ./list/side-bar
+					aside.project-list-sidebar.col-md-2.col-xs-3
+						include ./list/side-bar
+
+					if isShowingV1Projects && settings.overleaf && settings.overleaf.host
+						.project-list-sidebar-v1-link.col-md-2.col-xs-3
+							span Want to go back to the V1 dashboard?
+							a.btn.btn-default(href=settings.overleaf.host + "/dash?remember-dash=1")
+								| Go back to V1
 
 					.project-list-main.col-md-10.col-xs-9
 						include ./list/notifications

services/web/app/views/project/list/side-bar.pug

@@ -1,151 +1,144 @@
-if isShowingV1Projects && settings.overleaf && settings.overleaf.host
-	.project-list-sidebar-v1-link.col-md-2.col-xs-3
-		span Want to go back to the V1 dashboard?
-		a.btn.btn-default(href=settings.overleaf.host + "/dash?remember-dash=1")
-			| Go back to V1
+.dropdown(dropdown)
+	a.btn.btn-primary.sidebar-new-proj-btn.dropdown-toggle(
+		href="#",
+		data-toggle="dropdown",
+		dropdown-toggle
+	)
+		| #{translate("new_project")}
 
-aside.project-list-sidebar.col-md-2.col-xs-3
-	.dropdown(dropdown)
-		a.btn.btn-primary.sidebar-new-proj-btn.dropdown-toggle(
-			href="#",
-			data-toggle="dropdown",
-			dropdown-toggle
-		)
-			| #{translate("new_project")}
-
-		ul.dropdown-menu(role="menu")
-			li
-				a(
-					href,
-					sixpack-convert="first_sign_up",
-					ng-click="openCreateProjectModal()"
-				) #{translate("blank_project")}
-			li
-				a(
-					href,
-					sixpack-convert="first_sign_up",
-					ng-click="openCreateProjectModal('example')"
-				) #{translate("example_project")}
-			li
-				a(
-					href,
-					sixpack-convert="first_sign_up",
-					ng-click="openUploadProjectModal()"
-				) #{translate("upload_project")}
-			!= moduleIncludes("newProjectMenu", locals)
-			if (templates)
-				li.divider
-				li.dropdown-header #{translate("templates")}
-				each item in templates
-					li
-						a.menu-indent(href=item.url, sixpack-convert="first_sign_up") #{translate(item.name)}
+	ul.dropdown-menu(role="menu")
+		li
+			a(
+				href,
+				sixpack-convert="first_sign_up",
+				ng-click="openCreateProjectModal()"
+			) #{translate("blank_project")}
+		li
+			a(
+				href,
+				sixpack-convert="first_sign_up",
+				ng-click="openCreateProjectModal('example')"
+			) #{translate("example_project")}
+		li
+			a(
+				href,
+				sixpack-convert="first_sign_up",
+				ng-click="openUploadProjectModal()"
+			) #{translate("upload_project")}
+		!= moduleIncludes("newProjectMenu", locals)
+		if (templates)
+			li.divider
+			li.dropdown-header #{translate("templates")}
+			each item in templates
+				li
+					a.menu-indent(href=item.url, sixpack-convert="first_sign_up") #{translate(item.name)}
 
-	.row-spaced(ng-if="projects.length > 0", ng-cloak)
-		ul.list-unstyled.folders-menu(
-			ng-controller="TagListController"
+.row-spaced(ng-if="projects.length > 0", ng-cloak)
+	ul.list-unstyled.folders-menu(
+		ng-controller="TagListController"
+	)
+		li(ng-class="{active: (filter == 'all')}", ng-click="filterProjects('all')")
+			a(href) #{translate("all_projects")}
+		li(ng-class="{active: (filter == 'owned')}", ng-click="filterProjects('owned')")
+			a(href) #{translate("your_projects")}
+		li(ng-class="{active: (filter == 'shared')}", ng-click="filterProjects('shared')")
+			a(href) #{translate("shared_with_you")}
+		li(ng-class="{active: (filter == 'archived')}", ng-click="filterProjects('archived')")
+			a(href) #{translate("deleted_projects")}
+		if isShowingV1Projects
+			li(ng-class="{active: (filter == 'v1')}", ng-click="filterProjects('v1')")
+				a(href) #{translate("v1_projects")}
+		li.separator
+			h2 #{translate("folders")}
+		li.tag(
+			ng-repeat="tag in tags | orderBy:'name'",
+			ng-class="{active: tag.selected}",
+			ng-cloak,
+			ng-click="selectTag(tag)"
 		)
-			li(ng-class="{active: (filter == 'all')}", ng-click="filterProjects('all')")
-				a(href) #{translate("all_projects")}
-			li(ng-class="{active: (filter == 'owned')}", ng-click="filterProjects('owned')")
-				a(href) #{translate("your_projects")}
-			li(ng-class="{active: (filter == 'shared')}", ng-click="filterProjects('shared')")
-				a(href) #{translate("shared_with_you")}
-			li(ng-class="{active: (filter == 'archived')}", ng-click="filterProjects('archived')")
-				a(href) #{translate("deleted_projects")}
-			if isShowingV1Projects
-				li(ng-class="{active: (filter == 'v1')}", ng-click="filterProjects('v1')")
-					a(href) #{translate("v1_projects")}
-			li.separator
-				h2 #{translate("folders")}
-			li.tag(
-				ng-repeat="tag in tags | orderBy:'name'",
-				ng-class="{active: tag.selected}",
-				ng-cloak,
-				ng-click="selectTag(tag)"
-			)
-				a.tag-name(href)
-					i.icon.fa.fa-fw(
-						ng-class="{\
-							'fa-folder-open-o': tag.selected,\
-							'fa-folder-o': !tag.selected\
-						}"
-					)
-					span.name {{tag.name}}
-						span.subdued  ({{tag.project_ids.length}})
-						span.v1-badge(
-							ng-if="tag.isV1",
-							ng-cloak,
-							aria-label=translate("v1_badge")
-							tooltip-template="'v1TagTooltipTemplate'"
-							tooltip-append-to-body="true"
-						)
-				span.dropdown.tag-menu(dropdown)
-					a.dropdown-toggle(
-						href="#",
-						data-toggle="dropdown",
-						dropdown-toggle,
-						stop-propagation="click"
-					)
-						span.caret
-					ul.dropdown-menu.dropdown-menu-right(
-						role="menu"
+			a.tag-name(href)
+				i.icon.fa.fa-fw(
+					ng-class="{\
+						'fa-folder-open-o': tag.selected,\
+						'fa-folder-o': !tag.selected\
+					}"
+				)
+				span.name {{tag.name}} 
+					span.subdued  ({{tag.project_ids.length}})
+					span.v1-badge(
+						ng-if="tag.isV1",
+						ng-cloak,
+						aria-label=translate("v1_badge")
+						tooltip-template="'v1TagTooltipTemplate'"
+						tooltip-append-to-body="true"
 					)
-						li
-							a(href, ng-click="renameTag(tag)", stop-propagation="click")
-								| #{translate("rename")}
-						li
-							a(href, ng-click="deleteTag(tag)", stop-propagation="click")
-								| #{translate("delete")}
-			li.tag.untagged(
-				ng-if="tags.length",
-				ng-cloak,
-				ng-click="selectUntagged()"
-				ng-class="{active: filter === 'untagged'}",
-			)
-				a.tag-name(href)
-					| #{translate("uncategorized")}
-					span.subdued  ({{ nUntagged }})
-			li(ng-cloak)
-				a.tag(href, ng-click="openNewTagModal()")
-					i.fa.fa-fw.fa-plus
-					span.name #{translate("new_folder")}
-
-	.row-spaced(ng-if="projects.length == 0", ng-cloak)
-		.first-project
-			div
-				i.fa.fa-arrow-up.fa-2x
-			div
-				strong #{translate("create_your_first_project")}
-
-	- if (showUserDetailsArea)
-		span(ng-controller="LeftHandMenuPromoController",  ng-cloak)
-
-			.row-spaced#userProfileInformation(ng-if="hasProjects")
-				div(ng-controller="UserProfileController")
-					hr(ng-show="percentComplete < 100")
-					.text-centered.user-profile(ng-show="percentComplete < 100")
-						.progress
-							.progress-bar.progress-bar-info(ng-style="{'width' : (percentComplete+'%')}")
+			span.dropdown.tag-menu(dropdown)
+				a.dropdown-toggle(
+					href="#",
+					data-toggle="dropdown",
+					dropdown-toggle,
+					stop-propagation="click"
+				)
+					span.caret
+				ul.dropdown-menu.dropdown-menu-right(
+					role="menu"
+				)
+					li
+						a(href, ng-click="renameTag(tag)", stop-propagation="click")
+							| #{translate("rename")}
+					li
+						a(href, ng-click="deleteTag(tag)", stop-propagation="click")
+							| #{translate("delete")}
+		li.tag.untagged(
+			ng-if="tags.length",
+			ng-cloak,
+			ng-click="selectUntagged()"
+			ng-class="{active: filter === 'untagged'}",
+		) 	
+			a.tag-name(href)
+				| #{translate("uncategorized")}
+				span.subdued  ({{ nUntagged }})
+		li(ng-cloak)
+			a.tag(href, ng-click="openNewTagModal()")
+				i.fa.fa-fw.fa-plus
+				span.name #{translate("new_folder")}
 
-						p.small #{translate("profile_complete_percentage", {percentval:"{{percentComplete}}"})}
+.row-spaced(ng-if="projects.length == 0", ng-cloak)
+	.first-project
+		div
+			i.fa.fa-arrow-up.fa-2x
+		div
+			strong #{translate("create_your_first_project")}
+			
+- if (showUserDetailsArea)
+	span(ng-controller="LeftHandMenuPromoController",  ng-cloak)
 
-						button#completeUserProfileInformation.btn.btn-info(
-							ng-hide="formVisable",
-							ng-click="openUserProfileModal()"
-						) #{translate("complete")}
+		.row-spaced#userProfileInformation(ng-if="hasProjects")
+			div(ng-controller="UserProfileController")
+				hr(ng-show="percentComplete < 100")
+				.text-centered.user-profile(ng-show="percentComplete < 100")
+					.progress
+						.progress-bar.progress-bar-info(ng-style="{'width' : (percentComplete+'%')}")
 
+					p.small #{translate("profile_complete_percentage", {percentval:"{{percentComplete}}"})}
+					
+					button#completeUserProfileInformation.btn.btn-info(
+						ng-hide="formVisable",
+						ng-click="openUserProfileModal()"
+					) #{translate("complete")}
 
-			.row-spaced(ng-if="hasProjects && userHasNoSubscription", ng-cloak).text-centered
-				hr
-				p.small #{translate("on_free_sl")}
-				p
-					a(href="/user/subscription/plans", sixpack-convert="left-menu-upgraed-rotation").btn.btn-primary #{translate("upgrade")}
-				p.small.text-centered
-					| #{translate("or_unlock_features_bonus")}
-					a(href="/user/bonus") #{translate("sharing_sl")} .
 
+		.row-spaced(ng-if="hasProjects && userHasNoSubscription", ng-cloak).text-centered
+			hr
+			p.small #{translate("on_free_sl")}
+			p
+				a(href="/user/subscription/plans", sixpack-convert="left-menu-upgraed-rotation").btn.btn-primary #{translate("upgrade")}
+			p.small.text-centered
+				| #{translate("or_unlock_features_bonus")} 
+				a(href="/user/bonus") #{translate("sharing_sl")} .
 
-	script.
-		window.userHasNoSubscription = #{!!(settings.enableSubscriptions && !hasSubscription)}
+			
+script.
+	window.userHasNoSubscription = #{!!(settings.enableSubscriptions && !hasSubscription)}