Skip to content

Commit cf80b88

Browse files
themightychristhemightychris
authored
Merge pull request #147 from CfABrigadePhiladelphia/development
Release: laddr v2.3.1
2 parents daecb4f + 017c8a8 commit cf80b88

11 files changed

Lines changed: 172 additions & 169 deletions

File tree

‎html-templates/home.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<p class="media-heading">{Laddr::$siteSlogan|escape}</p>
2424
<ul class="list-inline">
2525
{if $.User}
26-
<li><a href="/chat" class="btn btn-lg btn-success">{glyph "comment"}&nbsp;{_ "Chat with us on Slack"}</a></li>
26+
<li><p><a href="/chat" class="btn btn-lg btn-success">{glyph "comment"}&nbsp;{_ "Chat with us on Slack"}</a></p></li>
2727
{else}
28-
<li><a href="/register" class="btn btn-lg btn-success">{glyph "heart"}&nbsp;{_ "Join Us!"}</a></li>
28+
<li><p><a href="/register" class="btn btn-lg btn-success">{glyph "heart"}&nbsp;{_ "Join Us!"}</a></p></li>
2929
{/if}
30-
<li><a href="/projects" class="btn btn-lg btn-primary">{glyph "book"}&nbsp;{_ "Browse Projects"}</a></li>
30+
<li><p><a href="/projects" class="btn btn-lg btn-primary">{glyph "book"}&nbsp;{_ "Browse Projects"}</a></p></li>
3131
</ul>
3232
</div>
3333
</div>
@@ -124,4 +124,4 @@
124124
</div>
125125
</div>
126126
</main>
127-
{/block}
127+
{/block}

