From 6a4562015ed27ac513d0c4573ef8267996e42e4b Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Wed, 12 Aug 2015 04:50:31 -0400
Subject: [PATCH] Invert the view title/project name order in the browser
 title.

---
 docs/releases/2.0.rst                                         | 1 +
 mayan/apps/appearance/templates/403.html                      | 2 +-
 mayan/apps/appearance/templates/404.html                      | 2 +-
 mayan/apps/appearance/templates/500.html                      | 2 +-
 mayan/apps/appearance/templates/appearance/about.html         | 2 +-
 mayan/apps/appearance/templates/appearance/base.html          | 2 +-
 .../apps/appearance/templates/appearance/generic_confirm.html | 2 +-
 mayan/apps/appearance/templates/appearance/generic_form.html  | 2 +-
 mayan/apps/appearance/templates/appearance/generic_list.html  | 2 +-
 .../templates/appearance/generic_list_horizontal.html         | 2 +-
 .../templates/appearance/generic_multi_subtemplates.html      | 2 +-
 .../appearance/templates/appearance/generic_template.html     | 2 +-
 mayan/apps/appearance/templates/appearance/home.html          | 2 +-
 mayan/apps/appearance/templates/appearance/tools.html         | 2 +-
 .../templates/dynamic_search/search_results.html              | 4 +++-
 15 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/docs/releases/2.0.rst b/docs/releases/2.0.rst
index 4adf77e92d..1f291faa10 100644
--- a/docs/releases/2.0.rst
+++ b/docs/releases/2.0.rst
@@ -78,6 +78,7 @@ What's new in Mayan EDMS v2.0
 * Preview images' titles are clickable.
 * Improved API
 * Text parsers and OCR backend are used in tandem.
+* Invert page title/project name order in browser title.
 
 Upgrading from a previous version
 =================================
diff --git a/mayan/apps/appearance/templates/403.html b/mayan/apps/appearance/templates/403.html
index 0199abb707..9d2d06c0d8 100644
--- a/mayan/apps/appearance/templates/403.html
+++ b/mayan/apps/appearance/templates/403.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %} :: {% blocktrans %}Insufficient permissions{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans %}Insufficient permissions{% endblocktrans %}{% endblock %}
 
 {% block content %}
     <div class="content">
diff --git a/mayan/apps/appearance/templates/404.html b/mayan/apps/appearance/templates/404.html
index 1f0451db72..9fb31c1c02 100644
--- a/mayan/apps/appearance/templates/404.html
+++ b/mayan/apps/appearance/templates/404.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %} :: {% blocktrans %}Page not found{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans %}Page not found{% endblocktrans %}{% endblock %}
 
 {% block content %}
     <div class="content">
diff --git a/mayan/apps/appearance/templates/500.html b/mayan/apps/appearance/templates/500.html
index 6388c51803..8f9a63add7 100644
--- a/mayan/apps/appearance/templates/500.html
+++ b/mayan/apps/appearance/templates/500.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %} :: {% trans 'Server error' %}{% endblock %}
+{% block title %}{% trans 'Server error' %}{% endblock %}
 
 {% block content %}
     <div class="content">
diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html
index 1418c4b138..844628971f 100644
--- a/mayan/apps/appearance/templates/appearance/about.html
+++ b/mayan/apps/appearance/templates/appearance/about.html
@@ -5,7 +5,7 @@
 
 {% load common_tags %}
 
-{% block title %} :: {% trans 'About' %}{% endblock %}
+{% block title %}{% trans 'About' %}{% endblock %}
 
 {% block stylesheets %}
     <style>
diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html
index f988399503..23f1eccab3 100644
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -14,7 +14,7 @@
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta http-equiv="Content-Language" content="{{ LANGUAGE_CODE }}" />
-        <title>{% block project_name %}{% project_name %}{% endblock %}{% block title %}{% endblock %}</title>
+        <title>{% block title %}{% endblock %} :: {% block project_name %}{% project_name %}{% endblock %}</title>
 
         {% compress css %}
             <link href="{% static 'appearance/packages/font-awesome-4.3.0/css/font-awesome.min.css' %}" media="screen" rel="stylesheet" type="text/css" />
