##// END OF EJS Templates
And more refactorings
neko259 -
r2011:daba0554 default
parent child Browse files
Show More
@@ -4,7 +4,9 b' from boards.models import Banner'
4 from boards.models.user import Notification
4 from boards.models.user import Notification
5 from boards import settings
5 from boards import settings
6 from boards.models import Post, Tag, Thread
6 from boards.models import Post, Tag, Thread
7 from boards.settings import SECTION_FORMS
7 from boards.settings import SECTION_FORMS, SECTION_VIEW, SECTION_VERSION
8
9 THEME_CSS = 'css/{}/base_page.css'
8
10
9 CONTEXT_SITE_NAME = 'site_name'
11 CONTEXT_SITE_NAME = 'site_name'
10 CONTEXT_VERSION = 'version'
12 CONTEXT_VERSION = 'version'
@@ -60,25 +62,24 b' def user_and_ui_processor(request):'
60 context[CONTEXT_THEME] = theme
62 context[CONTEXT_THEME] = theme
61
63
62 # TODO Use static here
64 # TODO Use static here
63 context[CONTEXT_THEME_CSS] = 'css/' + theme + '/base_page.css'
65 context[CONTEXT_THEME_CSS] = THEME_CSS.format(theme)
64
66
65 context[CONTEXT_VERSION] = settings.get('Version', 'Version')
67 context[CONTEXT_VERSION] = settings.get(SECTION_VERSION, 'Version')
66 context[CONTEXT_SITE_NAME] = settings.get('Version', 'SiteName')
68 context[CONTEXT_SITE_NAME] = settings.get(SECTION_VERSION, 'SiteName')
67
69
68 if (settings.get_bool('Forms', 'LimitFirstPosting') and not settings_manager.get_setting('confirmed_user'))\
70 if settings.get_bool(SECTION_FORMS, 'LimitFirstPosting'):
69 or settings.get_bool('Forms', 'LimitPostingSpeed'):
70 context[CONTEXT_POW_DIFFICULTY] = settings.get_int(SECTION_FORMS, 'PowDifficulty')
71 context[CONTEXT_POW_DIFFICULTY] = settings.get_int(SECTION_FORMS, 'PowDifficulty')
71
72
72 context[CONTEXT_IMAGE_VIEWER] = settings_manager.get_setting(
73 context[CONTEXT_IMAGE_VIEWER] = settings_manager.get_setting(
73 SETTING_IMAGE_VIEWER,
74 SETTING_IMAGE_VIEWER,
74 default=settings.get('View', 'DefaultImageViewer'))
75 default=settings.get(SECTION_VIEW, 'DefaultImageViewer'))
75
76
76 context[CONTEXT_HAS_FAV_THREADS] =\
77 context[CONTEXT_HAS_FAV_THREADS] =\
77 len(settings_manager.get_fav_threads()) > 0
78 len(settings_manager.get_fav_threads()) > 0
78
79
79 context[CONTEXT_BANNERS] = Banner.objects.order_by('-id')
80 context[CONTEXT_BANNERS] = Banner.objects.order_by('-id')
80 context[CONTEXT_ONLY_FAVORITES] = settings_manager.get_setting(
81 context[CONTEXT_ONLY_FAVORITES] = settings_manager.get_setting(
81 SETTING_ONLY_FAVORITES, False)
82 SETTING_ONLY_FAVORITES, default=False)
82
83
83 get_notifications(context, settings_manager)
84 get_notifications(context, settings_manager)
84 get_new_post_count(context, settings_manager)
85 get_new_post_count(context, settings_manager)
@@ -8,6 +8,7 b" CONFIG_SETTINGS = 'boards/config/setting"
8 SECTION_FORMS = 'Forms'
8 SECTION_FORMS = 'Forms'
9 SECTION_VIEW = 'View'
9 SECTION_VIEW = 'View'
10 SECTION_EXTERNAL = 'External'
10 SECTION_EXTERNAL = 'External'
11 SECTION_VERSION = 'Version'
11
12
12 VALUE_TRUE = 'true'
13 VALUE_TRUE = 'true'
13
14
General Comments 0
You need to be logged in to leave comments. Login now