Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avanzamento modifiche MAPO SITE

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-05-31 18:56:10 +02:00
parent b8fe2d06de
commit 132aed880f
17 changed files with 176 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/App_Start/RouteConfig.cs
+7 -7
View File
@@ -3,13 +3,13 @@ using System.Web.Routing;
namespace MoonPro
{
public static class RouteConfig
public static class RouteConfig
{
public static void RegisterRoutes(RouteCollection routes)
{
public static void RegisterRoutes(RouteCollection routes)
{
var settings = new FriendlyUrlSettings();
settings.AutoRedirectMode = RedirectMode.Permanent;
routes.EnableFriendlyUrls(settings);
}
var settings = new FriendlyUrlSettings();
settings.AutoRedirectMode = RedirectMode.Permanent;
routes.EnableFriendlyUrls(settings);
}
}
}
MP-Site/Content/Roboto.woff
BIN
View File
Binary file not shown.
MP-Site/Content/RobotoCondensed.woff
BIN
View File
Binary file not shown.
MP-Site/Content/Style.css
+26 -4
View File
@@ -1,14 +1,36 @@
@import url('font-awesome.min.css');
/*Import fonts!*/
@import url('fonts.css');
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url('OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff') format('woff');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url('RobotoCondensed.woff') format('woff');
}
/* Gestione blocchi base */
body {
/*font-family: 'Open Sans', sans-serif;*/
font-family: 'Roboto Condensed', sans-serif;
font-family: 'Open Sans Condensed', sans-serif;
background-color: #5d5d5d;
}
.body {
font-family: 'Roboto Condensed', sans-serif;
font-family: 'Open Sans Condensed', sans-serif;
margin-top: 0px;
margin-left: 0px;
margin-bottom: 0px;
MP-Site/Content/Style.less
+3 -4
View File
@@ -1,17 +1,16 @@
@import url('font-awesome.min.css');
/*Import fonts!*/
@import url('./fonts.css');
@import url('./fonts.less');
/* Gestione blocchi base */
body {
/*font-family: 'Open Sans', sans-serif;*/
font-family: 'Roboto Condensed', sans-serif;
font-family: 'Open Sans Condensed', sans-serif;
background-color: #5d5d5d;
}
.body {
font-family: 'Roboto Condensed', sans-serif;
font-family: 'Open Sans Condensed', sans-serif;
margin-top: 0px;
margin-left: 0px;
margin-bottom: 0px;
MP-Site/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Site/Content/fonts.css
+12
View File
@@ -9,4 +9,16 @@
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff') format('woff');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url('RobotoCondensed.woff') format('woff');
}
MP-Site/Content/fonts.less
+14
View File
@@ -11,3 +11,17 @@
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff') format('woff');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url('RobotoCondensed.woff') format('woff');
}
MP-Site/Content/fonts.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff') format('woff');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('RobotoCondensed.woff') format('woff');}
MP-Site/MP-Site.csproj
+51 -7
View File
@@ -87,6 +87,8 @@
<UseGlobalApplicationHostFile />
<Use64BitIISExpress />
<TypeScriptToolsVersion>2.5</TypeScriptToolsVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -121,6 +123,9 @@
<HintPath>..\packages\AjaxMin.5.14.5506.26202\lib\net40\AjaxMin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
<Private>True</Private>
@@ -129,9 +134,29 @@
<HintPath>..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Web.Optimization.WebForms, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=2.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.2.2.6\lib\net40\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net46\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis.StrongName, Version=1.2.1.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.StrongName.1.2.1\lib\net46\StackExchange.Redis.StrongName.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DataVisualization" />
<Reference Include="System.Web.DataVisualization.Design" />
@@ -140,12 +165,18 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Web.Mobile" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersGen\MoonPro.cs">
@@ -533,7 +564,13 @@
<DependentUpon>fonts.less</DependentUpon>
</Content>
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.less</DependentUpon>
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
<Content Include="Content\Style.min.css">
<DependentUpon>Style.css</DependentUpon>
</Content>
<Content Include="Default.aspx" />
<Content Include="diagApp.aspx" />
@@ -611,6 +648,12 @@
<Content Include="Content\bootstrap-reboot.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="Content\Roboto.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\RobotoCondensed.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Properties\PublishProfiles\OVH-Demo.pubxml" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Properties\PublishProfiles\OVH-Demo-old.pubxml" />
@@ -692,12 +735,6 @@
<Content Include="scripts\umd\popper.min.js" />
<Content Include="StatisticheImpiego.aspx" />
<Content Include="MappaStato.aspx" />
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
<Content Include="Content\Style.min.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
<Content Include="ViewSwitcher.ascx" />
<Content Include="WebUserControls\mod_andamentoStorico.ascx" />
<Content Include="WebUserControls\mod_AnPro_DettArt.ascx" />
@@ -897,4 +934,11 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets" Condition="Exists('..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets'))" />
</Target>
</Project>
MP-Site/Web.config
+22 -2
View File
@@ -116,7 +116,7 @@
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" /></controls>
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" /><add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" /></controls>
</pages>
<httpHandlers>
<add path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
@@ -129,7 +129,11 @@
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" />
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" />
</httpModules>
</system.web>
<sessionState mode="Custom" customProvider="MySessionStateStore">
<providers>
<add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false" applicationName="MP_SITE" />
</providers>
</sessionState></system.web>
<system.webServer>
<staticContent>
<!--aggiunto mimetype x scaricamento fonts aggiuntive-->
@@ -157,6 +161,22 @@
<assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
<!--<bindingRedirect oldVersion="0.0.0.0-4.1.60919.0" newVersion="4.1.60919.0" />-->
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="StackExchange.Redis.StrongName" publicKeyToken="c219ff1ca8c2ce46" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.6.0" newVersion="1.2.6.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<elmah>
MP-Site/compilerconfig.json
-4
View File
@@ -1,8 +1,4 @@
[
{
"outputFile": "Style.css",
"inputFile": "Style.less"
},
{
"outputFile": "Content/Style.css",
"inputFile": "Content/Style.less"
MP-Site/packages.config
+10
View File
@@ -2,12 +2,22 @@
<packages>
<package id="AjaxControlToolkit" version="18.1.0" targetFramework="net462" />
<package id="AjaxMin" version="5.14.5506.26202" targetFramework="net4" />
<package id="Antlr" version="3.5.0.2" targetFramework="net462" />
<package id="bootstrap" version="4.1.1" targetFramework="net462" />
<package id="BuildWebCompiler" version="1.11.375" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net462" />
<package id="FontAwesome" version="4.7.0" targetFramework="net462" />
<package id="jQuery" version="3.3.1" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="2.2.6" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
<package id="popper.js" version="1.14.3" targetFramework="net462" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net462" />
<package id="StackExchange.Redis.StrongName" version="1.2.1" targetFramework="net462" />
<package id="WebGrease" version="1.6.0" targetFramework="net462" />
</packages>
MP-TAB/Content/fonts.css
+12
View File
@@ -9,4 +9,16 @@
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff') format('woff');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url('RobotoCondensed.woff') format('woff');
}
MP-TAB/Content/fonts.less
+15 -1
View File
@@ -10,4 +10,18 @@
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff') format('woff');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url('RobotoCondensed.woff') format('woff');
}
MP-TAB/Content/fonts.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff') format('woff');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('RobotoCondensed.woff') format('woff');}
MP-TAB/Web.config
+1 -1
View File
@@ -77,7 +77,7 @@
<add key="user" value="Mobile" />
<add key="cookieDayExpire" value="3650" />
<add key="safePages" value="Test#regNewDevice" />
<add key="EmbedQRead" value="false" />
<add key="EmbedQRead" value="true" />
<add key="forceSecurePages" value="regNewDevice" />
<!--conf commenti e ricalcoli-->
<add key="idxTipoCommento" value="999" />