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

Merge branch 'dev-v7.7' into user-group-permissions

Browse Source
This commit is contained in:
Shannon
2017-07-06 12:56:17 +10:00
parent 403a210c1c 7e9afe7720
commit f355b27d1f
22 changed files with 454 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/common/filters/preserveNewLineInHtml.filter.js
View File

@@ -6,6 +6,9 @@
**/
angular.module("umbraco.filters").filter('preserveNewLineInHtml', function () {
return function (text) {
if (!text) {
return '';
}
return text.replace(/\n/g, '<br />');
};
});

2
src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js
View File

@@ -21,7 +21,6 @@
vm.encodeHtml = false;
vm.encodeUrl = false;
vm.convertLinebreaks = false;
vm.removeParagraphTags = false;
vm.showAltField = false;
vm.showAltText = false;
@@ -130,7 +129,6 @@
+ (vm.encodeHtml !== false ? ', encoding: ' + "RenderFieldEncodingType.Html" : "")
+ (vm.encodeUrl !== false ? ', encoding: ' + "RenderFieldEncodingType.Url" : "")
+ (vm.convertLinebreaks !== false ? ', convertLineBreaks: ' + "true" : "")
+ (vm.removeParagraphTags !== false ? ', removeParagraphTags: ' + "true": "")
+ (vm.field ? ')' : "");
$scope.model.umbracoField = pageField;

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

@@ -168,22 +168,6 @@
</div>
</div>
<!-- Remove paragraph tags -->
<div class="control-group umb-control-group">
<div class="umb-el-wrap">
<div class="controls">
<div>
<label class="control-label" for="paragraph">
<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">
<localize key="templateEditor_removeParagraphDescription">Yes, remove paragraph tags</localize>
</div>
</div>
</div>
<!-- Output -->
<div class="control-group umb-control-group -no-border">
<div class="umb-el-wrap">

2
src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
View File

@@ -909,8 +909,6 @@
<key alias="postContent">Vložit za polem</key>
<key alias="preContent">Vložit před polem</key>
<key alias="recursive">Rekurzivní</key>
<key alias="removeParagraph">Odstranit tagy odstavce</key>
<key alias="removeParagraphHelp">Odstraní jakékoliv &amp;lt;P&amp;gt; na začátku a na konci textu</key>
<key alias="standardFields">Standardní pole</key>
<key alias="uppercase">Velká písmena</key>
<key alias="urlEncode">Kódování URL</key>

2
src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
View File

@@ -882,8 +882,6 @@ Vennlig hilsen Umbraco roboten
<key alias="postContent">Sett inn etter felt</key>
<key alias="preContent">Sett inn før felt</key>
<key alias="recursive">Rekursivt</key>
<key alias="removeParagraph">Fjern paragraftagger</key>
<key alias="removeParagraphHelp">Fjerner eventuelle &lt;P&gt; rundt teksten</key>
<key alias="standardFields">Standardfelter</key>
<key alias="uppercase">Store bokstaver</key>
<key alias="urlEncode">URL koding</key>

2
src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
View File

@@ -1100,8 +1100,6 @@
<key alias="postContent">欄位後插入</key>
<key alias="preContent">欄位前插入</key>
<key alias="recursive">遞迴</key>
<key alias="removeParagraph">移除段落符號</key>
<key alias="removeParagraphHelp">將會在字串首尾移除任何 &amp;lt;P&amp;gt; 符號</key>
<key alias="standardFields">標準欄位</key>
<key alias="uppercase">大寫</key>
<key alias="urlEncode">URL編碼</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
View File

@@ -1141,8 +1141,6 @@ Mange hilsner fra Umbraco robotten
<key alias="postContent">Indsæt efter felt</key>
<key alias="preContent">Indsæt før felt</key>
<key alias="recursive">Rekursivt</key>
<key alias="removeParagraph">Fjern paragraf-tags</key>
<key alias="removeParagraphHelp">Fjerner eventuelle &amp;lt;P&amp;gt; omkring teksten</key>
<key alias="standardFields">Standard felter</key>
<key alias="uppercase">Uppercase</key>
<key alias="urlEncode">URL encode</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/de.xml
View File

