diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c7b226ef..9097333db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ The changelog contains informations about bug fixes, new features or bc breaking ### Added +- [#1163](https://github.com/luyadev/luya/issues/1163) Styling of the toggler. Added toggles for each container. +- [#1245](https://github.com/luyadev/luya/issues/1245) Added gulp workflow to cms/admin. - [#1245](https://github.com/luyadev/luya/issues/1245) Added gulp workflow to cms/admin. - [#724](https://github.com/luyadev/luya/issues/724) Removed compass configs in admin module and added gulp workflow. - [#1243](https://github.com/luyadev/luya/issues/1243#issuecomment-288064499) Enabled all flags diff --git a/modules/admin/src/resources/dist/css/admin.css b/modules/admin/src/resources/dist/css/admin.css index 41dffa18f..b25358c8a 100644 --- a/modules/admin/src/resources/dist/css/admin.css +++ b/modules/admin/src/resources/dist/css/admin.css @@ -8578,7 +8578,7 @@ input[type='checkbox']:checked + .input__label:before, input[type='checkbox']:ch menu-dropdown, .menu-dropdown { display: block; - margin-left: -25px; } + margin: 10px 0 10px -25px; } .menu-dropdown__category { display: inline-block; @@ -8586,6 +8586,26 @@ menu-dropdown, min-width: 250px; padding-left: 25px; } +.menu-dropdown__container { + margin: 10px 0; } + +.menu-dropdown__title, +.menu-dropdown__toggle-all { + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + .menu-dropdown__title i, + .menu-dropdown__toggle-all i { + display: inline-block; + vertical-align: middle; } + .menu-dropdown__title span, + .menu-dropdown__toggle-all span { + vertical-align: middle; + margin-top: 3px; + display: inline-block; } + .menu-dropdown__list { position: relative; } .menu-dropdown__list .menu-dropdown__list .menu-dropdown__item { diff --git a/modules/admin/src/resources/scss/components/_menu-dropdown.scss b/modules/admin/src/resources/scss/components/_menu-dropdown.scss index f11f1e478..6f4b927f8 100644 --- a/modules/admin/src/resources/scss/components/_menu-dropdown.scss +++ b/modules/admin/src/resources/scss/components/_menu-dropdown.scss @@ -1,57 +1,80 @@ menu-dropdown, .menu-dropdown { - display: block; - margin-left: -25px; + display: block; + margin: 10px 0 10px -25px; } .menu-dropdown__category { - display: inline-block; - vertical-align: top; - min-width: 250px; - padding-left: 25px; + display: inline-block; + vertical-align: top; + min-width: 250px; + padding-left: 25px; + + +} + +.menu-dropdown__container { + margin: 10px 0; +} + +.menu-dropdown__title, +.menu-dropdown__toggle-all { + cursor: pointer; + user-select: none; + + i { + display: inline-block; + vertical-align: middle; + } + + span { + vertical-align: middle; + margin-top: 3px; + display: inline-block; + } } .menu-dropdown__list { - position: relative; - - .menu-dropdown__list .menu-dropdown__item { - padding-left: 15px; - - &:before { - content: ""; - position: absolute; - background-color: map_get($grey, "darken-1"); - height: 100%; - width: 2px; - left: 11px; - top: -5px; - } - &:after { - content: ""; - position: absolute; - background-color: map_get($grey, "darken-1"); - height: 2px; - width: 8px; - left: 11px; - top: 11px; - } - - &:last-of-type:before { - height: 17px; - } - } + position: relative; + + .menu-dropdown__list .menu-dropdown__item { + padding-left: 15px; + + &:before { + content: ""; + position: absolute; + background-color: map_get($grey, "darken-1"); + height: 100%; + width: 2px; + left: 11px; + top: -5px; + } + &:after { + content: ""; + position: absolute; + background-color: map_get($grey, "darken-1"); + height: 2px; + width: 8px; + left: 11px; + top: 11px; + } + + &:last-of-type:before { + height: 17px; + } + } } .menu-dropdown__item { - position: relative; + position: relative; - label { - width: 100%; - } + label { + width: 100%; + } } .menu-dropdown__label { - width: 100%; - overflow: hidden; - white-space: nowrap; + width: 100%; + overflow: hidden; + white-space: nowrap; } \ No newline at end of file diff --git a/modules/cms/src/admin/resources/dist/css/cmsadmin.css b/modules/cms/src/admin/resources/dist/css/cmsadmin.css index d6ed7aecc..e8af36b81 100644 --- a/modules/cms/src/admin/resources/dist/css/cmsadmin.css +++ b/modules/cms/src/admin/resources/dist/css/cmsadmin.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /** * Base colors */ @@ -99,13 +100,13 @@ .module-cmsadmin .accordion__entry--open > .accordion__body--empty:after { display: block; content: ""; - background: url("../img/empty-placeholder-arrow.png") top left no-repeat; + background: url("../../img/empty-placeholder-arrow.png") top left no-repeat; width: 100px; height: 40px; position: absolute; background-size: cover; opacity: 0.5; - right: 200px; + right: 0; bottom: -20px; } .module-cmsadmin .accordion__body .accordion__body--empty:after { display: none; } @@ -800,3 +801,64 @@ .module-cmsadmin zaa-wysiwyg ol, .module-cmsadmin zaa-wysiwyg ol li { list-style-type: decimal; } + +/** + * Prefix every module style with the module class + */ +.block-styles b, .block-styles strong { + font-weight: 700; } + +.block-styles i { + font-style: italic; } + +.block-styles u { + text-decoration: underline; } + +.block-styles h1, .block-styles h2, .block-styles h3, .block-styles h4, .block-styles h5 { + margin: 0; } + +.block-styles h1 { + font-size: 2rem; + line-height: 2.4rem; } + +.block-styles h2 { + font-size: 1.8rem; + line-height: 2.2rem; } + +.block-styles h3 { + font-size: 1.6rem; + line-height: 2rem; } + +.block-styles h4 { + font-size: 1.4rem; + line-height: 1.8rem; } + +.block-styles h5 { + font-size: 1.2rem; + line-height: 1.6rem; } + +.block-styles p, .block-styles span { + font-size: 1rem; + line-height: 1.2rem; + margin: 0; } + +.block-styles blockquote { + font-style: italic; } + .block-styles blockquote:before { + display: inline-block; + content: "«"; + margin-right: 5px; } + .block-styles blockquote:after { + display: inline-block; + content: "»"; + margin-left: 5px; } + +.block-styles ul, .block-styles ol { + padding: 0; + margin-left: 30px; } + +.block-styles ul, .block-styles ul li { + list-style-type: disc; } + +.block-styles ol, .block-styles ol li { + list-style-type: decimal; } diff --git a/modules/cms/src/admin/resources/dist/js/main.min.js b/modules/cms/src/admin/resources/dist/js/main.min.js index 0ca956134..c0ff0d6fd 100644 --- a/modules/cms/src/admin/resources/dist/js/main.min.js +++ b/modules/cms/src/admin/resources/dist/js/main.min.js @@ -1,48 +1,54 @@ (function() { "use strict"; - + // directive.js - - zaa.directive("menuDropdown", function(ServiceMenuData) { - return { - restrict : 'E', - scope : { - navId : '=' - }, - controller : function($scope) { - - $scope.changeModel = function(data) { - $scope.navId = data.id; - } - - $scope.menuData = ServiceMenuData.data; - - $scope.$on('service:MenuData', function(event, data) { - $scope.menuData = data; - }); - - function init() { - if ($scope.menuData.length == 0) { - ServiceMenuData.load(); - } - } - - $scope.toggler = true; - - init(); - }, - template : function() { - return '
keyboard_arrow_downkeyboard_arrow_up
' + - '{{container.name}}' + - '' + - '
'; - } - } - }); - - zaa.directive("zaaCmsPage", function($compile){ + + zaa.directive("menuDropdown", function(ServiceMenuData) { + return { + restrict : 'E', + scope : { + navId : '=' + }, + controller : function($scope) { + + $scope.changeModel = function(data) { + $scope.navId = data.id; + } + + $scope.menuData = ServiceMenuData.data; + + $scope.$on('service:MenuData', function(event, data) { + $scope.menuData = data; + }); + + function init() { + if ($scope.menuData.length == 0) { + ServiceMenuData.load(); + } + } + + for (var container in $scope.menuData.containers) { + $scope.menuData.containers[container].isHidden = false; + } + + $scope.toggler = true; + + init(); + }, + template : function() { + return '
' + + 'keyboard_arrow_downkeyboard_arrow_up Toggle all
' + + '
' + + 'keyboard_arrow_downkeyboard_arrow_up {{container.name}}' + + '
    ' + + '
  • ' + + '
