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

Merge branch 'dev-v7' into 7.3.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
This commit is contained in:
Stephan
2015-01-30 14:03:01 +01:00
parent 010e4edc83 f037f8541c
commit 1d80fc66af
21 changed files with 601 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI.Client/src/less/gridview.less
View File

@@ -151,11 +151,15 @@ IFRAME {overflow:hidden;}
bottom: 0;
top: 0;
right: 0;
width: 150px;
width: 50px;
opacity: 0.3;
z-index: 50;
}
.usky-grid .cell-tools.with-prompt {
width:200px;
}
.usky-grid .cell-tools:hover{
opacity: 1;
}
@@ -343,8 +347,20 @@ IFRAME {overflow:hidden;}
border-radius: 200px;
background: rgba(255,255,255, 1);
border:1px solid rgb(182, 182, 182);
margin: 2px;
margin: 2px;
}
.usky-grid .iconBox span.prompt {
display:block;
min-width: 150px;
text-align:center;
}
.usky-grid .iconBox span.prompt > a {
text-decoration:underline;
}
.usky-grid .iconBox:hover, .usky-grid .iconBox:hover *{
background: @blue !important;
color: white !important;

3
src/Umbraco.Web.UI.Client/src/less/panel.less
View File

@@ -160,7 +160,8 @@
border-top: 1px solid @grayLighter;
padding: 10px 0 10px 0;
margin-bottom: 17px;
position: fixed;
bottom: 0px;
left: 100px;

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

@@ -78,6 +78,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
<span class="btn fileinput-button" ng-class="{disabled: disabled}">
<i class="icon-page-up"></i>
<input type="file" name="files[]" multiple ng-disabled="disabled">
<localize key="general_upload">Upload</localize>
</span>
</div>

13
src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
View File

@@ -32,13 +32,14 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $
editorState.set($scope.content);
//We fetch all ancestors of the node to generate the footer breadcrump navigation
//We fetch all ancestors of the node to generate the footer breadcrumb navigation
if (!$routeParams.create) {
entityResource.getAncestors(content.id, "document")
.then(function (anc) {
anc.pop();
$scope.ancestors = anc;
});
if (content.parentId && content.parentId != -1) {
entityResource.getAncestors(content.id, "document")
.then(function (anc) {
$scope.ancestors = anc.reverse();
});
}
}
}

40
src/Umbraco.Web.UI.Client/src/views/content/edit.html
View File

@@ -4,42 +4,40 @@
ng-submit="save()"
val-form-manager>
<umb-panel ng-class="'editor-breadcrumb'">
<umb-panel ng-class="{'editor-breadcrumb': ancestors && ancestors.length > 0}">
<umb-header tabs="content.tabs">
<div class="span7">
<umb-content-name
placeholder="@placeholders_entername"
ng-model="content.name"/>
<umb-content-name placeholder="@placeholders_entername"
ng-model="content.name" />
</div>
<div class="span5">
<div class="span5">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group" ng-animate="'fade'" ng-show="formStatus">
<p class="btn btn-link umb-status-label">{{formStatus}}</p>
</div>
<umb-options-menu ng-show="currentNode"
current-node="currentNode"
current-section="{{currentSection}}">
current-node="currentNode"
current-section="{{currentSection}}">
</umb-options-menu>
</div>
</div>
</div>
</div>
</umb-header>
<umb-tab-view>
<umb-tab id="tab{{tab.id}}" rel="{{tab.id}}" ng-repeat="tab in content.tabs">
<div class="umb-pane">
<umb-property
property="property"
ng-repeat="property in tab.properties">
<umb-property property="property"
ng-repeat="property in tab.properties">
<umb-editor model="property"></umb-editor>
</umb-property>
<div class="umb-tab-buttons" detect-fold ng-class="{'umb-dimmed': busy}">
<div class="btn-group" ng-show="listViewPath">
<a class="btn" href="#{{listViewPath}}">
<localize key="buttons_returnToList">Return to list</localize>
@@ -52,20 +50,20 @@
</a>
</div>
<div class="btn-group dropup" ng-if="defaultButton" >
<div class="btn-group dropup" ng-if="defaultButton">
<!-- primary button -->
<a class="btn btn-success" href="#" ng-click="performAction(defaultButton)" prevent-default>
<localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
<localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
</a>
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-if="subButtons.length > 0">
<span class="caret"></span>
</a>
<a href="#">Return to list</a>
<!-- sub buttons -->
<ul class="dropdown-menu bottom-up" role="menu" aria-labelledby="dLabel" ng-if="subButtons.length > 0">
<ul class="dropdown-menu bottom-up" role="menu" aria-labelledby="dLabel" ng-if="subButtons.length > 0">
<li ng-repeat="btn in subButtons">
<a href="#" ng-click="performAction(btn)" prevent-default>
<localize key="{{btn.labelKey}}">{{btn.labelKey}}</localize>
@@ -73,14 +71,14 @@
</li>
</ul>
</div>
</div>
</div>
</div>
</umb-tab>
</umb-tab-view>
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="content.parentId">
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
<li ng-repeat="ancestor in ancestors">
<a href="#/content/content/edit/{{ancestor.id}}">{{ancestor.name}}</a>
</li>