‎html-templates/includes/site.footer.tpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
{capture assign=laddrLink}<a href="http://laddr.us">Laddr</a>{/capture}
44
{capture assign=cfpLink}<a href="http://codeforphilly.org">Code for Philly</a>{/capture}
5-
{sprintf(_("Powered by %s &mdash; a %s project."), $laddrLink, $cfpLink)}
6-
<br>
5+
6+
<p>{sprintf(_("Powered by %s &mdash; a %s project."), $laddrLink, $cfpLink)}</p>
7+
78
{localeSelector}
9+
810
{*
911
{if $.responseId == 'home'}
1012
<br>Cover photo by <a href="XXXXXX" target="_blank">XXXXXX</a>.

‎html-templates/login/login.tpl‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@
4141
<button type="submit" class="btn btn-primary">{_ Login}</button>
4242
</div>
4343

44-
<div class="form-group">
45-
{capture assign=recoverLink}<a href="/register/recover{tif $.request.return || $.server.SCRIPT_NAME != '/login' ? cat('?return=', escape(default($.request.return, $.server.REQUEST_URI), url))}">{_ "recover your password"}</a>{/capture}
46-
{capture assign=registerLink}<a href="/register{tif $.request.return || $.server.SCRIPT_NAME != '/login' ? cat('?return=', escape(default($.request.return, $.server.REQUEST_URI), url))}">{_ "create an account"}</a>{/capture}
47-
<div class="col-sm-offset-2 col-sm-10">
48-
<p>{sprintf(_('You can %s, or %s now.'), $recoverLink, $registerLink)}</p>
49-
</div>
50-
</div>
44+
{capture assign=recoverLink}<a href="/register/recover{tif $.request.return || $.server.SCRIPT_NAME != '/login' ? cat('?return=', escape(default($.request.return, $.server.REQUEST_URI), url))}">{_ "recover your password"}</a>{/capture}
45+
{capture assign=registerLink}<a href="/register{tif $.request.return || $.server.SCRIPT_NAME != '/login' ? cat('?return=', escape(default($.request.return, $.server.REQUEST_URI), url))}">{_ "create an account"}</a>{/capture}
46+
47+
<p>{sprintf(_('You can %s, or %s now.'), $recoverLink, $registerLink)}</p>
5148
{/strip}
5249

5350
{foreach item=value key=name from=$postVars}

‎html-templates/people/person.tpl‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
<div class="page-header">
1010
{if $.User->ID == $Person->ID || (ProfileRequestHandler::$accountLevelEditOthers && $.User->hasAccountLevel(ProfileRequestHandler::$accountLevelEditOthers))}
11-
<div class="btn-toolbar pull-right">
11+
<p class="btn-toolbar pull-right">
1212
<div class="btn-group">
1313
<a class="btn btn-primary" href="/profile{tif $.User->ID != $Person->ID ? cat('?person=', $Person->ID)}">Edit Profile</a>
1414
{if $.User->hasAccountLevel('Staff')}
1515
<a class="btn btn-danger" href="{$Person->getUrl('/delete')|escape}">Delete {personName $Person}</a>
1616
{/if}
1717
</div>
18-
</div>
18+
</p>
1919
{/if}
2020

2121
<h1>{personName $Person}</h1>
@@ -26,11 +26,13 @@
2626

2727
<div class="row">
2828
<div id="photos" class="col-sm-3">
29-
{avatar $Person size=200 imgCls="img-responsive"}
30-
<div id="photo-thumbs" class="clearfix">
31-
{foreach item=Photo from=$Person->Photos}
32-
<a href="{$Photo->getThumbnailRequest(1024,768)}" class="photo-thumb" id="t{$Photo->ID}" title="{$Photo->Caption|escape}"><img src="{$Photo->getThumbnailRequest(48,48)}" /></a>
33-
{/foreach}
29+
<div class="text-center">
30+
{avatar $Person size=200 imgCls="img-responsive"}
31+
<div id="photo-thumbs" class="clearfix">
32+
{foreach item=Photo from=$Person->Photos}
33+
<a href="{$Photo->getThumbnailRequest(1024,768)}" class="photo-thumb" id="t{$Photo->ID}" title="{$Photo->Caption|escape}"><img src="{$Photo->getThumbnailRequest(48,48)}" /></a>
34+
{/foreach}
35+
</div>
3436
</div>
3537
</div>
3638

‎html-templates/projects/projectEdit.tpl‎

Lines changed: 101 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -12,108 +12,109 @@
1212
{block content}
1313
{$Project = $data}
1414

15-
<header class="page-header">
16-
<h2>
17-
{if $Project->isPhantom}
18-
{_ "Create new project"}
19-
{else}
20-
{_("Edit project %s")|sprintf:$Project->Title|escape}
21-
{/if}
22-
</h2>
23-
</header>
24-
25-
{if !$Project->isValid}
26-
<div class="error well">
27-
<strong>{_ "There were problems with your entry:"}</strong>
28-
<ul class="errors">
29-
{foreach item=error key=field from=$Project->validationErrors}
30-
<li>{$error}</li>
31-
{/foreach}
32-
</ul>
33-
</div>
34-
{/if}
15+
<div class="container">
16+
<div class="row">
17+
<div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
18+
<div class="page-header">
19+
<h1>
20+
{if $Project->isPhantom}
21+
{_ "Create new project"}
22+
{else}
23+
{_("Edit project %s")|sprintf:$Project->Title|escape}
24+
{/if}
25+
</h1>
26+
</div>
3527

28+
{if !$Project->isValid}
29+
<div class="error well">
30+
<strong>{_ "There were problems with your entry:"}</strong>
31+
<ul class="errors">
32+
{foreach item=error key=field from=$Project->validationErrors}
33+
<li>{$error}</li>
34+
{/foreach}
35+
</ul>
36+
</div>
37+
{/if}
3638

37-
<form method="POST" class="form-horizontal">
38-
<div class="control-group">
39-
<label for="field-title" class="control-label">{_ "Title"}:</label>
40-
<div class="controls">
41-
<input name="Title" id="field-title" placeholder="{_ 'Train Schedule Analyzer'}"
42-
value="{refill field=Title default=$Project->Title}" />
39+
<form method="POST">
40+
<div class="form-group">
41+
<label for="field-title">{_ "Title"}:</label>
42+
<input name="Title" id="field-title" class="form-control" placeholder="{_ 'Train Schedule Analyzer'}" value="{refill field=Title default=$Project->Title}" />
43+
</div>
44+
<div class="form-group">
45+
<label for="field-url-users">{_ "Users' URL"}:</label>
46+
<input type="url" name="UsersUrl" id="field-url-users" class="form-control" placeholder="{_ 'http://mypublicapp.org'}" value="{refill field=UsersUrl default=$Project->UsersUrl}" />
47+
</div>
48+
<div class="form-group">
49+
<label for="field-url-developers">{_ "Developers' URL"}:</label>
50+
<input type="url" name="DevelopersUrl" id="field-url-developers" class="form-control" placeholder="http://github.com/..." value="{refill field=DevelopersUrl default=$Project->DevelopersUrl}"/>
51+
</div>
52+
<div class="form-group">
53+
<label for="topicTagsInput">{_ 'Topic Tags'}:</label>
54+
<input type="tags" data-tag-prefix="topic" id="topicTagsInput" class="form-control" name="tags[topic]" placeholder="{_ 'Education, Mapping, Crime'}" value="{refill field=tags.topic default=Tag::getTagsString($Project->Tags, topic)}"/>
55+
</div>
56+
<div class="form-group">
57+
<label for="techTagsInput">{_ 'Technology Tags'}:</label>
58+
<input type="tags" data-tag-prefix="tech" id="techTagsInput" class="form-control" name="tags[tech]" placeholder="{_ 'PHP, Bootstrap, JavaScript'}" value="{refill field=tags.tech default=Tag::getTagsString($Project->Tags, tech)}"/>
59+
</div>
60+
<div class="form-group">
61+
<label for="eventTagsInput">{_ 'Event Tags'}:</label>
62+
<input type="tags" data-tag-prefix="event" id="eventTagsInput" class="form-control" name="tags[event]" placeholder="{_ 'Education Hackathon 2014'}" value="{refill field=tags.event default=Tag::getTagsString($Project->Tags, event)}"/>
63+
</div>
64+
<p id="project-stage"><b>{_ 'Stage'}:</b></p>
65+
<div aria-labelledby="project-stage">
66+
<div class="radio">
67+
<label>
68+
<input type="radio" name="Stage" value="Commenting" {refill field=Stage default=$Project->Stage|default:Commenting checked=Commenting}>
69+
<b>{_ Commenting}</b>: {Laddr\Project::getStageDescription(Commenting)}
70+
</label>
71+
</div>
72+
<div class="radio">
73+
<label>
74+
<input type="radio" name="Stage" value="Bootstrapping" {refill field=Stage default=$Project->Stage checked=Bootstrapping}>
75+
<b>{_ Bootstrapping}</b>: {Laddr\Project::getStageDescription(Bootstrapping)}
76+
</label>
77+
</div>
78+
<div class="radio">
79+
<label>
80+
<input type="radio" name="Stage" value="Prototyping" {refill field=Stage default=$Project->Stage checked=Prototyping}>
81+
<b>{_ Prototyping}</b>: {Laddr\Project::getStageDescription(Prototyping)}
82+
</label>
83+
</div>
84+
<div class="radio">
85+
<label>
86+
<input type="radio" name="Stage" value="Testing" {refill field=Stage default=$Project->Stage checked=Testing}>
87+
<b>{_ Testing}</b>: {Laddr\Project::getStageDescription(Testing)}
88+
</label>
89+
</div>
90+
<div class="radio">
91+
<label>
92+
<input type="radio" name="Stage" value="Maintaining" {refill field=Stage default=$Project->Stage checked=Maintaining}>
93+
<b>{_ Maintaining}</b>: {Laddr\Project::getStageDescription(Maintaining)}
94+
</label>
95+
</div>
96+
<div class="radio">
97+
<label>
98+
<input type="radio" name="Stage" value="Drifting" {refill field=Stage default=$Project->Stage checked=Drifting}>
99+
<b>{_ Drifting}</b>: {Laddr\Project::getStageDescription(Drifting)}
100+
</label>
101+
</div>
102+
<div class="radio">
103+
<label>
104+
<input type="radio" name="Stage" value="Hibernating" {refill field=Stage default=$Project->Stage checked=Hibernating}>
105+
<b>{_ Hibernating}</b>: {Laddr\Project::getStageDescription(Hibernating)}
106+
</label>
107+
</div>
108+
</div>
109+
<div class="form-group">
110+
<label for="README">{_ 'README(.md)'}</label>
111+
<div class="controls">
112+
<textarea name="README" class="input-block-level" rows="10">{refill field=README default=$Project->README}</textarea>
113+
</div>
114+
</div>
115+
<button type="submit" class="btn btn-primary">{if $Project->isPhantom}{_ 'Create Project'}{else}{_ 'Save Changes'}{/if}</button>
116+
</form>
43117
</div>
44118
</div>
45-
<div class="control-group">
46-
<label for="field-url-users" class="control-label">{_ "Users' URL"}:</label>
47-
<div class="controls">
48-
<input name="UsersUrl" id="field-url-users" placeholder="{_ 'http://mypublicapp.org'}"
49-
value="{refill field=UsersUrl default=$Project->UsersUrl}" class="input-xxlarge" />
50-
</div>
51-
</div>
52-
<div class="control-group">
53-
<label for="field-url-developers" class="control-label">{_ "Developers' URL"}:</label>
54-
<div class="controls">
55-
<input name="DevelopersUrl" id="field-url-developers" placeholder="http://github.com/..."
56-
value="{refill field=DevelopersUrl default=$Project->DevelopersUrl}" class="input-xxlarge"/>
57-
</div>
58-
</div>
59-
<div class="control-group">
60-
<label for="topicTagsInput" class="control-label">{_ 'Topic Tags'}:</label>
61-
<div class="controls">
62-
<input type="tags" data-tag-prefix="topic" id="topicTagsInput" name="tags[topic]" placeholder="{_ 'Education, Mapping, Crime'}" value="{refill field=tags.topic default=Tag::getTagsString($Project->Tags, topic)}"/>
63-
</div>
64-
</div>
65-
<div class="control-group">
66-
<label for="techTagsInput" class="control-label">{_ 'Technology Tags'}:</label>
67-
<div class="controls">
68-
<input type="tags" data-tag-prefix="tech" id="techTagsInput" name="tags[tech]" placeholder="{_ 'PHP, Bootstrap, JavaScript'}" value="{refill field=tags.tech default=Tag::getTagsString($Project->Tags, tech)}"/>
69-
</div>
70-
</div>
71-
<div class="control-group">
72-
<label for="eventTagsInput" class="control-label">{_ 'Event Tags'}:</label>
73-
<div class="controls">
74-
<input type="tags" data-tag-prefix="event" id="eventTagsInput" name="tags[event]" placeholder="{_ 'Education Hackathon 2014'}" value="{refill field=tags.event default=Tag::getTagsString($Project->Tags, event)}"/>
75-
</div>
76-
</div>
77-
<div class="control-group">
78-
<label class="control-label">{_ 'Stage'}:</label>
79-
<div class="controls">
80-
<label class="radio">
81-
<input type="radio" name="Stage" value="Commenting" {refill field=Stage default=$Project->Stage|default:Commenting checked=Commenting}>
82-
<strong>{_ Commenting}</strong>: {Laddr\Project::getStageDescription(Commenting)}
83-
</label>
84-
<label class="radio">
85-
<input type="radio" name="Stage" value="Bootstrapping" {refill field=Stage default=$Project->Stage checked=Bootstrapping}>
86-
<strong>{_ Bootstrapping}</strong>: {Laddr\Project::getStageDescription(Bootstrapping)}
87-
</label>
88-
<label class="radio">
89-
<input type="radio" name="Stage" value="Prototyping" {refill field=Stage default=$Project->Stage checked=Prototyping}>
90-
<strong>{_ Prototyping}</strong>: {Laddr\Project::getStageDescription(Prototyping)}
91-
</label>
92-
<label class="radio">
93-
<input type="radio" name="Stage" value="Testing" {refill field=Stage default=$Project->Stage checked=Testing}>
94-
<strong>{_ Testing}</strong>: {Laddr\Project::getStageDescription(Testing)}
95-
</label>
96-
<label class="radio">
97-
<input type="radio" name="Stage" value="Maintaining" {refill field=Stage default=$Project->Stage checked=Maintaining}>
98-
<strong>{_ Maintaining}</strong>: {Laddr\Project::getStageDescription(Maintaining)}
99-
</label>
100-
<label class="radio">
101-
<input type="radio" name="Stage" value="Drifting" {refill field=Stage default=$Project->Stage checked=Drifting}>
102-
<strong>{_ Drifting}</strong>: {Laddr\Project::getStageDescription(Drifting)}
103-
</label>
104-
<label class="radio">
105-
<input type="radio" name="Stage" value="Hibernating" {refill field=Stage default=$Project->Stage checked=Hibernating}>
106-
<strong>{_ Hibernating}</strong>: {Laddr\Project::getStageDescription(Hibernating)}
107-
</label>
108-
</div>
109-
</div>
110-
<div class="control-group">
111-
<label for="README" class="control-label">{_ 'README(.md)'}</label>
112-
<div class="controls">
113-
<textarea name="README" class="input-block-level" rows="10">{refill field=README default=$Project->README}</textarea>
114-
<br/><br/>
115-
<input type="submit" class="btn-sm btn btn-default" value="{if $Project->isPhantom}{_ 'Create Project'}{else}{_ 'Save Changes'}{/if}"/>
116-
</div>
117-
</div>
118-
</form>
119+
</div>
119120
{/block}

‎html-templates/projects/projectSaved.tpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
{capture assign=projectLink}{projectLink $Project}{/capture}
99

10+
<div class="page-header">
11+
<h1>Project Created</h1>
12+
</div>
1013
{if $Project->isNew}
1114
<p>{_("Your project has been created: %s")|sprintf:$projectLink}</p>
1215
{else}

0 commit comments

Comments
 (0)