Merge pull request #98 from weseek/master

release v1.2.3

.github/ISSUE_TEMPLATE.md

@@ -20,7 +20,7 @@ How to reproduce? (再現手順)
 1. process 3
 
 
-What's happen? (症状)
+What happens? (症状)
 ---------------------
 
 - symptom

CHANGES.md

@@ -1,6 +1,12 @@
 CHANGES
 ========
 
+## 1.2.3
+
+* Improvement: Ensure to be enabled to use Presentation Mode even when not logged in
+* Improvement: Presentation Mode on IE11 (Experimental)
+* Fix: Broken Presentation Mode
+
 ## 1.2.2
 
 * Support: Merge official Crowi (master branch)

README.md

@@ -58,11 +58,19 @@ see also [weseek/crowi-plus-docker-compose][docker-compose]
 On-premise
 ----------
 
-## Dependencies
+### Dependencies
 
 - node 6.x (DON'T USE 7.x)
 - npm 4.x
 - yarn
+- MongoDB 3.x
+
+#### Optional Dependencies
+
+- Redix 3.x
+- ElasticSearch 5.x
+  - Japanese (kuromoji) Analysis plugin
+  - ICU Analysis Plugin
 
 ### Start
 
@@ -70,7 +78,16 @@ On-premise
 git clone https://github.com/weseek/crowi-plus.git
 cd crowi-plus
 yarn
-MONGO_URI=mongodb://example.com/crowi npm start
+MONGO_URI=mongodb://MONGO_HOST:MONGO_PORT/crowi npm start
+```
+
+If you use Redis and ElasticSearch, add environment variables before `npm start` like following:
+
+```
+export MONGO_URI=mongodb://MONGO_HOST:MONGO_PORT/crowi
+export REDIS_URL=redis://REDIS_HOST:REDIS_PORT/crowi
+export ELASTICSEARCH_URI=http://ELASTICSEARCH_HOST:ELASTICSEARCH_PORT/crowi
+npm start
 ```
 
 ### Install plugins
@@ -89,7 +106,7 @@ npm start
 
 ## Other documents
 
-More info are [here](https://github.com/crowi/crowi/wiki/Install-and-Configuration).
+More info are [here](https://github.com/crowi/crowi/wiki/Install-and-Configuration#env-parameters).
 
 Getting Started to Develop
 ==========================
@@ -185,7 +202,7 @@ and help you to craft the change so that it is successfully accepted into the pr
 Language
 ---------
 
-Write issues and PRs in Engulish or Japanese.
+Write issues and PRs in English or Japanese.
 
 Discussion
 -----------

config/webpack.common.js

@@ -100,6 +100,7 @@ module.exports = function (options) {
       new webpack.ProvidePlugin({
         jQuery: "jquery",
         $: "jquery",
+        hljs: "reveal.js/plugin/highlight/highlight",
       }),
 
       // omit moment/locale/*.js

lib/views/page.html

@@ -138,7 +138,6 @@
       </a>
       <ul class="dropdown-menu">
        <li><a href="#" data-target="#renamePage" data-toggle="modal"><i class="fa fa-share"></i> {{ t('Move') }}</a></li>
-       <li><a href="?presentation=1" class="toggle-presentation"><i class="fa fa-arrows-alt"></i> {{ t('Presentation Mode') }} (beta)</a></li>
        {% if isDeletablePage() %}
        <li class="divider"></li>
        <li class=""><a href="#" data-target="#deletePage" data-toggle="modal"><i class="fa fa-trash-o text-danger"></i> {{ t('Delete') }}</a></li>
@@ -148,6 +147,7 @@
     {% if page %}
     <li class="pull-right"><a href="#revision-history" data-toggle="tab"><i class="fa fa-history"></i> History</a></li>
     {% endif %}
+    <li class="pull-right"><a href="?presentation=1" class="toggle-presentation"><i class="fa fa-film"></i> {{ t('Presentation Mode') }}</a></li>
   </ul>
   {% endif %}
 

lib/views/page_presentation.html

@@ -6,6 +6,17 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
+    <!-- polyfills for IE11 -->
+    <script>
+      var userAgent = window.navigator.userAgent.toLowerCase();
+      if (userAgent.indexOf('msie') != -1 || userAgent.indexOf('trident') != -1) {
+        var scriptElement = document.createElement('script');
+        scriptElement.src = 'https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.23.0/polyfill.min.js';
+        var headElement = document.getElementsByTagName('head')[0];
+        headElement.appendChild(scriptElement);
+      }
+    </script>
+
     <!-- jQuery -->
     <script src="//cdn.jsdelivr.net/jquery/3.2.1/jquery.min.js"></script>
 
@@ -20,6 +31,13 @@
     <script src="{{ webpack_asset('legacy-presentation').js }}" defer></script>
 
     <title>{{ path|path2name }} | {{ path }}</title>
+
+    <!-- Google Fonts -->
+    <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
+
+    <style>
+      {{ customCss() }}
+    </style>
   </head>
   <body>
     <div class="reveal">

locales/en-US/translation.json

@@ -28,7 +28,7 @@
 
   "List View": "List",
   "Timeline View": "Timeline",
-  "Presentation Mode": "Presentation Mode",
+  "Presentation Mode": "Presentation",
 
   "Created": "Created",
   "Last updated": "Updated",

locales/ja/translation.json

@@ -28,7 +28,6 @@
 
   "List View": "リスト表示",
   "Timeline View": "タイムライン表示",
-  "Presentation Mode": "プレゼンモード",
 
   "Created": "作成日",
   "Last updated": "最終更新",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "1.2.2-RC",
+  "version": "1.2.3-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",
@@ -111,7 +111,7 @@
     "react-clipboard.js": "^1.0.1",
     "react-dom": "^15.5.0",
     "redis": "^2.7.1",
-    "reveal.js": "~3.4.0",
+    "reveal.js": "^3.5.0",
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.3",
     "socket.io": "~1.7.0",

resource/css/_layout.scss

@@ -1,5 +1,4 @@
 .crowi { // {{{
-  font-family: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
   h1, h2, h3, h4, h5, h6 {
     font-weight: 500;
   }

resource/css/_utilities.scss

@@ -56,9 +56,9 @@ $link-hover-color:      darken($link-color, 15%);
 // // Typography
 // // -------------------------
 //
-// $font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif:  Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
 // $font-family-serif:       Georgia, "Times New Roman", Times, serif;
-// $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+$font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", MeiryoKe_Console, monospace;
 // $font-family-base:        $font-family-sans-serif;
 //
 // $font-size-base:          14px;

resource/css/crowi-reveal.scss

@@ -1,7 +1,10 @@
+// import crowi variable
+@import 'utilities';
+
 .reveal {
   font-size: 32px;
   section * {
-    font-family: "Lucida Grande", "Hiragino Kaku Gothic Pro W3", Meiryo, san-serif;
+    font-family: $font-family-sans-serif !important;
   }
 
   .slides > section {

resource/js/legacy/crowi-presentation.js

@@ -17,6 +17,9 @@ Reveal.initialize({
   center: true,
   transition: 'slide',
 
+  //// This specification method can't be used
+  ////   sice deleting symlink prevented `src` from being resolved -- 2017.06.15 Yuki Takei
+  //
   // Optional libraries used to extend on reveal.js
   // dependencies: [
   //   { src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
@@ -35,6 +38,10 @@ require.ensure([], () => {
   require('reveal.js/plugin/highlight/highlight.js');
   require('reveal.js/plugin/zoom-js/zoom.js');
   require('reveal.js/plugin/notes/notes.js');
+
+  // fix https://github.com/weseek/crowi-plus/issues/96
+  Reveal.slide(0,0);
+  Reveal.sync();
 })
 
 Reveal.addEventListener('ready', function(event) {