Skip to content

Commit dff34ee

Browse files
sachatrauwaensachatrauwaen
committed
Merge branch 'release/v4.2'
2 parents b634f56 + 33d7252 commit dff34ee

File tree

1,047 files changed

+260879
-38032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,047 files changed

+260879
-38032
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ packages/
44
custom.targets
55
obj/
66
Install/
7-
OpenContent/OpenContent920.csproj.user
7+
*.user
8+
OpenContentDnnHost/bin/

‎OpenContent/AddEdit.ascx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected override void OnInit(EventArgs e)
3030

3131
if (settings.TemplateKey.Extention != ".manifest")
3232
{
33-
manifest = ManifestUtils.GetFileManifest(settings.TemplateKey.TemplateDir);
33+
manifest = ManifestUtils.LoadManifestFileFromCacheOrDisk(settings.TemplateKey.TemplateDir);
3434
}
3535

3636
if (manifest != null)

‎OpenContent/AlpacaFormBuilder.ascx.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@ public partial class AlpacaFormBuilder : PortalModuleBase
2727
protected override void OnInit(EventArgs e)
2828
{
2929
base.OnInit(e);
30-
var globalSettingsController = OpenContentControllerFactory.Instance.OpenContentGlobalSettingsController(ModuleContext.PortalId);
30+
var globalSettingsController = App.Services.CreateGlobalSettingsRepository(ModuleContext.PortalId);
3131
hlCancel.NavigateUrl = Globals.NavigateURL();
3232
cmdSave.NavigateUrl = Globals.NavigateURL();
33+
3334
var editLayout = globalSettingsController.GetEditLayout();
3435
var bootstrap = globalSettingsController.GetEditLayout() != AlpacaLayoutEnum.DNN;
3536
bool loadBootstrap = bootstrap && globalSettingsController.GetLoadBootstrap();
37+
bool loadGlyphicons = bootstrap && App.Services.CreateGlobalSettingsRepository(ModuleContext.PortalId).GetLoadGlyphicons();
3638

3739
OpenContentSettings settings = this.OpenContentSettings();
3840
AlpacaEngine alpaca = new AlpacaEngine(Page, ModuleContext.PortalId, "" /*settings.Template.Uri().FolderPath*/, "builder");
39-
alpaca.RegisterAll(bootstrap, loadBootstrap);
41+
alpaca.RegisterAll(bootstrap, loadBootstrap, loadGlyphicons);
42+
4043
//string ItemId = Request.QueryString["id"];
4144
//AlpacaContext = new AlpacaContext(PortalId, ModuleId, ItemId, ScopeWrapper.ClientID, null, cmdSave.ClientID, null, null);
42-
ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/builder/formbuilder.js", FileOrder.Js.DefaultPriority+10);
45+
ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/builder/formbuilder.js", FileOrder.Js.DefaultPriority + 10);
4346
ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/js/builder/formbuilder.css", FileOrder.Css.DefaultPriority);
4447
//ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/bootstrap/js/bootstrap.min.js", FileOrder.Js.DefaultPriority);
4548
//ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/js/bootstrap/css/bootstrap.min.css", FileOrder.Css.DefaultPriority);

‎OpenContent/App_LocalResources/CloneModule.ascx.resx

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="cmdSave.Text" xml:space="preserve">
121+
<value>Save</value>
122+
</data>
123+
<data name="cmdCheckAll.Text" xml:space="preserve">
124+
<value>All</value>
125+
</data>
126+
<data name="cmdCheckNone.Text" xml:space="preserve">
127+
<value>None</value>
128+
</data>
129+
</root>

‎OpenContent/App_LocalResources/EditData.ascx.resx

+9-6
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,19 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="DataType.Text" xml:space="preserve">
121-
<value>Type of data</value>
122-
</data>
123-
<data name="Versions.Text" xml:space="preserve">
124-
<value>Versions</value>
125-
</data>
126120
<data name="cmdImport.Text" xml:space="preserve">
127121
<value>Import Demo Data</value>
128122
</data>
129123
<data name="cmdRestApi.Text" xml:space="preserve">
130124
<value>Rest Api Doc</value>
131125
</data>
126+
<data name="cmdSaveDefault.Text" xml:space="preserve">
127+
<value>Save to file As default</value>
128+
</data>
129+
<data name="DataType.Text" xml:space="preserve">
130+
<value>Type of data</value>
131+
</data>
132+
<data name="Versions.Text" xml:space="preserve">
133+
<value>Versions</value>
134+
</data>
132135
</root>

‎OpenContent/App_LocalResources/EditGlobalSettings.ascx.resx

+14-2
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,25 @@
144144
<data name="lGoogleApiKey.Text" xml:space="preserve">
145145
<value>Google Api Key</value>
146146
</data>
147-
<data name="lFastHandlebars.Text" xml:space="preserve">
148-
<value>Fast Handlebars. Case sensitive variables ! (Beta)</value>
147+
<data name="lLegacyHandlebars.Text" xml:space="preserve">
148+
<value>Legacy Handlebars. Case unsensitive variables. Slower.</value>
149149
</data>
150150
<data name="lSaveXml.Text" xml:space="preserve">
151151
<value>Save Xml</value>
152152
</data>
153153
<data name="cmdUpgradeXml.Text" xml:space="preserve">
154154
<value>Generate Xml</value>
155155
</data>
156+
<data name="lGithubRepository.Text" xml:space="preserve">
157+
<value>Github Templates Repository</value>
158+
</data>
159+
<data name="cmdPurgeUrlCache.Text" xml:space="preserve">
160+
<value>Clear Url Cache</value>
161+
</data>
162+
<data name="lLoadGlyphicons.Text" xml:space="preserve">
163+
<value>Load Glyphicons on Edit Form (for bootstrap 4)</value>
164+
</data>
165+
<data name="lCompositeCss.Text" xml:space="preserve">
166+
<value>Composite &amp; Minify Template Css (require DNN 8 or greater)</value>
167+
</data>
156168
</root>

‎OpenContent/App_LocalResources/EditInit.ascx.resx

-36
Original file line numberDiff line numberDiff line change
@@ -117,51 +117,18 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="AddContent.Action" xml:space="preserve">
121-
<value>Add Content</value>
122-
</data>
123-
<data name="EditData.Action" xml:space="preserve">
124-
<value>Edit Raw Data</value>
125-
</data>
126-
<data name="EditGlobalSettings.Action" xml:space="preserve">
127-
<value>Edit Global Settings</value>
128-
</data>
129120
<data name="EditSettings.Action" xml:space="preserve">
130121
<value>Template Settings</value>
131122
</data>
132-
<data name="EditTemplate.Action" xml:space="preserve">
133-
<value>Edit Template Files</value>
134-
</data>
135123
<data name="Help.Action" xml:space="preserve">
136124
<value>Help</value>
137125
</data>
138-
<data name="lTemplate.Text" xml:space="preserve">
139-
<value>Template</value>
140-
</data>
141-
<data name="lUseTemplate.Text" xml:space="preserve">
142-
<value>I want</value>
143-
</data>
144126
<data name="ShareTemplate.Action" xml:space="preserve">
145127
<value>Template Exchange</value>
146128
</data>
147129
<data name="Intro.Text" xml:space="preserve">
148130
<value>Get Started</value>
149131
</data>
150-
<data name="lFrom.Text" xml:space="preserve">
151-
<value>Based On Template From</value>
152-
</data>
153-
<data name="lTemplateName.Text" xml:space="preserve">
154-
<value>New Template Name</value>
155-
</data>
156-
<data name="EditContent.Action" xml:space="preserve">
157-
<value>Edit Content</value>
158-
</data>
159-
<data name="lUseContent.Text" xml:space="preserve">
160-
<value>Source of content</value>
161-
</data>
162-
<data name="lDataSource.Text" xml:space="preserve">
163-
<value>Page - Module</value>
164-
</data>
165132
<data name="cmdSave.Text" xml:space="preserve">
166133
<value>Save</value>
167134
</data>
@@ -171,7 +138,4 @@
171138
<data name="EditInit.Action" xml:space="preserve">
172139
<value>Template Init</value>
173140
</data>
174-
<data name="lDetailPage.Text" xml:space="preserve">
175-
<value>Detail Page</value>
176-
</data>
177141
</root>

‎OpenContent/App_LocalResources/EditInit.ascx.de-AT.resx ‎OpenContent/App_LocalResources/SharedResources.de-AT.resx

File renamed without changes.

‎OpenContent/App_LocalResources/EditInit.ascx.de-DE.resx ‎OpenContent/App_LocalResources/SharedResources.de-DE.resx

-30
Original file line numberDiff line numberDiff line change
@@ -117,24 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="AddContent.Action" xml:space="preserve">
121-
<value>Inhalt hinzufügen</value>
122-
</data>
123-
<data name="EditData.Action" xml:space="preserve">
124-
<value>Rohdaten bearbeiten</value>
125-
</data>
126-
<data name="EditGlobalSettings.Action" xml:space="preserve">
127-
<value>Globale Einstellungen bearbeiten</value>
128-
</data>
129-
<data name="EditSettings.Action" xml:space="preserve">
130-
<value>Einstellungen für Vorlagen</value>
131-
</data>
132-
<data name="EditTemplate.Action" xml:space="preserve">
133-
<value>Vorlagen bearbeiten</value>
134-
</data>
135-
<data name="Help.Action" xml:space="preserve">
136-
<value>Hilfe</value>
137-
</data>
138120
<data name="lTemplate.Text" xml:space="preserve">
139121
<value>Vorlage</value>
140122
</data>
@@ -144,18 +126,12 @@
144126
<data name="ShareTemplate.Action" xml:space="preserve">
145127
<value>Vorlagenaustausch</value>
146128
</data>
147-
<data name="Intro.Text" xml:space="preserve">
148-
<value>Einleitung</value>
149-
</data>
150129
<data name="lFrom.Text" xml:space="preserve">
151130
<value>Zugrundeliegende Vorlage</value>
152131
</data>
153132
<data name="lTemplateName.Text" xml:space="preserve">
154133
<value>Name der neuen Vorlage</value>
155134
</data>
156-
<data name="EditContent.Action" xml:space="preserve">
157-
<value>Inhalt bearbeiten</value>
158-
</data>
159135
<data name="lUseContent.Text" xml:space="preserve">
160136
<value>Inhaltsquelle</value>
161137
</data>
@@ -165,12 +141,6 @@
165141
<data name="cmdSave.Text" xml:space="preserve">
166142
<value>Speichern</value>
167143
</data>
168-
<data name="EditQuery.Action" xml:space="preserve">
169-
<value>Einstellungen für Filter</value>
170-
</data>
171-
<data name="EditInit.Action" xml:space="preserve">
172-
<value>Vorlage initialisieren</value>
173-
</data>
174144
<data name="lDetailPage.Text" xml:space="preserve">
175145
<value>Detailseite</value>
176146
</data>

‎OpenContent/App_LocalResources/SharedResources.resx

+39
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,43 @@
126126
<data name="cmdSaveClose.Text" xml:space="preserve">
127127
<value>Save and Close</value>
128128
</data>
129+
<data name="lDataSource.Text" xml:space="preserve">
130+
<value>Page - Module</value>
131+
</data>
132+
<data name="lDetailPage.Text" xml:space="preserve">
133+
<value>Detail Page</value>
134+
</data>
135+
<data name="lFrom.Text" xml:space="preserve">
136+
<value>Based On Template From</value>
137+
</data>
138+
<data name="liCreateNewTemplate.Text" xml:space="preserve">
139+
<value>Create a new template</value>
140+
</data>
141+
<data name="liFromSite.Text" xml:space="preserve">
142+
<value>Site</value>
143+
</data>
144+
<data name="liFromWeb.Text" xml:space="preserve">
145+
<value>Web (github)</value>
146+
</data>
147+
<data name="liOtherModule.Text" xml:space="preserve">
148+
<value>Other Module</value>
149+
</data>
150+
<data name="liThisModule.Text" xml:space="preserve">
151+
<value>This module</value>
152+
</data>
153+
<data name="liUseExistingTemplate.Text" xml:space="preserve">
154+
<value>Use a existing template</value>
155+
</data>
156+
<data name="lTemplate.Text" xml:space="preserve">
157+
<value>Template</value>
158+
</data>
159+
<data name="lTemplateName.Text" xml:space="preserve">
160+
<value>New Template Name</value>
161+
</data>
162+
<data name="lUseContent.Text" xml:space="preserve">
163+
<value>Source of content</value>
164+
</data>
165+
<data name="lUseTemplate.Text" xml:space="preserve">
166+
<value>I want</value>
167+
</data>
129168
</root>

0 commit comments

Comments
 (0)