refresh ed aggiunta (iniziale) master e css da ETS_WS

This commit is contained in:
Samuele Locatelli
2013-05-09 10:51:01 +02:00
parent b4e338bf05
commit 6687b54b6f
11 changed files with 33 additions and 90 deletions
+10 -1
View File
@@ -28,4 +28,13 @@
/ETS_Data/bin/WinLab
/ETS_Data/obj/Release
/ETS_Data/obj/ETS/Package/PackageTmp/*
/ETS_Data/obj/ETS/*.pdb
/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
Binary file not shown.
+1 -3
View File
@@ -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);
}
+13 -42
View File
@@ -106,14 +106,14 @@
</ItemGroup>
<ItemGroup>
<Content Include="About.aspx" />
<Content Include="Account\Login.aspx" />
<Content Include="Account\Manage.aspx" />
<Content Include="Account\OpenAuthProviders.ascx" />
<Content Include="Account\Register.aspx" />
<Content Include="Account\RegisterExternalLogin.aspx" />
<Content Include="App_Readme\Elmah.txt" />
<Content Include="Contact.aspx" />
<Content Include="Content\BuildBlocks.css" />
<Content Include="Content\ETS.css" />
<Content Include="Content\ExtraComp.css" />
<Content Include="Content\MasterPage.css" />
<Content Include="Content\Site.css" />
<Content Include="Content\Style.css" />
<Content Include="Content\themes\base\images\animated-overlay.gif" />
<Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
<Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
@@ -226,10 +226,10 @@
<SubType>Designer</SubType>
</Content>
<Content Include="Bundle.config" />
<Content Include="WebMasterPages\AjaxSimpleFull.Master" />
</ItemGroup>
<ItemGroup>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\AuthConfig.cs" />
<Compile Include="About.aspx.cs">
<DependentUpon>About.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -237,41 +237,6 @@
<Compile Include="About.aspx.designer.cs">
<DependentUpon>About.aspx</DependentUpon>
</Compile>
<Compile Include="Account\Login.aspx.cs">
<DependentUpon>Login.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Account\Login.aspx.designer.cs">
<DependentUpon>Login.aspx</DependentUpon>
</Compile>
<Compile Include="Account\Manage.aspx.cs">
<DependentUpon>Manage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Account\Manage.aspx.designer.cs">
<DependentUpon>Manage.aspx</DependentUpon>
</Compile>
<Compile Include="Account\OpenAuthProviders.ascx.cs">
<DependentUpon>OpenAuthProviders.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Account\OpenAuthProviders.ascx.designer.cs">
<DependentUpon>OpenAuthProviders.ascx</DependentUpon>
</Compile>
<Compile Include="Account\Register.aspx.cs">
<DependentUpon>Register.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Account\Register.aspx.designer.cs">
<DependentUpon>Register.aspx</DependentUpon>
</Compile>
<Compile Include="Account\RegisterExternalLogin.aspx.cs">
<DependentUpon>RegisterExternalLogin.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Account\RegisterExternalLogin.aspx.designer.cs">
<DependentUpon>RegisterExternalLogin.aspx</DependentUpon>
</Compile>
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="Contact.aspx.cs">
<DependentUpon>Contact.aspx</DependentUpon>
@@ -312,12 +277,18 @@
<Compile Include="ViewSwitcher.ascx.designer.cs">
<DependentUpon>ViewSwitcher.ascx</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\AjaxSimpleFull.Master.cs">
<DependentUpon>AjaxSimpleFull.Master</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\AjaxSimpleFull.Master.designer.cs">
<DependentUpon>AjaxSimpleFull.Master</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="WebUserControls\" />
</ItemGroup>
<ItemGroup>
<Content Include="Account\Web.config" />
<Content Include="Site.Master" />
</ItemGroup>
<ItemGroup>
+1 -18
View File
@@ -41,24 +41,7 @@
</p>
</div>
<div class="float-right">
<section id="login">
<asp:LoginView runat="server" ViewStateMode="Disabled">
<AnonymousTemplate>
<ul>
<li><a id="registerLink" runat="server" href="~/Account/Register.aspx">Register</a></li>
<li><a id="loginLink" runat="server" href="~/Account/Login.aspx">Log in</a></li>
</ul>
</AnonymousTemplate>
<LoggedInTemplate>
<p>
Hello, <a runat="server" class="username" href="~/Account/Manage.aspx" title="Manage your account">
<asp:LoginName runat="server" CssClass="username" />
</a>!
<asp:LoginStatus runat="server" LogoutAction="Redirect" LogoutText="Log off" LogoutPageUrl="~/" />
</p>
</LoggedInTemplate>
</asp:LoginView>
</section>
<nav>
<ul id="menu">
<li><a href="Default">Home</a></li>
Binary file not shown.
@@ -3,14 +3,7 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Antlr3.Runtime.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\AspNet.ScriptManager.jQuery.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\AspNet.ScriptManager.jQuery.UI.Combined.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.AspNet.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.Core.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OAuth.Consumer.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OAuth.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OpenId.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OpenId.RelyingParty.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\EntityFramework.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.AspNet.Membership.OpenAuth.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.AspNet.Web.Optimization.WebForms.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.ScriptManager.MSAjax.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.ScriptManager.WebForms.dll
@@ -19,19 +12,8 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\System.Web.Providers.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\WebGrease.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\EntityFramework.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.Core.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OAuth.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OAuth.Consumer.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OpenId.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.OpenId.RelyingParty.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\DotNetOpenAuth.AspNet.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\obj\Debug\PROJ-ETS.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\obj\Debug\PROJ-ETS.pdb
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Elmah.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Org.Mentalis.Security.Cryptography.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Mono.Math.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.AspNet.Membership.OpenAuth.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Org.Mentalis.Security.Cryptography.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Mono.Math.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.AspNet.FriendlyUrls.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\PROJ-ETS\bin\Microsoft.AspNet.FriendlyUrls.xml
Binary file not shown.
@@ -27,10 +27,10 @@ installing ASP.NET Friendly URLs package:
using System.Web.Routing;
...
protected void Application_Start(object sender, EventArgs e)
{
RouteConfig.RegisterRoutes(RouteTable.Routes);
}
protected void Application_Start(object sender, EventArgs e)
{
RouteConfig.RegisterRoutes(RouteTable.Routes);
}
If your app had a RouteConfig class before installing
@@ -41,7 +41,7 @@ ASP.NET Friendly URLs package:
Call EnableFriendlyUrls() in your RegisterRoutes method:
public static void RegisterRoutes(RouteCollection routes)
{
routes.EnableFriendlyUrls();
}
public static void RegisterRoutes(RouteCollection routes)
{
routes.EnableFriendlyUrls();
}