Skip to content

Commit

Permalink
Merge pull request #153 from CodeForPhilly/development
Browse files Browse the repository at this point in the history
Release: laddr v2.3.3
  • Loading branch information
themightychris authored Nov 2, 2016
2 parents a8535a0 + 9eb94dd commit 0f8eaef
Show file tree
Hide file tree
Showing 22 changed files with 284 additions and 170 deletions.
6 changes: 3 additions & 3 deletions html-templates/blog/blogPost.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

{block "css"}
{$dwoo.parent}
{cssmin "pages/blog.css"}
{cssmin "pages/article.css"}
{/block}

{block "title"}{$data->Title} — {$dwoo.parent}{/block}
Expand All @@ -68,7 +68,7 @@

{$Post = $data}

<article class="blog-post">
<article class="article">
<header class="article-header">
{if Emergence\CMS\BlogRequestHandler::checkWriteAccess($Post)}
<div class="btn-toolbar pull-right">
Expand Down Expand Up @@ -105,7 +105,7 @@
{$Post->RenderBody()}
</div>

<section class="blog-comments">
<section class="article-comments">
{commentSection $Post}
</section>
</article>
Expand Down
46 changes: 26 additions & 20 deletions html-templates/blog/blogPosts.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,38 @@

{block "css"}
{$dwoo.parent}
{cssmin "pages/blog.css"}
{cssmin "pages/article.css"}
{/block}

{block title}Blog &mdash; {$dwoo.parent}{/block}

{block "content"}
{load_templates "subtemplates/blog.tpl"}
{load_templates "subtemplates/paging.tpl"}

<header class="page-header">
<div class="btn-toolbar pull-right">
<a href="/blog/create" class="btn btn-success">New Post</a>
</div>

<h2>Blog Feed</h2>
</header>
<div class="row">
<div class="col-md-8 col-md-offset-2">

<section class="page-section article-collection">
{foreach item=BlogPost from=$data}
{blogPost $BlogPost useSummary=true showBody=false}
{foreachelse}
<p class="empty-text">Stay tuned for the first post&hellip;</p>
{/foreach}
</section>
<header class="page-header">
<a href="/blog/create" class="btn btn-success pull-right">New Post</a>

{if $total > $limit}
<footer class="page-footer">
<strong>{$total|number_format} posts:</strong> {pagingLinks $total pageSize=$limit}
</footer>
{/if}
<h1>Blog Feed</h1>
</header>

<section class="page-section article-collection">
{foreach item=BlogPost from=$data}
{blogPost $BlogPost useSummary=true showBody=false headingLevel="h2"}
{foreachelse}
<p class="empty-text">Stay tuned for the first post&hellip;</p>
{/foreach}
</section>

{if $total > $limit}
<footer class="page-footer">
<strong>{$total|number_format} posts:</strong> {pagingLinks $total pageSize=$limit}
</footer>
{/if}

</div>
</div>
{/block}
20 changes: 20 additions & 0 deletions html-templates/confirm.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{extends "designs/site.tpl"}

{block "content"}
<div class="row">
<div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
<div class="page-header">
{if $data->getTitle()}
<h1>Delete {$data->getTitle()}</h1>
{else}
<h1>Please confirm</h1>
{/if}
</div>
<p class="confirm">{$question}</p>
<form method="POST">
<button type="button" class="btn btn-default margin-right" name="Sure" value="No" onclick="javascript:history.go(-1);">No</button>
<button type="submit" class="btn btn-danger" name="Sure">Yes</button>
</form>
</div>
</div>
{/block}
86 changes: 72 additions & 14 deletions html-templates/home.tpl
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{extends designs/site.tpl}

{block "css"}
{$dwoo.parent}
{cssmin "pages/home.css"}
{/block}

{block js-bottom}
{$dwoo.parent}
{jsmin "features/sidebar-checkin.js"}
Expand Down Expand Up @@ -63,21 +58,39 @@
</div>
<input type="submit" value="Check In" class="btn btn-success">
</form>

{if count($currentMeetup.checkins)}
<div class="checkins">
<h3>{_ "Checked-in Members"}</h3>

{$lastProjectID = false}
<dl class="checkins-list">
<dt class="checkins-list-title">{_ "No Current Project"}</dt>
{foreach item=Checkin from=$currentMeetup.checkins}
{if $Checkin->Project && $Checkin->ProjectID != $lastProjectID}
<dt class="checkins-list-title">{projectLink $Checkin->Project}</dt>
{$lastProjectID = $Checkin->ProjectID}

{foreach item=Checkin from=$currentMeetup.checkins}
{if $Checkin->ProjectID !== $lastProjectID}
{tif !$.foreach.default.first ? '</ul>'}
<h4>
{if $Checkin->Project}
{projectLink $Checkin->Project}
{else}
No Current Project
{/if}
<dd class="checkins-list-person">{personLink $Checkin->Member photo=yes photoSize=32}</dd>
{/foreach}
</dl>
</h4>

