Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated to Bootstrap 3 (final), added font-awesome (no more glyphicons) #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated to Bootstrap 3 (final), added font-awesome (no more glyphicons) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52d53a6
Merge pull request #1 from warrenbuckley/master
mptrs Aug 26, 2013
fe7f326
git ignore update (no .suo, no csproj.user)
Aug 26, 2013
934923a
Added BS 3 final, fixed nav and some layout things because of the update
Aug 26, 2013
af3c753
Merge branch 'feature/UpdateBootstrap' into develop
Aug 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ CWSStart.Web/CWSStart.Web/App_Data/TEMP/PluginCache/*
CWSStart.Web/CWSStart.Web/bin/*
CWSStart.Web/CWSStart.Web/obj/*
CWSStart.Web/packages/*
CWSStart.Web/CWSStart.Web.v11.suo
CWSStart.Web/CWSStart.Web/CWSStart.Web.csproj.user
8 changes: 6 additions & 2 deletions CWSStart.Web/CWSStart.Web/CWSStart.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,19 +226,19 @@
<Content Include="bin\x86\sqlceme40.dll" />
<Content Include="bin\x86\sqlceqp40.dll" />
<Content Include="bin\x86\sqlcese40.dll" />
<Content Include="css\bootstrap.css" />
<Content Include="css\bootstrap.min.css" />
<Content Include="css\CWS-log-viewer.css" />
<Content Include="css\CWS-start.css" />
<Content Include="css\font-awesome.min.css" />
<Content Include="css\sticky-footer.css" />
<Content Include="css\dummy.txt" />
<Content Include="default.aspx" />
<Content Include="font\fontawesome-webfont.svg" />
<Content Include="macroScripts\dummy.txt" />
<Content Include="masterpages\dummy.txt" />
<Content Include="media\1001\venue.jpg" />
<Content Include="media\1001\venue_thumb.jpg" />
<Content Include="media\dummy.txt" />
<Content Include="scripts\bootstrap.js" />
<Content Include="scripts\bootstrap.min.js" />
<Content Include="scripts\dummy.txt" />
<Content Include="scripts\jquery-1.10.2.min.js" />
Expand Down Expand Up @@ -349,6 +349,10 @@
</Content>
<Content Include="Views\CWS-Members.cshtml" />
<Content Include="Views\CWS-Profile.cshtml" />
<Content Include="font\fontawesome-webfont.eot" />
<Content Include="font\fontawesome-webfont.ttf" />
<Content Include="font\fontawesome-webfont.woff" />
<Content Include="font\FontAwesome.otf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
Expand Down
2 changes: 1 addition & 1 deletion CWSStart.Web/CWSStart.Web/Views/CWS-Galleries.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

if (firstPhoto != null)
{
<div class="col-lg-3">
<div class="col-md-3">
<a href="@gallery.Url" class="thumbnail">
<img src="@firstPhoto.GetProperty("photo").Value" alt="@firstPhoto.Name" />
</a>
Expand Down
2 changes: 1 addition & 1 deletion CWSStart.Web/CWSStart.Web/Views/CWS-Gallery.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="row">
@foreach (var photo in group)
{
<div class="col-lg-3">
<div class="col-md-3">
<a href="@photo.Url" class="thumbnail">
<img src="@photo.GetProperty("photo").Value" alt="@photo.Name" />
</a>
Expand Down
6 changes: 3 additions & 3 deletions CWSStart.Web/CWSStart.Web/Views/CWS-Home.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
@Html.Raw(Model.Content.GetPropertyValue("bodyText"))

<div class="row">
<div class="col-4">
<div class="col-md-4">
@Html.Raw(Model.Content.GetPropertyValue("featureOne"))
</div>
<div class="col-4">
<div class="col-md-4">
@Html.Raw(Model.Content.GetPropertyValue("featureTwo"))
</div>
<div class="col-4">
<div class="col-md-4">
@Html.Raw(Model.Content.GetPropertyValue("featureThree"))
</div>
</div>
6 changes: 4 additions & 2 deletions CWSStart.Web/CWSStart.Web/Views/CWS-Master.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
<html lang="en">
<head>
<meta charset="utf-8">

<meta http-equiv="X-UA-Compatible" content="IE=edge">

<title>CWS Start - The Umbraco MVC Starter Website</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="Warren Buckley - A Creative Web Specialist in Umbraco">

<!-- Bootstrap core CSS -->
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/font-awesome.min.css" rel="stylesheet">
<link href="/css/sticky-footer.css" rel="stylesheet">

<!-- Custom CWS Start Styles -->
Expand Down Expand Up @@ -45,7 +47,7 @@
<p class="text-muted">
CWS Start is an example website starter kit for <a href="http://umbraco.com" target="_blank">the Open Source ASP.NET CMS platform Umbraco</a>. <br/>
Built by <a href="http://creativewebspecialist.co.uk" target="_blank">Warren Buckley</a> and
powered by <a href="http://getbootstrap.com" target="_blank">Bootstrap 3RC1 Framework</a>.
powered by <a href="http://getbootstrap.com" target="_blank">Bootstrap 3 Framework</a>.
</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions CWSStart.Web/CWSStart.Web/Views/CWS-Profile.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<h2>@currentMember.Text</h2>

<div class="row">
<div class="col-9">
<div class="col-md-9">
<h3>Email: @currentMember.Email</h3>
<h3>Description: @currentMember.getProperty("description").Value.ToString()</h3>

Expand All @@ -30,7 +30,7 @@
<h3>No of profile views: @currentMember.getProperty("numberOfProfileViews").Value</h3>
<h3>Last Login Date: @DateTime.ParseExact(currentMember.getProperty("lastLoggedIn").Value.ToString(), "dd/MM/yyyy @ HH:mm:ss", null)</h3>
</div>
<div class="col-3">
<div class="col-md-3">
<img src="@(currentMember.Email.GetGravatarUrl(250, string.Empty))" alt="@currentMember.Text" class="img-circle"/>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions CWSStart.Web/CWSStart.Web/Views/CWS-Two-Column.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

<h2>@Model.Content.Name</h2>
<div class="row">
<div class="col-9">
<div class="col-md-9">
@RenderSection("mainColumn")
</div>
<div class="col-3">
<div class="col-md-3">
@RenderSection("subColumn")
</div>
</div>
53 changes: 30 additions & 23 deletions CWSStart.Web/CWSStart.Web/Views/SiteChromeSurface/Navi.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,66 @@
@inherits Umbraco.Web.Mvc.UmbracoViewPage<IEnumerable<IPublishedContent>>

@{
var pages = Model;
var currentPageID = UmbracoContext.Current.PageId ?? Umbraco.TypedContentAtRoot().Single(x => x.DocumentTypeAlias == "CWS-Home").Id;
var currentPage = Umbraco.TypedContent(currentPageID);
var pages = Model;
var currentPageID = UmbracoContext.Current.PageId ?? Umbraco.TypedContentAtRoot().Single(x => x.DocumentTypeAlias == "CWS-Home").Id;
var currentPage = Umbraco.TypedContent(currentPageID);
}

<div class="navbar navbar-fixed-top">
<header class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">CWS Start</a>
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">CWS Start</a>
</div>

<div class="nav-collapse collapse">
<nav class="collapse navbar-collapse bs-navbar-collapse">
<ul class="nav navbar-nav">
@foreach (var page in pages)
{
var isSelected = page.IsAncestorOrSelf(currentPage, "active");
var hasChildren = page.Children.Any() ? "dropdown" : string.Empty;
var isSelected = page.IsAncestorOrSelf(currentPage, "active");
var hasChildren = page.Children.Any() ? "dropdown" : string.Empty;

var hideInNavi = Convert.ToBoolean(page.GetPropertyValue("hideInNavigationLoggedIn"));

//If member is logged in AND hide in navi is not true
if (Umbraco.MemberIsLoggedOn() && !hideInNavi)
{
@renderNaviItem(page, currentPage, isSelected, hasChildren);
@renderNaviItem(page, currentPage, isSelected, hasChildren);
}
else if (!Umbraco.MemberIsLoggedOn() && page.IsVisible())
{
@renderNaviItem(page, currentPage, isSelected, hasChildren);
@renderNaviItem(page, currentPage, isSelected, hasChildren);
}

}

@if (Umbraco.MemberIsLoggedOn())
{
<li>
@Html.ActionLink("Logout", "Logout", "AuthSurface")
</li>
}
</ul>

<form class="navbar-form form-inline pull-right" action="/search" method="POST">
<input type="text" class="form-control" name="q" placeholder="Search" />

<form class="navbar-form navbar-right" role="search" action="/search" method="POST">
<div class="form-group">
<input type="text" class="form-control" name="q" placeholder="Search" />
</div>
<button type="submit" class="btn btn-default">Search</button>
</form>

</div><!--/.nav-collapse -->
</nav>
<!--/.nav-collapse -->
</div>
</div>
</header>

@helper renderNaviItem (IPublishedContent page, IPublishedContent currentPage, HtmlString isSelected, string hasChildren) {
@helper renderNaviItem(IPublishedContent page, IPublishedContent currentPage, HtmlString isSelected, string hasChildren)
{
<li class="@isSelected @hasChildren">
@if (page.Children.Any())
{
Expand Down
Loading