Merge pull request #93 from Open-MBEE/release/3.4.0

Release/3.4.0

Gruntfile.js

@@ -64,7 +64,7 @@ module.exports = function(grunt) {
         proxies: [
           {
             context: '/mms-ts',
-            host: 'cae-ts-test.jpl.nasa.gov',//'localhost',//'100.64.243.161',
+            host: 'mms-ts-uat.jpl.nasa.gov',//'localhost',//'100.64.243.161',
             port: 8080
           },
           {
@@ -78,6 +78,7 @@ module.exports = function(grunt) {
       };
     }
   }
+
   var combineCustomJS = {
         options: {
             banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */\n',
@@ -290,6 +291,7 @@ module.exports = function(grunt) {
         reporterOutput: '',
         evil: true, //allow eval for plot integration
         globalstrict: true,
+        validthis: true,
         globals: {
           angular: true,
           window: true,
@@ -355,7 +357,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.3.2',
+            version: '3.4.0',
             path: 'deploy/'
           }]
         }
@@ -372,7 +374,6 @@ module.exports = function(grunt) {
         }
     },
 
-
     protractor: {
       options: {
         keepAlive: true, // If false, the grunt process stops when the test fails.
@@ -445,7 +446,6 @@ module.exports = function(grunt) {
   grunt.registerTask('launch', function(build, arg1) {
     if (arg1) {
       grunt.log.writeln("Launching server with proxy");
-
       grunt.task.run('configureProxies:' + arg1, 'connect:' + arg1);
     } else {
       grunt.log.writeln("Launching server with proxy API");
@@ -462,5 +462,5 @@ module.exports = function(grunt) {
   grunt.registerTask('e2e',function(arg1) {
     grunt.log.writeln("Launching Protractor");
     grunt.task.run('e2e-test');
-  })
+  });
 };

GruntfileMms.js

@@ -4,6 +4,21 @@
 module.exports = function(grunt) {
     require('jit-grunt')(grunt);
 
+    var combineCustomJS = {
+        options: {
+            banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */\n',
+                wrap: 'mms',
+                mangle: true,
+                sourceMap: {
+                includeSources: true
+            }
+        },
+        files: {
+            'dist/mms.js': ['src/mms.js', 'src/services/*.js'],
+            'dist/mms.directives.js': ['src/mms.directives.js', 'src/directives/**/*.js']
+        }
+  };
+
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
 
@@ -28,6 +43,12 @@ module.exports = function(grunt) {
                 dest: 'dist/temp/js/mms.directives.tpls.js'
             }
         },
+
+        // concat only (no minification )
+        concat: {
+            combineCustomJS: combineCustomJS
+        },
+
         uglify: {
             options: {
                 banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */\n',
@@ -65,5 +86,5 @@ module.exports = function(grunt) {
         clean: ['dist/temp']
     });
 
-    grunt.registerTask('default', ['html2js', 'uglify', 'clean']);
+    grunt.registerTask('default', ['html2js', 'concat', 'clean']);
 };

app/assets/styles/ve/layout/_pane-center.scss

@@ -72,32 +72,19 @@ tr {
 .container-tree-reorder {
   margin-bottom: 24px;
 
-  .tree-reorder {
-    margin: 0 auto;
-    padding-top: 12px;
-    padding-bottom: 24px;
-    clear: both;
-    border: 1px solid $ve-silver-darker-1;
-    border-radius: 3px;
-    background-color: $ve-silver-lighter-1;
-    padding: 8px;
-    margin: 18px 0;
-  }
-
+  /*Float reorder buttons to the right */
   .btn-tree-reorder-save {
     float: right;
     margin-top: 24px;
     margin-right: 8px;
-    padding-left: 27px;
-    padding-right: 27px;
   }
 
   .angular-ui-tree-handle {
     font-family: $font-family-sans-serif;
-    color:$ve-slate-base;
-    padding:4px 6px;
+    color: $ve-slate-base;
+    padding: 4px 6px;
     border-radius: 2px;
-    font-weight:bold;
+    font-weight: bold;
     -webkit-transition: background-color .1s ease-out !important;
     -moz-transition: background-color .1s ease-out !important;
     -o-transition: background-color .1s ease-out !important;
@@ -129,6 +116,7 @@ tr {
     background-color:transparent;
   }
 
+  /*Add blue dotted line to visual feedback of where the item will be placed*/
   .angular-ui-tree-placeholder:before{
     background-image: url(../assets/location-feedback.svg);
     content: ' ';
@@ -171,3 +159,9 @@ tr {
     color: lighten($ve-accent, 24%);
   }
 }
+
+
+/* Overwrite angularjs bootstrap's popuover so that the popover's container expands with its content */
+.popover {
+  max-width: none;
+}

app/assets/styles/ve/layout/_pane-left.scss

@@ -44,7 +44,7 @@ $pane_left_btn_group_width: 244px;
       border-bottom: 1px solid $ve-silver-darker-1;
 
       .ve-plain-input{
-        margin: 0;
+        margin: 0 2px;
         border-color: $ve-silver-darker-1;
       }
 

app/assets/styles/ve/layout/_pane-right.scss

@@ -63,4 +63,59 @@
       }
     }
   }
-}
+}
+
+.htmlDiff {
+
+  [class*="patcher-"] {
+    position: relative;
+  }
+
+  [class*="patcher-"]:not(td):not(tr) {
+    display: inline-block;
+  }
+
+  .patcher-text-insertion, .patcher-text-deletion {
+    display: inline !important;
+  }
+
+  [class*="patcher-"]:not(.patcher-text-diff)::before {
+    position: absolute;
+    z-index: 1;
+    top: -8px;
+    right: -8px;
+    content: ' ';
+    background-size: 16px;
+    height: 16px;
+    width: 16px;
+    background-repeat: no-repeat;
+  }
+
+  /*Green background to additions*/
+  .patcher-replaceIn, .patcher-attribute-replace-in, .patcher-insert, .patcher-text-insertion {
+    background-color: #dafde0;
+  }
+
+  /*Plus sign and green border to non textual changes*/
+  .patcher-replaceIn, .patcher-attribute-replace-in, .patcher-insert {
+    &::before{
+      background-image: url(../assets/insert.svg);
+    }
+    border: 2px dashed #abffb9;
+  }
+
+  /*Strikethrough and red background to deletions*/
+  .patcher-replaceOut, .patcher-delete, .patcher-attribute-replace-out, .patcher-text-deletion {
+    background-color: #ffe3e3;
+    text-decoration: rgba(255, 0, 0, 0.4) line-through; /* Ignored in CSS1/CSS2 UAs */
+    -webkit-text-decoration: rgba(255, 0, 0, 0.4) line-through; /* Ignored in CSS1/CSS2 UAs */
+  }
+
+  /*Delete icon and dotted red border to non textual deletions*/
+  .patcher-replaceOut, .patcher-delete, .patcher-attribute-replace-out {
+    &::before{
+      background-image: url(../assets/delete.svg);
+    }
+    border: 2px dashed #ffb6b6;
+  }
+}

app/assets/styles/ve/layout/_ve-nav.scss

@@ -266,8 +266,9 @@ nav.project-level-header {
 
       a{
         padding: 0 7px 0 5px;
+        max-width: 100%;
 
-      /*Hover state over links to show it's clickable*/
+        /*Hover state over links to show it's clickable*/
         &:hover{
           text-decoration: underline;
         }
@@ -286,7 +287,7 @@ nav.project-level-header {
     .back-to-proj{
       font-size: 1.2em;
       top: .05em;
-      position: relative;    
+      position: relative;
     }
   }
 }
@@ -316,14 +317,14 @@ nav.project-level-header {
   }
 }
 
-/*Hide all but the first 2 breadcrumbs and add */
+/*Hide all but the last 2 breadcrumbs */
 @media (max-width: 1000px) and (min-width: 700px){
   .breadcrumbs{
-    li:nth-child(3):after{
-      content: "\203A ...";
-    }
+    // li:nth-child(2):after{
+    //   content: "\203A ...";
+    // }
 
-    li:nth-child(2){
+    li:nth-last-child(-n+2) {
       a, span{
         display: inline-block;
       }
@@ -334,10 +335,15 @@ nav.project-level-header {
 /*Add an ellipsis after the home to show there's more */
 @media (max-width: 700px){
   .breadcrumbs{
-    li:nth-child(2):after{
-      content: "\203A ...";
+    li:nth-last-child(2){
+      a, span{
+        display: inline-block;
+      }
     }
   }
+  .navbar-right {
+    display: none;
+  }
 }