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

[Mobile] Merge

Browse Source 
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
This commit is contained in:
Shivam Dave
2015-08-26 14:07:52 -07:00
parent 2542255342 b8b9721ddc
commit def5e17bb8
43 changed files with 1601 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/templates/controls/switcher.html
View File

@@ -21,7 +21,7 @@
-->
<span ng-controller="ViewSwitcherController">
<div
class="view-switcher menu-element btn btn-menu dropdown click-invoke"
class="view-switcher menu-element s-btn l-btn btn-menu dropdown click-invoke"
ng-if="view.length > 1"
ng-controller="ClickAwayController as toggle"
>

8
platform/commonUI/general/res/templates/tree-node.html
View File

@@ -21,14 +21,16 @@
-->
<span ng-controller="ToggleController as toggle">
<span ng-controller="TreeNodeController as treeNode">
<span class="tree-item menus-to-left"
<span
class="tree-item menus-to-left"
ng-class="{selected: treeNode.isSelected()}"
>
<mct-representation
<mct-representation
key="'label'"
mct-object="domainObject"
ng-model="ngModel"
ng-click="!treeNode.checkMobile() ? treeNode.setObject(ngModel, domainObject) : toggle.toggle(); treeNode.trackExpansion()"
ng-click="!treeNode.checkMobile() || model.composition == undefined ?
ngModel.selectedObject = domainObject : toggle.toggle(); treeNode.trackExpansion()"
>
</mct-representation>
<span