[#2781] Intro text editable

ckan · Aug 2, 2012 · 16c7c2e · 16c7c2e
1 parent 7a6f00b
commit 16c7c2e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py
@@ -48,6 +48,9 @@ def config(self):
             about = data.get('about')
             app_globals.set_global('ckan.site_about', about)
 
+            intro_text = data.get('intro_text')
+            app_globals.set_global('ckan.site_intro_text', intro_text)
+
         if 'reset' in data:
             # remove sys info items
             for key in app_globals.auto_update:
@@ -68,6 +71,7 @@ def config(self):
         data['style'] = g.main_css
         data['tagline'] = g.site_description
         data['about'] = g.site_about
+        data['intro_text'] = g.site_intro_text
 
         vars = {'data': data, 'errors': {}, 'styles': styles}
         return base.render('admin/config.html',

diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py
@@ -23,6 +23,7 @@
     'ckan.site_url',
     'ckan.site_description',
     'ckan.site_about',
+    'ckan.site_intro_text',
 ]
 
 # A place to store the origional config options of we override them

diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html
@@ -18,6 +18,8 @@ <h1 class="page-heading">{{ _('Configuration Settings') }}</h1>
 
         {{ form.markdown('about', id='field-about', label=_('About Text'), placeholder=_('About contents'), value=data.about, error=errors.about) }}
 
+        {{ form.markdown('intro_text', id='field-about', label=_('Intro Text'), placeholder=_('Intro contents'), value=data.intro_text, error=errors.intro_text) }}
+
         <div class="form-actions">
           <button type="submit" class="btn" name="reset">Reset</button>
           <button type="submit" class="btn btn-primary" name="save">Update</button>

diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
@@ -23,16 +23,20 @@
     <div class="module-content">
       {% block home_primary %}
         <header>
-          {% block home_primary_content %}
-            <h1 class="page-heading">{% block home_primary_heading %}{{ _("Welcome to CKAN") }}{% endblock %}</h1>
-            <p>
-            {% block home_primary_text %}
-              {% trans %}This is a nice introductory paragraph about CKAN or the site
-              in general. We don't have any copy to go here yet but soon we will
-              {% endtrans %}
+          {% if g.site_intro_text %}
+          {{ h.render_markdown(g.site_intro_text) }}
+          {% else %}
+            {% block home_primary_content %}
+              <h1 class="page-heading">{% block home_primary_heading %}{{ _("Welcome to CKAN") }}{% endblock %}</h1>
+              <p>
+              {% block home_primary_text %}
+                {% trans %}This is a nice introductory paragraph about CKAN or the site
+                in general. We don't have any copy to go here yet but soon we will
+                {% endtrans %}
+              {% endblock %}
+              </p>
             {% endblock %}
-            </p>
-          {% endblock %}
+          {% endif %}
         </header>
       {% endblock %}