Просмотр исходного кода

Merge pull request #2199 from weseek/support/comment-out-for-release-dev4.0.0

Support/comment out for release dev4.0.0
itizawa 5 лет назад
Родитель
Сommit
81e7d9679b

+ 2 - 0
src/client/js/app.jsx

@@ -68,6 +68,8 @@ Object.assign(componentMappings, {
   // 'revision-history': <PageHistory pageId={pageId} />,
   'tags-page': <TagsList crowi={appContainer} />,
 
+  'create-page-name-input': <PagePathAutoComplete crowi={appContainer} initializedPath={pageContainer.state.path} addTrailingSlash />,
+
   'page-editor': <PageEditor />,
   'page-editor-path-nav': <PagePathNavForEditor />,
   'page-editor-options-selector': <OptionsSelector crowi={appContainer} />,

+ 12 - 3
src/server/views/layout/layout.html

@@ -107,7 +107,13 @@
       {% endif %}
 
       {% if user %}
-      <li id="create-page-button" class="nav-item d-none d-md-block"></li>
+      <!-- TODO GW-79 enable after refactoring  <li id="create-page-button" class="nav-item d-none d-md-block"></li> -->
+      <li class="nav-item d-none d-md-block">
+        <a class="nav-link create-page" href="#" data-target="#create-page" data-toggle="modal">
+          <i class="icon-pencil mr-2"></i>
+          <span>{{ t('New') }}</span>
+        </a>
+      </li>
       <li class="nav-item d-none d-md-block">
         <a class="nav-link" href="https://docs.growi.org/" target="_blank">
           <i class="icon-question mr-2"></i><span class="mr-2">{{ t('Help') }}</span><span class="small"><i class="icon-share-alt"></i></span>
@@ -143,14 +149,17 @@
 
 <div class="grw-fixed-controls-container d-md-none d-edit-none animated fadeInUp faster">
   <div class="grw-fixed-controls-button-container rounded-circle">
-    <div id='create-page-button-icon'></div>
+    <!-- TODO GW-79 enable after refactoring <div id='create-page-button-icon'></div> -->
+    <button class="btn btn-lg btn-primary rounded-circle waves-effect waves-light" type="button" data-target="#create-page" data-toggle="modal">
+      <i class="icon-pencil"></i>
+    </button>
   </div>
 </div>
 
 <!-- /#staff-credit -->
 <div id="staff-credit"></div>
 
-<div id="page-create-modal"></div>
+<!-- TODO GW-79 enable after refactoring <div id="page-create-modal"></div> -->
 {% include '../modal/shortcuts.html' %}
 
 {% block body_end %}

+ 1 - 1
src/server/views/modal/create_page.html

@@ -52,7 +52,7 @@
         {% set templateParentPath = parentPath(path | preventXss | escape) %}
         <div id="template-form" class="row form-group">
           <fieldset class="col-12">
-            <h3 class="grw-modal-head pb-2">{{ t('template.modal_label.Create template under', templateParentPath) }}</h3>
+            <h3 class="grw-modal-head pb-2">{{ t('template.modal_label.Create template under') }}<br><code>{{ templateParentPath }}</code></h3>
             <div class="d-flex create-page-input-container">
               <div class="create-page-input-row d-flex align-items-center">