[Fixed Position] Add dialog for text

Add dialog for text elements in fixed position view;
tweak styling on some other element types. WTD-880.
This commit is contained in:
Victor Woeltjen 2015-02-20 12:57:15 -08:00
parent f5b6be9b5d
commit 638a7c8609
4 changed files with 30 additions and 7 deletions

View File

@ -1,4 +1,3 @@
<div ng-style="{ background: ngModel.fill }"
style="width: 100%; height: 100%;">
???
</div>

View File

@ -1 +1,3 @@
<img ng-src="{{ngModel.element.url}}" style="width: 100%; height: 100%;"></img>
<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>

View File

@ -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>

View File

@ -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
}
]
}
]
}
};