You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/23 15:34:02 UTC
[4/5] allura git commit: [#7998] ticket:878 changed attachments_list
style, fix geting filename
[#7998] ticket:878 changed attachments_list style, fix geting filename
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5d4cde0f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5d4cde0f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5d4cde0f
Branch: refs/heads/ib/7998
Commit: 5d4cde0fa25da04bdfb27d6940cb062b9bbbdb4c
Parents: b091d8f
Author: Denis Kotov <de...@gmail.com>
Authored: Wed Dec 23 13:49:11 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Dec 23 14:42:27 2015 +0200
----------------------------------------------------------------------
Allura/allura/templates/widgets/attachment_list.html | 1 +
ForgeWiki/forgewiki/templates/wiki/page_edit.html | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5d4cde0f/Allura/allura/templates/widgets/attachment_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/attachment_list.html b/Allura/allura/templates/widgets/attachment_list.html
index 45f6c24..c553dd7 100644
--- a/Allura/allura/templates/widgets/attachment_list.html
+++ b/Allura/allura/templates/widgets/attachment_list.html
@@ -53,6 +53,7 @@
{{lib.csrf_token()}}
</form>
</div>
+ <div style="clear:both"></div>
{% endfor %}
</div>
{% endif %}
http://git-wip-us.apache.org/repos/asf/allura/blob/5d4cde0f/ForgeWiki/forgewiki/templates/wiki/page_edit.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index 9f3335a..e1e1940 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -128,7 +128,7 @@
'<span>' +
'<input type="submit" value="Delete File"/>' +
'</span>' +
- '</form></div>';
+ '</form></div><div style="clear:both"></div>';
$(new_attach).prependTo($('.attachment_files'));
};
};
@@ -141,7 +141,7 @@
processData: false,
contentType: false,
success: function(data) {
- var attachment_name = $("#file_info").val();
+ var attachment_name = $("#file_info")[0].files[0].name;
var attachment_url = page_url + 'attachment/' + attachment_name;
update_attachments(attachment_url, attachment_name, $("#file_info")[0].files[0].size);
}