# HG changeset patch
# User gibus
# Date 1381396565 -7200
# Node ID 723261fb23fbc2a13259e8f138ff8c351948e2ad
# Parent  05b5e51e882309384b8d9fd9fe51724a76f6b6d6
Put also workspace name in any case.

diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/activate.html
--- a/src/cm/templates/site/activate.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/activate.html	Thu Oct 10 11:16:05 2013 +0200
@@ -10,12 +10,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans %}Activate your account{% endblocktrans %}</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/contact.html
--- a/src/cm/templates/site/contact.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/contact.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>Contact</h1>
 <form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/forgot_pw.html
--- a/src/cm/templates/site/forgot_pw.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/forgot_pw.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans %}Reset my password{% endblocktrans %}</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/help.html
--- a/src/cm/templates/site/help.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/help.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans %}Help{% endblocktrans %}</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/login.html
--- a/src/cm/templates/site/login.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/login.html	Thu Oct 10 11:16:05 2013 +0200
@@ -12,12 +12,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 
 {% include "site/login_form.html" %}
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/non_authenticated_index.html
--- a/src/cm/templates/site/non_authenticated_index.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/non_authenticated_index.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 
 {% if public_texts %}
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/notifications_desactivate.html
--- a/src/cm/templates/site/notifications_desactivate.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/notifications_desactivate.html	Thu Oct 10 11:16:05 2013 +0200
@@ -12,12 +12,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 
 <div id="login_container">
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/profile.html
--- a/src/cm/templates/site/profile.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/profile.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans with user.username as username %}Your profile ({{ username }}){% endblocktrans %}</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/profile_pw.html
--- a/src/cm/templates/site/profile_pw.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/profile_pw.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans with user.username as username %}Your profile ({{ username }}){% endblocktrans %}</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/register.html
--- a/src/cm/templates/site/register.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/register.html	Thu Oct 10 11:16:05 2013 +0200
@@ -12,12 +12,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 
 <div id="login_container">
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/reset_pw.html
--- a/src/cm/templates/site/reset_pw.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/reset_pw.html	Thu Oct 10 11:16:05 2013 +0200
@@ -14,12 +14,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans %}Reset your password{% endblocktrans %}</h1>
 <form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/text_pending.html
--- a/src/cm/templates/site/text_pending.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/text_pending.html	Thu Oct 10 11:16:05 2013 +0200
@@ -4,12 +4,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>Text pending!</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/unauthorized.html
--- a/src/cm/templates/site/unauthorized.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/unauthorized.html	Thu Oct 10 11:16:05 2013 +0200
@@ -5,12 +5,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans %}Unauthorized{% endblocktrans %}</h1>
 
diff -r 05b5e51e8823 -r 723261fb23fb src/cm/templates/site/user_activate.html
--- a/src/cm/templates/site/user_activate.html	Thu Oct 10 09:37:17 2013 +0200
+++ b/src/cm/templates/site/user_activate.html	Thu Oct 10 11:16:05 2013 +0200
@@ -10,12 +10,11 @@
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
 <div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
-{% else %}
+{% endif %}
 
 {% if CONF.workspace_name %}
 <a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
 {% endif %}
-{% endif %}
 </h1>
 <h1>{% blocktrans %}Activate your account{% endblocktrans %}</h1>
 <form id="user_add" enctype="multipart/form-data" class="wizard-form" action="." method="post">