From 638a7c86099bdd70196d13f3aa1fe284e1d2c131 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 20 Feb 2015 12:57:15 -0800
Subject: [PATCH] [Fixed Position] Add dialog for text

Add dialog for text elements in fixed position view;
tweak styling on some other element types. WTD-880.
---
 .../layout/res/templates/elements/box.html    |  1 -
 .../layout/res/templates/elements/image.html  |  4 ++-
 .../layout/res/templates/elements/text.html   |  6 ++---
 .../layout/src/elements/ElementFactory.js     | 26 +++++++++++++++++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/platform/features/layout/res/templates/elements/box.html b/platform/features/layout/res/templates/elements/box.html
index eab7cf0af5..5938549bad 100644
--- a/platform/features/layout/res/templates/elements/box.html
+++ b/platform/features/layout/res/templates/elements/box.html
@@ -1,4 +1,3 @@
 <div ng-style="{ background: ngModel.fill }"
      style="width: 100%; height: 100%;">
-    ???
 </div>
\ No newline at end of file
diff --git a/platform/features/layout/res/templates/elements/image.html b/platform/features/layout/res/templates/elements/image.html
index a00e18faaa..041147df27 100644
--- a/platform/features/layout/res/templates/elements/image.html
+++ b/platform/features/layout/res/templates/elements/image.html
@@ -1 +1,3 @@
-<img ng-src="{{ngModel.element.url}}" style="width: 100%; height: 100%;"></img>
\ No newline at end of file
+<div ng-style="{ 'background-image': 'url(' + ngModel.element.url + ')'}"
+     style="width: 100%; height: 100%; background-size: contain; background-repeat: no-repeat; background-position: center;">
+</div>
\ No newline at end of file
diff --git a/platform/features/layout/res/templates/elements/text.html b/platform/features/layout/res/templates/elements/text.html
index e41d20b639..2b52f04598 100644
--- a/platform/features/layout/res/templates/elements/text.html
+++ b/platform/features/layout/res/templates/elements/text.html
@@ -1,4 +1,4 @@
-<div ng-style="{ background: ngModel.fill }"
-     style="width: 100%; height: 100%">
-    {{ngModel.text}}
+<div ng-style="{ background: ngModel.element.fill }"
+     style="width: 100%; height: 100%; overflow: hidden;">
+    {{ngModel.element.text}}
 </div>
\ No newline at end of file
diff --git a/platform/features/layout/src/elements/ElementFactory.js b/platform/features/layout/src/elements/ElementFactory.js
index 9e1ee6e2b9..dc1eb27e82 100644
--- a/platform/features/layout/src/elements/ElementFactory.js
+++ b/platform/features/layout/src/elements/ElementFactory.js
@@ -6,8 +6,15 @@ define(
         "use strict";
 
         var INITIAL_STATES = {
-                "fixed.image": {
-                    url: "http://www.nasa.gov/sites/default/themes/NASAPortal/images/nasa-logo.gif"
+                "fixed.image": {},
+                "fixed.box": {
+                    fill: "#888",
+                    border: "transparent"
+                },
+                "fixed.line": {},
+                "fixed.text": {
+                    fill: "transparent",
+                    border: "transparent"
                 }
             },
             DIALOGS = {
@@ -25,6 +32,21 @@ define(
                             ]
                         }
                     ]
+                },
+                "fixed.text": {
+                    name: "Text Element Properties",
+                    sections: [
+                        {
+                            rows: [
+                                {
+                                    key: "text",
+                                    control: "textfield",
+                                    name: "Text",
+                                    required: true
+                                }
+                            ]
+                        }
+                    ]
                 }
             };