Merge branch 'master' into feature/no-cdn-mode

resource/locales/en-US/welcome.md

@@ -3,7 +3,7 @@
 [![GitHub Releases](https://img.shields.io/github/release/weseek/growi.svg)](https://github.com/weseek/growi/releases/latest)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
 
-<div class="panel panel-default">
+<div class="panel panel-primary">
   <div class="panel-heading">Tips</div>
   <div class="panel-body"><ul>
     <li>Ctrl(⌘)-/ to show quick help</li>

resource/locales/ja/welcome.md

@@ -3,7 +3,7 @@
 [![GitHub Releases](https://img.shields.io/github/release/weseek/growi.svg)](https://github.com/weseek/growi/releases/latest)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
 
-<div class="panel panel-default">
+<div class="panel panel-primary">
   <div class="panel-heading">Tips</div>
   <div class="panel-body"><ul>
     <li>Ctrl(⌘)-/ でショートカットヘルプを表示します</li>

src/client/styles/agile-admin/inverse/colors/christmas.scss

@@ -12,12 +12,12 @@ $linktext: lighten(#0d5901, 5%);
 $linktext-hover: lighten($linktext, 12%);
 $sidebar-text: #ffffff;
 $primary: $themecolor;
-$info: lighten($themecolor, 10%);
 $logo-mark-fill: lighten(desaturate($topbar, 50%), 50%);
 $wikilinktext: lighten($themecolor, 5%);
 $wikilinktext-hover: lighten($wikilinktext, 15%);
 $inline-code-color: darken($subthemecolor, 5%);
 $inline-code-bg: lighten($subthemecolor, 70%);
+$border-original: $border;
 $border: $subthemecolor;
 $navbar-border: $themecolor;
 $active-nav-tabs-bgcolor: white;
@@ -59,7 +59,7 @@ $active-nav-tabs-bgcolor: white;
 
 #wrapper > .navbar > .navbar-header {
   background-image: url("/images/themes/christmas/christmas-navbar.jpg");
-  border-bottom: 3px solid $subthemecolor;
+  border-bottom: 4px solid $subthemecolor;
 }
 
 /*
@@ -106,7 +106,18 @@ body:not(.on-edit) .nav.nav-tabs {
 /*
  * Panel
  */
-.panel.panel-default {
+.panel {
+  &.panel-white, &.panel-default {
+    border-color: $border-original;
+    .panel-heading {
+        color: $dark;
+        background-color: $border-original;
+        border-bottom:1px solid $border-original;
+    }
+  }
+}
+
+.panel.panel-primary {
   border-color: #bd3425;
   .panel-heading {
     color: white;

src/client/styles/agile-admin/inverse/widgets.scss

@@ -1293,11 +1293,12 @@ background:$white;
   box-shadow: none !important;
 }
 }
-
+/*
 .input-group-addon {
 border-radius: $radius;
 border: 1px solid $border;
 }
+*/
 /*
 .input-daterange input:first-child, .input-daterange input:last-child{border-radius:$radius;}
 */

src/server/routes/page.js

@@ -597,9 +597,6 @@ module.exports = function(crowi, app) {
       options.grantUserGroupId = grantUserGroupId;
     }
 
-    // store previous revision
-    const previousRevision = page.revision;
-
     try {
       page = await Page.updatePage(page, pageBody, req.user, options);
     }
@@ -622,6 +619,8 @@ module.exports = function(crowi, app) {
 
     // user notification
     if (isSlackEnabled && slackChannels != null) {
+      const Revision = crowi.model('Revision');
+      const previousRevision = await Revision.findById(page.revision);
       await notifyToSlackByUser(page, req.user, slackChannels, 'update', previousRevision);
     }
   };