Merge pull request #515 from tiberiuichim/simple_404_page

Simplify 404 http error view template; Make nav-bar and editor-bar slots same between view/master.pt and edit/master.pt
Kotti · Nov 29, 2016 · 22e92c7 · 22e92c7
2 parents a098d2f + 101283d
commit 22e92c7
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -12,6 +12,11 @@ Change History
   a defined add_view. This avoids a hard crash with, for example, a content
   type derived from Content that has no add_view defined.
 
+- Added ``nav-bar`` slot to ``edit/master.pt``, ``edit-bar`` and ``nav-bar``
+  slots to ``view/master.pt``
+
+- Bugfix: Simplify 404 page, no longer crash when authenticated
+
 - Change: simplify `kotti.util.LinkBase.selected()`: use request.view_name
   instead of deriving the view name from request.url. Also, consider the View
   editor bar entry as selected even when the url doesn't end with a slash '/'

diff --git a/kotti/templates/edit/master.pt b/kotti/templates/edit/master.pt
@@ -27,9 +27,14 @@
   </head>
 
   <body class="view-${request.view_name or 'default'} ${api.body_css_class} logged-in">
-    <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
-    <metal:editorbar define-slot="editor-bar" tal:condition="request.user is not None"
-                     tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+
+    <nav tal:omit-tag="" metal:define-slot="nav-bar">
+      <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" ></nav>
+    </nav>
+    <editbar tal:omit-tag="" metal:define-slot="editor-bar">
+      <div tal:condition="request.user is not None"
+        tal:replace="api.render_template('kotti:templates/editor-bar.pt')" ></div>
+    </editbar>
 
     <div class="container">
       <div class="row">

diff --git a/kotti/templates/http-errors/notfound.pt b/kotti/templates/http-errors/notfound.pt
@@ -2,6 +2,26 @@
 <html i18n:domain="Kotti"
       metal:use-macro="api.macro('kotti:templates/view/master.pt')">
 
+    <div metal:fill-slot="nav-bar">
+      <nav class="navbar navbar-static-top navbar-inverse"
+        role="navigation"
+        id="navbar-view">
+        <div class="container-fluid">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-view-collapse">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="${request.application_url}/">
+              ${api.site_title}
+            </a>
+          </div>
+        </div>
+      </nav>
+    </div>
+
     <div metal:fill-slot="content" class="notfound">
       <h1 i18n:translate="">Not Found</h1>
       <p i18n:translate="">The resource could not be found</p>

diff --git a/kotti/templates/view/master.pt b/kotti/templates/view/master.pt
@@ -30,9 +30,14 @@
   <body class="${request.user is not None and 'logged-in'}
                view-${request.view_name or 'default'}
                ${api.body_css_class}">
-    <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
-    <div tal:condition="request.user is not None and has_location_context"
-         tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+
+    <nav tal:omit-tag="" metal:define-slot="nav-bar">
+      <nav tal:replace="api.render_template('kotti:templates/view/nav.pt')" />
+    </nav>
+    <editbar tal:omit-tag="" metal:define-slot="editor-bar">
+      <div tal:condition="request.user is not None and has_location_context"
+           tal:replace="api.render_template('kotti:templates/editor-bar.pt')" />
+    </editbar>
 
     <div class="container">
       <div tal:replace="api.render_template('kotti:templates/edit/breadcrumbs.pt')" />

diff --git a/kotti/tests/test_functional.py b/kotti/tests/test_functional.py
@@ -198,6 +198,12 @@ def test_login(self, webtest):
         resp = form.submit('submit').maybe_follow()
         assert "Welcome, Administrator" in resp.body
 
+    @pytest.mark.user('admin')
+    def test_exception_views(self, webtest):
+        app = webtest.app
+        resp = app.get('/this-does-not-exist', status=404)
+        assert "<h1>Not Found</h1>" in resp.body
+
     @pytest.mark.user('admin')
     def test_content_management(self, webtest):