diff --git a/MP-Admin/MP-Admin.csproj b/MP-Admin/MP-Admin.csproj index 42d809bb..021d3d34 100644 --- a/MP-Admin/MP-Admin.csproj +++ b/MP-Admin/MP-Admin.csproj @@ -203,6 +203,12 @@ + + fonts.less + + + fonts.css + @@ -267,6 +273,19 @@ + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/MP-Admin/WebMasterPages/MoonPro.master b/MP-Admin/WebMasterPages/MoonPro.master index a30b4c64..08a623f7 100644 --- a/MP-Admin/WebMasterPages/MoonPro.master +++ b/MP-Admin/WebMasterPages/MoonPro.master @@ -22,35 +22,26 @@ -
+
-
- - - - - -
-
+
-
- - - - - - - - -
+
+
+
+
-
- -
- - -
+
+
+ +
+
+
+
+ + +
diff --git a/MP-Admin/WebMasterPages/MoonPro.master.designer.cs b/MP-Admin/WebMasterPages/MoonPro.master.designer.cs index 56faaf26..6d5d9e5e 100644 --- a/MP-Admin/WebMasterPages/MoonPro.master.designer.cs +++ b/MP-Admin/WebMasterPages/MoonPro.master.designer.cs @@ -38,24 +38,6 @@ public partial class MoonPro { /// protected global::MoonPro_site.WebUserControls.mod_menuTop Mod_menuTop1; - /// - /// Controllo UpdatePanel2. - /// - /// - /// 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 UpdatePanel2; - - /// - /// Controllo Mod_menuSx1. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::mod_menuSx Mod_menuSx1; - /// /// Controllo UpdatePanel1. /// diff --git a/MP-Admin/WebUserControls/mod_menuTop.ascx b/MP-Admin/WebUserControls/mod_menuTop.ascx index 1fe699a6..f90285d6 100644 --- a/MP-Admin/WebUserControls/mod_menuTop.ascx +++ b/MP-Admin/WebUserControls/mod_menuTop.ascx @@ -1,28 +1,42 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="MoonPro_site.WebUserControls.mod_menuTop" - CodeBehind="mod_menuTop.ascx.cs" %> + CodeBehind="mod_menuTop.ascx.cs" %> <%-- Gestione resize --%> + -
 
- - - - - +
 
diff --git a/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs b/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs index e227f7de..7a455252 100644 --- a/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs +++ b/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs @@ -39,6 +39,15 @@ namespace MoonPro_site.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton btnUpdate; + /// + /// Controllo btnLogOut. + /// + /// + /// 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.LinkButton btnLogOut; + /// /// Controllo lastUpdate. /// @@ -49,13 +58,13 @@ namespace MoonPro_site.WebUserControls { protected global::System.Web.UI.WebControls.Label lastUpdate; /// - /// Controllo btnLogOut. + /// Controllo updtPage. /// /// /// 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.LinkButton btnLogOut; + protected global::System.Web.UI.UpdateProgress updtPage; /// /// Controllo hlGuida.