Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indentation #1608

Merged
merged 2 commits into from
Feb 19, 2024
Merged

Indentation #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cd697c
Discussion-link on Convert-Page leads to NONAMEGIVEN fixes #1546
RogerHaase Feb 18, 2024
38b8890
fix trivial templates/modify.html indentation error; #1554 fallout
RogerHaase Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/moin/templates/itemviews.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@
{%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
{% set title = _('Discuss contents of this item') %}
<li>
<a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name=supp_name) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}</a>
<a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name = supp_name) }}"
title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}
</a>
</li>
{%- endif %}
{%- endif %}
Expand Down
24 changes: 12 additions & 12 deletions src/moin/templates/modify.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,18 @@ <h1>{{ title }}</h1>
{% set may_admin = user.may.admin(fqname) %}
{{ meta_editor(form['meta_form'], may_admin) }}

{% if item.meta['name'][0].endswith('Group') %}
{{ forms.render(form['usergroup']) }}
<div class="hint">
{{ _('Enter list of user names, one name per line.') }}
</div>
{% endif %}
{% if item.meta['name'][0].endswith('Dict') %}
{{ forms.render(form['wikidict']) }}
<div class="hint">
{{ _('Enter "key=value" strings, one per line, no quotes, no blank lines.') }}
</div>
{% endif %}
{% if item.meta['name'][0].endswith('Group') %}
{{ forms.render(form['usergroup']) }}
<div class="hint">
{{ _('Enter list of user names, one name per line.') }}
</div>
{% endif %}
{% if item.meta['name'][0].endswith('Dict') %}
{{ forms.render(form['wikidict']) }}
<div class="hint">
{{ _('Enter "key=value" strings, one per line, no quotes, no blank lines.') }}
</div>
{% endif %}
{{ gen.form.close() }}
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/moin/themes/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ def setup_jinja_env():
'storage': flaskg.storage,
'clock': flaskg.clock,
'cfg': app.cfg,
'item_name': '@NONAMEGIVEN', # XXX can we just use '' ?
'item_name': request.view_args.get('item_name', ''),
'url_for_item': url_for_item,
'get_fqname': get_fqname,
'get_editor_info': lambda meta: get_editor_info(meta),
Expand Down