@@ -901,8 +901,6 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
<key alias="postContent">An den Feldinhalt anhängen</key>
<key alias="preContent">Dem Feldinhalt voranstellen</key>
<key alias="recursive">Rekursiv</key>
<key alias="removeParagraph">Textabsatz entfernen</key>
<key alias="removeParagraphHelp">Alle &lt;p&gt; am Anfang und am Ende des Feldinhalts werden entfernt</key>
<key alias="standardFields">Standardfelder</key>
<key alias="uppercase">Großbuchstaben</key>
<key alias="urlEncode">URL kodieren</key>

3
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1378,9 +1378,6 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="preContent">Insert before field</key>
<key alias="recursive">Recursive</key>
<key alias="recursiveDescr">Yes, make it recursive</key>
<key alias="removeParagraph">Remove paragraph tags</key>
<key alias="removeParagraphDescription">Yes, remove paragraph tags</key>
<key alias="removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</key>
<key alias="separator">Separator</key>
<key alias="standardFields">Standard Fields</key>
<key alias="uppercase">Uppercase</key>

3
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1361,9 +1361,6 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="preContent">Insert before field</key>
<key alias="recursive">Recursive</key>
<key alias="recursiveDescr">Yes, make it recursive</key>
<key alias="removeParagraph">Remove paragraph tags</key>
<key alias="removeParagraphDescription">Yes, remove paragraph tags</key>
<key alias="removeParagraphHelp">Will remove any paragraph tag in the beginning and end of the text</key>
<key alias="separator">Separator</key>
<key alias="standardFields">Standard Fields</key>
<key alias="uppercase">Uppercase</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/es.xml
View File

@@ -807,8 +807,6 @@
<key alias="postContent">Insertar después del campo</key>
<key alias="preContent">Insertar antes del campo</key>
<key alias="recursive">Recursivo</key>
<key alias="removeParagraph">Borrar los tags del párrafo</key>
<key alias="removeParagraphHelp">Borrará cualquier &amp;lt;P&amp;gt; al principio y al final del texto</key>
<key alias="uppercase">Mayúscula</key>
<key alias="urlEncode">Codificar URL</key>
<key alias="urlEncodeHelp">Formateará los caracteres especiales de las URLs</key>

3
src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
View File

@@ -1343,9 +1343,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
<key alias="preContent">Insérer avant le champ</key>
<key alias="recursive">Récursif</key>
<key alias="recursiveDescr">Oui, rendre récursif</key>
<key alias="removeParagraph">Supprimer les balises de paragraphe</key>
<key alias="removeParagraphDescription">Oui, supprimer les balises de paragraphe</key>
<key alias="removeParagraphHelp">Supprimera toute balise &amp;lt;P&amp;gt; au début et à la fin du texte</key>
<key alias="separator">Séparateur</key>
<key alias="standardFields">Champs standards</key>
<key alias="uppercase">Majuscules</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/he.xml
View File

@@ -817,8 +817,6 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="postContent">הוסף אחרי השדה</key>
<key alias="preContent">הוסף לפני השדה</key>
<key alias="recursive">רקורסיבי</key>
<key alias="removeParagraph">הסר תגי פסקה</key>
<key alias="removeParagraphHelp">מסיר את כל ה- &amp;lt;P&amp;gt; בתחילת ובסוף הטקסט</key>
<key alias="uppercase">אותיות גדולות</key>
<key alias="urlEncode">קידוד URL</key>
<key alias="urlEncodeHelp">תווים מיוחדים יעוצבו ב- URL</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/it.xml
View File

