From e1a8aead0b35e5d2172005887327634c40685ba5 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 14 Feb 2018 14:16:39 +0100 Subject: [PATCH] update master x spsotare componenti testata... --- CMS_SC/Bootstrap.Master | 203 +++++++++--------- CMS_SC/BootstrapNoUpdPnl.Master | 181 ++++++++-------- CMS_SC/BootstrapNoUpdPnl.Master.designer.cs | 113 +++++----- CMS_SC/WebUserControls/mod_testata.ascx | 180 ++++++++-------- .../mod_testata.ascx.designer.cs | 18 -- 5 files changed, 333 insertions(+), 362 deletions(-) diff --git a/CMS_SC/Bootstrap.Master b/CMS_SC/Bootstrap.Master index fadb224..59fc9c4 100644 --- a/CMS_SC/Bootstrap.Master +++ b/CMS_SC/Bootstrap.Master @@ -5,118 +5,113 @@ - - - - - - - - <%: Page.Title %> - CMS_SC + + + + + + + + <%: Page.Title %> - CMS_SC - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + - - - - + + + + -
- <%--EnablePartialRendering="false"--%> - - - <%--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 -
- -
- - - - - -
- - - <%--
+ +
+ + + + <%: Scripts.Render("~/bundles/jSteamware") %> + diff --git a/CMS_SC/BootstrapNoUpdPnl.Master b/CMS_SC/BootstrapNoUpdPnl.Master index c24e6df..79d3011 100644 --- a/CMS_SC/BootstrapNoUpdPnl.Master +++ b/CMS_SC/BootstrapNoUpdPnl.Master @@ -5,108 +5,103 @@ - - - - - - - - <%: Page.Title %> - CMS_SC + + + + + + + + <%: Page.Title %> - CMS_SC - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - + + <%: 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 -
- + + + + <%--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
- - - -
- - - +
+ + + + + + + <%: Scripts.Render("~/bundles/jSteamware") %> + diff --git a/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs b/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs index 08b47ee..8db03da 100644 --- a/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs +++ b/CMS_SC/BootstrapNoUpdPnl.Master.designer.cs @@ -1,159 +1,158 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace CMS_SC -{ - - +namespace CMS_SC { + + public partial class BootstrapNoUpdPnl { /// - /// PlaceHolder1 control. + /// Controllo PlaceHolder1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// BundleReference1 control. + /// Controllo BundleReference1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// BundleReference2 control. + /// Controllo BundleReference2. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// HeadContent control. + /// Controllo HeadContent. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// form1 control. + /// Controllo form1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// ScriptManager1 control. + /// Controllo ScriptManager1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// uppNavbar control. + /// Controllo uppNavbar. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// mod_testata control. + /// Controllo mod_testata. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::CMS_SC.WebUserControls.mod_testata mod_testata; /// - /// FeaturedContent control. + /// Controllo FeaturedContent. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// MainContent control. + /// Controllo MainContent. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// uppFooter control. + /// Controllo uppFooter. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// Timer1 control. + /// Controllo Timer1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// lblVers control. + /// Controllo lblVers. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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.Label lblVers; /// - /// lblDateTime control. + /// Controllo lblDateTime. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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.Label lblDateTime; /// - /// updtRicerca control. + /// Controllo updtRicerca. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.UpdateProgress updtRicerca; /// - /// PlaceHolder2 control. + /// Controllo PlaceHolder2. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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/CMS_SC/WebUserControls/mod_testata.ascx b/CMS_SC/WebUserControls/mod_testata.ascx index cf99b1c..31d9f68 100644 --- a/CMS_SC/WebUserControls/mod_testata.ascx +++ b/CMS_SC/WebUserControls/mod_testata.ascx @@ -1,97 +1,97 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_testata" %> -<%if (false) - { %> - - -<%} %> -
- - - - -
-
-
+ +