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

WIP: reconstruct layouts

* create portal
Yuki Takei 8 лет назад
Родитель
Сommit
abc393346c

+ 1 - 1
lib/routes/page.js

@@ -168,7 +168,7 @@ module.exports = function(crowi, app) {
     Page.hasPortalPage(path, req.user, req.query.revision)
     .then(function(portalPage) {
       renderVars.page = portalPage;
-      renderVars.isPortal = true;
+      renderVars.isPortal = (portalPage != null);
 
       if (portalPage) {
         renderVars.revision = portalPage.revision;

+ 19 - 0
lib/views/widget/page_tabs.html

@@ -49,4 +49,23 @@
   <li class="pull-right"><a href="?presentation=1" class="toggle-presentation"><i class="icon-film"></i> {{ t('Presentation Mode') }}</a></li>
 
 </ul>
+
+{% else %} {# for creating portal #}
+
+<ul class="nav nav-tabs nav-tabs-create-portal hidden-print">
+
+  <li class="nav-main-left-tab">
+    <a id="portal-form-close" href="#">
+      <i class="icon-action-undo"></i> {{ t('Cancel') }}
+    </a>
+  </li>
+
+  <li class="nav-main-left-tab active">
+    <a>
+      <i class="icon-note"></i> {{ t('Create') }}
+    </a>
+  </li>
+
 {% endif %}
+
+</ul>

+ 0 - 4
resource/js/legacy/crowi.js

@@ -371,9 +371,7 @@ $(function() {
   });
 
   $('#create-portal-button').on('click', function(e) {
-    $('.portal').removeClass('hide');
     $('body').addClass('on-edit');
-    $('.portal a[data-toggle="tab"][href="#edit-form"]').tab('show');
 
     var path = $('.content-main').data('path');
     if (path != '/' && $('.content-main').data('page-id') == '') {
@@ -386,9 +384,7 @@ $(function() {
     }
   });
   $('#portal-form-close').on('click', function(e) {
-    $('.portal').addClass('hide');
     $('body').removeClass('on-edit');
-
     return false;
   });
 

+ 12 - 0
resource/styles/scss/_on-edit.scss

@@ -8,6 +8,7 @@ body.on-edit {
   .row.not-found-message-row,
   .users-meta,
   .user-page-content-container,
+  .portal-form-button,
   .alert-info.alert-moved,
   .alert-info.alert-unlinked,
   .like-button, .bookmark-link, .btn-edit,
@@ -270,6 +271,17 @@ body.on-edit {
   }
 } // }}}
 
+/*
+ * for creating portal
+ */
+.nav-tabs-create-portal {
+  display: none;
+}
+.on-edit .nav-tabs-create-portal {
+  display: block;
+}
+
+
 /*
 .crowi.main-container .main .page-list.content-main { // {{{ Edit Form of Page List