Fix/logout on profile button (#339)

* fix: profile button logs user out previously clicking on the profile button would log the user out. This now loads the "my plugins" page which is more intuitive as it before needed the detour over the plugins page. * fix: fixture passwords admin -> admin staff -> staff creator -> creator * chore: change links from http to https * fix: block identifier
qgis · Jan 31, 2024 · fe8b04d · fe8b04d
1 parent 2f7e9c1
commit fe8b04d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/qgis-app/fixtures/auth.json b/qgis-app/fixtures/auth.json
@@ -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"
         }
@@ -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"
         }
@@ -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"
         }

diff --git a/qgis-app/templates/base.html b/qgis-app/templates/base.html
@@ -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"
@@ -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 %}
 
@@ -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="">
@@ -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>