This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 56c3c490ad383696a4258f56f0f58e119d180f25 Merge: feda1bf 3694aca Author: zan-mateusz <[email protected]> AuthorDate: Wed Jul 14 09:17:58 2021 +0100 Merge branch 'master' into feature/node-management-ui .../app/views/main/main.template.html | 2 +- .../catalog-saver/catalog-saver.directive.js | 74 +-- .../catalog-saver.modal.template.html | 4 +- .../app/components/designer/designer.directive.js | 46 +- .../app/components/designer/designer.less | 10 + .../app/components/designer/designer.spec.js | 211 ++++++++- .../providers/blueprint-service.provider.js | 80 +++- .../app/components/quick-fix/quick-fix.js | 49 +- .../spec-editor/spec-editor.directive.js | 33 +- .../app/components/util/d3-blueprint.js | 178 +++++++- .../app/components/util/model/entity.model.js | 24 +- .../app/views/main/graphical/graphical.state.html | 495 ++++++++++++++------- .../app/views/main/graphical/graphical.state.less | 100 +++-- .../app/views/main/main.controller.js | 4 +- .../blueprint-composer/app/views/main/main.less | 3 + .../catalog/app/views/catalog/catalog.state.js | 44 +- ui-modules/home/app/index.js | 9 +- ui-modules/home/app/index.less | 7 +- .../home/app/views/about/about.controller.js | 2 + .../home/app/views/about/about.template.html | 9 +- .../home/app/views/logbook/logbook.controller.js | 180 -------- .../home/app/views/logbook/logbook.template.html | 73 --- ui-modules/home/app/views/main/main.template.html | 2 +- ui-modules/utils/logbook/logbook.js | 294 ++++++++++++ .../{home/app/views => utils}/logbook/logbook.less | 64 ++- ui-modules/utils/logbook/logbook.template.html | 83 ++++ .../module-links/module-links-navbar.template.html | 2 +- ui-modules/utils/providers/catalog-api.provider.js | 13 +- ui-modules/utils/quick-launch/quick-launch.html | 2 +- ui-modules/utils/quick-launch/quick-launch.js | 80 ++-- 30 files changed, 1475 insertions(+), 702 deletions(-) diff --cc ui-modules/home/app/index.less index e5e3587,5010821..b95954c --- a/ui-modules/home/app/index.less +++ b/ui-modules/home/app/index.less @@@ -23,9 -27,7 +27,8 @@@ // Add project less files here @import 'views/main/main'; - @import 'views/logbook/logbook'; @import 'views/main/deploy/modal'; +@import 'views/about/node-management/node-management'; @import 'components/onboarding/onboarding'; .hideMainContent { diff --cc ui-modules/home/app/views/about/about.controller.js index c554b44,12c33fb..cafdf23 --- a/ui-modules/home/app/views/about/about.controller.js +++ b/ui-modules/home/app/views/about/about.controller.js @@@ -16,16 -16,13 +16,18 @@@ * specific language governing permissions and limitations * under the License. */ + import angular from 'angular'; +import moment from "moment"; import uiRouter from 'angular-ui-router'; -import serverApi from 'brooklyn-ui-utils/api/brooklyn/server'; +import uibModal from 'angular-ui-bootstrap/src/modal/index-nocss'; +import serverApi from 'brooklyn-ui-utils/api/brooklyn/server.js'; +import brInterstitialSpinner from 'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner'; import {HIDE_INTERSTITIAL_SPINNER_EVENT} from 'brooklyn-ui-utils/interstitial-spinner/interstitial-spinner'; -import template from './about.template.html'; +import template from "./about.template.html"; +import nodeManagementTemplate from "./node-management/node-management.template.html"; + + const MODULE_NAME = 'states.about'; const BROOKLYN_VERSION = __BROOKLYN_VERSION__; const BUILD_NAME = __BUILD_NAME__; // if something embedding brooklyn diff --cc ui-modules/home/app/views/about/about.template.html index 4eaaecc,e7a84a4..74575c0 --- a/ui-modules/home/app/views/about/about.template.html +++ b/ui-modules/home/app/views/about/about.template.html @@@ -135,5 -91,7 +135,8 @@@ </ul> </div> </div> + + <h2>Logbook</h2> + <br-logbook></br-logbook> </div> +
