diff --git a/.gitignore b/.gitignore index 95b4e06..6ea9f64 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,13 @@ /ETS_Data/bin/WinLab /ETS_Data/obj/Release /ETS_Data/obj/ETS/Package/PackageTmp/* -/ETS_Data/obj/ETS/*.pdb \ No newline at end of file +/ETS_Data/obj/ETS/*.pdb + +#-------------------------------------------- +# PROJ-ETS +#-------------------------------------------- +/PROJ-ETS/bin/Debug +/PROJ-ETS/bin/WinLab +/PROJ-ETS/obj/Release +/PROJ-ETS/obj/ETS/Package/PackageTmp/* +/PROJ-ETS/obj/ETS/*.pdb \ No newline at end of file diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 1dd2c8a..6363b77 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Global.asax.cs b/PROJ-ETS/PROJ-ETS/Global.asax.cs index 531811c..8836f83 100644 --- a/PROJ-ETS/PROJ-ETS/Global.asax.cs +++ b/PROJ-ETS/PROJ-ETS/Global.asax.cs @@ -15,10 +15,8 @@ namespace PROJ_ETS { // Code that runs on application startup BundleConfig.RegisterBundles(BundleTable.Bundles); - AuthConfig.RegisterOpenAuth(); - // aggiungo route x pagine di default - //RegisterRoutes(RouteTable.Routes); + // aggiungo friendlyUrls... RouteConfig.RegisterRoutes(RouteTable.Routes); } diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 8cdaa12..c974e56 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -106,14 +106,14 @@ - - - - - + + + + + @@ -226,10 +226,10 @@ Designer + - About.aspx ASPXCodeBehind @@ -237,41 +237,6 @@ About.aspx - - Login.aspx - ASPXCodeBehind - - - Login.aspx - - - Manage.aspx - ASPXCodeBehind - - - Manage.aspx - - - OpenAuthProviders.ascx - ASPXCodeBehind - - - OpenAuthProviders.ascx - - - Register.aspx - ASPXCodeBehind - - - Register.aspx - - - RegisterExternalLogin.aspx - ASPXCodeBehind - - - RegisterExternalLogin.aspx - Contact.aspx @@ -312,12 +277,18 @@ ViewSwitcher.ascx + + AjaxSimpleFull.Master + + + AjaxSimpleFull.Master + + - diff --git a/PROJ-ETS/PROJ-ETS/Site.Master b/PROJ-ETS/PROJ-ETS/Site.Master index 2d17a3a..0a132d2 100644 --- a/PROJ-ETS/PROJ-ETS/Site.Master +++ b/PROJ-ETS/PROJ-ETS/Site.Master @@ -41,24 +41,7 @@

-
- - - - - -

- Hello, - - ! - -

-
-
-
+