From 11197e669c21b5960b6ef5975bd5eecc98e05a44 Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Fri, 2 Dec 2016 18:02:27 +0100
Subject: [PATCH] Remove /about endpoint

---
 pillar/web/projects/routes.py               | 26 ---------------------
 src/templates/nodes/search.jade             |  2 +-
 src/templates/projects/edit.jade            |  2 +-
 src/templates/projects/edit_node_types.jade |  2 +-
 src/templates/projects/sharing.jade         |  2 +-
 src/templates/projects/view_embed.jade      |  6 ++---
 6 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/pillar/web/projects/routes.py b/pillar/web/projects/routes.py
index 8c8b3d5b..5f33bb45 100644
--- a/pillar/web/projects/routes.py
+++ b/pillar/web/projects/routes.py
@@ -432,32 +432,6 @@ def search(project_url):
                            og_picture=project.picture_header)
 
 
-@blueprint.route('/<project_url>/about')
-def about(project_url):
-    """About page of a project"""
-
-    # TODO: Duplicated code from view function, we could re-use view instead
-
-    api = system_util.pillar_api()
-    project = find_project_or_404(project_url,
-                                  embedded={'header_node': 1},
-                                  api=api)
-
-    # Load the header video file, if there is any.
-    header_video_file = None
-    header_video_node = None
-    if project.header_node and project.header_node.node_type == 'asset' and \
-                    project.header_node.properties.content_type == 'video':
-            header_video_node = project.header_node
-            header_video_file = utils.get_file(project.header_node.properties.file)
-            header_video_node.picture = utils.get_file(header_video_node.picture)
-
-    return render_project(project, api,
-                          extra_context={'title': 'about',
-                                         'header_video_file': header_video_file,
-                                         'header_video_node': header_video_node})
-
-
 @blueprint.route('/<project_url>/edit', methods=['GET', 'POST'])
 @login_required
 def edit(project_url):
diff --git a/src/templates/nodes/search.jade b/src/templates/nodes/search.jade
index 6ac762e1..28035515 100644
--- a/src/templates/nodes/search.jade
+++ b/src/templates/nodes/search.jade
@@ -35,7 +35,7 @@ meta(name="twitter:description", content="{{project.summary}}")
 				data-toggle="tooltip",
 				data-placement="left",
 				class="{% if title == 'about' %}active {% endif %}{% if project.picture_square %}image{% endif %}")
-				a(href="{{url_for('projects.about', project_url=project.url, _external=True)}}")
+				a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
 					#project-loading
 						i.pi-spin
 					| {% if project.picture_square %}
diff --git a/src/templates/projects/edit.jade b/src/templates/projects/edit.jade
index dfdbe0f4..ae5e6f8b 100644
--- a/src/templates/projects/edit.jade
+++ b/src/templates/projects/edit.jade
@@ -14,7 +14,7 @@
 					data-toggle="tooltip",
 					data-placement="left",
 					class="{% if title == 'about' %}active {% endif %}{% if project.picture_square %}image{% endif %}")
-					a(href="{{url_for('projects.about', project_url=project.url, _external=True)}}")
+					a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
 						#project-loading
 							i.pi-spin
 						| {% if project.picture_square %}
diff --git a/src/templates/projects/edit_node_types.jade b/src/templates/projects/edit_node_types.jade
index 5835a1f8..2404cb32 100644
--- a/src/templates/projects/edit_node_types.jade
+++ b/src/templates/projects/edit_node_types.jade
@@ -14,7 +14,7 @@
 					data-toggle="tooltip",
 					data-placement="left",
 					class="{% if title == 'about' %}active {% endif %}{% if project.picture_square %}image{% endif %}")
-					a(href="{{url_for('projects.about', project_url=project.url, _external=True)}}")
+					a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
 						#project-loading
 							i.pi-spin
 						| {% if project.picture_square %}
diff --git a/src/templates/projects/sharing.jade b/src/templates/projects/sharing.jade
index 9a6187e1..3ae5b05c 100644
--- a/src/templates/projects/sharing.jade
+++ b/src/templates/projects/sharing.jade
@@ -14,7 +14,7 @@
 					data-toggle="tooltip",
 					data-placement="left",
 					class="{% if title == 'about' %}active {% endif %}{% if project.picture_square %}image{% endif %}")
-					a(href="{{url_for('projects.about', project_url=project.url, _external=True)}}")
+					a(href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
 						#project-loading
 							i.pi-spin
 						| {% if project.picture_square %}
diff --git a/src/templates/projects/view_embed.jade b/src/templates/projects/view_embed.jade
index 1b91c21b..ee965efc 100644
--- a/src/templates/projects/view_embed.jade
+++ b/src/templates/projects/view_embed.jade
@@ -34,7 +34,7 @@ script.
 			.fp-waiting
 				i.pi-spin.spin
 		| {% elif project.picture_header %}
-		a(href="{{ url_for( 'projects.about', project_url=project.url) }}")
+		a(href="{{ url_for( 'projects.view', project_url=project.url) }}")
 			img.header(src="{{ project.picture_header.thumbnail('l', api=api) }}")
 		| {% endif %}
 
@@ -52,13 +52,13 @@ script.
 
 		.node-details-title
 			h1
-				a(href="{{ url_for( 'projects.about', project_url=project.url) }}") {{ project.name }}
+				a(href="{{ url_for( 'projects.view', project_url=project.url) }}") {{ project.name }}
 
 		.node-details-description
 			| {{ project.summary }}
 
 		| {# Until we implement urls for pages
-		a.learn-more(href="{{ url_for( 'projects.about', project_url=project.url) }}") LEARN MORE
+		a.learn-more(href="{{ url_for( 'projects.view', project_url=project.url) }}") LEARN MORE
 		| #}
 
 		.node-extra