From bf1fa0ac4c5c453f831f76e1a86b128cc14dc509 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 26 Feb 2016 13:07:50 -0800 Subject: [PATCH] [Templates] Include templates using text plugin Resolves #673 --- platform/commonUI/about/bundle.js | 28 ++++++-- platform/commonUI/browse/bundle.js | 42 ++++++++---- platform/commonUI/dialog/bundle.js | 28 ++++++-- platform/commonUI/edit/bundle.js | 24 +++++-- platform/commonUI/general/bundle.js | 80 +++++++++++++++++------ platform/commonUI/inspect/bundle.js | 16 +++-- platform/commonUI/notification/bundle.js | 4 +- platform/features/clock/bundle.js | 8 ++- platform/features/conductor/bundle.js | 4 +- platform/features/events/bundle.js | 4 +- platform/features/imagery/bundle.js | 4 +- platform/features/layout/bundle.js | 32 ++++++--- platform/features/pages/bundle.js | 4 +- platform/features/plot/bundle.js | 4 +- platform/features/rtevents/bundle.js | 4 +- platform/features/rtscrolling/bundle.js | 4 +- platform/features/scrolling/bundle.js | 4 +- platform/features/static-markup/bundle.js | 4 +- platform/features/timeline/bundle.js | 42 ++++++++---- platform/forms/bundle.js | 36 +++++++--- platform/persistence/queue/bundle.js | 4 +- platform/search/bundle.js | 12 +++- 22 files changed, 292 insertions(+), 100 deletions(-) diff --git a/platform/commonUI/about/bundle.js b/platform/commonUI/about/bundle.js index 90235af297..aff0825f5c 100644 --- a/platform/commonUI/about/bundle.js +++ b/platform/commonUI/about/bundle.js @@ -26,12 +26,26 @@ define([ "./src/LogoController", "./src/AboutController", "./src/LicenseController", + "text!./res/templates/app-logo.html", + "text!./res/templates/about-logo.html", + "text!./res/templates/overlay-about.html", + "text!./res/templates/license-apache.html", + "text!./res/templates/license-mit.html", + "text!./res/templates/licenses.html", + "text!./res/templates/licenses-export-md.html", 'legacyRegistry' ], function ( aboutDialogTemplate, LogoController, AboutController, LicenseController, + appLogoTemplate, + aboutLogoTemplate, + overlayAboutTemplate, + licenseApacheTemplate, + licenseMitTemplate, + licensesTemplate, + licensesExportMdTemplate, legacyRegistry ) { "use strict"; @@ -43,12 +57,12 @@ define([ { "key": "app-logo", "priority": "optional", - "templateUrl": "templates/app-logo.html" + "template": appLogoTemplate }, { "key": "about-logo", "priority": "preferred", - "templateUrl": "templates/about-logo.html" + "template": aboutLogoTemplate }, { "key": "about-dialog", @@ -56,15 +70,15 @@ define([ }, { "key": "overlay-about", - "templateUrl": "templates/overlay-about.html" + "template": overlayAboutTemplate }, { "key": "license-apache", - "templateUrl": "templates/license-apache.html" + "template": licenseApacheTemplate }, { "key": "license-mit", - "templateUrl": "templates/license-mit.html" + "template": licenseMitTemplate } ], "controllers": [ @@ -156,11 +170,11 @@ define([ "routes": [ { "when": "/licenses", - "templateUrl": "templates/licenses.html" + "template": licensesTemplate }, { "when": "/licenses-md", - "templateUrl": "templates/licenses-export-md.html" + "template": licensesExportMdTemplate } ] } diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js index 10eb6c7004..74c4059cab 100644 --- a/platform/commonUI/browse/bundle.js +++ b/platform/commonUI/browse/bundle.js @@ -37,6 +37,16 @@ define([ "./src/creation/AddActionProvider", "./src/creation/CreationService", "./src/windowing/WindowTitler", + "text!./res/templates/browse.html", + "text!./res/templates/create/locator.html", + "text!./res/templates/browse-object.html", + "text!./res/templates/create/create-button.html", + "text!./res/templates/create/create-menu.html", + "text!./res/templates/items/grid-item.html", + "text!./res/templates/browse/object-header.html", + "text!./res/templates/menu-arrow.html", + "text!./res/templates/back-arrow.html", + "text!./res/templates/items/items.html", 'legacyRegistry' ], function ( BrowseController, @@ -54,6 +64,16 @@ define([ AddActionProvider, CreationService, WindowTitler, + browseTemplate, + locatorTemplate, + browseObjectTemplate, + createButtonTemplate, + createMenuTemplate, + gridItemTemplate, + objectHeaderTemplate, + menuArrowTemplate, + backArrowTemplate, + itemsTemplate, legacyRegistry ) { "use strict"; @@ -63,12 +83,12 @@ define([ "routes": [ { "when": "/browse/:ids*", - "templateUrl": "templates/browse.html", + "template": browseTemplate, "reloadOnSearch": false }, { "when": "", - "templateUrl": "templates/browse.html", + "template": browseTemplate, "reloadOnSearch": false } ], @@ -134,13 +154,13 @@ define([ "controls": [ { "key": "locator", - "templateUrl": "templates/create/locator.html" + "template": locatorTemplate } ], "representations": [ { "key": "browse-object", - "templateUrl": "templates/browse-object.html", + "template": browseObjectTemplate, "gestures": [ "drop" ], @@ -150,18 +170,18 @@ define([ }, { "key": "create-button", - "templateUrl": "templates/create/create-button.html" + "template": createButtonTemplate }, { "key": "create-menu", - "templateUrl": "templates/create/create-menu.html", + "template": createMenuTemplate, "uses": [ "action" ] }, { "key": "grid-item", - "templateUrl": "templates/items/grid-item.html", + "template": gridItemTemplate, "uses": [ "type", "action", @@ -174,14 +194,14 @@ define([ }, { "key": "object-header", - "templateUrl": "templates/browse/object-header.html", + "template": objectHeaderTemplate, "uses": [ "type" ] }, { "key": "menu-arrow", - "templateUrl": "templates/menu-arrow.html", + "template": menuArrowTemplate, "uses": [ "action" ], @@ -194,7 +214,7 @@ define([ "uses": [ "context" ], - "templateUrl": "templates/back-arrow.html" + "template": backArrowTemplate } ], "services": [ @@ -250,7 +270,7 @@ define([ "name": "Items", "glyph": "9", "description": "Grid of available items", - "templateUrl": "templates/items/items.html", + "template": itemsTemplate, "uses": [ "composition" ], diff --git a/platform/commonUI/dialog/bundle.js b/platform/commonUI/dialog/bundle.js index 3839afbcf8..3d99408478 100644 --- a/platform/commonUI/dialog/bundle.js +++ b/platform/commonUI/dialog/bundle.js @@ -24,10 +24,24 @@ define([ "./src/DialogService", "./src/OverlayService", + "text!./res/templates/overlay-dialog.html", + "text!./res/templates/overlay-options.html", + "text!./res/templates/dialog.html", + "text!./res/templates/overlay-blocking-message.html", + "text!./res/templates/message.html", + "text!./res/templates/overlay-message-list.html", + "text!./res/templates/overlay.html", 'legacyRegistry' ], function ( DialogService, OverlayService, + overlayDialogTemplate, + overlayOptionsTemplate, + dialogTemplate, + overlayBlockingMessageTemplate, + messageTemplate, + overlayMessageListTemplate, + overlayTemplate, legacyRegistry ) { "use strict"; @@ -57,33 +71,33 @@ define([ "templates": [ { "key": "overlay-dialog", - "templateUrl": "templates/overlay-dialog.html" + "template": overlayDialogTemplate }, { "key": "overlay-options", - "templateUrl": "templates/overlay-options.html" + "template": overlayOptionsTemplate }, { "key": "form-dialog", - "templateUrl": "templates/dialog.html" + "template": dialogTemplate }, { "key": "overlay-blocking-message", - "templateUrl": "templates/overlay-blocking-message.html" + "template": overlayBlockingMessageTemplate }, { "key": "message", - "templateUrl": "templates/message.html" + "template": messageTemplate }, { "key": "overlay-message-list", - "templateUrl": "templates/overlay-message-list.html" + "template": overlayMessageListTemplate } ], "containers": [ { "key": "overlay", - "templateUrl": "templates/overlay.html" + "template": overlayTemplate } ] } diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index f5142031e6..c4b0da1798 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -36,6 +36,12 @@ define([ "./src/policies/EditActionPolicy", "./src/representers/EditRepresenter", "./src/representers/EditToolbarRepresenter", + "text!./res/templates/edit.html", + "text!./res/templates/library.html", + "text!./res/templates/edit-object.html", + "text!./res/templates/edit-action-buttons.html", + "text!./res/templates/elements.html", + "text!./res/templates/topbar-edit.html", 'legacyRegistry' ], function ( EditController, @@ -52,6 +58,12 @@ define([ EditActionPolicy, EditRepresenter, EditToolbarRepresenter, + editTemplate, + libraryTemplate, + editObjectTemplate, + editActionButtonsTemplate, + elementsTemplate, + topbarEditTemplate, legacyRegistry ) { "use strict"; @@ -61,7 +73,7 @@ define([ "routes": [ { "when": "/edit", - "templateUrl": "templates/edit.html" + "template": editTemplate } ], "controllers": [ @@ -185,27 +197,27 @@ define([ "templates": [ { "key": "edit-library", - "templateUrl": "templates/library.html" + "template": libraryTemplate } ], "representations": [ { "key": "edit-object", - "templateUrl": "templates/edit-object.html", + "template": editObjectTemplate, "uses": [ "view" ] }, { "key": "edit-action-buttons", - "templateUrl": "templates/edit-action-buttons.html", + "template": editActionButtonsTemplate, "uses": [ "action" ] }, { "key": "edit-elements", - "templateUrl": "templates/elements.html", + "template": elementsTemplate, "uses": [ "composition" ], @@ -215,7 +227,7 @@ define([ }, { "key": "topbar-edit", - "templateUrl": "templates/topbar-edit.html" + "template": topbarEditTemplate } ], "representers": [ diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js index 6077785cf1..71c5890947 100644 --- a/platform/commonUI/general/bundle.js +++ b/platform/commonUI/general/bundle.js @@ -48,6 +48,25 @@ define([ "./src/directives/MCTScroll", "./src/directives/MCTSplitPane", "./src/directives/MCTSplitter", + "text!./res/templates/bottombar.html", + "text!./res/templates/controls/action-button.html", + "text!./res/templates/controls/input-filter.html", + "text!./res/templates/indicator.html", + "text!./res/templates/message-banner.html", + "text!./res/templates/progress-bar.html", + "text!./res/templates/controls/time-controller.html", + "text!./res/templates/containers/accordion.html", + "text!./res/templates/subtree.html", + "text!./res/templates/tree.html", + "text!./res/templates/tree-node.html", + "text!./res/templates/label.html", + "text!./res/templates/controls/action-group.html", + "text!./res/templates/menu/context-menu.html", + "text!./res/templates/controls/switcher.html", + "text!./res/templates/object-inspector.html", + "text!./res/templates/controls/selector.html", + "text!./res/templates/controls/datetime-picker.html", + "text!./res/templates/controls/datetime-field.html", 'legacyRegistry' ], function ( UrlService, @@ -76,6 +95,25 @@ define([ MCTScroll, MCTSplitPane, MCTSplitter, + bottombarTemplate, + actionButtonTemplate, + inputFilterTemplate, + indicatorTemplate, + messageBannerTemplate, + progressBarTemplate, + timeControllerTemplate, + accordionTemplate, + subtreeTemplate, + treeTemplate, + treeNodeTemplate, + labelTemplate, + actionGroupTemplate, + contextMenuTemplate, + switcherTemplate, + objectInspectorTemplate, + selectorTemplate, + datetimePickerTemplate, + datetimeFieldTemplate, legacyRegistry ) { "use strict"; @@ -138,31 +176,31 @@ define([ "templates": [ { "key": "bottombar", - "templateUrl": "templates/bottombar.html" + "template": bottombarTemplate }, { "key": "action-button", - "templateUrl": "templates/controls/action-button.html" + "template": actionButtonTemplate }, { "key": "input-filter", - "templateUrl": "templates/controls/input-filter.html" + "template": inputFilterTemplate }, { "key": "indicator", - "templateUrl": "templates/indicator.html" + "template": indicatorTemplate }, { "key": "message-banner", - "templateUrl": "templates/message-banner.html" + "template": messageBannerTemplate }, { "key": "progress-bar", - "templateUrl": "templates/progress-bar.html" + "template": progressBarTemplate }, { "key": "time-controller", - "templateUrl": "templates/controls/time-controller.html" + "template": timeControllerTemplate } ], "controllers": [ @@ -371,7 +409,7 @@ define([ "containers": [ { "key": "accordion", - "templateUrl": "templates/containers/accordion.html", + "template": accordionTemplate, "attributes": [ "label" ] @@ -380,7 +418,7 @@ define([ "representations": [ { "key": "tree", - "templateUrl": "templates/subtree.html", + "template": subtreeTemplate, "uses": [ "composition" ], @@ -389,25 +427,25 @@ define([ }, { "key": "tree", - "templateUrl": "templates/tree.html" + "template": treeTemplate }, { "key": "subtree", - "templateUrl": "templates/subtree.html", + "template": subtreeTemplate, "uses": [ "composition" ] }, { "key": "tree-node", - "templateUrl": "templates/tree-node.html", + "template": treeNodeTemplate, "uses": [ "action" ] }, { "key": "label", - "templateUrl": "templates/label.html", + "template": labelTemplate, "uses": [ "type", "location" @@ -420,7 +458,7 @@ define([ }, { "key": "node", - "templateUrl": "templates/label.html", + "template": labelTemplate, "uses": [ "type" ], @@ -431,42 +469,42 @@ define([ }, { "key": "action-group", - "templateUrl": "templates/controls/action-group.html", + "template": actionGroupTemplate, "uses": [ "action" ] }, { "key": "context-menu", - "templateUrl": "templates/menu/context-menu.html", + "template": contextMenuTemplate, "uses": [ "action" ] }, { "key": "switcher", - "templateUrl": "templates/controls/switcher.html", + "template": switcherTemplate, "uses": [ "view" ] }, { "key": "object-inspector", - "templateUrl": "templates/object-inspector.html" + "template": objectInspectorTemplate } ], "controls": [ { "key": "selector", - "templateUrl": "templates/controls/selector.html" + "template": selectorTemplate }, { "key": "datetime-picker", - "templateUrl": "templates/controls/datetime-picker.html" + "template": datetimePickerTemplate }, { "key": "datetime-field", - "templateUrl": "templates/controls/datetime-field.html" + "template": datetimeFieldTemplate } ], "licenses": [ diff --git a/platform/commonUI/inspect/bundle.js b/platform/commonUI/inspect/bundle.js index ea2f58e432..9576a344c1 100644 --- a/platform/commonUI/inspect/bundle.js +++ b/platform/commonUI/inspect/bundle.js @@ -25,11 +25,19 @@ define([ "./src/gestures/InfoGesture", "./src/gestures/InfoButtonGesture", "./src/services/InfoService", + "text!./res/info-table.html", + "text!./res/info-bubble.html", + "text!./res/bubble.html", + "text!./res/templates/info-button.html", 'legacyRegistry' ], function ( InfoGesture, InfoButtonGesture, InfoService, + infoTableTemplate, + infoBubbleTemplate, + bubbleTemplate, + infoButtonTemplate, legacyRegistry ) { "use strict"; @@ -39,17 +47,17 @@ define([ "templates": [ { "key": "info-table", - "templateUrl": "info-table.html" + "template": infoTableTemplate }, { "key": "info-bubble", - "templateUrl": "info-bubble.html" + "template": infoBubbleTemplate } ], "containers": [ { "key": "bubble", - "templateUrl": "bubble.html", + "template": bubbleTemplate, "attributes": [ "bubbleTitle", "bubbleLayout" @@ -99,7 +107,7 @@ define([ "representations": [ { "key": "info-button", - "templateUrl": "templates/info-button.html", + "template": infoButtonTemplate, "gestures": [ "infobutton" ] diff --git a/platform/commonUI/notification/bundle.js b/platform/commonUI/notification/bundle.js index a9123847fc..4bde1dff03 100644 --- a/platform/commonUI/notification/bundle.js +++ b/platform/commonUI/notification/bundle.js @@ -25,11 +25,13 @@ define([ "./src/NotificationIndicatorController", "./src/NotificationIndicator", "./src/NotificationService", + "text!./res/notification-indicator.html", 'legacyRegistry' ], function ( NotificationIndicatorController, NotificationIndicator, NotificationService, + notificationIndicatorTemplate, legacyRegistry ) { "use strict"; @@ -53,7 +55,7 @@ define([ "templates": [ { "key": "notificationIndicatorTemplate", - "templateUrl": "notification-indicator.html" + "template": notificationIndicatorTemplate } ], "controllers": [ diff --git a/platform/features/clock/bundle.js b/platform/features/clock/bundle.js index b7661e418b..1d22a3f8a0 100644 --- a/platform/features/clock/bundle.js +++ b/platform/features/clock/bundle.js @@ -29,6 +29,8 @@ define([ "./src/controllers/RefreshingController", "./src/actions/StartTimerAction", "./src/actions/RestartTimerAction", + "text!./res/templates/clock.html", + "text!./res/templates/timer.html", 'legacyRegistry' ], function ( ClockIndicator, @@ -38,6 +40,8 @@ define([ RefreshingController, StartTimerAction, RestartTimerAction, + clockTemplate, + timerTemplate, legacyRegistry ) { "use strict"; @@ -116,13 +120,13 @@ define([ "key": "clock", "type": "clock", "editable": false, - "templateUrl": "templates/clock.html" + "template": clockTemplate }, { "key": "timer", "type": "timer", "editable": false, - "templateUrl": "templates/timer.html" + "template": timerTemplate } ], "actions": [ diff --git a/platform/features/conductor/bundle.js b/platform/features/conductor/bundle.js index 1a215e2a10..9987be5c68 100644 --- a/platform/features/conductor/bundle.js +++ b/platform/features/conductor/bundle.js @@ -25,11 +25,13 @@ define([ "./src/ConductorRepresenter", "./src/ConductorTelemetryDecorator", "./src/ConductorService", + "text!./res/templates/time-conductor.html", 'legacyRegistry' ], function ( ConductorRepresenter, ConductorTelemetryDecorator, ConductorService, + timeConductorTemplate, legacyRegistry ) { "use strict"; @@ -70,7 +72,7 @@ define([ "templates": [ { "key": "time-conductor", - "templateUrl": "templates/time-conductor.html" + "template": timeConductorTemplate } ], "constants": [ diff --git a/platform/features/events/bundle.js b/platform/features/events/bundle.js index 829036acb3..f494784eff 100644 --- a/platform/features/events/bundle.js +++ b/platform/features/events/bundle.js @@ -25,11 +25,13 @@ define([ "./src/EventListController", "./src/directives/MCTDataTable", "./src/policies/MessagesViewPolicy", + "text!./res/templates/messages.html", 'legacyRegistry' ], function ( EventListController, MCTDataTable, MessagesViewPolicy, + messagesTemplate, legacyRegistry ) { "use strict"; @@ -44,7 +46,7 @@ define([ "name": "Messages", "glyph": "5", "description": "Scrolling list of messages.", - "templateUrl": "templates/messages.html", + "template": messagesTemplate, "needs": [ "telemetry" ], diff --git a/platform/features/imagery/bundle.js b/platform/features/imagery/bundle.js index 79c3d00994..e17534fc4c 100644 --- a/platform/features/imagery/bundle.js +++ b/platform/features/imagery/bundle.js @@ -25,11 +25,13 @@ define([ "./src/policies/ImageryViewPolicy", "./src/controllers/ImageryController", "./src/directives/MCTBackgroundImage", + "text!./res/templates/imagery.html", 'legacyRegistry' ], function ( ImageryViewPolicy, ImageryController, MCTBackgroundImage, + imageryTemplate, legacyRegistry ) { "use strict"; @@ -42,7 +44,7 @@ define([ "name": "Imagery", "key": "imagery", "glyph": "ã", - "templateUrl": "templates/imagery.html", + "template": imageryTemplate, "priority": "preferred", "needs": [ "telemetry" diff --git a/platform/features/layout/bundle.js b/platform/features/layout/bundle.js index 538d456007..493a910b97 100644 --- a/platform/features/layout/bundle.js +++ b/platform/features/layout/bundle.js @@ -25,11 +25,27 @@ define([ "./src/LayoutController", "./src/FixedController", "./src/LayoutCompositionPolicy", + "text!./res/templates/layout.html", + "text!./res/templates/fixed.html", + "text!./res/templates/frame.html", + "text!./res/templates/elements/telemetry.html", + "text!./res/templates/elements/box.html", + "text!./res/templates/elements/line.html", + "text!./res/templates/elements/text.html", + "text!./res/templates/elements/image.html", 'legacyRegistry' ], function ( LayoutController, FixedController, LayoutCompositionPolicy, + layoutTemplate, + fixedTemplate, + frameTemplate, + telemetryTemplate, + boxTemplate, + lineTemplate, + textTemplate, + imageTemplate, legacyRegistry ) { "use strict"; @@ -44,7 +60,7 @@ define([ "name": "Display Layout", "glyph": "L", "type": "layout", - "templateUrl": "templates/layout.html", + "template": layoutTemplate, "editable": true, "uses": [] }, @@ -53,7 +69,7 @@ define([ "name": "Fixed Position", "glyph": "3", "type": "telemetry.panel", - "templateUrl": "templates/fixed.html", + "template": fixedTemplate, "uses": [ "composition" ], @@ -191,7 +207,7 @@ define([ "representations": [ { "key": "frame", - "templateUrl": "templates/frame.html" + "template": frameTemplate } ], "controllers": [ @@ -218,23 +234,23 @@ define([ "templates": [ { "key": "fixed.telemetry", - "templateUrl": "templates/elements/telemetry.html" + "template": telemetryTemplate }, { "key": "fixed.box", - "templateUrl": "templates/elements/box.html" + "template": boxTemplate }, { "key": "fixed.line", - "templateUrl": "templates/elements/line.html" + "template": lineTemplate }, { "key": "fixed.text", - "templateUrl": "templates/elements/text.html" + "template": textTemplate }, { "key": "fixed.image", - "templateUrl": "templates/elements/image.html" + "template": imageTemplate } ], "policies": [ diff --git a/platform/features/pages/bundle.js b/platform/features/pages/bundle.js index 1d5cb24210..70119db5bd 100644 --- a/platform/features/pages/bundle.js +++ b/platform/features/pages/bundle.js @@ -23,9 +23,11 @@ define([ "./src/EmbeddedPageController", + "text!./res/iframe.html", 'legacyRegistry' ], function ( EmbeddedPageController, + iframeTemplate, legacyRegistry ) { "use strict"; @@ -54,7 +56,7 @@ define([ ], "views": [ { - "templateUrl": "iframe.html", + "template": iframeTemplate, "name": "Page", "type": "example.page", "key": "example.page", diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 18eba3aa51..e780a61d2c 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -25,11 +25,13 @@ define([ "./src/MCTChart", "./src/PlotController", "./src/policies/PlotViewPolicy", + "text!./res/templates/plot.html", 'legacyRegistry' ], function ( MCTChart, PlotController, PlotViewPolicy, + plotTemplate, legacyRegistry ) { "use strict"; @@ -42,7 +44,7 @@ define([ "name": "Plot", "key": "plot", "glyph": "6", - "templateUrl": "templates/plot.html", + "template": plotTemplate, "needs": [ "telemetry" ], diff --git a/platform/features/rtevents/bundle.js b/platform/features/rtevents/bundle.js index 8efaf072bd..25142d7dc6 100644 --- a/platform/features/rtevents/bundle.js +++ b/platform/features/rtevents/bundle.js @@ -25,11 +25,13 @@ define([ "./src/RTEventListController", "./src/directives/MCTRTDataTable", "./src/policies/RTMessagesViewPolicy", + "text!./res/templates/rtmessages.html", 'legacyRegistry' ], function ( RTEventListController, MCTRTDataTable, RTMessagesViewPolicy, + rtmessagesTemplate, legacyRegistry ) { "use strict"; @@ -44,7 +46,7 @@ define([ "name": "RT Messages", "glyph": "5", "description": "Scrolling list of real time messages.", - "templateUrl": "templates/rtmessages.html", + "template": rtmessagesTemplate, "needs": [ "telemetry" ], diff --git a/platform/features/rtscrolling/bundle.js b/platform/features/rtscrolling/bundle.js index d0b8f68f10..3466dc44f1 100644 --- a/platform/features/rtscrolling/bundle.js +++ b/platform/features/rtscrolling/bundle.js @@ -23,9 +23,11 @@ define([ "./src/RTScrollingListController", + "text!./res/templates/rtscrolling.html", 'legacyRegistry' ], function ( RTScrollingListController, + rtscrollingTemplate, legacyRegistry ) { "use strict"; @@ -40,7 +42,7 @@ define([ "name": "Scrolling", "glyph": "5", "description": "Scrolling list of data values.", - "templateUrl": "templates/rtscrolling.html", + "template": rtscrollingTemplate, "needs": [ "telemetry" ], diff --git a/platform/features/scrolling/bundle.js b/platform/features/scrolling/bundle.js index 546fb6a06b..567330e165 100644 --- a/platform/features/scrolling/bundle.js +++ b/platform/features/scrolling/bundle.js @@ -23,9 +23,11 @@ define([ "./src/ScrollingListController", + "text!./res/templates/scrolling.html", 'legacyRegistry' ], function ( ScrollingListController, + scrollingTemplate, legacyRegistry ) { "use strict"; @@ -40,7 +42,7 @@ define([ "name": "Scrolling", "glyph": "5", "description": "Scrolling list of data values.", - "templateUrl": "templates/scrolling.html", + "template": scrollingTemplate, "needs": [ "telemetry" ], diff --git a/platform/features/static-markup/bundle.js b/platform/features/static-markup/bundle.js index 63dfe3ac0b..4ac5a13701 100644 --- a/platform/features/static-markup/bundle.js +++ b/platform/features/static-markup/bundle.js @@ -23,9 +23,11 @@ define([ + "text!./res/markup.html", 'legacyRegistry' ], function ( + markupTemplate, legacyRegistry ) { "use strict"; @@ -45,7 +47,7 @@ define([ ], "views": [ { - "templateUrl": "markup.html", + "template": markupTemplate, "name": "Static Markup", "type": "static.markup", "key": "static.markup" diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index a791fc4fb0..5be95f643c 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -38,6 +38,16 @@ define([ "./src/directives/MCTSwimlaneDrop", "./src/directives/MCTSwimlaneDrag", "./src/services/ObjectLoader", + "text!./res/templates/values.html", + "text!./res/templates/timeline.html", + "text!./res/templates/activity-gantt.html", + "text!./res/templates/tabular-swimlane-cols-tree.html", + "text!./res/templates/tabular-swimlane-cols-data.html", + "text!./res/templates/resource-graphs.html", + "text!./res/templates/resource-graph-labels.html", + "text!./res/templates/legend-item.html", + "text!./res/templates/ticks.html", + "text!./res/templates/controls/datetime.html", 'legacyRegistry' ], function ( TimelineController, @@ -56,6 +66,16 @@ define([ MCTSwimlaneDrop, MCTSwimlaneDrag, ObjectLoader, + valuesTemplate, + timelineTemplate, + activityGanttTemplate, + tabularSwimlaneColsTreeTemplate, + tabularSwimlaneColsDataTemplate, + resourceGraphsTemplate, + resourceGraphLabelsTemplate, + legendItemTemplate, + ticksTemplate, + datetimeTemplate, legacyRegistry ) { "use strict"; @@ -226,7 +246,7 @@ define([ "key": "values", "name": "Values", "glyph": "A", - "templateUrl": "templates/values.html", + "template": valuesTemplate, "type": "mode", "uses": [ "cost" @@ -239,7 +259,7 @@ define([ "glyph": "S", "type": "timeline", "description": "A timeline view of Timelines and Activities.", - "templateUrl": "templates/timeline.html", + "template": timelineTemplate, "editable": true, "toolbar": { "sections": [ @@ -335,7 +355,7 @@ define([ "representations": [ { "key": "gantt", - "templateUrl": "templates/activity-gantt.html", + "template": activityGanttTemplate, "uses": [ "timespan", "type" @@ -346,42 +366,42 @@ define([ { "key": "timeline-tabular-swimlane-cols-tree", "priority": "mandatory", - "templateUrl": "templates/tabular-swimlane-cols-tree.html" + "template": tabularSwimlaneColsTreeTemplate }, { "key": "timeline-tabular-swimlane-cols-data", "priority": "mandatory", - "templateUrl": "templates/tabular-swimlane-cols-data.html" + "template": tabularSwimlaneColsDataTemplate }, { "key": "timeline-resource-graphs", "priority": "mandatory", - "templateUrl": "templates/resource-graphs.html" + "template": resourceGraphsTemplate }, { "key": "timeline-resource-graph-labels", "priority": "mandatory", - "templateUrl": "templates/resource-graph-labels.html" + "template": resourceGraphLabelsTemplate }, { "key": "timeline-legend-item", "priority": "mandatory", - "templateUrl": "templates/legend-item.html" + "template": legendItemTemplate }, { "key": "timeline-ticks", "priority": "mandatory", - "templateUrl": "templates/ticks.html" + "template": ticksTemplate } ], "controls": [ { "key": "timeline-datetime", - "templateUrl": "templates/controls/datetime.html" + "template": datetimeTemplate }, { "key": "duration", - "templateUrl": "templates/controls/datetime.html" + "template": datetimeTemplate } ], "controllers": [ diff --git a/platform/forms/bundle.js b/platform/forms/bundle.js index 43c76d18ae..5cd3cbdaad 100644 --- a/platform/forms/bundle.js +++ b/platform/forms/bundle.js @@ -29,6 +29,15 @@ define([ "./src/controllers/CompositeController", "./src/controllers/ColorController", "./src/controllers/DialogButtonController", + "text!./res/templates/controls/checkbox.html", + "text!./res/templates/controls/datetime.html", + "text!./res/templates/controls/select.html", + "text!./res/templates/controls/textfield.html", + "text!./res/templates/controls/button.html", + "text!./res/templates/controls/color.html", + "text!./res/templates/controls/composite.html", + "text!./res/templates/controls/menu-button.html", + "text!./res/templates/controls/dialog.html", 'legacyRegistry' ], function ( MCTForm, @@ -38,6 +47,15 @@ define([ CompositeController, ColorController, DialogButtonController, + checkboxTemplate, + datetimeTemplate, + selectTemplate, + textfieldTemplate, + buttonTemplate, + colorTemplate, + compositeTemplate, + menuButtonTemplate, + dialogTemplate, legacyRegistry ) { "use strict"; @@ -66,39 +84,39 @@ define([ "controls": [ { "key": "checkbox", - "templateUrl": "templates/controls/checkbox.html" + "template": checkboxTemplate }, { "key": "datetime", - "templateUrl": "templates/controls/datetime.html" + "template": datetimeTemplate }, { "key": "select", - "templateUrl": "templates/controls/select.html" + "template": selectTemplate }, { "key": "textfield", - "templateUrl": "templates/controls/textfield.html" + "template": textfieldTemplate }, { "key": "button", - "templateUrl": "templates/controls/button.html" + "template": buttonTemplate }, { "key": "color", - "templateUrl": "templates/controls/color.html" + "template": colorTemplate }, { "key": "composite", - "templateUrl": "templates/controls/composite.html" + "template": compositeTemplate }, { "key": "menu-button", - "templateUrl": "templates/controls/menu-button.html" + "template": menuButtonTemplate }, { "key": "dialog-button", - "templateUrl": "templates/controls/dialog.html" + "template": dialogTemplate } ], "controllers": [ diff --git a/platform/persistence/queue/bundle.js b/platform/persistence/queue/bundle.js index 473e91a06d..00df156b0a 100644 --- a/platform/persistence/queue/bundle.js +++ b/platform/persistence/queue/bundle.js @@ -25,11 +25,13 @@ define([ "./src/QueuingPersistenceCapabilityDecorator", "./src/PersistenceQueue", "./src/PersistenceFailureController", + "text!./res/templates/persistence-failure-dialog.html", 'legacyRegistry' ], function ( QueuingPersistenceCapabilityDecorator, PersistenceQueue, PersistenceFailureController, + persistenceFailureDialogTemplate, legacyRegistry ) { "use strict"; @@ -67,7 +69,7 @@ define([ "templates": [ { "key": "persistence-failure-dialog", - "templateUrl": "templates/persistence-failure-dialog.html" + "template": persistenceFailureDialogTemplate } ], "controllers": [ diff --git a/platform/search/bundle.js b/platform/search/bundle.js index 3ad0c8b77f..7a0a9f4b9e 100644 --- a/platform/search/bundle.js +++ b/platform/search/bundle.js @@ -27,6 +27,9 @@ define([ "./src/controllers/ClickAwayController", "./src/services/GenericSearchProvider", "./src/services/SearchAggregator", + "text!./res/templates/search-item.html", + "text!./res/templates/search.html", + "text!./res/templates/search-menu.html", 'legacyRegistry' ], function ( SearchController, @@ -34,6 +37,9 @@ define([ ClickAwayController, GenericSearchProvider, SearchAggregator, + searchItemTemplate, + searchTemplate, + searchMenuTemplate, legacyRegistry ) { "use strict"; @@ -80,17 +86,17 @@ define([ "representations": [ { "key": "search-item", - "templateUrl": "templates/search-item.html" + "template": searchItemTemplate } ], "templates": [ { "key": "search", - "templateUrl": "templates/search.html" + "template": searchTemplate }, { "key": "search-menu", - "templateUrl": "templates/search-menu.html" + "template": searchMenuTemplate } ], "components": [