{$lastProjectID = $Checkin->ProjectID}

<ul class="row list-unstyled">
{/if}

<li class="col-xs-6 col-sm-4 col-md-3">
{personLink $Checkin->Member photo=yes photoSize=64 linkCls="thumbnail"}
</li>
{/foreach}

</ul>

</div>
{/if}

</div>
</div>
{/if}
Expand All @@ -90,6 +103,51 @@
<li><a href="/blog" class="btn btn-link">{glyph "file"} {_ "Browse all blog posts"}</a></li>
</ul>

{*
<article class="post panel panel-default ">
<div class="panel-body">
<header class="post-header">
<h3 class="post-title">
<a href="#">Code for Philly Hack Night</a><small class="text-muted margin-left">{glyph "console"}</small>
</h3>
</header>
<div class="update-body">
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>
<h4>Projects</h4>
<h5><a href="/projects/example_project-4">Example Project</a></h5>
<ul class="row list-unstyled">
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/chris" title="Chris Alfano" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/36b6d909c0c65d4fcdfcc307b84fb06f?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Chris Alfano</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/chris" title="Chris Alfano" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/36b6d909c0c65d4fcdfcc307b84fb06f?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Chris Alfano</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/kurt" title="Kurt Gawinowicz" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/5d5ff5fd825a914d5057562aec05eb9b?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Kurt Gawinowicz</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/kurt" title="Kurt Gawinowicz" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/5d5ff5fd825a914d5057562aec05eb9b?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Kurt Gawinowicz</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/chris" title="Chris Alfano" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/36b6d909c0c65d4fcdfcc307b84fb06f?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Chris Alfano</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/kurt" title="Kurt Gawinowicz" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/5d5ff5fd825a914d5057562aec05eb9b?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Kurt Gawinowicz</span></a></li>
</ul>
<h4>New Projects</h4>
<ul class="padding-bottom">
<li><a href="#">Example Project 2</a></li>
<li><a href="#">Example Project 3</a></li>
<li><a href="#">Example Project 4</a></li>
<li><a href="#">Example Project 5</a></li>
</ul>
<h4>New Members</h4>
<ul class="row list-unstyled">
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/chris" title="Chris Alfano" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/36b6d909c0c65d4fcdfcc307b84fb06f?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Chris Alfano</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/chris" title="Chris Alfano" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/36b6d909c0c65d4fcdfcc307b84fb06f?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Chris Alfano</span></a></li>
<li class="col-xs-6 col-sm-4 col-md-3"><a href="/people/kurt" title="Kurt Gawinowicz" class="thumbnail text-center"><img src="//www.gravatar.com/avatar/5d5ff5fd825a914d5057562aec05eb9b?s=128&amp;r=g&amp;d=mm" class="avatar " width="64" height="64"><span class="name ">Kurt Gawinowicz</span></a></li>
</ul>
</div>
</div>
<footer class="post-footer panel-footer clearfix">
<small class="text-muted"><span class="glyphicon glyphicon-time" aria-hidden="true"></span>&nbsp;<a href="/blog/lorem_ipsum_dolor_sit_amet"><time datetime="2016-10-05T19:21:00-04:00" title="Wed 05 Oct 2016 07:21:00 PM EDT">5 Oct 2016</time></a></small>
</footer>
</article>
*}

{foreach item=Article from=$activity}
{projectActivity $Article headingLevel=h3 showProject=true}
{foreachelse}
Expand Down
12 changes: 8 additions & 4 deletions html-templates/how-to-help.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
{block title}{_ "How to Help"} &mdash; {$dwoo.parent}{/block}

{block content}
<div class="page-header">
<h1>{_ "How to Help"}</h1>
</div>
<div class="row">
<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
<div class="page-header">
<h1>{_ "How to Help"}</h1>
</div>

<p><a href="/projects/create" class="btn btn-primary">Create a project</a> or <a href="/projects">find an existing</a> one to get involved with in our projects directory.</p>
<p><a href="/projects/create" class="btn btn-primary margin-right">Create a project</a> or <a href="/projects">find an existing</a> one to get involved with in our projects directory.</p>
</div>
</div>
{/block}
2 changes: 1 addition & 1 deletion html-templates/includes/site.css.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'branding/*'
)}

<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,400italic,700,700italic' rel='stylesheet' type='text/css'>

{if $.User->hasAccountLevel('Staff')}
{cssmin "features/content-editable.css"}
Expand Down
15 changes: 11 additions & 4 deletions html-templates/mission.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
{block title}{_ "Our Mission"} &mdash; {$dwoo.parent}{/block}

