Merge branch 'release/3.2.1'

# Conflicts: # Gruntfile.js # app/js/mms/directives/veNav.js
Open-MBEE · Nov 10, 2017 · 2aab824 · 2aab824
2 parents 6492840 + 3e799ed
commit 2aab824
Show file tree

Hide file tree

Showing 638 changed files with 5,454 additions and 16,007 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -2,12 +2,11 @@ var proxySnippet = require('grunt-connect-proxy/lib/utils').proxyRequest;
 
 module.exports = function(grunt) {
 
-  var jsFiles = ['app/js/**/*.js', 'src/**/*.js'];
+  var jsFiles = ['app/js/**/*.js', 'src/directives/**/*.js', 'src/services/*.js'];
 
   var artifactoryUrl = grunt.option('ARTIFACTORY_URL');
   var artifactoryUser = grunt.option('ARTIFACTORY_USER');
   var artifactoryPassword = grunt.option('ARTIFACTORY_PASSWORD');
-  var servers = grunt.file.readJSON('angular-mms-grunt-servers.json');
   var connectObject = {
     'static': {
       options: {
@@ -24,40 +23,44 @@ module.exports = function(grunt) {
         }
     }};
 
-  // Set proxie info for server list
-  for (var key in servers) {
-    var serverPort = 443;
-    var serverHttps = true;
-    if (key == "localhost") {
-       serverPort = 8080;
-       serverHttps = false;
-    }
-    connectObject[key] = {
-        options: {
-          hostname: '*',
-          port: 9000,
-          open: true,
-          base: '/mms.html',
-          livereload: true,
-          middleware: function(connect) {
-            return [proxySnippet];
-          }
-        },
-        proxies: [
-          {
-            context: '/alfresco',  // '/api'
-            host: servers[key],
-            changeOrigin: true,
-            https: serverHttps,
-            port: serverPort
+  if (grunt.file.exists('angular-mms-grunt-servers.json')) {
+    var servers = grunt.file.readJSON('angular-mms-grunt-servers.json');
+
+    // Set proxie info for server list
+    for (var key in servers) {
+      var serverPort = 443;
+      var serverHttps = true;
+      if (key == "localhost") {
+        serverPort = 8080;
+        serverHttps = false;
+      }
+      connectObject[key] = {
+          options: {
+            hostname: '*',
+            port: 9000,
+            open: true,
+            base: '/mms.html',
+            livereload: true,
+            middleware: function(connect) {
+              return [proxySnippet];
+            }
           },
-          {
-            context: '/',
-            host: 'localhost',
-            port: 9001
-          }
-        ]
-    };
+          proxies: [
+            {
+              context: '/alfresco',  // '/api'
+              host: servers[key],
+              changeOrigin: true,
+              https: serverHttps,
+              port: serverPort
+            },
+            {
+              context: '/',
+              host: 'localhost',
+              port: 9001
+            }
+          ]
+      };
+    }
   }
 
   // Project configuration.
@@ -183,8 +186,8 @@ module.exports = function(grunt) {
     sass: {
       dist : {
         files: {
-          'dist/css/partials/mms.css': 'src/directives/templates/styles/mms-main.scss',
-          'dist/css/partials/ve-main.css': 'app/styles/ve/ve-main.scss'
+          'dist/css/partials/mms.css': 'src/assets/styles/mms-main.scss',
+          'dist/css/partials/ve-main.css': 'app/assets/styles/ve/ve-main.scss'
         }
       }
     },
@@ -223,7 +226,8 @@ module.exports = function(grunt) {
           //__timely: true,
           Blob: true,
           navigator: true,
-          eval: false
+          eval: false,
+          Set: true
         }
       }
     },
@@ -269,6 +273,12 @@ module.exports = function(grunt) {
           {expand: true, src: '**', cwd: 'dist', dest: 'build/'},
           {expand: true, src: '**', cwd: 'app', dest: 'build/'},
         ]
+      },
+      src: {
+        files:[
+          {expand: true, src: '**', cwd: 'src/assets', dest: 'build/assets/'},
+          {expand: true, src: '**', cwd: 'src/lib', dest: 'build/lib/'},
+        ]
       }
     },
 
@@ -286,7 +296,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: 'gov.nasa.jpl:evm:zip',
-            version: '3.2.0',
+            version: '3.2.1',
             path: 'deploy/'
           }]
         }
