Use reversed URLs in headers and add an Admin Logout link (#149)

code4romania · Jan 28, 2024 · c66730d · c66730d
1 parent 80afb50
commit c66730d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/backend/templates/v1/admin2/header.html b/backend/templates/v1/admin2/header.html
@@ -14,13 +14,15 @@
 
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav">
-                <li><a href="/admin/">Acasă</a></li>
-                <li><a href="/admin/organizatii/">Organizații</a></li>
-                <li><a href="/admin/conturi/">Conturi</a></li>
-                <li><a href="/admin/ong-nou/">Asociație nouă</a></li>
-                {# <li><a href="/admin/campanii">Campanie nouă</a></li> #}
+                <li><a href="{{ url('admin-index') }}">Acasă</a></li>
+                <li><a href="{{ url('admin-ngos') }}">Organizații</a></li>
+                <li><a href="{{ url('admin-users') }}">Conturi</a></li>
+                <li><a href="{{ url('admin-ong-nou') }}">Asociație nouă</a></li>
+                {# <li><a href="{{ url('admin-campanii') }}">Campanie nouă</a></li> #}
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="{{ url('admin:logout') }}?next=/">Ieși din cont admin</a></li>
             </ul>
-
         </div>
     </div>
 </nav>
diff --git a/backend/templates/v1/admin2/ngos.html b/backend/templates/v1/admin2/ngos.html
@@ -24,7 +24,7 @@
                     <tr>
                         <td>{{ loop.index }}</td>
                         <td>
-                            <a href="/admin/{{ ngo.slug }}/">{{ ngo.name }}</a>
+                            <a href="{{ url('admin-ong', kwargs={'ngo_url': ngo.slug}) }}">{{ ngo.name }}</a>
                         </td>
                         <td>
                             {{ ngo.email or '' }}

diff --git a/backend/templates/v1/components/ngo-header.html b/backend/templates/v1/components/ngo-header.html
@@ -12,7 +12,7 @@
             </div>
             <div class="media-body">
                 <h1>
-                    <a href="/{{ ngo.slug }}/">
+                    <a href="{{ url('twopercent', kwargs={'ngo_url': ngo.slug}) }}">
                         <span itemprop="name" >{{ ngo.name }}</span>
                     </a>
                 </h1>

diff --git a/backend/templates/v1/header.html b/backend/templates/v1/header.html
@@ -17,10 +17,10 @@
         {% if not custom_subdomain %}
             <div id="header-menu" class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="/asociatii/">Asociații</a></li>
-                    <li><a href="/ong/">Înregistrează ONG</a></li>
-                    <li><a href="/despre/">Despre</a></li>
-                    <li><a href="/login/">Log In</a></li>
+                    <li><a href="{{ url('associations') }}">Asociații</a></li>
+                    <li><a href="{{ url('ngo') }}">Înregistrează ONG</a></li>
+                    <li><a href="{{ url('about') }}">Despre</a></li>
+                    <li><a href="{{ url('login') }}">Log In</a></li>
                 </ul>
                 <div id="sponsor-container">
                     <p class="text-center text-link">

diff --git a/backend/templates/v1/ngo/account-header.html b/backend/templates/v1/ngo/account-header.html
@@ -14,9 +14,9 @@
 
         <div id="account-header-container" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li><a href="/contul-meu/">Acasă</a></li>
-                <li><a href="/asociatia/">Date asociație</a></li>
-                <li><a href="/date-cont/">Date cont</a></li>
+                <li><a href="{{ url('contul-meu') }}">Acasă</a></li>
+                <li><a href="{{ url('association') }}">Date asociație</a></li>
+                <li><a href="{{ url('date-contul-meu') }}">Date cont</a></li>
                 <!-- <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Donatii <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
@@ -26,7 +26,7 @@
                 </li> -->
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="/logout/">Ieși din cont</a></li>
+                <li><a href="{{ url('logout') }}">Ieși din cont</a></li>
             </ul>
         </div>
     </div>