From 7759ceae10903b8ac236512cb4e6d9010fea747e Mon Sep 17 00:00:00 2001 From: shiv12095 Date: Sun, 10 Jul 2016 01:42:08 +0530 Subject: [PATCH] Modified the UI of add Vorto Model modal. Signed-off-by: shiv12095 --- .../src/main/resources/static/css/style.css | 10 ++- .../resources/static/dist/js/controllers.js | 34 ++++---- .../templates/add-editor-modal-template.html | 23 ++++-- .../functionblock-editor-template.html | 79 ------------------- .../static/templates/tab-template.html | 29 ------- 5 files changed, 42 insertions(+), 133 deletions(-) delete mode 100644 server/devtool/src/main/resources/static/templates/functionblock-editor-template.html delete mode 100644 server/devtool/src/main/resources/static/templates/tab-template.html diff --git a/server/devtool/src/main/resources/static/css/style.css b/server/devtool/src/main/resources/static/css/style.css index afb56dc8de..503e64e615 100644 --- a/server/devtool/src/main/resources/static/css/style.css +++ b/server/devtool/src/main/resources/static/css/style.css @@ -855,4 +855,12 @@ a:hover { color: #000000; text-shadow: none; font-weight: bold; -} \ No newline at end of file +} + +.align-left { + float:left; +} + +.align-right { + float:right; +} diff --git a/server/devtool/src/main/resources/static/dist/js/controllers.js b/server/devtool/src/main/resources/static/dist/js/controllers.js index 00cd17379f..8ea92391b0 100644 --- a/server/devtool/src/main/resources/static/dist/js/controllers.js +++ b/server/devtool/src/main/resources/static/dist/js/controllers.js @@ -17,17 +17,19 @@ define(["angular"], function(angular) { $scope.selectedTabId = 0; $scope.selectedEditor = null; - $scope.editorTypes = ['InformationModel', 'FunctionBlock']; + $scope.editorTypes = [ + {language:'infomodel', display:'Info Model'}, + {language:'fbmodel', display:'Function Block'} + ]; $scope.models = []; $scope.queryFilter = ""; $scope.$on("addTab", function(event, args) { - console.log(args.editorType); - $scope.addEditor(args.editorType); + $scope.addEditor(args.language); }); - $scope.addEditor = function(editorType) { + $scope.addEditor = function(language) { $scope.counter++; var tabId = $scope.counter; var editorParentDivId = "xtext-editor-parent-" + tabId; @@ -36,7 +38,7 @@ define(["angular"], function(angular) { id: tabId, editorParentDivId: editorParentDivId, editorDivId: editorDivId, - language: editorType + language: language }; console.log(tab); $scope.tabs.push(tab); @@ -45,9 +47,9 @@ define(["angular"], function(angular) { var element = angular.element(document).find('#editors'); element.append('
'); $compile(element.contents())($scope); - if (editorType == 'InformationModel') { + if (language == 'infomodel') { $scope.addInfoModelEditor(editorDivId); - } else if (editorType == 'FunctionBlock') { + } else if (language == 'fbmodel') { $scope.addFunctionBlockEditor(editorDivId); } } @@ -114,7 +116,7 @@ define(["angular"], function(angular) { animation: true, controller: 'AddEditorModalController', templateUrl: 'templates/add-editor-modal-template.html', - size: 'lg', + size: 'sm', resolve: { editorTypes: function() { return $scope.editorTypes; @@ -153,14 +155,14 @@ define(["angular"], function(angular) { $scope.importModel = function() { if ($scope.isValidModel()) { if ($scope.isModelSelected()) { - if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'InformationModel') { - $http.get('./editor/infomodel/link/functionblock/' + $scope.selectedEditor.xtextServices.validationService._encodedResourceId + '/' + $scope.selectedModelId['namespace'] + '/' + $scope.selectedModelId['name'] + '/' + $scope.selectedModelId['version']).success( + if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'infomodel') { + $http.get('./editor/infomodel/link/fbmodel/' + $scope.selectedEditor.xtextServices.validationService._encodedResourceId + '/' + $scope.selectedModelId['namespace'] + '/' + $scope.selectedModelId['name'] + '/' + $scope.selectedModelId['version']).success( function(data, status, headers, config) { $scope.selectedEditor.setValue(data); }).error(function(data, status, headers, config) { window.alert('Failed') }); - } else if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'FunctionBlock') { + } else if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'fbmodel') { $http.get('./editor/functionblock/link/datatype/' + $scope.selectedEditor.xtextServices.validationService._encodedResourceId + '/' + $scope.selectedModelId['namespace'] + '/' + $scope.selectedModelId['name'] + '/' + $scope.selectedModelId['version']).success( function(data, status, headers, config) { editor.setValue(data); @@ -187,8 +189,8 @@ define(["angular"], function(angular) { var modelType = null; console.log('called here'); console.log($scope.tabs[$scope.selectedTabIndex]['language']); - if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'InformationModel') { - modelType = "Functionblock"; + if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'infomodel') { + modelType = "fbmodel"; filter = $scope.queryFilter + " " + modelType; $http.get('./editor/infomodel/search=' + filter).success( function(data, status, headers, config) { @@ -196,7 +198,7 @@ define(["angular"], function(angular) { }).error(function(data, status, headers, config) { $scope.models = []; }); - } else if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'FunctionBlock') { + } else if ($scope.tabs[$scope.selectedTabIndex]['language'] == 'fbmodel') { modelType = "Datatype"; filter = $scope.queryFilter + " " + modelType; $http.get('./editor/functionblock/search=' + filter).success( @@ -226,13 +228,13 @@ define(["angular"], function(angular) { $scope.editorTypes = editorTypes; $scope.selected = { - editorType: $scope.editorTypes[0] + language: $scope.editorTypes[0]['language'] }; $scope.ok = function() { $uibModalInstance.close($scope.selected.editorType); $rootScope.$broadcast("addTab", { - editorType: $scope.selected.editorType + language: $scope.selected.language }); console.log('sent'); }; diff --git a/server/devtool/src/main/resources/static/templates/add-editor-modal-template.html b/server/devtool/src/main/resources/static/templates/add-editor-modal-template.html index 23b601ae11..3bedcd5eb4 100644 --- a/server/devtool/src/main/resources/static/templates/add-editor-modal-template.html +++ b/server/devtool/src/main/resources/static/templates/add-editor-modal-template.html @@ -1,14 +1,21 @@
-

Please select the type of Editor

+

New Vorto Model

-
    -
  • - {{editorType}} -
    • -
+
+

What kind of model do you want to create?

+
+
+

+ {{editorType.display}} +

+
- - +
+ +
+
+ +
diff --git a/server/devtool/src/main/resources/static/templates/functionblock-editor-template.html b/server/devtool/src/main/resources/static/templates/functionblock-editor-template.html deleted file mode 100644 index 3acd98ff2f..0000000000 --- a/server/devtool/src/main/resources/static/templates/functionblock-editor-template.html +++ /dev/null @@ -1,79 +0,0 @@ -
-
-
-
- -

Describe your Function Blocks

-
- -

- Hint: Press Ctrl + Space for Content Assist -

-
-
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
Search Results: {{models.length}}
Name Details
{{ model.id.name }}
-
-
-
-
-
-
-
diff --git a/server/devtool/src/main/resources/static/templates/tab-template.html b/server/devtool/src/main/resources/static/templates/tab-template.html deleted file mode 100644 index 25e395d017..0000000000 --- a/server/devtool/src/main/resources/static/templates/tab-template.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
- -
-
-
- -
-
-
-
-

BOO YEAH

-

{{tabs[selectedTab].id}}

-

{{tabs[selectedTab].language}}

-

{{tabs[selectedTab].parent}}

-
-
-
-
-
-