Put logo really everywhere.
--- a/src/cm/templates/site/activate.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/activate.html Thu Oct 10 09:37:17 2013 +0200
@@ -7,6 +7,16 @@
{% block content %}
+<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 %}
+
+{% 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="activate" enctype="multipart/form-data" class="wizard-form" action="." method="post">
--- a/src/cm/templates/site/contact.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/contact.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,6 +11,16 @@
{% block content %}
+<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 %}
+
+{% 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">
<table class="wide_form">
--- a/src/cm/templates/site/forgot_pw.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/forgot_pw.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,6 +11,16 @@
{% block content %}
+<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 %}
+
+{% 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>
{% if form %}
--- a/src/cm/templates/site/help.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/help.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,6 +11,16 @@
{% block content %}
+<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 %}
+
+{% 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>
<h2>{% blocktrans %}General Presentation{% endblocktrans %}</h2>
--- a/src/cm/templates/site/login.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/login.html Thu Oct 10 09:37:17 2013 +0200
@@ -9,8 +9,17 @@
{% block content %}
-<h1 class="main_title"><a class="title" href="{% url index %}">{{ CONF.workspace_name }}</a></h1>
+<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 %}
+
+{% 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" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
--- a/src/cm/templates/site/non_authenticated_index.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/non_authenticated_index.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,7 +11,16 @@
{% block content %}
-<h1 class="main_title"><a class="title" href="{% url index %}">{{ CONF.workspace_name }}</a></h1>
+<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 %}
+
+{% 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 %}
<table class="home-table">
@@ -37,4 +46,4 @@
{% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
--- a/src/cm/templates/site/notifications_desactivate.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/notifications_desactivate.html Thu Oct 10 09:37:17 2013 +0200
@@ -9,7 +9,16 @@
{% block content %}
-<h1 class="main_title"><a class="title" href="{% url index %}">{{ CONF.workspace_name }}</a></h1>
+<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 %}
+
+{% 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">
--- a/src/cm/templates/site/profile.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/profile.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,6 +11,16 @@
{% block content %}
+<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 %}
+
+{% 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>
<ul class="sub_list">
--- a/src/cm/templates/site/profile_pw.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/profile_pw.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,6 +11,16 @@
{% block content %}
+<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 %}
+
+{% 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>
<ul class="sub_list">
--- a/src/cm/templates/site/register.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/register.html Thu Oct 10 09:37:17 2013 +0200
@@ -9,7 +9,16 @@
{% block content %}
-<h1 class="main_title"><a class="title" href="{% url index %}">{{ CONF.workspace_name }}</a></h1>
+<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 %}
+
+{% 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">
--- a/src/cm/templates/site/reset_pw.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/reset_pw.html Thu Oct 10 09:37:17 2013 +0200
@@ -11,6 +11,16 @@
{% block content %}
+<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 %}
+
+{% 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">
<table class="wide_form">
--- a/src/cm/templates/site/text_pending.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/text_pending.html Thu Oct 10 09:37:17 2013 +0200
@@ -1,6 +1,16 @@
{% extends "site/layout/base.html" %}
{% block content %}
+<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 %}
+
+{% 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>
Your text "{{ text.get_latest_version.title }}" has been successfully created.
--- a/src/cm/templates/site/unauthorized.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/unauthorized.html Thu Oct 10 09:37:17 2013 +0200
@@ -2,6 +2,16 @@
{% load i18n %}
{% block content %}
+<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 %}
+
+{% 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>
--- a/src/cm/templates/site/user_activate.html Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/user_activate.html Thu Oct 10 09:37:17 2013 +0200
@@ -7,6 +7,16 @@
{% block content %}
+<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 %}
+
+{% 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">
<table class="wide_form">