' + + '
'; + } + } + }); + + zaa.directive("zaaCmsPage", function($compile) { return { restrict: "E", scope: { @@ -71,7 +77,7 @@ navId : '=' }, controller : function($scope, $http, $state) { - + $scope.$watch('navId', function(n) { if (n) { $http.get('admin/api-cms-navitem/get-nav-item-path', { params : { navId : $scope.navId }}).then(function(response) { @@ -82,7 +88,7 @@ }); } }); - + $scope.goTo = function(navId) { $state.go('custom.cmsedit', { navId : navId }); } @@ -101,9 +107,9 @@ }, templateUrl : 'updateformpage.html', controller : function($scope) { - + $scope.parent = $scope.$parent.$parent; - + $scope.isEditAvailable = function() { return $scope.parent.item.nav_item_type == 1; } @@ -143,7 +149,7 @@ } } }); - + zaa.directive("createForm", function() { return { restrict : 'EA', @@ -152,14 +158,14 @@ }, templateUrl : 'createform.html', controller : function($scope, $http, $filter, ServiceMenuData, Slug, ServiceLanguagesData, AdminToastService) { - + $scope.error = []; $scope.success = false; - + $scope.controller = $scope.$parent; - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); @@ -167,50 +173,50 @@ $scope.menuDataReload = function() { return ServiceMenuData.load(true); } - + function initializer() { $scope.menu = $scope.menuData.items; $scope.navcontainers = $scope.menuData.containers; } - + initializer(); - - + + $scope.data.nav_item_type = 1; $scope.data.parent_nav_id = 0; $scope.data.is_draft = 0; - + $scope.data.nav_container_id = 1; - - + + $scope.languagesData = ServiceLanguagesData.data; - + $scope.$on('service:LanguagesData', function(event, data) { $scope.languagesData = data; }); - - + + $scope.data.lang_id = parseInt($filter('filter')($scope.languagesData, {'is_default': '1'}, true)[0].id); - + $scope.navitems = []; - + $scope.$watch(function() { return $scope.data.nav_container_id }, function(n, o) { if (n !== undefined && n !== o) { $scope.data.parent_nav_id = 0; $scope.navitems = $scope.menu[n]['__items']; } }); - + $scope.aliasSuggestion = function() { $scope.data.alias = Slug.slugify($scope.data.title); }; - + $scope.$watch('data.alias', function(n, o) { if (n!=o && n!=null) { $scope.data.alias = Slug.slugify(n); } }); - + $scope.exec = function () { $scope.controller.save().then(function(response) { $scope.menuDataReload(); @@ -229,11 +235,11 @@ $scope.error = reason; }); } - + } } }); - + zaa.directive("createFormPage", function(ServiceLayoutsData, ServiceMenuData) { return { restrict : 'EA', @@ -242,34 +248,34 @@ }, templateUrl : 'createformpage.html', controller : function($scope) { - + $scope.data.use_draft = 0; $scope.data.layout_id = 0; $scope.data.from_draft_id = 0; - + // layoutsData - + $scope.layoutsData = ServiceLayoutsData.data; - + $scope.$on('service:BlocksData', function(event, data) { $scope.layoutsData = data; }); - + // menuData - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); - + function init() { $scope.drafts = $scope.menuData.drafts; $scope.layouts = $scope.layoutsData; } - + init(); - + $scope.save = function() { $scope.$parent.exec(); } @@ -285,20 +291,20 @@ }, templateUrl : 'createformmodule.html', controller : function($scope) { - + $scope.modules = []; - + $http.get('admin/api-admin-common/data-modules').then(function(response) { $scope.modules = response.data; }) - + $scope.save = function() { $scope.$parent.exec(); } } } }); - + zaa.directive("createFormRedirect", function() { return { restrict : 'EA', @@ -307,30 +313,30 @@ }, templateUrl : 'createformredirect.html', controller : function($scope) { - + $scope.save = function() { $scope.$parent.exec(); } } } }); - + // factory.js - + zaa.factory('PlaceholderService', function() { var service = []; - + service.status = 1; /* 1 = showplaceholders; 0 = hide placeholders */ - + service.delegate = function(status) { service.status = status; } - + return service; }); - + // layout.js - + zaa.config(function($stateProvider, resolverProvider) { $stateProvider .state("custom.cmsedit", { @@ -346,37 +352,37 @@ templateUrl: 'cmsadmin/page/drafts' }); }); - + zaa.controller("DraftsController", function($scope, $state, ServiceMenuData) { - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); - + $scope.go = function(navId) { $state.go('custom.cmsedit', { navId : navId }); }; - + }); - + /* controllers */ - + zaa.controller("ConfigController", function($scope, $http, AdminToastService) { $scope.data = {}; - + $http.get('admin/api-cms-admin/config').then(function(response) { $scope.data = response.data; }); - + $scope.save = function() { $http.post('admin/api-cms-admin/config', $scope.data).then(function(response) { AdminToastService.success(i18n['js_config_update_success'], 4000); }); } }); - + zaa.controller("PageVersionsController", function($scope, $http, ServiceLayoutsData, AdminToastService) { /** * @var object $typeData From parent scope controller NavItemController @@ -385,44 +391,44 @@ * @var integer $fromVersionPageId From ng-model the version copy from or 0 = new empty/blank version * @var integer $versionLayoutId From ng-model, only if fromVersionPageId is 0 */ - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + // layoutsData - + $scope.layoutsData = ServiceLayoutsData.data; - + $scope.$on('service:LayoutsData', function(event, data) { $scope.layoutsData = data; }); - + $scope.closeCreateModal = function() { $scope.createVersionModalState = true; } - + $scope.editVersionModalState = true; - + $scope.closeEditModal = function() { $scope.editVersionModalState = true; } - + $scope.openEditModal = function() { $scope.editVersionModalState = false; } - + $scope.toggleVersionEdit = function(versionId) { $scope.$parent.switchVersion(versionId); $scope.openEditModal(); }; - + $scope.toggleRemoveVersion = function(versionid) { $scope.$parent.switchVersion(versionid); $scope.$parent.removeCurrentVersion(); - + } - + // controller logic - + $scope.changeVersionLayout = function(versionItem) { $http.post('admin/api-cms-navitem/change-page-version-layout', $.param({'pageItemId': versionItem.id, 'layoutId': versionItem.layout_id, 'alias': versionItem.version_alias}), headers).then(function(response) { $scope.refreshForce(); @@ -430,7 +436,7 @@ AdminToastService.success(i18n['js_version_update_success'], 4000); }); }; - + $scope.createNewVersionSubmit = function(data) { if (data == undefined) { AdminToastService.error(i18n['js_version_error_empty_fields'], 4000); @@ -444,55 +450,55 @@ AdminToastService.error(i18n['js_version_error_empty_fields'], 4000); return null; } - + $scope.refreshForce(); $scope.closeCreateModal(); - + AdminToastService.success(i18n['js_version_create_success'], 4000); }); }; }); - + zaa.controller("CopyPageController", function($scope, $http, AdminToastService, Slug) { - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + $scope.$on('deletedNavItem', function() { $scope.isOpen = false; $scope.itemSelection = false; $scope.selection = 0; }); - + $scope.NavItemController = $scope.$parent; - + $scope.navId = 0; - + $scope.items = null; - + $scope.isOpen = false; - + $scope.itemSelection = false; - + $scope.selection = 0; - + $scope.select = function(item) { $scope.selection = item.id; $scope.itemSelection = angular.copy(item); }; - + $scope.aliasSuggestion = function() { $scope.itemSelection.alias = Slug.slugify($scope.itemSelection.title); } - + $scope.loadItems = function() { $scope.navId = $scope.NavItemController.NavController.navData.id; - + $http.get('admin/api-cms-nav/find-nav-items', { params: { navId : $scope.navId }}).then(function(response) { $scope.items = response.data; $scope.isOpen = true; }); }; - + $scope.save = function() { $scope.itemSelection['toLangId'] = $scope.NavItemController.lang.id; $http.post('admin/api-cms-nav/create-from-page', $.param($scope.itemSelection), headers).then(function(response) { @@ -504,19 +510,19 @@ } }); } - + }); - + zaa.controller("DropNavController", function($scope, $http, ServiceMenuData, AdminToastService) { - + $scope.droppedNavItem = null; $scope.showVersionList = false; - + $scope.errorMessageOnDuplicateAlias = function(response) { AdminToastService.error(i18nParam('js_page_add_exists', {title: response.success.title, id: response.success.nav_id}), 5000); } - + $scope.onBeforeDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-before', { params : { moveItemId : $scope.droppedNavItem.id, droppedBeforeItemId : itemid }}).then(function(r) { @@ -526,7 +532,7 @@ ServiceMenuData.load(true); }); } - + $scope.onAfterDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-after', { params : { moveItemId : $scope.droppedNavItem.id, droppedAfterItemId : itemid }}).then(function(r) { @@ -536,7 +542,7 @@ ServiceMenuData.load(true); }); } - + $scope.onChildDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-to-child', { params : { moveItemId : $scope.droppedNavItem.id, droppedOnItemId : itemid }}).then(function(r) { @@ -546,7 +552,7 @@ ServiceMenuData.load(true); }); } - + $scope.onEmptyDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-to-container', { params : { moveItemId : $scope.droppedNavItem.id, droppedOnCatId : itemid }}).then(function(r) { @@ -557,7 +563,7 @@ }); } }) - + zaa.filter("menuparentfilter", function() { return function(input, containerId, parentNavId) { var result = []; @@ -569,7 +575,7 @@ return result; }; }); - + zaa.filter('menuchildfilter', function() { return function(input, containerId, parentNavId) { var returnValue = false; @@ -580,43 +586,43 @@ } } }); - + return returnValue; } }); - + zaa.controller("CmsLiveEdit", function($scope, ServiceLiveEditMode) { - + $scope.display = 0; - + $scope.url = homeUrl; - + $scope.$watch(function() { return ServiceLiveEditMode.state }, function(n, o) { $scope.display = n; }); - + $scope.$on('service:LiveEditModeUrlChange', function(event, url) { var d = new Date(); var n = d.getTime(); $scope.url = url + '&' + n; }); - + }); - + zaa.controller("CmsMenuTreeController", function($scope, $state, $http, $filter, ServiceMenuData, ServiceLiveEditMode) { - + // live edit service - + $scope.liveEditState = 0; - + $scope.$watch('liveEditStateToggler', function(n) { ServiceLiveEditMode.state = n; }); - + // menu Data - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); @@ -624,81 +630,81 @@ $scope.menuDataReload = function() { return ServiceMenuData.load(true); }; - + // controller logic - + $scope.toggleItem = function(data) { if (data.toggle_open == undefined) { data['toggle_open'] = 1; } else { data['toggle_open'] = !data.toggle_open; } - + $http.post('admin/api-cms-nav/tree-history', {data: data}, {ignoreLoadingBar: true}); - + }; - + $scope.go = function(data) { ServiceLiveEditMode.changeUrl(data.nav_item_id, 0); $state.go('custom.cmsedit', { navId : data.id }); }; - + $scope.showDrag = 0; - + $scope.isCurrentElement = function(data) { if (data !== null && $state.params.navId == data.id) { return true; } - + return false; }; - + $scope.hiddenCats = []; - + $scope.$watch('menuData', function (n, o) { $scope.hiddenCats = n.hiddenCats; }); - + $scope.toggleCat = function(catId) { if (catId in $scope.hiddenCats) { $scope.hiddenCats[catId] = !$scope.hiddenCats[catId]; } else { $scope.hiddenCats[catId] = 1; } - + $http.post('admin/api-cms-nav/save-cat-toggle', {catId: catId, state: $scope.hiddenCats[catId]}, {ignoreLoadingBar: true}); }; - + $scope.toggleIsHidden = function(catId) { - + if ($scope.hiddenCats == undefined) { return false; } - + if (catId in $scope.hiddenCats) { if ($scope.hiddenCats[catId] == 1) { return true; } } - + return false; }; - + }); - + // create.js - + zaa.controller("CmsadminCreateController", function($scope, $q, $http) { - + $scope.data = {}; $scope.data.isInline = false; - + $scope.save = function() { - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + return $q(function(resolve, reject) { - + if ($scope.data.nav_item_type == 1) { $http.post('admin/api-cms-nav/create-page', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -706,7 +712,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 2) { $http.post('admin/api-cms-nav/create-module', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -714,7 +720,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 3) { $http.post('admin/api-cms-nav/create-redirect', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -725,23 +731,23 @@ }); } }); - + zaa.controller("CmsadminCreateInlineController", function($scope, $q, $http) { - + $scope.data = { nav_id : $scope.$parent.NavController.id }; - + $scope.data.isInline = true; - + $scope.save = function() { - + $scope.data.lang_id = $scope.lang.id; - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + return $q(function(resolve, reject) { - + if ($scope.data.nav_item_type == 1) { $http.post('admin/api-cms-nav/create-page-item', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -749,7 +755,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 2) { $http.post('admin/api-cms-nav/create-module-item', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -757,7 +763,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 3) { $http.post('admin/api-cms-nav/create-redirect-item', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -767,27 +773,27 @@ } }) } - + }); - + // update.js - + zaa.controller("NavController", function($scope, $filter, $stateParams, $http, LuyaLoading, PlaceholderService, ServicePropertiesData, ServiceMenuData, ServiceLanguagesData, AdminToastService, AdminClassService, AdminLangService) { - + $scope.AdminLangService = AdminLangService; - + /* service AdminPropertyService inheritance */ - + $scope.propertiesData = ServicePropertiesData.data; - + $scope.$on('service:PropertiesData', function(event, data) { $scope.propertiesData = data; }); - + /* service ServiceMenuData inheritance */ - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); @@ -795,21 +801,21 @@ $scope.menuDataReload = function() { return ServiceMenuData.load(true); } - + /* service ServiceLangaugesData inheritance */ - + $scope.languagesData = ServiceLanguagesData.data; - + $scope.$on('service:LanguagesData', function(event, data) { $scope.languagesData = data; }); - + /* placeholders toggler service */ - + $scope.PlaceholderService = PlaceholderService; - + $scope.placeholderState = $scope.PlaceholderService.status; - + $scope.$watch('placeholderState', function(n, o) { if (n !== o && n !== undefined) { $scope.PlaceholderService.delegate(n); @@ -817,31 +823,31 @@ }); /* sidebar logic */ - + $scope.sidebar = false; - + $scope.enableSidebar = function() { $scope.sidebar = true; } - + $scope.toggleSidebar = function() { $scope.sidebar = !$scope.sidebar; }; - + /* app logic */ - + $scope.showActions = 1; - + $scope.id = parseInt($stateParams.navId); - + $scope.isDeleted = false; - + $scope.AdminClassService = AdminClassService; - + $scope.propValues = {}; - + $scope.hasValues = false; - + $scope.bubbleParents = function(parentNavId, containerId) { var item = $filter('menuchildfilter')($scope.menuData.items, containerId, parentNavId); if (item) { @@ -849,7 +855,7 @@ $scope.bubbleParents(item.parent_nav_id, item.nav_container_id); } } - + $scope.createDeepPageCopy = function() { $http.post('admin/api-cms-nav/deep-page-copy', {navId: $scope.id}).then(function(response) { $scope.menuDataReload(); @@ -857,7 +863,7 @@ $scope.showActions = 1; }); }; - + $scope.loadNavProperties = function() { $http.get('admin/api-cms-nav/get-properties', { params: {navId: $scope.id}}).then(function(response) { for(var i in response.data) { @@ -867,13 +873,13 @@ } }); }; - + $scope.togglePropMask = function() { $scope.showPropForm = !$scope.showPropForm; } - + $scope.showPropForm = false; - + $scope.storePropValues = function() { var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; $http.post('admin/api-cms-nav/save-properties?navId='+$scope.id, $.param($scope.propValues), headers).then(function(response) { @@ -882,10 +888,10 @@ $scope.showPropForm = false; }); } - + $scope.trash = function() { AdminToastService.confirm(i18n['js_page_confirm_delete'], function($timeout, $toast) { - + $http.get('admin/api-cms-nav/delete', { params : { navId : $scope.id }}).then(function(response) { $scope.isDeleted = true; $scope.menuDataReload().then(function() { @@ -896,9 +902,9 @@ }); }); }; - + $scope.isDraft = false; - + $scope.submitNavForm = function() { $http.post('admin/api-cms-nav/update?id=' + $scope.navData.id, {layout_file: $scope.navData.layout_file}).then(function(response) { AdminToastService.success(i18nParam('js_page_update_layout_save_success'), 3000); @@ -908,18 +914,18 @@ }); }); } - + function initializer() { $scope.navData = $filter('filter')($scope.menuData.items, {id: $scope.id}, true)[0]; - + if ($scope.navData == undefined) { $scope.isDraft = true; } else { - + $scope.loadNavProperties(); - + /* properties --> */ - + $scope.$watch(function() { return $scope.navData.is_offline }, function(n, o) { if (n !== o && n !== undefined) { $http.get('admin/api-cms-nav/toggle-offline', { params : { navId : $scope.navData.id , offlineStatus : n }}).then(function(response) { @@ -931,7 +937,7 @@ }); } }); - + $scope.$watch(function() { return $scope.navData.is_hidden }, function(n, o) { if (n !== o && n !== undefined) { $http.get('admin/api-cms-nav/toggle-hidden', { params : { navId : $scope.navData.id , hiddenStatus : n }}).then(function(response) { @@ -943,7 +949,7 @@ }); } }); - + $scope.$watch(function() { return $scope.navData.is_home }, function(n, o) { if (n !== o && n !== undefined) { $http.get('admin/api-cms-nav/toggle-home', { params : { navId : $scope.navData.id , homeState : n }}).then(function(response) { @@ -959,69 +965,69 @@ }); } } - + initializer(); }); - + /** * @param $scope.lang from ng-repeat */ zaa.controller("NavItemController", function($scope, $http, $timeout, Slug, ServiceMenuData, AdminLangService, AdminToastService, ServiceLiveEditMode) { - + $scope.loaded = false; - + $scope.NavController = $scope.$parent; - + $scope.liveEditState = false; - + $scope.$watch(function() { return ServiceLiveEditMode.state }, function(n, o) { $scope.liveEditState = n; }); - + $scope.openLiveUrl = function(id, versionId) { ServiceLiveEditMode.changeUrl(id, versionId); }; - + $scope.loadLiveUrl = function() { ServiceLiveEditMode.changeUrl($scope.item.id, $scope.currentPageVersion); } - + // serviceMenuData inheritance - + $scope.menuDataReload = function() { return ServiceMenuData.load(true); } - + $scope.$on('service:LoadLanguage', function(event, data) { if (!$scope.loaded) { $scope.refresh(); } }); - + // properties: - + $scope.isTranslated = false; - + $scope.item = []; - + $scope.itemCopy = []; - + $scope.settings = false; - + $scope.typeDataCopy = []; - + $scope.typeData = []; - + $scope.container = []; - + $scope.currentVersionInformation = null; - + $scope.errors = []; - + $scope.homeUrl = homeUrl; - + $scope.currentPageVersion = 0; - + $scope.trashItem = function() { if ($scope.lang.is_default == 0) { AdminToastService.confirm(i18n['js_page_confirm_delete'], function($timeout, $toast) { @@ -1046,7 +1052,7 @@ }); } }; - + $scope.reset = function() { $scope.itemCopy = angular.copy($scope.item); if ($scope.item.nav_item_type == 1) { @@ -1054,7 +1060,7 @@ } else { $scope.typeDataCopy = angular.copy($scope.typeData); } - + } $scope.updateNavItemData = function(itemCopy, typeDataCopy) { @@ -1084,18 +1090,18 @@ $scope.errors = response.data; }); }; - + $scope.toggleSettings = function() { $scope.reset(); $scope.settings = !$scope.settings; }; - + $scope.$watch('itemCopy.alias', function(n, o) { if (n!=o && n!=null) { $scope.itemCopy.alias = Slug.slugify(n); } }); - + $scope.removeCurrentVersion = function() { // {alias: $scope.currentVersionInformation.version_alias} AdminToastService.confirm(i18nParam('js_version_delete_confirm', {alias: $scope.currentVersionInformation.version_alias}), function($toast, $http) { @@ -1107,10 +1113,10 @@ }); }); } - + $scope.getItem = function(langId, navId) { $http({ - url: 'admin/api-cms-navitem/nav-lang-item', + url: 'admin/api-cms-navitem/nav-lang-item', method: "GET", params: { langId : langId, navId : navId } }).then(function(response) { @@ -1138,27 +1144,27 @@ $scope.loaded = true }); }; - + $scope.switchVersion = function(pageVersionid) { $scope.container = $scope.typeData[pageVersionid]['contentAsArray']; $scope.currentVersionInformation = $scope.typeData[pageVersionid]; $scope.currentPageVersion = pageVersionid; $scope.loadLiveUrl(); }; - + $scope.refreshForce = function() { $scope.getItem($scope.lang.id, $scope.NavController.id); } - + $scope.refresh = function() { if (AdminLangService.isInSelection($scope.lang.short_code)) { $scope.getItem($scope.lang.id, $scope.NavController.id); } - + }; - + // - + function init() { $scope.refresh(); } - + init(); }); - - + + /** * @param $scope.placeholder * from ng-repeat */ zaa.controller("PagePlaceholderController", function($scope, AdminClassService, PlaceholderService) { - + $scope.NavItemTypePageController = $scope.$parent; - + $scope.PlaceholderService = PlaceholderService; - + $scope.$watch(function() { return $scope.PlaceholderService.status }, function(n,o) { if (n) { $scope.isOpen = true; @@ -1228,13 +1234,13 @@ $scope.isOpen = false; } }); - + $scope.isOpen = false; - + $scope.toggleOpen = function() { $scope.isOpen = !$scope.isOpen; } - + $scope.mouseEnter = function() { var status = AdminClassService.getClassSpace('onDragStart'); if (status !== undefined && !$scope.isOpen) { @@ -1242,35 +1248,35 @@ } }; }); - - + + /** * @param $scope.block * from ng-repeat */ zaa.controller("PageBlockEditController", function($scope, $sce, $http, AdminClassService, AdminToastService, ServiceBlockCopyStack, ServiceLiveEditMode) { - + $scope.PagePlaceholderController = $scope.$parent; - + $scope.onStart = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', 'page--drag-active'); }); }; - + $scope.copyBlock = function() { ServiceBlockCopyStack.push($scope.block.id, $scope.block.name); }; - + $scope.toggleHidden = function() { if ($scope.block.is_hidden == 0) { $scope.block.is_hidden = 1; } else { $scope.block.is_hidden = 0; } - + $http({ - url: 'admin/api-cms-navitem/toggle-block-hidden', + url: 'admin/api-cms-navitem/toggle-block-hidden', method: "GET", params: { blockId : $scope.block.id, hiddenState: $scope.block.is_hidden } }).then(function(response) { @@ -1285,14 +1291,14 @@ if (varFieldName in $scope.block.field_help) { return true; } - + return false; } - + $scope.getInfo = function(varFieldName) { return $scope.block.field_help[varFieldName]; } - + $scope.isEditable = function() { return typeof $scope.block.vars != "undefined" && $scope.block.vars.length > 0; }; @@ -1300,25 +1306,25 @@ $scope.isConfigable = function() { return typeof $scope.block.cfgs != "undefined" && $scope.block.cfgs.length > 0; }; - + $scope.safe = function(html) { return $sce.trustAsHtml(html); }; - + $scope.onStop = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', undefined); }); }; - + $scope.$watch(function() { return $scope.block.values }, function(n, o) { $scope.data = n; }); - + $scope.$watch(function() { return $scope.block.variation }, function(n, o) { $scope.evalVariationVisbility(n); }); - + $scope.evalVariationVisbility = function(variatenName) { if ($scope.block.variations.hasOwnProperty(variatenName)) { var variation = $scope.block.variations[$scope.block.variation]; @@ -1342,9 +1348,9 @@ }); } } - + $scope.cfgdata = $scope.block.cfgvalues || {}; - + $scope.edit = false; $scope.config = false; @@ -1369,7 +1375,7 @@ $scope.config = !$scope.config; $scope.edit = false; }; - + $scope.renderTemplate = function(template, dataVars, cfgVars, block, extras) { if (template == undefined) { return ''; @@ -1377,17 +1383,17 @@ var template = twig({ data: template }); - + var content = template.render({ vars : dataVars, cfgs : cfgVars, block : block, extras : extras }); - + return $sce.trustAsHtml(content); }; - + $scope.removeBlock = function(block) { AdminToastService.confirm(i18nParam('js_page_block_delete_confirm', {name: block.name}), function($timeout, $toast) { $http.delete('admin/api-cms-navitempageblockitem/delete?id=' + block.id).then(function(response) { @@ -1398,7 +1404,7 @@ }); }); }; - + $scope.save = function () { $http.put('admin/api-cms-navitempageblockitem/update?id=' + $scope.block.id, { json_config_values: $scope.data, @@ -1414,26 +1420,26 @@ $scope.evalVariationVisbility($scope.block.variation); }); } - + }); - + /** * @TODO HANDLING SORT INDEX OF EACH BLOCK */ zaa.controller("DropBlockController", function($scope, $http, AdminClassService) { - + $scope.PagePlaceholderController = $scope.$parent; - + $scope.droppedBlock = {}; - + $scope.onDrop = function($event, $ui) { - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + var sortIndex = $($event.target).data('sortindex'); var moveBlock = $scope.droppedBlock['vars'] || false; var event = $scope.droppedBlock['event'] || false; - + if (event === 'isServiceBlockCopyInstance') { $http.post('admin/api-cms-navitemblock/copy-block-from-stack', $.param({ copyBlockId: $scope.droppedBlock.blockId, @@ -1466,15 +1472,15 @@ AdminClassService.setClassSpace('onDragStart', undefined); } }); - + zaa.controller("DroppableBlocksController", function($scope, $http, AdminClassService, ServiceBlocksData, ServiceBlockCopyStack, $sce) { - + // service ServiceBlocksData inheritance - + $scope.blocksData = ServiceBlocksData.data; - + $scope.blocksDataRestore = angular.copy($scope.blocksData); - + $scope.$on('service:BlocksData', function(event, data) { $scope.blocksData = data; }); @@ -1482,45 +1488,45 @@ $scope.blocksDataReload = function() { return ServiceBlocksData.load(true); } - + $scope.addToFav = function(item) { $http.post('admin/api-cms-block/to-fav', {block: item }).then(function(response) { $scope.blocksDataReload(); }); }; - + $scope.removeFromFav = function(item) { $http.post('admin/api-cms-block/remove-fav', {block: item }).then(function(response) { $scope.blocksDataReload(); }); }; - + $scope.toggleGroup = function(group) { if (group.toggle_open == undefined) { group.toggle_open = 1; } else { group.toggle_open = !group.toggle_open; } - + $http.post('admin/api-cms-block/toggle-group', {group: group}, {ignoreLoadingBar: true}); } - + // controller logic - + $scope.copyStack = ServiceBlockCopyStack.stack; - + $scope.$on('service:CopyStack', function(event, stack) { $scope.copyStack = stack; }); - + $scope.clearStack = function() { ServiceBlockCopyStack.clear(); }; - + $scope.searchQuery = ''; - + $scope.searchIsDirty = false; - + $scope.$watch('searchQuery', function(n, o) { if (n !== '') { $scope.searchIsDirty = true; @@ -1531,24 +1537,24 @@ $scope.blocksData = angular.copy($scope.blocksDataRestore); } }) - + $scope.onStart = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', 'page--drag-active'); }); } - + $scope.safe = function(html) { return $sce.trustAsHtml(html); } - + $scope.onStop = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', undefined); }); } }); - + })(); /** * all global admin services diff --git a/modules/cms/src/admin/resources/js/cmsadmin.js b/modules/cms/src/admin/resources/js/cmsadmin.js index 35502d9d5..4f42d564c 100644 --- a/modules/cms/src/admin/resources/js/cmsadmin.js +++ b/modules/cms/src/admin/resources/js/cmsadmin.js @@ -1,48 +1,54 @@ (function() { "use strict"; - + // directive.js - - zaa.directive("menuDropdown", function(ServiceMenuData) { - return { - restrict : 'E', - scope : { - navId : '=' - }, - controller : function($scope) { - - $scope.changeModel = function(data) { - $scope.navId = data.id; - } - - $scope.menuData = ServiceMenuData.data; - - $scope.$on('service:MenuData', function(event, data) { - $scope.menuData = data; - }); - - function init() { - if ($scope.menuData.length == 0) { - ServiceMenuData.load(); - } - } - - $scope.toggler = true; - - init(); - }, - template : function() { - return '
keyboard_arrow_downkeyboard_arrow_up
' + - '{{container.name}}' + - '
    ' + - '
  • ' + - '
