Merge pull request #2928 from weseek/imprv/article-area-gw4142

article-area-gw4142

src/client/js/components/NotFoundPage.jsx

@@ -7,7 +7,6 @@ import CustomNavigation from './CustomNavigation';
 import PageList from './PageList';
 import PageTimeline from './PageTimeline';
 
-
 const NotFoundPage = (props) => {
   const { t } = props;
 
@@ -27,7 +26,7 @@ const NotFoundPage = (props) => {
   };
 
   return (
-    <div className="grw-custom-navigation mt-5">
+    <div className="grw-custom-navigation mt-5 on-edit">
       <CustomNavigation navTabMapping={navTabMapping} />
     </div>
   );

src/client/styles/scss/_on-edit.scss

@@ -63,6 +63,11 @@ body.on-edit {
     }
   }
 
+  // hide when Editor
+  .grw-custom-navigation {
+    display: none;
+  }
+
   // hide unnecessary elements
   .d-edit-none {
     display: none !important;

src/server/views/widget/not_found_content.html

@@ -5,11 +5,8 @@
     data-template-tags="{{ templateTags }}"
   {% endif %}
   >
-
   <div id="display-switcher"></div>
-  <div id="not-found-alert"></div>
   <div id="not-found-page"></div>
-
   <div class="tab-content">
 
 

src/server/views/widget/page_alerts.html

@@ -80,5 +80,8 @@
     {% if isTrashPage() %}
       <div id="trash-page-alert"></div>
     {% endif %}
+    {% if !page %}
+      <div id="not-found-alert"></div>
+    {% endif %}
   </div>
 </div>