Skip to content

Commit

Permalink
Merge branch 'release/v4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
sachatrauwaen committed May 29, 2019
2 parents b634f56 + 33d7252 commit dff34ee
Show file tree
Hide file tree
Showing 1,047 changed files with 260,879 additions and 38,032 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ packages/
custom.targets
obj/
Install/
OpenContent/OpenContent920.csproj.user
*.user
OpenContentDnnHost/bin/
2 changes: 1 addition & 1 deletion OpenContent/AddEdit.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected override void OnInit(EventArgs e)

if (settings.TemplateKey.Extention != ".manifest")
{
manifest = ManifestUtils.GetFileManifest(settings.TemplateKey.TemplateDir);
manifest = ManifestUtils.LoadManifestFileFromCacheOrDisk(settings.TemplateKey.TemplateDir);
}

if (manifest != null)
Expand Down
9 changes: 6 additions & 3 deletions OpenContent/AlpacaFormBuilder.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,22 @@ public partial class AlpacaFormBuilder : PortalModuleBase
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
var globalSettingsController = OpenContentControllerFactory.Instance.OpenContentGlobalSettingsController(ModuleContext.PortalId);
var globalSettingsController = App.Services.CreateGlobalSettingsRepository(ModuleContext.PortalId);
hlCancel.NavigateUrl = Globals.NavigateURL();
cmdSave.NavigateUrl = Globals.NavigateURL();

var editLayout = globalSettingsController.GetEditLayout();
var bootstrap = globalSettingsController.GetEditLayout() != AlpacaLayoutEnum.DNN;
bool loadBootstrap = bootstrap && globalSettingsController.GetLoadBootstrap();
bool loadGlyphicons = bootstrap && App.Services.CreateGlobalSettingsRepository(ModuleContext.PortalId).GetLoadGlyphicons();

OpenContentSettings settings = this.OpenContentSettings();
AlpacaEngine alpaca = new AlpacaEngine(Page, ModuleContext.PortalId, "" /*settings.Template.Uri().FolderPath*/, "builder");
alpaca.RegisterAll(bootstrap, loadBootstrap);
alpaca.RegisterAll(bootstrap, loadBootstrap, loadGlyphicons);