{block content}
<div class="page-header">
<h1>{_ "Our Mission"}</h1>
</div>

<div class="row">
<div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">

<div class="page-header">
<h1>{_ "Our Mission"}</h1>
</div>

{capture assign=aboutMarkdown}
[Code for America](http://www.codeforamerica.org/) is a 501(c)3
Expand All @@ -21,5 +25,8 @@ Our programs change how we participate in government by:

{_($aboutMarkdown)|markdown}

<iframe width="560" height="315" src="//www.youtube.com/embed/kDFhzNfd-bg?rel=0" frameborder="0" allowfullscreen></iframe>
<iframe width="560" height="315" src="//www.youtube.com/embed/kDFhzNfd-bg?rel=0" frameborder="0" allowfullscreen></iframe>

</div>
</div>
{/block}
45 changes: 45 additions & 0 deletions html-templates/pages/page.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{extends "designs/site.tpl"}

{block "css"}
{$dwoo.parent}
{cssmin "pages/article.css"}
{/block}

{block title}{$data->Title|escape} &mdash; {$dwoo.parent}{/block}

{block "content-wrapper"}
<div class="container-fluid">

{block content}
{$Page = $data}
<article class="article cms-page reading-width">
<header class="article-header">
{if Emergence\CMS\PagesRequestHandler::checkWriteAccess($Page, true)}
<div class="btn-toolbar pull-right">
<div class="btn-group">
<a href="{$Page->getURL()}/edit" class="btn btn-default">Edit</a>&nbsp;
<a href="{$Page->getURL()}/delete"
class="btn btn-danger confirm"
data-confirm-yes="Delete Page"
data-confirm-no="Don&rsquo;t Delete"
data-confirm-title="Deleting Post"
data-confirm-body="Are you sure you want to delete the page &ldquo;{$Page->Title|escape}?&rdquo;"
data-confirm-destructive="true"
data-confirm-success-target=".cms-page"
data-confirm-success-message="Page deleted">Delete</a>
</div>
</div>
{/if}
<h1 class="header-title">
<a href="{$Page->getURL()}">{$Page->Title}</a>
</h1>
</header>

<section class="article-body">
{$Page->renderBody()}
</section>
</article>
{/block}

</div>
{/block}
25 changes: 25 additions & 0 deletions html-templates/pages/pages.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{extends "designs/site.tpl"}

{block title}Pages &mdash; {$dwoo.parent}{/block}

{block content}
<div class="row">
<div class="col-md-8 col-md-offset-2">

<header class="page-header">
<form action="/pages/create" method="GET" class="pull-right">
{* field "Title" "Page Title" *}
<button type="submit" class="btn btn-success">Create New Page</button>
</form>
<h1>Pages Directory</h1>
</header>

<ul>
{foreach item=Page from=$data}
<li><a href="/pages/{$Page->Handle}">{$Page->Title|escape}</a></li>
{/foreach}
</ul>

</div>
</div>
{/block}
16 changes: 5 additions & 11 deletions html-templates/people/people.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

{block title}{_ 'Members'} &mdash; {$dwoo.parent}{/block}

{block "css"}
{$dwoo.parent}
{cssmin "pages/members.css"}
{/block}

{block js-bottom}
{$dwoo.parent}
{jsmin "features/sidebar-tags.js"}
Expand All @@ -19,12 +14,11 @@

<div class="row">
<div class="col-sm-4 col-md-3">
<div class="tags-ct members">

<header class="btn-group btn-group-justified btn-group-xs" role="group">
<div class="tags-ct">
<div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">
<a href="#members-by-tech" class="tagFilter active btn btn-default" role="button" data-group="byTech">{_ "skills"}</a>
<a href="#members-by-project" class="tagFilter btn btn-default" role="button" data-group="byTopic">{_ "topics"}</a>
</header>
</div>

{template tagLink tagData rootUrl linkCls=""}
<a class="{$linkCls}" href="{$rootUrl}?tag={$tagData.Handle}">{$tagData.Title}{if $tagData.itemsCount} <span class="badge pull-right">{$tagData.itemsCount|number_format}</span>{/if}</a>
Expand All @@ -46,9 +40,9 @@

<div class="col-sm-8 col-md-9">
{foreach item=Person from=$data}
{if $.foreach.default.index % 6 == 0}<div class="row members-list">{/if}
{if $.foreach.default.index % 6 == 0}<div class="row">{/if}
<div class="col-sm-4 col-md-2">
{personLink $Person photo=yes photoSize=150 linkCls="thumbnail"}
{personLink $Person photo=yes photoSize=150 linkCls="thumbnail text-center"}
</div>
{if $.foreach.default.index % 6 == 5 || $.foreach.default.last}</div>{/if}
{/foreach}
Expand Down
Loading

0 comments on commit 0f8eaef

Please sign in to comment.