Explorar o código

move and rename EditTagModal

yusuketk %!s(int64=7) %!d(string=hai) anos
pai
achega
e08aefa2ef

+ 4 - 1
src/client/js/app.js

@@ -25,6 +25,8 @@ import { EditorOptions, PreviewOptions } from './components/PageEditor/OptionsSe
 import SavePageControls from './components/SavePageControls';
 import PageEditorByHackmd from './components/PageEditorByHackmd';
 import Page from './components/Page';
+// TODO GC-1391 activate
+import TagViewer from './components/Page/TagViewer';
 import PageHistory from './components/PageHistory';
 import PageComments from './components/PageComments';
 import CommentForm from './components/PageComment/CommentForm';
@@ -308,7 +310,8 @@ if (pageId) {
 }
 if (pagePath) {
   componentMappings.page = <Page crowi={crowi} crowiRenderer={crowiRenderer} markdown={markdown} pagePath={pagePath} onSaveWithShortcut={saveWithShortcut} />;
-  componentMappings['revision-path'] = <RevisionPath pageId={pageId} pagePath={pagePath} crowi={crowi} sendTagData={setTagData} />;
+  componentMappings['revision-path'] = <RevisionPath pagePath={pagePath} crowi={crowi} />;
+  componentMappings['tag-viewer'] = <TagViewer crowi={crowi} pageId={pageId} sendTagData={setTagData} />; // [TODO] GC-1391 activate
   componentMappings['revision-url'] = <RevisionUrl pageId={pageId} pagePath={pagePath} />;
 }
 

+ 0 - 16
src/client/js/components/Page/RevisionPath.js

@@ -1,7 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-// TODO GC-1391 activate
-// import EditTagModal from './EditTagModal';
 
 import CopyButton from '../CopyButton';
 
@@ -84,13 +82,6 @@ export default class RevisionPath extends React.Component {
       marginLeft: '0.5em',
       padding: '0 2px',
     };
-    // TODO GC-1391 activate
-    // const tagButtonStyle = {
-    //   height: '19px',
-    //   width: '30px',
-    //   marginLeft: '0.5em',
-    //   padding: '0 2px',
-    // };
 
     const pageLength = this.state.pages.length;
 
@@ -128,12 +119,6 @@ export default class RevisionPath extends React.Component {
         <a href="#edit" className="btn btn-default btn-edit" style={editButtonStyle}>
           <i className="icon-note" />
         </a>
-        {/* <EditTagModal
-          crowi={this.props.crowi}
-          pageId={this.props.pageId}
-          style={tagButtonStyle}
-          sendTagData={this.props.sendTagData}
-        /> [TODO] GC-1391 activate */}
       </span>
     );
   }
@@ -141,7 +126,6 @@ export default class RevisionPath extends React.Component {
 }
 
 RevisionPath.propTypes = {
-  pageId: PropTypes.string,
   pagePath: PropTypes.string.isRequired,
   crowi: PropTypes.object.isRequired,
   sendTagData: PropTypes.func,

+ 2 - 2
src/client/js/components/Page/EditTagModal.jsx → src/client/js/components/Page/TagViewer.jsx

@@ -6,7 +6,7 @@ import Tooltip from 'react-bootstrap/es/Tooltip';
 import Modal from 'react-bootstrap/es/Modal';
 import PageTagForm from '../PageTagForm';
 
-export default class EditTagModal extends React.Component {
+export default class TagViewer extends React.Component {
 
   constructor(props) {
     super(props);
@@ -98,7 +98,7 @@ export default class EditTagModal extends React.Component {
 
 }
 
-EditTagModal.propTypes = {
+TagViewer.propTypes = {
   crowi: PropTypes.object.isRequired,
   pageId: PropTypes.string,
   sendTagData: PropTypes.func,

+ 4 - 0
src/client/styles/scss/_page.scss

@@ -88,6 +88,10 @@
         }
       }
     }
+
+    h1.title {
+      float: left;
+    }
   }
 
   // alert component settings

+ 1 - 0
src/server/views/layout-growi/widget/header.html

@@ -8,6 +8,7 @@
       </div>
       <div class="title-container">
         <h1 class="title" id="revision-path"></h1>
+        <h1 class="title" id="tag-viewer"></h1>
         <div id="revision-url" class="url-line"></div>
       </div>
       {% if page %}