Skip to content

Commit

Permalink
added images
Browse files Browse the repository at this point in the history
fixed problem with elmah's referencing
  • Loading branch information
jarrettmeyer committed Jan 26, 2010
1 parent 57933b8 commit 1168737
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 11 deletions.
Binary file added src/Project.Web/Content/Images/ajax-loader.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Project.Web/Content/Images/circle-red-x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Project.Web/Content/Images/notification-info.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 31 additions & 1 deletion src/Project.Web/Content/Stylesheets/Screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ tbody td {
width: 100%;
border: 3px solid #5B5B5B;
background-color: #C0C0C0;
color: #5B5B5B;
font-weight: bold;
padding: 0.8em;
margin-bottom: 1em;
Expand All @@ -111,6 +110,37 @@ tbody td {
margin: 0;
}

.error-notification {
background: #E09698 url('../Images/notification-error.png') no-repeat 10px 13px;
color: #910000;
border-color: #910000;
padding-left: 24px;
}

.info-notification {
background: #E09698 url('../Images/notification-info.png') no-repeat 10px 13px;
color: #910000;
border-color: #910000;
padding-left: 24px;
}

.success-notification {
background: #E09698 url('../Images/notification-success.png') no-repeat 10px 13px;
color: #910000;
border-color: #910000;
padding-left: 24px;
}

.warning-notification {
background: #FFFF99 url('../Images/notification-warning.png') no-repeat 10px 13px;
border-color: #FF6600;
padding-left: 36px;
}

.warning-notification li {
color: #FF6600;
}


/* FORM LAYOUT ELEMENTS
----------------------------------------------------------*/
Expand Down
14 changes: 8 additions & 6 deletions src/Project.Web/Project.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RootNamespace>Project.Web</RootNamespace>
<AssemblyName>Project.Web</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<MvcBuildViews>true</MvcBuildViews>
<MvcBuildViews>false</MvcBuildViews>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -31,10 +31,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Elmah, Version=1.1.11517.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\tools\elmah\Elmah.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\tools\ninject\Ninject.dll</HintPath>
Expand Down Expand Up @@ -102,12 +98,18 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Content\Images\ajax-loader.gif" />
<Content Include="Content\Images\circle-green-check.png" />
<Content Include="Content\Images\circle-red-x.png" />
<Content Include="Content\Images\notification-error.png" />
<Content Include="Content\Images\notification-info.png" />
<Content Include="Content\Images\notification-success.png" />
<Content Include="Content\Images\notification-warning.png" />
<Content Include="log4net.config" />
<Content Include="Views\Notifications\Index.ascx" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Content\Images\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
Expand Down
8 changes: 4 additions & 4 deletions src/Project.Web/Views/Notifications/Index.ascx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="notification success-notification">
<ul>
<% foreach (var notification in Model.GetNotifications<SuccessNotification>()) { %>
<%= Html.Encode(notification.Message) %>
<li><%= Html.Encode(notification.Message) %></li>
<% } %>
</ul>
</div>
Expand All @@ -15,7 +15,7 @@
<div class="notification error-notification">
<ul>
<% foreach (var notification in Model.GetNotifications<ErrorNotification>()) { %>
<%= Html.Encode(notification.Message) %>
<li><%= Html.Encode(notification.Message) %></li>
<% } %>
</ul>
</div>
Expand All @@ -24,7 +24,7 @@
<div class="notification warning-notification">
<ul>
<% foreach (var notification in Model.GetNotifications<WarningNotification>()) { %>
<%= Html.Encode(notification.Message) %>
<li><%= Html.Encode(notification.Message) %></li>
<% } %>
</ul>
</div>
Expand All @@ -33,7 +33,7 @@
<div class="notification info-notification">
<ul>
<% foreach (var notification in Model.GetNotifications<InfoNotification>()) { %>
<%= Html.Encode(notification.Message) %>
<li><%= Html.Encode(notification.Message) %></li>
<% } %>
</ul>
</div>
Expand Down

0 comments on commit 1168737

Please sign in to comment.