Skip to content

Commit

Permalink
Merge branch 'persian/v9.10.0-persian' into persian/v9.10.1-persian
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnouraei
mnouraei committed Aug 27, 2021
2 parents 9ec1a0f + 0ecaf7e commit 6fc62d4
Show file tree
Hide file tree
Showing 164 changed files with 27,261 additions and 1,111 deletions.
1 change: 1 addition & 0 deletions DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<Content Include="08.00.00.txt" />
<Content Include="App_LocalResources\ViewConsole.ascx.resx" />
<Content Include="console.png" />
<Content Include="module.rtl.css" />
<Content Include="Scripts\jquery.console.js" />
<Content Include="releaseNotes.txt" />
</ItemGroup>
Expand Down
82 changes: 82 additions & 0 deletions DNN Platform/Admin Modules/Dnn.Modules.Console/module.rtl.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@

.console { width:95%; height:95%; }
.console select { margin-right:0px;margin-bottom:4px; }

.console-none div { height:30px; margin:2px; width:180px; padding:5px; cursor:pointer; text-align:right; float:right; }
.console-none h3 { margin: 0px 28px 2px 2px; padding-top:5px; font-size:1em; line-height: 1.4em; font-weight: normal }
.console-none div div { display:none; }

.console-none-detail div { padding:10px; clear:both; cursor:pointer; }
.console-none-detail h3 { margin: 2px 28px 2px 2px; padding-top:5px; font-size:1em; }
.console-none-detail div div { margin: 2px 28px 2px 2px; padding:0px; clear:none; }

.console-small div { height:30px; margin:2px; width:180px; padding:5px; cursor:pointer; text-align:right; float:right; }
.console-small img { padding:4px; float:right; }
.console-small h3 { margin: 0px 28px 2px 2px; padding-top:5px; font-size:1em; line-height: 1.4em; font-weight: normal }
.console-small div div { display:none; }

.console-small-detail div { padding:10px; clear:both; cursor:pointer; }
.console-small-detail img { padding:4px; float:right; }
.console-small-detail h3 { margin: 2px 28px 2px 2px; padding:0px; font-size:1em; }
.console-small-detail div div { margin: 2px 28px 2px 2px; padding:0px; clear:none; }

.console-large div { margin:10px; width:130px; height:90px !important; padding:0px; cursor:pointer; text-align:center; float:right; }
.console-large img { float:none; padding: 10px 0px 0px 0px; }
.console-large h3 { margin:2px; width:130px; text-align:center; overflow:hidden; font-size:1em; line-height: 1.4em; padding-top:5px; font-weight: normal }
.console-large div div { display:none; }

.console-large-detail div { margin:0px; padding:15px; clear:both; cursor:pointer; }
.console-large-detail img { padding:0px; float:right; }
.console-large-detail h3 { margin: 2px 44px 2px 2px; padding: 0px; font-size:1em; }
.console-large-detail div div { margin: 2px 44px 2px 2px; padding:0px; clear:none; }

