alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Frontend] Normalized buttons in toolbar

Browse Source 
WTD-894
Fixed application of CSS styles in HTML templates to format buttons properly;
In-progress...
This commit is contained in:
Charles Hacskaylo
2015-02-25 09:54:44 -08:00
parent be3a31324d
commit db87147bbd
5 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/commonUI/general/res/templates/controls/action-button.html
View File

@@ -1,5 +1,4 @@
<a href="" <a class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
ng-class="{ labeled: parameters.labeled }" ng-class="{ labeled: parameters.labeled }"
title="{{parameters.action.getMetadata().description}}" title="{{parameters.action.getMetadata().description}}"
ng-click="parameters.action.perform()"> ng-click="parameters.action.perform()">

3
platform/forms/res/templates/controls/button.html
View File

@@ -1,5 +1,4 @@
<a href="" <a class="t-btn l-btn s-btn s-icon-btn s-very-subtle xxx"
class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
ng-class="{ labeled: structure.text }" ng-class="{ labeled: structure.text }"
ng-click="structure.click()"> ng-click="structure.click()">
<span class="ui-symbol icon"> <span class="ui-symbol icon">

2
platform/forms/res/templates/controls/color.html
View File

@@ -1,4 +1,4 @@
<div class="s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke" <div class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
ng-controller="ClickAwayController as toggle"> ng-controller="ClickAwayController as toggle">
<span ng-click="toggle.toggle()"> <span ng-click="toggle.toggle()">

2
platform/forms/res/templates/controls/menu-button.html
View File

@@ -1,4 +1,4 @@
<div class="s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke" <div class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
ng-controller="ClickAwayController as toggle"> ng-controller="ClickAwayController as toggle">
<span ng-click="toggle.toggle()"> <span ng-click="toggle.toggle()">

59
platform/forms/res/templates/toolbar.html
View File

@@ -1,34 +1,29 @@
<form name="tool-bar btn-bar contents" novalidate> <form novalidate>
<div class="tool-bar btn-bar contents abs">
<div class="form"> <span ng-repeat="section in structure.sections"
<span ng-repeat="section in structure.sections" class="control-group"
class="control-group coordinates" ng-if="!section.hidden"
ng-if="!section.hidden" title="{{section.description}}">
title="{{section.description}}"> <ng-form ng-repeat="item in section.items"
ng-class="{ 'input-labeled': item.name }"
<ng-form ng-repeat="item in section.items" ng-hide="item.hidden"
ng-class="{ 'input-labeled': item.name }" class="inline"
ng-hide="item.hidden" title="{{item.description}}"
class="inline" name="mctFormInner">
title="{{item.description}}"
name="mctFormInner">
<label ng-if="item.name">
{{item.name}}:
</label>
<mct-control key="item.control"
ng-class="{ disabled: item.disabled }"
ng-model="ngModel"
ng-required="item.required"
ng-pattern="getRegExp(item.pattern)"
options="item.options"
structure="item"
field="item.key">
</mct-control>
</ng-form>
</span>
</div>
<label ng-if="item.name">
{{item.name}}:
</label>
<mct-control key="item.control"
ng-class="{ disabled: item.disabled }"
ng-model="ngModel"
ng-required="item.required"
ng-pattern="getRegExp(item.pattern)"
options="item.options"
structure="item"
field="item.key">
</mct-control>
</ng-form>
</span>
</div>
</form> </form>