diff -r 4ec5ae89a7b0 -r 0c01050f9717 src/cm/templates/site/layout/base_workspace.html
--- a/src/cm/templates/site/layout/base_workspace.html	Wed Feb 10 14:34:08 2010 +0100
+++ b/src/cm/templates/site/layout/base_workspace.html	Thu Feb 11 16:28:10 2010 +0100
@@ -11,7 +11,20 @@
 {% get_local_perm request can_manage_workspace as can_manage_workspace %}
 {% nb_texts as nb_texts %}
 {% nb_users as nb_users %}
-<h1 class="main_title"><a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a></h1>
+<h1 class="main_title">
+{% if CONF.f_get_logo_url %}
+<div><img src="{{ CONF.f_get_logo_url }}"></img></div>
+{% endif %}
+
+{% if CONF.workspace_name %}
+<a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
+{% endif %}
+</h1>
+
+{% if CONF.workspace_tagline %}
+<div>
+{{ CONF.workspace_tagline }}</div>
+{% endif %}
 
 <span class="metadata">
 {% blocktrans count nb_texts as nb_texts %}{{ nb_texts }} text{% plural %}{{ nb_texts }} texts{% endblocktrans %}{% if can_manage_workspace %}, {% blocktrans count nb_users as nb_users %}{{ nb_users }} user{% plural %}{{ nb_users }} users{% endblocktrans %}