Refresh Pt 3b

This commit is contained in:
Thomas Hounsell 2015-03-28 02:09:26 +00:00
parent a9102fd59e
commit 8b0c517d37
8 changed files with 76 additions and 174 deletions

View File

@ -47,6 +47,10 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath> <HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="Humanizer, Version=1.34.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
<HintPath>..\packages\Humanizer.1.34.0\lib\portable-win+net40+sl50+wp8+wpa81\Humanizer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Threading.Tasks"> <Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath> <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@ -295,6 +299,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
<Folder Include="Areas\admin\Views\Shared\" /> <Folder Include="Areas\admin\Views\Shared\" />
<Folder Include="Models\ViewModel\Front\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="packages.config"> <Content Include="packages.config">

View File

@ -1,4 +1,5 @@
@model IEnumerable<IGrouping<BuildFeed.Models.BuildGroup, BuildFeed.Models.Build>> @model IEnumerable<IGrouping<BuildFeed.Models.BuildGroup, BuildFeed.Models.Build>>
@using Humanizer;
@{ @{
ViewBag.Title = "BuildFeed"; ViewBag.Title = "BuildFeed";
} }
@ -7,11 +8,19 @@
@foreach (var group in Model) @foreach (var group in Model)
{ {
<div class="col-sm-2"> <div class="col-sm-2">
<h3 class="build-group-title"><a href="#"><i class="fa fa-plus-square"></i></a> @group.Key.ToString()</h3> <h3 class="build-group-title"><a href="#"><span class="icon"><i class="fa fa-plus-square"></i></span> @group.Key.ToString()</a></h3>
<p> <p>
@if(group.Any(k => k.BuildTime.HasValue)) @if (group.Any(k => k.BuildTime.HasValue))
{ {
<span><i class="fa fa-calendar fa-fw"></i> @group.Max(k => k.BuildTime).Value.ToString("dd MMMM yyyy")</span><br /> var maxDate = group.Max(k => k.BuildTime).Value;
if (maxDate.AddDays(28) > DateTime.Now)
{
<span title="@maxDate.ToString("dd MMMM yyyy")"><i class="fa fa-calendar fa-fw"></i> @maxDate.Humanize()</span><br />
}
else
{
<span title="@maxDate.Humanize()"><i class="fa fa-calendar fa-fw"></i> @maxDate.ToString("dd MMMM yyyy")</span><br />
}
} }
<i class="fa fa-server fa-fw"></i> @group.Count().ToString() builds <i class="fa fa-server fa-fw"></i> @group.Count().ToString() builds
</p> </p>

View File

@ -4,10 +4,10 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet" /> <!--<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet" />-->
<link href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.2/yeti/bootstrap.min.css" rel="stylesheet" /> <link href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.4/slate/bootstrap.min.css" rel="stylesheet" />
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" /> <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic" rel="stylesheet" type="text/css" /> <link href="//fonts.googleapis.com/css?family=Hind:300,700,400" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="~/favicon.ico" /> <link rel="shortcut icon" href="~/favicon.ico" />
<link rel="icon" href="~/favicon.ico" /> <link rel="icon" href="~/favicon.ico" />
<link rel="canonical" href="@Url.Action()" /> <link rel="canonical" href="@Url.Action()" />
@ -79,7 +79,7 @@
</footer> </footer>
</div> </div>
@Scripts.Render("~/bundles/jquery") @Scripts.Render("~/bundles/jquery")
<script type="text/javascript" src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script> <script type="text/javascript" src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
@RenderSection("scripts", required: false) @RenderSection("scripts", required: false)
</body> </body>
</html> </html>

View File

@ -23,6 +23,8 @@
$(function () { $(function () {
Chart.defaults.global.responsive = true; Chart.defaults.global.responsive = true;
Chart.defaults.global.showTooltips = false; Chart.defaults.global.showTooltips = false;
Chart.defaults.global.scaleFontFamily = "Hind, sans-serif";
Chart.defaults.global.scaleFontColor = "#bbb";
Chart.defaults.Line.scaleShowGridLines = false; Chart.defaults.Line.scaleShowGridLines = false;

View File

@ -16,15 +16,8 @@
--> -->
<system.web> <system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" /> <compilation xdt:Transform="RemoveAttributes(debug)" />
<httpModules>
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Extensibility.Web.RequestTracking.WebRequestTrackingModule, Microsoft.ApplicationInsights.Extensibility.Web" xdt:Transform="Insert"/>
</httpModules>
</system.web> </system.web>
<system.webServer> <system.webServer>
<modules>
<remove name="ApplicationInsightsWebTracking" xdt:Transform="Insert" />
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Extensibility.Web.RequestTracking.WebRequestTrackingModule, Microsoft.ApplicationInsights.Extensibility.Web" preCondition="managedHandler" xdt:Transform="Insert" />
</modules>
<rewrite xdt:Transform="Insert"> <rewrite xdt:Transform="Insert">
<rules> <rules>
<rule name="CanonicalHost" stopProcessing="true"> <rule name="CanonicalHost" stopProcessing="true">

View File

@ -5,38 +5,38 @@
--> -->
<configuration> <configuration>
<appSettings> <appSettings>
<add key="webpages:Version" value="3.0.0.0"/> <add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false"/> <add key="webpages:Enabled" value="false" />
<add key="PreserveLoginUrl" value="true"/> <add key="PreserveLoginUrl" value="true" />
<add key="ClientValidationEnabled" value="true"/> <add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true"/> <add key="UnobtrusiveJavaScriptEnabled" value="true" />
<add key="data:ServerHost" value="localhost"/> <add key="data:ServerHost" value="localhost" />
<add key="data:ServerPort" value="6379"/> <add key="data:ServerPort" value="6379" />
<add key="data:ServerDB" value="1"/> <add key="data:ServerDB" value="1" />
<add key="form:QuestionFromEmail" value="smtp@betawiki.net"/> <add key="form:QuestionFromEmail" value="smtp@betawiki.net" />
<add key="form:QuestionToEmail" value="thomas@buildfeed.net"/> <add key="form:QuestionToEmail" value="thomas@buildfeed.net" />
<add key="RouteDebugger:Enabled" value="false"/> <add key="RouteDebugger:Enabled" value="false" />
</appSettings> </appSettings>
<system.web> <system.web>
<compilation debug="true" targetFramework="4.5"/> <compilation debug="true" targetFramework="4.5" />
<httpRuntime targetFramework="4.5"/> <httpRuntime targetFramework="4.5" />
<globalization culture="en-gb" uiCulture="en-gb"/> <globalization culture="en-gb" uiCulture="en-gb" />
<trace enabled="false" requestLimit="40" pageOutput="true"/> <trace enabled="false" requestLimit="40" pageOutput="true" />
<sessionState cookieless="UseCookies"/> <sessionState cookieless="UseCookies" />
<anonymousIdentification cookieless="UseCookies" enabled="false"/> <anonymousIdentification cookieless="UseCookies" enabled="false" />
<authentication mode="Forms"> <authentication mode="Forms">
<forms loginUrl="/login/" cookieless="UseCookies" name="BuildFeedAuth"/> <forms loginUrl="/login/" cookieless="UseCookies" name="BuildFeedAuth" />
</authentication> </authentication>
<membership defaultProvider="BuildFeedMemberProvider"> <membership defaultProvider="BuildFeedMemberProvider">
<providers> <providers>
<clear/> <clear />
<add name="BuildFeedMemberProvider" type="RedisAuth.RedisMembershipProvider,RedisAuth"/> <add name="BuildFeedMemberProvider" type="RedisAuth.RedisMembershipProvider,RedisAuth" />
</providers> </providers>
</membership> </membership>
<roleManager defaultProvider="BuildFeedRoleProvider" enabled="true"> <roleManager defaultProvider="BuildFeedRoleProvider" enabled="true">
<providers> <providers>
<clear/> <clear />
<add name="BuildFeedRoleProvider" type="RedisAuth.RedisRoleProvider,RedisAuth"/> <add name="BuildFeedRoleProvider" type="RedisAuth.RedisRoleProvider,RedisAuth" />
</providers> </providers>
</roleManager> </roleManager>
<httpModules> <httpModules>
@ -45,58 +45,57 @@
<system.webServer> <system.webServer>
<modules> <modules>
</modules> </modules>
<urlCompression doDynamicCompression="true"/> <urlCompression doDynamicCompression="true" />
<validation validateIntegratedModeConfiguration="false"/> <validation validateIntegratedModeConfiguration="false" />
<handlers> <handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/> <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="OPTIONSVerbHandler"/> <remove name="OPTIONSVerbHandler" />
<remove name="TRACEVerbHandler"/> <remove name="TRACEVerbHandler" />
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
preCondition="integratedMode,runtimeVersionv4.0"/>
</handlers> </handlers>
</system.webServer> </system.webServer>
<system.net> <system.net>
<mailSettings> <mailSettings>
<smtp configSource="smtp.config"/> <smtp configSource="smtp.config" />
</mailSettings> </mailSettings>
</system.net> </system.net>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/> <assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0"/> <bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/> <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/> <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/> <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/> <assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0"/> <bindingRedirect oldVersion="0.0.0.0-1.1.20.0" newVersion="1.1.20.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/> <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

View File

@ -1,6 +1,6 @@
body, h1, h2, h3 body, h1, h2, h3
{ {
font-family: 'Source Sans Pro', sans-serif; font-family: 'Hind', sans-serif;
} }
h1 h1
@ -17,15 +17,16 @@ h1
#page-content #page-content
{ {
padding-top: 70px; padding-top: 50px;
} }
.build-group-title .build-group-title
{ {
font-size: 22px; font-size: 22px;
font-weight: 300;
} }
.build-group-title a .build-group-title .icon
{ {
font-size: 0.6em; font-size: 0.6em;
vertical-align: 3px; vertical-align: 3px;
@ -33,76 +34,6 @@ h1
margin-left: 0.3em; margin-left: 0.3em;
} }
.build-head
{
margin-bottom: 0.33em;
}
.build-head h3
{
margin: 0;
display: inline-block;
}
.build-head .btn
{
display: inline-block;
margin-right: 0.66em;
vertical-align: text-bottom;
padding: 2px 6px;
}
.build-foot
{
margin-bottom: 2em;
}
.build-foot .badge
{
border-radius: 4px;
font-weight: normal;
color: #fff !important;
}
.build-foot .badge:first-child
{
min-width: 90px;
}
li:last-child .build-foot
{
margin-bottom: 0;
}
.fa-sm
{
font-size: 0.7em;
vertical-align: 1px;
margin-right: 0.12em;
}
.more-link
{
display: inline-block;
font-size: 13px;
vertical-align: 1px;
border-bottom: 1px dashed #41c0e5;
color: #31b0d5;
}
.more-link .fa-sm
{
font-size: 11px;
vertical-align: 0px;
}
.more-link:hover
{
color: #30829e;
border-bottom-color: #50a2be;
text-decoration: none;
}
.field-validation-error .field-validation-error
{ {
color: #ff4136; color: #ff4136;
@ -113,47 +44,9 @@ li:last-child .build-foot
font-weight: bold; font-weight: bold;
} }
.panel-heading h4
{
margin: 0;
}
.panel-search .list-group
{
margin-bottom: 0;
}
.panel-search .list-group-item-heading {
overflow: hidden;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
}
.panel-search .list-group-item-heading h4
{
font-size: 16px;
}
.panel-search .list-group-item-heading strong
{
font-weight: normal;
}
.pagination
{
font-weight: normal;
}
.pagination > li > a,
.pagination > li > span
{
padding: 2px 7px;
margin-left: 2px;
}
#page-footer #page-footer
{ {
font-size: 12px;
margin-top: 1em; margin-top: 1em;
} }

View File

@ -2,6 +2,7 @@
<packages> <packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net45" userInstalled="true" /> <package id="Antlr" version="3.5.0.2" targetFramework="net45" userInstalled="true" />
<package id="Chart.js" version="1.0.1" targetFramework="net45" userInstalled="true" /> <package id="Chart.js" version="1.0.1" targetFramework="net45" userInstalled="true" />
<package id="Humanizer" version="1.34.0" targetFramework="net45" userInstalled="true" />
<package id="jQuery" version="2.1.3" targetFramework="net45" userInstalled="true" /> <package id="jQuery" version="2.1.3" targetFramework="net45" userInstalled="true" />
<package id="jquery.TypeScript.DefinitelyTyped" version="2.2.3" targetFramework="net45" userInstalled="true" /> <package id="jquery.TypeScript.DefinitelyTyped" version="2.2.3" targetFramework="net45" userInstalled="true" />
<package id="jQuery.Validation" version="1.13.1" targetFramework="net45" userInstalled="true" /> <package id="jQuery.Validation" version="1.13.1" targetFramework="net45" userInstalled="true" />