Temp/omg

Gruntfile.js

@@ -353,7 +353,7 @@ module.exports = function(grunt) {
     artifactory: {
       options: {
         url: artifactoryUrl,
-        repository: snapshotRepo, //releaseRepo,
+        repository: releaseRepo,
         username: artifactoryUser,
         password: artifactoryPassword
       },
@@ -364,7 +364,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.6.1-SNAPSHOT',
+            version: '3.6.1',
             path: 'deploy/'
           }]
         }

app/js/mms/app.js

@@ -49,7 +49,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
 
     var mmsHost = window.location.protocol + '//' + window.location.host;
     URLServiceProvider.setMmsUrl(mmsHost);
-    //URLServiceProvider.setMmsUrl('https://opencae-uat.jpl.nasa.gov');
+    //URLServiceProvider.setMmsUrl('https://mms.openmbee.org');
 
     $httpProvider.defaults.withCredentials = true;
 // Check if user is logged in, if so redirect to select page otherwise go to login if the url isn't mapped

app/js/mms/controllers/toolbar.controller.js

@@ -26,7 +26,7 @@ function($scope, $rootScope, $state, UxService, refOb, documentOb) {
         tbApi.addButton(UxService.getToolbarButton("element-history"));
         tbApi.addButton(UxService.getToolbarButton("tags"));
         // if ($state.includes('project.ref.document')) {
-            tbApi.addButton(UxService.getToolbarButton("jobs"));
+            //tbApi.addButton(UxService.getToolbarButton("jobs"));
         // }
         if ($state.includes('project.ref') && !$state.includes('project.ref.document')) {
             editable = documentOb._editable && refOb.type === 'Branch';

app/mms.html

@@ -11,7 +11,7 @@
     <!--endbuild-->
     <link rel="stylesheet" href="css/ve-mms.min.css" type="text/css">
     <link rel="stylesheet" href="lib/flatpickr/flatpickr.css" type="text/css">
-    <link href="/mms-ts/tsperspectives/TSWebView.css" rel="stylesheet" type="text/css">
+    <!--<link href="/mms-ts/tsperspectives/TSWebView.css" rel="stylesheet" type="text/css"> -->
     <link rel="icon" type="image/png" href="assets/favicon.png" />
     <link rel="icon" type="image/png" href="assets/favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="assets/favicon-16x16.png" sizes="16x16" />

app/partials/mms/pane-center.html

@@ -5,9 +5,11 @@
                 <a type="button" class="btn btn-tools btn-sm" target="_blank" rel="noopener noreferrer" ng-href="{{docLibLink}}" uib-tooltip="Manage files" tooltip-placement="bottom" tooltip-popup-delay="100">
                     <img src="assets/alfresco-icon-sm.png">DocLib
                 </a>
+                <!--
                 <button type="button" class="btn btn-tools btn-sm share-url" ng-if="!ve_fn" ng-click="handleShareURL()" uib-tooltip="Share Page" tooltip-placement="bottom" tooltip-popup-delay="100"
                 popover-trigger="outsideClick" uib-popover-template="dynamicPopover.templateUrl" popover-title="{{dynamicPopover.title}}" popover-placement="bottom-left">
                 <i class="fa fa-share-alt"></i></button>
+                -->
             </div>
             <div class="pane-center-btn-group">
                 <mms-button-bar buttons="buttons" mms-bb-api="bbApi" class="bordered-button-bar"></mms-button-bar>

app/partials/mms/veNav.html

@@ -24,7 +24,7 @@
                 </div>
             </form>
             <ul class="nav navbar-nav global-menu">
-                <!--<li><span><a ng-click="stagingView()">UAT</a></span></li>-->
+
                 <li class="dropdown">
                     <span class="dropdown ve-dark-dropdown-nav fixed-content-dropdown" uib-dropdown on-toggle="toggled(open)">
                         <a href id="help-dropdown" class="dropdown-toggle" uib-dropdown-toggle>
@@ -36,10 +36,10 @@
                             </li>
                             <li class="divider"></li>
                             <li>
-                                <a href="https://wiki.jpl.nasa.gov/display/opencae/View+Editor+User+Guide" target="_blank">View Editor User Guide</a>
+                                <a href="https://github.com/Open-MBEE/ve/blob/develop/Documents/ViewEditorUserGuide.pdf" target="_blank">View Editor Help</a>
                             </li>
                             <li>
-                                <a href="https://jira.jpl.nasa.gov/servicedesk/customer/portal/5" target="_blank">Report Issue</a>
+                                <a href="https://openmbee.atlassian.net/secure/Dashboard.jspa" target="_blank">Report Issue</a>
                             </li>
                             <li class="divider"></li>
                             <li class="list-section-bottom">

src/directives/mmsCkEditor.js

@@ -340,7 +340,7 @@ function mmsCkeditor($uibModal, $templateCache, $timeout, growl, CKEDITOR, _, Ca
         };
 
         // Formatting editor toolbar
-        var stylesToolbar = { name: 'styles', items : ['Format','FontSize','TextColor','BGColor' ] };
+        var stylesToolbar = { name: 'styles', items : ['Styles',/*'Format',*/'FontSize','TextColor','BGColor'] };
         var basicStylesToolbar = { name: 'basicstyles', items : [ 'Bold','Italic','Underline', 'mmsExtraFormat'] };
         var clipboardToolbar = { name: 'clipboard', items : [ 'Undo','Redo' ] };
         var justifyToolbar = { name: 'paragraph', items : [ 'JustifyLeft','JustifyCenter','JustifyRight' ] };

src/directives/mmsTranscludeDoc.js

@@ -44,6 +44,9 @@ function mmsTranscludeDoc(Utils, ElementService, UtilsService, ViewService, UxSe
     var fixPreSpanRegex = /<\/span>\s*<mms-cf/g;
     var fixPostSpanRegex = /<\/mms-cf>\s*<span[^>]*>/g;
     var emptyRegex = /^\s*$/;
+    var spacePeriod = />(?:\s|&nbsp;)\./g;
+    var spaceSpace = />(?:\s|&nbsp;)(?:\s|&nbsp;)/g;
+    var spaceComma = />(?:\s|&nbsp;),/g;
 
     var mmsTranscludeDocCtrl = function($scope) {
 
@@ -93,6 +96,9 @@ function mmsTranscludeDoc(Utils, ElementService, UtilsService, ViewService, UxSe
             }
             doc = doc.replace(fixPreSpanRegex, "<mms-cf");
             doc = doc.replace(fixPostSpanRegex, "</mms-cf>");
+            doc = doc.replace(spacePeriod, '>.');
+            doc = doc.replace(spaceSpace, '> ');
+            doc = doc.replace(spaceComma, '>,');
             if (preview) {
                 domElement[0].innerHTML = '<div class="panel panel-info">'+doc+'</div>';
             } else {

src/directives/mmsTranscludeVal.js

@@ -39,6 +39,9 @@ function mmsTranscludeVal(ElementService, UtilsService, UxService, Utils, URLSer
     var frameTemplate = $templateCache.get('mms/templates/mmsTranscludeValFrame.html');
     var editTemplate = $templateCache.get('mms/templates/mmsTranscludeValEdit.html');
     var emptyRegex = /^\s*$/;
+    var spacePeriod = />(?:\s| )\./g;
+    var spaceSpace = />(?:\s| )(?:\s| )/g;
+    var spaceComma = />(?:\s| ),/g;
 
     var mmsTranscludeCtrl = function ($scope, $rootScope) {
 
@@ -119,6 +122,9 @@ function mmsTranscludeVal(ElementService, UtilsService, UxService, Utils, URLSer
                     domElement[0].innerHTML = '<span class="no-print placeholder">(no value)</span>';
                     return;
                 }
+                toCompile = toCompile.replace(spacePeriod, '>.');
+                toCompile = toCompile.replace(spaceSpace, '> ');
+                toCompile = toCompile.replace(spaceComma, '>,');
                 if (preview) {
                     domElement[0].innerHTML = '<div class="panel panel-info">'+toCompile+'</div>';
                 } else {

src/directives/mmsTree.js

@@ -351,6 +351,7 @@ function mmsTree(ApplicationService, $timeout, $log, $templateCache, $filter, Ut
                     children: branch.children
                 });
                 if (branch.children) {
+                    var alpha = false;
                     if (scope.options.sort) {
                         branch.children.sort(scope.options.sort);
                     }
@@ -366,8 +367,12 @@ function mmsTree(ApplicationService, $timeout, $log, $templateCache, $filter, Ut
                             add_branch_to_list(level + 1, section, branch.children[i], child_visible, peNums);
                         } else {
                             if (scope.options.sectionNumbering) {
+                                if (branch.children[i].data._isAppendix) {
+                                    alpha = true;
+                                    j = 0;
+                                }
                                 var nextSection = section.slice(); 
-                                nextSection.push(j);
+                                nextSection.push(alpha ? String.fromCharCode(j + 65) : j);
                                 if (nextSection.length <= scope.options.numberingDepth) {
                                     peNums.table = 0; peNums.figure = 0; peNums.equaton = 0;
                                 }

src/directives/mmsViewLink.js

@@ -75,7 +75,7 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
             .then(function(data) {
                 scope.element = data;
                 scope.name = data.name;
-                scope.type = 'Section ';
+                scope.type = 'Clause ';
                 scope.suffix = '';
                 scope.hash = '#' + data.id;
                 if (scope.mmsPeId && scope.mmsPeId !== '') {
@@ -92,13 +92,33 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
                         } else if (ViewService.isEquation(pe)) {
                             scope.type = "Eq. (";
                             scope.suffix = ')';
+                        } else if (ViewService.isSection(pe)) {
+                            scope.type = '';
                         }
                         if (ApplicationService.getState().fullDoc) {
                             scope.href = UtilsService.PROJECT_URL_PREFIX + scope.projectId + '/' + scope.refId + '/documents/' + scope.docid + "/full" + scope.hash;
                         } else {
                             scope.href = UtilsService.PROJECT_URL_PREFIX + scope.projectId + '/' + scope.refId + '/documents/' + scope.docid + '/views/' + scope.vid + scope.hash;
                         }
+                    }, function() {
+                        if (data._veNumber) {
+                            var numbers = data._veNumber.split('.');
+                            if (numbers.length > 1) {
+                                scope.type = '';
+                            } else if (isNaN(parseInt(numbers[0]))) {
+                                scope.type = 'Annex ';
+                            }
+                        }
                     });
+                } else {
+                    if (data._veNumber) {
+                        var numbers = data._veNumber.split('.');
+                        if (numbers.length > 1) {
+                            scope.type = '';
+                        } else if (isNaN(parseInt(numbers[0]))) {
+                            scope.type = 'Annex ';
+                        }
+                    }
                 }
                 if (UtilsService.isDocument(data)) {
                     docid = data.id;
@@ -114,6 +134,11 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
                     element.html("<span class=\"mms-error\">view link doesn't refer to a view</span>");
                 }
                 scope.loading = false;
+                //for omg doc - if we're in a doc, just assume the link is within current doc
+                if (ApplicationService.getState().inDoc) {
+                    scope.docid = ApplicationService.getState().currentDoc;
+                }
+                //end omg specific fix
                 if (ApplicationService.getState().fullDoc) {
                     scope.href = UtilsService.PROJECT_URL_PREFIX + scope.projectId + '/' + scope.refId + '/documents/' + scope.docid + '/full' + scope.hash;
                 } else {

src/lib/ckeditor/config.js

@@ -15,7 +15,7 @@ CKEDITOR.editorConfig = function( config ) {
 	//config.tabSpaces = 4;
 	//config.height = 350;
 	// config.extraPlugins = 'autosave,iframe,mediaembed,embed,
-	config.extraPlugins = 'liststyle,colordialog,autosave,autogrow,mmscf,mmscomment,mmsvlink,mmsreset,mmssignature,mmsdropdown';
+	config.extraPlugins = 'liststyle,colordialog,autosave,autogrow,stylescombo,mmscf,mmscomment,mmsvlink,mmsreset,mmssignature,mmsdropdown';
     config.autoGrow_minHeight = 200;
     config.autoGrow_maxHeight = 600;
     config.autoGrow_bottomSpace = 50;
@@ -40,4 +40,16 @@ CKEDITOR.editorConfig = function( config ) {
 
 	// Simplify the dialog windows.
 	config.removeDialogTabs = 'image:advanced;link:advanced';
+
+	config.stylesSet = [
+		{ name: 'Paragraph',		element: 'p' },
+		{ name: 'Heading 1',		element: 'h1' },
+		{ name: 'Heading 2',		element: 'h2' },
+		{ name: 'Heading 3',		element: 'h3' },
+		{ name: 'Heading 4',		element: 'h4' },
+		{ name: 'Heading 5',		element: 'h5' },
+		{ name: 'Heading 6',		element: 'h6' },
+		{ name: 'Preformatted Text',element: 'pre' },
+		{ name: 'Computer Code',	element: 'code' }
+	];
 };

src/lib/ckeditor/plugins/stylescombo/lang/en.js

@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+CKEDITOR.plugins.setLang( 'stylescombo', 'en', {
+	label: 'Styles',
+	panelTitle: 'Formatting Styles',
+	panelTitle1: 'Block Styles',
+	panelTitle2: 'Inline Styles',
+	panelTitle3: 'Object Styles'
+} );