28
src/Umbraco.Web.UI.Client/src/views/media/edit.html
View File

@@ -3,14 +3,13 @@
ng-show="loaded"
ng-submit="save()"
val-form-manager>
<umb-panel ng-class="'editor-breadcrumb'">
<umb-panel ng-class="{'editor-breadcrumb': ancestors && ancestors.length > 0}">
<umb-header tabs="content.tabs">
<div class="span7">
<umb-content-name
placeholder="@placeholders_entername"
ng-model="content.name"/>
</div>
<umb-content-name placeholder="@placeholders_entername"
ng-model="content.name" />
</div>
<div class="span5">
<div class="btn-toolbar pull-right umb-btn-toolbar">
@@ -19,8 +18,8 @@
</div>
<umb-options-menu ng-show="currentNode"
current-node="currentNode"
current-section="{{currentSection}}">
current-node="currentNode"
current-section="{{currentSection}}">
</umb-options-menu>
</div>
</div>
@@ -30,21 +29,20 @@
<umb-tab id="tab{{tab.id}}" rel="{{tab.id}}" ng-repeat="tab in content.tabs">
<div class="umb-pane">
<umb-property
property="property"
ng-repeat="property in tab.properties">
<umb-property property="property"
ng-repeat="property in tab.properties">
<umb-editor model="property"></umb-editor>
</umb-property>
<div class="umb-tab-buttons" detect-fold ng-class="{'umb-dimmed': busy}">
<div class="btn-group" ng-show="listViewPath">
<a class="btn" href="#{{listViewPath}}">
<localize key="buttons_returnToList">Return to list</localize>
</a>
</div>
<div class="btn-group">
<button type="submit" data-hotkey="ctrl+s" class="btn btn-success">
<localize key="buttons_save">Save</localize>
@@ -56,7 +54,7 @@
</umb-tab>
</umb-tab-view>
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="content.parentId">
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
<li ng-repeat="ancestor in ancestors">
<a href="#/media/media/edit/{{ancestor.id}}">{{ancestor.name}}</a>
</li>

17
src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
View File

@@ -66,15 +66,16 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, enti
serverValidationManager.executeAndClearAllSubscriptions();
syncTreeNode($scope.content, data.path, true);
});
if ($scope.content.parentId && $scope.content.parentId != -1) {
//We fetch all ancestors of the node to generate the footer breadcrump navigation
entityResource.getAncestors($routeParams.id, "media")
.then(function (anc) {
$scope.ancestors = anc.reverse();
});
}
//We fetch all ancestors of the node to generate the footer breadcrump navigation
entityResource.getAncestors($routeParams.id, "media")
.then(function(anc) {
anc.pop();
$scope.ancestors = anc;
});
});
}
$scope.save = function () {

12
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -393,11 +393,15 @@ angular.module("umbraco")
};
$scope.clearPrompt = function(scopedObject, e) {
scopedObject.deletePrompt = false;
e.preventDefault();
e.stopPropagation();
}
$scope.showPrompt = function (scopedObject) {
scopedObject.deletePrompt = true;
}
// *********************************************

23
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -62,16 +62,17 @@
<!-- delete row -->
<div class="cell-tools-remove">
<div class="iconBox"
ng-click="deletePrompt = true"
ng-click="showPrompt(row)"
ng-mouseover="setWarnighlightRow(row)"
ng-mouseleave="disableWarnhighlightRow(row)">
<span ng-if="deletePrompt">
<localize key="general_areyousure"/>
<a href style="text-decoration: underline" ng-click="removeRow(section, $index)"><localize key="general_yes"/></a>
<span class="prompt" ng-if="row.deletePrompt">
<localize key="general_areyousure" />
<a href ng-click="removeRow(section, $index)"><localize key="general_yes" /></a>
<a href ng-click="clearPrompt(row, $event)"><localize key="general_no" /></a>
</span>
<i ng-if="!deletePrompt" class="icon icon-trash"></i>
<i ng-if="!row.deletePrompt" class="icon icon-trash"></i>
</div>
</div>
@@ -120,22 +121,24 @@
<!-- Filled cell tools -->
<div class="cell-tools"
ng-class="{'with-prompt': control.deletePrompt}"
ng-animate="'fade'"
ng-show="control && (currentControl == control)">
<!-- delete control -->
<div class="cell-tools-remove">
<div class="iconBox"
ng-click="deletePrompt = true"
ng-click="showPrompt(control)"
ng-mouseover="setWarnhighlightControl(control)"
ng-mouseleave="disableWarnhighlightControl(control)">
<span ng-show="deletePrompt">
<localize key="general_areyousure"/>
<a href style="text-decoration: underline" ng-click="removeControl(area, $index)"><localize key="general_yes"/></a>
<span class="prompt" ng-show="control.deletePrompt">
<localize key="general_areyousure" />
<a href ng-click="removeControl(area, $index)"><localize key="general_yes" /></a>
<a href ng-click="clearPrompt(control, $event)"><localize key="general_no" /></a>
</span>
<i ng-show="!deletePrompt" class="icon icon-trash"></i>
<i ng-show="!control.deletePrompt" class="icon icon-trash"></i>
</div>
</div>