From c628d88b3ec0fafafd554767e13978743a0d2062 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 14 Jan 2015 12:28:25 -0800 Subject: [PATCH] [About] Implement placeholder dialog Implement a placeholder for the About dialog, including some minimal version information. WTD-667. --- platform/commonUI/about/bundle.json | 8 ++++++++ .../commonUI/about/res/templates/about-dialog.html | 12 ++++++++++++ .../commonUI/about/res/templates/about-logo.html | 2 +- platform/commonUI/about/res/templates/licenses.html | 1 + .../commonUI/about/res/templates/overlay-about.html | 4 ++++ platform/core/bundle.json | 13 +++++++++++++ platform/framework/bundle.json | 3 ++- 7 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 platform/commonUI/about/res/templates/about-dialog.html create mode 100644 platform/commonUI/about/res/templates/licenses.html create mode 100644 platform/commonUI/about/res/templates/overlay-about.html diff --git a/platform/commonUI/about/bundle.json b/platform/commonUI/about/bundle.json index 663d2550eb..142241449c 100644 --- a/platform/commonUI/about/bundle.json +++ b/platform/commonUI/about/bundle.json @@ -11,6 +11,14 @@ "key": "about-logo", "priority": "preferred", "templateUrl": "templates/about-logo.html" + }, + { + "key": "about-dialog", + "templateUrl": "templates/about-dialog.html" + }, + { + "key": "overlay-about", + "templateUrl": "templates/overlay-about.html" } ], "controllers": [ diff --git a/platform/commonUI/about/res/templates/about-dialog.html b/platform/commonUI/about/res/templates/about-dialog.html new file mode 100644 index 0000000000..7840b8860b --- /dev/null +++ b/platform/commonUI/about/res/templates/about-dialog.html @@ -0,0 +1,12 @@ +
+ This is a placeholder for the about dialog. + + Show licenses. + +

+ + {{version.name}} + {{version.value}} + +

+
diff --git a/platform/commonUI/about/res/templates/about-logo.html b/platform/commonUI/about/res/templates/about-logo.html index c31a7d55a7..2b658c2696 100644 --- a/platform/commonUI/about/res/templates/about-logo.html +++ b/platform/commonUI/about/res/templates/about-logo.html @@ -1,4 +1,4 @@ - + diff --git a/platform/commonUI/about/res/templates/licenses.html b/platform/commonUI/about/res/templates/licenses.html new file mode 100644 index 0000000000..c3af087cd9 --- /dev/null +++ b/platform/commonUI/about/res/templates/licenses.html @@ -0,0 +1 @@ +Placeholder for open source licenses. \ No newline at end of file diff --git a/platform/commonUI/about/res/templates/overlay-about.html b/platform/commonUI/about/res/templates/overlay-about.html new file mode 100644 index 0000000000..f9af8cd923 --- /dev/null +++ b/platform/commonUI/about/res/templates/overlay-about.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 6cb0f329f6..3ae730083c 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -3,6 +3,19 @@ "description": "Defines core concepts of Open MCT Web.", "sources": "src", "extensions": { + "versions": [ + { + "name": "Open MCT Web", + "value": "0.3.0-dev", + "priority": 1000 + }, + { + "name": "Built", + "value": "YYYY-MM-DDTHH:MM:ssZ", + "description": "The date on which this version of the client was built.", + "priority": 990 + } + ], "components": [ { "provides": "objectService", diff --git a/platform/framework/bundle.json b/platform/framework/bundle.json index a09bea185c..057e9287d0 100644 --- a/platform/framework/bundle.json +++ b/platform/framework/bundle.json @@ -12,5 +12,6 @@ } } }, - "extensions": {} + "extensions": { + } } \ No newline at end of file