//string ItemId = Request.QueryString["id"];
//AlpacaContext = new AlpacaContext(PortalId, ModuleId, ItemId, ScopeWrapper.ClientID, null, cmdSave.ClientID, null, null);
ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/builder/formbuilder.js", FileOrder.Js.DefaultPriority+10);
ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/builder/formbuilder.js", FileOrder.Js.DefaultPriority + 10);
ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/js/builder/formbuilder.css", FileOrder.Css.DefaultPriority);
//ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/bootstrap/js/bootstrap.min.js", FileOrder.Js.DefaultPriority);
//ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/js/bootstrap/css/bootstrap.min.css", FileOrder.Css.DefaultPriority);
Expand Down
129 changes: 129 additions & 0 deletions OpenContent/App_LocalResources/CloneModule.ascx.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="cmdSave.Text" xml:space="preserve">
<value>Save</value>
</data>
<data name="cmdCheckAll.Text" xml:space="preserve">
<value>All</value>
</data>
<data name="cmdCheckNone.Text" xml:space="preserve">
<value>None</value>
</data>
</root>
15 changes: 9 additions & 6 deletions OpenContent/App_LocalResources/EditData.ascx.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,19 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="DataType.Text" xml:space="preserve">
<value>Type of data</value>
</data>
<data name="Versions.Text" xml:space="preserve">
<value>Versions</value>
</data>
<data name="cmdImport.Text" xml:space="preserve">
<value>Import Demo Data</value>
</data>
<data name="cmdRestApi.Text" xml:space="preserve">
<value>Rest Api Doc</value>
</data>
<data name="cmdSaveDefault.Text" xml:space="preserve">
<value>Save to file As default</value>
</data>
<data name="DataType.Text" xml:space="preserve">
<value>Type of data</value>
</data>
<data name="Versions.Text" xml:space="preserve">
<value>Versions</value>
</data>
</root>
16 changes: 14 additions & 2 deletions OpenContent/App_LocalResources/EditGlobalSettings.ascx.resx
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,25 @@
<data name="lGoogleApiKey.Text" xml:space="preserve">
<value>Google Api Key</value>
</data>
<data name="lFastHandlebars.Text" xml:space="preserve">
<value>Fast Handlebars. Case sensitive variables ! (Beta)</value>
<data name="lLegacyHandlebars.Text" xml:space="preserve">
<value>Legacy Handlebars. Case unsensitive variables. Slower.</value>
</data>
<data name="lSaveXml.Text" xml:space="preserve">
<value>Save Xml</value>
</data>
<data name="cmdUpgradeXml.Text" xml:space="preserve">
<value>Generate Xml</value>
</data>
<data name="lGithubRepository.Text" xml:space="preserve">
<value>Github Templates Repository</value>
</data>
<data name="cmdPurgeUrlCache.Text" xml:space="preserve">
<value>Clear Url Cache</value>
</data>
<data name="lLoadGlyphicons.Text" xml:space="preserve">
<value>Load Glyphicons on Edit Form (for bootstrap 4)</value>
</data>
<data name="lCompositeCss.Text" xml:space="preserve">
<value>Composite &amp; Minify Template Css (require DNN 8 or greater)</value>
</data>
</root>
36 changes: 0 additions & 36 deletions OpenContent/App_LocalResources/EditInit.ascx.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,51 +117,18 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AddContent.Action" xml:space="preserve">
<value>Add Content</value>
</data>
<data name="EditData.Action" xml:space="preserve">
<value>Edit Raw Data</value>
</data>
<data name="EditGlobalSettings.Action" xml:space="preserve">
<value>Edit Global Settings</value>
</data>
<data name="EditSettings.Action" xml:space="preserve">
<value>Template Settings</value>
</data>
<data name="EditTemplate.Action" xml:space="preserve">
<value>Edit Template Files</value>
</data>
<data name="Help.Action" xml:space="preserve">
<value>Help</value>
</data>
<data name="lTemplate.Text" xml:space="preserve">
<value>Template</value>
</data>
<data name="lUseTemplate.Text" xml:space="preserve">
<value>I want</value>
</data>
<data name="ShareTemplate.Action" xml:space="preserve">
<value>Template Exchange</value>
</data>
<data name="Intro.Text" xml:space="preserve">
<value>Get Started</value>
</data>
<data name="lFrom.Text" xml:space="preserve">
<value>Based On Template From</value>
</data>
<data name="lTemplateName.Text" xml:space="preserve">
<value>New Template Name</value>
</data>
<data name="EditContent.Action" xml:space="preserve">
<value>Edit Content</value>
</data>
<data name="lUseContent.Text" xml:space="preserve">
<value>Source of content</value>
</data>
<data name="lDataSource.Text" xml:space="preserve">
<value>Page - Module</value>
</data>
<data name="cmdSave.Text" xml:space="preserve">
<value>Save</value>
</data>
Expand All @@ -171,7 +138,4 @@
<data name="EditInit.Action" xml:space="preserve">
<value>Template Init</value>
</data>
<data name="lDetailPage.Text" xml:space="preserve">
<value>Detail Page</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AddContent.Action" xml:space="preserve">
<value>Inhalt hinzufügen</value>
</data>
<data name="EditData.Action" xml:space="preserve">
<value>Rohdaten bearbeiten</value>
</data>
<data name="EditGlobalSettings.Action" xml:space="preserve">
<value>Globale Einstellungen bearbeiten</value>
</data>
<data name="EditSettings.Action" xml:space="preserve">
<value>Einstellungen für Vorlagen</value>
</data>
<data name="EditTemplate.Action" xml:space="preserve">
<value>Vorlagen bearbeiten</value>
</data>
<data name="Help.Action" xml:space="preserve">
<value>Hilfe</value>
</data>
<data name="lTemplate.Text" xml:space="preserve">
<value>Vorlage</value>
</data>
Expand All @@ -144,18 +126,12 @@
<data name="ShareTemplate.Action" xml:space="preserve">
<value>Vorlagenaustausch</value>
</data>
<data name="Intro.Text" xml:space="preserve">
<value>Einleitung</value>
</data>
<data name="lFrom.Text" xml:space="preserve">
<value>Zugrundeliegende Vorlage</value>
</data>
<data name="lTemplateName.Text" xml:space="preserve">
<value>Name der neuen Vorlage</value>
</data>
<data name="EditContent.Action" xml:space="preserve">
<value>Inhalt bearbeiten</value>
</data>
<data name="lUseContent.Text" xml:space="preserve">
<value>Inhaltsquelle</value>
</data>
Expand All @@ -165,12 +141,6 @@
<data name="cmdSave.Text" xml:space="preserve">
<value>Speichern</value>
</data>
<data name="EditQuery.Action" xml:space="preserve">
<value>Einstellungen für Filter</value>
</data>
<data name="EditInit.Action" xml:space="preserve">
<value>Vorlage initialisieren</value>
</data>
<data name="lDetailPage.Text" xml:space="preserve">
<value>Detailseite</value>
</data>
Expand Down
39 changes: 39 additions & 0 deletions OpenContent/App_LocalResources/SharedResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,43 @@
<data name="cmdSaveClose.Text" xml:space="preserve">
<value>Save and Close</value>
</data>
<data name="lDataSource.Text" xml:space="preserve">
<value>Page - Module</value>
</data>
<data name="lDetailPage.Text" xml:space="preserve">
<value>Detail Page</value>
</data>
<data name="lFrom.Text" xml:space="preserve">
<value>Based On Template From</value>
</data>
<data name="liCreateNewTemplate.Text" xml:space="preserve">
<value>Create a new template</value>
</data>
<data name="liFromSite.Text" xml:space="preserve">
<value>Site</value>
</data>
<data name="liFromWeb.Text" xml:space="preserve">
<value>Web (github)</value>
</data>
<data name="liOtherModule.Text" xml:space="preserve">
<value>Other Module</value>
</data>
<data name="liThisModule.Text" xml:space="preserve">
<value>This module</value>
</data>
<data name="liUseExistingTemplate.Text" xml:space="preserve">
<value>Use a existing template</value>
</data>
<data name="lTemplate.Text" xml:space="preserve">
<value>Template</value>
</data>
<data name="lTemplateName.Text" xml:space="preserve">
<value>New Template Name</value>
</data>
<data name="lUseContent.Text" xml:space="preserve">
<value>Source of content</value>
</data>
<data name="lUseTemplate.Text" xml:space="preserve">
<value>I want</value>
</data>
</root>
Loading

0 comments on commit dff34ee

Please sign in to comment.