Merge pull request #85 from weseek/master

release v1.1.11

CHANGES.md

@@ -1,6 +1,11 @@
 CHANGES
 ========
 
+## 1.1.11
+
+* Fix: omit comment form from page_list (crowi-plus Enhanced Layout)
+* Fix: .search-box is broken on sm/xs screen
+
 ## 1.1.10
 
 * Fix: .search-box is broken on sm/xs screen

README.md

@@ -3,7 +3,9 @@
 <p align="center">
   <a href="https://heroku.com/deploy"><img src="https://www.herokucdn.com/deploy/button.png"></a>
 </p>
-
+<p align="center">
+  <a href="https://demo.crowi-plus.org">Demo Site</a>
+</p>
 
 crowi-plus [![Chat on Slack](https://crowi-plus-slackin.weseek.co.jp/badge.svg)][slackin]
 ===========
@@ -27,6 +29,7 @@ This is **crowi-plus** that is the fork of [Crowi][crowi], is [perfectly compati
   * [Multiple sites example](https://github.com/weseek/crowi-plus-docker-compose/tree/master/examples/multi-app)
   * [HTTPS(with Let's Encrypt) proxy integration example](https://github.com/weseek/crowi-plus-docker-compose/tree/master/examples/https-portal)
 * [Added miscellaneous features](https://github.com/weseek/crowi-plus/wiki/Additional-Features)
+* Support for IE11 (Experimental)
 * Developer-friendly
   * Less compile time
   * LiveReload separately available by server/client code change
@@ -38,8 +41,8 @@ Quick Start for Production
 Using Heroku
 ------------
 
-1. go to https://heroku.com/deploy
-1. input INSTALL_PLUGINS to install plugins
+1. Go to https://heroku.com/deploy
+1. (Optional) Input INSTALL_PLUGINS to install plugins
 
 Using docker-compose
 ---------------------

lib/views/crowi-plus/base/page_list_nosidebar.html

@@ -40,3 +40,16 @@
 </div>
 
 {% endblock %} {# layout_main #}
+
+
+{% block footer %}
+  {% parent %}
+  <div class="system-version">
+    <span>
+      <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
+    </span>
+    <span>
+      <a href="" data-target="#help-modal" data-toggle="modal"><i class="fa fa-question-circle"></i> {{ t('Help') }}</a>
+    </span>
+  </div>
+{% endblock %}

lib/views/crowi-plus/base/page_nosidebar.html

@@ -40,3 +40,16 @@
 </div>
 
 {% endblock %} {# layout_main #}
+
+
+{% block footer %}
+  {% parent %}
+  <div class="system-version">
+    <span>
+      <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
+    </span>
+    <span>
+      <a href="" data-target="#help-modal" data-toggle="modal"><i class="fa fa-question-circle"></i> {{ t('Help') }}</a>
+    </span>
+  </div>
+{% endblock %}

lib/views/crowi-plus/base/user_page_nosidebar.html

@@ -62,3 +62,16 @@
 </div>
 
 {% endblock %} {# layout_main #}
+
+
+{% block footer %}
+  {% parent %}
+  <div class="system-version">
+    <span>
+      <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
+    </span>
+    <span>
+      <a href="" data-target="#help-modal" data-toggle="modal"><i class="fa fa-question-circle"></i> {{ t('Help') }}</a>
+    </span>
+  </div>
+{% endblock %}

lib/views/crowi-plus/page_list.html

@@ -41,7 +41,3 @@
     </div>
   </div>
 {% endblock %}
-
-{% block content_main_after %}
-  {% include 'widget/comments.html' %}
-{% endblock %}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "1.1.10-RC",
+  "version": "1.1.11-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",

resource/css/_layout.scss

@@ -13,15 +13,9 @@
       border-radius: 0;
       border: none;
       margin-bottom: 0;
-      display: flex;
 
       box-shadow: 0 3px 10px 0px rgba(0,0,0,.3);
 
-      .navbar-header {
-        flex-grow: 1;
-        display: flex;
-      }
-
       .navbar-brand {
         font-weight: bold;
         img {
@@ -59,7 +53,7 @@
       }
 
       .navbar-toggle {
-        margin-left: 15px;
+        position: absolute;
         top: 0;
         right: 0;
       }

resource/css/_layout_crowi-plus.scss

@@ -2,4 +2,21 @@
   .main-crowi-plus-customized .content-main {
     padding: 0;
   }
+
+  .system-version {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    opacity: .6;
+
+    > span {
+      margin-left: .5em;
+    }
+  }
+
+  @media (max-width: $screen-sm-max) {
+    .system-version {
+      display: none;
+    }
+  }
 }

resource/css/_search.scss

@@ -26,45 +26,7 @@
 }
 
 .search-top {
-  flex-grow: 1;
-  display: flex;
-
-  %flexgrow {
-    flex-grow: 1;
-    display: flex;
-  }
-
-  // set flex-grow
-  .search-box {
-    @extend %flexgrow;
-    .form-group {
-      @extend %flexgrow;
-    }
-    .input-group {
-      @extend %flexgrow;
-    }
-  }
-
   .search-top-input-group {
-
-    // using react-bootstrap-typeahead
-    // see: https://github.com/ericgio/react-bootstrap-typeahead
-    .bootstrap-typeahead {
-      @extend %flexgrow;
-      max-width: 480px;
-
-      .bootstrap-typeahead-input {
-        @extend %flexgrow;
-        input {
-          @extend %flexgrow;
-        }
-      }
-
-    }
-    .input-group-btn {
-      flex-basis: 39px;
-    }
-
     .search-top-clear {
       position: absolute;
       right: 40px;
@@ -157,10 +119,10 @@
 }
 
 // Smartphone and Tablet
-@media (max-width: $screen-sm-max) {
+@media (max-width: $screen-xs-max) {
   .search-top {
+    margin-top: 4px 0 0 0;
     padding: 0;
-    margin-right: 0;
     border-style: none !important;
     box-shadow: none !important;
     -webkit-box-shadow: none !important;
@@ -181,13 +143,30 @@
   }
 }
 
-// Smartphone
-@media (max-width: $screen-xs-max) {
-  .search-top {
-    .search-top-input-group {
-      .btn {
-        z-index: 10;
-      }
+.search-top .search-form {
+  @media (min-width: $screen-sm-max) {
+    // using react-bootstrap-typeahead
+    // see: https://github.com/ericgio/react-bootstrap-typeahead
+    .bootstrap-typeahead-input input {
+      width: 500px;
     }
   }
+  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+    background-color: #0f0;
+    // using react-bootstrap-typeahead
+    // see: https://github.com/ericgio/react-bootstrap-typeahead
+    .bootstrap-typeahead-input input {
+      width: 270px;
+    }
+  }
+  @media (min-width: $screen-xs-min) and (max-width: $screen-xs-max) {
+    width: 70%;
+  }
+  @media (min-width: $screen-xs-min*2/3) and (max-width: $screen-xs-min) {
+    width: 58%;
+  }
+  @media (max-width: $screen-xs-min*2/3) {
+    width: 40%;
+    min-width: 120px;
+  }
 }