Show calls to action when logged out too.

The messages previously shown are more suited for the hosting service at sayit.mysociety.org - this way, when you install the code yourself, you are immediately given things to do. Fixes #411.
mysociety · Dec 13, 2014 · 64cfb57 · 64cfb57
1 parent 2c6df3c
commit 64cfb57
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/speeches/templates/speeches/_home.html b/speeches/templates/speeches/_home.html
@@ -77,16 +77,16 @@ <h2>{% block instance_search_title %}{% trans 'Search speeches and statements' %
   {% else %}
 
     <div class="nothing-here-yet-message">
-      {% if request.is_user_instance %}
+      {% block nothing-here-yet %}
         <h1>{% trans 'Brilliant!' %}</h1>
         <p class="lead">{% trans 'Now you&rsquo;ve got your own public database for speeches and statements.' %}</p>
         <p class="lead">{% trans 'However, it&rsquo;s totally empty. Let&rsquo;s get started by adding something.' %}</p>
-        <p><a href="{% url "speeches:speech-add" %}" class="button">{% trans 'Add your first statement' %}</a></p>
-      {% else %}
-        <h1>{% trans 'This is a brand new SayIt site.' %}</h1>
-        <p class="lead">{% trans 'Its creator hasn&rsquo;t yet added any speeches or statements for you to see.' %}</p>
-        <p><a href="http://sayit.mysociety.org" class="button">{% trans 'Learn more about SayIt' %}</a></p>
-      {% endif %}
+        <p>
+            <a href="{% url "speeches:speech-add" %}" class="button">{% trans 'Add your first statement' %}</a>
+            <a href="{% url "speeches:speaker-add" %}" class="button">{% trans 'Add your first speaker' %}</a>
+            <a href="{% url 'speeches:import-popolo' %}" class="button">{% trans "Import speakers" %}</a>
+        </p>
+      {% endblock %}
     </div>
 
   {% endif %}

diff --git a/speeches/templates/speeches/parentless_list.html b/speeches/templates/speeches/parentless_list.html
@@ -13,15 +13,17 @@
 
 {% block content %}
 
-  {% if section_list or speech_list %}
-
+  {% if section_list or speech_list or request.is_user_instance %}
     <div class="page-header">
       {% if request.is_user_instance %}
         <a href="{% url "speeches:speech-add" %}" class="button small right">{% trans "Add a new speech" %}</a>
         <a href="{% url "speeches:section-add" %}" class="button secondary small right">{% trans "Add a section" %}</a>
       {% endif %}
         <h1>{% trans "Speeches" %}</h1>
     </div>
+  {% endif %}
+
+  {% if section_list or speech_list %}
 
       {% if section_list %}
         <ul class="unstyled">
@@ -53,15 +55,11 @@ <h2>{% trans 'Speeches not in a section' %}</h2>
   {% else %}
 
     <div class="nothing-here-yet-message">
-      {% if request.is_user_instance %}
+      {% block nothing-here-yet %}
         <h1>{% trans 'You haven&rsquo;t added any speeches or statements yet' %}</h1>
         <p class="lead">{% trans 'Once you have, you&rsquo;ll be able to browse speeches and organise them into sections here.' %}</p>
         <p><a href="{% url "speeches:speech-add" %}" class="button">{% trans 'Add your first statement' %}</a></p>
-      {% else %}
-        <h1>{% trans 'This is a brand new SayIt site.' %}</h1>
-        <p class="lead">{% trans 'Its creator hasn&rsquo;t yet added any speeches or statements for you to see.' %}</p>
-        <p><a href="http://sayit.mysociety.org" class="button">{% trans 'Learn more about SayIt' %}</a></p>
-      {% endif %}
+      {% endblock %}
     </div>
 
   {% endif %}

diff --git a/speeches/templates/speeches/speaker_list.html b/speeches/templates/speeches/speaker_list.html
@@ -8,7 +8,7 @@
 
 {% block content %}
 
-
+  {% if speaker_list or request.is_user_instance %}
     <div class="page-header">
       {% if request.is_user_instance %}
         <a href="{% url "speeches:speaker-add" %}" class="button small right">{% trans "Add a new speaker" %}</a>
@@ -18,6 +18,7 @@
         <h1>{% trans "All Speakers" %}</h1>
       {% endif %}
     </div>
+  {% endif %}
 
   {% if speaker_list %}
 
@@ -40,19 +41,15 @@ <h1>{% trans "All Speakers" %}</h1>
   {% else %}
 
     <div class="nothing-here-yet-message">
-      {% if request.is_user_instance %}
+      {% block nothing-here-yet %}
         <h1>{% trans 'You haven&rsquo;t added any speeches or statements yet' %}</h1>
         <p class="lead">{% trans 'Once you have, this page will contain a list of all the different people who made each statement in this SayIt site.' %}</p>
         <p>
-          <a href="{% url "speeches:speech-add" %}" class="button">{% trans 'Add your first statement' %}</a>
           <a href="{% url "speeches:speaker-add" %}" class="button">{% trans 'Add your first speaker' %}</a>
+          <a href="{% url "speeches:import-popolo" %}" class="button">{% trans "Import speakers" %}</a>
+          <a href="{% url "speeches:speech-add" %}" class="button secondary">{% trans 'Add your first statement' %}</a>
         </p>
-
-      {% else %}
-        <h1>{% trans 'This is a brand new SayIt site.' %}</h1>
-        <p class="lead">{% trans 'Its creator hasn&rsquo;t yet added any speeches or statements for you to see.' %}</p>
-        <p><a href="http://sayit.mysociety.org" class="button">{% trans 'Learn more about SayIt' %}</a></p>
-      {% endif %}
+      {% endblock %}
     </div>
 
   {% endif %}