diff options
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/models/question.py | 1 | ||||
| -rwxr-xr-x | askbot/skins/default/media/style/style.css | 6 | ||||
| -rw-r--r-- | askbot/skins/default/templates/blocks/paginator.html | 4 | ||||
| -rw-r--r-- | askbot/views/readers.py | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index 3f236e73..456a8d99 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -19,4 +19,4 @@ def get_version(): """returns version of the askbot app this version is meaningful for pypi only """ - return '0.6.56' + return '0.6.57' diff --git a/askbot/models/question.py b/askbot/models/question.py index fecdef13..2a2a36f0 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -55,7 +55,6 @@ class QuestionManager(models.Manager): #DATED COMMENT #todo: this is confusing - last_edited_at field #is used as an indicator whether question has been edited - #in template askbot/skins/default/templates/post_contributor_info.html #but in principle, post creation should count as edit as well question.last_edited_by = question.author question.last_edited_at = added_at diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index d8ebb430..9ea83ee9 100755 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -272,7 +272,7 @@ blockquote { background-color: #cccccc;/*888a85; /*#e9b96e;*/ width:700px; border: 1px solid #aaaaaa; - padding: 4px 5px 4px 5px; + padding: 4px 5px 4px 4px; } #searchBar .searchInput, #searchBar .searchInputCancelable { @@ -643,7 +643,7 @@ a:hover.medal { float: left; height: 20px; line-height: 22px; - margin: 5px 4px 0 0; + margin: 5px 0 0 4px; padding: 0 11px 0 11px; text-decoration: none; } @@ -652,7 +652,7 @@ a:hover.medal { float: left; font-weight: bold; color: #777; - margin: 8px 4px 0 4px; + margin: 8px 0 0 4px; } .tabsB a { diff --git a/askbot/skins/default/templates/blocks/paginator.html b/askbot/skins/default/templates/blocks/paginator.html new file mode 100644 index 00000000..9782407f --- /dev/null +++ b/askbot/skins/default/templates/blocks/paginator.html @@ -0,0 +1,4 @@ +<!-- paginator.html --> +{% import "macros.html" as macros %} +{{ macros.paginator(paginator_context)}} +<!-- end paginator.html --> diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 78a2ddd7..b6e6d2bf 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -153,7 +153,7 @@ def questions(request): } if q_count > search_state.page_size: - paginator_tpl = ENV.get_template('paginator.html') + paginator_tpl = ENV.get_template('blocks/paginator.html') #todo: remove this patch on context after all templates are moved to jinja paginator_context['base_url'] = request.path + '?sort=%s&' % search_state.sort data = { |