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

Pulizia e test x cercare di risolvere js che si inchiodano a vicenda...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-01 14:09:36 +01:00
parent c7033bb07f
commit 5384fef310
17 changed files with 378 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/About.aspx
+1 -1
View File
@@ -1,7 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="MoonProTablet.About" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="ui-grid-solo" style="color: white; text-align: center;">
<div class="content">
<h1>Module: <%: SteamWare.memLayer.ML.confReadString("CodModulo") %></h1>
<h3>.net framework: <%: runtimeImg %></h3>
<h3>Main Assembly: <%: mainAssembly %></h3>
MP-Tablet/App_Start/BundleConfig.cs
+5 -5
View File
@@ -27,16 +27,16 @@ namespace MoonProTablet
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
//bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include(
// "~/Scripts/jquery-ui-i18n.min.js"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
//bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include(
// "~/Scripts/jquery-ui-i18n.min.js"));
// aggiungo bundle dinamico x less --> css
//bundles.Add(new DynamicFolderBundle("less", "*.less"));
MP-Tablet/App_Start/RouteConfig.cs
+16 -9
View File
@@ -3,16 +3,23 @@ using System.Web.Routing;
namespace MoonProTablet
{
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);
// tolto x problemi compatibilità Chrome/Firefox (va solo con explorer...)
routes.EnableFriendlyUrls();
}
var settings = new FriendlyUrlSettings();
settings.AutoRedirectMode = RedirectMode.Temporary;
routes.EnableFriendlyUrls(settings);
#if false
//var settings = new FriendlyUrlSettings();
//settings.AutoRedirectMode = RedirectMode.Permanent;
//routes.EnableFriendlyUrls(settings);
// tolto x problemi compatibilità Chrome/Firefox (va solo con explorer...)
routes.EnableFriendlyUrls();
#endif
}
}
}
MP-Tablet/Bundle.config
+5 -6
View File
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<bundles version="1.0">
<styleBundle path="~/Content/css">
<include path="~/Content/bootstrap.css" />
<include path="~/Content/jquery.mobile-1.3.2.min.css" />
<include path="~/Content/font-awesome.css" />
<include path="~/Content/fonts.css" />
<include path="~/Content/dichMan.css" />
<include path="~/Content/baseStyle.css" />
<include path="~/Content/bootstrap.min.css" />
<include path="~/Content/font-awesome.min.css" />
<include path="~/Content/fonts.min.css" />
<include path="~/Content/dichMan.min.css" />
<include path="~/Content/baseStyle.min.css" />
</styleBundle>
<styleBundle path="~/Content/themes/base/css">
<!--<include path="~/Content/themes/base/jquery.ui.all.css" />-->
MP-Tablet/Content/dichMan.css
+35 -183
View File
@@ -1,197 +1,49 @@
/* First breakpoint is 460px. 3 column layout. Tiles 150x150 pixels at the breakpoint. */
@media all and (min-width: 460px) {
.elDich .ui-content {
padding: 9px;
}
.elDich .ui-listview .ui-li.ui-btn {
float: left;
width: 30.9333%;
/* 33.3333% incl. 2 x 1.2% margin */
height: 132px;
margin: 9px 1.2%;
border-width: 0;
/* The 1px border would break the layout so we set it on .ui-btn-inner instead. */
}
/* If you don't want a border at all, just set "border: none;" here to negate the semi white top border */
.elDich .ui-listview .ui-li.ui-btn-inner {
border: inherit;
border-width: 1px;
margin: -1px;
}
.elDich .ui-listview .ui-btn-inner,
.elDich .ui-listview .ui-btn-text,
.elDich .ui-listview .ui-link-inherit,
.elDich .ui-listview .ui-li-thumb {
width: 100%;
height: 100%;
display: block;
overflow: hidden;
}
.elDich .ui-listview .ui-link-inherit {
padding: 0 !important;
position: relative;
}
/* Inherit the border-radius from the UL that has class .ui-corner-all in case of an inset listview. */
.elDich .ui-listview .ui-li,
.elDich .ui-listview .ui-btn-text,
.elDich .ui-listview .ui-link-inherit,
.elDich .ui-listview .ui-li-thumb {
-webkit-border-radius: inherit;
border-radius: inherit;
}
.elDich .ui-listview .ui-li-thumb {
height: auto;
/* To keep aspect ratio. */
max-width: 100%;
max-height: none;
margin: 0;
left: 0;
z-index: -1;
}
/* Hide the icon */
.elDich .ui-listview .ui-icon {
display: none;
}
/* Make text wrap. */
.elDich .ui-listview .ui-li-heading,
.elDich .ui-listview .ui-li-desc {
font-family: 'Open Sans Condensed', sans-serif;
white-space: normal;
overflow: visible;
position: absolute;
left: 0;
right: 0;
}
/* Text position */
.elDich .ui-listview .ui-li-heading {
margin: 0;
padding: 20px;
bottom: 40%;
}
.elDich .ui-listview .ui-li-desc {
font-family: 'Open Sans', sans-serif;
margin: 0;
padding: 0 20px;
min-height: 40%;
bottom: 0;
line-height: 1.5;
}
/* Semi transparent background and different position if there is a thumb */
.ui-li-dich {
background: #111;
background: rgba(0, 0, 0, 0.8);
-webkit-background-clip: padding;
background-clip: padding-box;
}
/*
.ui-listview .ui-li-has-thumb .ui-li-heading
{
padding: 10px;
bottom: 20%;
}
*/
.ui-li-dich {
padding: 0 10px;
min-height: 20%;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: inherit;
border-bottom-right-radius: inherit;
}
/* ui-li-aside has class .ui-li-desc as well so we have to override some things. */
.elDich .ui-listview .ui-li-desc.ui-li-aside {
padding: 2px 10px;
width: auto;
min-height: 0;
top: 0;
left: auto;
bottom: auto;
/* Custom styling. */
color: #c0c0c0;
background: #990099;
background: rgba(153, 0, 153, 0.85);
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
}
/* If you want to add shadow, don't kill the focus style. */
.elDich .ui-listview .ui-btn:not(.ui-focus) {
-moz-box-shadow: 0px 0px 9px #111;
-webkit-box-shadow: 0px 0px 9px #111;
box-shadow: 0px 0px 9px #111;
}
/* Images mask the hover bg color so we give desktop users feedback by applying the focus style on hover as well. */
.elDich .ui-listview .ui-btn:hover {
-moz-box-shadow: 0px 0px 12px #387bbe;
-webkit-box-shadow: 0px 0px 12px #387bbe;
box-shadow: 0px 0px 12px #387bbe;
}
/* Animate focus and hover style, and resizing. */
.elDich .ui-listview .ui-btn {
-webkit-transition: all 500ms ease;
-moz-transition: all 500ms ease;
-o-transition: all 500ms ease;
-ms-transition: all 500ms ease;
transition: all 500ms ease;
/* Gestione blocchi dichiarazione fermate */
.labelBottom {
background: #111;
background: rgba(0, 0, 0, 0.8);
-webkit-background-clip: padding-box;
background-clip: padding-box;
padding: 0 0.4em;
min-height: 30%;
width: 100%;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: inherit;
border-bottom-right-radius: inherit;
line-height: 1em;
}
.dichBlock {
font-family: 'Open Sans Condensed', sans-serif;
color: #FFF;
background-image: linear-gradient(#111, #000);
box-shadow: 5px 5px 10px 0 rgba(150, 150, 150, 0.2), 10px 10px 10px 0 rgba(200, 200, 200, 0.39);
width: 6em;
}
/* First breakpoint is 460px. 3 column layout. Tiles 150x150 pixels at the breakpoint. */
@media all and (max-width: 600px) {
.dichBlock {
font-size: 1em;
}
}
/* Second breakpoint. 4 column layout. Tiles will be 150x150 pixels again at the breakpoint. */
@media all and (min-width: 600px) {
.elDich .ui-content {
padding: 10px;
}
/* Set a max-width for the last breakpoint to prevent too much stretching on large screens.
By setting the max-width equal to the breakpoint width minus padding we keep square tiles. */
.elDich .ui-listview {
max-width: 800px;
margin: 0 auto;
}
/* Because of the 1000px max-width the width will always be 230px (and margin left/right 10px),
but we stick to percentage values for demo purposes. */
.elDich .ui-listview .ui-li.ui-btn {
width: 23%;
height: 148px;
margin: 10px 1%;
.dichBlock {
font-size: 1em;
width: 7em;
}
}
/* Second breakpoint. 5 column layout. Tiles will be 156x156 pixels again at the breakpoint. */
@media all and (min-width: 800px) {
.elDich .ui-content {
padding: 10px;
}
/* Set a max-width for the last breakpoint to prevent too much stretching on large screens.
By setting the max-width equal to the breakpoint width minus padding we keep square tiles. */
.elDich .ui-listview {
max-width: 1000px;
margin: 0 auto;
}
/* Because of the 1000px max-width the width will always be 230px (and margin left/right 10px),
but we stick to percentage values for demo purposes. */
.elDich .ui-listview .ui-li.ui-btn {
width: 18%;
height: 156px;
margin: 10px 1%;
.dichBlock {
font-size: 1.4em;
width: 7em;
}
}
/* Second breakpoint. 6 column layout. Tiles will be 156x156 pixels again at the breakpoint. */
@media all and (min-width: 1100px) {
.elDich .ui-content {
padding: 10px;
}
/* Set a max-width for the last breakpoint to prevent too much stretching on large screens.
By setting the max-width equal to the breakpoint width minus padding we keep square tiles. */
.elDich .ui-listview {
max-width: 1200px;
margin: 0 auto;
}
/* Because of the 1000px max-width the width will always be 230px (and margin left/right 10px),
but we stick to percentage values for demo purposes. */
.elDich .ui-listview .ui-li.ui-btn {
width: 14.5%;
height: 160px;
margin: 10px 1%;
.dichBlock {
font-size: 1.5em;
width: 7em;
}
}
MP-Tablet/Content/fonts.less
+1 -1
View File
@@ -10,4 +10,4 @@
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
}
MP-Tablet/MP-Tablet.csproj
+16 -12
View File
@@ -12,7 +12,7 @@
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MP-Tablet</RootNamespace>
<RootNamespace>MoonProTablet</RootNamespace>
<AssemblyName>MP-Tablet</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
@@ -67,10 +67,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AjaxMin, Version=5.14.5506.26196, Culture=neutral, PublicKeyToken=21ef50ce11b5d80f, processorArchitecture=MSIL">
<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">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
@@ -150,6 +146,12 @@
<Content Include="Content\bootstrap-reboot.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\dichMan.css">
<DependentUpon>dichMan.less</DependentUpon>
</Content>
<Content Include="Content\dichMan.min.css">
<DependentUpon>dichMan.css</DependentUpon>
</Content>
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\baseStyle.css">
@@ -158,17 +160,11 @@
<Content Include="Content\baseStyle.min.css">
<DependentUpon>baseStyle.css</DependentUpon>
</Content>
<Content Include="Content\dichMan.css">
<DependentUpon>dichMan.less</DependentUpon>
</Content>
<Content Include="Content\dichMan.min.css">
<DependentUpon>dichMan.less</DependentUpon>
</Content>
<Content Include="Content\fonts.css">
<DependentUpon>fonts.less</DependentUpon>
</Content>
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.less</DependentUpon>
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="Content\themes\base\accordion.css" />
<Content Include="Content\themes\base\all.css" />
@@ -470,6 +466,7 @@
<DependentUpon>Web.config</DependentUpon>
</None>
<Content Include="WebMasterPages\Bootstrap.Master" />
<Content Include="WebMasterPages\BootstrapNoUpdPnl.Master" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersGen\MoonPro.cs">
@@ -594,6 +591,13 @@
<Compile Include="WebMasterPages\Bootstrap.Master.designer.cs">
<DependentUpon>Bootstrap.Master</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\BootstrapNoUpdPnl.Master.cs">
<DependentUpon>BootstrapNoUpdPnl.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebMasterPages\BootstrapNoUpdPnl.Master.designer.cs">
<DependentUpon>BootstrapNoUpdPnl.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_commenti.ascx.cs">
<DependentUpon>mod_commenti.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
MP-Tablet/Test.aspx
+23 -25
View File
@@ -1,27 +1,25 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="MoonProTablet.Test" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/BootstrapNoUpdPnl.Master" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="MoonProTablet.Test" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
<a href="#moreInfo" class="btn btn-secondary btn-sm" data-toggle="collapse">...more info
</a>
<div id="moreInfo" class="collapse">
Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
</div>
<button data-toggle="collapse" data-target="#demo">Collapsible</button>
<div id="demo" class="collapse">
Lorem ipsum dolor text....
</div>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid my-3" role="main">
<br />
<br />
<br />
<br />
<br />
<br />
<br />
<a href="#moreInfo" class="btn btn-secondary btn-sm" data-toggle="collapse">...more info</a>
<div id="moreInfo" class="collapse">
Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
</div>
</form>
</body>
</html>
<button data-toggle="collapse" data-target="#demo">Collapsible</button>
<div id="demo" class="collapse">
Lorem ipsum dolor text....
</div>
</div>
</asp:Content>
MP-Tablet/Test.aspx.designer.cs
Generated
-9
View File
@@ -11,14 +11,5 @@ namespace MoonProTablet {
public partial class Test {
/// <summary>
/// Controllo form1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
MP-Tablet/Web.config
+1
View File
@@ -71,6 +71,7 @@
<add key="dominio" value="Donati" />
<add key="user" value="Mobile" />
<add key="cookieDayExpire" value="3650" />
<add key="safePages" value="Test#regNewDevice" />
<!--conf commenti e ricalcoli-->
<add key="idxTipoCommento" value="999" />
<add key="commEnableEditDel" value="true" />
MP-Tablet/WebMasterPages/Bootstrap.Master
+2 -2
View File
@@ -11,11 +11,11 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="CMS_SC site" />
<meta name="description" content="MP Tablet" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - CMS_SC</title>
<title><%: Page.Title %> - MPTAB</title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master
+86
View File
@@ -0,0 +1,86 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="BootstrapNoUpdPnl.master.cs" Inherits="WebMasterPages.BootstrapNoUpdPnl" %>
<%@ Register Src="~/WebUserControls/mod_title.ascx" TagPrefix="uc1" TagName="mod_title" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head runat="server">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="CMS_SC site" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - CMS_SC</title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
</asp:ContentPlaceHolder>
</head>
<body>
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<asp:UpdatePanel ID="uppNavbar" runat="server">
<ContentTemplate>
<uc1:mod_title runat="server" id="mod_title" />
</ContentTemplate>
</asp:UpdatePanel>
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent">
</asp:ContentPlaceHolder>
<div style="background-color: white;">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
Area main content da customizzare
</div>
</asp:ContentPlaceHolder>
</div>
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<footer class="navbar fixed-bottom navbar-light bg-light text-dark p-0 px-2 m-0" style="font-size: 1.2em; height: 1.5em;">
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<div class="d-flex justify-content-start pl-3 text-left">
<strong>MPTAB</strong> -
v.<%: currVersion.ToString() %>&nbsp;|&nbsp;<%: DateTime.Now %></div>
<div class="d-flex justify-content-center text-center">
<%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %>
</div>
<div class="d-flex justify-content-end pr-3 text-right">
Powered by&nbsp;<strong>Steamware</strong>&nbsp;s.r.l. - &copy; 2007-<%: DateTime.Now.Year %></div>
</footer>
</ContentTemplate>
</asp:UpdatePanel>
</form>
<script src="Scripts/bootstrap.min.js"></script>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
</body>
</html>
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.cs
+46
View File
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebMasterPages
{
public partial class BootstrapNoUpdPnl : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
setTimer();
updateLabels();
}
}
/// <summary>
/// Versione corrente sw
/// </summary>
public Version currVersion
{
get
{
return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
}
}
/// <summary>
/// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
/// </summary>
private void setTimer()
{
Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
}
protected void Timer1_Tick(object sender, EventArgs e)
{
updateLabels();
}
private void updateLabels()
{
}
}
}
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs
Generated
+132
View File
@@ -0,0 +1,132 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace WebMasterPages {
public partial class BootstrapNoUpdPnl {
/// <summary>
/// Controllo PlaceHolder1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// Controllo BundleReference1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// Controllo BundleReference2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// Controllo HeadContent.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent;
/// <summary>
/// Controllo form1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// Controllo ScriptManager1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.ScriptManager ScriptManager1;
/// <summary>
/// Controllo uppNavbar.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel uppNavbar;
/// <summary>
/// Controllo mod_title.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_title mod_title;
/// <summary>
/// Controllo FeaturedContent.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent;
/// <summary>
/// Controllo MainContent.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent;
/// <summary>
/// Controllo uppFooter.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel uppFooter;
/// <summary>
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer Timer1;
/// <summary>
/// Controllo PlaceHolder2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2;
}
}
MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx
+2 -5
View File
@@ -30,14 +30,11 @@
OnClick="btnAnnulla_Click" />
</div>
<div class="col-12 my-4">
<a href="#moreInfo" class="btn btn-secondary btn-sm" data-toggle="collapse">...more info
</a>
<a href="#moreInfo" class="btn btn-secondary btn-sm" data-toggle="collapse">...more info</a>
<div id="moreInfo" class="collapse">
Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
</div>
<a data-toggle="collapse" data-target="#demo">Collapsible</a>
<button data-toggle="collapse" data-target="#demo">Collapsible</button>
<div id="demo" class="collapse">
Lorem ipsum dolor text....
</div>
MP-Tablet/WebUserControls/mod_title.ascx.cs
+7 -3
View File
@@ -76,7 +76,7 @@ namespace MoonProTablet.WebUserControls
char[] delimiter = delimStr.ToCharArray();
string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter);
int n = finalUrl.Length;
string _paginaCorrente = finalUrl[n - 1].ToString();
string _paginaCorrente = finalUrl[n - 1].ToString().Replace(".aspx", "");
try
{
HttpCookie cookie = Request.Cookies[memLayer.ML.CRS("cookieName")];
@@ -84,7 +84,11 @@ namespace MoonProTablet.WebUserControls
{
// rimando pagina x registrazione devices
logger.lg.scriviLog("Cookie non valido / non trovato", tipoLog.STARTUP);
Response.Redirect("~/regNewDevice.aspx");
// solo se NON sono alla pagina di registrazione o altre SAFE pages......
if (memLayer.ML.CRS("safePages").ToLower().IndexOf(_paginaCorrente.ToLower()) < 0)
{
Response.Redirect("~/regNewDevice");
}
}
else
{
@@ -172,7 +176,7 @@ namespace MoonProTablet.WebUserControls
/// <param name="navUrl"></param>
/// <returns></returns>
public string checkPage(object navUrl)
{
{
string answ = "";
if (navUrl.ToString().Replace(".aspx", "").Replace("~/", "") == titolo.Replace(".aspx", ""))
{
MP-Tablet/packages.config
-1
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AjaxMin" version="5.14.5506.26202" targetFramework="net45" />
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
<package id="AspNet.ScriptManager.bootstrap" version="4.0.0" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.3.1" targetFramework="net462" />