Factorized HTML titles

diff --git a/html_templates/base.html b/html_templates/base.html
index 649969b4e912206b137d8529c1c4cbceca9a500f..9032e8e92c0a8783306ae7f9c12323178d1fd3e9 100644 (file)
--- a/html_templates/base.html
+++ b/html_templates/base.html
@@ -3,7 +3,7 @@
 <link rel=icon href='/aiga_water_transportation.png' sizes='16x16' type='image/png'>
 <link rel=stylesheet href='/global.css'>
 <link rel=alternate type='application/rss+xml' title='All the news about AIS ship monitoring' href='/news/feed'>
-<title>{% block title %}AIS{% endblock %}</title>
+<title>{% block title %}No title{% endblock %} - AIS</title>
 <script src='/javascript/jquery/jquery.js' type='text/javascript'></script>
 <script src='/global.js' type='text/javascript'></script>
 {% block style_extra %}{% endblock %}

diff --git a/html_templates/fleet.html b/html_templates/fleet.html
index 94e9570075b1cdfad365e9e12dd7e876631b6c1a..5827a008bfefd8b59ba21ff9ef35a409b79b3665 100644 (file)
--- a/html_templates/fleet.html
+++ b/html_templates/fleet.html
@@ -1,7 +1,7 @@
 {% extends "fleets.html" %}
 
 {% block title %}
-Fleet {{ fleet.name }} details - AIS
+Fleet {{ fleet.name }} details
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/fleet_edit.html b/html_templates/fleet_edit.html
index 25909d0bb541d4aedc6bd93146d5690e0afedf5b..ee2d8ad645defdcb1ab5c3fb803fffae4733353e 100644 (file)
--- a/html_templates/fleet_edit.html
+++ b/html_templates/fleet_edit.html
@@ -2,9 +2,9 @@
 
 {% block title %}
 {% if fleet.id %}
-Fleet {{ fleet.name }} edition - AIS
+Fleet {{ fleet.name }} edition
 {% else %}
-Fleet creation - AIS
+Fleet creation
 {% endif %}
 {% endblock %}
 

diff --git a/html_templates/fleet_history.html b/html_templates/fleet_history.html
index bfc7d7a2c67e61a24413e09cff41dbe78d9868f4..13733d53e4aafe7bff186b56d9fe77c79fcd90f9 100644 (file)
--- a/html_templates/fleet_history.html
+++ b/html_templates/fleet_history.html
@@ -1,7 +1,7 @@
 {% extends "fleet.html" %}
 
 {% block title %}
-Fleet {{ fleet.name }} history - AIS
+Fleet {{ fleet.name }} history
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/fleet_users.html b/html_templates/fleet_users.html
index 8a41392e7419d842795bac6b6b331650eaccf9fe..4f7108cae01ed634d17eb9df5a77388c165b3c1b 100644 (file)
--- a/html_templates/fleet_users.html
+++ b/html_templates/fleet_users.html
@@ -1,7 +1,7 @@
 {% extends "fleet.html" %}
 
 {% block title %}
-Fleet {{ fleet.name }} access control list - AIS
+Fleet {{ fleet.name }} access control list
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/fleet_vessel_add.html b/html_templates/fleet_vessel_add.html
index 4bc7de10b8c49e14d680adb95456e0b8194eaa91..8057f7144ab523c19238ff96daf60dcdb4d67295 100644 (file)
--- a/html_templates/fleet_vessel_add.html
+++ b/html_templates/fleet_vessel_add.html
@@ -1,7 +1,7 @@
 {% extends "fleet.html" %}
 
 {% block title %}
-Adding vessels in fleet {{ fleet.name }} - AIS
+Adding vessels in fleet {{ fleet.name }}
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/fleet_vessels.html b/html_templates/fleet_vessels.html
index a2223a9a9271b6272b9258e4f47ed4016f0dfdf8..7160acbaca9e6ca210138399e68cfe4eccf985e4 100644 (file)
--- a/html_templates/fleet_vessels.html
+++ b/html_templates/fleet_vessels.html
@@ -1,7 +1,7 @@
 {% extends "fleet.html" %}
 
 {% block title %}
