This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 8d25b6f51c4589a854405ee531140181eb7c297c
Author: Dave Brondsema <dbronds...@slashdotmedia.com>
AuthorDate: Wed Jun 12 11:36:58 2024 -0400
replace tabs with spaces in jinja html files
---
.../templates/jinja_master/neigh_nav_menu.html | 2 +-
Allura/allura/templates/macro/members.html | 16 +++++-----
Allura/allura/templates/neighborhood_help.html | 2 +-
Allura/allura/templates/neighborhood_moderate.html | 2 +-
Allura/allura/templates/repo/file.html | 4 +--
.../allura/templates/site_admin_new_projects.html | 12 ++++----
.../widgets/neighborhood_overview_form.html | 12 ++++----
.../allura/templates/widgets/project_summary.html | 2 +-
Allura/allura/tests/test_globals.py | 4 +--
.../templates/blog_widgets/view_post.html | 4 +--
.../templates/feedback/common_feedback.html | 6 ++--
.../templates/feedback/edit_feedback.html | 4 +--
.../forgefeedback/templates/feedback/index.html | 10 +++---
.../templates/feedback/new_feedback.html | 2 +-
.../forgewiki/templates/wiki/admin_options.html | 2 +-
ForgeWiki/forgewiki/templates/wiki/page_edit.html | 36 +++++++++++-----------
16 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/Allura/allura/templates/jinja_master/neigh_nav_menu.html
b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
index d9abc1352..0635e2217 100644
--- a/Allura/allura/templates/jinja_master/neigh_nav_menu.html
+++ b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
@@ -23,7 +23,7 @@
{% if neighborhood.icon %}
<a href="{{neighborhood.url()}}"><img {{
lib.project_icon_srcs(neighborhood.neighborhood_project) }}
class="project_icon" alt="{{neighborhood.name}} Logo"/></a>
{% endif %}
- <h1 class="project_title"><a
href="{{neighborhood.url()}}">{{neighborhood.name}}</a></h1>
+ <h1 class="project_title"><a
href="{{neighborhood.url()}}">{{neighborhood.name}}</a></h1>
{% if neighborhood.project_list_url %}
<div class="project_title_link">
<a href="{{neighborhood.project_list_url}}">
diff --git a/Allura/allura/templates/macro/members.html
b/Allura/allura/templates/macro/members.html
index 8ed27fcfb..2c4de5b75 100644
--- a/Allura/allura/templates/macro/members.html
+++ b/Allura/allura/templates/macro/members.html
@@ -17,11 +17,11 @@
under the License.
-#}
<h6>Project Members:</h6>
- <ul class="md-users-list">
- {% for user in users -%}
- <li><a
href="{{user.url}}">{{user.name}}</a>{{user.admin}}</li>
- {%- endfor %}
- {% if over_limit -%}
- <li class="md-users-list-more"><a
href="{{c.project.url()}}_members">All Members</a></li>
- {%- endif %}
- </ul>
\ No newline at end of file
+ <ul class="md-users-list">
+ {% for user in users -%}
+ <li><a href="{{user.url}}">{{user.name}}</a>{{user.admin}}</li>
+ {%- endfor %}
+ {% if over_limit -%}
+ <li class="md-users-list-more"><a
href="{{c.project.url()}}_members">All Members</a></li>
+ {%- endif %}
+ </ul>
diff --git a/Allura/allura/templates/neighborhood_help.html
b/Allura/allura/templates/neighborhood_help.html
index 7a2cd8347..110fdbe67 100644
--- a/Allura/allura/templates/neighborhood_help.html
+++ b/Allura/allura/templates/neighborhood_help.html
@@ -36,7 +36,7 @@
<ul>
<li><code>show_proj_icon</code> = yes/no. Default 'yes'</li>
<li><code>show_download_button</code> = yes/no. Default 'no'</li>
- <li><code>show_awards_banner</code> = yes/no. Default 'yes'</li>
+ <li><code>show_awards_banner</code> = yes/no. Default 'yes'</li>
<li><code>sort</code> = last_updated/alpha/random/last_registered.
Default 'last_updated'</li>
<li><code>show_total</code> = yes/no. Adds a sentence with a total count
of how many projects are listed. Default 'no'</li>
<li><code>columns</code> = 1, 2, or 3. Default 1</li>
diff --git a/Allura/allura/templates/neighborhood_moderate.html
b/Allura/allura/templates/neighborhood_moderate.html
index 22fe17559..5ae8469d5 100644
--- a/Allura/allura/templates/neighborhood_moderate.html
+++ b/Allura/allura/templates/neighborhood_moderate.html
@@ -36,7 +36,7 @@
</select>
<label for="pid">Project Shortname</label>
<input type="text" name="pid" id="pid">
- </p>
+ </p>
<input type="submit" name="invite" value="Invite!"/>
<input type="submit" name="uninvite" value="Cancel Invitation!"/>
{{lib.csrf_token()}}
diff --git a/Allura/allura/templates/repo/file.html
b/Allura/allura/templates/repo/file.html
index 5fbb38b23..c53fafabb 100644
--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -41,9 +41,9 @@
<script type="text/javascript">(function() {
$(window).on('hashchange', function(e) {
var hash = window.location.hash.substring(1);
- if ('originalEvent' in e && 'oldURL' in e.originalEvent) {
+ if ('originalEvent' in e && 'oldURL' in e.originalEvent) {
$('#' + e.originalEvent.oldURL.split('#')[1]).css('background-color',
'transparent');
- }
+ }
if (hash !== '' && hash.substring(0, 1) === 'l' &&
!isNaN(hash.substring(1))) {
$('#' + hash).css('background-color', '#ffff99');
}
diff --git a/Allura/allura/templates/site_admin_new_projects.html
b/Allura/allura/templates/site_admin_new_projects.html
index 68de05b4c..413b43720 100644
--- a/Allura/allura/templates/site_admin_new_projects.html
+++ b/Allura/allura/templates/site_admin_new_projects.html
@@ -118,11 +118,11 @@
<script type="text/javascript"
src="{{g.forge_static('js/jquery.tablesorter.js')}}"></script>
<script type="text/JavaScript">$(document).ready(function() {
$(function(){
- $('#new_projects').tablesorter({
- usNumberFormat : false,
- sortReset : false,
- sortRestart : false
- });
- });
+ $('#new_projects').tablesorter({
+ usNumberFormat : false,
+ sortReset : false,
+ sortRestart : false
+ });
+ });
} );</script>
{% endblock %}
diff --git a/Allura/allura/templates/widgets/neighborhood_overview_form.html
b/Allura/allura/templates/widgets/neighborhood_overview_form.html
index 9724ecb7c..2637c1cb6 100644
--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html
+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html
@@ -60,12 +60,12 @@
{% endif %}
<label class="grid-4">Project List URL</label>
<div
class="grid-14">{{widget.display_field(widget.fields.project_list_url)}}</div>
- <label class="grid-4">Anchored tools</label>
- <div
class="grid-14">{{widget.display_field(widget.fields.anchored_tools)}}
- <br/>
- Anchored tools will be inserted at the beginning of all
projects, and cannot be removed by a project.
- If you change the anchored tools, already-inserted tools will
stay on all those projects. Example: "wiki:Wiki, sometool:The Label"
- </div>
+ <label class="grid-4">Anchored tools</label>
+ <div class="grid-14">{{widget.display_field(widget.fields.anchored_tools)}}
+ <br/>
+ Anchored tools will be inserted at the beginning of all projects, and
cannot be removed by a project.
+ If you change the anchored tools, already-inserted tools will stay on
all those projects. Example: "wiki:Wiki, sometool:The Label"
+ </div>
<label class="grid-4">Prohibited tools</label>
<div
class="grid-14">{{widget.display_field(widget.fields.prohibited_tools)}}</div>
<label class="grid-4"> </label>
diff --git a/Allura/allura/templates/widgets/project_summary.html
b/Allura/allura/templates/widgets/project_summary.html
index ee1b61f37..f5c5eadab 100644
--- a/Allura/allura/templates/widgets/project_summary.html
+++ b/Allura/allura/templates/widgets/project_summary.html
@@ -18,7 +18,7 @@
-#}
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<div class="list card{% if show_proj_icon%} proj_icon{% endif %}"
- {%- if columns == 2 %} style="width: 330px"{% elif columns == 3 %}
style="width: 220px"{% endif %}>
+ {%- if columns == 2 %} style="width: 330px"{% elif columns == 3 %}
style="width: 220px"{% endif %}>
{% if accolades %}
<div class="box notch">
<div class="feature">
diff --git a/Allura/allura/tests/test_globals.py
b/Allura/allura/tests/test_globals.py
index 27a2ba266..dfd9d492a 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -240,7 +240,7 @@ class Test():
p_test.add_user(M.User.by_username('test-user'), ['Developer'])
p_test.add_user(M.User.by_username('test-user-0'), ['Member'])
ThreadLocalODMSession.flush_all()
- r = g.markdown_wiki.convert('[[members limit=2]]').replace('\t',
'').replace('\n', '')
+ r = g.markdown_wiki.convert('[[members limit=2]]').replace(' ',
'').replace('\n', '')
assert (r ==
'<div class="markdown_content"><h6>Project Members:</h6>'
'<ul class="md-users-list">'
@@ -254,7 +254,7 @@ class Test():
user = M.User.by_username('test-admin')
user.display_name = 'Test Admin <script>'
r = g.markdown_wiki.convert('[[members]]')
- assert (r.replace('\n', '').replace('\t', '') ==
+ assert (r.replace('\n', '').replace(' ', '') ==
'<div class="markdown_content"><h6>Project Members:</h6>'
'<ul class="md-users-list">'
'<li><a href="/u/test-admin/">Test Admin <script></a>
(admin)</li>'
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
index 4e392cbea..583c729f5 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
@@ -23,10 +23,10 @@
<em class="grid-19">
Posted by {{lib.user_link(base_post.author(), avatar=True)}}
{{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
- <span>| {{value.state.capitalize()}}</span>
+ <span>| {{value.state.capitalize()}}</span>
{% endif %}
{% if h.has_access(value, 'write') %}
- <span>| <a href="{{value.url()}}edit">Edit</a></span>
+ <span>| <a href="{{value.url()}}edit">Edit</a></span>
{% endif %}
</em>
{% if value.labels %}
diff --git
a/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html
b/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html
index 5cb838e26..5231ba9e9 100755
--- a/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html
+++ b/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html
@@ -27,9 +27,9 @@
<!-- macro for feedback alert message -->
{% macro alert_message() %}
- <div id="check">
- <p id="status_msg" style="color:#f33;display:none;"> <i
class="fa fa-exclamation-triangle"></i> Profanity alert! Please update your
feedback.</p>
- </div>
+ <div id="check">
+ <p id="status_msg" style="color:#f33;display:none;"> <i class="fa
fa-exclamation-triangle"></i> Profanity alert! Please update your feedback.</p>
+ </div>
{% endmacro %}
<!-- macro for feedback cancel button -->
diff --git a/ForgeFeedback/forgefeedback/templates/feedback/edit_feedback.html
b/ForgeFeedback/forgefeedback/templates/feedback/edit_feedback.html
index ff3d29489..666451d2d 100755
--- a/ForgeFeedback/forgefeedback/templates/feedback/edit_feedback.html
+++ b/ForgeFeedback/forgefeedback/templates/feedback/edit_feedback.html
@@ -44,10 +44,10 @@ p {
<div class="row">
<div class="col-25">
- <p> <h2>Edit your feedback for <b> {{c.project.name}} </b></h2> </p>
+ <p> <h2>Edit your feedback for <b> {{c.project.name}} </b></h2> </p>
{{ common_feed.alert_message() }}
- </div>
+ </div>
<div class="col-75">
<fieldset class="rating">
diff --git a/ForgeFeedback/forgefeedback/templates/feedback/index.html
b/ForgeFeedback/forgefeedback/templates/feedback/index.html
index 853c4d198..1caacc33c 100755
--- a/ForgeFeedback/forgefeedback/templates/feedback/index.html
+++ b/ForgeFeedback/forgefeedback/templates/feedback/index.html
@@ -35,11 +35,11 @@
{% if c.user and c.user != c.user.anonymous() %}
<div class="index">
- {% if user_has_already_reviewed == False %}
- <p><h2> Provide your <a href="{{c.app.url}}new_feedback">Feedback</a>
for {{c.project.name}} </h2></p>
- {% else %}
- <p><h2><a href="{{c.app.url}}edit_feedback"> Edit </a> or <a
class="post-link" href="#"> Delete </a> your feedback for {{c.project.name}}
</h2> </p>
- {% endif %}
+ {% if user_has_already_reviewed == False %}
+ <p><h2> Provide your <a href="{{c.app.url}}new_feedback">Feedback</a> for
{{c.project.name}} </h2></p>
+ {% else %}
+ <p><h2><a href="{{c.app.url}}edit_feedback"> Edit </a> or <a
class="post-link" href="#"> Delete </a> your feedback for {{c.project.name}}
</h2> </p>
+ {% endif %}
</div>
{% else %}
<p><h3> <a target="_parent" href="{{ config.get('auth.login_url', '/auth/')
}}">Login </a> to Add/Modify Feedback</h3></p>
diff --git a/ForgeFeedback/forgefeedback/templates/feedback/new_feedback.html
b/ForgeFeedback/forgefeedback/templates/feedback/new_feedback.html
index f8d87d7b5..f60497c58 100755
--- a/ForgeFeedback/forgefeedback/templates/feedback/new_feedback.html
+++ b/ForgeFeedback/forgefeedback/templates/feedback/new_feedback.html
@@ -45,7 +45,7 @@ p {
<p> <h2>Provide your feedback for <b> {{c.project.name}}</b></h2> </p>
{{ common_feed.alert_message() }}
- </div>
+ </div>
<div class="col-75">
<fieldset class="rating" id="sar">
<input type="radio" id="star5" name="rating" value="5" /><label
for="star5" title="Excellent">5 stars</label>
diff --git a/ForgeWiki/forgewiki/templates/wiki/admin_options.html
b/ForgeWiki/forgewiki/templates/wiki/admin_options.html
index 969d209fe..bc6a6983d 100644
--- a/ForgeWiki/forgewiki/templates/wiki/admin_options.html
+++ b/ForgeWiki/forgewiki/templates/wiki/admin_options.html
@@ -55,7 +55,7 @@
<div class="grid-13"> </div>
<div class="grid-13">
{% if allow_config %}
- <input type="submit" value="Save"/>
+ <input type="submit" value="Save"/>
<a href="#" class="close">Cancel</a>
{% endif %}
</div>
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index efef31149..e75672268 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -53,19 +53,19 @@
{% block wiki_content %}
<form method="POST" class="can-retry" action="update" id="page_edit_form">
- <label class="grid-4">Name:</label>
- <div class="grid-14">
- <input type="text" name="title" id="title" value="{{page.title}}"
placeholder="Page name" required="required" autofocus="autofocus"/>
- </div>
- <label class="grid-20">Content:</label>
- <div style="clear:both;"></div>
- <div class="grid-20">
- {{c.markdown_editor.display(id='text', name='text',value=page.text)}}
- </div>
- <div style="clear:both;"></div>
- <label class="grid-4">Labels:</label>
- <div class="grid-14" style="margin-left:0">
- {{c.label_edit.display(id='labels', name='labels',
value=page.labels)}}
+ <label class="grid-4">Name:</label>
+ <div class="grid-14">
+ <input type="text" name="title" id="title" value="{{page.title}}"
placeholder="Page name" required="required" autofocus="autofocus"/>
+ </div>
+ <label class="grid-20">Content:</label>
+ <div style="clear:both;"></div>
+ <div class="grid-20">
+ {{c.markdown_editor.display(id='text', name='text',value=page.text)}}
+ </div>
+ <div style="clear:both;"></div>
+ <label class="grid-4">Labels:</label>
+ <div class="grid-14" style="margin-left:0">
+ {{c.label_edit.display(id='labels', name='labels', value=page.labels)}}
</div>
<div class="grid-20">
<input type="submit" value="Save">
@@ -75,7 +75,7 @@
<input type="checkbox" name="subscribe"
class="subscribe-checkbox">Subscribe to this wiki page
</label>
{% endif %}
- </div>
+ </div>
{{lib.csrf_token()}}
</form>
<div class="grid-19">
@@ -113,7 +113,7 @@
'<div class="attachment_images"></div>' +
'<div class="attachment_files"></div>';
$(attach_divs).prependTo($('.attachments'));
- };
+ }
var ext = filename.split('.').pop().toLowerCase();
if($.inArray(ext, ['gif','png','jpg','jpeg']) != -1) {
new_attach = '<div class="attachment_thumb">' +
@@ -135,8 +135,8 @@
'</span>' +
'</form></div><div style="clear:both"></div>';
$(new_attach).prependTo($('.attachment_files'));
- };
- };
+ }
+ }
$('#attachment_form').on('submit', function(event) {
event.preventDefault();
@@ -166,7 +166,7 @@
type: "POST",
url: attr_url,
data: elem.serialize() +"&_session_id=" + $.cookie('_session_id'),
- success: function() {;
+ success: function() {
elem.parent().remove();
}
});
