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/10/21 14:08:32 UTC
[1/2] allura git commit: [#8007] Fix forum icon path
Repository: allura
Updated Branches:
refs/heads/master f33baf423 -> 52c8d5cf8
[#8007] Fix forum icon path
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/52c8d5cf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/52c8d5cf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/52c8d5cf
Branch: refs/heads/master
Commit: 52c8d5cf89fac05ae736c157b757818b62b39d78
Parents: b216703
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Oct 21 14:27:38 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Oct 21 14:34:35 2015 +0300
----------------------------------------------------------------------
.../forgediscussion/templates/discussionforums/admin_forums.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/52c8d5cf/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
index 9b6b3e0..4d31933 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
@@ -40,7 +40,7 @@
<div class="editable viewing">
<span class="viewer">
{% if forum.icon %}
- <img src="{{forum.url()}}/icon" alt="Forum icon"/>
+ <img src="{{forum.url()}}icon" alt="Forum icon"/>
{% else %}
<img src="{{g.forge_static('images/project_default.png')}}" alt="Forum icon"/>
{% endif %}
[2/2] allura git commit: [#8007] fix paths to avoid double slashes in
icon paths, not all webservers allow that sloppiness :)
Posted by je...@apache.org.
[#8007] fix paths to avoid double slashes in icon paths, not all webservers allow that sloppiness :)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b2167039
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b2167039
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b2167039
Branch: refs/heads/master
Commit: b2167039bdb6ce9cdf700861106c258bd59ef076
Parents: f33baf4
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Oct 20 17:05:45 2015 -0400
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Oct 21 14:34:35 2015 +0300
----------------------------------------------------------------------
.../allura/ext/admin/templates/admin_widgets/metadata_admin.html | 2 +-
Allura/allura/ext/user_profile/templates/sections/projects.html | 2 +-
Allura/allura/templates/jinja_master/nav_menu.html | 2 +-
Allura/allura/templates/jinja_master/neigh_nav_menu.html | 2 +-
Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
Allura/allura/templates/widgets/neighborhood_overview_form.html | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/b2167039/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
----------------------------------------------------------------------
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 b313dfc..0b3659c 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -99,7 +99,7 @@
<div id="project-icon" class="viewing">
{% if value.icon %}
<div class="viewer" style="overflow: auto">
- <img src="{{value.url()}}/icon?{{value.icon._id.generation_time}}" style="float:left; margin-right: 1em;" alt="">
+ <img src="{{value.url()}}icon?{{value.icon._id.generation_time}}" style="float:left; margin-right: 1em;" alt="">
<a id="edit-icon" href="#" title="Edit" style="display:inline-block;margin-top:15px"><b data-icon="p" class="ico ico-pencil"></b></a>
<a id="delete-icon" href="#" title="Remove" style="display:inline-block;margin-top:15px"><b data-icon="d" class="ico ico-delete"></b></a>
</div>
http://git-wip-us.apache.org/repos/asf/allura/blob/b2167039/Allura/allura/ext/user_profile/templates/sections/projects.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/templates/sections/projects.html b/Allura/allura/ext/user_profile/templates/sections/projects.html
index 9e1c632..55483bb 100644
--- a/Allura/allura/ext/user_profile/templates/sections/projects.html
+++ b/Allura/allura/ext/user_profile/templates/sections/projects.html
@@ -35,7 +35,7 @@
{% for project in projects %}
<li{% if loop.index > 5 %} class="hidden"{% endif %}>
{% if project.icon -%}
- <img src="{{project.url()}}/icon?{{project.icon._id.generation_time}}" alt="Project Logo" width="48" height="48"/>
+ <img src="{{project.url()}}icon?{{project.icon._id.generation_time}}" alt="Project Logo" width="48" height="48"/>
{%- else -%}
<img src="{{g.forge_static('images/project_default.png')}}" alt="Project Logo" width="48" height="48"/>
{%- endif -%}
http://git-wip-us.apache.org/repos/asf/allura/blob/b2167039/Allura/allura/templates/jinja_master/nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/nav_menu.html b/Allura/allura/templates/jinja_master/nav_menu.html
index 520267e..b65d80d 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -29,7 +29,7 @@
{% if c.project.is_user_project %}
{{lib.gravatar(c.project.user_project_of, size=48, className='project_icon')}}
{% elif c.project.icon %}
- <img src="{{c.project.url()}}/icon?{{c.project.icon._id.generation_time}}" class="project_icon" alt="Project Logo">
+ <img src="{{c.project.url()}}icon?{{c.project.icon._id.generation_time}}" class="project_icon" alt="Project Logo">
{% endif %}
<h1 class="project_title">
<a href="{{c.project.url()}}" class="project_link">
http://git-wip-us.apache.org/repos/asf/allura/blob/b2167039/Allura/allura/templates/jinja_master/neigh_nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/neigh_nav_menu.html b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
index 687dd2b..907ad5f 100644
--- a/Allura/allura/templates/jinja_master/neigh_nav_menu.html
+++ b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
@@ -20,7 +20,7 @@
<div id="nav_menu_missing"></div>
{% else %}
{% if neighborhood.icon %}
- <a href="{{neighborhood.url()}}"><img src="{{neighborhood.url()}}/icon" class="project_icon" alt="{{neighborhood.name}} Logo"/></a>
+ <a href="{{neighborhood.url()}}"><img src="{{neighborhood.url()}}icon" class="project_icon" alt="{{neighborhood.name}} Logo"/></a>
{% endif %}
<h1 class="project_title"><a href="{{neighborhood.url()}}">{{neighborhood.name}}</a></h1>
{% if neighborhood.project_list_url %}
http://git-wip-us.apache.org/repos/asf/allura/blob/b2167039/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index fd3f6fb..5581037 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -121,7 +121,7 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros
{% if not project_header_right %}
{%- macro project_header_right(project, app) %}
{% if project.neighborhood.icon %}
- <a href="{{project.neighborhood.url()}}"><img src="{{project.neighborhood.url()}}/icon" class="neighborhood_icon"
+ <a href="{{project.neighborhood.url()}}"><img src="{{project.neighborhood.url()}}icon" class="neighborhood_icon"
alt="Return to {{project.neighborhood.name}}" title="Return to {{project.neighborhood.name}}"></a>
<div class="neighborhood_title">
<h1><a href="{{project.neighborhood.url()}}">{{project.neighborhood.name}}</a></h1>
http://git-wip-us.apache.org/repos/asf/allura/blob/b2167039/Allura/allura/templates/widgets/neighborhood_overview_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_overview_form.html b/Allura/allura/templates/widgets/neighborhood_overview_form.html
index 0bd3215..c555a4d 100644
--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html
+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html
@@ -40,7 +40,7 @@
<label class="grid-4">Icon</label>
<div class="grid-14">
{% if neighborhood.icon %}
- <img src="{{neighborhood.url()}}/icon" style="vertical-align: middle" alt=""/>
+ <img src="{{neighborhood.url()}}icon" style="vertical-align: middle" alt=""/>
{% endif %}
{{widget.display_field(widget.fields.icon)}}
</div>