##// END OF EJS Templates
Merged with default branch
neko259 -
r847:011dea60 merge decentral
parent child Browse files
Show More
@@ -67,7 +67,7 b' body {'
67 }
67 }
68
68
69 .navigation_panel, .tag_info {
69 .navigation_panel, .tag_info {
70 background: #444;
70 background: #222;
71 margin-bottom: 5px;
71 margin-bottom: 5px;
72 margin-top: 5px;
72 margin-top: 5px;
73 padding: 10px;
73 padding: 10px;
@@ -101,6 +101,20 b' body {'
101 visibility: hidden;
101 visibility: hidden;
102 }
102 }
103
103
104 .header {
105 border-bottom: solid 2px #ccc;
106 margin-bottom: 5px;
107 border-top: none;
108 margin-top: 0;
109 }
110
111 .footer {
112 border-top: solid 2px #ccc;
113 margin-top: 5px;
114 border-bottom: none;
115 margin-bottom: 0;
116 }
117
104 p, .br {
118 p, .br {
105 margin-top: .5em;
119 margin-top: .5em;
106 margin-bottom: .5em;
120 margin-bottom: .5em;
@@ -341,10 +355,6 b' li {'
341 display: none;
355 display: none;
342 }
356 }
343
357
344 .footer {
345 margin: 5px;
346 }
347
348 .bar-value {
358 .bar-value {
349 background: rgba(50, 55, 164, 0.45);
359 background: rgba(50, 55, 164, 0.45);
350 font-size: 0.9em;
360 font-size: 0.9em;
@@ -386,8 +396,9 b' li {'
386 }
396 }
387
397
388 .current_page {
398 .current_page {
389 border: solid 1px #afdcec;
390 padding: 2px;
399 padding: 2px;
400 background-color: #afdcec;
401 color: #000;
391 }
402 }
392
403
393 .current_mode {
404 .current_mode {
@@ -25,7 +25,7 b''
25 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
25 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
26 <script src="{% url 'js_info_dict' %}"></script>
26 <script src="{% url 'js_info_dict' %}"></script>
27
27
28 <div class="navigation_panel">
28 <div class="navigation_panel header">
29 <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
29 <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
30 {% for tag in tags %}
30 {% for tag in tags %}
31 <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
31 <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
@@ -45,7 +45,7 b''
45 <script src="{% static 'js/refpopup.js' %}"></script>
45 <script src="{% static 'js/refpopup.js' %}"></script>
46 <script src="{% static 'js/main.js' %}"></script>
46 <script src="{% static 'js/main.js' %}"></script>
47
47
48 <div class="navigation_panel">
48 <div class="navigation_panel footer">
49 {% block metapanel %}{% endblock %}
49 {% block metapanel %}{% endblock %}
50 [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
50 [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
51 {% with ppd=posts_per_day|floatformat:2 %}
51 {% with ppd=posts_per_day|floatformat:2 %}
@@ -54,9 +54,5 b''
54 <a class="link" href="#top">{% trans 'Up' %}</a>
54 <a class="link" href="#top">{% trans 'Up' %}</a>
55 </div>
55 </div>
56
56
57 <div class="footer">
58 <!-- Put your banners here -->
59 </div>
60
61 </body>
57 </body>
62 </html>
58 </html>
@@ -154,18 +154,6 b' INSTALLED_APPS = ('
154 'boards',
154 'boards',
155 )
155 )
156
156
157 DEBUG_TOOLBAR_PANELS = (
158 'debug_toolbar.panels.version.VersionDebugPanel',
159 'debug_toolbar.panels.timer.TimerDebugPanel',
160 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
161 'debug_toolbar.panels.headers.HeaderDebugPanel',
162 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
163 'debug_toolbar.panels.template.TemplateDebugPanel',
164 'debug_toolbar.panels.sql.SQLDebugPanel',
165 'debug_toolbar.panels.signals.SignalDebugPanel',
166 'debug_toolbar.panels.logger.LoggingPanel',
167 )
168
169 # A sample logging configuration. The only tangible logging
157 # A sample logging configuration. The only tangible logging
170 # performed by this configuration is to send an email to
158 # performed by this configuration is to send an email to
171 # the site admins on every HTTP 500 error when DEBUG=False.
159 # the site admins on every HTTP 500 error when DEBUG=False.
@@ -229,18 +217,15 b' COMPRESS_HTML = True'
229 # Debug mode middlewares
217 # Debug mode middlewares
230 if DEBUG:
218 if DEBUG:
231 MIDDLEWARE_CLASSES += (
219 MIDDLEWARE_CLASSES += (
232 #'boards.profiler.ProfilerMiddleware',
233 'debug_toolbar.middleware.DebugToolbarMiddleware',
220 'debug_toolbar.middleware.DebugToolbarMiddleware',
234 )
221 )
235
222
236 def custom_show_toolbar(request):
223 def custom_show_toolbar(request):
237 return DEBUG
224 return False
238
225
239 DEBUG_TOOLBAR_CONFIG = {
226 DEBUG_TOOLBAR_CONFIG = {
240 'INTERCEPT_REDIRECTS': False,
241 'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
242 'HIDE_DJANGO_SQL': False,
243 'ENABLE_STACKTRACES': True,
227 'ENABLE_STACKTRACES': True,
228 'SHOW_TOOLBAR_CALLBACK': 'neboard.settings.custom_show_toolbar',
244 }
229 }
245
230
246 # FIXME Uncommenting this fails somehow. Need to investigate this
231 # FIXME Uncommenting this fails somehow. Need to investigate this
@@ -16,6 +16,7 b''
16 * Add buttons to insert a named link or a named quote to the markup panel
16 * Add buttons to insert a named link or a named quote to the markup panel
17 * Add support for "attention posts" that are shown in the header"
17 * Add support for "attention posts" that are shown in the header"
18 * Use absolute post reflinks in the raw text
18 * Use absolute post reflinks in the raw text
19 * Use default boards/settings when it is not defined. Maybe default_settings.py module?
19
20
20 = Bugs =
21 = Bugs =
21 * Search sort order is confusing
22 * Search sort order is confusing
General Comments 0
You need to be logged in to leave comments. Login now