Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Niels Lyngsø
|
ca45b8e590 | ||
|
Niels Lyngsø
|
095444e80d | ||
|
Niels Lyngsø
|
2940072640 | ||
|
Niels Lyngsø
|
a45ed3559b | ||
|
Niels Lyngsø
|
a32398ccde | ||
|
Niels Lyngsø
|
496f9cb329 | ||
|
Niels Lyngsø
|
b70979a0de | ||
|
Niels Lyngsø
|
6846f762e5 | ||
|
Niels Lyngsø
|
6299ab0870 | ||
|
Niels Lyngsø
|
5c3fb0495f | ||
|
Niels Lyngsø
|
44acf7e845 | ||
|
Niels Lyngsø
|
fa5192c294 |
+1
@@ -17,6 +17,7 @@
|
||||
replace: true,
|
||||
templateUrl: 'views/components/editor/umb-editor-sub-views.html',
|
||||
scope: {
|
||||
onSelectVariant: "&",
|
||||
subViews: "=",
|
||||
model: "="
|
||||
},
|
||||
|
||||
+6
-2
@@ -9,7 +9,8 @@ angular.module("umbraco.directives")
|
||||
scope: {
|
||||
property: "=",
|
||||
showInherit: "<",
|
||||
inheritsFrom: "<"
|
||||
inheritsFrom: "<",
|
||||
onSelectVariant: "&?"
|
||||
},
|
||||
transclude: true,
|
||||
restrict: 'E',
|
||||
@@ -27,7 +28,10 @@ angular.module("umbraco.directives")
|
||||
var self = this;
|
||||
|
||||
//set the API properties/methods
|
||||
|
||||
|
||||
self.openDefaultVariant = function() {
|
||||
console.log("Hello")
|
||||
};
|
||||
self.property = $scope.property;
|
||||
self.setPropertyError = function (errorMsg) {
|
||||
$scope.property.propertyErrorMessage = errorMsg;
|
||||
|
||||
@@ -744,6 +744,10 @@ legend + .control-group {
|
||||
-webkit-margin-top-collapse: separate;
|
||||
}
|
||||
|
||||
.umb-property__stickers {
|
||||
margin-bottom:10px;
|
||||
}
|
||||
|
||||
// Horizontal-specific styles
|
||||
// --------------------------
|
||||
|
||||
@@ -767,6 +771,11 @@ legend + .control-group {
|
||||
*padding-left: @horizontalComponentOffset;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-property__stickers {
|
||||
margin-left: @horizontalComponentOffset;
|
||||
margin-bottom:2px;
|
||||
}
|
||||
|
||||
|
||||
// Remove bottom margin on block level help text since that's accounted for on .control-group
|
||||
@@ -814,6 +823,10 @@ legend + .control-group {
|
||||
.form-horizontal .controls {
|
||||
margin-left: 0;
|
||||
}
|
||||
.form-horizontal .umb-property__stickers {
|
||||
margin-left: 0;
|
||||
margin-bottom:10px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -195,6 +195,9 @@ label:not([for]) {
|
||||
/* CONTROL VALIDATION */
|
||||
.umb-control-required {
|
||||
color: @controlRequiredColor;
|
||||
&.--as-grey {
|
||||
color:@gray-6;
|
||||
}
|
||||
}
|
||||
|
||||
.controls-row {
|
||||
@@ -219,7 +222,7 @@ label:not([for]) {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls {
|
||||
.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls, .hidelabel > div > .umb-property__stickers {
|
||||
padding: 0;
|
||||
border: none;
|
||||
margin: 0 !important;
|
||||
|
||||
@@ -37,6 +37,11 @@
|
||||
|
||||
// displays property inline with preceeding
|
||||
.umb-property {
|
||||
|
||||
.umb-el-wrap {
|
||||
position:relative;
|
||||
}
|
||||
|
||||
&--pull {
|
||||
float:left;
|
||||
width:60%;
|
||||
@@ -53,7 +58,51 @@
|
||||
width:100%;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-property__inheriting-from-default {
|
||||
background-color: @gray-11;
|
||||
color:@gray-3;
|
||||
padding: 4px 8px;
|
||||
border-radius: 3px;
|
||||
transition: background-color 120ms, color 120ms;
|
||||
|
||||
@media (min-width: 768px) {
|
||||
border-bottom-left-radius: 0;
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
}
|
||||
&.--disabled {
|
||||
|
||||
user-select: none;
|
||||
cursor: not-allowed;
|
||||
|
||||
.control-label {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.controls {
|
||||
opacity: 0.4;
|
||||
pointer-events: none;
|
||||
transition: opacity 240ms;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
/*.controls {
|
||||
opacity: 0.3;
|
||||
}*/
|
||||
.umb-property__inheriting-from-default {
|
||||
background-color: @gray-10;
|
||||
color: black;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.hidelabel > div > .umb-property__stickers .umb-property__inheriting-from-default {
|
||||
border-bottom-left-radius: 3px;
|
||||
border-bottom-right-radius: 3px;
|
||||
}
|
||||
|
||||
|
||||
.umb-property .alert {
|
||||
border-radius: 3px;
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
<div>
|
||||
<ng-form name="tabbedContentForm">
|
||||
<div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
|
||||
<div class="umb-group-panel"
|
||||
retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)"
|
||||
data-app-anchor="{{group.id}}"
|
||||
data-element="group-{{group.alias}}"
|
||||
ng-repeat="group in content.tabs track by group.label">
|
||||
|
||||
<div class="umb-group-panel__header">
|
||||
<div>{{ group.label }}</div>
|
||||
@@ -12,9 +16,12 @@
|
||||
ng-repeat="property in group.properties track by property.alias"
|
||||
property="property"
|
||||
show-inherit="content.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
|
||||
inherits-from="defaultVariant.language.name">
|
||||
on-select-variant="onSelectVariant(variant)"
|
||||
inherits-from="defaultVariant"
|
||||
ng-class="{'--disabled': content.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue}"
|
||||
>
|
||||
|
||||
<div ng-class="{'o-40 cursor-not-allowed': content.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue}">
|
||||
<div>
|
||||
<umb-property-editor
|
||||
model="property"
|
||||
preview="content.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue">
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<umb-editor-container ng-if="vm.editor.content.apps.length > 0">
|
||||
<div class="umb-editor-sub-views">
|
||||
<div ng-repeat="app in vm.editor.content.apps track by app.alias">
|
||||
<umb-editor-sub-view model="app" content="vm.content" />
|
||||
<umb-editor-sub-view model="app" content="vm.content" on-select-variant="vm.selectVariant(variant)"/>
|
||||
</div>
|
||||
</div>
|
||||
</umb-editor-container>
|
||||
|
||||
@@ -7,21 +7,25 @@
|
||||
<div class="umb-el-wrap">
|
||||
|
||||
<label class="control-label" ng-hide="property.hideLabel" for="{{property.alias}}" ng-attr-title="{{propertyAlias}}">
|
||||
|
||||
<small ng-if="showInherit" class="db" style="padding-top: 0; margin-bottom: 5px;">
|
||||
<localize key="contentTypeEditor_inheritedFrom"></localize> {{inheritsFrom}}
|
||||
</small>
|
||||
|
||||
{{property.label}}
|
||||
|
||||
<span ng-if="property.validation.mandatory">
|
||||
<strong class="umb-control-required">*</strong>
|
||||
<strong class="umb-control-required" ng-class="{'--as-grey': showInherit}">*</strong>
|
||||
</span>
|
||||
<small ng-bind-html="property.description | preserveNewLineInHtml"></small>
|
||||
|
||||
</label>
|
||||
|
||||
<div class="umb-property__stickers">
|
||||
<small ng-if="showInherit" class="umb-property__inheriting-from-default" on-click="openDefaultVariant();">
|
||||
<localize key="contentTypeEditor_invariantValueInheritedFrom" tokens="[inheritsFrom.language.name]" watchTokens="true"></localize>
|
||||
</small>
|
||||
</div>
|
||||
|
||||
<div class="controls" ng-transclude>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</ng-form>
|
||||
|
||||
@@ -223,8 +223,7 @@
|
||||
|
||||
<div class="umb-group-builder__property-tag" ng-if="property.inherited">
|
||||
<i class="icon icon-merge"></i>
|
||||
<span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom"></localize></span>
|
||||
{{property.contentTypeName}}
|
||||
<span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom" tokens="[property.contentTypeName]"></localize></span>
|
||||
</div>
|
||||
|
||||
<div class="umb-group-builder__property-tag" ng-if="property.locked">
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
<umb-tabbed-content
|
||||
ng-if="!vm.loading"
|
||||
content="vm.content">
|
||||
content="vm.content"
|
||||
onSelectVariant="vm.onSelectVariant(variant)">
|
||||
</umb-tabbed-content>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1280,7 +1280,8 @@ Mange hilsner fra Umbraco robotten
|
||||
<key alias="group">Gruppe</key>
|
||||
<key alias="noGroups">Du har ikke tilføjet nogle grupper</key>
|
||||
<key alias="addGroup">Tilføj gruppe</key>
|
||||
<key alias="inheritedFrom">Nedarvet fra</key>
|
||||
<key alias="inheritedFrom">Nedarvet fra %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Arver indholdet fra %0%</key>
|
||||
<key alias="addProperty">Tilføj egenskab</key>
|
||||
<key alias="requiredLabel">Påkrævet label</key>
|
||||
<key alias="enableListViewHeading">Aktiver listevisning</key>
|
||||
|
||||
@@ -1125,7 +1125,7 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="cancelAndUploadAnother">Cancel and upload another package</key>
|
||||
<key alias="accept">I accept</key>
|
||||
<key alias="termsOfUse">terms of use</key>
|
||||
|
||||
|
||||
<key alias="pathToFile">Path to file</key>
|
||||
<key alias="pathToFileDescription">Absolute path to file (ie: /bin/umbraco.bin)</key>
|
||||
<key alias="installed">Installed</key>
|
||||
@@ -1545,7 +1545,8 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="group">Group</key>
|
||||
<key alias="noGroups">You have not added any groups</key>
|
||||
<key alias="addGroup">Add group</key>
|
||||
<key alias="inheritedFrom">Inherited from</key>
|
||||
<key alias="inheritedFrom">Inherited from %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Invariant value is obtained from %0%</key>
|
||||
<key alias="addProperty">Add property</key>
|
||||
<key alias="requiredLabel">Required label</key>
|
||||
<key alias="enableListViewHeading">Enable list view</key>
|
||||
|
||||
@@ -1558,7 +1558,8 @@ To manage your website, simply open the Umbraco back office and start adding con
|
||||
<key alias="group">Group</key>
|
||||
<key alias="noGroups">You have not added any groups</key>
|
||||
<key alias="addGroup">Add group</key>
|
||||
<key alias="inheritedFrom">Inherited from</key>
|
||||
<key alias="inheritedFrom">Inherited from %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Invariant value is obtained from %0%</key>
|
||||
<key alias="addProperty">Add property</key>
|
||||
<key alias="requiredLabel">Required label</key>
|
||||
<key alias="enableListViewHeading">Enable list view</key>
|
||||
|
||||
@@ -1192,7 +1192,8 @@
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">Composiciones</key>
|
||||
<key alias="noGroups">No has añadido ninguna pestaña</key>
|
||||
<key alias="inheritedFrom">Heredado de</key>
|
||||
<key alias="inheritedFrom">Heredado de %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Heredado de %0%</key>
|
||||
<key alias="addProperty">Añadir propiedad</key>
|
||||
<key alias="requiredLabel">Etiqueta requerida</key>
|
||||
<key alias="enableListViewHeading">Activar vista de lista</key>
|
||||
|
||||
@@ -1365,7 +1365,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">Compositions</key>
|
||||
<key alias="noGroups">Vous n'avez pas ajouté d'onglet</key>
|
||||
<key alias="inheritedFrom">Hérité de</key>
|
||||
<key alias="inheritedFrom">Hérité de %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Hérité de %0%</key>
|
||||
<key alias="addProperty">Ajouter une propriété</key>
|
||||
<key alias="requiredLabel">Label requis</key>
|
||||
<key alias="enableListViewHeading">Activer la vue en liste</key>
|
||||
|
||||
@@ -925,7 +925,8 @@ Runwayをインストールして作られた新しいウェブサイトがど
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">構成</key>
|
||||
<key alias="noGroups">タブが追加されていません</key>
|
||||
<key alias="inheritedFrom">次から継承:</key>
|
||||
<key alias="inheritedFrom">次から継承: %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">次から継承: %0%</key>
|
||||
<key alias="addProperty">プロパティの追加</key>
|
||||
<key alias="requiredLabel">必要なラベル</key>
|
||||
<key alias="enableListViewHeading">リスト ビューの有効化</key>
|
||||
|
||||
@@ -960,7 +960,8 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
|
||||
<key alias="compositions">Composities</key>
|
||||
<key alias="noGroups">Er zijn nog geen groepen toegevoegd</key>
|
||||
<key alias="addGroup">Voeg groep toe</key>
|
||||
<key alias="inheritedFrom">Inherited van</key>
|
||||
<key alias="inheritedFrom">Inherited van %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Inherited van %0%</key>
|
||||
<key alias="addProperty">Voeg property toe</key>
|
||||
<key alias="requiredLabel">Verplicht label</key>
|
||||
<key alias="enableListViewHeading">Zet list view aan</key>
|
||||
|
||||
@@ -1171,7 +1171,8 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">Kompozycje</key>
|
||||
<key alias="noGroups">Nie dodałeś żadnych zakładek</key>
|
||||
<key alias="inheritedFrom">Odziedziczone z</key>
|
||||
<key alias="inheritedFrom">Odziedziczone z %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Odziedziczone z %0%</key>
|
||||
<key alias="addProperty">Dodaj właściwość</key>
|
||||
<key alias="requiredLabel">Wymagana etykieta</key>
|
||||
<key alias="enableListViewHeading">Włącz widok listy</key>
|
||||
|
||||
@@ -267,7 +267,8 @@
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">Композиции</key>
|
||||
<key alias="noGroups">Вы не добавили ни одной вкладки</key>
|
||||
<key alias="inheritedFrom">Унаследовано от</key>
|
||||
<key alias="inheritedFrom">Унаследовано от %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">Унаследовано от %0%</key>
|
||||
<key alias="addProperty">Добавить свойство</key>
|
||||
<key alias="requiredLabel">Обязательная метка</key>
|
||||
<key alias="enableListViewHeading">Представление в формате списка</key>
|
||||
|
||||
@@ -971,7 +971,8 @@
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">组合</key>
|
||||
<key alias="noGroups">您没有添加任何选项卡</key>
|
||||
<key alias="inheritedFrom">继承自</key>
|
||||
<key alias="inheritedFrom">继承自 %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">继承自 %0%</key>
|
||||
<key alias="addProperty">添加属性</key>
|
||||
<key alias="requiredLabel">必需的标签</key>
|
||||
<key alias="enableListViewHeading">启用列表视图</key>
|
||||
|
||||
@@ -958,7 +958,8 @@
|
||||
<area alias="contentTypeEditor">
|
||||
<key alias="compositions">組合</key>
|
||||
<key alias="noGroups">您沒有增加任何選項卡</key>
|
||||
<key alias="inheritedFrom">繼承的表格</key>
|
||||
<key alias="inheritedFrom">繼承的表格 %0%</key>
|
||||
<key alias="invariantValueInheritedFrom">繼承的表格 %0%</key>
|
||||
<key alias="addProperty">增加屬性</key>
|
||||
<key alias="requiredLabel">必要標籤</key>
|
||||
<key alias="enableListViewHeading">允許清單檢視</key>
|
||||
|
||||
Reference in New Issue
Block a user