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

Nicer modal animations, fixes rte bug

Browse Source
This commit is contained in:
perploug
2013-08-12 22:23:06 +02:00
parent 5a435523ed
commit 9c38670dde
6 changed files with 32 additions and 22 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

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

4
src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
View File

@@ -34,8 +34,8 @@ angular.module("umbraco.directives")
'<ins ng-hide="node.hasChildren" style="background:none;width:18px;"></ins>' +
'<ins ng-show="node.hasChildren" ng-class="{\'icon-caret-right\': !node.expanded, \'icon-caret-down\': node.expanded}" ng-click="load(this, node)"></ins>' +
'<i class="{{node.cssClass}}" style="{{node.style}}"></i>' +
'<a href="{{node.routePath}}" ng-click="select(this, node, $event)" >{{node.name}}</a>' +
'<a href="#" class="umb-options" ng-hide="!node.menuUrl" ng-click="options(this, node, $event)"><i></i><i></i><i></i></a>' +
'<a href title="#{{node.routePath}}" ng-click="select(this, node, $event)" >{{node.name}}</a>' +
'<a href class="umb-options" ng-hide="!node.menuUrl" ng-click="options(this, node, $event)"><i></i><i></i><i></i></a>' +
'<div ng-show="node.loading" class="l"><div></div></div>' +
'</div>' +
'</li>',

28
src/Umbraco.Web.UI.Client/src/less/animations.less
View File

@@ -21,26 +21,38 @@
}
.slide-hide, .slide-show {
-webkit-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
-moz-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
-o-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
-webkit-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
-moz-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
-o-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
}
.slide-hide {
margin-left: 0;
-webkit-transform: translateX(0%);
-moz-transform: translateX(0%);
-ms-transform: translateX(0%);
transform: translateX(0%);
}
.slide-hide.slide-hide-active {
margin-left: -100%;
-webkit-transform: translateX(-100%);
-moz-transform: translateX(-100%);
-ms-transform: translateX(-100%);
transform: translateX(-100%);
}
.slide-show {
margin-left: -100%;
-webkit-transform: translateX(-100%);
-moz-transform: translateX(-100%);
-ms-transform: translateX(-100%);
transform: translateX(-100%);
}
.slide-show.slide-show-active {
margin-left: 0;
-webkit-transform: translateX(0%);
-moz-transform: translateX(0%);
-ms-transform: translateX(0%);
transform: translateX(0%);
}
.tree-node-delete-leave {

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

@@ -15,7 +15,7 @@
.umb-tree li.current > div, .umb-tree div.selected {
background: #2e8aea;
}
.umb-tree li.current > div i.umb-options i, .umb-tree div.selected i{
.umb-tree li.current > div a.umb-options i, .umb-tree div.selected i{
background: #fff;
border-color: #2e8aea;
}
@@ -64,10 +64,10 @@
background-position: 0
}
.umb-tree div > i.umb-options {
.umb-tree div > a.umb-options {
visibility: hidden;
}
.umb-tree div:hover > i.umb-options {
.umb-tree div:hover > a.umb-options {
visibility: visible;
}
@@ -107,7 +107,7 @@
background: @grayLighter
}
i.umb-options {
a.umb-options {
visibility: hidden;
cursor: pointer;
display: inline-block;
@@ -119,7 +119,7 @@ i.umb-options {
top: 0px;
}
i.umb-options i {
a.umb-options i {
height: 6px !important;
width: 6px !important;
border-radius: 20px;
@@ -129,11 +129,11 @@ i.umb-options i {
margin: 10px -2px 0 0;
}
li.root > div > i.umb-options {
li.root > div > a.umb-options {
top: 10px;
}
.hide-options .umb-options{display: none !important}
.hide-options a.umb-options{display: none !important}
.hide-header h5{display: none !important}
.umb-icon-item {
@@ -167,7 +167,7 @@ li.root > div > i.umb-options {
font-size: 10px;
display: block
}
.umb-icon-item:hover .umb-options {
.umb-icon-item:hover a.umb-options {
visibility: visible
}
.umb-icon-item .umb-spr {

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

@@ -16,7 +16,6 @@ angular.module("umbraco")
editor.on('blur', function(e) {
$scope.$apply(function() {
//$scope.model.value = e.getBody().innerHTML;
$scope.model.value = editor.getContent();
});
});
@@ -31,7 +30,6 @@ angular.module("umbraco")
$(data.selection).each(function (i, img) {
var imagePropVal = umbImageHelper.getImagePropertyVaue({imageModel: img, scope: $scope});
var data = {
src: (imagePropVal != null && imagePropVal != "") ? imagePropVal: "nothing.jpg",
id: '__mcenew'

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
View File

@@ -1,3 +1,3 @@
<div ng-controller="Umbraco.Editors.RTEController" class="span7">
<textarea ng-model="value" rows="10" id="{{model.alias}}_rte"></textarea>
<textarea ng-model="model.value" rows="10" id="{{model.alias}}_rte"></textarea>
</div>