fix

Author: sachatrauwaen

OpenForm.csproj

@@ -187,6 +187,16 @@
     <Content Include="AlpacaFormBuilder.ascx" />
     <Content Include="Edit.ascx" />
     <Content Include="EditData.ascx" />
+    <Content Include="images\edit.png" />
+    <Content Include="images\editcontent2.png" />
+    <Content Include="images\editsettings2.png" />
+    <Content Include="images\edittemplate.png" />
+    <Content Include="images\exchange.png" />
+    <Content Include="images\formbuilder.png" />
+    <Content Include="images\help.png" />
+    <Content Include="images\icon_extensions.png" />
+    <Content Include="images\settings.gif" />
+    <Content Include="images\settings.png" />
     <Content Include="js\alpaca-bundle.js" />
     <Content Include="js\alpaca-bundle.min.js">
       <DependentUpon>alpaca-bundle.js</DependentUpon>
@@ -246,9 +256,6 @@
   <ItemGroup>
     <Content Include="App_LocalResources\AlpacaFormBuilder.ascx.resx" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="bundleconfig.json" />
-  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

OpenForm.dnn

@@ -3,7 +3,7 @@
     <package name="OpenForm" type="Module" version="03.05.00">
       <friendlyName>OpenForm</friendlyName>
       <description>OpenForm module. Requires OpenContent v3.4.5 or higher</description>
-      <iconFile>~/Images/icon_extensions.png</iconFile>
+      <iconFile>~/DesktopModules/OpenForm/Images/icon_extensions.png</iconFile>
       <owner>
         <name>Satrabel.be</name>
         <organization>Satrabel.be</organization>

View.ascx.cs

@@ -102,9 +102,11 @@ private JToken GetOptions()
 
             // language options
             optionsFilename = Path.GetDirectoryName(templateFilename) + "\\" + $"options.{DnnLanguageUtils.GetCurrentCultureCode()}.json";
-            JToken languageOptionsJson = JsonUtils.GetJsonFromFile(optionsFilename);
-            optionsJson = optionsJson.JsonMerge(languageOptionsJson);
-
+            if (File.Exists(optionsFilename))
+            {
+                JToken languageOptionsJson = JsonUtils.GetJsonFromFile(optionsFilename);
+                optionsJson = optionsJson.JsonMerge(languageOptionsJson);
+            }
             return optionsJson;
         }