You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/09/19 20:43:28 UTC
[50/50] git commit: [#4724] ticket:149 FF renders forum pagination in
wrong spot
[#4724] ticket:149 FF renders forum pagination in wrong spot
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4bfe7d48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4bfe7d48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4bfe7d48
Branch: refs/heads/master
Commit: 4bfe7d48abee3ff525b5bcd588f79c13f3c7b3ae
Parents: 5e54b1d
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Wed Aug 22 19:59:34 2012 +0400
Committer: Dave Brondsema <db...@geek.net>
Committed: Wed Sep 5 21:31:19 2012 +0000
----------------------------------------------------------------------
.../allura/lib/widgets/resources/css/page_list.css | 3 +++
Allura/allura/templates/widgets/page_list.html | 2 +-
.../templates/widgets/subscription_form.html | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4bfe7d48/Allura/allura/lib/widgets/resources/css/page_list.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/page_list.css b/Allura/allura/lib/widgets/resources/css/page_list.css
index 3e0c878..71094a6 100644
--- a/Allura/allura/lib/widgets/resources/css/page_list.css
+++ b/Allura/allura/lib/widgets/resources/css/page_list.css
@@ -3,3 +3,6 @@
margin: 0 20px 20px 0;
font-size: 1.1em;
}
+.div_page_list {
+ height: 40px;
+}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4bfe7d48/Allura/allura/templates/widgets/page_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/page_list.html b/Allura/allura/templates/widgets/page_list.html
index d6ab14b..d69211d 100644
--- a/Allura/allura/templates/widgets/page_list.html
+++ b/Allura/allura/templates/widgets/page_list.html
@@ -1,4 +1,4 @@
-<div>
+<div class="div_page_list">
<div class="page_list">
{% set paginator = widget.paginator(count, page, limit) %}
{{paginator.pager('$link_first $link_previous ~2~ $link_next $link_last (Page $page of $page_count)')}}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4bfe7d48/Allura/allura/templates/widgets/subscription_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/subscription_form.html b/Allura/allura/templates/widgets/subscription_form.html
index e7c4fd1..e1002fc 100644
--- a/Allura/allura/templates/widgets/subscription_form.html
+++ b/Allura/allura/templates/widgets/subscription_form.html
@@ -1,6 +1,6 @@
<div {{attrs|default({}, true)|xmlattr}} class="discussion_subscription_form">
<div class="clear"></div>
- {{widget.fields['page_list'].display(limit=limit, page=page, count=count)}}
+ {{widget.fields['page_list'].display(limit=limit, page=page, count=count)}}
<form method="{{method}}" action="{{action}}" {% if enctype %}enctype="{{enctype}}"{% endif %} class="follow_form">
{{widget.fields['threads'].display(value=threads)}}
<p>