Revert "Make flag images use dnn image handler. Fixes #200"

This reverts commit 1f06e24.
openstore-ecommerce · Oct 12, 2021 · fd7a979 · fd7a979
1 parent a2fae42
commit fd7a979
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Admin/EditLanguage.ascx.cs b/Admin/EditLanguage.ascx.cs
@@ -62,7 +62,7 @@ protected override void OnLoad(EventArgs e)
                 {
                     Controls.Add(new LiteralControl("<li>"));
                     var cmd = new LinkButton();
-                    cmd.Text = "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + l.Value.Code + ".gif&h=" + Size + "' alt='" + l.Value.EnglishName + "' />";
+                    cmd.Text = "<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + Size + "/" + l.Value.Code + ".png' alt='" + l.Value.EnglishName + "' />";
                     cmd.CommandArgument = l.Value.Code;
                     cmd.CommandName = "selectlang";
                     cmd.Command += (s, cmde) =>

diff --git a/render/GenXmlTemplateExt.cs b/render/GenXmlTemplateExt.cs
@@ -4020,7 +4020,7 @@ private void CreateEditFlag(Control container, XmlNode xmlNod)
             var lc = new Literal();
             var size = "16";
             if (xmlNod.Attributes != null && (xmlNod.Attributes["size"] != null)) size = xmlNod.Attributes["size"].Value;
-            lc.Text = "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + StoreSettings.Current.EditLanguage + ".gif&h=" + size + "'/>";
+            lc.Text = "<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + size + "/" + StoreSettings.Current.EditLanguage + ".png' />";
             lc.DataBinding += EditFlagDataBind;
             container.Controls.Add(lc);
         }
@@ -4779,7 +4779,7 @@ private void CreateEditCultureSelect(Control container, XmlNode xmlNod)
             foreach (var l in enabledlanguages)
             {
                 strOut.Append("<li><a href='javascript:void(0)' lang='" + l.Value.Code + "' class='" + cssclassli + "'>");
-                strOut.Append("<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + l.Value.Code + ".gif&h=" + size + "' alt='" + l.Value.NativeName + "' />");
+                strOut.Append("<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + size + "/" + l.Value.Code + ".png' alt='" + l.Value.NativeName + "' />");
                 strOut.Append("</a></li>");
             }
             strOut.Append("</ul>");

diff --git a/render/NBrightBuyRazorTokens.cs b/render/NBrightBuyRazorTokens.cs
@@ -69,7 +69,7 @@ public IEncodedString EditLanguageButton(int size = 16)
                 foreach (var l in enabledlanguages)
                 {
                     strOut1 += "<li class='selectlang' editlang='" + l.Value.Code + "'>";
-                    strOut1 += "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + l.Value.Code + ".gif&h=" + size + "' alt='" + l.Value.EnglishName + "' />";
+                    strOut1 += "<img src='" + StoreSettings.NBrightBuyPath() + "/Themes/config/img/flags/" + size + "/" + l.Value.Code + ".png' alt='" + l.Value.EnglishName + "' />";
                     strOut1 += "</li>";
                 }
                 strOut1 += "</ul>";
@@ -1317,8 +1317,7 @@ public IEncodedString LangFlag(string lang)
 
         public IEncodedString LangFlag(string lang, int size)
         {
-            var strOut = "<img src='/DnnImageHandler.ashx?mode=file&file=/images/flags/" + lang + ".gif&w=" + size + "' />";
-
+            var strOut = "<img src = '/DesktopModules/NBright/NBrightBuy/Themes/config/img/flags/" + size + "/" + lang + ".png' />"; ;
             return new RawString(strOut);
         }