@@ -332,22 +342,22 @@ module.exports = function(grunt) {
         files: {
           // Target-specific file lists and/or options go here.
           'app/js': [ '**.js'],
-          'app': [ '*.html', 'partials/**', 'styles/**'],
+          'app': [ '*.html', 'partials/**', 'assets/styles/**'],
           'src/directives': [ '**.js', '**.html'],
-          'src/directives/templates/styles': [ 'base/**', 'components/**', 'layout/**'],
+          'src/assets/styles': [ 'base/**', 'components/**', 'layout/**'],
           'src/services': [ '**']
         },
       },
       'mms-app': {
         files: {
           'app/js': [ '**.js'],
-          'app': [ '*.html', 'partials/**', 'styles/**'],
+          'app': [ '*.html', 'partials/**', 'assets/styles/**'],
         },
       },
       'mms-directives': {
         files: {
           'src/directives': [ '**.js', '**.html'],
-          'src/directives/templates/styles': [ 'base/**', 'components/**', 'layout/**']
+          'src/assets/styles': [ 'base/**', 'components/**', 'layout/**']
         },
       },
       'mms-services': {

diff --git a/angular-mms-grunt-servers.json b/angular-mms-grunt-servers.json
diff --git a/app/styles/ve/base/_globals.scss → app/assets/styles/ve/base/_globals.scss b/app/styles/ve/base/_globals.scss → app/assets/styles/ve/base/_globals.scss
@@ -3,9 +3,9 @@
 *************************/
 
 /* MMS base styles */
-@import "../../../../src/directives/templates/styles/base/_mms-mixins.scss";
-@import "../../../../src/directives/templates/styles/base/_mms-typography.scss";
-@import "../../../../src/directives/templates/styles/base/_mms-colors.scss";
+@import "../../../../../src/assets/styles/base/_mms-mixins.scss";
+@import "../../../../../src/assets/styles/base/_mms-typography.scss";
+@import "../../../../../src/assets/styles/base/_mms-colors.scss";
 
 $background_hover_transition: background-color .2s linear;
 

diff --git a/app/styles/ve/base/_ve-colors.scss → app/assets/styles/ve/base/_ve-colors.scss b/app/styles/ve/base/_ve-colors.scss → app/assets/styles/ve/base/_ve-colors.scss
diff --git a/app/styles/ve/layout/_login-select.scss → ...ssets/styles/ve/layout/_login-select.scss b/app/styles/ve/layout/_login-select.scss → ...ssets/styles/ve/layout/_login-select.scss
diff --git a/app/styles/ve/layout/_pane-center.scss → ...assets/styles/ve/layout/_pane-center.scss b/app/styles/ve/layout/_pane-center.scss → ...assets/styles/ve/layout/_pane-center.scss
@@ -2,7 +2,7 @@
   Styles for the View Editor center pane
 *************************/
 
-$pane_center_btn_group_width: 120px;
+$pane_center_btn_group_width: 340px;
 
 /* start of fullDoc page styles */
 body.fullDoc {
@@ -28,6 +28,7 @@ tr {
 
   .pane-center {
     margin-right: 0;
+    padding-bottom: 30px;
   }
 
   .pane-center-spinner {
@@ -41,6 +42,10 @@ tr {
     padding-top: 9px;
     padding-right: 12px;
     min-width: $pane_center_btn_group_width;
+
+    .bordered-button-bar {
+      float: right;
+    }
   }
 
   .center-view {
@@ -64,9 +69,13 @@ tr {
   }
 
   .pane-center-inner {
-    padding-top: 9px;
+    padding-top: 14px;
+    padding-bottom:40px;
   }
 }
+@media (max-width: 720px) {
+
+}
 
 .container-tree-reorder {
   margin-bottom: 24px;
@@ -146,7 +155,6 @@ tr {
   > .pane-center {
     @include box-shadow(-4px 0px 2px -2px rgba(0, 0, 0, .24));
     margin-right: 0;
-
   }
 
   .pane-center-header,
@@ -184,8 +192,10 @@ tr {
 /* styling for doclib link to the right of the button bar*/
 
 .doclib-link {
-  margin: 5px 8px 5px 0;
-  float:right;
+  margin: 0 4px;
+  line-height: 1.1;
+  padding-top: 9px;
+  float: left;
 
   img{
     padding-right:5px;

diff --git a/app/styles/ve/layout/_pane-left.scss → app/assets/styles/ve/layout/_pane-left.scss b/app/styles/ve/layout/_pane-left.scss → app/assets/styles/ve/layout/_pane-left.scss
@@ -2,7 +2,7 @@
   Styles for the View Editor left pane
 *************************/
 
-$pane_left_btn_group_width: 150px;
+$pane_left_btn_group_width: 240px;
 
 #main-pane {
   > .west-tabs {
@@ -23,9 +23,8 @@ $pane_left_btn_group_width: 150px;
   width: 100%;
 
   .pane-left {
-    // TODO -This was originally commented, uncommented to make styles work for diff/merge area
-    // height: 100%;
     width: 100%;
+    // min-width: 250px;
 
     .pane-left-toolbar-wrap {
       padding: 9px 0px 30px 8px;
@@ -49,6 +48,12 @@ $pane_left_btn_group_width: 150px;
   }
 }
 
+// @media (max-width: 720px) {
+//   .pane-left-btn-group {
+//     margin-top: 26px;
+//   }
+// }
+
 .diff-pane-left {
 
   height: 100%;

diff --git a/app/styles/ve/layout/_pane-right.scss → app/assets/styles/ve/layout/_pane-right.scss b/app/styles/ve/layout/_pane-right.scss → app/assets/styles/ve/layout/_pane-right.scss
diff --git a/app/styles/ve/layout/_panes.scss → app/assets/styles/ve/layout/_panes.scss b/app/styles/ve/layout/_panes.scss → app/assets/styles/ve/layout/_panes.scss
@@ -19,11 +19,6 @@
     font-style: italic;
   }
 
-  table,
-  table * {
-    //font-family: $font-family-sans-serif; //messes with kenny's stuff
-  }
-
   h1,
   h2,
   h3,
@@ -39,14 +34,12 @@
   overflow: hidden;
   width: 100%;
   height: 100vh;
-  padding-bottom: 14px;
 }
 
 #inner-wrap {
   position: relative;
   width: 100%;
-  height: 98.2vh;
-  @include calc(height, "100vh - 14px");
+  height: 100vh;
 }
 
 .fa-pane-orientation-vertical,
@@ -91,19 +84,14 @@
 }
 
 @media screen and (max-width: 45em) {
-  #main-pane {
-    top: 46px;
-  }
 
   #main-pane > div {
     z-index: 0; //TODO was 1000
   }
 }
 
-@media screen and (min-width: 45.0625em) {
-  #main-pane {
-    top: 72px;
-  }
+#main-pane {
+  top: 72px;
 }
 
 .diff-pane-left,

diff --git a/app/styles/ve/layout/_ve-footer.scss → app/assets/styles/ve/layout/_ve-footer.scss b/app/styles/ve/layout/_ve-footer.scss → app/assets/styles/ve/layout/_ve-footer.scss