.console-mouseon { background-color:#ebedf0; } /*#f1f6f9*/

/*------------------------------------------------*/
/* DEFAULT PROFILE STYLE */
/*------------------------------------------------*/

.UserProfileControls ul li {
list-style-type: none;
}

/*------------------------------------------------*/
/* PROFILE STYLE */
/*------------------------------------------------*/
.console.profile {
/*width: 250px;*/
width:100% !important; /* updated for responsive*/
height: auto;
background-color: #484848; /* Menu Background Color */
}

.console.profile .console-none div {
cursor: pointer;
cursor: pointer;
float: right;
height: auto;
/*width: 250px;*/
width:100% !important; /* updated for responsive*/
padding: 0px;
margin: 0px;
text-align: right;
}

.console.profile .console-none h3 {
padding: 10px 40px 10px 8px;
margin: 0;
border-bottom: solid 1px #fff;
background: url('../../images/arrow-right-white.png') 18px center no-repeat;
color: #eee;
font-size: 13px;
line-height: 1;
font-weight: bold;
}

.console.profile .console-none div div {
display: none;
}

.console.profile .console-mouseon {
background-color: #70b1c7; /* Menu Hover Background Color */
}
266 changes: 266 additions & 0 deletions DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Dnn.Modules.ModuleCreator.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>
</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BD519B8A-169C-4328-BF67-62CD278435BC}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dnn.Modules.ModuleCreator</RootNamespace>
<AssemblyName>Dnn.Modules.ModuleCreator</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Dnn.Modules.ModuleCreator.XML</DocumentationFile>
<NoWarn>1591</NoWarn>
<LangVersion>7</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Dnn.Modules.ModuleCreator.XML</DocumentationFile>
<NoWarn>1591,1573</NoWarn>
<LangVersion>7</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\SolutionInfo.cs">
<Link>SolutionInfo.cs</Link>
</Compile>
<Compile Include="Components\BusinessController.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CreateModule.ascx.cs">
<DependentUpon>CreateModule.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CreateModule.ascx.designer.cs">
<DependentUpon>CreateModule.ascx</DependentUpon>
</Compile>
<Content Include="Module.rtl.css" />
<Content Include="Templates\C#\Class File\template.cs" />
<Content Include="Templates\C#\DAL2\templateController.cs" />
<Content Include="Templates\C#\DAL2\templateInfo.cs" />
<Content Include="Templates\C#\Module - User Control\_CONTROL_.ascx.cs">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="Templates\C#\Scheduled Job\templateJob.cs" />
<Content Include="Templates\C#\Settings - User Control\Settings.ascx.cs">
<DependentUpon>Settings.ascx</DependentUpon>
</Content>
<Content Include="Templates\C#\Web Service API\templateAPIController.cs" />
<Content Include="Templates\C#\Web Service API\templateRouteMapper.cs" />
<Compile Include="viewsource.ascx.cs">
<DependentUpon>viewsource.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="viewsource.ascx.designer.cs">
<DependentUpon>viewsource.ascx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="08.00.00.txt" />
<Content Include="App_LocalResources\CreateModule.ascx.resx" />
<Content Include="icon.png" />
<Content Include="js\ModuleCreator.js" />
<Content Include="logo.png" />
<Content Include="releaseNotes.txt" />
<Content Include="Templates\C#\Class File\readme.txt" />
<Content Include="Templates\C#\DAL2\01.00.00.sql" />
<Content Include="Templates\C#\DAL2\readme.txt" />
<Content Include="Templates\C#\DAL2\uninstall.sql" />
<Content Include="Templates\C#\Module - Inline Script\readme.txt" />
<Content Include="Templates\C#\Module - Inline Script\template.ascx" />
<Content Include="Templates\C#\Module - Razor\readme.txt" />
<Content Include="Templates\C#\Module - User Control\readme.txt" />
<Content Include="Templates\C#\Module - User Control\template.ascx" />
<Content Include="Templates\C#\Scheduled Job\readme.txt" />
<Content Include="Templates\C#\Settings - User Control\readme.txt" />
<Content Include="Templates\C#\Settings - User Control\Settings.ascx" />
<Content Include="Templates\C#\Web Service API\readme.txt" />
<Content Include="Templates\VB\Class File\readme.txt" />
<Content Include="Templates\VB\Class File\template.vb" />
<Content Include="Templates\VB\DAL2\01.00.00.sql" />
<Content Include="Templates\VB\DAL2\readme.txt" />
<Content Include="Templates\VB\DAL2\templateController.vb" />
<Content Include="Templates\VB\DAL2\templateInfo.vb" />
<Content Include="Templates\VB\DAL2\uninstall.sql" />
<Content Include="Templates\VB\Module - Inline Script\readme.txt" />
<Content Include="Templates\VB\Module - Inline Script\template.ascx" />
<Content Include="Templates\VB\Module - Razor\readme.txt" />
<Content Include="Templates\VB\Module - User Control\readme.txt" />
<Content Include="Templates\VB\Module - User Control\template.ascx" />
<Content Include="Templates\VB\Module - User Control\_CONTROL_.ascx.vb">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="Templates\VB\Scheduled Job\readme.txt" />
<Content Include="Templates\VB\Scheduled Job\templateJob.vb" />
<Content Include="Templates\VB\Settings - User Control\readme.txt" />
<Content Include="Templates\VB\Settings - User Control\Settings.ascx" />
<Content Include="Templates\VB\Settings - User Control\Settings.ascx.vb">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="Templates\VB\Web Service API\readme.txt" />
<Content Include="Templates\VB\Web Service API\templateController.vb" />
<Content Include="Templates\VB\Web Service API\templateRouteMapper.vb" />
<Content Include="Templates\Web\HTML Document\readme.txt" />
<Content Include="Templates\Web\HTML Document\template.html" />
<Content Include="Templates\Web\JavaScript\readme.txt" />
<Content Include="Templates\Web\JavaScript\template.js" />
<Content Include="Templates\Web\Module - HTML\readme.txt" />
<Content Include="Templates\Web\Module - HTML\template.ascx" />
<Content Include="Templates\Web\Module - HTML\template.html" />
<Content Include="Templates\Web\Style Sheet\Module.css" />
<Content Include="Templates\Web\Style Sheet\readme.txt" />
<Content Include="Templates\Web\XML Document\readme.txt" />
<Content Include="Templates\Web\XML Document\template.xml" />
<Content Include="viewsource.ascx" />
</ItemGroup>
<ItemGroup>
<Content Include="license.txt" />
<Content Include="module.css" />
<Content Include="CreateModule.ascx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Abstractions\DotNetNuke.Abstractions.csproj">
<Project>{6928A9B1-F88A-4581-A132-D3EB38669BB0}</Project>
<Name>DotNetNuke.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.DependencyInjection\DotNetNuke.DependencyInjection.csproj">
<Project>{0fca217a-5f9a-4f5b-a31b-86d64ae65198}</Project>
<Name>DotNetNuke.DependencyInjection</Name>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.Instrumentation\DotNetNuke.Instrumentation.csproj">
<Project>{3cd5f6b8-8360-4862-80b6-f402892db7dd}</Project>
<Name>DotNetNuke.Instrumentation</Name>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.Web.Client\DotNetNuke.Web.Client.csproj">
<Project>{03e3afa5-ddc9-48fb-a839-ad4282ce237e}</Project>
<Name>DotNetNuke.Web.Client</Name>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Module.build" />
</ItemGroup>
<ItemGroup>
<Content Include="dnn_ModuleCreator.dnn">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="App_LocalResources\ViewSource.ascx.resx" />
</ItemGroup>
<ItemGroup>
<Content Include="Templates\C#\Module - Inline Script\template.ascx.resx" />
<Content Include="Templates\C#\Module - User Control\template.ascx.resx" />
<Content Include="Templates\C#\Settings - User Control\Settings.ascx.resx">
<DependentUpon>Settings.ascx.cs</DependentUpon>
</Content>
<Content Include="Templates\VB\Module - Inline Script\template.ascx.resx">
<SubType>Designer</SubType>
</Content>
<Content Include="Templates\VB\Module - User Control\template.ascx.resx" />
<Content Include="Templates\VB\Settings - User Control\Settings.ascx.resx" />
</ItemGroup>
<ItemGroup>
<Content Include="Templates\C#\Module - Razor\_template.cshtml" />
<Content Include="Templates\VB\Module - Razor\_template.vbhtml" />
</ItemGroup>
<ItemGroup>
<Content Include="web.config" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\..\stylecop.json">
<Link>stylecop.json</Link>
</AdditionalFiles>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>56695</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:56695/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="Module.build" />
</Project>
9 changes: 9 additions & 0 deletions DNN Platform/Connectors/GoogleTagManager/Module.rtl.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
body {
}
.snippetTree {
float: right;
min-width: 17%;
}
.dnnDisabled {

}
9 changes: 9 additions & 0 deletions DNN Platform/DotNetNuke.Web.Client/ClientResourceManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,15 @@ public static void RegisterStyleSheet(Page page, string filePath, int priority,

if (fileExists || FileExists(page, filePath))
{
//START Persian-DnnSoftware
if ((System.Globalization.CultureInfo.CurrentCulture.TextInfo.IsRightToLeft && filePath.Contains(".css")) && !filePath.Contains("http"))
{
string locfile = filePath.Replace(".css", ".rtl.css");
if (FileExists(page, locfile))
filePath = locfile;
}
//END Persian-DnnSoftware

var include = new DnnCssInclude { ForceProvider = provider, Priority = priority, FilePath = filePath, Name = name, Version = version };
var loader = page.FindControl("ClientResourceIncludes");

Expand Down
Loading

0 comments on commit 6fc62d4

Please sign in to comment.