Allura/allura/lib/widgets/templates/post.html to Allura/allura/lib/widgets/templates/post_widget.html
--- a/Allura/allura/lib/widgets/templates/post.html +++ b/Allura/allura/lib/widgets/templates/post_widget.html @@ -1,75 +1,87 @@ -<div xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude" - py:strip="True"> - <xi:include href="${g.allura_templates}/lib.html" /> - <?python from allura.lib.security import has_artifact_access?> - <div id="$value.slug" class="discussion-post"> +{% import 'jinja_master/lib.html' as lib with context %} + +<div> + <div id="{{value.slug}}" class="discussion-post"> <div class="row"> <div class="column grid_1 tcenter"> <p class="gravatar"> - <a href="${value.author().url()}">${gravatar(value.author())}</a><br/> - <a href="${value.author().url()}">${value.author().display_name}</a><br />${h.ago(value.timestamp)} + <a href="{{value.author().url()}}">{{lib.gravatar(value.author())}}</a><br/> + <a href="{{value.author().url()}}">{{value.author().display_name}}</a><br />{{h.ago(value.timestamp)}} </p> </div> + <div class="column grid_8"> <div class="display_post"> - <b py:if="show_subject">${value.subject or '(no subject)'}<br/></b> - ${Markup(g.markdown.convert(value.text))} + {% if show_subject %} + <b>{{value.subject or '(no subject)'}}<br/></b> + {% endif %} + {{g.markdown.convert(value.text)|safe}} </div> - <div class="edit_post_form" style="display:none" py:if="has_artifact_access('post', value.thread)()"> - ${widgets.edit_post.display(value=value, submit_text='Save', action=value.url())} + {% if h.has_artifact_access('post', value.thread)() %} + <div class="edit_post_form" style="display:none"> + {{widgets.edit_post.display(value=value, submit_text='Save', action=value.url())}} </div> - <div class="add_attachment_form" style="display:none; clear: both; overflow: auto;" py:if="has_artifact_access('moderate', value)()"> - ${widgets.attach_post.display(value=value, action=value.url() + 'attach')} + {% endif %} + {% if h.has_artifact_access('moderate', value)() %} + <div class="add_attachment_form" style="display:none; clear: both; overflow: auto;"> + {{widgets.attach_post.display(value=value, action=value.url() + 'attach')}} </div> - <div py:if="value.attachments"> + {% endif %} + {% if value.attachments %} + <div> <strong>Attachments</strong> - <py:for each="att in value.attachments"> - ${widgets.attachment.display(post=value, value=att)} + {% for att in value.attachments %} + {{widgets.attachment.display(post=value, value=att)}} + {% if c.user._id and value.author_id==c.user._id %} <form - py:if="c.user._id and value.author_id==c.user._id" method="POST" - action="${att.url()}" + action="{{att.url()}}" style="display:inline"> <input class="submit" type="submit" name="delete" value="Delete"/> </form> - </py:for> + {% endif %} + {% endfor %} </div> + {% endif %} </div> + <div class="options"> <a href="" class="reply_post btn ico-l"><b class="ui-icon ui-icon-arrowreturnthick-1-w"></b> <span>Reply</span></a> <div style="clear:both"> - <a href="${tg.url(url.current(),dict(page=page,limit=limit))}#$value.slug" class="ico-l little_link"><b class="ui-icon ui-icon-link"></b> <span>Link</span></a><br/> + <a href="{{tg.url(url.current(),dict(page=page,limit=limit))}}#{{value.slug}}" class="ico-l little_link"><b class="ui-icon ui-icon-link"></b> <span>Link</span></a><br/> <a href="" class="edit_post ico-l little_link"><b class="ui-icon ui-icon-pencil"></b> <span>Edit</span></a><br/> - <py:if test="has_artifact_access('moderate', value)()"> - ${widgets.moderate_post.display(value=value, action=value.url()+'moderate')} - </py:if> - <a href="#" class="ico-l add_attachment little_link" py:if="has_artifact_access('post', value.thread)()"><b class="ui-icon ui-icon-document"></b> <span>Attach</span></a> + {% if h.has_artifact_access('moderate', value)() %} + {{widgets.moderate_post.display(value=value, action=value.url()+'moderate')}} + {% endif %} + {% if h.has_artifact_access('post', value.thread)() %} + <a href="#" class="ico-l add_attachment little_link"><b class="ui-icon ui-icon-document"></b> <span>Attach</span></a> + {% endif %} </div> </div> </div> <ul> <li> - <div class="row reply_post_form" style="display:none" py:if="has_artifact_access('post', value.thread)()"> + {% if h.has_artifact_access('post', value.thread)() %} + <div class="row reply_post_form" style="display:none"> <div class="reply"> <div class="column grid_1 tcenter"> <p class="gravatar"> - ${gravatar(c.user)}<br/><br/> - <a href="${c.user.url()}">$c.user.display_name</a> + {{lib.gravatar(c.user)}}<br/><br/> + <a href="{{c.user.url()}}">{{c.user.display_name}}</a> </p> </div> <div class="column grid_8"> - ${widgets.edit_post.display( + {{widgets.edit_post.display( submit_text='Post Reply', action=value.url()+'reply', value=dict( text='', subject=value.reply_subject()), - )} + )}} </div> </div> </div> + {% endif %} </li> </ul> </div> @@ -84,8 +96,9 @@ </div> </div>--> - <div class="promote_to_thread_form push-${3+indent} span-${16-indent} last clear" style="display:none" - py:if="has_artifact_access('moderate', value.thread)() and 'promote_to_thread' in widgets and not supress_promote"> - ${widgets.promote_to_thread.display(value=value, action=value.url()+'moderate')} + {% if h.has_artifact_access('moderate', value.thread)() and 'promote_to_thread' in widgets and not supress_promote %} + <div class="promote_to_thread_form push-{{3+indent}} span-{{16-indent}} last clear" style="display:none"> + {{widgets.promote_to_thread.display(value=value, action=value.url()+'moderate')}} </div> + {% endif %} </div>
Allura/allura/lib/widgets/templates/project_list.html to Allura/allura/lib/widgets/templates/project_list_widget.html
--- a/Allura/allura/lib/widgets/templates/project_list.html +++ b/Allura/allura/lib/widgets/templates/project_list_widget.html @@ -1,16 +1,17 @@ -<div xmlns:py="http://genshi.edgewall.org/" - class="list"> - <?python from allura.lib.security import has_project_access ?> - <p py:if="not len(projects)">No projects found</p> - <div py:if="len(projects)" class="list"> - <?python old_project = c.project ?> - <py:for each="project in projects"> - <?python g.set_project(project.shortname)?> - <py:if test="has_project_access('read', project)()"> - ${project_summary.display(value=project)} - </py:if> - </py:for> - <?python g.set_project(old_project and old_project.shortname or '')?> - </div> +<div class="list"> + {% if not projects %} + <p>No projects found</p> + {% else %} + <div class="list"> + {% set old_project = c.project %} + {% for project in projects %} + {% do g.set_project(project.shortname) %} + {% if h.has_project_access('read', project)() %} + {{project_summary.display(value=project)}} + {% endif %} + {% endfor %} + {% do g.set_project(old_project and old_project.shortname or '') %} + </div> + {% endif %} </div>