diff options
| -rw-r--r-- | askbot/conf/site_settings.py | 1 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 | ||||
| -rw-r--r-- | askbot/skins/default/templates/main_page/tab_bar.html | 2 | ||||
| -rw-r--r-- | askbot/skins/default/templates/user_profile/user_edit.html | 19 | ||||
| -rw-r--r-- | askbot/startup_procedures.py | 8 |
5 files changed, 17 insertions, 15 deletions
diff --git a/askbot/conf/site_settings.py b/askbot/conf/site_settings.py index 8cd73b3d..c64ea952 100644 --- a/askbot/conf/site_settings.py +++ b/askbot/conf/site_settings.py @@ -63,7 +63,6 @@ settings.register( livesettings.StringValue( QA_SITE_SETTINGS, 'APP_URL', - default='http://askbot.org', description=_( 'Base URL for your Q&A forum, must start with ' 'http or https' diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 19fd3c61..71ccf0f2 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -222,7 +222,7 @@ djcelery.setup_loader() DOMAIN_NAME = '{{domain_name}}' CSRF_COOKIE_NAME = '{{domain_name}}_csrf' -CSRF_COOKIE_DOMAIN = DOMAIN_NAME +CSRF_COOKIE_DOMAIN = DOMAIN_NAME #note that this can be edited STATIC_ROOT = os.path.join(PROJECT_ROOT, "static") STATICFILES_DIRS = (os.path.join(ASKBOT_ROOT, 'skins'),) diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html index e08232bb..8b666155 100644 --- a/askbot/skins/default/templates/main_page/tab_bar.html +++ b/askbot/skins/default/templates/main_page/tab_bar.html @@ -1,6 +1,6 @@ {% import "macros.html" as macros %} {% load extra_filters_jinja %} -{% cache 0 "scope_sort_tabs" search_tags request.user scope sort query context.page language_code %} +{% cache 0 "scope_sort_tabs" search_tags request.user author_name scope sort query context.page language_code %} <a class="rss" {% if feed_url %} href="{{settings.APP_URL}}{{feed_url}}" diff --git a/askbot/skins/default/templates/user_profile/user_edit.html b/askbot/skins/default/templates/user_profile/user_edit.html index 94a1d58d..7735ba93 100644 --- a/askbot/skins/default/templates/user_profile/user_edit.html +++ b/askbot/skins/default/templates/user_profile/user_edit.html @@ -40,7 +40,7 @@ <td> {% if settings.EDITABLE_SCREEN_NAME %} {{ form.username }} - <span class="form-error"></span> {{ form.username.errors }} </td> + <span class="form-error"> {{ form.username.errors }} </span></td> {% else %} {{ view_user.username }} {% endif %} @@ -53,8 +53,7 @@ <td> {% if settings.EDITABLE_EMAIL %} {{ form.email }} - <span class="form-error"></span> - {{ form.email.errors }} + <span class="form-error">{{ form.email.errors }}</span> {% else %} {{ view_user.email }} {% trans %}(cannot be changed){% endtrans %} @@ -63,27 +62,27 @@ </tr> <tr> <td>{{ form.realname.label_tag() }}:</td> - <td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td> + <td>{{ form.realname }} <span class="form-error"> {{ form.realname.errors }} </span></td> </tr> <tr> <td>{{ form.website.label_tag() }}:</td> - <td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td> + <td>{{ form.website }} <span class="form-error"> {{ form.website.errors }} </span></td> </tr> <tr> <td>{{ form.city.label_tag() }}:</td> - <td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td> + <td>{{ form.city }} <span class="form-error"> {{ form.city.errors }} </span></td> </tr> <tr> <td>{{ form.country.label_tag() }}:</td> - <td>{{ form.country }} <span class="form-error"></span> {{ form.country.errors }} </td> + <td>{{ form.country }} <span class="form-error"> {{ form.country.errors }} </span></td> </tr> <tr> <td>{{ form.show_country.label_tag() }}:</td> - <td>{{ form.show_country }} <span class="form-error"></span> {{ form.show_country.errors }} </td> + <td>{{ form.show_country }} <span class="form-error"> {{ form.show_country.errors }} </span></td> </tr> <tr> <td>{{ form.birthday.label_tag() }}:</td> - <td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td> + <td>{{ form.birthday }} <span class="form-error"> {{ form.birthday.errors }} </span></td> </tr> <tr> <td></td> @@ -95,7 +94,7 @@ </tr> <tr> <td style="vertical-align:top">{{ form.about.label_tag() }}:</td> - <td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td> + <td>{{ form.about }} <span class="form-error"> {{ form.about.errors }} </span></td> </tr> </table> <div style="margin:30px 0 60px 0"> diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py index 4c76be2c..0ce5b3a1 100644 --- a/askbot/startup_procedures.py +++ b/askbot/startup_procedures.py @@ -356,7 +356,11 @@ def test_staticfiles(): askbot_root = os.path.dirname(askbot.__file__) skin_dir = os.path.abspath(os.path.join(askbot_root, 'skins')) - if skin_dir not in map(os.path.abspath, django_settings.STATICFILES_DIRS): + + # django_settings.STATICFILES_DIRS can have strings or tuples + staticfiles_dirs = [d[1] if isinstance(d, tuple) else d + for d in django_settings.STATICFILES_DIRS] + if skin_dir not in map(os.path.abspath, staticfiles_dirs): errors.append( 'Add to STATICFILES_DIRS list of your settings.py file:\n' " '%s'," % skin_dir @@ -368,7 +372,7 @@ def test_staticfiles(): 'Directory specified with settning ASKBOT_EXTRA_SKINS_DIR ' 'must exist and contain your custom skins for askbot.' ) - if extra_skins_dir not in django_settings.STATICFILES_DIRS: + if extra_skins_dir not in staticfiles_dirs: errors.append( 'Add ASKBOT_EXTRA_SKINS_DIR to STATICFILES_DIRS entry in ' 'your settings.py file.\n' |