-Fleet {{ fleet.name }} vessels - AIS
+Fleet {{ fleet.name }} vessels
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/fleets.html b/html_templates/fleets.html
index 94ab19599a014823511160ff3ad553dcbe0d07d2..56deba5cd18ee8ddcc6c1a58e6e1f825983c7b4a 100644 (file)
--- a/html_templates/fleets.html
+++ b/html_templates/fleets.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-Fleets - AIS
+Fleets
 {% endblock %}
 
 {% block tab_active_fleet %} id=tabactive{% endblock %}

diff --git a/html_templates/job.html b/html_templates/job.html
index 8b2907f621c04597e235ec5e44f725e4b72ed0a0..6a8f848687d0090480d51f6804d3f2807f717a51 100644 (file)
--- a/html_templates/job.html
+++ b/html_templates/job.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block title %}
-Job {{ job.id }} details - AIS
+Job {{ job.id }} details
 {% endblock %}
 
 {% block content %}

diff --git a/html_templates/jobs.html b/html_templates/jobs.html
index 0e6a23d20814ac27c2a20610ec474dbe29257207..e4c4d05e753b9867b34135a6ed8fe625dbd59056 100644 (file)
--- a/html_templates/jobs.html
+++ b/html_templates/jobs.html
@@ -3,7 +3,7 @@
 {% block tab_active_job %} id=tabactive{% endblock %}
 
 {% block title %}
-Jobs - AIS
+Jobs
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/news.html b/html_templates/news.html
index 9ac71357a873ca82bb2112954fb8ca7c9869bcf4..187ed1aeef0d9380cb9ffca85bd44da319b95f94 100644 (file)
--- a/html_templates/news.html
+++ b/html_templates/news.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-News - AIS
+News
 {% endblock %}
 
 {% block tab_active_news %} id=tabactive{% endblock %}

diff --git a/html_templates/sources.html b/html_templates/sources.html
index 28a4bb05731dca400aeeaa4f8a00c2e27241cd1c..2569ec5d3f511ffe9b8f8c54de6641f0d2deeb05 100644 (file)
--- a/html_templates/sources.html
+++ b/html_templates/sources.html
@@ -1,7 +1,7 @@
 {% extends "sources_index.html" %}
 
 {% block title %}
