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

update ui to latest

Browse Source
This commit is contained in:
Per Ploug
2015-06-08 18:17:36 +02:00
parent 120b7bae17
commit 77a571efb3
2 changed files with 45 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/Umbraco.Web.UI.Client/src/views/membertype/edit.controller.js
View File

@@ -11,57 +11,34 @@ function MemberTypeEditController($scope, $rootScope, $routeParams, $log, member
$scope.page = {actions: [], menu: [], subViews: [] };
$scope.sortingMode = false;
$scope.page.subViews = [
{
"name": "Design",
"icon": "merge",
"view": "views/documentType/views/design/design.html",
"tools": [
{
"name": "Reorder",
"icon": "navigation",
"action": function() {
$scope.toggleSortingMode();
$scope.page.navigation = [
{
"name": "Design",
"icon": "merge",
"view": "views/documentType/views/design/design.html",
"active": true,
"tools": [
{
"name": "Reorder",
"icon": "navigation",
"action": function() {
$scope.toggleSortingMode();
}
}
}
]
}
];
]
}
];
if ($routeParams.create) {
//we are creating so get an empty data type item
memberTypeResource.getScaffold()
.then(function(dt) {
$scope.contentType = dt;
//set a shared state
editorState.set($scope.contentType);
// add init tab
addInitTab();
init(dt);
});
}
else {
memberTypeResource.getById($routeParams.id).then(function(dt){
$scope.contentType = dt;
// set all tab to inactive
if( $scope.contentType.groups.length !== 0 ) {
angular.forEach($scope.contentType.groups, function(group){
// set state
group.tabState = "inActive";
// push init/placeholder property
addInitProperty(group);
});
}
//set a shared state
editorState.set($scope.contentType);
// add init tab
addInitTab();
init(dt);
});
}
@@ -72,26 +49,8 @@ function MemberTypeEditController($scope, $rootScope, $routeParams, $log, member
//perform any pre-save logic here
memberTypeResource.save($scope.contentType).then(function(dt){
//post save logic here -the saved doctype returns as a new object
// set all tab to inactive
if( $scope.contentType.groups.length !== 0 ) {
angular.forEach($scope.contentType.groups, function(group){
// set state
group.tabState = "inActive";
// push init/placeholder property
addInitProperty(group);
});
}
//set a shared state
editorState.set($scope.contentType);
// add init tab
addInitTab();
init(dt);
});
};
@@ -137,6 +96,29 @@ function MemberTypeEditController($scope, $rootScope, $routeParams, $log, member
}
};
function init(contentType){
$scope.contentType = contentType;
// set all tab to inactive
if( $scope.contentType.groups.length !== 0 ) {
angular.forEach($scope.contentType.groups, function(group){
// set state
group.tabState = "inActive";
// push init/placeholder property
addInitProperty(group);
});
}
//set a shared state
editorState.set($scope.contentType);
// add init tab
addInitTab();
}
function addInitTab() {
// check i init tab already exists

16
src/Umbraco.Web.UI.Client/src/views/membertype/edit.html
View File

@@ -9,23 +9,16 @@
name="contentType.name"
alias="contentType.alias"
description="contentType.description"
menu="page.menu"
actions="page.menu">
navigation="page.navigation"
icon="contentType.icon">
</umb-editor-header>
<umb-editor-container class="editors-document-type-container">
<div class="editors-document-type-canvas" ng-class="{'is-in-sorting-mode': sortingMode}">
<umb-sub-views></umb-sub-views>
<pre>{{ contentType | json }}</pre>
<umb-editor-sub-views></umb-editor-sub-views>
</div>
</umb-editor-container>
<umb-editor-footer>
<button type="submit" data-hotkey="ctrl+s" class="btn btn-success">
<localize key="buttons_save">Save</localize>
@@ -33,9 +26,6 @@
</umb-editor-footer>
</umb-editor-view>
</form>
<!-- overlay for change property editor -->