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

Fix/logout on profile button #339

Merged
merged 4 commits into from
Jan 31, 2024
+11 −11
Merged

Fix/logout on profile button #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d58427
fix: profile button logs user out
TheGreatRefrigerator Jan 7, 2024
d0d9b59
fix: fixture passwords
TheGreatRefrigerator Jan 7, 2024
a7c12b6
chore: change links from http to https
TheGreatRefrigerator Jan 7, 2024
9816967
fix: block identifier
TheGreatRefrigerator Jan 7, 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
6 changes: 3 additions & 3 deletions qgis-app/fixtures/auth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"last_login": "2010-11-24 07:56:12",
"groups": [],
"user_permissions": [],
"password": "sha1$d6c11$4f3f04e104dc8bbe7950234f0cd8406a65df0bdf",
"password": "pbkdf2_sha256$150000$foQAQGi54z25$AQelhq+oBE3TOBJRT9F9UsEP5K1PSWQnQeozkmyc3fs=",
"email": "",
"date_joined": "2010-11-24 07:56:12"
}
Expand All @@ -30,7 +30,7 @@
"last_login": "2010-11-25 07:35:07",
"groups": [],
"user_permissions": [],
"password": "sha1$9ba9f$6088ef8abc2243a55e777e937159c8f2fd4920bb",
"password": "pbkdf2_sha256$150000$BBba4NloaWZO$XN4lzpxcvFSrLl1QqiwQz/0ZLiEH/JTgEJE/uRRXWto=",
"email": "[email protected]",
"date_joined": "2009-10-06 18:04:20"
}
Expand All @@ -48,7 +48,7 @@
"last_login": "2010-11-25 07:35:20",
"groups": [],
"user_permissions": [],
"password": "sha1$cb97a$221727796b3f551e342dca9d00112f072e399182",
"password": "pbkdf2_sha256$150000$GJga5YEinaWz$zJAjCXccvWHNPGmoZEjvBNgm1DGkjZGA3BmTVaNAxP4=",
"email": "",
"date_joined": "2010-11-25 07:35:20"
}
Expand Down
16 changes: 8 additions & 8 deletions qgis-app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<script type="text/javascript" src="{% static "js/jquery-1.11.1.min.js" %}"></script>
<script type="text/javascript" src="{% static "bootstrap/js/bootstrap-3.4.1.min.js" %}"></script>

<!-- Cookie disclaimer -->
<script type="text/javascript" id="cookieinfo" src="{% static 'js/cookieinfo/cookieinfo.min.js' %}" data-bg="#1c2028"
data-fg="#FFFFFF" data-link="#22961c" data-cookie="CookieInfoScript" data-text-align="left"
Expand All @@ -49,7 +49,7 @@

<a class="brand" href="https://www.qgis.org">QGIS</a>
{% if user.is_authenticated %}
<a id="user-tooltip" href="{% if user.is_superuser %}{% url "admin:index" %}{% else %}{% url "logout" %}{% endif %}"
<a id="user-tooltip" href="{% if user.is_superuser %}{% url "admin:index" %}{% else %}{% url "my_plugins" %}{% endif %}"
data-toggle="tooltip" data-placement="bottom" title="{{ user.username }}" style="float: right !important"><i class="icon-user icon-3x"></i></a>
{% endif %}

Expand Down Expand Up @@ -133,7 +133,7 @@
<h3>Sustaining Members</h3>
</header>
<div class="row">
<a href="http://www.qgis.org/en/site/about/sustaining_members.html">
<a href="https://www.qgis.org/en/site/about/sustaining_members.html">
<!--<div class="span6">
<div class="sponsor">
<img src="../_images/gold.png" width="90px" alt="">
Expand All @@ -160,15 +160,15 @@ <h5>Silver Sponsors</h5>
<div class="container">
<div>
<ul class="unstyled inline" id="social">
<li id="twitter"><a href="http://twitter.com/qgis" class="external"><div></div></a></li>
<li id="twitter"><a href="https://twitter.com/qgis" class="external"><div></div></a></li>
<li id="facebook"><a href="https://www.facebook.com/QGIS-298112000235096" class="external"><div></div></a></li>
<li id="github"><a href="http://github.com/qgis/QGIS-Django" class="external"><div></div></a></li>
<li id="github"><a href="https://github.com/qgis/QGIS-Django" class="external"><div></div></a></li>
</ul>
</div>

<p class="credit">{% trans "All content is licensed under" %} <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 licence (CC BY-SA)</a>.</p>
{% block "credits" %}
<p class="credit">{% trans "Select graphics from " %}<a href="http://thenounproject.com" target="_blank">{% trans "The Noun Project collection" %}</a>.</p>
<p class="credit">{% trans "All content is licensed under" %} <a href="https://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 licence (CC BY-SA)</a>.</p>
{% block credits %}
<p class="credit">{% trans "Select graphics from " %}<a href="https://thenounproject.com" target="_blank">{% trans "The Noun Project collection" %}</a>.</p>
<p class="credit">{% trans "This web application was developed by:" %}&nbsp;<a href="https://www.itopen.it">Alessandro Pasotti</a> and &nbsp;<a href="https://kartoza.com"><img src="{% static 'images/kartoza-logo-only.png' %}" alt="Kartoza icon" width="16" height="16" />Kartoza</a>. <span>Version: {% version_tag %}</span>.</p>
{% endblock %}
</div>
Expand Down
Loading