-Sources graphs - AIS
+Sources graphs
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/sources_index.html b/html_templates/sources_index.html
index 02c044f62dcbe1e7d6710b36932368defcd07cfc..5862acc83f61d4fb6c2e1d4b7abde043d6ac3b10 100644 (file)
--- a/html_templates/sources_index.html
+++ b/html_templates/sources_index.html
@@ -14,7 +14,7 @@ span.id2 {
 {% endblock %}
 
 {% block title %}
-Sources overview - AIS
+Sources overview
 {% endblock %}
 
 {% block tab_active_source %} id=tabactive{% endblock %}

diff --git a/html_templates/user_change_password.html b/html_templates/user_change_password.html
index b951e6f90db63f0799f100485516f12bb4b01128..ceea14e138054e059e6c399968c060f20f9e436b 100644 (file)
--- a/html_templates/user_change_password.html
+++ b/html_templates/user_change_password.html
@@ -1,7 +1,7 @@
 {% extends "user_edit.html" %}
 
 {% block title %}
-Change password of {{ auser.name }} - AIS
+Change password of {{ auser.name }}
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/user_delete.html b/html_templates/user_delete.html
index 9a368fbd9cae5e8bf5e1ef210226cdda638f9ada..22bbfa7eeaa99cfdc50c7be31728cf1901fbeafd 100644 (file)
--- a/html_templates/user_delete.html
+++ b/html_templates/user_delete.html
@@ -1,7 +1,7 @@
 {% extends "user_edit.html" %}
 
 {% block title %}
-Delete user acccount {{ auser.name }} - AIS
+Delete user acccount {{ auser.name }}
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/user_detail.html b/html_templates/user_detail.html
index da70f9a7e7c525a205d8c7e3f114a2a4509ab9a3..8601cfce153a8981393d1296837835cfc9658a27 100644 (file)
--- a/html_templates/user_detail.html
+++ b/html_templates/user_detail.html
@@ -1,7 +1,7 @@
 {% extends "users.html" %}
 
 {% block title %}
-User {{ auser.login }} details - AIS
+User {{ auser.login }} details
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/user_edit.html b/html_templates/user_edit.html
index 0624c70dfd8f09baac37b3e8faf4c77dbb674ba0..a307aa0050787626c0aab16d1f76b943b61f7e10 100644 (file)
--- a/html_templates/user_edit.html
+++ b/html_templates/user_edit.html
@@ -1,7 +1,7 @@
 {% extends "user_detail.html" %}
 
 {% block title %}
-User edition - AIS
+User edition
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/users.html b/html_templates/users.html
index cf450d95e3a7fe252c6ec035863c90201aa8c148..3e58137bc0a65b72052eceb926c7f785654b433f 100644 (file)
--- a/html_templates/users.html
+++ b/html_templates/users.html
@@ -3,7 +3,7 @@
 {% block tab_active_user %} id=tabactive{% endblock %}
 
 {% block title %}
-User accounts - AIS
+User accounts
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/vessel.html b/html_templates/vessel.html
index eecc30a367a570a1683476f22c637d8a31261252..17c7ddfbede9ce2c1bf35cbbcfdef80ebdbcc986 100644 (file)
--- a/html_templates/vessel.html
+++ b/html_templates/vessel.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block title %}
-{{ nmea.get_title }} - ship details - AIS
+{{ nmea.get_title }} - ship details
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/vessel_history.html b/html_templates/vessel_history.html
index d2c4b9fa6b7eaf5232b0479ce5ea0fb068c34501..6ad8a7d77981630ad1863dd9eff4d3f4ba20531b 100644 (file)
--- a/html_templates/vessel_history.html
+++ b/html_templates/vessel_history.html
@@ -1,7 +1,7 @@
 {% extends "vessel.html" %}
 
 {% block title %}
-Archive data for {{ nmea.get_name }} - AIS
+Archive data for {{ nmea.get_name }}
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/vessel_index.html b/html_templates/vessel_index.html
index 00dc8954a81a1efb93f275451a0f159a5a835be8..5ff4e9cfd34b70ef60c8effa1f1618351292afe3 100644 (file)
--- a/html_templates/vessel_index.html
+++ b/html_templates/vessel_index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}
-Vessel search - AIS
+Vessel search
 {% endblock %}
 
 {% block tab_active_vessel %} id=tabactive{% endblock %}

diff --git a/html_templates/vessel_manual_input.html b/html_templates/vessel_manual_input.html
index 74e985d1b6643ea631b99850afc1bb85b003c234..bc7e18c12fbc093b160b2a548f102c40d2f6c808 100644 (file)
--- a/html_templates/vessel_manual_input.html
+++ b/html_templates/vessel_manual_input.html
@@ -1,7 +1,7 @@
 {% extends "vessel.html" %}
 
 {% block title %}
-{{ nmea.get_title}} - manual input - AIS
+{{ nmea.get_title}} - manual input
 {% endblock %}
 
 {% block breadcrumbs %}

diff --git a/html_templates/vessels.html b/html_templates/vessels.html
index d54789ede826eced1eb2c95f1ca818d36306bdf4..d85cd2e7d4fea7b84ee0885f0f2953ed4e887e2e 100644 (file)
--- a/html_templates/vessels.html
+++ b/html_templates/vessels.html
@@ -3,7 +3,7 @@
 {% load ais_extras %}
 
 {% block title %}
-Vessel search results - AIS
+Vessel search results
 {% endblock %}
 
 {% block breadcrumbs %}