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

Updating media picker to work and look properly

Browse Source
This commit is contained in:
Shannon
2013-06-11 12:16:37 +02:00
parent da146891ef
commit a656911061
10 changed files with 120 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Umbraco.Web.UI.Client/build/belle/views/common/dialogs/mediapicker.html
View File

@@ -1,49 +0,0 @@
<div class="umb-panel" ng-controller="Umbraco.Dialogs.MediaPickerController">
<div class="umb-panel-header">
<div class="umb-el-wrap umb-panel-buttons">
<div class="pull-right umb-btn-toolbar">
<button class="btn">Create <i class="icon-upload"></i></button>
<button type="button" ng-click="submit(dialogData)" class="btn btn-primary">Select (x)</button>
</div>
</div>
</div>
<div class="umb-panel-body umb-scrollable" auto-scale="1">
<div class="umb-panel">
<div class="umb-control-group">
<ul class="breadcrumb">
<li><strong>You are here:</strong></li>
<li><a href="#">Media</a></li>
</ul>
<div id="search-form" ng-animate="'slide'">
<form class="form-search" ng-controller="SearchController">
<i class="icon-search"></i>
<input type="text"
ng-model="ui.searchTerm"
class="umb-search-field search-query"
placeholder="{{localization.app.search.typeToSearch}}"
on-blur="deActivateSearch()"
on-keyup="performSearch(ui.searchTerm)">
</form>
</div>
</ul>
<ul class="thumbnails">
<li class="span2" ng-repeat="image in images">
<a href="#" class="thumbnail" ng-class="{selected: dialogData.selection.indexOf(image) > -1}"
ng-click="selectMediaItem(image)"
prevent-default>
<img ng-src="{{image.thumbnail}}" />
<span style="color:white;">{{image.name}}</span>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>

29
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
View File

@@ -29,18 +29,25 @@
</div>
</ul>
<ul class="thumbnails">
<li class="span2" ng-repeat="image in images">
<ul class="thumbnails">
<li class="span2 folder" ng-repeat="image in images">
<a href="#" class="thumbnail" ng-class="{selected: dialogData.selection.indexOf(image) > -1}"
ng-click="selectMediaItem(image)"
prevent-default>
<img ng-src="{{image.thumbnail}}" />
<span style="color:white;">{{image.name}}</span>
</a>
</li>
</ul>
<a href="#" class="thumbnail" ng-class="{selected: dialogData.selection.indexOf(image) > -1}"
ng-click="selectMediaItem(image)"
prevent-default>
<div ng-switch on="image.isImage" >
<img ng-src="{{image.thumbnail}}" ng-switch-when="true" alt="{{image.name}}"/>
<span ng-switch-default>
<i class="icon-folder-close"></i>
</span>
</div>
{{image.name}}
</a>
</li>
</ul>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js
View File

@@ -28,8 +28,7 @@ angular.module("umbraco")
}
};
$scope.saveAndPublish = function (cnt) {
cnt.publishDate = new Date();
$scope.saveAndPublish = function (cnt) {
contentResource.publishContent(cnt, $routeParams.create, $scope.files)
.then(function(data) {
$scope.content = data;
@@ -38,7 +37,6 @@ angular.module("umbraco")
};
$scope.save = function (cnt) {
cnt.updateDate = new Date();
contentResource.saveContent(cnt, $routeParams.create, $scope.files)
.then(function (data) {
$scope.content = data;

13
src/Umbraco.Web.UI.Client/src/views/media/mediaedit.controller.js
View File

@@ -25,9 +25,18 @@ function mediaEditController($scope, $routeParams, mediaResource, notificationsS
$scope.files.push({ id: propertyId, file: files[i] });
}
};
//TODO: Clean this up and share this code with the content editor
$scope.saveAndPublish = function (cnt) {
mediaResource.saveMedia(cnt, $routeParams.create, $scope.files)
.then(function (data) {
$scope.content = data;
notificationsService.success("Published", "Media has been saved and published");
});
};
$scope.save = function (cnt) {
cnt.updateDate = new Date();
//TODO: Clean this up and share this code with the content editor
$scope.save = function (cnt) {
mediaResource.saveMedia(cnt, $routeParams.create, $scope.files)
.then(function (data) {
$scope.content = data;