Merge branch 'release/v44'

sachatrauwaen · Jan 15, 2020 · 01f6100 · 01f6100
2 parents cc7a76b + 17442ee
commit 01f6100
Show file tree

Hide file tree

Showing 108 changed files with 2,500 additions and 203 deletions.
diff --git a/OpenContent/CloneModule.ascx.cs b/OpenContent/CloneModule.ascx.cs
@@ -18,6 +18,7 @@
 using DotNetNuke.Entities.Tabs;
 using DotNetNuke.Framework.JavaScriptLibraries;
 using Satrabel.OpenContent.Components;
+using Satrabel.OpenContent.Components.Dnn;
 using Satrabel.OpenContent.Components.Manifest;
 
 #endregion
@@ -56,7 +57,7 @@ protected override void OnLoad(EventArgs e)
             {
                 {
                     ListItem li = new ListItem(ti.TabName, ti.TabID.ToString());
-                    li.Text = ti.IndentedTabName;
+                    li.Text = $"{ti.IndentedTabName} <a href='{DnnUrlUtils.NavigateUrl(ti.TabID)}' target='_blank' style='font-size: 10px;text-decoration: none;' class='clonetabid'>({ti.TabID})</span></a>" ;
                     li.Enabled = ti.TabID != m.TabID;
                     cblPages.Items.Add(li);
 
@@ -68,7 +69,7 @@ protected override void OnLoad(EventArgs e)
                         if (tmi.IsDeleted)
                         {
                             //li.Enabled = false;
-                            li.Text = "<i>" + li.Text + "</i>";
+                            li.Text = $"<i>{li.Text}</i>";
                         }
                         else
                         {

diff --git a/OpenContent/Components/Alpaca/AlpacaEngine.cs b/OpenContent/Components/Alpaca/AlpacaEngine.cs
@@ -113,6 +113,16 @@ private void RegisterAlpaca(bool bootstrap, bool loadBootstrap, bool loadGlyphic
             ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/alpacaengine.js", FileOrder.Js.DefaultPriority + 10);
 
             ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/css/font-awesome/css/font-awesome.min.css", FileOrder.Css.DefaultPriority + 1);
+
+
+            string prefix = (string.IsNullOrEmpty(Prefix) ? "" : $"{Prefix}-");
+            string physicalDirectory = HostingEnvironment.MapPath("~/" + VirtualDirectory);
+            string jsFilename = physicalDirectory + "\\" + $"{prefix}edit.js";
+            if (File.Exists(jsFilename))
+            {
+                ClientResourceManager.RegisterScript(Page, $"~/{VirtualDirectory}/{prefix}edit.js", FileOrder.Js.DefaultPriority + 11);
+            }
+
         }
         public void RegisterTemplates()
         {
@@ -156,7 +166,7 @@ private void RegisterFields(bool bootstrap)
                     fieldTypes = FieldTypes(options);
                 }
             }
-            if (allFields || fieldTypes.Contains("address"))
+            if (allFields || fieldTypes.Contains("address") || fieldTypes.Contains("mladdress"))
             {
                 string apikey = App.Services.CreateGlobalSettingsRepository(PortalId).GetGoogleApiKey();
                 ClientResourceManager.RegisterScript(Page, "//maps.googleapis.com/maps/api/js?v=3.exp&libraries=places" + (string.IsNullOrEmpty(apikey) ? "" : "&key=" + apikey), FileOrder.Js.DefaultPriority);

diff --git a/OpenContent/Components/Alpaca/FormBuilder.cs b/OpenContent/Components/Alpaca/FormBuilder.cs
@@ -149,7 +149,7 @@ private static void GetFields(SchemaConfig newSchemaFilter, OptionsConfig newOpt
 
                         fieldLst.Add(propKey);
                     }
-                    else if (prop.Value.Type == "number")
+                    else if (prop.Value.Type == "number" || optType == "mlnumber")
                     {
                         var newProp = new SchemaConfig()
                         {
@@ -358,6 +358,17 @@ private FieldConfig CreateFieldConfigFromSchemaAndOptionFile(string key)
                         };
                         newConfig.Fields.Add(prop.Key, newField);
                     }
+                    else if (optType == "mlnumber")
+                    {
+                        var newField = new FieldConfig()
+                        {
+                            IndexType = "float",
+                            Index = true,
+                            Sort = true,
+                            MultiLanguage = true
+                        };
+                        newConfig.Fields.Add(prop.Key, newField);
+                    }
                     else if (prop.Value.Type == "number")
                     {
                         var newField = new FieldConfig()