From 5384fef3100d7a263425363688bcdc55aab48d73 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 1 Mar 2018 14:09:36 +0100 Subject: [PATCH] Pulizia e test x cercare di risolvere js che si inchiodano a vicenda... --- MP-Tablet/About.aspx | 2 +- MP-Tablet/App_Start/BundleConfig.cs | 10 +- MP-Tablet/App_Start/RouteConfig.cs | 25 +- MP-Tablet/Bundle.config | 11 +- MP-Tablet/Content/dichMan.css | 218 +++--------------- MP-Tablet/Content/fonts.less | 2 +- MP-Tablet/MP-Tablet.csproj | 28 ++- MP-Tablet/Test.aspx | 48 ++-- MP-Tablet/Test.aspx.designer.cs | 9 - MP-Tablet/Web.config | 1 + MP-Tablet/WebMasterPages/Bootstrap.Master | 4 +- .../WebMasterPages/BootstrapNoUpdPnl.Master | 86 +++++++ .../BootstrapNoUpdPnl.Master.cs | 46 ++++ .../BootstrapNoUpdPnl.Master.designer.cs | 132 +++++++++++ .../WebUserControls/mod_enrollByAuthKey.ascx | 7 +- MP-Tablet/WebUserControls/mod_title.ascx.cs | 10 +- MP-Tablet/packages.config | 1 - 17 files changed, 378 insertions(+), 262 deletions(-) create mode 100644 MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master create mode 100644 MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.cs create mode 100644 MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs diff --git a/MP-Tablet/About.aspx b/MP-Tablet/About.aspx index 74b57885..208ca6c5 100644 --- a/MP-Tablet/About.aspx +++ b/MP-Tablet/About.aspx @@ -1,7 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="MoonProTablet.About" %> -
+

Module: <%: SteamWare.memLayer.ML.confReadString("CodModulo") %>

.net framework: <%: runtimeImg %>

Main Assembly: <%: mainAssembly %>

