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/08/01 18:07:51 UTC
[1/5] allura git commit: Updated code as per suggestions in review
Repository: allura
Updated Branches:
refs/heads/master 0177f3e41 -> 73ac85df3
Updated code as per suggestions in review
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/76e7c77e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/76e7c77e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/76e7c77e
Branch: refs/heads/master
Commit: 76e7c77eaf51cd0423cd95960c72b64f4cade4b3
Parents: 5af758c
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jul 26 14:08:46 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Aug 1 14:02:27 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 1 +
Allura/allura/templates/widgets/post_widget.html | 12 ++----------
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/76e7c77e/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 dbfb555..51c2102 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2279,6 +2279,7 @@ div.attachment_item{
.attachment_item .attachment-name {
background-color: #fafafa;
padding: 5px;
+ word-wrap: break-word;
}
.attachment_item img {
http://git-wip-us.apache.org/repos/asf/allura/blob/76e7c77e/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 22131ae..ec1876b 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -123,7 +123,7 @@
</a>
{% endif %}
- <a href="http://localhost:8080/p/test/tickets/1/#dd1a" download title="Download File" class="btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <a href="{{att.url()}}" download title="Download File" class="btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
<span><i class="fa fa-download" aria-hidden="true"></i></span>
</a>
<input type="hidden" name="delete" value="True">
@@ -196,21 +196,13 @@
image.attr("src", image_source);
$('#lightbox').lightbox_me({
- centered: true,
- onLoad: function() {
-
- }
+ centered: true
});
e.preventDefault();
});
});
- function deleteAttachment()
- {
- document.forms["myform"].submit();
- }
-
</script>
{% endblock %}
\ No newline at end of file
[3/5] allura git commit: Initial design changes to list attachments.
Added lightbox_me to view images
Posted by br...@apache.org.
Initial design changes to list attachments. Added lightbox_me to view images
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ecf45dc3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ecf45dc3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ecf45dc3
Branch: refs/heads/master
Commit: ecf45dc3fc6315b6b7ed39b3482e2385691886e9
Parents: 0177f3e
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jul 12 07:13:22 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Aug 1 14:02:27 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 73 +++++++++--------
.../allura/templates/widgets/post_widget.html | 82 +++++++++++++++-----
2 files changed, 102 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ecf45dc3/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 f86b19d..366a5f8 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2203,46 +2203,51 @@ a.sidebar-disabled:focus {
}
/* Attachments */
-.attachment_images {
- overflow: auto;
+
+
+div.attachment_holder {
+ padding-left: 5px;
}
-div.attachment_thumb {
- float: left;
- margin: .5em;
- margin-right: 1.5em;
- position: relative;
- padding: 10px;
+div.attachment_item{
+ border-radius: 6px;
+ display: inline-block;
+ vertical-align: bottom;
+ box-sizing: border-box;
+ border: 1px solid #e5e5e5;
+ width: 120px;
+ height: 100%;
+ margin-bottom: 2px;
}
-div.attachment_thumb .delete_attachment .pic {
- position: absolute;
- top: 0;
- left: 100px;
+
+.attachment_item .attachment_toolbar{
+ border-radius-top: 5px;
+ background-color: #f5f5f5;
+ padding: 5px;
}
-div.attachment_thumb .file {
- position: absolute;
- top: 0;
- right: -40px;
+
+.attachment_item .attachment_toolbar .btn{
+ float: none;
+ margin-right: 2px;
+ background: rgb(235,235,235);
+ font-weight: bold;
+ color: rgb(69,69,69);
+ font-size: 0.8em;
}
-div.attachment_thumb .file_type {
- border: 1px solid #ccc;
- display: block;
- height: 100px;
- width: 100px;
- position: relative;
- text-transform: uppercase;
- text-align: center;
- font-weight: bold;
- font-size: 1.2em;
- margin-bottom: .5em;
- background: #ccc;
- background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, to(#cccccc), from(white));
- background-image: -moz-linear-gradient(100% 100% 90deg, #cccccc, white 100%);
+
+.attachment_item .attachment-name {
+ background-color: #fafafa;
+ padding: 5px;
}
-div.attachment_thumb .file_type span {
- display: block;
- margin-top: 45px;
- color: #666;
+
+.attachment_item img {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.attachment_item .attachment_thumbnail {
+ padding: 5px;
}
/* Cards */
http://git-wip-us.apache.org/repos/asf/allura/blob/ecf45dc3/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 ce6be9d..22131ae 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -98,29 +98,38 @@
</div>
{% endif %}
{% if value.attachments and (not pending or moderator) %}
- <div style="padding-left: 5px;">
- <strong>Attachments</strong>
- <div class="clear"></div>
+ <div class="attachment_holder">
{% for att in value.attachments %}
- <div class="attachment_thumb">
- <form method="POST" action="{{att.url()}}">
+ <div class="attachment_item">
{% if att.is_image() %}
- <a href="{{att.url()}}"><img src="{{att.url()}}/thumb" alt="Thumbnail"/></a>
- <br/>
- <a href="{{att.url()}}">{{att.filename}}</a>
- {% if h.has_access(value, 'moderate')()%}
- <br>
- <input class="submit delete_attachment pic" type="submit" value="X"/>
- {% endif %}
+ <div class="attachment_thumbnail">
+ <a class="lightbox" data-src="{{att.url()}}" href="{{att.url()}}">
+ <img src="{{att.url()}}/thumb" alt="Thumbnail"/>
+ </a>
+ </div>
+ <div class="attachment-name">
+ <i class="fa fa-picture-o" aria-hidden="true"></i>
{% else %}
- <a href="{{att.url()}}">{{att.filename}}</a>
- {% if h.has_access(value, 'moderate')()%}
- <input class="submit delete_attachment file" type="submit" value="X"/>
- {% endif %}
+ <div class="attachment-name">
+ <i class="fa fa-file-o" aria-hidden="true"></i>
{% endif %}
- <input type="hidden" name="delete" value="True">
- {{lib.csrf_token()}}
- </form>
+ <a href="{{att.url()}}">{{att.filename}}</a>
+ </div>
+ <div class="attachment_toolbar">
+ <form method="POST" action="{{att.url()}}">
+ {% if h.has_access(value, 'moderate')()%}
+ <a href="javascript: void(0)" onclick="$(this).closest('form').submit();" title="Remove Attachment"" class="btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <span><i class="fa fa-trash-o" aria-hidden="true"></i></span>
+ </a>
+ {% endif %}
+
+ <a href="http://localhost:8080/p/test/tickets/1/#dd1a" download title="Download File" class="btn ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <span><i class="fa fa-download" aria-hidden="true"></i></span>
+ </a>
+ <input type="hidden" name="delete" value="True">
+ {{lib.csrf_token()}}
+ </form>
+ </div>
</div>
{% endfor %}
</div>
@@ -161,6 +170,11 @@
</li>
</ul>
</div>
+ <!-- lightbox_me div that will dynamically load attachment image -->
+ <div id="lightbox" style="display:none; height: 90%">
+ <img style="width: inherit; height: inherit; display: block; margin-left: auto; margin-right: auto;" src="#">
+ </div>
+
</div>
{% block extra_css %}
@@ -170,3 +184,33 @@
}
</style>
{% endblock %}
+
+{% block extra_js %}
+<script type="text/javascript">
+
+ $(document).ready( function(){
+ //lightbox_me script to create lightbox of attached images
+ $('.lightbox').click(function(e) {
+ var image_source = $(this).data("src");
+ var image = $('#lightbox').find('img:first');
+ image.attr("src", image_source);
+
+ $('#lightbox').lightbox_me({
+ centered: true,
+ onLoad: function() {
+
+ }
+ });
+
+ e.preventDefault();
+ });
+ });
+
+ function deleteAttachment()
+ {
+ document.forms["myform"].submit();
+ }
+
+</script>
+
+{% endblock %}
\ No newline at end of file
[4/5] allura git commit: Readd old attachment css
Posted by br...@apache.org.
Readd old attachment css
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8e026079
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8e026079
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8e026079
Branch: refs/heads/master
Commit: 8e026079f476bae5f3dffe3b8cb762dfa4552b34
Parents: ecf45dc
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed Jul 13 04:21:22 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Aug 1 14:02:27 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 41 +++++++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8e026079/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 366a5f8..dbfb555 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2204,6 +2204,47 @@ a.sidebar-disabled:focus {
/* Attachments */
+.attachment_images {
+ overflow: auto;
+}
+
+div.attachment_thumb {
+ float: left;
+ margin: .5em;
+ margin-right: 1.5em;
+ position: relative;
+ padding: 10px;
+}
+div.attachment_thumb .delete_attachment .pic {
+ position: absolute;
+ top: 0;
+ left: 100px;
+}
+div.attachment_thumb .file {
+ position: absolute;
+ top: 0;
+ right: -40px;
+}
+div.attachment_thumb .file_type {
+ border: 1px solid #ccc;
+ display: block;
+ height: 100px;
+ width: 100px;
+ position: relative;
+ text-transform: uppercase;
+ text-align: center;
+ font-weight: bold;
+ font-size: 1.2em;
+ margin-bottom: .5em;
+ background: #ccc;
+ background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, to(#cccccc), from(white));
+ background-image: -moz-linear-gradient(100% 100% 90deg, #cccccc, white 100%);
+}
+div.attachment_thumb .file_type span {
+ display: block;
+ margin-top: 45px;
+ color: #666;
+}
div.attachment_holder {
padding-left: 5px;
[5/5] allura git commit: Update test_forum:testposts test with
updated html
Posted by br...@apache.org.
Update test_forum:testposts test with updated html
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/73ac85df
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/73ac85df
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/73ac85df
Branch: refs/heads/master
Commit: 73ac85df311cd7262f52099f8f5a1473558a496a
Parents: 76e7c77
Author: Rohan Verma <ro...@gmail.com>
Authored: Sat Jul 30 19:28:49 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Aug 1 14:02:28 2016 -0400
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/73ac85df/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 5b6ef01..99df83b 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -243,7 +243,7 @@ class TestForumAsync(TestController):
r = self.app.get(url)
assert "test1.txt" in r
assert "test2.txt" in r
- for link in r.html.findAll('a'):
+ for link in r.html.findAll('a.btn'):
if 'attachment' in link.get('href', ''):
self.app.get(str(link['href']))
self.app.post(str(link['href']), params=dict(delete='on'))
[2/5] allura git commit: Updated Tests to match changes
Posted by br...@apache.org.
Updated Tests to match changes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5af758c6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5af758c6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5af758c6
Branch: refs/heads/master
Commit: 5af758c62c13c1d265880bc2e5814e8c65dbbd97
Parents: 8e02607
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed Jul 13 18:21:22 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Aug 1 14:02:27 2016 -0400
----------------------------------------------------------------------
Allura/allura/tests/functional/test_discuss.py | 8 ++++----
ForgeTracker/forgetracker/tests/functional/test_root.py | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5af758c6/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 d9fe37b..c18a330 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -321,7 +321,7 @@ class TestAttachment(TestDiscussBase):
r = self.app.post(self.post_link + 'attach',
upload_files=[('file_info', 'test.txt', 'HiThere!')])
r = self.app.get(self.thread_link)
- assert '<div class="attachment_thumb">' in r
+ assert '<div class="attachment_holder">' in r
alink = self.attach_link()
r = self.app.get(alink)
assert r.content_type == 'text/plain'
@@ -396,7 +396,7 @@ class TestAttachment(TestDiscussBase):
upload_files=[('file_info', 'user.png', pic)])
# ... make sure ordinary user can see it
r = self.app.get(self.thread_link, extra_environ=ordinary_user)
- assert '<div class="attachment_thumb">' in r
+ assert '<div class="attachment_holder">' in r
alink = self.attach_link()
thumblink = alink + '/thumb'
# ... and access it
@@ -411,10 +411,10 @@ class TestAttachment(TestDiscussBase):
session(post).flush(post)
# ... make sure attachment is not visible to ordinary user
r = self.app.get(self.thread_link, extra_environ=ordinary_user)
- assert '<div class="attachment_thumb">' not in r, 'Attachment is visible on unmoderated post'
+ assert '<div class="attachment_holder">' not in r, 'Attachment is visible on unmoderated post'
# ... but visible to moderator
r = self.app.get(self.thread_link, extra_environ=moderator)
- assert '<div class="attachment_thumb">' in r
+ assert '<div class="attachment_holder">' in r
# ... and ordinary user can't access it
self.app.get(alink, status=403, extra_environ=ordinary_user)
self.app.get(thumblink, status=403, extra_environ=ordinary_user)
http://git-wip-us.apache.org/repos/asf/allura/blob/5af758c6/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 1bffbe3..77a563b 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -882,10 +882,10 @@ class TestFunctionalController(TrackerTestController):
self.app.post(post_link + 'attach',
upload_files=[('file_info', 'test.txt', 'HiThere!')])
r = self.app.get('/bugs/1/', dict(page=1))
- assert '<input class="submit delete_attachment file" type="submit" value="X"/>' in r
+ assert '<i class="fa fa-trash-o" aria-hidden="true"></i>' in r
r.forms[5].submit()
r = self.app.get('/bugs/1/', dict(page=1))
- assert '<input class="submit delete_attachment" type="submit" value="X"/>' not in r
+ assert '<i class="fa fa-trash-o" aria-hidden="true"></i>' not in r
def test_new_text_attachment_content(self):
file_name = 'test_root.py'
@@ -2279,9 +2279,10 @@ class TestFunctionalController(TrackerTestController):
r = self.app.post('/p/test/bugs/1/move/',
params={'tracker': str(bugs2.config._id)}).follow()
- attachs = r.html.findAll('div', attrs={'class': 'attachment_thumb'})
- ta = str(attachs[1]) # ticket's attachments
- ca = str(attachs[2]) # comment's attachments
+ attach_tickets = r.html.findAll('div', attrs={'class': 'attachment_thumb'})
+ attach_comments = r.html.findAll('div', attrs={'class': 'attachment_item'})
+ ta = str(attach_tickets) # ticket's attachments
+ ca = str(attach_comments) # comment's attachments
assert_in('<a href="/p/test2/bugs2/1/attachment/neo-icon-set-454545-256x350.png"', ta)
assert_in('<img src="/p/test2/bugs2/1/attachment/neo-icon-set-454545-256x350.png/thumb"', ta)
p = M.Post.query.find().sort('timestamp', 1).first()