Yuki Takei 7 лет назад
Родитель
Сommit
6433922fe5

+ 0 - 3
src/client/js/app.js

@@ -33,7 +33,6 @@ import PageAttachment from './components/PageAttachment';
 import PageStatusAlert from './components/PageStatusAlert';
 import RevisionPath from './components/Page/RevisionPath';
 import TagLabels from './components/Page/TagLabels';
-import RevisionUrl from './components/Page/RevisionUrl';
 import BookmarkButton from './components/BookmarkButton';
 import LikeButton from './components/LikeButton';
 import PagePathAutoComplete from './components/PagePathAutoComplete';
@@ -314,8 +313,6 @@ if (pageId) {
 if (pagePath) {
   componentMappings.page = <Page crowi={crowi} crowiRenderer={crowiRenderer} markdown={markdown} pagePath={pagePath} onSaveWithShortcut={saveWithShortcut} />;
   componentMappings['revision-path'] = <RevisionPath pagePath={pagePath} crowi={crowi} />;
-  // [TODO] there is a need to decide the destination of RevisionUrl
-  componentMappings['revision-url'] = <RevisionUrl crowi={crowi} pageId={pageId} pagePath={pagePath} />;
   componentMappings['tag-label'] = <I18nextProvider i18n={i18n}><TagLabels crowi={crowi} pageId={pageId} sendTagData={setTagData} /></I18nextProvider>;
 }
 

+ 3 - 1
src/server/views/layout-crowi/forbidden.html

@@ -10,7 +10,9 @@
       <div>
         <div>
           <h1 class="title" id="revision-path"></h1>
-          <div id="revision-url" class="url-line"></div>
+          {% if page and not forbidden and not isTrashPage() %}
+            <div id="tag-label"></div>
+          {% endif %}
         </div>
       </div>
 

+ 3 - 1
src/server/views/layout-crowi/not_creatable.html

@@ -10,7 +10,9 @@
       <div>
         <div>
           <h1 class="title" id="revision-path"></h1>
-          <div id="revision-url" class="url-line"></div>
+          {% if page and not forbidden and not isTrashPage() %}
+            <div id="tag-label"></div>
+          {% endif %}
         </div>
       </div>
 

+ 3 - 1
src/server/views/layout-crowi/not_found.html

@@ -10,7 +10,9 @@
       <div>
         <div>
           <h1 class="title" id="revision-path"></h1>
-          <div id="revision-url" class="url-line"></div>
+          {% if page and not forbidden and not isTrashPage() %}
+            <div id="tag-label"></div>
+          {% endif %}
         </div>
       </div>
 

+ 3 - 1
src/server/views/layout-crowi/page.html

@@ -11,7 +11,9 @@
       <div class="d-flex align-items-center">
         <div class="title-container">
           <h1 class="title" id="revision-path"></h1>
-          <div id="revision-url" class="url-line"></div>
+          {% if page and not forbidden and not isTrashPage() %}
+            <div id="tag-label"></div>
+          {% endif %}
         </div>
         {% include '../widget/header-buttons.html' %}
       </div>

+ 4 - 4
src/server/views/layout-crowi/page_list.html

@@ -16,10 +16,10 @@
 
     <div class="d-flex align-items-center">
       <div class="title-container">
-        <div class="d-flex">
-          <h1 class="title" id="revision-path"></h1>
-        </div>
-        <div id="revision-url" class="url-line"></div>
+        <h1 class="title" id="revision-path"></h1>
+        {% if page and not forbidden and not isTrashPage() %}
+          <div id="tag-label"></div>
+        {% endif %}
       </div>
       {% include '../widget/header-buttons.html' %}
     </div>

+ 2 - 6
src/server/views/layout-growi/widget/header.html

@@ -8,13 +8,9 @@
       </div>
       <div class="title-container">
         <h1 class="title" id="revision-path"></h1>
-
-        <!-- [TODO] commentout Until the destination is decided -->
-        <!-- <div id="revision-url" class="url-line"></div> -->
-        {% if not forbidden %}
-          <div class="title" id="tag-label"></div>
+        {% if page and not forbidden and not isTrashPage() %}
+          <div id="tag-label"></div>
         {% endif %}
-
       </div>
       {% if page %}
       {% include '../../widget/header-buttons.html' %}

+ 3 - 1
src/server/views/layout-kibela/widget/header.html

@@ -7,7 +7,9 @@
     </div>
     <div class="title-container">
       <h1 class="title" id="revision-path"></h1>
-      <div id="revision-url" class="url-line"></div>
+      {% if page and not forbidden and not isTrashPage() %}
+        <div id="tag-label"></div>
+      {% endif %}
     </div>
     {% if page %} {% include '../../widget/header-buttons.html' %}