Compare commits

...

8 Commits

Author SHA1 Message Date
Warren Buckley f40b802523 Revert change to en_us.xml 2019-07-03 10:24:25 +01:00
Warren Buckley d8157f2599 Revert "Fix line endings - according to VS19"
This reverts commit 4ebc2d7c29.
2019-07-03 10:23:18 +01:00
Warren Buckley 4ebc2d7c29 Fix line endings - according to VS19 2019-07-03 10:19:54 +01:00
Warren Buckley 7c0933c50b Add margin-right to trash icon next to copy/text 2019-07-03 09:57:22 +01:00
Warren Buckley 90a8c2d2c9 Add in language keys 2019-07-03 09:57:01 +01:00
Warren Buckley 58e241b6cb Add in trash icon & apply correct color from variables 2019-07-03 09:23:19 +01:00
Warren Buckley 69f85926d2 Merge branch 'v8/dev' into v8/feature/recycle-bin-context-message 2019-07-03 09:13:10 +01:00
Warren Buckley 91743833f5 Add a message bar to give context that this node/content item is in the trash/recycle bin 2019-07-02 16:44:07 +01:00
4 changed files with 2163 additions and 2145 deletions
@@ -65,7 +65,7 @@
width: 500px;
will-change: transform;
left: auto;
.umb-editor-container {
max-width: 500px;
}
@@ -90,3 +90,14 @@
opacity: 1;
transition: opacity 320ms 20ms, visibility 0s;
}
.umb-editor--trashed-message {
background:@errorBackground;
color:@errorText;
padding:10px;
margin-bottom:20px;
i {
margin-right:5px;
}
}
@@ -27,6 +27,12 @@
</ng-form>
<umb-editor-container ng-if="vm.editor.content.apps.length > 0">
<!-- Deleted Context Message Bar (Displayed when viewing node in recycle bin) -->
<div ng-show="vm.content.trashed" class="umb-editor--trashed-message">
<i class="icon icon-trash"></i> <localize key="content_nodeIsInTrash">This content node is in the Recycle Bin</localize>
</div>
<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" />
@@ -97,12 +97,12 @@
<key alias="domainUpdated">Domain '%0%' has been updated</key>
<key alias="orEdit">Edit Current Domains</key>
<key alias="domainHelpWithVariants">
<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".]]></key>
<key alias="inherit">Inherit</key>
<key alias="setLanguage">Culture</key>
<key alias="setLanguageHelp">
<![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
<![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
to the current node, unless a domain below applies too.]]>
</key>
<key alias="setDomains">Domains</key>
@@ -295,7 +295,8 @@
<key alias="sendForApproval">Send for approval</key>
<key alias="schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</key>
<key alias="createEmpty">Create new</key>
<key alias="createFromClipboard">Paste from clipboard</key>
<key alias="createFromClipboard">Paste from clipboard</key>
<key alias="nodeIsInTrash">This content node is in the Recycle Bin</key>
</area>
<area alias="blueprints">
<key alias="createBlueprintFrom">Create a new Content Template from '%0%'</key>
File diff suppressed because it is too large Load Diff