@@ -788,8 +788,6 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
<key alias="postContent"><![CDATA[Inserisci dopo il campo]]></key>
<key alias="preContent"><![CDATA[Inserisci prima il campo]]></key>
<key alias="recursive">Ricorsivo</key>
<key alias="removeParagraph"><![CDATA[Rimuovi i tag paragrafo]]></key>
<key alias="removeParagraphHelp"><![CDATA[Rimuoverà &lt;P&gt; all'inizio e alla fine del testo]]></key>
<key alias="standardFields">Campi Standard</key>
<key alias="uppercase">Maiuscolo</key>
<key alias="urlEncode"><![CDATA[Codifica URL]]></key>

2
src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
View File

@@ -1106,8 +1106,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="postContent">フィールド値の後ろ追加</key>
<key alias="preContent">フィールド値の前に追加</key>
<key alias="recursive">再帰的</key>
<key alias="removeParagraph">段落タグの消去</key>
<key alias="removeParagraphHelp">段落タグ &amp;lt;P&amp;gt; を消去します</key>
<key alias="standardFields">標準フィールド</key>
<key alias="uppercase">大文字変換</key>
<key alias="urlEncode">URLエンコード</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
View File

@@ -793,8 +793,6 @@
<key alias="postContent">필드뒤에 삽입</key>
<key alias="preContent">필드앞에 삽입</key>
<key alias="recursive">Recursive</key>
<key alias="removeParagraph">단락 태그삭제</key>
<key alias="removeParagraphHelp">문서 시작과 끝의 &amp;amp;lt;P&amp;amp;gt; 를 삭제하시겠습니까</key>
<key alias="uppercase">대문자</key>
<key alias="urlEncode">URL 인코딩</key>
<key alias="urlEncodeHelp">URL의 특수문자를 포맷하겠습니까</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
View File

@@ -1169,8 +1169,6 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
<key alias="postContent">Invoegen na veld</key>
<key alias="preContent">Invoegen voor veld</key>
<key alias="recursive">Recursief</key>
<key alias="removeParagraph">Verwijder paragraaf tags</key>
<key alias="removeParagraphHelp"><![CDATA[Alle <P> tags aan het begin en einde van de tekst worden verwijderd]]></key>
<key alias="standardFields">Standaard velden</key>
<key alias="uppercase">Hoofdletters</key>
<key alias="urlEncode">URL-encoderen</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
View File

@@ -1276,8 +1276,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
<key alias="postContent">Wstaw za polem</key>
<key alias="preContent">Wstaw przed polem</key>
<key alias="recursive">Rekurencyjne</key>
<key alias="removeParagraph">Usuń znaki paragrafu</key>
<key alias="removeParagraphHelp">Usuwa wszystkie &amp;lt;P&amp;gt; z początku i końca tekstu</key>
<key alias="standardFields">Standardowe Pola</key>
<key alias="uppercase">Wielkie litery</key>
<key alias="urlEncode">Kodowanie URL</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
View File

@@ -782,8 +782,6 @@ Você pode publicar esta página e todas suas sub-páginas ao selecionar <em>pub
<key alias="postContent">Inserir após campo</key>
<key alias="preContent">Inserir antes do campo</key>
<key alias="recursive">Recursivo</key>
<key alias="removeParagraph">Remover etiquetas de parágrafo</key>
<key alias="removeParagraphHelp">Removerá quaisquer &amp;lt;P&amp;gt; do começo ao fim do texto</key>
<key alias="uppercase">Maiúscula</key>
<key alias="urlEncode">Codificar URL</key>
<key alias="urlEncodeHelp">Vai formatar caracteres especiais em URLs</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
View File

@@ -1444,8 +1444,6 @@
<key alias="preContent">Вставить перед полем</key>
<key alias="recursive">Рекурсивно</key>
<key alias="recursiveDescr">Да, использовать рекурсию</key>
<key alias="removeParagraph">Удалить тэги параграфов</key>
<key alias="removeParagraphHelp">Удаляются тэги параграфа ('p') в начале и в конце абзацев</key>
<key alias="separator">Разделитель</key>
<key alias="standardFields">Стандартные</key>
<key alias="uppercase">В верхнем регистре</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
View File

@@ -818,8 +818,6 @@
<key alias="postContent">Infoga efter fält</key>
<key alias="preContent">Infoga före fält</key>
<key alias="recursive">Rekursiv</key>
<key alias="removeParagraph">Avlägsna stycke-taggar</key>
<key alias="removeParagraphHelp">Kommer att avlägsna alla &amp;lt;P&amp;gt; i början och slutet av texten</key>
<key alias="standardFields">Standardfält</key>
<key alias="uppercase">Versaler</key>
<key alias="urlEncode">URL-koda</key>

704
src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
View File

File diff suppressed because it is too large Load Diff