Просмотр исходного кода

The page title is now configureable

sh4nks 11 лет назад
Родитель
Сommit
9e9fbe02f5

+ 6 - 3
flaskbb/configs/default.py

@@ -20,7 +20,6 @@ class DefaultConfig(object):
     _basedir = os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(
                             os.path.dirname(__file__)))))
 
-    PROJECT = "flaskbb"
     DEBUG = False
     TESTING = False
 
@@ -36,7 +35,7 @@ class DefaultConfig(object):
 
     # Default Database
     SQLALCHEMY_DATABASE_URI = 'sqlite:///' + _basedir + '/' + \
-                              PROJECT + ".sqlite"
+                              'flaskbb.sqlite'
     # sqlite for testing/debug.
     SQLALCHEMY_ECHO = False
 
@@ -100,10 +99,14 @@ class DefaultConfig(object):
     # 0 - Disable it
     TRACKER_LENGTH = 7
 
-    FORUM_URL_PREFIX = "/forum"
+    FORUM_URL_PREFIX = ""
     USER_URL_PREFIX = "/user"
     AUTH_URL_PREFIX = "/auth"
     ADMIN_URL_PREFIX = "/admin"
 
     # Default style
     DEFAULT_THEME = "bootstrap3"
+
+    # Your project name with a subtitle
+    PROJECT_TITLE = "FlaskBB"
+    PROJECT_SUBTITLE = "A lightweight forum software in flask"

+ 11 - 5
flaskbb/configs/development.py.example

@@ -16,8 +16,12 @@ class DevelopmentConfig(DefaultConfig):
     DEBUG = True
 
     # SQLAlchemy connection options
+    # This will create in the applications folder (where manage.py is)
+    # a database named flaskbb.sqlite.
     SQLALCHEMY_DATABASE_URI = 'sqlite:///' + DefaultConfig._basedir + '/' + \
-                              DefaultConfig.PROJECT + ".sqlite"
+                              'flaskbb.sqlite'
+
+    # This will print all SQL statements
     SQLALCHEMY_ECHO = True
 
     # Security
@@ -28,17 +32,19 @@ class DevelopmentConfig(DefaultConfig):
     # Recaptcha
     # To get recaptcha, visit the link below:
     # https://www.google.com/recaptcha/admin/create
-    RECAPTCHA_ENABLED = False
+    # Those keys are only going to work on localhost!
+    RECAPTCHA_ENABLED = True
     RECAPTCHA_USE_SSL = False
-    RECAPTCHA_PUBLIC_KEY = "your_public_key"
-    RECAPTCHA_PRIVATE_KEY = "your_private_key"
+    RECAPTCHA_PUBLIC_KEY = "6LcZB-0SAAAAAGIddBuSFU9aBpHKDa16p5gSqnxK"
+    RECAPTCHA_PRIVATE_KEY = "6LcZB-0SAAAAAPuPHhazscMJYa2mBe7MJSoWXrUu"
     RECAPTCHA_OPTIONS = {"theme": "white"}
 
     # Mail
+    # Google Mail example
     MAIL_SERVER = "smtp.googlemail.com"
     MAIL_PORT = 465
     MAIL_USE_SSL = True
     MAIL_USERNAME = "flaskbb@gmail.com"
     MAIL_PASSWORD = "your_password"
-    MAIL_DEFAULT_SENDER = "flaskbb.com"
+    MAIL_DEFAULT_SENDER = "flaskbb@gmail.com"
     ADMINS = ["flaskbb@gmail.com"]

+ 8 - 1
flaskbb/configs/production.py.example

@@ -18,7 +18,7 @@ class ProductionConfig(DefaultConfig):
     #SQLALCHEMY_DATABASE_URI = "postgresql://localhost/example"
     # For SQLite:
     #SQLALCHEMY_DATABASE_URI = 'sqlite:///' + DefaultConfig._basedir + '/' + \
-    #                          DefaultConfig.PROJECT + ".sqlite"
+    #                          'flaskbb.sqlite'
 
     ## Security
     # This is the secret key that is used for session signing.
@@ -76,6 +76,13 @@ class ProductionConfig(DefaultConfig):
     REDIS_DB = 0
 
     ## FlaskBB Configs
+    # Default style
+    DEFAULT_THEME = "bootstrap3"
+
+    # Your project name with a subtitle
+    PROJECT_TITLE = "FlaskBB"
+    PROJECT_SUBTITLE = "A lightweight forum software in flask"
+
     # Pagination
     # How many posts per page are displayed
     POSTS_PER_PAGE = 10

+ 9 - 1
flaskbb/templates/layout.html

@@ -2,7 +2,15 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <title>{% block title %}{% if not page_title %}FlaskBB{% else %}{{ page_title }} - FlaskBB{% endif %}{% endblock %}</title>
+        <title>
+        {% block title %}
+            {%- if not page_title -%}
+                {{ config["PROJECT_TITLE"] }} - {{ config["PROJECT_SUBTITLE"] }}
+            {%- else -%}
+                {{ page_title }} - {{ config["PROJECT_TITLE"] }}
+            {%- endif -%}
+        {% endblock %}
+        </title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="FlaskBB is a forum software written in Flask">
         <meta name="author" content="FlaskBB Team">