' + - '
'; - } - } - }); - - zaa.directive("zaaCmsPage", function($compile){ + + zaa.directive("menuDropdown", function(ServiceMenuData) { + return { + restrict : 'E', + scope : { + navId : '=' + }, + controller : function($scope) { + + $scope.changeModel = function(data) { + $scope.navId = data.id; + } + + $scope.menuData = ServiceMenuData.data; + + $scope.$on('service:MenuData', function(event, data) { + $scope.menuData = data; + }); + + function init() { + if ($scope.menuData.length == 0) { + ServiceMenuData.load(); + } + } + + for (var container in $scope.menuData.containers) { + $scope.menuData.containers[container].isHidden = false; + } + + $scope.toggler = true; + + init(); + }, + template : function() { + return '
' + + 'keyboard_arrow_downkeyboard_arrow_up Toggle all
' + + '
' + + 'keyboard_arrow_downkeyboard_arrow_up {{container.name}}' + + '
    ' + + '
  • ' + + '
' + + '
'; + } + } + }); + + zaa.directive("zaaCmsPage", function($compile) { return { restrict: "E", scope: { @@ -71,7 +77,7 @@ navId : '=' }, controller : function($scope, $http, $state) { - + $scope.$watch('navId', function(n) { if (n) { $http.get('admin/api-cms-navitem/get-nav-item-path', { params : { navId : $scope.navId }}).then(function(response) { @@ -82,7 +88,7 @@ }); } }); - + $scope.goTo = function(navId) { $state.go('custom.cmsedit', { navId : navId }); } @@ -101,9 +107,9 @@ }, templateUrl : 'updateformpage.html', controller : function($scope) { - + $scope.parent = $scope.$parent.$parent; - + $scope.isEditAvailable = function() { return $scope.parent.item.nav_item_type == 1; } @@ -143,7 +149,7 @@ } } }); - + zaa.directive("createForm", function() { return { restrict : 'EA', @@ -152,14 +158,14 @@ }, templateUrl : 'createform.html', controller : function($scope, $http, $filter, ServiceMenuData, Slug, ServiceLanguagesData, AdminToastService) { - + $scope.error = []; $scope.success = false; - + $scope.controller = $scope.$parent; - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); @@ -167,50 +173,50 @@ $scope.menuDataReload = function() { return ServiceMenuData.load(true); } - + function initializer() { $scope.menu = $scope.menuData.items; $scope.navcontainers = $scope.menuData.containers; } - + initializer(); - - + + $scope.data.nav_item_type = 1; $scope.data.parent_nav_id = 0; $scope.data.is_draft = 0; - + $scope.data.nav_container_id = 1; - - + + $scope.languagesData = ServiceLanguagesData.data; - + $scope.$on('service:LanguagesData', function(event, data) { $scope.languagesData = data; }); - - + + $scope.data.lang_id = parseInt($filter('filter')($scope.languagesData, {'is_default': '1'}, true)[0].id); - + $scope.navitems = []; - + $scope.$watch(function() { return $scope.data.nav_container_id }, function(n, o) { if (n !== undefined && n !== o) { $scope.data.parent_nav_id = 0; $scope.navitems = $scope.menu[n]['__items']; } }); - + $scope.aliasSuggestion = function() { $scope.data.alias = Slug.slugify($scope.data.title); }; - + $scope.$watch('data.alias', function(n, o) { if (n!=o && n!=null) { $scope.data.alias = Slug.slugify(n); } }); - + $scope.exec = function () { $scope.controller.save().then(function(response) { $scope.menuDataReload(); @@ -229,11 +235,11 @@ $scope.error = reason; }); } - + } } }); - + zaa.directive("createFormPage", function(ServiceLayoutsData, ServiceMenuData) { return { restrict : 'EA', @@ -242,34 +248,34 @@ }, templateUrl : 'createformpage.html', controller : function($scope) { - + $scope.data.use_draft = 0; $scope.data.layout_id = 0; $scope.data.from_draft_id = 0; - + // layoutsData - + $scope.layoutsData = ServiceLayoutsData.data; - + $scope.$on('service:BlocksData', function(event, data) { $scope.layoutsData = data; }); - + // menuData - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); - + function init() { $scope.drafts = $scope.menuData.drafts; $scope.layouts = $scope.layoutsData; } - + init(); - + $scope.save = function() { $scope.$parent.exec(); } @@ -285,20 +291,20 @@ }, templateUrl : 'createformmodule.html', controller : function($scope) { - + $scope.modules = []; - + $http.get('admin/api-admin-common/data-modules').then(function(response) { $scope.modules = response.data; }) - + $scope.save = function() { $scope.$parent.exec(); } } } }); - + zaa.directive("createFormRedirect", function() { return { restrict : 'EA', @@ -307,30 +313,30 @@ }, templateUrl : 'createformredirect.html', controller : function($scope) { - + $scope.save = function() { $scope.$parent.exec(); } } } }); - + // factory.js - + zaa.factory('PlaceholderService', function() { var service = []; - + service.status = 1; /* 1 = showplaceholders; 0 = hide placeholders */ - + service.delegate = function(status) { service.status = status; } - + return service; }); - + // layout.js - + zaa.config(function($stateProvider, resolverProvider) { $stateProvider .state("custom.cmsedit", { @@ -346,37 +352,37 @@ templateUrl: 'cmsadmin/page/drafts' }); }); - + zaa.controller("DraftsController", function($scope, $state, ServiceMenuData) { - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); - + $scope.go = function(navId) { $state.go('custom.cmsedit', { navId : navId }); }; - + }); - + /* controllers */ - + zaa.controller("ConfigController", function($scope, $http, AdminToastService) { $scope.data = {}; - + $http.get('admin/api-cms-admin/config').then(function(response) { $scope.data = response.data; }); - + $scope.save = function() { $http.post('admin/api-cms-admin/config', $scope.data).then(function(response) { AdminToastService.success(i18n['js_config_update_success'], 4000); }); } }); - + zaa.controller("PageVersionsController", function($scope, $http, ServiceLayoutsData, AdminToastService) { /** * @var object $typeData From parent scope controller NavItemController @@ -385,44 +391,44 @@ * @var integer $fromVersionPageId From ng-model the version copy from or 0 = new empty/blank version * @var integer $versionLayoutId From ng-model, only if fromVersionPageId is 0 */ - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + // layoutsData - + $scope.layoutsData = ServiceLayoutsData.data; - + $scope.$on('service:LayoutsData', function(event, data) { $scope.layoutsData = data; }); - + $scope.closeCreateModal = function() { $scope.createVersionModalState = true; } - + $scope.editVersionModalState = true; - + $scope.closeEditModal = function() { $scope.editVersionModalState = true; } - + $scope.openEditModal = function() { $scope.editVersionModalState = false; } - + $scope.toggleVersionEdit = function(versionId) { $scope.$parent.switchVersion(versionId); $scope.openEditModal(); }; - + $scope.toggleRemoveVersion = function(versionid) { $scope.$parent.switchVersion(versionid); $scope.$parent.removeCurrentVersion(); - + } - + // controller logic - + $scope.changeVersionLayout = function(versionItem) { $http.post('admin/api-cms-navitem/change-page-version-layout', $.param({'pageItemId': versionItem.id, 'layoutId': versionItem.layout_id, 'alias': versionItem.version_alias}), headers).then(function(response) { $scope.refreshForce(); @@ -430,7 +436,7 @@ AdminToastService.success(i18n['js_version_update_success'], 4000); }); }; - + $scope.createNewVersionSubmit = function(data) { if (data == undefined) { AdminToastService.error(i18n['js_version_error_empty_fields'], 4000); @@ -444,55 +450,55 @@ AdminToastService.error(i18n['js_version_error_empty_fields'], 4000); return null; } - + $scope.refreshForce(); $scope.closeCreateModal(); - + AdminToastService.success(i18n['js_version_create_success'], 4000); }); }; }); - + zaa.controller("CopyPageController", function($scope, $http, AdminToastService, Slug) { - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + $scope.$on('deletedNavItem', function() { $scope.isOpen = false; $scope.itemSelection = false; $scope.selection = 0; }); - + $scope.NavItemController = $scope.$parent; - + $scope.navId = 0; - + $scope.items = null; - + $scope.isOpen = false; - + $scope.itemSelection = false; - + $scope.selection = 0; - + $scope.select = function(item) { $scope.selection = item.id; $scope.itemSelection = angular.copy(item); }; - + $scope.aliasSuggestion = function() { $scope.itemSelection.alias = Slug.slugify($scope.itemSelection.title); } - + $scope.loadItems = function() { $scope.navId = $scope.NavItemController.NavController.navData.id; - + $http.get('admin/api-cms-nav/find-nav-items', { params: { navId : $scope.navId }}).then(function(response) { $scope.items = response.data; $scope.isOpen = true; }); }; - + $scope.save = function() { $scope.itemSelection['toLangId'] = $scope.NavItemController.lang.id; $http.post('admin/api-cms-nav/create-from-page', $.param($scope.itemSelection), headers).then(function(response) { @@ -504,19 +510,19 @@ } }); } - + }); - + zaa.controller("DropNavController", function($scope, $http, ServiceMenuData, AdminToastService) { - + $scope.droppedNavItem = null; $scope.showVersionList = false; - + $scope.errorMessageOnDuplicateAlias = function(response) { AdminToastService.error(i18nParam('js_page_add_exists', {title: response.success.title, id: response.success.nav_id}), 5000); } - + $scope.onBeforeDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-before', { params : { moveItemId : $scope.droppedNavItem.id, droppedBeforeItemId : itemid }}).then(function(r) { @@ -526,7 +532,7 @@ ServiceMenuData.load(true); }); } - + $scope.onAfterDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-after', { params : { moveItemId : $scope.droppedNavItem.id, droppedAfterItemId : itemid }}).then(function(r) { @@ -536,7 +542,7 @@ ServiceMenuData.load(true); }); } - + $scope.onChildDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-to-child', { params : { moveItemId : $scope.droppedNavItem.id, droppedOnItemId : itemid }}).then(function(r) { @@ -546,7 +552,7 @@ ServiceMenuData.load(true); }); } - + $scope.onEmptyDrop = function($event, $ui) { var itemid = $($event.target).data('itemid'); $http.get('admin/api-cms-navitem/move-to-container', { params : { moveItemId : $scope.droppedNavItem.id, droppedOnCatId : itemid }}).then(function(r) { @@ -557,7 +563,7 @@ }); } }) - + zaa.filter("menuparentfilter", function() { return function(input, containerId, parentNavId) { var result = []; @@ -569,7 +575,7 @@ return result; }; }); - + zaa.filter('menuchildfilter', function() { return function(input, containerId, parentNavId) { var returnValue = false; @@ -580,43 +586,43 @@ } } }); - + return returnValue; } }); - + zaa.controller("CmsLiveEdit", function($scope, ServiceLiveEditMode) { - + $scope.display = 0; - + $scope.url = homeUrl; - + $scope.$watch(function() { return ServiceLiveEditMode.state }, function(n, o) { $scope.display = n; }); - + $scope.$on('service:LiveEditModeUrlChange', function(event, url) { var d = new Date(); var n = d.getTime(); $scope.url = url + '&' + n; }); - + }); - + zaa.controller("CmsMenuTreeController", function($scope, $state, $http, $filter, ServiceMenuData, ServiceLiveEditMode) { - + // live edit service - + $scope.liveEditState = 0; - + $scope.$watch('liveEditStateToggler', function(n) { ServiceLiveEditMode.state = n; }); - + // menu Data - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); @@ -624,81 +630,81 @@ $scope.menuDataReload = function() { return ServiceMenuData.load(true); }; - + // controller logic - + $scope.toggleItem = function(data) { if (data.toggle_open == undefined) { data['toggle_open'] = 1; } else { data['toggle_open'] = !data.toggle_open; } - + $http.post('admin/api-cms-nav/tree-history', {data: data}, {ignoreLoadingBar: true}); - + }; - + $scope.go = function(data) { ServiceLiveEditMode.changeUrl(data.nav_item_id, 0); $state.go('custom.cmsedit', { navId : data.id }); }; - + $scope.showDrag = 0; - + $scope.isCurrentElement = function(data) { if (data !== null && $state.params.navId == data.id) { return true; } - + return false; }; - + $scope.hiddenCats = []; - + $scope.$watch('menuData', function (n, o) { $scope.hiddenCats = n.hiddenCats; }); - + $scope.toggleCat = function(catId) { if (catId in $scope.hiddenCats) { $scope.hiddenCats[catId] = !$scope.hiddenCats[catId]; } else { $scope.hiddenCats[catId] = 1; } - + $http.post('admin/api-cms-nav/save-cat-toggle', {catId: catId, state: $scope.hiddenCats[catId]}, {ignoreLoadingBar: true}); }; - + $scope.toggleIsHidden = function(catId) { - + if ($scope.hiddenCats == undefined) { return false; } - + if (catId in $scope.hiddenCats) { if ($scope.hiddenCats[catId] == 1) { return true; } } - + return false; }; - + }); - + // create.js - + zaa.controller("CmsadminCreateController", function($scope, $q, $http) { - + $scope.data = {}; $scope.data.isInline = false; - + $scope.save = function() { - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + return $q(function(resolve, reject) { - + if ($scope.data.nav_item_type == 1) { $http.post('admin/api-cms-nav/create-page', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -706,7 +712,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 2) { $http.post('admin/api-cms-nav/create-module', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -714,7 +720,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 3) { $http.post('admin/api-cms-nav/create-redirect', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -725,23 +731,23 @@ }); } }); - + zaa.controller("CmsadminCreateInlineController", function($scope, $q, $http) { - + $scope.data = { nav_id : $scope.$parent.NavController.id }; - + $scope.data.isInline = true; - + $scope.save = function() { - + $scope.data.lang_id = $scope.lang.id; - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + return $q(function(resolve, reject) { - + if ($scope.data.nav_item_type == 1) { $http.post('admin/api-cms-nav/create-page-item', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -749,7 +755,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 2) { $http.post('admin/api-cms-nav/create-module-item', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -757,7 +763,7 @@ reject(response.data); }); } - + if ($scope.data.nav_item_type == 3) { $http.post('admin/api-cms-nav/create-redirect-item', $.param($scope.data), headers).then(function(response) { resolve(response.data); @@ -767,27 +773,27 @@ } }) } - + }); - + // update.js - + zaa.controller("NavController", function($scope, $filter, $stateParams, $http, LuyaLoading, PlaceholderService, ServicePropertiesData, ServiceMenuData, ServiceLanguagesData, AdminToastService, AdminClassService, AdminLangService) { - + $scope.AdminLangService = AdminLangService; - + /* service AdminPropertyService inheritance */ - + $scope.propertiesData = ServicePropertiesData.data; - + $scope.$on('service:PropertiesData', function(event, data) { $scope.propertiesData = data; }); - + /* service ServiceMenuData inheritance */ - + $scope.menuData = ServiceMenuData.data; - + $scope.$on('service:MenuData', function(event, data) { $scope.menuData = data; }); @@ -795,21 +801,21 @@ $scope.menuDataReload = function() { return ServiceMenuData.load(true); } - + /* service ServiceLangaugesData inheritance */ - + $scope.languagesData = ServiceLanguagesData.data; - + $scope.$on('service:LanguagesData', function(event, data) { $scope.languagesData = data; }); - + /* placeholders toggler service */ - + $scope.PlaceholderService = PlaceholderService; - + $scope.placeholderState = $scope.PlaceholderService.status; - + $scope.$watch('placeholderState', function(n, o) { if (n !== o && n !== undefined) { $scope.PlaceholderService.delegate(n); @@ -817,31 +823,31 @@ }); /* sidebar logic */ - + $scope.sidebar = false; - + $scope.enableSidebar = function() { $scope.sidebar = true; } - + $scope.toggleSidebar = function() { $scope.sidebar = !$scope.sidebar; }; - + /* app logic */ - + $scope.showActions = 1; - + $scope.id = parseInt($stateParams.navId); - + $scope.isDeleted = false; - + $scope.AdminClassService = AdminClassService; - + $scope.propValues = {}; - + $scope.hasValues = false; - + $scope.bubbleParents = function(parentNavId, containerId) { var item = $filter('menuchildfilter')($scope.menuData.items, containerId, parentNavId); if (item) { @@ -849,7 +855,7 @@ $scope.bubbleParents(item.parent_nav_id, item.nav_container_id); } } - + $scope.createDeepPageCopy = function() { $http.post('admin/api-cms-nav/deep-page-copy', {navId: $scope.id}).then(function(response) { $scope.menuDataReload(); @@ -857,7 +863,7 @@ $scope.showActions = 1; }); }; - + $scope.loadNavProperties = function() { $http.get('admin/api-cms-nav/get-properties', { params: {navId: $scope.id}}).then(function(response) { for(var i in response.data) { @@ -867,13 +873,13 @@ } }); }; - + $scope.togglePropMask = function() { $scope.showPropForm = !$scope.showPropForm; } - + $scope.showPropForm = false; - + $scope.storePropValues = function() { var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; $http.post('admin/api-cms-nav/save-properties?navId='+$scope.id, $.param($scope.propValues), headers).then(function(response) { @@ -882,10 +888,10 @@ $scope.showPropForm = false; }); } - + $scope.trash = function() { AdminToastService.confirm(i18n['js_page_confirm_delete'], function($timeout, $toast) { - + $http.get('admin/api-cms-nav/delete', { params : { navId : $scope.id }}).then(function(response) { $scope.isDeleted = true; $scope.menuDataReload().then(function() { @@ -896,9 +902,9 @@ }); }); }; - + $scope.isDraft = false; - + $scope.submitNavForm = function() { $http.post('admin/api-cms-nav/update?id=' + $scope.navData.id, {layout_file: $scope.navData.layout_file}).then(function(response) { AdminToastService.success(i18nParam('js_page_update_layout_save_success'), 3000); @@ -908,18 +914,18 @@ }); }); } - + function initializer() { $scope.navData = $filter('filter')($scope.menuData.items, {id: $scope.id}, true)[0]; - + if ($scope.navData == undefined) { $scope.isDraft = true; } else { - + $scope.loadNavProperties(); - + /* properties --> */ - + $scope.$watch(function() { return $scope.navData.is_offline }, function(n, o) { if (n !== o && n !== undefined) { $http.get('admin/api-cms-nav/toggle-offline', { params : { navId : $scope.navData.id , offlineStatus : n }}).then(function(response) { @@ -931,7 +937,7 @@ }); } }); - + $scope.$watch(function() { return $scope.navData.is_hidden }, function(n, o) { if (n !== o && n !== undefined) { $http.get('admin/api-cms-nav/toggle-hidden', { params : { navId : $scope.navData.id , hiddenStatus : n }}).then(function(response) { @@ -943,7 +949,7 @@ }); } }); - + $scope.$watch(function() { return $scope.navData.is_home }, function(n, o) { if (n !== o && n !== undefined) { $http.get('admin/api-cms-nav/toggle-home', { params : { navId : $scope.navData.id , homeState : n }}).then(function(response) { @@ -959,69 +965,69 @@ }); } } - + initializer(); }); - + /** * @param $scope.lang from ng-repeat */ zaa.controller("NavItemController", function($scope, $http, $timeout, Slug, ServiceMenuData, AdminLangService, AdminToastService, ServiceLiveEditMode) { - + $scope.loaded = false; - + $scope.NavController = $scope.$parent; - + $scope.liveEditState = false; - + $scope.$watch(function() { return ServiceLiveEditMode.state }, function(n, o) { $scope.liveEditState = n; }); - + $scope.openLiveUrl = function(id, versionId) { ServiceLiveEditMode.changeUrl(id, versionId); }; - + $scope.loadLiveUrl = function() { ServiceLiveEditMode.changeUrl($scope.item.id, $scope.currentPageVersion); } - + // serviceMenuData inheritance - + $scope.menuDataReload = function() { return ServiceMenuData.load(true); } - + $scope.$on('service:LoadLanguage', function(event, data) { if (!$scope.loaded) { $scope.refresh(); } }); - + // properties: - + $scope.isTranslated = false; - + $scope.item = []; - + $scope.itemCopy = []; - + $scope.settings = false; - + $scope.typeDataCopy = []; - + $scope.typeData = []; - + $scope.container = []; - + $scope.currentVersionInformation = null; - + $scope.errors = []; - + $scope.homeUrl = homeUrl; - + $scope.currentPageVersion = 0; - + $scope.trashItem = function() { if ($scope.lang.is_default == 0) { AdminToastService.confirm(i18n['js_page_confirm_delete'], function($timeout, $toast) { @@ -1046,7 +1052,7 @@ }); } }; - + $scope.reset = function() { $scope.itemCopy = angular.copy($scope.item); if ($scope.item.nav_item_type == 1) { @@ -1054,7 +1060,7 @@ } else { $scope.typeDataCopy = angular.copy($scope.typeData); } - + } $scope.updateNavItemData = function(itemCopy, typeDataCopy) { @@ -1084,18 +1090,18 @@ $scope.errors = response.data; }); }; - + $scope.toggleSettings = function() { $scope.reset(); $scope.settings = !$scope.settings; }; - + $scope.$watch('itemCopy.alias', function(n, o) { if (n!=o && n!=null) { $scope.itemCopy.alias = Slug.slugify(n); } }); - + $scope.removeCurrentVersion = function() { // {alias: $scope.currentVersionInformation.version_alias} AdminToastService.confirm(i18nParam('js_version_delete_confirm', {alias: $scope.currentVersionInformation.version_alias}), function($toast, $http) { @@ -1107,10 +1113,10 @@ }); }); } - + $scope.getItem = function(langId, navId) { $http({ - url: 'admin/api-cms-navitem/nav-lang-item', + url: 'admin/api-cms-navitem/nav-lang-item', method: "GET", params: { langId : langId, navId : navId } }).then(function(response) { @@ -1138,27 +1144,27 @@ $scope.loaded = true }); }; - + $scope.switchVersion = function(pageVersionid) { $scope.container = $scope.typeData[pageVersionid]['contentAsArray']; $scope.currentVersionInformation = $scope.typeData[pageVersionid]; $scope.currentPageVersion = pageVersionid; $scope.loadLiveUrl(); }; - + $scope.refreshForce = function() { $scope.getItem($scope.lang.id, $scope.NavController.id); } - + $scope.refresh = function() { if (AdminLangService.isInSelection($scope.lang.short_code)) { $scope.getItem($scope.lang.id, $scope.NavController.id); } - + }; - + // - + function init() { $scope.refresh(); } - + init(); }); - - + + /** * @param $scope.placeholder * from ng-repeat */ zaa.controller("PagePlaceholderController", function($scope, AdminClassService, PlaceholderService) { - + $scope.NavItemTypePageController = $scope.$parent; - + $scope.PlaceholderService = PlaceholderService; - + $scope.$watch(function() { return $scope.PlaceholderService.status }, function(n,o) { if (n) { $scope.isOpen = true; @@ -1228,13 +1234,13 @@ $scope.isOpen = false; } }); - + $scope.isOpen = false; - + $scope.toggleOpen = function() { $scope.isOpen = !$scope.isOpen; } - + $scope.mouseEnter = function() { var status = AdminClassService.getClassSpace('onDragStart'); if (status !== undefined && !$scope.isOpen) { @@ -1242,35 +1248,35 @@ } }; }); - - + + /** * @param $scope.block * from ng-repeat */ zaa.controller("PageBlockEditController", function($scope, $sce, $http, AdminClassService, AdminToastService, ServiceBlockCopyStack, ServiceLiveEditMode) { - + $scope.PagePlaceholderController = $scope.$parent; - + $scope.onStart = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', 'page--drag-active'); }); }; - + $scope.copyBlock = function() { ServiceBlockCopyStack.push($scope.block.id, $scope.block.name); }; - + $scope.toggleHidden = function() { if ($scope.block.is_hidden == 0) { $scope.block.is_hidden = 1; } else { $scope.block.is_hidden = 0; } - + $http({ - url: 'admin/api-cms-navitem/toggle-block-hidden', + url: 'admin/api-cms-navitem/toggle-block-hidden', method: "GET", params: { blockId : $scope.block.id, hiddenState: $scope.block.is_hidden } }).then(function(response) { @@ -1285,14 +1291,14 @@ if (varFieldName in $scope.block.field_help) { return true; } - + return false; } - + $scope.getInfo = function(varFieldName) { return $scope.block.field_help[varFieldName]; } - + $scope.isEditable = function() { return typeof $scope.block.vars != "undefined" && $scope.block.vars.length > 0; }; @@ -1300,25 +1306,25 @@ $scope.isConfigable = function() { return typeof $scope.block.cfgs != "undefined" && $scope.block.cfgs.length > 0; }; - + $scope.safe = function(html) { return $sce.trustAsHtml(html); }; - + $scope.onStop = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', undefined); }); }; - + $scope.$watch(function() { return $scope.block.values }, function(n, o) { $scope.data = n; }); - + $scope.$watch(function() { return $scope.block.variation }, function(n, o) { $scope.evalVariationVisbility(n); }); - + $scope.evalVariationVisbility = function(variatenName) { if ($scope.block.variations.hasOwnProperty(variatenName)) { var variation = $scope.block.variations[$scope.block.variation]; @@ -1342,9 +1348,9 @@ }); } } - + $scope.cfgdata = $scope.block.cfgvalues || {}; - + $scope.edit = false; $scope.config = false; @@ -1369,7 +1375,7 @@ $scope.config = !$scope.config; $scope.edit = false; }; - + $scope.renderTemplate = function(template, dataVars, cfgVars, block, extras) { if (template == undefined) { return ''; @@ -1377,17 +1383,17 @@ var template = twig({ data: template }); - + var content = template.render({ vars : dataVars, cfgs : cfgVars, block : block, extras : extras }); - + return $sce.trustAsHtml(content); }; - + $scope.removeBlock = function(block) { AdminToastService.confirm(i18nParam('js_page_block_delete_confirm', {name: block.name}), function($timeout, $toast) { $http.delete('admin/api-cms-navitempageblockitem/delete?id=' + block.id).then(function(response) { @@ -1398,7 +1404,7 @@ }); }); }; - + $scope.save = function () { $http.put('admin/api-cms-navitempageblockitem/update?id=' + $scope.block.id, { json_config_values: $scope.data, @@ -1414,26 +1420,26 @@ $scope.evalVariationVisbility($scope.block.variation); }); } - + }); - + /** * @TODO HANDLING SORT INDEX OF EACH BLOCK */ zaa.controller("DropBlockController", function($scope, $http, AdminClassService) { - + $scope.PagePlaceholderController = $scope.$parent; - + $scope.droppedBlock = {}; - + $scope.onDrop = function($event, $ui) { - + var headers = {"headers" : { "Content-Type" : "application/x-www-form-urlencoded; charset=UTF-8" }}; - + var sortIndex = $($event.target).data('sortindex'); var moveBlock = $scope.droppedBlock['vars'] || false; var event = $scope.droppedBlock['event'] || false; - + if (event === 'isServiceBlockCopyInstance') { $http.post('admin/api-cms-navitemblock/copy-block-from-stack', $.param({ copyBlockId: $scope.droppedBlock.blockId, @@ -1466,15 +1472,15 @@ AdminClassService.setClassSpace('onDragStart', undefined); } }); - + zaa.controller("DroppableBlocksController", function($scope, $http, AdminClassService, ServiceBlocksData, ServiceBlockCopyStack, $sce) { - + // service ServiceBlocksData inheritance - + $scope.blocksData = ServiceBlocksData.data; - + $scope.blocksDataRestore = angular.copy($scope.blocksData); - + $scope.$on('service:BlocksData', function(event, data) { $scope.blocksData = data; }); @@ -1482,45 +1488,45 @@ $scope.blocksDataReload = function() { return ServiceBlocksData.load(true); } - + $scope.addToFav = function(item) { $http.post('admin/api-cms-block/to-fav', {block: item }).then(function(response) { $scope.blocksDataReload(); }); }; - + $scope.removeFromFav = function(item) { $http.post('admin/api-cms-block/remove-fav', {block: item }).then(function(response) { $scope.blocksDataReload(); }); }; - + $scope.toggleGroup = function(group) { if (group.toggle_open == undefined) { group.toggle_open = 1; } else { group.toggle_open = !group.toggle_open; } - + $http.post('admin/api-cms-block/toggle-group', {group: group}, {ignoreLoadingBar: true}); } - + // controller logic - + $scope.copyStack = ServiceBlockCopyStack.stack; - + $scope.$on('service:CopyStack', function(event, stack) { $scope.copyStack = stack; }); - + $scope.clearStack = function() { ServiceBlockCopyStack.clear(); }; - + $scope.searchQuery = ''; - + $scope.searchIsDirty = false; - + $scope.$watch('searchQuery', function(n, o) { if (n !== '') { $scope.searchIsDirty = true; @@ -1531,22 +1537,22 @@ $scope.blocksData = angular.copy($scope.blocksDataRestore); } }) - + $scope.onStart = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', 'page--drag-active'); }); } - + $scope.safe = function(html) { return $sce.trustAsHtml(html); } - + $scope.onStop = function() { $scope.$apply(function() { AdminClassService.setClassSpace('onDragStart', undefined); }); } }); - + })(); \ No newline at end of file diff --git a/modules/cms/src/admin/resources/scss/cmsadmin-block-styles.scss b/modules/cms/src/admin/resources/scss/cmsadmin-block-styles.scss deleted file mode 100644 index b3feac98f..000000000 --- a/modules/cms/src/admin/resources/scss/cmsadmin-block-styles.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import "base/variables"; - - -/** - * Prefix every module style with the module class - */ -.block-styles { - - @import "block-styles/base"; - @import "block-styles/titles"; - @import "block-styles/text"; - -} \ No newline at end of file diff --git a/modules/cms/src/admin/resources/scss/cmsadmin.scss b/modules/cms/src/admin/resources/scss/cmsadmin.scss index 965d31083..ef76525e2 100644 --- a/modules/cms/src/admin/resources/scss/cmsadmin.scss +++ b/modules/cms/src/admin/resources/scss/cmsadmin.scss @@ -31,3 +31,14 @@ @import "components/treeview"; @import "components/wysiwyg"; } + +/** + * Prefix every module style with the module class + */ +.block-styles { + + @import "block-styles/base"; + @import "block-styles/titles"; + @import "block-styles/text"; + +} \ No newline at end of file diff --git a/modules/cms/src/admin/resources/scss/components/_accordion.scss b/modules/cms/src/admin/resources/scss/components/_accordion.scss index 6139e2064..76cbfcd31 100644 --- a/modules/cms/src/admin/resources/scss/components/_accordion.scss +++ b/modules/cms/src/admin/resources/scss/components/_accordion.scss @@ -61,13 +61,13 @@ .accordion__entry--open > .accordion__body--empty:after { display: block; content: ""; - background: url("../img/empty-placeholder-arrow.png") top left no-repeat; + background: url("../../img/empty-placeholder-arrow.png") top left no-repeat; width: 100px; height: 40px; position: absolute; background-size: cover; opacity: 0.5; - right: 200px; + right: 0; bottom: -20px; }