Merge branch 'master' into SWIK-1287_TranslationUI

actions/activityfeed/loadActivities.js

@@ -30,6 +30,16 @@ export default function loadActivities(context, payload, done) {
         // context.dispatch('UPDATE_PAGE_TITLE', {
         //     pageTitle: pageTitle
         // });
-        done();
+        if (payload.params.stype !== 'deck')
+            return done();
+        context.service.read('presentation.live', {id: payload.params.sid}, {timeout: 20 * 1000}, (err, res) => {
+            if (err) {
+                log.error(context, {filepath: __filename});
+                context.executeAction(serviceUnavailable, payload, done);
+            } else {
+                context.dispatch('LOAD_PRESENTATIONS_SUCCESS', res);
+            }
+            done();
+        });
     });
 }

actions/decktree/moveTreeNode.js

@@ -1,4 +1,5 @@
 import UserProfileStore from '../../stores/UserProfileStore';
+import addActivity from '../activityfeed/addActivity';
 const log = require('../log/clog');
 
 export default function moveTreeNode(context, payload, done) {
@@ -42,6 +43,15 @@ export default function moveTreeNode(context, payload, done) {
                 context.dispatch('MOVE_TREE_NODE_FAILURE', err);
             } else {
                 context.dispatch('MOVE_TREE_NODE_SUCCESS', payload);
+
+                let activity = {
+                    activity_type: 'move',
+                    user_id: String(userid),
+                    content_name: res.title,
+                    content_id: String(res.id),
+                    content_kind: res.type
+                };
+                context.executeAction(addActivity, {activity: activity});
             }
             done(null, res);
         });

actions/slide/loadSlideView.js

@@ -10,6 +10,10 @@ export default function loadSlideView(context, payload, done) {
         context.executeAction(slideIdTypeError, payload, done);
         return;
     }
+    console.log('send to load');
+    context.dispatch('LOAD_SLIDE_CONTENT_LOAD', {loadingIndicator: 'true'});
+    //context.dispatch('LOAD_SLIDE_CONTENT_LOAD');
+    //console.log('get content');
 
     context.service.read('slide.content', payload, {timeout: 20 * 1000}, (err, res) => {
         if (err) {

assets/css/custom.css

@@ -40,7 +40,7 @@
   font-size: 20px;
   position: absolute;
   right: 0;
-  width: 200px;
+  width: 150px;
   height: 100vh;
 }
 
@@ -50,7 +50,7 @@
 
 .top-diff .reveal {
   position: relative;
-  width: calc(100% - 200px);
+  width: calc(100% - 150px);
 }
 
 .top-diff .reveal .slides {
@@ -84,6 +84,8 @@
 
 .top-diff .inlineContent {
   padding: 2%;
+  display: flex;
+  flex-direction: column;
 }
 
 @media screen and (max-width: 900px) {
@@ -100,60 +102,76 @@
    .top-diff .helpers {
      width: 100vw;
      position: relative;
-     height: 180px;
-     background-color: rgba(255,153,0,0.2);
-   }
-
-   .top-diff .helpers .inlineContent {
-     display: flex;
-     flex-direction: column;
-   }
-
-   .top-diff .helpers .checkbox {
-     flex: 1;
-   }
-
-   .top-diff .helpers .diff-header {
-     display: none
+     height: 240px;
    }
 
  }
 
 /* HTML DOM Node related */
-.diff-view .added, .modified, .deleted {
-  padding: 5px;
+.diff-view .added,
+.diff-view .modified,
+.diff-view .deleted {
+  padding: 5px 5px 5px 5px;
   margin: 0px -10px;
   display: inline-block;
+  position: relative;
+}
+
+.diff-view .added::before,
+.diff-view .modified::before,
+.diff-view .deleted::before {
+  color: rgba(0,0,0,0.8);
+  position: absolute;
+  font-size: 20px;
+  right: 5px;
+  top: -3px;
+  font-weight: 700;
+}
+
+.diff-view ul, .diff-view ol {
+  display: flex;
+  flex-direction: column;
+}
+
+.diff-view ul .added,
+.diff-view ul .modified,
+.diff-view ul .deleted {
+  display: inline-table !important;
 }
 
 .diff-view p {
   margin: 1em;
 }
 
 .diff-view .added {
-  border: 5px solid #93ca3b;
-  background-color: rgba(147,202,59,0.2);
+  border: 2px solid #2196F3;
+  background-color: rgba(0, 188, 212,0.2);
 }
+.diff-view .added::before { content: "+" }
+
 .diff-view .modified {
-  border: 5px solid #FFCC00;
-  background-color: rgba(255,204,0,0.1);
+  border: 2px solid #FFCC00;
+  background-color: rgba(255,204,0,0.2);
 }
+.diff-view .modified::before { content: "+/-" }
+
 .diff-view .deleted {
-  border: 5px solid #ff0030;
-  background-color: rgba(255,0,48,0.1);
+  border: 2px solid #ff0030;
+  background-color: rgba(255,0,48,0.2);
 }
+.diff-view .deleted::before { content: "x" }
 
 .diff-view.inverse .added {
-  border: 5px solid #2ecc71;
+  border: 2px solid #2ecc71;
   background-color: rgba(46,204,113,0.2);
 }
 .diff-view.inverse .modified {
-  border: 5px solid #FF9800;
-  background-color: rgba(255,152,0,0.1);
+  border: 2px solid #FF9800;
+  background-color: rgba(255,152,0,0.2);
 }
 .diff-view.inverse .deleted {
-  border: 5px solid #9C27B0;
-  background-color: rgba(156,39,176,0.1);
+  border: 2px solid #9C27B0;
+  background-color: rgba(156,39,176,0.2);
 }
 
 /* Text related */
@@ -171,12 +189,20 @@
   line-height: 32px;
 }
 
-.diff-view.hide-add .added, .diff-view.hide-mod .modified, .diff-view.hide-del .deleted  {
-  border: 5px solid transparent;
+.diff-view.hide-add .added,
+.diff-view.hide-mod .modified,
+.diff-view.hide-del .deleted  {
+  border: 2px solid transparent;
   background-color: transparent;
 }
+.diff-view.hide-add .added::before,
+.diff-view.hide-mod .modified::before,
+.diff-view.hide-del .deleted::before {
+  display: none;
+}
 
-.diff-view.hide-text .ins, .diff-view.hide-text .del{
+.diff-view.hide-text .ins,
+.diff-view.hide-text .del{
   color: #333;
   background-color: transparent;
   text-decoration: none;