From 186aa3775cc71b62023a0ac67e3d1798fc601eec Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 19 Sep 2012 20:48:57 -0400 Subject: modified documentation and the settings.py templates to reflect the location of default skin files --- askbot/doc/source/customizing-skin-in-askbot.rst | 9 ++++----- askbot/setup_templates/settings.py | 4 +++- askbot/setup_templates/settings.py.mustache | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/askbot/doc/source/customizing-skin-in-askbot.rst b/askbot/doc/source/customizing-skin-in-askbot.rst index 09ea0dbb..e384a314 100644 --- a/askbot/doc/source/customizing-skin-in-askbot.rst +++ b/askbot/doc/source/customizing-skin-in-askbot.rst @@ -15,8 +15,7 @@ of better performance and flexibility of coding. What are skins made of ====================== -Skin is a directory either within ``askbot/skins`` -or in a directory, pointed to by ``ASKBOT_EXTRA_SKINS_DIR`` +Skin is a directory, pointed to by ``ASKBOT_EXTRA_SKINS_DIR`` parameter of your ``settings.py`` file. Skin name is the same as the name of its directory, @@ -37,7 +36,7 @@ A skin consists of HTML templates, css and javascript and all of these resources are looked up first within currently active skin, then in "default". -Names "default" and "common" are reserved and should not be used to +Name "default" is reserved and should not be used to name custom skins. Current state of skin system @@ -108,7 +107,7 @@ In addition, it will help if your copy of askbot code is installed in the django project directory (use ``python setup.py develop`` method to install askbot in the first place). -Then edit anything in directory ``askbot/skins/default`` +Then edit anything in directories ``askbot/templates`` and ``askbot/media`` and commit to your own repository. If the askbot app is installed in the `site-packages` or `dist-packages` @@ -156,7 +155,7 @@ Git makes this task quite simple and manageable. Skin templates ============== -The first template to look at is `askbot/skins/default/templates/base.html`, it is quite simple and you can substantially change the appearance by modifying that template in the combination with adding some custom css. +The first template to look at is `askbot/templates/base.html`, it is quite simple and you can substantially change the appearance by modifying that template in the combination with adding some custom css. More detailed description of templates will follow. diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 0af52df1..a257a9f0 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -229,7 +229,9 @@ CSRF_COOKIE_NAME = 'askbot_csrf' #enter domain name here - e.g. example.com #CSRF_COOKIE_DOMAIN = '' -STATICFILES_DIRS = ( os.path.join(ASKBOT_ROOT, 'skins'),) +STATICFILES_DIRS = ( + ('default/media', os.path.join(ASKBOT_ROOT, 'media'), +) RECAPTCHA_USE_SSL = True diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 82ff1d92..8ed69803 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -230,7 +230,9 @@ CSRF_COOKIE_NAME = '{{domain_name}}_csrf' #CSRF_COOKIE_DOMAIN = DOMAIN_NAME STATIC_ROOT = os.path.join(PROJECT_ROOT, "static") -STATICFILES_DIRS = (os.path.join(ASKBOT_ROOT, 'skins'),) +STATICFILES_DIRS = ( + ('default/media', os.path.join(ASKBOT_ROOT, 'media'), +) RECAPTCHA_USE_SSL = True -- cgit v1.2.3-1-g7c22