Intranet: UI Update to foundation 6

TYPE: Feature LINK: OGC-1772
OneGov · Aug 13, 2024 · ffbae8a · ffbae8a
1 parent 6565b29
commit ffbae8a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/src/onegov/intranet/app.py b/src/onegov/intranet/app.py
@@ -1,10 +1,10 @@
-from onegov.org import OrgApp
+from onegov.town6 import TownApp
 
 
 from typing import Any
 
 
-class IntranetApp(OrgApp):
+class IntranetApp(TownApp):
 
     def configure_organisation(
         self,

diff --git a/src/onegov/intranet/views/exceptionviews.py b/src/onegov/intranet/views/exceptionviews.py
@@ -2,7 +2,7 @@
 
 from onegov.core.security import Public
 from onegov.intranet import IntranetApp
-from onegov.org.views.exceptionviews import handle_forbidden
+from onegov.town6.views.exceptionviews import town_handle_forbidden
 from onegov.user import Auth
 from purl import URL
 from webob.exc import HTTPForbidden
@@ -11,7 +11,7 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from onegov.core.types import RenderData
-    from onegov.org.request import OrgRequest
+    from onegov.town6.request import TownRequest
     from webob import Response
 
 
@@ -22,7 +22,7 @@
 )
 def handle_forbidden_for_homepage(
     self: HTTPForbidden,
-    request: 'OrgRequest'
+    request: 'TownRequest'
 ) -> 'RenderData | Response':
     """ Usually, the forbidden view offers no way to log in, as we usually
     do not need that feature (exception views should be simple).
@@ -39,4 +39,4 @@ def handle_forbidden_for_homepage(
     if URL(request.url).path() == '/':
         return morepath.redirect(login_url)
 
-    return handle_forbidden(self, request)
+    return town_handle_forbidden(self, request)
diff --git a/src/onegov/town6/templates/macros.pt b/src/onegov/town6/templates/macros.pt
@@ -59,15 +59,23 @@
 
 <metal:navigation define-macro="side-navigation-nested">
     <a tal:condition="children" tal:define="page page|None">
-        <div class="navlink ${'current' if nav_page == page else ''}"><span data-click-target="${link.attrs['href']}">${link.text}</span>
-        <metal:b use-macro="layout.macros['access_hint']" tal:define="item nav_page"/>
-        <metal:b use-macro="layout.macros['publication_hint']" tal:define="item nav_page"/></div>
+        <div class="navlink ${'current' if nav_page == page else ''}">
+            <span data-click-target="${link.attrs['href']}">
+                ${link.text}
+                <metal:b use-macro="layout.macros['access_hint']" tal:define="item nav_page"/>
+                <metal:b use-macro="layout.macros['publication_hint']" tal:define="item nav_page"/>
+            </span>
+        </div>
     </a>
     <tal:b tal:condition="not: children" tal:define="page page|None">
         <a href="${link.attrs['href']}">
-            <div class="navlink ${'current' if nav_page == page else ''}"><span>${link.text}</span>
-            <metal:b use-macro="layout.macros['access_hint']" tal:define="item nav_page"/>
-            <metal:b use-macro="layout.macros['publication_hint']" tal:define="item nav_page"/></div>
+            <div class="navlink ${'current' if nav_page == page else ''}">
+                <span>
+                    ${link.text}
+                    <metal:b use-macro="layout.macros['access_hint']" tal:define="item nav_page"/>
+                    <metal:b use-macro="layout.macros['publication_hint']" tal:define="item nav_page"/>
+                </span>
+            </div>
         </a>
     </tal:b>
     <tal:b tal:define="ancestors layout.model.ancestors|[]">

diff --git a/src/onegov/town6/theme/styles/header.scss b/src/onegov/town6/theme/styles/header.scss
@@ -651,6 +651,18 @@ $editbar-fg-color-active: $white;
                     background: rgba(250, 250, 250, .15);
                     color: $white;
                 }
+
+                .private-hint,
+                .member-hint,
+                .mtan-hint,
+                .secret-hint,
+                .secret-mtan-hint,
+                .unpublished-hint {
+                    &::before {
+                        color: $white;
+                        padding-left: .5rem;
+                    }
+                }
             }
         }