yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add markup for member picker and content picker

Browse Source
This commit is contained in:
Mads Rasmussen
2017-02-09 10:42:15 +01:00
parent 1de52482e3
commit 1901fbb6ed
2 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
View File

@@ -1,34 +1,48 @@
<div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('content')"> <div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('content')">
<div class="umb-control-group"> <div ng-hide="miniListView">
<umb-tree-search-box
hide-search-callback="hideSearch" <div class="umb-control-group">
search-callback="onSearchResults" <umb-tree-search-box
search-from-id="{{searchInfo.searchFromId}}" hide-search-callback="hideSearch"
search-from-name="{{searchInfo.searchFromName}}" search-callback="onSearchResults"
show-search="{{searchInfo.showSearch}}" search-from-id="{{searchInfo.searchFromId}}"
section="content"> search-from-name="{{searchInfo.searchFromName}}"
</umb-tree-search-box> show-search="{{searchInfo.showSearch}}"
section="content">
</umb-tree-search-box>
</div>
<umb-tree-search-results
ng-if="searchInfo.showSearch"
results="searchInfo.results"
select-result-callback="selectResult">
</umb-tree-search-results>
<div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
<umb-tree
section="content"
treealias="content"
hideheader="{{hideHeader}}"
hideoptions="true"
isdialog="true"
customtreeparams="{{customTreeParams}}"
eventhandler="dialogTreeEventHandler"
enablelistviewsearch="true"
enablelistviewexpand="true"
enablecheckboxes="{{multiPicker}}">
</umb-tree>
</div>
</div> </div>
<umb-tree-search-results <umb-mini-list-view
ng-if="searchInfo.showSearch" ng-if="miniListView"
results="searchInfo.results" node="miniListView"
select-result-callback="selectResult"> entity-type="{{entityType}}"
</umb-tree-search-results> start-node-id="model.startNodeId"
on-select="selectListViewNode(node)"
<div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'"> on-close="closeMiniListView()">
<umb-tree </umb-mini-list-view>
section="content"
treealias="content"
hideheader="{{hideHeader}}"
hideoptions="true"
isdialog="true"
customtreeparams="{{customTreeParams}}"
eventhandler="dialogTreeEventHandler"
enablelistviewsearch="true"
enablecheckboxes="{{multiPicker}}">
</umb-tree>
</div>
</div> </div>

69
src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html
View File

@@ -1,34 +1,47 @@
<div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('member')"> <div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('member')">
<div class="umb-control-group"> <div ng-hide="miniListView">
<umb-tree-search-box
hide-search-callback="hideSearch"
search-callback="onSearchResults"
search-from-id="{{searchInfo.searchFromId}}"
search-from-name="{{searchInfo.searchFromName}}"
show-search="{{searchInfo.showSearch}}"
section="member">
</umb-tree-search-box>
</div>
<umb-tree-search-results <div class="umb-control-group">
ng-if="searchInfo.showSearch" <umb-tree-search-box
results="searchInfo.results" hide-search-callback="hideSearch"
select-result-callback="selectResult"> search-callback="onSearchResults"
</umb-tree-search-results> search-from-id="{{searchInfo.searchFromId}}"
search-from-name="{{searchInfo.searchFromName}}"
show-search="{{searchInfo.showSearch}}"
section="member">
</umb-tree-search-box>
</div>
<div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'"> <umb-tree-search-results
<umb-tree ng-if="searchInfo.showSearch"
section="member" results="searchInfo.results"
treealias="member" select-result-callback="selectResult">
hideheader="{{hideHeader}}" </umb-tree-search-results>
hideoptions="true"
isdialog="true" <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
customtreeparams="{{customTreeParams}}" <umb-tree
eventhandler="dialogTreeEventHandler" section="member"
enablelistviewsearch="true" treealias="member"
enablecheckboxes="{{multiPicker}}"> hideheader="{{hideHeader}}"
</umb-tree> hideoptions="true"
</div> isdialog="true"
customtreeparams="{{customTreeParams}}"
eventhandler="dialogTreeEventHandler"
enablelistviewsearch="true"
enablelistviewexpand="true"
enablecheckboxes="{{multiPicker}}">
</umb-tree>
</div>
</div>
<umb-mini-list-view
ng-if="miniListView"
node="miniListView"
entity-type="{{entityType}}"
start-node-id="model.startNodeId"
on-select="selectListViewNode(node)"
on-close="closeMiniListView()">
</umb-mini-list-view>
</div> </div>