From 5c39433e568ce5e1e90ee4b1733bcab6c5d4718e Mon Sep 17 00:00:00 2001 From: "Lam, Doris T (393A)" Date: Fri, 8 Feb 2019 15:24:08 -0800 Subject: [PATCH 1/9] only get tomsawyer license on first ts diagram instantiation --- Gruntfile.js | 2 +- app/js/mms/directives/veNav.js | 2 +- src/directives/mmsTsDiagram.js | 17 +++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 666489255..513ac1a34 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -358,7 +358,7 @@ module.exports = function(grunt) { options: { publish: [{ id: groupId + ':ve:zip', - version: '3.5.0-SNAPSHOT', + version: '3.5.1-SNAPSHOT', path: 'deploy/' }] } diff --git a/app/js/mms/directives/veNav.js b/app/js/mms/directives/veNav.js index 8ec007aed..effd2e5b4 100644 --- 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/src/directives/mmsTsDiagram.js b/src/directives/mmsTsDiagram.js index 8a3352ffc..35a2c1542 100644 --- 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( - '\n' + - '\n' + - '\n' + - ''); - + $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( + '\n' + + '\n' + + '\n' + + ''); + + importedTsJs = true; + } var id = ApplicationService.createUniqueId(); if (peId2projectId[scope.mmsPeId]) { id = peId2projectId[scope.mmsPeId]; From e3b00d981ce154a2f47a54fed487f0924cf1e863 Mon Sep 17 00:00:00 2001 From: "Lam, Doris T (393A)" Date: Fri, 8 Feb 2019 15:51:04 -0800 Subject: [PATCH 2/9] fix tree filter placeholder --- app/js/mms/controllers/tree.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/mms/controllers/tree.controller.js b/app/js/mms/controllers/tree.controller.js index 7b782373a..c631c2563 100644 --- 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'; } From bad6b215bde0d53674cb27556f769b408fa52f5b Mon Sep 17 00:00:00 2001 From: Ellen Date: Thu, 14 Feb 2019 15:07:55 -0800 Subject: [PATCH 3/9] Pull new doc tab to right and make grey to make less confusing --- src/directives/mmsViewLink.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/directives/mmsViewLink.js b/src/directives/mmsViewLink.js index d6fc18f64..a0e95973c 100644 --- 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: '{{linkText}}{{type}}{{element._veNumber}}{{suffix}}{{name || "Unnamed View"}}' + - '', + '', link: mmsViewLinkLink }; } From 0cd34c9ee6f8e825f1eb6a0a9a4e5ca378bee119 Mon Sep 17 00:00:00 2001 From: Ellen Date: Thu, 14 Feb 2019 15:22:21 -0800 Subject: [PATCH 4/9] Added a hover label to name input --- .../styles/components/_mms-transclude.scss | 20 +++++++++++++++++++ .../templates/mmsTranscludeName.html | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/components/_mms-transclude.scss b/src/assets/styles/components/_mms-transclude.scss index 7b4091291..385eabad5 100644 --- a/src/assets/styles/components/_mms-transclude.scss +++ b/src/assets/styles/components/_mms-transclude.scss @@ -89,6 +89,26 @@ 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); + z-index: 100; +} + +/*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/templates/mmsTranscludeName.html b/src/directives/templates/mmsTranscludeName.html index df198a886..ce80a5037 100644 --- a/src/directives/templates/mmsTranscludeName.html +++ b/src/directives/templates/mmsTranscludeName.html @@ -1,8 +1,9 @@
- + Name + - + From 571d2a78d6e8112e99cd0919e3a1b5fa55698802 Mon Sep 17 00:00:00 2001 From: Ellen Date: Thu, 14 Feb 2019 15:29:39 -0800 Subject: [PATCH 5/9] Move label behind input --- src/assets/styles/components/_mms-transclude.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/assets/styles/components/_mms-transclude.scss b/src/assets/styles/components/_mms-transclude.scss index 385eabad5..ddaf7e85a 100644 --- a/src/assets/styles/components/_mms-transclude.scss +++ b/src/assets/styles/components/_mms-transclude.scss @@ -101,7 +101,6 @@ mms-transclude-name .input-group > .input-group-addon.transclude-name-label{ visibility: 0; opacity: 0; @include transition(all .3s); - z-index: 100; } /*Label becomes visible on hover*/ From 6bf67afb82eb0d6d54f91100ee2b888031630293 Mon Sep 17 00:00:00 2001 From: Ellen Date: Wed, 20 Feb 2019 09:09:04 -0800 Subject: [PATCH 6/9] Added min-width and scroll for dropdown. --- app/assets/styles/ve/layout/_ve-nav.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/styles/ve/layout/_ve-nav.scss b/app/assets/styles/ve/layout/_ve-nav.scss index 845d31e33..120b970db 100644 --- a/app/assets/styles/ve/layout/_ve-nav.scss +++ b/app/assets/styles/ve/layout/_ve-nav.scss @@ -366,13 +366,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; From 33aac312359ca8da0dd68af9dc2eb3ee6f18000c Mon Sep 17 00:00:00 2001 From: Ellen Date: Wed, 20 Feb 2019 09:10:37 -0800 Subject: [PATCH 7/9] Replaced unnecessary class with bootstrap and fixed some styling inconsistencies --- app/assets/styles/ve/layout/_ve-dropdowns.scss | 5 ++++- app/assets/styles/ve/layout/_ve-nav.scss | 15 +++------------ app/partials/mms/veMenu.html | 6 ++---- app/partials/mms/veNav.html | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/assets/styles/ve/layout/_ve-dropdowns.scss b/app/assets/styles/ve/layout/_ve-dropdowns.scss index a1b5b0a6e..bc52d1eaf 100644 --- 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 index 120b970db..a2383286f 100644 --- 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{ diff --git a/app/partials/mms/veMenu.html b/app/partials/mms/veMenu.html index c35f65040..6e12c626a 100644 --- a/app/partials/mms/veMenu.html +++ b/app/partials/mms/veMenu.html @@ -1,9 +1,7 @@