diff --git a/mayan/apps/appearance/templates/appearance/generic_confirm.html b/mayan/apps/appearance/templates/appearance/generic_confirm.html
index f9bf833092..61ed353590 100644
--- a/mayan/apps/appearance/templates/appearance/generic_confirm.html
+++ b/mayan/apps/appearance/templates/appearance/generic_confirm.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block title %} :: {% trans 'Confirm' %} {{ title }}{% endblock %}
+{% block title %}{% trans 'Confirm' %} {{ title }}{% endblock %}
 
 {% block content %}
     <h3>
diff --git a/mayan/apps/appearance/templates/appearance/generic_form.html b/mayan/apps/appearance/templates/appearance/generic_form.html
index c1ebc06276..5603365792 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form.html
@@ -2,7 +2,7 @@
 
 {% load common_tags %}
 
-{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %}
 
 {% block content %}
     <h3>{% include 'appearance/calculate_form_title.html' %}</h3>
diff --git a/mayan/apps/appearance/templates/appearance/generic_list.html b/mayan/apps/appearance/templates/appearance/generic_list.html
index 3d33c7bc67..f728ac1b80 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list.html
@@ -4,7 +4,7 @@
 
 {% load navigation_tags %}
 
-{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %}
 
 {% block content %}
     {% if title %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
index 7ecbb2504b..713f7f95ad 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
@@ -2,7 +2,7 @@
 
 {% load navigation_tags %}
 
-{% block title %} :: {{ title }}{% endblock %}
+{% block title %}{{ title }}{% endblock %}
 
 {% block content %}
     <h3>
diff --git a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
index 419148bc98..0af36c26bb 100644
--- a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
@@ -2,7 +2,7 @@
 
 {% load common_tags %}
 
-{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' %}{% endblock %}
 
 {% block content %}
     {% if main_title %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_template.html b/mayan/apps/appearance/templates/appearance/generic_template.html
index 7017657d59..5fb185d01a 100644
--- a/mayan/apps/appearance/templates/appearance/generic_template.html
+++ b/mayan/apps/appearance/templates/appearance/generic_template.html
@@ -1,6 +1,6 @@
 {% extends 'appearance/base.html' %}
 
-{% block title %} :: {{ title }}{% endblock %}
+{% block title %}{{ title }}{% endblock %}
 
 {% block content %}
     <h3>{{ title }}</h3>
diff --git a/mayan/apps/appearance/templates/appearance/home.html b/mayan/apps/appearance/templates/appearance/home.html
index 79b0cef6e2..47f5e1831a 100644
--- a/mayan/apps/appearance/templates/appearance/home.html
+++ b/mayan/apps/appearance/templates/appearance/home.html
@@ -5,7 +5,7 @@
 
 {% load navigation_tags %}
 
-{% block title %} :: {% trans 'Home' %}{% endblock %}
+{% block title %}{% trans 'Home' %}{% endblock %}
 
 {% block content %}
     <h3>
diff --git a/mayan/apps/appearance/templates/appearance/tools.html b/mayan/apps/appearance/templates/appearance/tools.html
index 8924cdd0a6..7139b7d150 100644
--- a/mayan/apps/appearance/templates/appearance/tools.html
+++ b/mayan/apps/appearance/templates/appearance/tools.html
@@ -1,6 +1,6 @@
 {% extends 'appearance/base.html' %}
 
-{% block title %} :: {{ title }}{% endblock %}
+{% block title %}{{ title }}{% endblock %}
 
 {% block content %}
     <h3>
diff --git a/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html b/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
index 53cde82b59..82b0347d4a 100644
--- a/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
+++ b/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
@@ -1,6 +1,8 @@
 {% extends 'appearance/base.html' %}
+
 {% load i18n %}
-{% block title %} :: {{ title }}{% endblock %}
+
+{% block title %}{{ title }}{% endblock %}
 
 {% block content %}
     {% if form %}