Skip to content

Commit fd7a979

Browse files
committed
Revert "Make flag images use dnn image handler. Fixes #200"
This reverts commit 1f06e24.
1 parent a2fae42 commit fd7a979

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Admin/EditLanguage.ascx.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected override void OnLoad(EventArgs e)
6262
{
6363
Controls.Add(new LiteralControl("<li>"));
6464
var cmd = new LinkButton();
65-
cmd.Text = "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + l.Value.Code + ".gif&h=" + Size + "' alt='" + l.Value.EnglishName + "' />";
65+
cmd.Text = "<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + Size + "/" + l.Value.Code + ".png' alt='" + l.Value.EnglishName + "' />";
6666
cmd.CommandArgument = l.Value.Code;
6767
cmd.CommandName = "selectlang";
6868
cmd.Command += (s, cmde) =>

render/GenXmlTemplateExt.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4020,7 +4020,7 @@ private void CreateEditFlag(Control container, XmlNode xmlNod)
40204020
var lc = new Literal();
40214021
var size = "16";
40224022
if (xmlNod.Attributes != null && (xmlNod.Attributes["size"] != null)) size = xmlNod.Attributes["size"].Value;
4023-
lc.Text = "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + StoreSettings.Current.EditLanguage + ".gif&h=" + size + "'/>";
4023+
lc.Text = "<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + size + "/" + StoreSettings.Current.EditLanguage + ".png' />";
40244024
lc.DataBinding += EditFlagDataBind;
40254025
container.Controls.Add(lc);
40264026
}
@@ -4779,7 +4779,7 @@ private void CreateEditCultureSelect(Control container, XmlNode xmlNod)
47794779
foreach (var l in enabledlanguages)
47804780
{
47814781
strOut.Append("<li><a href='javascript:void(0)' lang='" + l.Value.Code + "' class='" + cssclassli + "'>");
4782-
strOut.Append("<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + l.Value.Code + ".gif&h=" + size + "' alt='" + l.Value.NativeName + "' />");
4782+
strOut.Append("<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + size + "/" + l.Value.Code + ".png' alt='" + l.Value.NativeName + "' />");
47834783
strOut.Append("</a></li>");
47844784
}
47854785
strOut.Append("</ul>");

render/NBrightBuyRazorTokens.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public IEncodedString EditLanguageButton(int size = 16)
6969
foreach (var l in enabledlanguages)
7070
{
7171
strOut1 += "<li class='selectlang' editlang='" + l.Value.Code + "'>";
72-
strOut1 += "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + l.Value.Code + ".gif&h=" + size + "' alt='" + l.Value.EnglishName + "' />";
72+
strOut1 += "<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + size + "/" + l.Value.Code + ".png' alt='" + l.Value.EnglishName + "' />";
7373
strOut1 += "</li>";
7474
}
7575
strOut1 += "</ul>";
@@ -1317,8 +1317,7 @@ public IEncodedString LangFlag(string lang)
13171317

13181318
public IEncodedString LangFlag(string lang, int size)
13191319
{
1320-
var strOut = "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + lang + ".gif&w=" + size + "' />";
1321-
1320+
var strOut = "<img src = '/DesktopModules/NBright/NBrightBuy/Themes/config/img/flags/" + size + "/" + lang + ".png' />"; ;
13221321
return new RawString(strOut);
13231322
}
13241323

0 commit comments

Comments
 (0)