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/07/13 19:29:58 UTC
[01/18] allura git commit: [#8088] Sleek button design
Repository: allura
Updated Branches:
refs/heads/master ac793feca -> 5bb18508f
[#8088] Sleek button design
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d59cac73
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d59cac73
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d59cac73
Branch: refs/heads/master
Commit: d59cac732e5ba2c497aefe071c814e9cc273a579
Parents: 5e6a1b2
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed Jun 8 02:43:22 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:28 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d59cac73/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 3af702b..0199265 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3466,6 +3466,11 @@ fieldset.preferences legend {
.bubble .header .btn{
float: none;
margin: 0px;
+ border: 1px solid rgb(215,215,215);
+ background: rgb(235,235,235);
+ font-weight: bold;
+ color: rgb(69,69,69);
+ font-size: 0.8em;
}
.header form{
[06/18] allura git commit: [#8088] Added check to see if user has
permission to reply
Posted by br...@apache.org.
[#8088] Added check to see if user has permission to reply
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ed07eed6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ed07eed6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ed07eed6
Branch: refs/heads/master
Commit: ed07eed6b21421352472228d7470293efb53e0fb
Parents: 68aa802
Author: Rohan Verma <ro...@gmail.com>
Authored: Thu Jun 9 23:53:54 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/widgets/post_widget.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ed07eed6/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 3a4ea9e..bec9ecd 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -57,8 +57,9 @@
{{lib.user_link(value.author())}} - <i style="color: #777">{{lib.abbr_date(value.timestamp)}}</i>
<div class="tools">
- <a class="icon reply_post btn" href="#" style="" title="Reply" role="button"><span class="ui-button-text"><i class="fa fa-reply"></i></span></a>
-
+ {% if h.has_access(value.thread, 'post')() %}
+ <a class="icon reply_post btn" href="#" style="" title="Reply" role="button"><span class="ui-button-text"><i class="fa fa-reply"></i></span></a>
+ {% endif %}
<a href="{{shortlink_url}}" class="icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"{%if value.status == 'pending'%} style="display:none"{%endif%}>
<span><i class="fa fa-link" aria-hidden="true"></i></span></a>
[18/18] allura git commit: Fix how far lists inside comments can go;
a proper fix for [#6248]
Posted by br...@apache.org.
Fix how far lists inside comments can go; a proper fix for [#6248]
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5bb18508
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5bb18508
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5bb18508
Branch: refs/heads/master
Commit: 5bb18508f53fa80c4362341cb381604dc2abadd8
Parents: bbe874b
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Jul 11 16:40:49 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:57 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5bb18508/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 2335f0d..d147079 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2456,11 +2456,11 @@ div.attachment_thumb .file_type span {
#comment ul {
list-style: none;
- margin: 0 20px 0px 0;
+ margin: 0 0 0 0;
padding: 0;
float: right;
clear: right;
- width: 99%;
+ width: 99%; /* to make thread-level <ul> full width */
}
#comment ul ul li {
@@ -2501,6 +2501,7 @@ div.attachment_thumb .file_type span {
float: none;
padding-left: 1em;
list-style-type: disc;
+ width: inherit; /* regular, not 99% from thread-level <ul> */
}
#comment .edit_post_form ul,
#comment .reply_post_form ul {
[11/18] allura git commit: [#8088] Updated style for meta_posts
Posted by br...@apache.org.
[#8088] Updated style for meta_posts
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3ebe0fed
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3ebe0fed
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3ebe0fed
Branch: refs/heads/master
Commit: 3ebe0fedf11e6e788435520ae92b00519988127c
Parents: 6e49813
Author: Rohan Verma <ro...@gmail.com>
Authored: Thu Jun 23 22:58:41 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 14 ++++++++++++++
Allura/allura/templates/widgets/post_widget.html | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3ebe0fed/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 4fee5f7..ad2ad2c 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3516,6 +3516,20 @@ fieldset.preferences legend {
border-radius: 10%;
}
+.meta_post .bubble .header{
+ background-color: #ffffff;
+ font-size: 0.7em;
+}
+
+.meta_post .bubble::before{
+ border-right-color: #efefef;
+}
+
+.meta_post .bubble .markdown_content{
+ padding-left: 5px;
+ font-size: 0.7em;
+}
+
@media print{
body{
background-color: #FFFFFF;
http://git-wip-us.apache.org/repos/asf/allura/blob/3ebe0fed/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index bec9ecd..b79e989 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -28,7 +28,7 @@
+ '#' + value.slug %}
<div>
- <div id="{{value.slug}}" class="discussion-post">
+ <div id="{{value.slug}}" class="discussion-post {%if value.is_meta %}meta_post{% endif %}">
{% if h.has_access(value, 'moderate')() %}
<div class="info grid-15 spam-present">
<span class="spam-text">Comment has been marked as spam. </span>
[12/18] allura git commit: [#8088] Fix for images exceeding bubble
Posted by br...@apache.org.
[#8088] Fix for images exceeding bubble
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6e498139
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6e498139
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6e498139
Branch: refs/heads/master
Commit: 6e498139f6aebeece6dbe66907a44a718c6dda0b
Parents: 407997c
Author: Rohan Verma <ro...@gmail.com>
Authored: Thu Jun 23 19:34:38 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6e498139/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index ab79801..4fee5f7 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2425,6 +2425,10 @@ div.attachment_thumb .file_type span {
padding-left: 0;
}
+.discussion-post img {
+ max-width: 100%;
+}
+
#comment .row .options {
position: relative;
padding-top: 5px;
[04/18] allura git commit: [#8088] Visual changes to discussion tool.
added a header toolbar design
Posted by br...@apache.org.
[#8088] Visual changes to discussion tool. added a header toolbar design
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7c2b05a9
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7c2b05a9
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7c2b05a9
Branch: refs/heads/master
Commit: 7c2b05a9446a8f7ab1386545567ecd4ad460e79a
Parents: ac793fe
Author: Rohan Verma <ro...@gmail.com>
Authored: Sat Jun 4 06:59:47 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:28 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 75 +++++++++++++++-----
.../allura/templates/widgets/moderate_post.html | 10 ++-
.../allura/templates/widgets/post_widget.html | 53 ++++++--------
3 files changed, 85 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7c2b05a9/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 8cb3805..3af702b 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2401,13 +2401,6 @@ div.attachment_thumb .file_type span {
/* Discussion */
#comment .row {
- border: 3px solid #d7d7d7;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- -o-border-radius: 5px;
- -ms-border-radius: 5px;
- -khtml-border-radius: 5px;
- border-radius: 5px;
position: relative;
float: right;
clear: right;
@@ -2452,7 +2445,10 @@ div.attachment_thumb .file_type span {
}
#comment .grid-14 { overflow: visible; }
-#comment .display_post { margin-right: 5px; }
+#comment .display_post {
+ margin-right: 5px;
+ padding: 5px;
+}
#comment ul {
list-style: none;
@@ -2485,19 +2481,10 @@ div.attachment_thumb .file_type span {
#comment ul .row {
margin: 0;
- min-height: 140px;
padding-top: 1em;
}
#comment ul ul .row {
- border: 3px solid #ebebeb;
- border-top: none;
- border-radius: 0;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-bottom-left-radius: 0;
- -webkit-border-bottom-left-radius: 5px;
- -moz-border-radius-bottomleft: 5px;
position: relative;
}
@@ -3462,6 +3449,60 @@ fieldset.preferences legend {
float: left;
}
+.bubble{
+ border-radius: 3px;
+ display: inline-block;
+ vertical-align: top;
+ box-sizing: border-box;
+ border: 1px solid #e5e5e5;
+}
+
+.bubble .header{
+ border-radius-top: 5px;
+ background-color: #e5e5e5;
+ padding: 10px;
+}
+
+.bubble .header .btn{
+ float: none;
+ margin: 0px;
+}
+
+.header form{
+ display:inline;
+}
+
+.header .tools{
+ display: inline;
+ float: right;
+}
+
+.header a .little_link {
+
+}
+
+.bubble::before {
+ width: 0;
+ height: 0;
+ border-style: solid;
+ border-width: 8px 8px 8px 0;
+ border-color: transparent #F7F7F7 transparent transparent;
+ content:'\A';
+ position:absolute;
+ left: 83px;
+ top: 25px;
+ border-right-color: #e5e5e5;
+}
+
+.discussion-post .row .emboss{
+ //un-emboss image for discussions
+
+ box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
+ -webkit-box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
+
+ border-radius: 10%;
+}
+
@media print{
body{
background-color: #FFFFFF;
http://git-wip-us.apache.org/repos/asf/allura/blob/7c2b05a9/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index d111e23..4c3f277 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -19,21 +19,19 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<form method="POST" action="{{action}}">
<input type="hidden" name="delete" value="True"/>
- <a href="" class="moderate_post little_link"><span>Delete</span></a>
+ <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-trash-o fa-lg"></i></span></a>
{{lib.csrf_token()}}
</form>
-<br/>
{%if status == 'pending'%}
<form method="POST" class="moderate_approve" action="{{action}}">
<input type="hidden" name="approve" value="True"/>
- <a href="" class="moderate_post little_link"><span>Approve</span></a>
+ <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-check" aria-hidden="true"></i>
+ Approve</span></a>
{{lib.csrf_token()}}
</form>
- <br/>
{%endif%}
<form method="POST" class="moderate_spam" action="{{action}}">
<input type="hidden" name="spam" value="True"/>
- <a href="" class="moderate_post little_link"><span>Spam</span></a>
+ <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i> Spam</span></a>
{{lib.csrf_token()}}
- </form>
<br/>
http://git-wip-us.apache.org/repos/asf/allura/blob/7c2b05a9/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 8c614d4..a5fd418 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -47,24 +47,38 @@
<div class="grid-2 tcenter gravatar">
<p class="gravatar">
{% set size = value.parent and 32 or 48 %}
- {{lib.gravatar(value.author(), size=size)}}<br>
- <small>
- {{lib.user_link(value.author())}}
- </small>
- <br>
- <small>{{lib.abbr_date(value.timestamp)}}</small>
+ {{lib.gravatar(value.author(), size=size)}}
</p>
</div>
{% set pending = value.status == 'pending' %}
{% set moderator = h.has_access(value, 'moderator')() %}
- <div class="grid-14 post-content" style="width: {{indent == 0 and 525 or (indent <= 40 and 515-indent*10 or 65)}}px">
- <div class="display_post{% if pending and moderator %} moderate{% endif %}">
+ <div class="grid-16 post-content bubble" style="width: {{indent == 0 and 652 or (indent <= 40 and 642-indent*10 or 65)}}px">
+ <div class="header">
+ {{lib.user_link(value.author())}} - <i style="color: #777">{{lib.abbr_date(value.timestamp)}}</i>
+
+ <div class="tools">
+ <a class="icon reply_post btn" href="#" style="" title="Reply" role="button"><span class="ui-button-text"><i class="fa fa-reply"></i></span></a>
+
+ <a href="{{shortlink_url}}" class="icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"{%if value.status == 'pending'%} style="display:none"{%endif%}>
+ <span><i class="fa fa-link" aria-hidden="true"></i></span></a>
+
+ {% if h.has_access(value, 'moderate')()%}
+ <a href="#" class="icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only edit_post little_link"><span><i class="fa fa-pencil" aria-hidden="true"></i></span></a>
+ {% endif %}
+
+ {% if h.has_access(value.thread, 'moderate')() %}
+ {{widgets.moderate_post.display(value=value, action=value.url()+'moderate', status = value.status)}}
+ {%endif%}
+ </div>
+ </div>
+ <div class="display_post{% if pending and moderator %} moderate{% endif %}">
{% if pending and not moderator %}
<b>Post awaiting moderation.</b>
{% else %}
{% if show_subject %}
<b>{{value.subject or '(no subject)'}}<br/></b>
{% endif %}
+
{{g.markdown.cached_convert(value, 'text')|safe}}
{{lib.related_artifacts(value)}}
{% if value.edit_count %}
@@ -111,28 +125,7 @@
</div>
{% endif %}
</div>
- <div class="options grid-3">
- {% if h.has_access(value.thread, 'post')() %}
- {{ g.icons['reply'].render(
- show_title=True,
- extra_css='reply_post btn',
- style='display:none;' if value.status == 'pending' else '') }}
- {% endif %}
- <div style="clear:both">
- <div class="little_link">
- <a href="{{shortlink_url}}" class="little_link shortlink"{%if value.status == 'pending'%} style="display:none"{%endif%}><span>Link</span></a><br/>
- {% if h.has_access(value, 'moderate')()%}
- <a href="#" class="edit_post little_link"><span>Edit</span></a><br/>
- {% endif %}
- </div>
- {% if h.has_access(value.thread, 'moderate')() %}
- {{widgets.moderate_post.display(value=value, action=value.url()+'moderate', status = value.status)}}
- {%endif%}
- {% if h.has_access(value.thread, 'post')() %}
- <a href="#" class="add_attachment little_link"><span>Attach</span></a>
- {% endif %}
- </div>
- </div>
+
<div class="shortlink_popup modal" style="display: none">
{{ g.icons['close'].render(extra_css='close') }}
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
[15/18] allura git commit: [#8088] Fixed design issue in codemirror
while editing ticket
Posted by br...@apache.org.
[#8088] Fixed design issue in codemirror while editing ticket
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/bbe874be
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/bbe874be
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/bbe874be
Branch: refs/heads/master
Commit: bbe874be28a8e54c4c759bf6b7a39d495f188f5a
Parents: 8bbdabf
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed Jul 13 00:17:21 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:30 2016 -0400
----------------------------------------------------------------------
.../forgetracker/templates/tracker_widgets/ticket_form.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/bbe874be/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index d266ca2..cfa90ab 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -115,7 +115,7 @@
</div>
</div>
<div style="clear:both"> </div>
- <div class="reply discussion-post" style="position:relative;{% if not show_comment %} display:none{% endif %}">
+ <div class="reply" style="position:relative;{% if not show_comment %} display:none{% endif %}">
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
[13/18] allura git commit: [#8088] Fixed Test failiures due to new
css meta_post class for discussions
Posted by br...@apache.org.
[#8088] Fixed Test failiures due to new css meta_post class for discussions
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8bbdabf1
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8bbdabf1
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8bbdabf1
Branch: refs/heads/master
Commit: 8bbdabf14b5fba38d70d668c7fb2240839eba770
Parents: 3a52e47
Author: Rohan Verma <ro...@gmail.com>
Authored: Mon Jul 4 01:33:12 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:30 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/widgets/post_widget.html | 2 +-
ForgeTracker/forgetracker/tests/functional/test_root.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8bbdabf1/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 93079a0..ce6be9d 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -28,7 +28,7 @@
+ '#' + value.slug %}
<div>
- <div id="{{value.slug}}" class="discussion-post {%if value.is_meta %}meta_post{% endif %}">
+ <div id="{{value.slug}}" class="discussion-post{%if value.is_meta %} meta_post{% endif %}">
{% if h.has_access(value, 'moderate')() %}
<div class="info grid-15 spam-present">
<span class="spam-text">Comment has been marked as spam. </span>
http://git-wip-us.apache.org/repos/asf/allura/blob/8bbdabf1/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index f8e9d18..1bffbe3 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1482,7 +1482,7 @@ class TestFunctionalController(TrackerTestController):
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page=1))
assert_true(summary + ' --> ' + new_summary in r)
- assert_true(len(r.html.findAll(attrs={'class': 'discussion-post'})) == 2)
+ assert_true(len(r.html.findAll(attrs={'class': 'discussion-post meta_post'})) == 1)
def test_discussion_paging(self):
summary = 'test discussion paging'
[10/18] allura git commit: [#8088] test_anonymous_post updated
Posted by br...@apache.org.
[#8088] test_anonymous_post updated
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9a93a45e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9a93a45e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9a93a45e
Branch: refs/heads/master
Commit: 9a93a45e21de8cfc9a65cc7e0cba950b6b90d2a6
Parents: ed07eed
Author: Rohan Verma <ro...@gmail.com>
Authored: Thu Jun 16 21:22:32 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/9a93a45e/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 6475514..5b6ef01 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -505,11 +505,8 @@ class TestForum(TestController):
r = self.app.get(thread.request.url)
assert '<div class="display_post moderate">' in r
- assert '<a class="icon reply_post btn" href="#" style="display:none;" title="Reply">'\
- '<i class="fa fa-reply"></i> Reply</a>' in r
+ assert '<i class="fa fa-reply"></i>' in r
- assert r.html.find(
- 'a', {'class': 'little_link shortlink', 'style': 'display:none'}) is not None
assert 'name="delete"' in r
assert 'name="approve"' in r
assert 'name="spam"' in r
[08/18] allura git commit: [#8088] Fixed margins
Posted by br...@apache.org.
[#8088] Fixed margins
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/68aa8024
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/68aa8024
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/68aa8024
Branch: refs/heads/master
Commit: 68aa8024fa397fa1dc7773211a83f5f8fa40d5a0
Parents: 72d87ae
Author: Rohan Verma <ro...@gmail.com>
Authored: Thu Jun 9 22:09:54 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 2 +-
Allura/allura/templates/widgets/post_widget.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/68aa8024/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 3f47d02..ab79801 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2452,7 +2452,7 @@ div.attachment_thumb .file_type span {
#comment ul {
list-style: none;
- margin: 0 20px 20px 0;
+ margin: 0 20px 0px 0;
padding: 0;
float: right;
clear: right;
http://git-wip-us.apache.org/repos/asf/allura/blob/68aa8024/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index a5fd418..3a4ea9e 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -52,7 +52,7 @@
</div>
{% set pending = value.status == 'pending' %}
{% set moderator = h.has_access(value, 'moderator')() %}
- <div class="grid-16 post-content bubble" style="width: {{indent == 0 and 652 or (indent <= 40 and 642-indent*10 or 65)}}px">
+ <div class="grid-16 post-content bubble" style="width: {{indent == 0 and 652 or (indent <= 40 and 642-indent*10 or 65)}}px; {% if indent != 0 %} margin-right:0px {% endif %}">
<div class="header">
{{lib.user_link(value.author())}} - <i style="color: #777">{{lib.abbr_date(value.timestamp)}}</i>
[05/18] allura git commit: [#8088] Rebased to remove bad commit,
Added tooltips to buttons
Posted by br...@apache.org.
[#8088] Rebased to remove bad commit, Added tooltips to buttons
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ee60af24
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ee60af24
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ee60af24
Branch: refs/heads/master
Commit: ee60af2425dd640388880c60204b604f4a0b523d
Parents: 3ebe0fe
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jun 24 20:05:37 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/widgets/moderate_post.html | 6 +++---
Allura/allura/templates/widgets/post_widget.html | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ee60af24/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index 9c507e4..f57648a 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -19,20 +19,20 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<form method="POST" action="{{action}}">
<input type="hidden" name="delete" value="True"/>
- <a href="" class="moderate_post delete little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-trash-o fa-lg"></i></span></a>
+ <a href="" title="Delete" class="moderate_post delete little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-trash-o fa-lg"></i></span></a>
{{lib.csrf_token()}}
</form>
{%if status == 'pending'%}
<form method="POST" class="moderate_approve" action="{{action}}">
<input type="hidden" name="approve" value="True"/>
- <a href="" class="moderate_post approve little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-check" aria-hidden="true"></i>
+ <a href="" title="Approve" class="moderate_post approve little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-check" aria-hidden="true"></i>
Approve</span></a>
{{lib.csrf_token()}}
</form>
{%endif%}
<form method="POST" class="moderate_spam" action="{{action}}">
<input type="hidden" name="spam" value="True"/>
- <a href="" class="moderate_post spam little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i></span></a>
+ <a href="" title="Mark as Spam" class="moderate_post spam little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i></span></a>
{{lib.csrf_token()}}
</form>
<br/>
http://git-wip-us.apache.org/repos/asf/allura/blob/ee60af24/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index b79e989..fd7ef4d 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -60,11 +60,11 @@
{% if h.has_access(value.thread, 'post')() %}
<a class="icon reply_post btn" href="#" style="" title="Reply" role="button"><span class="ui-button-text"><i class="fa fa-reply"></i></span></a>
{% endif %}
- <a href="{{shortlink_url}}" class="icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"{%if value.status == 'pending'%} style="display:none"{%endif%}>
+ <a href="{{shortlink_url}}" title="Shortlink" class="little_link shortlink icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"{%if value.status == 'pending'%} style="display:none"{%endif%}>
<span><i class="fa fa-link" aria-hidden="true"></i></span></a>
{% if h.has_access(value, 'moderate')()%}
- <a href="#" class="icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only edit_post little_link"><span><i class="fa fa-pencil" aria-hidden="true"></i></span></a>
+ <a href="#" title="Edit" class="icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only edit_post little_link"><span><i class="fa fa-pencil" aria-hidden="true"></i></span></a>
{% endif %}
{% if h.has_access(value.thread, 'moderate')() %}
[17/18] allura git commit: [#8088] Fixed design changes on editor
Posted by br...@apache.org.
[#8088] Fixed design changes on editor
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3a52e475
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3a52e475
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3a52e475
Branch: refs/heads/master
Commit: 3a52e475b9e818a2ac2933c2ea7aaf301ed0d2c6
Parents: 8fd25cf
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jul 1 13:10:22 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:30 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 24 ++++++++++++++++++--
Allura/allura/templates/widgets/edit_post.html | 8 +++----
.../allura/templates/widgets/post_widget.html | 2 +-
.../allura/templates/widgets/thread_widget.html | 9 +++++---
4 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index c838786..2335f0d 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3507,8 +3507,6 @@ fieldset.preferences legend {
}
.discussion-post .row .emboss{
- //un-emboss image for discussions
-
box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
-webkit-box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
@@ -3548,6 +3546,28 @@ fieldset.preferences legend {
font-size: 0.7em;
}
+.reply .bubble::before{
+ display:none;
+}
+
+.reply .gravatar{
+ padding-top: 33px;
+}
+
+.reply .markdown_edit .bubble{
+ padding-left: 5px;
+}
+
+div .bubble .CodeMirror {
+ border-top: 1px #bbb solid !important;
+ border-bottom: 1px #bbb solid !important;
+ width: 100%;
+}
+
+.bubble .edit_markdown_form{
+ padding-left: 5px;
+}
+
@media print{
body{
background-color: #FFFFFF;
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/templates/widgets/edit_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/edit_post.html b/Allura/allura/templates/widgets/edit_post.html
index b3d814c..f47fcf8 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -17,7 +17,7 @@
under the License.
-#}
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
-<div>
+<div class="edit_markdown_form">
<form id="edit_{{ action[-4:] }}" method="post" action="{{action}}"
enctype="multipart/form-data">
{% if show_subject %}
@@ -26,10 +26,10 @@
{% endif %}
{{widget.display_field(widget.fields.text)}}
<input type="hidden" class="original_value" value="{{value.text}}">
- <span class="arw"><span></span></span><br/>
+ <span class="arw"><span></span></span>
<div style="clear:both"></div>
- <input type="submit" value="{{submit_text}}"/>
- <a href="#" class="btn link cancel_edit_post">Cancel</a>
+ <input type="submit" value="{{submit_text}}" />
+ <a href="#" class="ui-button btn link cancel_edit_post">Cancel</a>
<a href="#" class="btn link attachment_form_add_button">Add attachments</a>
<input type="file" class="text attachment_form_fields" style="display:none" multiple="True" name="{{att_name}}" {% if att_id %}id="{{att_id}}"{% endif %}/>
{% if widget.antispam %}{% for fld in g.antispam.extra_fields() %}
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 3418d98..93079a0 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -146,7 +146,7 @@
</small>
</p>
</div>
- <div class="grid-14" style="width: {{indent <= 40 and 625-indent*10 or 225}}px">
+ <div class="grid-14 bubble" style="width: {{indent <= 40 and 625-indent*10 or 225}}px">
{{widgets.edit_post.display(
submit_text='Post Reply',
action=value.url()+'reply',
http://git-wip-us.apache.org/repos/asf/allura/blob/3a52e475/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index 256ad00..fa26fd7 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -52,8 +52,9 @@
{% if h.has_access(value, 'post')() %}
<div id="new_post_holder">
<span id="add_comment"></span>
- <div class="row reply">
- <div class="grid-2 tcenter">
+ <div class="row" style="padding-top:10px;">
+ <div class="reply">
+ <div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
<small>
@@ -62,8 +63,10 @@
</p>
</div>
<div class="grid-17">
- {{widgets.edit_post.display(submit_text='Post', action=value.url() + 'post')}}
+ {{widgets.edit_post.display(submit_text='Post', action=value.url() + 'post')}}
+ </div>
</div>
</div>
</div>
+
{% endif %}
[14/18] allura git commit: [#8088] Updated edit button style to match
new design changes. minor design changes
Posted by br...@apache.org.
[#8088] Updated edit button style to match new design changes. minor design changes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3e8f1466
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3e8f1466
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3e8f1466
Branch: refs/heads/master
Commit: 3e8f1466e819e941b58aa36c6a540f0a709590a4
Parents: ee60af2
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jun 24 20:40:58 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:30 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 20 +++++++++++++++++++-
.../allura/templates/widgets/post_widget.html | 4 ++--
2 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3e8f1466/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index ad2ad2c..c838786 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2480,7 +2480,6 @@ div.attachment_thumb .file_type span {
margin-top: 0 !important;
background-color: #fff;
overflow: auto;
- padding-bottom: 30px;
}
#comment ul .row {
@@ -3516,6 +3515,25 @@ fieldset.preferences legend {
border-radius: 10%;
}
+.discussion-post .editor-toolbar {
+ border: 0px;
+ width: 100%;
+}
+
+.discussion-post .CodeMirror {
+ border: 0px;
+ width: 100%;
+}
+
+.discussion-post .editor-statusbar {
+ border: 0px !important;
+ width: 100%;
+}
+
+.discussion-post .editor-preview {
+ width: 100%;
+}
+
.meta_post .bubble .header{
background-color: #ffffff;
font-size: 0.7em;
http://git-wip-us.apache.org/repos/asf/allura/blob/3e8f1466/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index fd7ef4d..3418d98 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -88,7 +88,7 @@
{% endif %}
</div>
{% if h.has_access(value, 'moderate')() %}
- <div class="edit_post_form reply" style="display:none">
+ <div class="edit_post_form reply" style="display:none; padding-left: 5px;">
{{widgets.edit_post.display(value=value, submit_text='Post', action=value.url())}}
</div>
{% endif %}
@@ -98,7 +98,7 @@
</div>
{% endif %}
{% if value.attachments and (not pending or moderator) %}
- <div>
+ <div style="padding-left: 5px;">
<strong>Attachments</strong>
<div class="clear"></div>
{% for att in value.attachments %}
[07/18] allura git commit: [#8088] Fix buttons getting cut-off
Posted by br...@apache.org.
[#8088] Fix buttons getting cut-off
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/72d87ae8
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/72d87ae8
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/72d87ae8
Branch: refs/heads/master
Commit: 72d87ae8f639859a963c0aa9b4d845ca5d61a81d
Parents: d59cac7
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed Jun 8 03:07:55 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/72d87ae8/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 0199265..3f47d02 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3473,6 +3473,10 @@ fieldset.preferences legend {
font-size: 0.8em;
}
+.header .fa{
+ display: inherit;
+}
+
.header form{
display:inline;
}
[02/18] allura git commit: [#8088] fix error when deleting comments
Posted by br...@apache.org.
[#8088] fix error when deleting comments
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5e6a1b2e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5e6a1b2e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5e6a1b2e
Branch: refs/heads/master
Commit: 5e6a1b2e369d522a5295d4feed385ef6fa1670d8
Parents: 62788f6
Author: Rohan Verma <ro...@gmail.com>
Authored: Sat Jun 4 07:32:44 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:28 2016 -0400
----------------------------------------------------------------------
Allura/allura/lib/widgets/discuss.py | 7 +++++++
Allura/allura/templates/widgets/moderate_post.html | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5e6a1b2e/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 0e24d5b..e2245b5 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -309,6 +309,13 @@ class Post(HierWidget):
$('.moderate_post', post).click(function(e){
e.preventDefault();
var mod = $(this).text();
+
+ if ($(this).hasClass('delete')) mod = 'Delete';
+ else if ($(this).hasClass('approve')) mod = 'Approve';
+ else if ($(this).hasClass('spam')) mod = 'Spam';
+ else if ($(this).hasClass('undo')) mod = 'Undo';
+
+
if (mod === 'Delete' && !confirm('Really delete this post?')) {
return;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/5e6a1b2e/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index c87953d..15048a6 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -19,19 +19,19 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<form method="POST" action="{{action}}">
<input type="hidden" name="delete" value="True"/>
- <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-trash-o fa-lg"></i></span></a>
+ <a href="" class="moderate_post delete little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-trash-o fa-lg"></i></span></a>
{{lib.csrf_token()}}
</form>
{%if status == 'pending'%}
<form method="POST" class="moderate_approve" action="{{action}}">
<input type="hidden" name="approve" value="True"/>
- <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-check" aria-hidden="true"></i>
+ <a href="" class="moderate_post approve little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-check" aria-hidden="true"></i>
Approve</span></a>
{{lib.csrf_token()}}
</form>
{%endif%}
<form method="POST" class="moderate_spam" action="{{action}}">
<input type="hidden" name="spam" value="True"/>
- <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i></span></a>
+ <a href="" class="moderate_post spam little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i></span></a>
{{lib.csrf_token()}}
<br/>
[16/18] allura git commit: [#8088] Update test to match new HTML
Posted by br...@apache.org.
[#8088] Update test to match new HTML
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8fd25cf8
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8fd25cf8
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8fd25cf8
Branch: refs/heads/master
Commit: 8fd25cf88d165913162924c7798eb46234642a67
Parents: 3e8f146
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jun 24 20:53:57 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:30 2016 -0400
----------------------------------------------------------------------
Allura/allura/tests/functional/test_discuss.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8fd25cf8/Allura/allura/tests/functional/test_discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index d17b57b..d9fe37b 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -149,9 +149,9 @@ class TestDiscuss(TestDiscussBase):
def test_spam_link(self):
r = self._make_post('Test post')
- assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i> Spam</span>' in r
+ assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i></span>' in r
r = self.app.get('/wiki/Home/', extra_environ={'username': 'test-user-1'})
- assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i> Spam</span>' not in r, 'User without moderate perm must not see Spam link'
+ assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i></span>' not in r, 'User without moderate perm must not see Spam link'
@patch('allura.controllers.discuss.g.spam_checker.submit_spam')
def test_moderate(self, submit_spam):
[09/18] allura git commit: [#8088] Fix failing tests due to missing
closing form tag. Update a test to match new html
Posted by br...@apache.org.
[#8088] Fix failing tests due to missing closing form tag. Update a test to match new html
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/407997cd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/407997cd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/407997cd
Branch: refs/heads/master
Commit: 407997cdc5419195ce716450ac8babf0b2e9f332
Parents: 9a93a45
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jun 21 22:28:00 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:29 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/widgets/moderate_post.html | 1 +
Allura/allura/tests/functional/test_discuss.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/407997cd/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index 15048a6..9c507e4 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -34,4 +34,5 @@
<input type="hidden" name="spam" value="True"/>
<a href="" class="moderate_post spam little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i></span></a>
{{lib.csrf_token()}}
+ </form>
<br/>
http://git-wip-us.apache.org/repos/asf/allura/blob/407997cd/Allura/allura/tests/functional/test_discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index 719e57a..d17b57b 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -149,9 +149,9 @@ class TestDiscuss(TestDiscussBase):
def test_spam_link(self):
r = self._make_post('Test post')
- assert '<span>Spam</span>' in r
+ assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i> Spam</span>' in r
r = self.app.get('/wiki/Home/', extra_environ={'username': 'test-user-1'})
- assert '<span>Spam</span>' not in r, 'User without moderate perm must not see Spam link'
+ assert '<span><i class="fa fa-exclamation" aria-hidden="true"></i> Spam</span>' not in r, 'User without moderate perm must not see Spam link'
@patch('allura.controllers.discuss.g.spam_checker.submit_spam')
def test_moderate(self, submit_spam):
[03/18] allura git commit: [#8088] fix error on firefox
Posted by br...@apache.org.
[#8088] fix error on firefox
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/62788f6b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/62788f6b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/62788f6b
Branch: refs/heads/master
Commit: 62788f6bbb22f5bd1e3eb5c7c4e11366c7844f9f
Parents: 7c2b05a
Author: Rohan Verma <ro...@gmail.com>
Authored: Sat Jun 4 07:02:16 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jul 13 15:03:28 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/widgets/moderate_post.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/62788f6b/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index 4c3f277..c87953d 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -32,6 +32,6 @@
{%endif%}
<form method="POST" class="moderate_spam" action="{{action}}">
<input type="hidden" name="spam" value="True"/>
- <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i> Spam</span></a>
+ <a href="" class="moderate_post little_link icon btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><i class="fa fa-exclamation" aria-hidden="true"></i></span></a>
{{lib.csrf_token()}}
<br/>