Skip to content

Commit 3cf4f14

Browse files
themightychristhemightychris
committed
Merge pull request #127 from CfABrigadePhiladelphia/development
Release: laddr v2.2.0
2 parents a866b08 + 107ac2e commit 3cf4f14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+667
-606
lines changed

‎event-handlers/Emergence/People/RegistrationRequestHandler/beforeRegister/recaptcha.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
if ($recaptcha = \RemoteSystems\ReCaptcha::getInstance()) {
4+
$recaptchaResponse = $recaptcha->verify($_EVENT['requestData']['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
5+
6+
if (!$recaptchaResponse->isSuccess()) {
7+
$_EVENT['additionalErrors']['ReCaptcha'] = 'Please prove that you aren\'t a spam robot by completing the reCAPTCHA';
8+
}
9+
}

‎event-handlers/Emergence/People/RegistrationRequestHandler/registerComplete/mailchimp.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
// add new user to a MailChimp list (see http://forum.laddr.us/t/mailchimp-integration/26)
4+
#\RemoteSystems\MailChimp::call('lists/subscribe', [
5+
# 'id' => 'YOUR_LIST_ID_HERE',
6+
# 'email' => [
7+
# 'email' => $_EVENT['User']->Email
8+
# ],
9+
# 'merge_vars' => [
10+
# 'FNAME' => $_EVENT['User']->FirstName,
11+
# 'LNAME' => $_EVENT['User']->LastName
12+
# ],
13+
# 'double_optin' => false,
14+
# 'replace_interests' => false,
15+
# 'send_welcome' => false
16+
#]);

‎event-handlers/Site/beforeScriptExecute/load-locale.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
3+
Emergence\Locale::loadRequestedLocale();

‎html-templates/bigscreen.tpl‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,34 +53,36 @@
5353

5454
{block "js-analytics"}{*Ignore this page for analytics*}{/block}
5555

56-
{block content-wrapper-open}<div class="container-fluid bigscreen-content">{/block}
57-
{block content}
58-
<div class="row">
56+
{block content-wrapper}
57+
<div class="container-fluid bigscreen-content">
58+
{block content}
5959

60-
<section class="col-md-4 announcements">
61-
{contentBlock "bigscreen-announcement"}
62-
</section>
60+
<div class="row">
61+
<section class="col-md-4 announcements">
62+
{contentBlock "bigscreen-announcement"}
63+
</section>
6364

64-
<section class="col-md-4">
65-
<h2>{_("Check in at %s")|sprintf:$.server.HTTP_HOST}</strong></h2>
66-
<img src="{versioned_url 'img/screenshot-checkin.png'}" class="screenshot">
67-
</section>
65+
<section class="col-md-4">
66+
<h2>{_("Check in at %s")|sprintf:$.server.HTTP_HOST}</strong></h2>
67+
<img src="{versioned_url 'img/screenshot-checkin.png'}" class="screenshot">
68+
</section>
6869

69-
<section class="col-md-4 checkins">
70-
<h2>{_ "Latest Checkins"}</h2>
71-
{if count($checkins)}
72-
<p class="lead">{$checkins|count} checkin{tif count($checkins) > 1 ? 's'} so far for this event:</p>
73-
<ul>
74-
{foreach item=Checkin from=$checkins}
75-
<li>
76-
{personLink $Checkin->Member photo=yes photoSize=32} checked in{if $Checkin->Project} to {projectLink $Checkin->Project}{else}.{/if}
77-
{timestamp $Checkin->Created}
78-
</li>
79-
{/foreach}
80-
</ul>
81-
{/if}
82-
</section>
70+
<section class="col-md-4 checkins">
71+
<h2>{_ "Latest Checkins"}</h2>
72+
{if count($checkins)}
73+
<p class="lead">{$checkins|count} checkin{tif count($checkins) > 1 ? 's'} so far for this event:</p>
74+
<ul>
75+
{foreach item=Checkin from=$checkins}
76+
<li>
77+
{personLink $Checkin->Member photo=yes photoSize=32} checked in{if $Checkin->Project} to {projectLink $Checkin->Project}{else}.{/if}
78+
{timestamp $Checkin->Created}
79+
</li>
80+
{/foreach}
81+
</ul>
82+
{/if}
83+
</section>
84+
</div>
8385

86+
{/block}
8487
</div>
85-
{/block}
86-
{block content-wrapper-close}</div>{/block}
88+
{/block}

‎html-templates/blog/blogPost.tpl‎

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -62,48 +62,54 @@
6262

6363
{block "title"}{$data->Title} &mdash; {$dwoo.parent}{/block}
6464

65-
{block "content-wrapper-open"}<div class="container-fluid">{/block}
66-
67-
{block "content"}
68-
{$Post = $data}
69-
70-
<article class="blog-post">
71-
<header class="article-header">
72-
{if Emergence\CMS\BlogRequestHandler::checkWriteAccess($Post)}
73-
<div class="btn-group pull-right">
74-
<a href="{$Post->getURL()}/edit" class="btn btn-default">{*glyph "pencil"*} {_ Edit}</a>
75-
<a href="{$Post->getURL()}/delete"
76-
class="btn btn-danger confirm"
77-
data-confirm-yes="Delete Post"
78-
data-confirm-no="Don&rsquo;t Delete"
79-
data-confirm-title="Deleting Post"
80-
data-confirm-body="Are you sure you want to delete the post &ldquo;{$Post->Title|escape}?&rdquo;"
81-
data-confirm-destructive="true"
82-
data-confirm-success-target=".blog-post"
83-
data-confirm-success-message="Blog post deleted">{*glyph "trash"*} {_ Delete}</a>
65+
{block "content-wrapper"}
66+
<div class="container-fluid">
67+
{block "content"}
68+
69+
{$Post = $data}
70+
71+
<article class="blog-post">
72+
<header class="article-header">
73+
{if Emergence\CMS\BlogRequestHandler::checkWriteAccess($Post)}
74+
<div class="btn-toolbar pull-right">
75+
<div class="btn-group">
76+
<a href="{$Post->getURL()}/edit" class="btn btn-default">{*glyph "pencil"*} {_ Edit}</a>
77+
<a href="{$Post->getURL()}/delete"
78+
class="btn btn-danger confirm"
79+
data-confirm-yes="Delete Post"
80+
data-confirm-no="Don&rsquo;t Delete"
81+
data-confirm-title="Deleting Post"
82+
data-confirm-body="Are you sure you want to delete the post &ldquo;{$Post->Title|escape}?&rdquo;"
83+
data-confirm-destructive="true"
84+
data-confirm-success-target=".blog-post"
85+
data-confirm-success-message="Blog post deleted">{*glyph "trash"*} {_ Delete}</a>
86+
</div>
87+
</div>
88+
{/if}
89+
90+
<h1 class="header-title"><a href="{$Post->getURL()}">{$Post->Title|escape}</a></h1>
91+
92+
<div class="article-meta">
93+
by {personLink $Post->Author photo=yes photoSize=36 pixelRatio=2}
94+
on <a href="{$Post->getURL()}">{timestamp $Post->Published}</a>
8495
</div>
85-
{/if}
8696

87-
<h1 class="header-title"><a href="{$Post->getURL()}">{$Post->Title|escape}</a></h1>
88-
89-
<div class="article-meta">
90-
by {personLink $Post->Author photo=yes photoSize=36 pixelRatio=2}
91-
on <a href="{$Post->getURL()}">{timestamp $Post->Published}</a>
92-
</div>
97+
{if $Post->Summary}
98+
<div class="article-summary">
99+
{$Post->Summary|escape}
100+
</div>
101+
{/if}
102+
</header>
93103

94-
{if $Post->Summary}
95-
<div class="article-summary">
96-
{$Post->Summary|escape}
104+
<div class="article-body">
105+
{$Post->RenderBody()}
97106
</div>
98-
{/if}
99-
</header>
100107

101-
<div class="article-body">
102-
{$Post->RenderBody()}
103-
</div>
108+
<section class="blog-comments">
109+
{commentSection $Post}
110+
</section>
111+
</article>
104112

105-
<section class="blog-comments">
106-
{commentSection $Post}
107-
</section>
108-
</article>
113+
{/block}
114+
</div>
109115
{/block}

‎html-templates/blog/blogPosts.tpl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
{load_templates "subtemplates/paging.tpl"}
1111

1212
<header class="page-header">
13-
<div class="pull-right">
14-
<a href="/blog/create" class="btn btn-success btn-lg">New Post</a>
15-
</div>
16-
<h1 class="header-title title-1">Blog Feed</h1>
13+
<div class="btn-toolbar pull-right">
14+
<a href="/blog/create" class="btn btn-success">New Post</a>
15+
</div>
16+
17+
<h2>Blog Feed</h2>
1718
</header>
1819

1920
<section class="page-section article-collection">

‎html-templates/checkin/checkinComplete.tpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
{block content}
66
{$Checkin = $data}
77

8-
<h2>{_ "Success!"}</h2>
8+
<header class="page-header">
9+
<h2>{_ "Success!"}</h2>
10+
</header>
11+
912
<p>Thanks for checking in {if $Checkin->Project}to {projectLink $Checkin->Project}{/if} @ {Laddr::$siteName|escape}!</p>
1013
<h3>{_ "Things to do next:"}</h3>
1114
<ul>

‎html-templates/checkin/latestEvents.tpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
{block title}{_ "Latest Events"} &mdash; {$dwoo.parent}{/block}
44

55
{block content}
6-
<h2>{_ "Latest Events"}</h2>
6+
<header class="page-header">
7+
<h2>{_ "Latest Events"}</h2>
8+
</header>
9+
710
<table width="600">
811
<tr>
912
<th align="left">Meetup ID</th>

‎html-templates/checkin/topMembers.tpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
{block title}{_ "Top Members"} &mdash; {$dwoo.parent}{/block}
44

55
{block content}
6-
<h2>{_ "Top Members"}</h2>
6+
<header class="page-header">
7+
<h2>{_ "Top Members"}</h2>
8+
</header>
9+
710
<table width="350">
811
<tr>
912
<th align="left">Member</th>

‎html-templates/contact/contact.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{block "content"}
66
<header class="page-header">
7-
<h1 class="header-title title-1">Contact Us</h1>
7+
<h2>Contact Us</h2>
88
</header>
99

1010
<form action="/contact" method="POST" class="contact-form">

0 commit comments

Comments
 (0)