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

Fixes: U4-662 Most icon for document type can't be shown in 4.8.1.

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-04-01 11:50:27 -02:00
parent 55c7f72d8e
commit bea50f4562
8 changed files with 245 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI/config/umbracoSettings.Release.config
View File

@@ -94,6 +94,20 @@
error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
<MacroErrors>inline</MacroErrors>
<!-- How Umbraco should show icons in the document type editor. Historically, the list has included all the files in
/Umbraco/Images/Umbraco plus a CSS sprite defined in Umbraco_Client/Tree/treeIcons.css, unfortunately these
contain many duplicates. The DocumentTypeIconList setting allows you to favor one list over the other.
Can be one of the following values:
- ShowDuplicates - Show duplicates in files and sprites. Historial Umbraco behaviour.
- HideSpriteDuplicates - If a file exists on disk with the same name as one in the sprite
then the file on disk overrules the one in the sprite, the
sprite icon will not be shown
- HideFileDuplicates - If a file exists on disk with the same name as one in the sprite
then the file in the sprite overrules the one on disk, the file
on disk will be shown (recommended) -->
<DocumentTypeIconList>ShowDuplicates</DocumentTypeIconList>
</content>
<security>

14
src/Umbraco.Web.UI/config/umbracoSettings.config
View File

@@ -88,6 +88,20 @@
error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
<MacroErrors>inline</MacroErrors>
<!-- How Umbraco should show icons in the document type editor. Historically, the list has included all the files in
/Umbraco/Images/Umbraco plus a CSS sprite defined in Umbraco_Client/Tree/treeIcons.css, unfortunately these
contain many duplicates. The DocumentTypeIconList setting allows you to favor one list over the other.
Can be one of the following values:
- ShowDuplicates - Show duplicates in files and sprites. Historial Umbraco behaviour.
- HideSpriteDuplicates - If a file exists on disk with the same name as one in the sprite
then the file on disk overrules the one in the sprite, the
sprite icon will not be shown
- HideFileDuplicates - If a file exists on disk with the same name as one in the sprite
then the file in the sprite overrules the one on disk, the file
on disk will be shown (recommended) -->
<DocumentTypeIconList>HideFileDuplicates</DocumentTypeIconList>
</content>
<security>

5
src/Umbraco.Web.UI/umbraco_client/ui/jquery.dd.js
View File

@@ -97,9 +97,8 @@
var t = "";
var clsName = "";
var pH = ""; //addition html
if (options.useSprite != false) {
clsName = ' ' + options.useSprite + ' ' + currentOptOption.className;
} else {
arrow = $(currentOptOption).prop("title");
var reg = new RegExp(/^\{.*\}$/);
var isJson = reg.test(arrow);
@@ -114,7 +113,7 @@
} else {
arrow = (arrow.length == 0) ? "" : '<img src="' + arrow + '" align="absmiddle" /> ';
};
};
var sText = $(currentOptOption).text();
var sValue = $(currentOptOption).val();
var sEnabledClass = ($(currentOptOption).prop("disabled") == true) ? "disabled" : "enabled";