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 2021/03/10 21:00:34 UTC
[allura] branch db/py3_icon_upload created (now 3ebd41d)
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a change to branch db/py3_icon_upload
in repository https://gitbox.apache.org/repos/asf/allura.git.
at 3ebd41d py3: Fix icon handling when error (like SVG uploaded)
This branch includes the following new commits:
new 3ebd41d py3: Fix icon handling when error (like SVG uploaded)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[allura] 01/01: py3: Fix icon handling when error (like SVG
uploaded)
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/py3_icon_upload
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 3ebd41d02c2425b5547c3f26c9e911d1e7c3c355
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Mar 10 14:03:29 2021 -0500
py3: Fix icon handling when error (like SVG uploaded)
---
Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html | 6 +++---
.../allura/ext/admin/templates/admin_widgets/metadata_admin.html | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index 24f2898..1bdcb50 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -103,12 +103,12 @@
</div>
<div class="grid-10">
- <label>Project Logo:</label>
+ <label>{% if c.project.is_user_project %}Profile Image{% else %}Project Logo{% endif %}:</label>
<br>
<div id="project-icon" class="viewing">
- {% if value.icon %}
+ {% if c.project.icon %}
<div class="viewer" style="overflow: auto">
- <img {{ lib.project_icon_srcs(value) }} style="float:left; margin-right: 1em;" alt="">
+ <img {{ lib.project_icon_srcs(c.project) }} style="float:left; margin-right: 1em;" alt="">
{{ g.icons['edit'].render(id='edit-icon', style='display:inline-block;margin-top:15px') }}
{{ g.icons['delete'].render(id='delete-icon', style='display:inline-block;margin-top:15px') }}
</div>
diff --git a/Allura/allura/templates_responsive/override/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/templates_responsive/override/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index 9c83ab9..f9c4126 100644
--- a/Allura/allura/templates_responsive/override/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/templates_responsive/override/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -111,11 +111,11 @@
</div>
<div class="column small-12 medium-5">
- <label>Project Logo:</label>
+ <label>{% if c.project.is_user_project %}Profile Image{% else %}Project Logo{% endif %}:</label>
<div id="project-icon" class="viewing">
- {% if value.icon %}
+ {% if c.project.icon %}
<div class="viewer" style="overflow: auto">
- <img {{ lib.project_icon_srcs(value) }} style="float:left; margin-right: 1em;" alt="">
+ <img {{ lib.project_icon_srcs(c.project) }} style="float:left; margin-right: 1em;" alt="">
{{ g.icons['edit'].render(id='edit-icon', style='display:inline-block;margin-top:15px') }}
{{ g.icons['delete'].render(id='delete-icon', style='display:inline-block;margin-top:15px') }}
</div>