From 5a9118cc186fe93e669ddc5c2c96861faae98dca Mon Sep 17 00:00:00 2001
From: khawkins98 <khawkins98@gmail.com>
Date: Fri, 6 Apr 2018 13:19:51 +0100
Subject: [PATCH] Add titles to HTML, clean up search presentation

---
 assets_build/gulp/tasks/search_index.js          | 1 +
 assets_site/layouts/default.html                 | 2 +-
 assets_site/layouts/websites/iframe/default.html | 2 +-
 assets_site/layouts/websites/page/default.html   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets_build/gulp/tasks/search_index.js b/assets_build/gulp/tasks/search_index.js
index f0219dc..3bb7eeb 100644
--- a/assets_build/gulp/tasks/search_index.js
+++ b/assets_build/gulp/tasks/search_index.js
@@ -91,6 +91,7 @@ function pageJson() {
 
       var title = text.match(/<title>(.*?)<\/title>/gi) + ' ';
         title = title.replace(/<title>(.*?)<\/title>/gi, '$1');
+        title = title.replace('EMBL-EBI Style Lab <','');
 
       var body = text.match(/<body.[\s\S]*?>(.[\s\S]*?)body>/gi) + ' ';
         body = body.replace(/<body.[\s\S]*?>(.[\s\S]*?)<\/body>/gi, '$1');
diff --git a/assets_site/layouts/default.html b/assets_site/layouts/default.html
index fc8a60b..a9153ab 100644
--- a/assets_site/layouts/default.html
+++ b/assets_site/layouts/default.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>EMBL-EBI Style Lab < {{meta-title}}</title>
+    <title>EMBL-EBI Style Lab < {{meta-title}} {{block.name}}</title>
     <link rel="icon" href="{{root}}assets/img/favicon/foundation-favicon.ico" type="image/x-icon">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" rel="stylesheet">
     <link rel="stylesheet" href="{{root}}assets/css/app.css">
diff --git a/assets_site/layouts/websites/iframe/default.html b/assets_site/layouts/websites/iframe/default.html
index c1ea543..5f9226f 100644
--- a/assets_site/layouts/websites/iframe/default.html
+++ b/assets_site/layouts/websites/iframe/default.html
@@ -3,7 +3,7 @@
 <html class="no-js" lang="en">
 <head>
   <meta charset="utf-8" />
-  <title>EMBL-EBI Style Lab < {{meta-title}}</title>
+  <title>EMBL-EBI Style Lab < {{block.name}}</title>
   <meta name="description" content="{{kit.description}}">
 
   <link rel="stylesheet" href="{{root}}assets/css/app.css?rev=@@hash">
diff --git a/assets_site/layouts/websites/page/default.html b/assets_site/layouts/websites/page/default.html
index 36b8e5c..3a5058b 100644
--- a/assets_site/layouts/websites/page/default.html
+++ b/assets_site/layouts/websites/page/default.html
@@ -3,7 +3,7 @@
 <html class="no-js" lang="en">
 <head>
   <meta charset="utf-8" />
-  <title>EMBL-EBI Style Lab < {{meta-title}}</title>
+  <title>EMBL-EBI Style Lab < {{block.name}}</title>
   <meta name="description" content="{{block.description}}"><!-- Describe what this page is about -->
   <meta name="keywords" content="bioinformatics, europe, institute" /><!-- A few keywords that relate to the content of THIS PAGE (not the whol project) -->
   <meta name="author" content="EMBL-EBI" /><!-- Your [project-name] here -->
-- 
GitLab