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

Merge branch 'localization-v764' of git://github.com/abryukhov/Umbraco-CMS into temp-U4-10043

Browse Source
This commit is contained in:
Claus
2017-06-21 12:03:25 +02:00
parent 8681d535f2 552c2ed4dc
commit bc76fa8687
39 changed files with 432 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
View File

@@ -86,7 +86,7 @@ Use this directive to generate a pagination.
(function() {
'use strict';
function PaginationDirective() {
function PaginationDirective(localizationService) {
function link(scope, el, attr, ctrl) {
@@ -123,12 +123,12 @@ Use this directive to generate a pagination.
//now, if the start is greater than 0 then '1' will not be displayed, so do the elipses thing
if (start > 0) {
scope.pagination.unshift({ name: "First", val: 1, isActive: false }, {val: "...",isActive: false});
scope.pagination.unshift({ name: localizationService.localize("general_first"), val: 1, isActive: false }, {val: "...",isActive: false});
}
//same for the end
if (start < maxIndex) {
scope.pagination.push({ val: "...", isActive: false }, { name: "Last", val: scope.totalPages, isActive: false });
scope.pagination.push({ val: "...", isActive: false }, { name: localizationService.localize("general_last"), val: scope.totalPages, isActive: false });
}
}

15
src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
View File

@@ -7,7 +7,8 @@
style="width: 100%"
ng-model="searchTerm"
class="umb-search-field search-query input-block-level"
placeholder="Filter..."
localize="plceholder"
placeholder="@placeholders_filter"
no-dirty-check>
</div>
</div>
@@ -17,12 +18,12 @@
<div class="umb-control-group">
<select ng-model="color" class="input-block-level">
<option value="">Black</option>
<option value="color-green">Green</option>
<option value="color-yellow">Yellow</option>
<option value="color-orange">Orange</option>
<option value="color-blue">Blue</option>
<option value="color-red">Red</option>
<option value=""><localize key="colors_black">Black</localize></option>
<option value="color-green"><localize key="colors_green">Green</localize></option>
<option value="color-yellow"><localize key="colors_yellow">Yellow</localize></option>
<option value="color-orange"><localize key="colors_orange">Orange</localize></option>
<option value="color-blue"><localize key="colors_blue">Blue</localize></option>
<option value="color-red"><localize key="colors_red">Red</localize></option>
</select>
</div>

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html
View File

@@ -3,7 +3,7 @@
<div class="umb-pane">
<p>
Are you sure you want to delete <strong>{{currentNode.name}}</strong> ?
<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
</p>

6
src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
View File

@@ -22,7 +22,7 @@
<umb-control-group label="@content_target">
<select class="umb-editor umb-dropdown" ng-model="target.target">
<option value=""></option>
<option value="_blank">Opens the linked document in a new window or tab</option>
<option value="_blank"><localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize></option>
<option value="_top">Opens the linked document in the full body of the window</option>
<option value="_parent">Opens the linked document in the parent frame</option>
</select>
@@ -63,7 +63,7 @@
<localize key="general_cancel">Cancel</localize>
</a>
<a href ng-click="switchToMediaPicker()" class="btn">Link to file</a>
<a href ng-click="switchToMediaPicker()" class="btn"><localize key="defaultdialogs_linkToMedia">Link to file</localize></a>
<button
class="btn btn-primary"
@@ -73,4 +73,4 @@
</div>
</div>
</div>
</div>
</div>

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

@@ -75,7 +75,8 @@
<input type="text"
ng-model="searchTerm"
class="umb-search-field search-query"
placeholder="Filter...">
localize="placeholder"
placeholder="@placeholders_filter">
</div>
<div class="upload-button">

4
src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
View File

@@ -1,4 +1,4 @@
<form ng-controller="Umbraco.Dialogs.RteEmbedController" val-form-manager>
<form ng-controller="Umbraco.Dialogs.RteEmbedController" val-form-manager>
<div class="umb-panel">
<div class="umb-panel-body no-header with-footer">
<umb-pane>
@@ -11,7 +11,7 @@
<umb-control-group label="Size">
<input type="text" ng-model="form.width" on-blur="changeSize('width')" style="width:50px"/> x <input type="text" ng-model="form.height" on-blur="changeSize('height')" style="width:50px"/>
<label for="constrain" style="display:inline">Constrain:</label>
<label for="constrain" style="display:inline"><localize key="general_constrainProportions">Constrain</localize>:</label>
<input id="constrain" type="checkbox" ng-model="form.constrain" style="margin-bottom: 10px;"/>
</umb-control-group>
</div>

6
src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html
View File

@@ -17,7 +17,7 @@
<div class="umb-panel">
<div class="umb-panel-header">
<h1 class="headline" style="margin: 10px 0 0 0">Build a query</h1>
<h1 class="headline" style="margin: 10px 0 0 0"><localize key="templte_buildQuery">Build a query</localize></h1>
</div>
<div class="umb-panel-body with-footer umb-querybuilder">
@@ -149,10 +149,10 @@
<localize key="general_close">Close</localize>
</a>
<a href ng-click="submit(result.queryExpression)" class="btn btn-primary">Insert</a>
<a href ng-click="submit(result.queryExpression)" class="btn btn-primary"><localize key="general_insert">Insert</localize></a>
</div>
</div>
</div>
</div>
</div>
</form>
</form>

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
View File

@@ -29,7 +29,7 @@
<a href ng-click="close()" class="btn btn-link">
<localize key="general_close">Close</localize>
</a>
<a href ng-click="submit(section)" class="btn btn-primary">Insert</a>
<a href ng-click="submit(section)" class="btn btn-primary"><localize key="general_insert">Insert</localize></a>
</div>
</div>
</div>

6
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
View File

@@ -42,7 +42,7 @@
<div class="umb-pane external-logins" ng-if="externalLoginProviders.length > 0 && !showPasswordFields">
<h5>External login providers</h5>
<h5><localize key="defaultdialogs_externalLoginProviders">External login providers</localize></h5>
<div ng-repeat="login in externalLoginProviders">
@@ -55,7 +55,7 @@
onclick="document.forms.oauthloginform.submit();">
<i class="fa" ng-class="login.properties.SocialIcon"></i>
Link your {{login.caption}} account
<localize key="defaultdialogs_linkYour">Link your</localize> {{login.caption}} <localize key="defaultdialogs_account">account</localize>
</button>
</form>
@@ -67,7 +67,7 @@
name="provider"
value="{{login.authType}}">
<i class="fa" ng-class="login.properties.SocialIcon"></i>
Un-link your {{login.caption}} account
<localize key="defaultdialogs_unLinkYour">Un-link your</localize> {{login.caption}} <localize key="defaultdialogs_account">account</localize>
</button>
</div>

5
src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
View File

@@ -69,12 +69,13 @@
</label>
<select class="umb-dropdown" ng-options="validationType.name for validationType in vm.validationTypes" ng-model="vm.selectedValidationType" ng-change="vm.changeValidationType(vm.selectedValidationType)">
<option value="">Validation</option>
<option value=""><localize key="validation_validation">Validation</localize></option>
</select>
<textarea
class="editor-validation-pattern"
placeholder="Enter a regular expression"
localize="placeholder"
placeholder="@validation_validationRegExp"
ng-model="model.property.validation.pattern"
ng-change="vm.changeValidationPattern()"
ng-if="vm.showValidationPattern"

12
src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
View File

@@ -17,22 +17,22 @@
<div class="umb-control-group">
<select ng-model="color" class="input-block-level">
<option value="">
<localize key="color_black">Black</localize>
<localize key="colors_black">Black</localize>
</option>
<option value="color-green">
<localize key="color_green">Green</localize>
<localize key="colors_green">Green</localize>
</option>
<option value="color-yellow">
<localize key="color_yellow">Yellow</localize>
<localize key="colors_yellow">Yellow</localize>
</option>
<option value="color-orange">
<localize key="color_orange">Orange</localize>
<localize key="colors_orange">Orange</localize>
</option>
<option value="color-blue">
<localize key="color_blue">Blue</localize>
<localize key="colors_blue">Blue</localize>
</option>
<option value="color-red">
<localize key="color_red">Red</localize>
<localize key="colors_red">Red</localize>
</option>
</select>
</div>

62
src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
View File

@@ -3,7 +3,7 @@
<!-- select field -->
<div class="control-group umb-control-group -no-border">
<div class="umb-el-wrap">
<label class="control-label" for="chooseField">Choose field</label>
<label class="control-label" for="chooseField"><localize key="templateEditor_chooseField">Choose field</localize></label>
<div class="controls">
<select ng-model="vm.field">
<optgroup localize="label" label="@templateEditor_customFields">
@@ -25,11 +25,11 @@
<!-- Fallback field -->
<div>
<i class="icon icon-add blue" ng-hide="vm.showAltField"></i>
<a href="" ng-click="vm.showAltField=true" ng-hide="vm.showAltField">Add fallback field</a>
<a href="" ng-click="vm.showAltField=true" ng-hide="vm.showAltField"><localize key="templateEditor_addFallbackField">Add fallback field</localize></a>
<div class="control-group umb-control-group -no-border" ng-hide="!vm.showAltField">
<div class="umb-el-wrap">
<label class="control-label" for="altField">Fallback field</label>
<label class="control-label" for="altField"><localize key="templateEditor_alternativeField">Fallback field</loclize></label>
<div class="controls">
<select ng-model="vm.altField" >
<optgroup localize="label" label="@templateEditor_customFields">
@@ -48,12 +48,12 @@
<div>
<div style="margin-bottom: 20px;">
<i class="icon icon-add blue" ng-hide="vm.showAltText"></i>
<a href="" ng-click="vm.showAltText=true" ng-hide="vm.showAltText">Add default value</a>
<a href="" ng-click="vm.showAltText=true" ng-hide="vm.showAltText"><localize key="templateEditor_addDefaultValue">Add default value</localize></a>
</div>
<div class="control-group umb-control-group -no-border" ng-hide="!vm.showAltText">
<div class="umb-el-wrap">
<label class="control-label" for="altText">Default value</label>
<label class="control-label" for="altText"><localize key="templateEditor_alternativeText">Default value</localize></label>
<div class="controls">
<input type="text" name="altText" ng-model="vm.altText" umb-auto-focus>
</div>
@@ -66,15 +66,15 @@
<div class="umb-el-wrap">
<div class="controls">
<label class="control-label" for="recursive">
Recursive
<localize key="templateEditor_recursive">Recursive</localize>
</label>
<input type="checkbox" name="recursive" ng-model="vm.recursive">
Yes, make it recursive
<localize key="templateEditor_recursiveDescr">Yes, make it recursive</localize>
</div>
</div>
</div>
<h5>Format and encoding</h5>
<h5><localize key="templateEditor_formatAndEncoding">Format and encoding</localize></h5>
<!-- Format as date -->
<div class="control-group umb-control-group">
@@ -82,13 +82,13 @@
<div class="controls">
<div>
<label class="control-label">
Format as date
<small>Format the value as a date, or a date with time, accoring to the active culture.</small>
<localize key="templateEditor_formatAsDate">Format as date</localize>
<small><localize key="templateEditor_formatAsDateDescr">Format the value as a date, or a date with time, accoring to the active culture</localize>.</small>
</label>
</div>
<a href ng-click="vm.setDateOption('date')" class="btn"><i class="icon icon-check" ng-if="vm.date"></i> Date only</a>
<a href ng-click="vm.setDateOption('dateWithTime')" class="btn"><i class="icon icon-check" ng-if="vm.dateTime"></i> Date and time</a>
<input type="text" ng-model="vm.dateTimeSeparator" ng-hide="!vm.dateTime" placeholder="separator">
<a href ng-click="vm.setDateOption('date')" class="btn"><i class="icon icon-check" ng-if="vm.date"></i> <localize key="templateEditor_dateOnly">Date only</localize></a>
<a href ng-click="vm.setDateOption('dateWithTime')" class="btn"><i class="icon icon-check" ng-if="vm.dateTime"></i> <localize key="templateEditor_withTime">Date and time</localize></a>
<input type="text" ng-model="vm.dateTimeSeparator" ng-hide="!vm.dateTime" localize="placeholder" placeholder="@templateEditor_separator">
</div>
</div>
</div>
@@ -99,11 +99,11 @@
<div class="controls">
<div>
<label class="control-label">
Casing
<localize key="templateEditor_casing">Casing</localize>
</label>
</div>
<a href ng-click="vm.setCasingOption('uppercase')" class="btn" style="text-transform: uppercase;"><i class="icon icon-check" ng-if="vm.casingUpper"></i> Uppercase</a>
<a href ng-click="vm.setCasingOption('lowercase')" class="btn"style="text-transform: lowercase;"><i class="icon icon-check" ng-if="vm.casingLower"></i> Lowercase</a>
<a href ng-click="vm.setCasingOption('uppercase')" class="btn" style="text-transform: uppercase;"><i class="icon icon-check" ng-if="vm.casingUpper"></i> <localize key="templateEditor_uppercase">Uppercase</localize></a>
<a href ng-click="vm.setCasingOption('lowercase')" class="btn"style="text-transform: lowercase;"><i class="icon icon-check" ng-if="vm.casingLower"></i> <localize key="templateEditor_lowercase">Lowercase</localize></a>
</div>
</div>
</div>
@@ -114,8 +114,8 @@
<div class="controls">
<div>
<label class="control-label">
Encoding
<small>Will format special characters in URLs</small>
<localize key="templateEditor_encoding">Encoding</localize>
<small><localize key="templateEditor_urlEncodeHelp">Will format special characters in URLs</localize></small>
</label>
</div>
<a href ng-click="vm.setEncodingOption('html')" class="btn"><i class="icon icon-check" ng-if="vm.encodeHtml"></i> HTML</a>
@@ -124,14 +124,14 @@
</div>
</div>
<h5>Modify output</h5>
<h5><localize key="templateEditor_modifyOutput">Modify output</localize></h5>
<!-- Insert Before -->
<div class="control-group umb-control-group -no-border ng-scope">
<div class="umb-el-wrap">
<label class="control-label" for="insertBefore">
Insert before field
<small>Will be inserted before the field value</small>
<localize key="templateEditor_preContent">Insert before field</localize>
<small><localize key="templateEditor_insertedBefore">Will be inserted before the field value</localize></small>
</label>
<div class="controls">
<input type="text" name="insertBefore" class="-full-width-input" ng-model="vm.insertBefore">
@@ -143,8 +143,8 @@
<div class="control-group umb-control-group">
<div class="umb-el-wrap">
<label class="control-label" for="insertAfter">
Insert after field
<small>Will be inserted after the field value</small>
<localize key="templateEditor_postContent">Insert after field</localize>
<small><localize key="templateEditor_insertedAfter">Will be inserted after the field value</localize></small>
</label>
<div class="controls">
<input type="text" name="insertAfter" class="-full-width-input" ng-model="vm.insertAfter">
@@ -158,12 +158,12 @@
<div class="controls">
<div>
<label class="control-label" for="linebreaks">
Convert line breaks
<small>Replaces line breaks with break html tag</small>
<localize key="templateEditor_convertLineBreaks">Convert line breaks</localize>
<small><localize key="templateEditor_convertLineBreaksHelp">Replaces line breaks with break html tag</localize></small>
</label>
</div>
<input type="checkbox" name="linebreaks" ng-model="vm.convertLinebreaks">
Yes, convert line breaks
<localize key="templateEditor_convertLineBreaks">Yes, convert line breaks</localize>
</div>
</div>
</div>
@@ -174,12 +174,12 @@
<div class="controls">
<div>
<label class="control-label" for="paragraph">
Remove paragraph tags
<small>Will remove any paragraph tag in the beginning and end of the text</small>
<localize key="templateEditor_removeParagraph">Remove paragraph tags</localize>
<small><localize key="templateEditor_removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</localize></small>
</label>
</div>
<input type="checkbox" name="paragraph" ng-model="vm.removeParagraphTags">
Yes, remove paragraph tags
<localize key="templateEditor_removeParagraph">Yes, remove paragraph tags</localize>
</div>
</div>
</div>
@@ -188,7 +188,7 @@
<div class="control-group umb-control-group -no-border">
<div class="umb-el-wrap">
<div class="controls">
<label class="control-label">Output sample</label>
<label class="control-label"><localize key="templateEditor_outputSample">Output sample</localize></label>
<pre>{{ vm.generateOutputSample() }}</pre>
</div>
</div>
@@ -196,4 +196,4 @@
</div>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
View File

@@ -11,7 +11,7 @@
<a ng-if="showBackButton()" href="" class="umb-mini-list-view__back" ng-click="exitMiniListView()">
<i class="icon-arrow-left umb-mini-list-view__back-icon"></i>
<span class="umb-mini-list-view__back-text">Back</span> /
<span class="umb-mini-list-view__back-text"><localize key="general_back">Back</localize></span> /
</a>
<umb-breadcrumbs
@@ -98,4 +98,4 @@
</div>
</div>
</div>

6
src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
View File

@@ -5,8 +5,8 @@
<div ng-if="description" class="umb-node-preview__description">{{ description }}</div>
</div>
<div class="umb-node-preview__actions">
<a class="umb-node-preview__action" title="Open" href="" ng-if="allowOpen" ng-click="onOpen()">Open</a>
<a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()">Remove</i></a>
<a class="umb-node-preview__action" title="Open" href="" ng-if="allowOpen" ng-click="onOpen()"><localize key="general_open">Open</localize></a>
<a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
<div>
</div>
</div>

6
src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
View File

@@ -14,15 +14,15 @@
<div ng-switch-default>
<p>
<i class="icon-alert red"></i> <strong class="red">All property types & property data</strong>
using this data type will be deleted permanently, please confirm you want to delete these as well.
<i class="icon-alert red"></i> <strong class="red"><localize key="editdatatype_allPropTypes">All property types & property data</localize></strong>
<localize key="editdatatype_willBeDeleted">using this data type will be deleted permanently, please confirm you want to delete these as well</localize>.
</p>
<hr />
<label class="checkbox">
<input type="checkbox" ng-model="confirmed" />
Yes, delete {{currentNode.name}} and all property types & property data using this data type
<localize key="editdatatype_yesDelete">Yes, delete</localize> <strong>{{currentNode.name}}</strong> <localize key="editdatatype_andAllRelated">and all property types & property data using this data type</localize>
</label>
<umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">

3
src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
View File

@@ -12,7 +12,6 @@
<umb-editor-header
menu="page.menu"
name="content.name"
key="content.key"
name-locked="page.nameLocked"
hide-icon="true"
hide-description="true"
@@ -28,7 +27,7 @@
ng-model="content.selectedEditor"
required
ng-options="e.alias as e.name for e in content.availableEditors"></select>
<span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="selectedEditor" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
</div>
</umb-property>

4
src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
View File

@@ -4,7 +4,7 @@
<div class="umb-pane">
<p class="abstract" ng-hide="success">
Select the folder to move <strong>{{currentNode.name}}</strong>&nbsp;to in the tree structure below
<localize key="editdatatype_selectFolder">Select the folder to move</localize> <strong>{{currentNode.name}}</strong>&nbsp;<localize key="editdatatype_inTheTree">to in the tree structure below</localize>
</p>
<div class="umb-loader-wrapper" ng-show="busy">
@@ -17,7 +17,7 @@
</div>
<div ng-show="success">
<h5 class="text-success"><strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong></h5>
<h5 class="text-success"><strong>{{currentNode.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong></h5>
<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
</div>

4
src/Umbraco.Web.UI.Client/src/views/media/move.html
View File

@@ -50,7 +50,7 @@
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()">Cancel</a>
<button class="btn btn-primary" ng-click="move()">Move</button>
<a class="btn btn-link" ng-click="nav.hideDialog()"><localize key="general_cancel">Cancel</localize></a>
<button class="btn btn-primary" ng-click="move()"><localize key="actions_move">Move</localize></button>
</div>
</div>

30
src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html
View File

@@ -24,7 +24,7 @@
<!-- Drag and drop illustration -->
<i class="icon-box" draggable="false"></i>
<small class="faded" draggable="false"><strong>Drop to upload</strong></small>
<small class="faded" draggable="false"><strong><localize key="packager_dropHere">Drop to upload</localize></strong></small>
<!-- Select files -->
<div class="umb-upload-local__select-file"
@@ -34,7 +34,7 @@
ngf-multiple="true"
ngf-pattern="*.zip"
ngf-max-size="{{ maxFileSize }}">
- <localize key="media_orClickHereToUpload">or click here to choose files</localize>
- <localize key="packager_orClickHereToUpload">or click here to choose files</localize>
</div>
</div>
@@ -42,9 +42,9 @@
</div>
<h3><strong>Upload package</strong></h3>
<h3><strong><localize key="packager_uploadPackage">Upload package</localize></strong></h3>
<p class="faded">
Install a local package by selecting it from your machine. Only install packages from sources you know and trust.
<localize key="packager_localPackageDescr">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</localize>.
</p>
</form>
@@ -55,7 +55,7 @@
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; Upload another package</a>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; <localize key="packager_uploadAnother">Upload another package</localize></a>
</umb-editor-sub-header-content-left>
</umb-editor-sub-header>
@@ -68,7 +68,7 @@
</div>
<div class="umb-package-info">
<h4 class="umb-info-local-item"><strong>Uploading package</strong></h4>
<h4 class="umb-info-local-item"><strong><localize key="packager_installStateUploading">Uploading package</localize></strong></h4>
<umb-progress-bar
percentage="{{vm.zipFile.uploadProgress}}">
@@ -90,7 +90,7 @@
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; Cancel and upload another package</a>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; <localize key="packager_cancelAndAnother">Cancel and upload another package</localize></a>
</umb-editor-sub-header-content-left>
</umb-editor-sub-header>
@@ -111,22 +111,22 @@
<h4 class="umb-info-local-item"><strong>{{ vm.localPackage.name }}</strong></h4>
<div class="umb-info-local-item">
<strong>Author</strong>
<strong><localize key="packager_packageAuthor">Author</localize></strong>
<a href="{{ vm.localPackage.authorUrl }}" target="_blank">{{ vm.localPackage.author }}</a>
</div>
<div class="umb-info-local-item">
<strong>Version</strong>
<strong><localize key="packager_packageVersion">Version</localize></strong>
{{ vm.localPackage.version }}
</div>
<div class="umb-info-local-item">
<strong>License</strong>
<strong><localize key="packager_packageLicense">License</localize></strong>
<a href="{{ vm.localPackage.licenseUrl }}" target="_blank">{{ vm.localPackage.license }}</a>
</div>
<div class="umb-info-local-item">
<strong>Read me</strong>
<strong><localize key="packager_packageReadme">Read me</localize></strong>
<br>
<small ng-bind-html-unsafe="vm.localPackage.readMe"></small>
</div>
@@ -134,14 +134,14 @@
<div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
<label for="license-accepts" class="umb-package-installer-label">
<input type="checkbox" id="license-accepts" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
<strong class="label-text">I accept <a href="{{ vm.localPackage.licenseUrl }}" target="_blank">terms of use</a></strong>
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
</label>
<button type="button"
ng-class="{'-inactive' : localPackageForm.$invalid}"
ng-disabled="localPackageForm.$invalid"
class="umb-era-button -green flex-inline mt3"
ng-click="vm.installPackage()">
Install package
<localize key="packager_packageInstall">Install package</localize>
</button>
</div>
@@ -153,7 +153,7 @@
</div>
<div class="umb-info-local-item text-error" ng-if="!vm.localPackage.isCompatible">
This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}}
<localize key="packager_targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</localize> {{vm.localPackage.umbracoVersion}}
</div>
<div class="umb-info-local-item text-info">
<p>{{vm.installState.status}}</p>
@@ -168,7 +168,7 @@
class="btn btn-success flex-inline mt3"
ng-click="vm.reloadPage()">
Finish
<localize key="packager_installFinish">Finish</localize>
</button>
</div>

22
src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
View File

@@ -5,7 +5,7 @@
<div ng-if="vm.installedPackages.length > 0">
<div class="umb-packages-view-title">Installed packages</div>
<div class="umb-packages-view-title"><localize key="packager_installedPackages">Installed packages</localize></div>
<div class="umb-package-list">
@@ -24,7 +24,7 @@
</div>
<div class="umb-package-list__item-actions">
<a class="umb-package-list__item-action" href="" ng-click="vm.confirmUninstall(installedPackage)">Uninstall</a>
<a class="umb-package-list__item-action" href="" ng-click="vm.confirmUninstall(installedPackage)"><localize key="packager_packageUninstallHeader">Uninstall</localize></a>
</div>
</div>
@@ -36,8 +36,8 @@
<umb-empty-state
ng-if="vm.installedPackages.length === 0"
position="center">
<h4><strong>You don’t have any packages installed.</strong></h4>
<p class="faded">You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the "Package" icon in the top right of your screen."</p>
<h4><strong><localize key="packager_noPackages">You don’t have any packages installed</localize>.</strong></h4>
<p class="faded"><localize key="packager_noPackagesDescr">You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the "Packages" icon in the top right of your screen</localize>.</p>
</umb-empty-state>
</div>
@@ -47,7 +47,7 @@
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'list'">&larr; Take me back</a>
<a class="umb-package-details__back-link" href="" ng-click="vm.state = 'list'">&larr; <localize key="general_back">Take me back</localize></a>
</umb-editor-sub-header-content-left>
</umb-editor-sub-header>
@@ -66,22 +66,22 @@
<h4 class="umb-info-local-item"><strong>{{ vm.package.name }}</strong></h4>
<div class="umb-info-local-item">
<strong>Author</strong>
<strong><localize key="packager_packageAuthor">Author</localize></strong>
<a href="{{ vm.package.authorLink }}" target="_blank">{{ vm.package.author }}</a>
</div>
<div class="umb-info-local-item">
<strong>Version</strong>
<strong><localize key="packager_packageVersion">Version</localize></strong>
{{ vm.package.version }}
</div>
<div class="umb-info-local-item">
<strong>License</strong>
<strong><localize key="packager_packageLicense">License</localize></strong>
<a href="{{ vm.package.licenseUrl }}" target="_blank">{{ vm.package.license }}</a>
</div>
<div class="umb-info-local-item">
<strong>Read me</strong>
<strong><localize key="packager_packageReadme">Read me</localize></strong>
<br>
<small> {{ vm.package.readme }} </small>
</div>
@@ -89,14 +89,14 @@
<div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == ''">
<label for="confirm-uninstall" class="umb-package-installer-label">
<input type="checkbox" id="confirm-uninstall" ng-model="vm.package.confirmUninstall" required no-dirty-check>
<strong class="label-text">Confirm package uninstall</strong>
<strong class="label-text"><localize key="packager_packageUninstallConfirm">Confirm package uninstall</localize></strong>
</label>
<button type="button"
ng-class="{'-inactive' : uninstallForm.$invalid}"
ng-disabled="uninstallForm.$invalid"
class="umb-era-button -green flex-inline mt3"
ng-click="vm.uninstallPackage(vm.package)">
Uninstall package
<localize key="packager_packageUninstallHeader">Uninstall package</localize>
</button>
</div>

58
src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
View File

@@ -7,7 +7,7 @@
<div class="umb-packages-section">
<div class="umb-packages-search">
<input class="-full-width-input" type="text" name="query" placeholder="Search for packages" umb-auto-focus ng-model="vm.searchQuery" ng-change="vm.search()" no-dirty-check>
<input class="-full-width-input" type="text" name="query" localize="placeholder" placeholder="@packager_packageSearch" umb-auto-focus ng-model="vm.searchQuery" ng-change="vm.search()" no-dirty-check>
</div>
</div>
@@ -26,7 +26,7 @@
</div>
<div class="umb-packages-section" ng-if="vm.searchQuery == ''">
<h4><strong>Popular</strong></h4>
<h4><strong><localize key="packager_packagesPopular">Popular</localize></strong></h4>
<div class="umb-packages clearfix">
<div class="umb-package" ng-repeat="package in vm.popular">
@@ -58,8 +58,8 @@
<div class="umb-packages-section" ng-if="vm.packages.length > 0">
<h4 ng-if="vm.searchQuery === ''"><strong>New Releases</strong></h4>
<h4 ng-if="vm.searchQuery !== ''"><strong>Results for '{{ vm.searchQuery }}'</strong></h4>
<h4 ng-if="vm.searchQuery === ''"><strong><localize key="packager_packagesNew">New Releases</localize></strong></h4>
<h4 ng-if="vm.searchQuery !== ''"><strong><localize key="packager_packageSearchResults">Results for</localize> '{{ vm.searchQuery }}'</strong></h4>
<div class="umb-packages clearfix">
@@ -105,8 +105,8 @@
<umb-empty-state
ng-if="vm.packages.length === 0 && vm.loading === false && vm.searchQuery !== ''"
position="center">
<h4><strong>We couldn't find anything for '{{ vm.searchQuery }}'</strong></h4>
<p class="faded">Please try searching for another package or browse through the categories.</p>
<h4><strong><localize key="packager_packageNoResults">We couldn't find anything for</localize> '{{ vm.searchQuery }}'</strong></h4>
<p class="faded"><localize key="packager_packageNoResultsDescr">Please try searching for another package or browse through the categories</localize>.</p>
</umb-empty-state>
</div>
@@ -119,7 +119,7 @@
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageList');">&larr; Take me back</a>
<a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageList');">&larr; <localize key="general_back">Take me back</localize></a>
</umb-editor-sub-header-content-left>
</umb-editor-sub-header>
@@ -155,7 +155,7 @@
<div class="umb-package-details__section">
<button class="umb-era-button -green -full-width"
ng-if="vm.package.isValid === true"
ng-click="vm.downloadPackage(vm.package)">Install package</button>
ng-click="vm.downloadPackage(vm.package)"><localize key="packager_packageInstall">Install package</localize></button>
<button class="umb-era-button -inactive -full-width" ng-if="vm.package.isValid === false" disabled>
<localize key="packager_packageAlreadyInstalled">Package is already installed</localize>
@@ -175,55 +175,55 @@
<div>
<div class="umb-package-details__owner-profile-name">{{ vm.package.ownerInfo.owner }}</div>
<div class="umb-package-details__owner-profile-karma">
{{ vm.package.ownerInfo.owner }} has <strong>{{ vm.package.ownerInfo.karma }}</strong> karma points
{{ vm.package.ownerInfo.owner }} <localize key="packager_packageHas">has</localize> <strong>{{ vm.package.ownerInfo.karma }}</strong> <localize key="packager_packageKarmaPoints">karma points</localize>
</div>
</div>
</div>
</div>
<div class="umb-package-details__section">
<div class="umb-package-details__section-title">Information</div>
<div class="umb-package-details__section-title"><localize key="packager_packageInfo">Information</localize></div>
<div>
<div class="umb-package-details__information-item" ng-if="vm.package.ownerInfo.owner">
<div class="umb-package-details__information-item-label">Owner:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageOwner">Owner</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.ownerInfo.owner}}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.ownerInfo.contributors">
<div class="umb-package-details__information-item-label">Contributors:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageContrib">Contributors</localize>:</div>
<div class="umb-package-details__information-item-content">
<span ng-repeat="contributor in vm.package.ownerInfo.contributors">{{ contributor }}<span ng-if="!$last">,&nbsp;</span></span>
</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.created">
<div class="umb-package-details__information-item-label">Created:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageCreated">Created</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.created | date:'yyyy-MM-dd HH:mm:ss'}}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.latestVersion">
<div class="umb-package-details__information-item-label">Current version:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageCurrVersion">Current version</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.latestVersion}}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.information.netVersion">
<div class="umb-package-details__information-item-label">.Net Version:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageNetVersion">.Net Version</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.information.netVersion}}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.licenseName">
<div class="umb-package-details__information-item-label">License:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageLicense">License</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.licenseName}}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.downloads">
<div class="umb-package-details__information-item-label">Downloads:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageDownloads">Downloads</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.downloads}}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.package.ownerInfo.karma">
<div class="umb-package-details__information-item-label">Likes:</div>
<div class="umb-package-details__information-item-label"><localize key="packager_packageLikes">Likes</localize>:</div>
<div class="umb-package-details__information-item-content">{{vm.package.likes}}</div>
</div>
@@ -231,8 +231,8 @@
</div>
<div class="umb-package-details__section">
<div class="umb-package-details__section-title">Compatibility</div>
<div class="umb-package-details__section-description">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</div>
<div class="umb-package-details__section-title"><localize key="packager_packageCompatibility">Compatibility</localize></div>
<div class="umb-package-details__section-description"><localize key="packager_packageCompatDescr">This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100%</localize></div>
<div class="umb-package-details__compatability" ng-repeat="compatibility in vm.package.compatibility | filter:percentage > 0">
<div class="umb-package-details__compatability-label">
<span class="umb-package-details__information-item-label">{{compatibility.version}}</span>
@@ -247,7 +247,7 @@
</div>
<div class="umb-package-details__section" ng-if="vm.package.externalSources">
<div class="umb-package-details__section-title">External sources</div>
<div class="umb-package-details__section-title"><localize key="packager_packageExtSources">External sources</localize></div>
<div>
<div class="umb-package-details__information-item" ng-repeat="externalSource in vm.package.externalSources">
<a class="umb-package-details__link" target="_blank" href="{{ externalSource.url }}">
@@ -269,7 +269,7 @@
<div ng-if="vm.packageViewState === 'packageInstall' && vm.loading === false">
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageDetails');">&larr; Take me back</a>
<a class="umb-package-details__back-link" href="" ng-click="vm.setPackageViewState('packageDetails');">&larr; <localize key="general_back">Take me back</localize></a>
</umb-editor-sub-header-content-left>
</umb-editor-sub-header>
@@ -295,17 +295,17 @@
</div>
<div class="umb-info-local-item">
<strong>Version</strong>
<strong><localize key="packager_packageVersion">Version</localize></strong>
{{ vm.localPackage.version }}
</div>
<div class="umb-info-local-item">
<strong>License</strong>
<strong><localize key="packager_packageLicense">License</localize></strong>
<a href="{{ vm.localPackage.licenseUrl }}" target="_blank">{{ vm.localPackage.license }}</a>
</div>
<div class="umb-info-local-item">
<strong>Read me</strong>
<strong><localize key="packager_packageReadme">Read me</localize></strong>
<br>
<small ng-bind-html-unsafe="vm.localPackage.readMe"></small>
</div>
@@ -313,7 +313,7 @@
<div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
<label for="license-accept" class="umb-package-installer-label">
<input type="checkbox" id="license-accept" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
<strong class="label-text">I accept <a href="{{ vm.localPackage.licenseUrl }}" target="_blank">terms of use</a></strong>
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
</label>
<button type="button"
ng-if="vm.installState.type !== 'error'"
@@ -321,7 +321,7 @@
ng-disabled="localPackageForm.$invalid"
class="umb-era-button -green flex-inline mt3"
ng-click="vm.installPackage(vm.localPackage)">
Install package
<localize key="packager_packageInstall">Install package</localize>
</button>
</div>
@@ -333,7 +333,7 @@
</div>
<div class="umb-info-local-item text-error" ng-if="!vm.localPackage.isCompatible">
This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}}
<localize key="packager_targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</localize> {{vm.localPackage.umbracoVersion}}
</div>
<div class="umb-info-local-item text-info" ng-class="{'text-info' : vm.installState.type !== 'error'}">
@@ -346,7 +346,7 @@
<button type="button"
class="btn btn-success flex-inline mt3"
ng-click="vm.reloadPage()">
Finish
<localize key="packager_installFinish">Finish</localize>
</button>
</div>

2
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
View File

@@ -40,7 +40,7 @@
<!-- Snippets list -->
<div ng-if="vm.showSnippets">
<h5>Select snippet</h5>
<h5><localize key="defaultdialogs_selectSnippet">Select snippet</localize></h5>
<ul class="umb-actions umb-actions-child">
<li ng-repeat="snippet in vm.snippets">

12
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
View File

@@ -29,7 +29,7 @@
type="button"
class="umb-era-button umb-button--s"
ng-click="vm.openInsertOverlay()">
<i class="icon icon-add"></i> Insert
<i class="icon icon-add"></i> <localize key="template_insert">Insert</localize>
</button>
<a class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle" data-toggle="dropdown">
@@ -37,9 +37,9 @@
</a>
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
<li><a href="" ng-click="vm.openPageFieldOverlay()">Value</a></li>
<li><a href="" ng-click="vm.openMacroOverlay()">Macro</a></li>
<li><a href="" ng-click="vm.openDictionaryItemOverlay()">Dictionary</a></li>
<li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
<li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
<li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary</localize></a></li>
</ul>
</div>
@@ -49,7 +49,7 @@
style="margin-right: 10px;"
class="umb-era-button umb-button--s"
ng-click="vm.openQueryBuilderOverlay()">
<i class="icon icon-wand"></i> Query builder
<i class="icon icon-wand"></i> <localize key="template_queryBuilder">Query builder</localize>
</button>
</div>
@@ -120,4 +120,4 @@
view="vm.queryBuilderOverlay.view">
</umb-overlay>
</div>
</div>

10
src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
View File

@@ -29,7 +29,7 @@
type="button"
class="umb-era-button umb-button--s"
ng-click="vm.openInsertOverlay()">
<i class="icon icon-add"></i> Insert
<i class="icon icon-add"></i> <localize key="template_insert">Insert</localize>
</button>
<a class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle" data-toggle="dropdown">
@@ -37,9 +37,9 @@
</a>
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
<li><a href="" ng-click="vm.openPageFieldOverlay()">Value</a></li>
<li><a href="" ng-click="vm.openMacroOverlay()">Macro</a></li>
<li><a href="" ng-click="vm.openDictionaryItemOverlay()">Dictionary</a></li>
<li><a href="" ng-click="vm.openPageFieldOverlay()"><localize key="template_insertPageField">Value</localize></a></li>
<li><a href="" ng-click="vm.openMacroOverlay()"><localize key="template_insertMacro">Macro</localize></a></li>
<li><a href="" ng-click="vm.openDictionaryItemOverlay()"><localize key="template_insertDictionaryItem">Dictionary</localize></a></li>
</ul>
</div>
@@ -49,7 +49,7 @@
style="margin-right: 10px;"
class="umb-era-button umb-button--s"
ng-click="vm.openQueryBuilderOverlay()">
<i class="icon icon-wand"></i> Query builder
<i class="icon icon-wand"></i> <localize key="template_queryBuilder">Query builder</localize>
</button>
</div>

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
View File

@@ -1,12 +1,12 @@
<div ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController">
<div ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController">
<div class="control-group color-picker-preval">
<input name="newColor" type="hidden" />
<button class="btn add" ng-click="add($event)">Add</button>
<button class="btn add" ng-click="add($event)"><localize key="general_add">Add</localize></button>
<label for="newColor" val-highlight="hasError">{{newColor}}</label>
</div>
<div class="control-group color-picker-preval" ng-repeat="item in model.value">
<div class="thumbnail span1" hex-bg-color="{{item.value}}" bg-orig="transparent"></div>
<pre>{{item.value}}</pre>
<button class="btn btn-danger" ng-click="remove(item, $event)">Remove</button>
<button class="btn btn-danger" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
View File

@@ -30,11 +30,11 @@
<input type="hidden" name="maxCount" ng-model="renderModel" />
<div class="help-inline" val-msg-for="minCount" val-toggle-msg="minCount">
You need to add at least {{model.config.minNumber}} items
<localize key="validation_valMinCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_valItems">items</localize>
</div>
<div class="help-inline" val-msg-for="maxCount" val-toggle-msg="maxCount">
You can only have {{model.config.maxNumber}} items selected
<localize key="validation_valMaxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_valItemsSel">items selected</localize>
</div>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
View File

@@ -14,9 +14,9 @@
</div>
<span class="help-inline" val-msg-for="datepicker" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="datepicker" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
<span class="help-inline" val-msg-for="datepicker" val-toggle-msg="valServer">{{datePickerForm.datepicker.errorMsg}}</span>
<span class="help-inline" val-msg-for="datepicker" val-toggle-msg="pickerError">Invalid date</span>
<span class="help-inline" val-msg-for="datepicker" val-toggle-msg="pickerError"><localize key="validation_valInvalidDate">Invalid date</localize></span>
<p ng-if="model.config.offsetTime === '1' && serverTimeNeedsOffsetting && model.value" class="muted">
<small><localize key="content_scheduledPublishServerTime">This translates to the following time on the server:</localize> {{serverTime}}</small><br/>

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
View File

@@ -1,4 +1,4 @@
<div class="umb-editor">
<div class="umb-editor">
<input name="decimalField"
type="number"
pattern="[0-9]+([,\.][0-9]+)?"
@@ -7,6 +7,6 @@
val-server="value"
fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
<span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number">Not a number</span>
<span class="help-inline" val-msg-for="decimalField" val-toggle-msg="number"><localize key="validation_valInvalidNumber">Not a number</localize></span>
<span class="help-inline" val-msg-for="decimalField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
</div>
</div>

8
src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
View File

@@ -1,4 +1,4 @@
<div>
<div>
<input type="email" name="textbox"
ng-model="model.value"
id="{{model.alias}}"
@@ -7,7 +7,7 @@
ng-required="model.config.IsRequired || model.validation.mandatory"
val-server="value" />
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="valEmail">Invalid email</span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="valEmail"><localize key="valiation_valInvalidEmail">Invalid email</localize></span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>
</div>
</div>

18
src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
View File

@@ -16,34 +16,34 @@
</div>
<div class="form" ng-show="newItem">
<h4>Define crop</h4>
<h4><localize key="imagecropper_defineCrop">Define crop</localize></h4>
<p>
Give the crop an alias and it's default width and height.
<localize key="imagecropper_defineCropDescr">Give the crop an alias and it's default width and height</localize>.
</p>
<div class="control-group">
<label>Alias</label>
<label><localize key="general_alias">Alias</localize></label>
<input name="newItem.alias" type="text"
ng-model="newItem.alias" val-highlight="{{hasError}}" />
</div>
<div class="control-group">
<label>Size</label>
<input name="newItem.width" type="number" placeholder="Width"
<label><localize key="general_size">Size</localize></label>
<input name="newItem.width" type="number" localize="placeholder" placeholder="@general_width"
ng-model="newItem.width" class="umb-editor-small" val-highlight="{{hasError}}" />
&times;
<input name="newItem.height" type="number" placeholder="Height"
<input name="newItem.height" type="number" localize="placeholder" placeholder="@general_height"
ng-model="newItem.height" class="umb-editor-small" val-highlight="{{hasError}}" />
</div>
<div class="control-group">
<button class="btn" ng-click="add($event)">Save crop</button>
<a href class="btn btn-link" ng-click="cancel($event)">Cancel</a>
<button class="btn" ng-click="add($event)"><localize key="imagecropper_saveCrop">Save crop</localize></button>
<a href class="btn btn-link" ng-click="cancel($event)"><localize key="general_cancel">Cancel</localize></a>
</div>
</div>
<div class="control-group" ng-hide="newItem">
<button class="btn" ng-click="newItem = {}" prevent-default>Add new crop</button>
<button class="btn" ng-click="newItem = {}" prevent-default><localize key="imagecropper_addCrop">Add new crop</localize></button>
</div>
</div>

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
View File

@@ -1,4 +1,4 @@
<div class="umb-editor">
<div class="umb-editor">
<input name="integerField"
type="number"
pattern="[0-9]*"
@@ -8,6 +8,6 @@
val-server="value"
fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
<span class="help-inline" val-msg-for="integerField" val-toggle-msg="number">Not a number</span>
<span class="help-inline" val-msg-for="integerField" val-toggle-msg="number"><localize key="validation_valInvalidNumber">Not a number</localize></span>
<span class="help-inline" val-msg-for="integerField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
</div>
</div>

8
src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.PropertyEditors.MemberGroupController">
<div ng-controller="Umbraco.PropertyEditors.MemberGroupController">
<div class="umb-member-group-box">
<h5>Not a member of group(s)</h5>
<h5><localize key="content_notmemberof">Not a member of group(s)</localize></h5>
<ul>
<li ng-repeat="item in getAvailable()">
<a href="" ng-click="addItem(item)">{{item}}</a>
@@ -8,11 +8,11 @@
</ul>
</div>
<div class="umb-member-group-box">
<h5>Member of group(s)</h5>
<h5><localize key="content_memberof">Member of group(s)</localize></h5>
<ul>
<li ng-repeat="item in getSelected()">
<a href="" ng-click="removeItem(item)">{{item}}</a>
</li>
</ul>
</div>
</div>
</div>

8
src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
View File

@@ -1,20 +1,20 @@
<div class="umb-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
<div class="umb-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
<div ui-sortable="sortableOptions" ng-model="model.value">
<div class="control-group" ng-repeat="item in model.value">
<i class="icon icon-navigation handle"></i>
<input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" />
<a prevent-default href="" title="Remove this text box"
<a prevent-default href="" localize="title" title="@content_removeTextBox"
ng-show="model.value.length > model.config.min"
ng-click="remove($index)">
<i class="icon icon-remove"></i>
</a>
</div>
</div>
<a prevent-default href="" title="Add another text box"
<a prevent-default href="" localize="title" title="@content_addTextBox"
ng-show="model.config.max <= 0 || model.value.length < model.config.max"
ng-click="add()">
<i class="icon icon-add"></i>
</a>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
View File

@@ -1,5 +1,5 @@
<div ng-controller="Umbraco.PropertyEditors.RTEController" class="umb-editor umb-rte">
<div ng-if="isLoading">Loading...</div>
<div ng-controller="Umbraco.PropertyEditors.RTEController" class="umb-editor umb-rte">
<div ng-if="isLoading"><localize key="general_loading">Loading</localize>...</div>
<textarea ng-style="{ visibility : isLoading ? 'hidden' : 'visible'}"
ng-model="model.value" rows="10"
id="{{textAreaHtmlId}}"></textarea>

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
View File

@@ -1,3 +1,3 @@
<textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="10" class="umb-editor umb-textarea textstring" val-server="value" ng-required="model.validation.mandatory"></textarea>
<span class="help-inline" val-msg-for="textarea" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="textarea" val-toggle-msg="valServer"></span>
<textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="10" class="umb-editor umb-textarea textstring" val-server="value" ng-required="model.validation.mandatory"></textarea>
<span class="help-inline" val-msg-for="textarea" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
<span class="help-inline" val-msg-for="textarea" val-toggle-msg="valServer"></span>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
View File

@@ -1,9 +1,9 @@
<div>
<div>
<input type="text" name="textbox" ng-model="model.value" id="{{model.alias}}"
class="umb-editor umb-textstring textstring"
val-server="value"
ng-required="model.validation.mandatory"
ng-trim="false" />
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
</div>