Permalink
Browse files

Merge branch 'master' of github.com:skroonenburg/Rejuicer

  • Loading branch information...
2 parents d90cdbb + 60de659 commit 66b4cbcb63bfdaa00f7bc1efd0a752f71c443bf4 @skroonenburg skroonenburg committed Aug 30, 2011
@@ -12,9 +12,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MvcDemo</RootNamespace>
<AssemblyName>MvcDemo</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -38,40 +39,28 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Lib\EcmaScript.NET.modified.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="Rejuicer, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="Rejuicer">
<HintPath>..\..\..\..\Lib\Rejuicer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
+ <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
- <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Core">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data.DataSetExtensions">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
+ <Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Xml.Linq">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
<Reference Include="System.Web" />
- <Reference Include="System.Web.Extensions">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
+ <Reference Include="System.Xml.Linq" />
<Reference Include="Yahoo.Yui.Compressor, Version=1.5.0.0, Culture=neutral, PublicKeyToken=f8b4b81ec75097e2, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Lib\Yahoo.Yui.Compressor.dll</HintPath>
@@ -10,37 +10,37 @@
Use the form below to change your password.
</p>
<p>
- New passwords are required to be a minimum of <%: ViewData["PasswordLength"] %> characters in length.
+ New passwords are required to be a minimum of <%= ViewData["PasswordLength"] %> characters in length.
</p>
<% using (Html.BeginForm()) { %>
- <%: Html.ValidationSummary(true, "Password change was unsuccessful. Please correct the errors and try again.") %>
+ <%= Html.ValidationSummary(true, "Password change was unsuccessful. Please correct the errors and try again.") %>
<div>
<fieldset>
<legend>Account Information</legend>
<div class="editor-label">
- <%: Html.LabelFor(m => m.OldPassword) %>
+ <%= Html.LabelFor(m => m.OldPassword) %>
</div>
<div class="editor-field">
- <%: Html.PasswordFor(m => m.OldPassword) %>
- <%: Html.ValidationMessageFor(m => m.OldPassword) %>
+ <%= Html.PasswordFor(m => m.OldPassword) %>
+ <%= Html.ValidationMessageFor(m => m.OldPassword) %>
</div>
<div class="editor-label">
- <%: Html.LabelFor(m => m.NewPassword) %>
+ <%= Html.LabelFor(m => m.NewPassword) %>
</div>
<div class="editor-field">
- <%: Html.PasswordFor(m => m.NewPassword) %>
- <%: Html.ValidationMessageFor(m => m.NewPassword) %>
+ <%= Html.PasswordFor(m => m.NewPassword) %>
+ <%= Html.ValidationMessageFor(m => m.NewPassword) %>
</div>
<div class="editor-label">
- <%: Html.LabelFor(m => m.ConfirmPassword) %>
+ <%= Html.LabelFor(m => m.ConfirmPassword) %>
</div>
<div class="editor-field">
- <%: Html.PasswordFor(m => m.ConfirmPassword) %>
- <%: Html.ValidationMessageFor(m => m.ConfirmPassword) %>
+ <%= Html.PasswordFor(m => m.ConfirmPassword) %>
+ <%= Html.ValidationMessageFor(m => m.ConfirmPassword) %>
</div>
<p>
@@ -7,34 +7,34 @@
<asp:Content ID="loginContent" ContentPlaceHolderID="MainContent" runat="server">
<h2>Log On</h2>
<p>
- Please enter your username and password. <%: Html.ActionLink("Register", "Register") %> if you don't have an account.
+ Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.
</p>
<% using (Html.BeginForm()) { %>
- <%: Html.ValidationSummary(true, "Login was unsuccessful. Please correct the errors and try again.") %>
+ <%= Html.ValidationSummary(true, "Login was unsuccessful. Please correct the errors and try again.") %>
<div>
<fieldset>
<legend>Account Information</legend>
<div class="editor-label">
- <%: Html.LabelFor(m => m.UserName) %>
+ <%= Html.LabelFor(m => m.UserName) %>
</div>
<div class="editor-field">
- <%: Html.TextBoxFor(m => m.UserName) %>
- <%: Html.ValidationMessageFor(m => m.UserName) %>
+ <%= Html.TextBoxFor(m => m.UserName) %>
+ <%= Html.ValidationMessageFor(m => m.UserName) %>
</div>
<div class="editor-label">
- <%: Html.LabelFor(m => m.Password) %>
+ <%= Html.LabelFor(m => m.Password) %>
</div>
<div class="editor-field">
- <%: Html.PasswordFor(m => m.Password) %>
- <%: Html.ValidationMessageFor(m => m.Password) %>
+ <%= Html.PasswordFor(m => m.Password) %>
+ <%= Html.ValidationMessageFor(m => m.Password) %>
</div>
<div class="editor-label">
- <%: Html.CheckBoxFor(m => m.RememberMe) %>
- <%: Html.LabelFor(m => m.RememberMe) %>
+ <%= Html.CheckBoxFor(m => m.RememberMe) %>
+ <%= Html.LabelFor(m => m.RememberMe) %>
</div>
<p>
@@ -10,45 +10,45 @@
Use the form below to create a new account.
</p>
<p>
- Passwords are required to be a minimum of <%: ViewData["PasswordLength"] %> characters in length.
+ Passwords are required to be a minimum of <%= ViewData["PasswordLength"] %> characters in length.
</p>
<% using (Html.BeginForm()) { %>
- <%: Html.ValidationSummary(true, "Account creation was unsuccessful. Please correct the errors and try again.") %>
+ <%= Html.ValidationSummary(true, "Account creation was unsuccessful. Please correct the errors and try again.") %>
<div>
<fieldset>
<legend>Account Information</legend>
<div class="editor-label">
- <%: Html.LabelFor(m => m.UserName) %>
+ <%= Html.LabelFor(m => m.UserName) %>
</div>
<div class="editor-field">
- <%: Html.TextBoxFor(m => m.UserName) %>
- <%: Html.ValidationMessageFor(m => m.UserName) %>
+ <%= Html.TextBoxFor(m => m.UserName) %>
+ <%= Html.ValidationMessageFor(m => m.UserName) %>
</div>
<div class="editor-label">
- <%: Html.LabelFor(m => m.Email) %>
+ <%= Html.LabelFor(m => m.Email) %>
</div>
<div class="editor-field">
- <%: Html.TextBoxFor(m => m.Email) %>
- <%: Html.ValidationMessageFor(m => m.Email) %>
+ <%= Html.TextBoxFor(m => m.Email) %>
+ <%= Html.ValidationMessageFor(m => m.Email) %>
</div>
<div class="editor-label">
- <%: Html.LabelFor(m => m.Password) %>
+ <%= Html.LabelFor(m => m.Password) %>
</div>
<div class="editor-field">
- <%: Html.PasswordFor(m => m.Password) %>
- <%: Html.ValidationMessageFor(m => m.Password) %>
+ <%= Html.PasswordFor(m => m.Password) %>
+ <%= Html.ValidationMessageFor(m => m.Password) %>
</div>
<div class="editor-label">
- <%: Html.LabelFor(m => m.ConfirmPassword) %>
+ <%= Html.LabelFor(m => m.ConfirmPassword) %>
</div>
<div class="editor-field">
- <%: Html.PasswordFor(m => m.ConfirmPassword) %>
- <%: Html.ValidationMessageFor(m => m.ConfirmPassword) %>
+ <%= Html.PasswordFor(m => m.ConfirmPassword) %>
+ <%= Html.ValidationMessageFor(m => m.ConfirmPassword) %>
</div>
<p>
@@ -2,13 +2,13 @@
<%
if (Request.IsAuthenticated) {
%>
- Welcome <b><%: Page.User.Identity.Name %></b>!
- [ <%: Html.ActionLink("Log Off", "LogOff", "Account") %> ]
+ Welcome <b><%= Page.User.Identity.Name %></b>!
+ [ <%= Html.ActionLink("Log Off", "LogOff", "Account") %> ]
<%
}
else {
%>
- [ <%: Html.ActionLink("Log On", "LogOn", "Account") %> ]
+ [ <%= Html.ActionLink("Log On", "LogOn", "Account") %> ]
<%
}
%>
@@ -23,8 +23,8 @@
<div id="menucontainer">
<ul id="menu">
- <li><%: Html.ActionLink("Home", "Index", "Home")%></li>
- <li><%: Html.ActionLink("About", "About", "Home")%></li>
+ <li><%= Html.ActionLink("Home", "Index", "Home")%></li>
+ <li><%= Html.ActionLink("About", "About", "Home")%></li>
</ul>
</div>
Oops, something went wrong.

0 comments on commit 66b4cbc

Please sign in to comment.