Repository: brooklyn-ui Updated Branches: refs/heads/master da18c6003 -> d1581af9f
composer tidies * give the right editor for generics in types * open config section by default * fix height of dropdown caret in top right Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/a3d0ebd4 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/a3d0ebd4 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/a3d0ebd4 Branch: refs/heads/master Commit: a3d0ebd4e182c4f1fd77f16bcec7e0d336d0515b Parents: 503d74e Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Tue Sep 11 20:44:42 2018 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Tue Sep 11 20:44:42 2018 +0100 ---------------------------------------------------------------------- .../app/components/spec-editor/spec-editor.directive.js | 3 +++ .../app/components/spec-editor/spec-editor.template.html | 2 +- ui-modules/blueprint-composer/app/views/main/main.less | 5 +++++ ui-modules/blueprint-composer/app/views/main/main.template.html | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a3d0ebd4/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js index 7a1ec92..8272d01 100644 --- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js +++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js @@ -372,6 +372,9 @@ export function specEditorDirective($rootScope, $templateCache, $injector, $sani if (!scope.defined(val)) val = scope.config[item.name]; let type = item.type; + if (type && type.indexOf("<")>=0) { + type = type.substring(0, type.indexOf("<")); + } // if actual value's type does not match declared type, // e.g. object is a map when declared type is object or string or something else, http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a3d0ebd4/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html index 8b466fe..6100ef6 100644 --- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html +++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.template.html @@ -52,7 +52,7 @@ </section> <!-- ENTITY CONFIGURATION --> -<br-collapsible state="state.config.open"> +<br-collapsible ng-if="true" state="state.config.open"> <!-- the ng-if is needed to make state update?! --> <heading> Configuration <span ng-if="getConfigIssues().length> 0" class="badge" ng-class="getBadgeClass(getConfigIssues())">{{getConfigIssues().length}}</span> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a3d0ebd4/ui-modules/blueprint-composer/app/views/main/main.less ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/views/main/main.less b/ui-modules/blueprint-composer/app/views/main/main.less index fdba549..1713b29 100644 --- a/ui-modules/blueprint-composer/app/views/main/main.less +++ b/ui-modules/blueprint-composer/app/views/main/main.less @@ -67,3 +67,8 @@ } } } + + +.flex { + display: flex; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a3d0ebd4/ui-modules/blueprint-composer/app/views/main/main.template.html ---------------------------------------------------------------------- diff --git a/ui-modules/blueprint-composer/app/views/main/main.template.html b/ui-modules/blueprint-composer/app/views/main/main.template.html index d9c894e..db569d0 100644 --- a/ui-modules/blueprint-composer/app/views/main/main.template.html +++ b/ui-modules/blueprint-composer/app/views/main/main.template.html @@ -16,8 +16,8 @@ specific language governing permissions and limitations under the License. --> -<div class="btn-group modes" role="group" aria-label="..."> - <div class="btn-group" uib-dropdown keyboard-nav auto-close="outsideClick"> +<div class="btn-group modes flex" role="group" aria-label="..."> + <div class="btn-group flex" uib-dropdown keyboard-nav auto-close="outsideClick"> <button type="button" class="btn btn-default disabled"> {{vm.mode.data.label}} </button>
