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

listview selection css

Browse Source
This commit is contained in:
perploug
2013-10-21 14:26:26 +02:00
parent 5a682c44bc
commit 652f1e52ec
24 changed files with 416 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
View File

@@ -32,7 +32,7 @@ angular.module("umbraco.directives")
if(!hideheader){
template +='<div>' +
'<h5><a href="#/{{section}}" ng-click="select(this, tree.root, $event)" on-right-click="altSelect(this, node, $event)" class="root-link">{{tree.name}}</a></h5>' +
'<h5><a href="#/{{section}}" ng-click="select(this, tree.root, $event)" on-right-click="altSelect(this, tree.root, $event)" class="root-link">{{tree.name}}</a></h5>' +
'<a href class="umb-options" ng-hide="tree.root.isContainer || !tree.root.menuUrl" ng-click="options(this, tree.root, $event)" ng-swipe-right="options(this, tree.root, $event)"><i></i><i></i><i></i></a>' +
'</div>';
}

1
src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
View File

@@ -551,7 +551,6 @@ angular.module('umbraco.services')
* hides any open navigation panes and resets the tree, actions and the currently selected node
*/
hideNavigation: function () {
this.ui.currentSection = "";
this.ui.actions = [];
this.ui.currentNode = undefined;
setMode("default");

2
src/Umbraco.Web.UI.Client/src/less/listview.less
View File

@@ -90,6 +90,8 @@
.umb-listview .selected input[type="checkbox"], .umb-listview tr:hover input[type="checkbox"]{display: inline-block;}
.umb-listview .inactive{color: @grayLight;}
.umb-listview .selected td{font-weight: bold;}
.umb-listview table thead {
font-size: 11px;
font-weight: 600;

1
src/Umbraco.Web.UI.Client/src/less/tree.less
View File

@@ -297,7 +297,6 @@ div.has-unpublished-version:before{
.umb-actions-child li {
display: block;
width: 100%;
}
.umb-actions-child a {

15
src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js
View File

@@ -7,7 +7,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController",
$scope.selectResult = function(result){
entityResource.getById(result.id, "Document").then(function(ent){
if(dialogOptions && dialogOptions.multipicker){
if(dialogOptions && dialogOptions.multiPicker){
$scope.showSearch = false;
$scope.results = [];
@@ -42,13 +42,20 @@ angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController",
args.event.stopPropagation();
eventsService.publish("Umbraco.Dialogs.ContentPickerController.Select", args).then(function(args){
if(dialogOptions && dialogOptions.multipicker){
if(dialogOptions && dialogOptions.multiPicker){
var c = $(args.event.target.parentElement);
if(!args.node.selected){
args.node.selected = true;
c.find("i.umb-tree-icon").hide()
.after("<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>");
var temp = "<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>";
var icon = c.find("i.umb-tree-icon");
if(icon.length > 0){
icon.hide().after(temp);
}else{
c.prepend(temp);
}
}else{
args.node.selected = false;
c.find(".temporary").remove();

12
src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
View File

@@ -1,6 +1,5 @@
<div class="umb-panel" ng-controller="Umbraco.Dialogs.IconPickerController">
<div class="umb-panel-header">
<div class="umb-el-wrap umb-panel-buttons">
<div class="span6">
<div class="form-search">
@@ -14,7 +13,7 @@
</div>
</div>
<div class="umb-panel-body umb-scrollable" auto-scale="0">
<div class="umb-panel-body with-footer">
<div class="umb-control-group">
<ul class="umb-thumbnails thumbnails">
@@ -28,4 +27,13 @@
</div>
<div class="umb-panel-footer" >
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
</div>
</div>
</div>
</div>

5
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
View File

@@ -61,14 +61,13 @@ angular.module("umbraco")
});
$scope.clickHandler = function(image, ev){
if (image.contentTypeAlias.toLowerCase() == 'folder') {
$scope.options.formData.currentFolder = image.id;
$scope.gotoFolder(image.id);
}else if (image.contentTypeAlias.toLowerCase() == 'image') {
eventsService.publish("Umbraco.Dialogs.MediaPickerController.Select", image).then(function(image){
if(dialogOptions && dialogOptions.multipicker){
if(dialogOptions && dialogOptions.multiPicker){
$scope.select(image);
image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
}else{
@@ -87,7 +86,7 @@ angular.module("umbraco")
}else if (image.contentTypeAlias.toLowerCase() == 'image') {
eventsService.publish("Umbraco.Dialogs.MediaPickerController.Select", image).then(function(image){
if(dialogOptions && dialogOptions.multipicker){
if(dialogOptions && dialogOptions.multiPicker){
$scope.select(image);
}else{
$scope.submit(image);

12
src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js
View File

@@ -32,8 +32,6 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams,
$scope.treeEventHandler = $({});
$scope.selectedId = navigationService.currentId;
//This reacts to clicks passed to the body element which emits a global call to close all dialogs
$rootScope.$on("closeDialogs", function (event) {
@@ -86,14 +84,10 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams,
//this reacts to tree items themselves being clicked
//the tree directive should not contain any handling, simply just bubble events
$scope.treeEventHandler.bind("treeNodeSelect", function (ev, args) {
var n = args.node;
ev.stopPropagation();
ev.preventDefault();
var n = args.node;
/*if(n.metaData && n.metaData.application){
$location.path(n.metaData.application).search("");
}else*/
if (n.metaData && n.metaData["jsClickCallback"] && angular.isString(n.metaData["jsClickCallback"]) && n.metaData["jsClickCallback"] !== "") {
//this is a legacy tree node!
@@ -121,8 +115,8 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams,
historyService.add({ name: n.name, link: n.routePath, icon: n.icon });
//not legacy, lets just set the route value and clear the query string if there is one.
$location.path(n.routePath).search("");
}else if(n.metaData && n.metaData.application){
$location.path("#/" + n.metaData.application);
} else if(args.element.section){
$location.path(args.element.section).search("");
}
navigationService.hideNavigation();

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
View File

@@ -35,7 +35,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.add = function() {
dialogService.mediaPicker({
multipicker: true,
multiPicker: true,
callback: function(data) {
_.each(data.selection, function(media, i) {
//shortcuts

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
View File

@@ -6,7 +6,7 @@ angular.module('umbraco')
function($scope, dialogService, entityResource, $log, iconHelper){
$scope.ids = $scope.model.value.split(',');
$scope.renderModel = [];
$scope.multipicker = true;
$scope.multiPicker = true;
entityResource.getByIds($scope.ids, "Member").then(function(data){
$(data).each(function(i, item){
@@ -16,7 +16,7 @@ angular.module('umbraco')
});
$scope.openMemberPicker =function(){
var d = dialogService.memberPicker({scope: $scope, multipicker: $scope.multipicker, callback: populate});
var d = dialogService.memberPicker({scope: $scope, multiPicker: $scope.multiPicker, callback: populate});
};
$scope.remove =function(index){