mirror of
https://github.com/nasa/openmct.git
synced 2025-01-01 19:06:40 +00:00
[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:
parent
f5b6be9b5d
commit
638a7c8609
@ -1,4 +1,3 @@
|
|||||||
<div ng-style="{ background: ngModel.fill }"
|
<div ng-style="{ background: ngModel.fill }"
|
||||||
style="width: 100%; height: 100%;">
|
style="width: 100%; height: 100%;">
|
||||||
???
|
|
||||||
</div>
|
</div>
|
@ -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>
|
@ -1,4 +1,4 @@
|
|||||||
<div ng-style="{ background: ngModel.fill }"
|
<div ng-style="{ background: ngModel.element.fill }"
|
||||||
style="width: 100%; height: 100%">
|
style="width: 100%; height: 100%; overflow: hidden;">
|
||||||
{{ngModel.text}}
|
{{ngModel.element.text}}
|
||||||
</div>
|
</div>
|
@ -6,8 +6,15 @@ define(
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var INITIAL_STATES = {
|
var INITIAL_STATES = {
|
||||||
"fixed.image": {
|
"fixed.image": {},
|
||||||
url: "http://www.nasa.gov/sites/default/themes/NASAPortal/images/nasa-logo.gif"
|
"fixed.box": {
|
||||||
|
fill: "#888",
|
||||||
|
border: "transparent"
|
||||||
|
},
|
||||||
|
"fixed.line": {},
|
||||||
|
"fixed.text": {
|
||||||
|
fill: "transparent",
|
||||||
|
border: "transparent"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
DIALOGS = {
|
DIALOGS = {
|
||||||
@ -25,6 +32,21 @@ define(
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"fixed.text": {
|
||||||
|
name: "Text Element Properties",
|
||||||
|
sections: [
|
||||||
|
{
|
||||||
|
rows: [
|
||||||
|
{
|
||||||
|
key: "text",
|
||||||
|
control: "textfield",
|
||||||
|
name: "Text",
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user