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 2016/12/05 16:39:39 UTC
[6/9] allura git commit: [#7981] make thread moderate panel a little
nicer looking
[#7981] make thread moderate panel a little nicer looking
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e7a39fce
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e7a39fce
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e7a39fce
Branch: refs/heads/master
Commit: e7a39fce90a909851507c35591ad5a4f54bb5600
Parents: c8e7076
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Nov 18 10:48:27 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Dec 5 11:39:20 2016 -0500
----------------------------------------------------------------------
Allura/allura/lib/widgets/discuss.py | 2 +-
.../templates/discussion_widgets/thread_header.html | 6 ++++--
ForgeDiscussion/forgediscussion/widgets/forum_widgets.py | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e7a39fce/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index a527dd9..98f60ca 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -485,7 +485,7 @@ class Thread(HierWidget):
if (mod_thread_link.length) {
if (mod_thread_form.length) {
mod_thread_link.click(function (e) {
- mod_thread_form.show();
+ mod_thread_form.toggle();
return false;
});
}
http://git-wip-us.apache.org/repos/asf/allura/blob/e7a39fce/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
index 9a988df..1c71c85 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
@@ -26,9 +26,11 @@
<div class="grid-5"><label>Updated:</label> {{lib.abbr_date(value.mod_date)}}</div>
{% if show_moderate and h.has_access(value, 'moderate')() %}
- <div id="mod_thread_form" style="display: none;">
+ <div id="mod_thread_form" style="display: none; clear: both">
<h2>Moderate Thread</h2>
- {{widgets.moderate_thread.display(value=value, action=value.url()+'moderate')}}
+ <div class="grid-19 fright">
+ {{widgets.moderate_thread.display(value=value, action=value.url()+'moderate')}}
+ </div>
<div style="clear: both;"> </div>
</div>
{% endif %}
http://git-wip-us.apache.org/repos/asf/allura/blob/e7a39fce/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
index d26f330..8c0c07f 100644
--- a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
+++ b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
@@ -120,8 +120,8 @@ class ModerateThread(CsrfForm):
submit_text = 'Save Changes'
class fields(ew_core.NameList):
- discussion = _ForumSelector(label='New Forum')
- flags = ew.CheckboxSet(options=['Sticky', 'Announcement'])
+ discussion = _ForumSelector(label='Move to different forum:')
+ flags = ew.CheckboxSet(label='Options', options=['Sticky', 'Announcement'])
class buttons(ew_core.NameList):
delete = ew.SubmitButton(label='Delete Thread')