diff --git a/MP-Tablet/App_Start/BundleConfig.cs b/MP-Tablet/App_Start/BundleConfig.cs index d7b69046..185205d7 100644 --- a/MP-Tablet/App_Start/BundleConfig.cs +++ b/MP-Tablet/App_Start/BundleConfig.cs @@ -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")); diff --git a/MP-Tablet/App_Start/RouteConfig.cs b/MP-Tablet/App_Start/RouteConfig.cs index 01bf30c4..ab570b91 100644 --- a/MP-Tablet/App_Start/RouteConfig.cs +++ b/MP-Tablet/App_Start/RouteConfig.cs @@ -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 } + } } diff --git a/MP-Tablet/Bundle.config b/MP-Tablet/Bundle.config index 6aea9b13..f5713572 100644 --- a/MP-Tablet/Bundle.config +++ b/MP-Tablet/Bundle.config @@ -1,12 +1,11 @@  - - - - - - + + + + + diff --git a/MP-Tablet/Content/dichMan.css b/MP-Tablet/Content/dichMan.css index 30f0ef48..6784bc98 100644 --- a/MP-Tablet/Content/dichMan.css +++ b/MP-Tablet/Content/dichMan.css @@ -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; } } \ No newline at end of file diff --git a/MP-Tablet/Content/fonts.less b/MP-Tablet/Content/fonts.less index 8f157b2a..5e0cc8cf 100644 --- a/MP-Tablet/Content/fonts.less +++ b/MP-Tablet/Content/fonts.less @@ -10,4 +10,4 @@ font-style: normal; font-weight: 300; src: url('OpenSansCondensed.woff') format('woff'); -} +} \ No newline at end of file diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 8fca00ca..c331adb2 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -12,7 +12,7 @@ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - MP-Tablet + MoonProTablet MP-Tablet v4.6.2 true @@ -67,10 +67,6 @@ false - - ..\packages\AjaxMin.5.14.5506.26202\lib\net40\AjaxMin.dll - True - False ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll @@ -150,6 +146,12 @@ + + dichMan.less + + + dichMan.css + @@ -158,17 +160,11 @@ baseStyle.css - - dichMan.less - - - dichMan.less - fonts.less - fonts.less + fonts.css @@ -470,6 +466,7 @@ Web.config + @@ -594,6 +591,13 @@ Bootstrap.Master + + BootstrapNoUpdPnl.Master + ASPXCodeBehind + + + BootstrapNoUpdPnl.Master + mod_commenti.ascx ASPXCodeBehind diff --git a/MP-Tablet/Test.aspx b/MP-Tablet/Test.aspx index 10c69b27..f7db21c5 100644 --- a/MP-Tablet/Test.aspx +++ b/MP-Tablet/Test.aspx @@ -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" %> - - - - - - - - -
-
- ...more info - -
- Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota). -
- - - -
- Lorem ipsum dolor text.... -
+ + + + + +
+
+
+
+
+
+
+
+ ...more info +
+ Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
- - - + +
+ Lorem ipsum dolor text.... +
+
+ diff --git a/MP-Tablet/Test.aspx.designer.cs b/MP-Tablet/Test.aspx.designer.cs index 3a575c18..cc702a95 100644 --- a/MP-Tablet/Test.aspx.designer.cs +++ b/MP-Tablet/Test.aspx.designer.cs @@ -11,14 +11,5 @@ namespace MoonProTablet { public partial class Test { - - /// - /// Controllo form1. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; } } diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index f61916db..d21f5953 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -71,6 +71,7 @@ + diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master b/MP-Tablet/WebMasterPages/Bootstrap.Master index 4295ff60..03c81dd0 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master @@ -11,11 +11,11 @@ - + - <%: Page.Title %> - CMS_SC + <%: Page.Title %> - MPTAB <%: Scripts.Render("~/bundles/modernizr") %> diff --git a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master new file mode 100644 index 00000000..3d867e4c --- /dev/null +++ b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master @@ -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" %> + + + + + + + + + + + + <%: Page.Title %> - CMS_SC + + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + + + + + + + + + +
+ + + <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%> + <%--Framework Scripts--%> + + + + + + + + + + + <%--Site Scripts--%> + + + + + + + + + +
+ +
+

hello world!

+ Area main content da customizzare +
+ +
+ + + +
+ + +
+ MPTAB - + v.<%: currVersion.ToString() %> | <%: DateTime.Now %>
+
+ <%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> +
+
+ Powered by Steamware s.r.l. - © 2007-<%: DateTime.Now.Year %>
+
+ + +
+ + + <%: Scripts.Render("~/bundles/jSteamware") %> + + + diff --git a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.cs b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.cs new file mode 100644 index 00000000..139eb2cc --- /dev/null +++ b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.cs @@ -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(); + } + } + /// + /// Versione corrente sw + /// + public Version currVersion + { + get + { + return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + } + } + /// + /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada + /// + private void setTimer() + { + Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms"); + } + protected void Timer1_Tick(object sender, EventArgs e) + { + updateLabels(); + } + private void updateLabels() + { + } + } +} \ No newline at end of file diff --git a/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs new file mode 100644 index 00000000..b4c37f09 --- /dev/null +++ b/MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.designer.cs @@ -0,0 +1,132 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace WebMasterPages { + + + public partial class BootstrapNoUpdPnl { + + /// + /// Controllo PlaceHolder1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + + /// + /// Controllo BundleReference1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// Controllo BundleReference2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// Controllo HeadContent. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + + /// + /// Controllo form1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// Controllo ScriptManager1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.ScriptManager ScriptManager1; + + /// + /// Controllo uppNavbar. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel uppNavbar; + + /// + /// Controllo mod_title. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_title mod_title; + + /// + /// Controllo FeaturedContent. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; + + /// + /// Controllo MainContent. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + + /// + /// Controllo uppFooter. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel uppFooter; + + /// + /// Controllo Timer1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer Timer1; + + /// + /// Controllo PlaceHolder2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2; + } +} diff --git a/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx b/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx index 2b71f80b..e7e7552c 100644 --- a/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx +++ b/MP-Tablet/WebUserControls/mod_enrollByAuthKey.ascx @@ -30,14 +30,11 @@ OnClick="btnAnnulla_Click" />
- ...more info - + ...more info
Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
- - Collapsible - +
Lorem ipsum dolor text....
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs index b9cb5f6a..a94d4cc7 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs @@ -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 /// /// public string checkPage(object navUrl) - { + { string answ = ""; if (navUrl.ToString().Replace(".aspx", "").Replace("~/", "") == titolo.Replace(".aspx", "")) { diff --git a/MP-Tablet/packages.config b/MP-Tablet/packages.config index 23926025..243d35d6 100644 --- a/MP-Tablet/packages.config +++ b/MP-Tablet/packages.config @@ -1,6 +1,5 @@  -