Migrated the old content picker to the new dialogs

This commit is contained in:
perploug
2013-09-18 15:44:50 +02:00
parent 4dd708820f
commit 4891c54ef5
9 changed files with 59 additions and 112 deletions

View File

@@ -28,7 +28,7 @@ angular.module("umbraco")
$scope.gotoFolder = function(folderId){
if(folderId > 0){
entityResource.getAncestors(folderId)
entityResource.getAncestors(folderId, "media")
.then(function(anc){
anc.splice(0,1);
$scope.path = anc;

View File

@@ -16,7 +16,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
</div>
</div>
<div class="pull-right umb-btn-toolbar">
<div class="pull-right">
<span class="btn fileinput-button" ng-class="{disabled: disabled}">
<i class="icon-page-up"></i>
<input type="file" name="files[]" multiple ng-disabled="disabled">
@@ -24,12 +24,9 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
</div>
</div>
</div>
<div class="umb-panel-body umb-scrollable" auto-scale="70">
<div class="control-group umb-control-group">
<ul class="breadcrumb">
<div class="row">
<ul class="breadcrumb span12">
<li><a href ng-click="gotoFolder(-1)" prevent-default>Media</a> / </li>
<li ng-repeat="item in path">
@@ -52,7 +49,11 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
</li>
</ul>
</div>
</div>
<div class="umb-panel-body umb-scrollable" auto-scale="70">
<div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader"
ng-hide="active() == 0"></div>

View File

@@ -3,7 +3,8 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
function ($scope, eventsService, $log) {
var dialogOptions = $scope.$parent.dialogOptions;
$scope.dialogTreeEventHandler = $({});
$scope.section = dialogOptions.section | "content";
$scope.section = dialogOptions.section;
$scope.dialogTreeEventHandler.bind("treeNodeSelect", function(ev, args){
args.event.preventDefault();

View File

@@ -12,7 +12,7 @@
<div class="umb-pane">
<umb-tree
section="{{section}}"
cachekey="contentpickerDialog"
cachekey="treepickerDialog"
showheader="false"
showoptions="false"
eventhandler="dialogTreeEventHandler">