maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix missing custom_notes for admins/resellers

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-18 09:30:02 +02:00
parent 5b3db2f096
commit 56f5c7b487
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
templates/Froxlor/user/index.html.twig
View File

@@ -118,6 +118,18 @@
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
{% if userinfo.custom_notes is not empty and userinfo.custom_notes_show == 1 %}
<div class="card mb-3">
<ul class="list-group list-group-flush">
<li class="list-group-item list-group-item-info d-flex justify-content-between align-items-start">
<div class="ms-2 me-auto">
{{ userinfo.custom_notes|nl2br|raw }}
</div>
</li>
</ul>
</div>
{% endif %}
</div> </div>
{% else %} {% else %}
<div <div
@@ -280,22 +292,23 @@
{% endif %} {% endif %}
{% if (get_setting('admin.show_news_feed') == 1 and userinfo.adminsession == 1) or (get_setting('customer.show_news_feed') == 1 and userinfo.adminsession == 0) %} {% if (get_setting('admin.show_news_feed') == 1 and userinfo.adminsession == 1) or (get_setting('customer.show_news_feed') == 1 and userinfo.adminsession == 0) %}
<div id="newsfeed" class="card"{% if userinfo.adminsession == 0 %} data-role="customer"{% endif %}> <div id="newsfeed" class="card" {% if userinfo.adminsession == 0 %} data-role="customer" {% endif %}>
<div class="card-header"> <div class="card-header">
<i class="fa-solid fa-info-circle me-1"></i> <i class="fa-solid fa-info-circle me-1"></i>
{% if get_setting('customer.news_feed_url') is empty %}Froxlor {% endif %}Newsfeed {% if get_setting('customer.news_feed_url') is empty %}Froxlor
</div> {% endif %}Newsfeed
<div class="list-group list-group-flush" id="newsfeeditems"> </div>
<div class="list-group-item d-flex justify-content-between align-items-start"> <div class="list-group list-group-flush" id="newsfeeditems">
<div class="ms-2 me-auto"> <div class="list-group-item d-flex justify-content-between align-items-start">
Loading newsfeed... <div class="ms-2 me-auto">
Loading newsfeed...
</div>
<span>
<i class="fa-solid fa-spinner fa-spin"></i>
</span>
</div> </div>
<span>
<i class="fa-solid fa-spinner fa-spin"></i>
</span>
</div> </div>
</div> </div>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>