Merge pull request #166 from njritter/feature/164-about-page

About Page
massgo · Nov 21, 2017 · fe8dc84 · fe8dc84
2 parents 775fdcd + d53ec05
commit fe8dc84
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 9 deletions.
diff --git a/app/league/admin/forms.py b/app/league/admin/forms.py
@@ -118,6 +118,10 @@ class SiteSettingsForm(FlaskForm):
     this_episode_phrase = StringField('This episode phrase',
                                       validators=[DataRequired(),
                                                   Length(min=1, max=10)])
+    about_page_text = StringField('About Page text',
+                                  validators=[DataRequired(),
+                                              Length(min=1, max=1000)])
+
     update = SubmitField('Update Site Settings')
 
     def validate(self):

diff --git a/app/league/admin/views.py b/app/league/admin/views.py
@@ -94,7 +94,8 @@ def manage_site_settings():
         update_site_settings(
             app=current_app,
             dashboard_title=form.dashboard_title.data,
-            this_episode_phrase=form.this_episode_phrase.data
+            this_episode_phrase=form.this_episode_phrase.data,
+            about_page_text=form.about_page_text.data
         )
         flash('Site settings updated!', 'success')
     else:

diff --git a/app/league/public/views.py b/app/league/public/views.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """Public section, including homepage and signup."""
-from flask import Blueprint, flash, redirect, render_template, request, url_for
+from flask import (Blueprint, current_app, flash, redirect, render_template,
+                   request, url_for)
 from flask_login import login_required, logout_user
 
 from league.admin.models import User
@@ -35,4 +36,6 @@ def logout():
 def about():
     """About page."""
     form = LoginForm(request.form)
-    return render_template('public/about.html', login_form=form)
+    site_settings = current_app.config['SITE_SETTINGS']
+    return render_template('public/about.html', site_settings=site_settings,
+                           login_form=form)
diff --git a/app/league/settings.py b/app/league/settings.py
@@ -17,9 +17,15 @@ class Config(object):
     CACHE_TYPE = 'simple'  # Can be "memcached", "redis", etc.
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     LEAGUE_ROOT_PASS = os.environ.get('LEAGUE_ROOT_PASS', 'root')
-    SITE_SETTINGS = {'dashboard_title': 'Dashboard',
-                     'this_episode_phrase': 'in Current Episode',
-                     'contact_email': 'hndrewaall@gmail.com'}
+    SITE_SETTINGS = {
+        'dashboard_title': 'Dashboard',
+        'this_episode_phrase': 'in Current Episode',
+        'contact_email': 'hndrewaall@gmail.com',
+        'about_page_text': (
+            'An app for managing Go leagues. Learn more and contribute on '
+            '<a href="https://github.com/massgo/league">GitHub</a>.'
+        )
+    }
 
 
 class ProdConfig(Config):

diff --git a/app/league/templates/admin/site_settings.html b/app/league/templates/admin/site_settings.html
@@ -16,6 +16,12 @@ <h1>Site Settings</h1>
                                     value=site_settings.this_episode_phrase)}}
     </div>
 
+    <div class="form-group">
+      {{ site_settings_form.about_page_text.label }}
+      {{ site_settings_form.about_page_text(class_="form-control",
+                                value=site_settings.about_page_text) }}
+    </div>
+
     {{ site_settings_form.update(class="btn btn-default btn-submit") }}
   </form>
 </div>

diff --git a/app/league/templates/nav.html b/app/league/templates/nav.html
@@ -16,6 +16,7 @@
   <div class="collapse navbar-collapse navbar-ex1-collapse">
     <ul class="nav navbar-nav">
       <li><a href="{{ url_for('dashboard.prizes') }}">Prizes</a></li>
+      <li><a href="{{ url_for('public.about') }}">About</a></li>
       {% if current_user and current_user.is_authenticated %}
       <li><a href="{{ url_for('dashboard.get_players') }}">Players</a></li>
       <li><a href="{{ url_for('dashboard.list_games') }}">Games</a></li>

diff --git a/app/league/templates/public/about.html b/app/league/templates/public/about.html
@@ -4,9 +4,8 @@
 {% block content %}
 <div class="body-content">
     <div class="row">
-      <h1>About</h1>
-      <p>This template was created by <a href="http://github.com/sloria/">Steven Loria</a> for use with the <a href="http://github.com/audreyr/cookiecutter/">cookiecutter</a> package by <a href="http://github.com/audreyr/">Audrey Roy</a>.</p>
+      <!-- TODO: https://github.com/massgo/league/issues/167 -->
+      {{ site_settings.about_page_text|safe }}
     </div>
 </div>
 {% endblock %}
-