diff --git a/GMW/Empty.Master b/GMW/Empty.Master index b4b30548..5da9e70b 100644 --- a/GMW/Empty.Master +++ b/GMW/Empty.Master @@ -3,21 +3,65 @@ + - - + + + + + + + + GMW - <%: Page.Title %> + + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/bootSwitch") %> + + <%----%> + + + +
-
+ + + <%--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 -
+

hello world!

+ Area main content da customizzare
+ + + <%: Scripts.Render("~/bundles/jSteamware") %> + diff --git a/GMW/Empty.Master.designer.cs b/GMW/Empty.Master.designer.cs index 15b9e427..5d748928 100644 --- a/GMW/Empty.Master.designer.cs +++ b/GMW/Empty.Master.designer.cs @@ -13,13 +13,40 @@ namespace GMW { public partial class Empty { /// - /// head control. + /// PlaceHolder1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder head; + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// ContentPlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; /// /// form1 control. @@ -30,6 +57,15 @@ namespace GMW { /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; + /// + /// ScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.ScriptManager ScriptManager1; + /// /// Main control. /// @@ -38,5 +74,14 @@ namespace GMW { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder Main; + + /// + /// PlaceHolder2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2; } } diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 4db0eb54..241ab49b 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -497,7 +497,6 @@ - @@ -574,7 +573,6 @@ Designer - Web.config @@ -1054,13 +1052,6 @@ SearchMag.aspx - - Site.Mobile.Master - ASPXCodeBehind - - - Site.Mobile.Master - spostaDataMatrix.aspx ASPXCodeBehind @@ -1124,13 +1115,6 @@ UpdateVoc.aspx - - ViewSwitcher.ascx - ASPXCodeBehind - - - ViewSwitcher.ascx - vocabolario.aspx ASPXCodeBehind @@ -1138,13 +1122,6 @@ vocabolario.aspx - - Ajax.master - ASPXCodeBehind - - - Ajax.master - AjaxSearch.master ASPXCodeBehind @@ -1152,13 +1129,6 @@ AjaxSearch.master - - AjaxSimple.master - ASPXCodeBehind - - - AjaxSimple.master - AjaxSimpleFull.Master ASPXCodeBehind @@ -2207,9 +2177,7 @@ - - diff --git a/GMW/Site.Mobile.Master b/GMW/Site.Mobile.Master deleted file mode 100644 index 37ae9770..00000000 --- a/GMW/Site.Mobile.Master +++ /dev/null @@ -1,23 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.Mobile.master.cs" Inherits="GMW.Site_Mobile" %> -<%@ Register Src="~/ViewSwitcher.ascx" TagPrefix="friendlyUrls" TagName="ViewSwitcher" %> - - - - - - - - - -
-
-

Mobile Master Page

- -
- -
- -
-
- - diff --git a/GMW/Site.Mobile.Master.cs b/GMW/Site.Mobile.Master.cs deleted file mode 100644 index cb949e70..00000000 --- a/GMW/Site.Mobile.Master.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace GMW -{ - public partial class Site_Mobile : System.Web.UI.MasterPage - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/GMW/Site.Mobile.Master.designer.cs b/GMW/Site.Mobile.Master.designer.cs deleted file mode 100644 index b4743278..00000000 --- a/GMW/Site.Mobile.Master.designer.cs +++ /dev/null @@ -1,51 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace GMW { - - - public partial class Site_Mobile { - - /// - /// HeadContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// FeaturedContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; - - /// - /// MainContent control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; - } -} diff --git a/GMW/ViewSwitcher.ascx b/GMW/ViewSwitcher.ascx deleted file mode 100644 index d7afa6d3..00000000 --- a/GMW/ViewSwitcher.ascx +++ /dev/null @@ -1,4 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ViewSwitcher.ascx.cs" Inherits="GMW.ViewSwitcher" %> -
- <%: CurrentView %> view | Switch to <%: AlternateView %> -
\ No newline at end of file diff --git a/GMW/ViewSwitcher.ascx.cs b/GMW/ViewSwitcher.ascx.cs deleted file mode 100644 index c5c60eab..00000000 --- a/GMW/ViewSwitcher.ascx.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Routing; -using System.Web.UI; -using System.Web.UI.WebControls; -using Microsoft.AspNet.FriendlyUrls.Resolvers; - -namespace GMW -{ - public partial class ViewSwitcher : System.Web.UI.UserControl - { - protected string CurrentView { get; private set; } - - protected string AlternateView { get; private set; } - - protected string SwitchUrl { get; private set; } - - protected void Page_Load(object sender, EventArgs e) - { - // Determine current view - var isMobile = WebFormsFriendlyUrlResolver.IsMobileView(new HttpContextWrapper(Context)); - CurrentView = isMobile ? "Mobile" : "Desktop"; - - // Determine alternate view - AlternateView = isMobile ? "Desktop" : "Mobile"; - - // Create switch URL from the route, e.g. ~/__FriendlyUrls_SwitchView/Mobile?ReturnUrl=/Page - var switchViewRouteName = "AspNet.FriendlyUrls.SwitchView"; - var switchViewRoute = RouteTable.Routes[switchViewRouteName]; - if (switchViewRoute == null) - { - // Friendly URLs is not enabled or the name of the switch view route is out of sync - this.Visible = false; - return; - } - var url = GetRouteUrl(switchViewRouteName, new { view = AlternateView, __FriendlyUrls_SwitchViews = true }); - url += "?ReturnUrl=" + HttpUtility.UrlEncode(Request.RawUrl); - SwitchUrl = url; - } - } -} \ No newline at end of file diff --git a/GMW/ViewSwitcher.ascx.designer.cs b/GMW/ViewSwitcher.ascx.designer.cs deleted file mode 100644 index 56c8ec63..00000000 --- a/GMW/ViewSwitcher.ascx.designer.cs +++ /dev/null @@ -1,15 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace GMW { - - - public partial class ViewSwitcher { - } -} diff --git a/GMW/WebMasterPages/Ajax.master b/GMW/WebMasterPages/Ajax.master deleted file mode 100644 index 31d2d0f9..00000000 --- a/GMW/WebMasterPages/Ajax.master +++ /dev/null @@ -1,70 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="True" Inherits="Ajax" CodeBehind="Ajax.master.cs" %> - -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -<%@ Register Src="~/WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> -<%@ Register Src="~/WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %> -<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" - TagPrefix="uc5" %> - - - - - - - - - -
- - -
- - - - - - - - - - - -
-
- - - - - -
-
- - - - - - -
- - -
- - - - -
- - -
-
- - -
-
- -
-
-
- - diff --git a/GMW/WebMasterPages/Ajax.master.cs b/GMW/WebMasterPages/Ajax.master.cs deleted file mode 100644 index ff0d2480..00000000 --- a/GMW/WebMasterPages/Ajax.master.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -public partial class Ajax : System.Web.UI.MasterPage -{ - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); - } - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - Mod_menuTop1.eh_toggleMenuSx += new EventHandler(Mod_menuTop1_eh_toggleMenuSx); - Mod_menuTop1.eh_reqUpdateMenu += new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); - } - - void Mod_menuTop1_eh_reqUpdateMenu(object sender, EventArgs e) - { - // chiamo update del menu sx... - Mod_menuSx1.forzaUpdateMenu(); - } - - void Mod_menuTop1_eh_toggleMenuSx(object sender, EventArgs e) - { - // cambio stato visualizzaizone menù laterale... - Mod_menuSx1.Visible = !Mod_menuSx1.Visible; - } - - protected override void OnUnload(EventArgs e) - { - base.OnUnload(e); - // svuoto tutti gli event handler inseriti... - Mod_menuTop1.eh_toggleMenuSx -= new EventHandler(Mod_menuTop1_eh_toggleMenuSx); - Mod_menuTop1.eh_reqUpdateMenu -= new EventHandler(Mod_menuTop1_eh_reqUpdateMenu); - } - /// - /// determina visibilità menù sx... - /// - public bool sxMenuVisible - { - get - { - return Mod_menuSx1.Visible; - } - set - { - Mod_menuSx1.Visible = value; - } - } -} diff --git a/GMW/WebMasterPages/Ajax.master.designer.cs b/GMW/WebMasterPages/Ajax.master.designer.cs deleted file mode 100644 index cee3e4ec..00000000 --- a/GMW/WebMasterPages/Ajax.master.designer.cs +++ /dev/null @@ -1,103 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - - -public partial class Ajax { - - /// - /// Head1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// sm control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.ScriptManager sm; - - /// - /// UpdatePanel1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel UpdatePanel1; - - /// - /// Mod_menuTop1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuTop Mod_menuTop1; - - /// - /// UpdatePanel2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel UpdatePanel2; - - /// - /// Mod_menuSx1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuSx Mod_menuSx1; - - /// - /// updPanelPagina control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel updPanelPagina; - - /// - /// ContentPlaceHolder1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; - - /// - /// Mod_menuBottom1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuBottom Mod_menuBottom1; -} diff --git a/GMW/WebMasterPages/AjaxSimple.master b/GMW/WebMasterPages/AjaxSimple.master deleted file mode 100644 index eaad95ce..00000000 --- a/GMW/WebMasterPages/AjaxSimple.master +++ /dev/null @@ -1,38 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="True" Inherits="AjaxSimple" CodeBehind="AjaxSimple.master.cs" %> - -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" - TagPrefix="uc1" %> - - - - Simplepage - - - - - -
- - -
- - - - - - - -
-
- - -
-
- -
-
-
- - diff --git a/GMW/WebMasterPages/AjaxSimple.master.cs b/GMW/WebMasterPages/AjaxSimple.master.cs deleted file mode 100644 index adf692f8..00000000 --- a/GMW/WebMasterPages/AjaxSimple.master.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Data; -using System.Configuration; -using System.Collections; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; -using SteamWare; - -public partial class AjaxSimple : System.Web.UI.MasterPage -{ - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); - } -} diff --git a/GMW/WebMasterPages/AjaxSimple.master.designer.cs b/GMW/WebMasterPages/AjaxSimple.master.designer.cs deleted file mode 100644 index 3e2625e0..00000000 --- a/GMW/WebMasterPages/AjaxSimple.master.designer.cs +++ /dev/null @@ -1,49 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - - -public partial class AjaxSimple { - - /// - /// form1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// ToolkitScriptManager1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.ScriptManager ToolkitScriptManager1; - - /// - /// ContentPlaceHolder1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1; - - /// - /// Mod_menuBottom1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_menuBottom Mod_menuBottom1; -} diff --git a/GMW/WebUserControls/mod_login.ascx b/GMW/WebUserControls/mod_login.ascx index 40f00a51..5708d1ba 100644 --- a/GMW/WebUserControls/mod_login.ascx +++ b/GMW/WebUserControls/mod_login.ascx @@ -1,12 +1,9 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_login" Codebehind="mod_login.ascx.cs" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_login" CodeBehind="mod_login.ascx.cs" %> - - - - -
- -
+

+ +

+
diff --git a/GMW/WebUserControls/mod_login.ascx.designer.cs b/GMW/WebUserControls/mod_login.ascx.designer.cs index bc8b7640..34fb57c9 100644 --- a/GMW/WebUserControls/mod_login.ascx.designer.cs +++ b/GMW/WebUserControls/mod_login.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GMW/WebUserControls/mod_unauthorized.ascx b/GMW/WebUserControls/mod_unauthorized.ascx index ea4c1343..3beb5bcf 100644 --- a/GMW/WebUserControls/mod_unauthorized.ascx +++ b/GMW/WebUserControls/mod_unauthorized.ascx @@ -1,16 +1,12 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_unauthorized" Codebehind="mod_unauthorized.ascx.cs" %> - - - - - - - - - - -
- -
-
-
+<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_unauthorized" CodeBehind="mod_unauthorized.ascx.cs" %> + +
+

+

+
+ +
+
+ +
+
diff --git a/GMW/WebUserControls/mod_unauthorized.ascx.designer.cs b/GMW/WebUserControls/mod_unauthorized.ascx.designer.cs index 7d5054f0..d5c35bcb 100644 --- a/GMW/WebUserControls/mod_unauthorized.ascx.designer.cs +++ b/GMW/WebUserControls/mod_unauthorized.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index d6cf4e02..7bb14835 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/forceUser.aspx b/GMW/forceUser.aspx index ba3cfc74..dc6b5b41 100644 --- a/GMW/forceUser.aspx +++ b/GMW/forceUser.aspx @@ -1,9 +1,11 @@ -<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimple.master" AutoEventWireup="true" - Inherits="forceUser" Title="ForceUser" Codebehind="forceUser.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/Empty.master" AutoEventWireup="true" + Inherits="forceUser" Title="ForceUser" CodeBehind="forceUser.aspx.cs" %> <%@ Register Src="WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %> - -
- + +
+
+ +
diff --git a/GMW/forceUser.aspx.designer.cs b/GMW/forceUser.aspx.designer.cs index c440714b..261a2999 100644 --- a/GMW/forceUser.aspx.designer.cs +++ b/GMW/forceUser.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GMW/unauthorized.aspx b/GMW/unauthorized.aspx index da9803a8..b8a95c3f 100644 --- a/GMW/unauthorized.aspx +++ b/GMW/unauthorized.aspx @@ -1,7 +1,7 @@ -<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimple.master" AutoEventWireup="true" Inherits="unauthorized" Title="Untitled Page" Codebehind="unauthorized.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/Empty.master" AutoEventWireup="true" Inherits="unauthorized" Title="Untitled Page" Codebehind="unauthorized.aspx.cs" %> <%@ Register Src="WebUserControls/mod_unauthorized.ascx" TagName="mod_unauthorized" TagPrefix="uc1" %> - + diff --git a/GMW/unauthorized.aspx.designer.cs b/GMW/unauthorized.aspx.designer.cs index 932b7caf..b31dcf8f 100644 --- a/GMW/unauthorized.aspx.designer.cs +++ b/GMW/unauthorized.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------