Merge branch 'release/3.5.1'

Open-MBEE · Feb 21, 2019 · ff66ead · ff66ead
2 parents 8f02efc + 09a8677
commit ff66ead
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 37 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -347,7 +347,7 @@ module.exports = function(grunt) {
     artifactory: {
       options: {
         url: artifactoryUrl,
-        repository: releaseRepo,
+        repository: releaseRepo, //snapshotRepo,
         username: artifactoryUser,
         password: artifactoryPassword
       },
@@ -358,7 +358,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.5.0',
+            version: '3.5.1',
             path: 'deploy/'
           }]
         }

diff --git a/app/assets/styles/ve/layout/_ve-dropdowns.scss b/app/assets/styles/ve/layout/_ve-dropdowns.scss
@@ -138,8 +138,11 @@
     }
 
     /*Clearing bootstrap styling*/
-    >li>a {
+    >li>a,
+    >li>span {
       padding: 1px 10px;
+    }
+    >li>a{
       color: white;
 
       &:hover {

diff --git a/app/assets/styles/ve/layout/_ve-nav.scss b/app/assets/styles/ve/layout/_ve-nav.scss
@@ -11,9 +11,8 @@
     2.2.2 Search
   2.3 User Profile
 3. Project Level Header
-  3.1 Select Project Dropdown
-  3.2 Breadcrumbs
-  3.3 Dropdowns
+  3.1 Breadcrumbs
+  3.2 Dropdowns
 
 -------------------------------------------------------------------*/
 
@@ -236,15 +235,7 @@ nav.project-level-header {
 }
 
 /*------------------------------------------------------------------
-  3.1 Select Project Dropdown
--------------------------------------------------------------------*/
-
-.select-project-dropdown {
-  float: left;
-}
-
-/*------------------------------------------------------------------
-  3.2 Breadcrumbs
+  3.1 Breadcrumbs
 -------------------------------------------------------------------*/
 
 .navbar{
@@ -366,13 +357,13 @@ nav.project-level-header {
 
 
 /*------------------------------------------------------------------
-  3.3 Dropdowns
+  3.2 Dropdowns
 -------------------------------------------------------------------*/
 
 .project-level-header .ve-dark-dropdown-nav ul.dropdown-menu {
   max-width: 400px;
-  overflow: hidden;
   text-align: left;
+  min-width: 260px;
   /*Clearing bootstrap styling so long names can wrap*/
   > li > a{
     white-space: normal;

diff --git a/app/js/mms/controllers/tree.controller.js b/app/js/mms/controllers/tree.controller.js
@@ -11,7 +11,7 @@ function($anchorScroll, $q, $filter, $location, $uibModal, $scope, $rootScope, $
     orgOb, projectOb, refOb, refObs, groupObs, docMeta) {
 
     $scope.filterInputPlaceholder = 'Filter groups/docs';
-    if ($state.current.name === 'project.ref.document.view' || $state.current.name === 'project.ref.document.full') {
+    if ($state.includes('project.ref.document')) {
         $scope.filterInputPlaceholder = 'Filter table of contents';
     }
 
@@ -484,6 +484,7 @@ function($anchorScroll, $q, $filter, $location, $uibModal, $scope, $rootScope, $
     if (documentOb && docMeta) {
         $scope.treeOptions.numberingDepth = docMeta.numberingDepth;
         $scope.treeOptions.numberingSeparator = docMeta.numberingSeparator;
+        $scope.treeOptions.startChapter = documentOb._startChapter;
     }
 
     $scope.fullDocMode = function() {

diff --git a/app/js/mms/directives/veNav.js b/app/js/mms/directives/veNav.js
@@ -87,7 +87,7 @@ function veNav($templateCache, $rootScope, $state, hotkeys, growl, $location, $u
             hotkeys.toggleCheatSheet();
         };
         scope.toggleAbout = function() {
-            scope.veV = '3.5.0';
+            scope.veV = '3.5.1';
             scope.mmsV = 'Loading...';
             ApplicationService.getMmsVersion().then(function(data) {
                 scope.mmsV = data;

diff --git a/app/partials/mms/veMenu.html b/app/partials/mms/veMenu.html
@@ -1,9 +1,7 @@
 <nav class="project-level-header navbar navbar-inverse navbar-fixed-top block" role="navigation">
-    <div class="btn-group ve-dark-dropdown-nav select-project-dropdown" uib-dropdown keyboard-nav>
+    <div class="btn-group ve-dark-dropdown-nav pull-left" uib-dropdown keyboard-nav>
         <button type="button" class="dropdown-toggle" ng-click="updateProjectChecked()" uib-dropdown-toggle>
-            <span class="selected-dropdown">
-                <span class="label-dropdown">Project:&nbsp;</span>{{ currentProject }}
-            </span>
+            <span class="label-dropdown">Project:&nbsp;</span><span class="selected-dropdown">{{ currentProject }}</span>
             <span><i class="fa fa-caret-down" aria-hidden="true"></i></span>
         </button>
         <ul class="dropdown-menu list-with-selected-item" uib-dropdown-menu role="menu">

diff --git a/app/partials/mms/veNav.html b/app/partials/mms/veNav.html
@@ -55,7 +55,7 @@
                         </a>
                         <ul class="dropdown-menu pull-right" uib-dropdown-menu aria-labelledby="login-dropdown" style="white-space: nowrap" role="login-menu">
                             <li ng-if="username" class="ve-secondary">
-                                Logged in as <b>{{ username }}</b>
+                                <span>Logged in as <b>{{ username }}</b></span>
                             </li>
                             <li class="divider"></li>
                             <li>

diff --git a/src/assets/styles/components/_mms-transclude.scss b/src/assets/styles/components/_mms-transclude.scss
@@ -89,6 +89,25 @@ mms-view:not(.reviewing) mms-transclude-com {
   display: none;
 }
 
+/*Add a name label that is hidden by default*/
+mms-transclude-name .input-group > .input-group-addon.transclude-name-label{
+  position: absolute;
+  top: -1.8em;
+  display: table;
+  opacity: 0;
+  border-radius: 4px 4px 0 0;
+    -webkit-border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+  visibility: 0;
+  opacity: 0;
+  @include transition(all .3s);
+}
+
+/*Label becomes visible on hover*/
+mms-transclude-name:hover .input-group > .input-group-addon.transclude-name-label{
+  visibility: 1;
+  opacity: 1;
+}
 
 /*------------------------------------------------------------------
 Element not found styling

diff --git a/src/directives/mmsTree.js b/src/directives/mmsTree.js
@@ -286,7 +286,7 @@ function mmsTree(ApplicationService, $timeout, $log, $templateCache, $filter, Ut
                     aggr = "";
                 else
                     aggr = '-' + aggr.toLowerCase();
-                var i, j = 0;
+                var i = 0;
                 if (!branch.expanded)
                     branch.expanded = false;
                 if ((branch.children && branch.children.length > 0) || (branch.expandable === true)) {
@@ -354,23 +354,28 @@ function mmsTree(ApplicationService, $timeout, $log, $templateCache, $filter, Ut
                     if (scope.options.sort) {
                         branch.children.sort(scope.options.sort);
                     }
-                    for (i = 0, j = 0; i < branch.children.length; i++) {
+                    var j = scope.options.startChapter;
+                    if (j === null || j === undefined || level != 1) {
+                        j = 1;
+                    }
+                    for (i = 0; i < branch.children.length; i++) {
                         var child_visible = visible && branch.expanded;
                         //if (branch.children[i].type === 'section')
                         //    add_branch_to_list(level + 1, '§ ', branch.children[i], child_visible);
                         if (branch.children[i].type === 'figure' || branch.children[i].type === 'table' || branch.children[i].type === 'equation') {
                             add_branch_to_list(level + 1, section, branch.children[i], child_visible, peNums);
                         } else {
-                            j++;
                             if (scope.options.sectionNumbering) {
                                 var nextSection = section.slice(); 
                                 nextSection.push(j);
                                 if (nextSection.length <= scope.options.numberingDepth) {
                                     peNums.table = 0; peNums.figure = 0; peNums.equaton = 0;
                                 }
                                 add_branch_to_list(level + 1, nextSection, branch.children[i], child_visible, peNums);
-                            } else
+                            } else {
                                 add_branch_to_list(level + 1, [], branch.children[i], child_visible, peNums);
+                            }
+                            j++;
                         }
                     }
                 }

diff --git a/src/directives/mmsTsDiagram.js b/src/directives/mmsTsDiagram.js
@@ -21,6 +21,7 @@ angular.module('mms.directives')
  *
  */
 function mmsTsDiagram(ElementService, $templateCache, $window, $timeout, growl, ApplicationService, AuthService, URLService) {
+    var importedTsJs = false;
     var template = $templateCache.get('mms/templates/mmsTsDiagram.html');
     var mapping = {};
     // var deferreds = {};
@@ -71,12 +72,7 @@ function mmsTsDiagram(ElementService, $templateCache, $window, $timeout, growl,
         REQ: 'REQ Relationships',
         UC: 'UC Relationships'
     };
-    $('body').append(
-    '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/tsperspectives.nocache.js"></script>\n' +
-    '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/dojo/dojo/dojo.js"></script>\n' +
-    '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/TSHovering.js"></script>\n' +
-    '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/TSButtonTooltip.js"></script>');
-
+
     $window.onPerspectivesCommandSuccess = function(successfulCommand) {
         console.log("Perspectives command: " + successfulCommand.command + " completed successfully");
         $window.hidePerspectivesProgressIndicator();
@@ -122,6 +118,15 @@ function mmsTsDiagram(ElementService, $templateCache, $window, $timeout, growl,
     };
     //store global mapping of project name to hash, on*** functions can lookup the hash 
     var mmsTsDiagramLink = function(scope, element, attrs) {
+        if (!$window.invokePerspectivesCommand && !importedTsJs) {
+            $('body').append(
+            '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/tsperspectives.nocache.js"></script>\n' +
+            '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/dojo/dojo/dojo.js"></script>\n' +
+            '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/TSHovering.js"></script>\n' +
+            '<script type="text/javascript" language="javascript" src="/mms-ts/tsperspectives/TSButtonTooltip.js"></script>');
+
+            importedTsJs = true;
+        }
         var id = ApplicationService.createUniqueId();
         if (peId2projectId[scope.mmsPeId]) {
             id = peId2projectId[scope.mmsPeId];

diff --git a/src/directives/mmsViewLink.js b/src/directives/mmsViewLink.js
@@ -150,7 +150,7 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
         },
         require: ['?^^mmsCf', '?^^mmsView'],
         template: '<span ng-if="!loading"><a target="{{target}}" ng-class="linkClass" ng-href="{{href}}"><i ng-class="linkIconClass" aria-hidden="true"></i><span ng-if="linkText">{{linkText}}</span><span ng-if="!linkText && change">{{type}}{{element._veNumber}}{{suffix}}</span><span ng-if="!linkText && !change">{{name || "Unnamed View"}}</span></a>' +
-        '<a class="external-link no-print" target="_blank" ng-href="{{href}}" ng-if="mmsExternalLink"><i class="fa fa-external-link" aria-hidden="true" title="Open document in new tab"></i></a></span>',
+        '<a class="external-link no-print" target="_blank" ng-href="{{href}}" ng-if="mmsExternalLink"><i class="fa fa-external-link ve-secondary-text pull-right" aria-hidden="true" title="Open document in new tab"></i></a></span>',
         link: mmsViewLinkLink
     };
 }
diff --git a/src/directives/templates/mmsTranscludeName.html b/src/directives/templates/mmsTranscludeName.html
@@ -1,8 +1,9 @@
 <form class="input-group" ng-submit="save($event)">
     <input type="text" class="form-control" ng-model="edit.name" aria-describedby="basic-addon2">
-    <span class="input-group-addon" ng-click="save($event)">
+	<span class="input-group-addon transclude-name-label">Name</span>
+    <span class="input-group-addon" ng-click="save($event)" title="Save">
         <i ng-if="!elementSaving" class="fa fa-save"></i>
         <i ng-if="elementSaving" class="fa fa-spinner fa-spin"></i>
     </span>
-    <span class="input-group-addon" ng-click="cancel($event)"><i class="fa fa-times"></i></span>
+    <span class="input-group-addon" ng-click="cancel($event)"><i class="fa fa-times" title="Cancel"></i></span>
 </form>