Skip to content

Release: laddr v2.3.1 #147

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

Merged
themightychris merged 2 commits into from
Aug 16, 2016
Merged

Release: laddr v2.3.1 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8997812
Change bootstrap breakpoints to 1024px
Aug 16, 2016
017c8a8
Improve misc markup
Aug 16, 2016
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
8 changes: 4 additions & 4 deletions html-templates/home.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<p class="media-heading">{Laddr::$siteSlogan|escape}</p>
<ul class="list-inline">
{if $.User}
<li><a href="/chat" class="btn btn-lg btn-success">{glyph "comment"}&nbsp;{_ "Chat with us on Slack"}</a></li>
<li><p><a href="/chat" class="btn btn-lg btn-success">{glyph "comment"}&nbsp;{_ "Chat with us on Slack"}</a></p></li>
{else}
<li><a href="/register" class="btn btn-lg btn-success">{glyph "heart"}&nbsp;{_ "Join Us!"}</a></li>
<li><p><a href="/register" class="btn btn-lg btn-success">{glyph "heart"}&nbsp;{_ "Join Us!"}</a></p></li>
{/if}
<li><a href="/projects" class="btn btn-lg btn-primary">{glyph "book"}&nbsp;{_ "Browse Projects"}</a></li>
<li><p><a href="/projects" class="btn btn-lg btn-primary">{glyph "book"}&nbsp;{_ "Browse Projects"}</a></p></li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -124,4 +124,4 @@
</div>
</div>
</main>
{/block}
{/block}
6 changes: 4 additions & 2 deletions html-templates/includes/site.footer.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

{capture assign=laddrLink}<a href="http://laddr.us">Laddr</a>{/capture}
{capture assign=cfpLink}<a href="http://codeforphilly.org">Code for Philly</a>{/capture}
{sprintf(_("Powered by %s &mdash; a %s project."), $laddrLink, $cfpLink)}
<br>

<p>{sprintf(_("Powered by %s &mdash; a %s project."), $laddrLink, $cfpLink)}</p>

{localeSelector}

{*
{if $.responseId == 'home'}
<br>Cover photo by <a href="XXXXXX" target="_blank">XXXXXX</a>.
Expand Down
11 changes: 4 additions & 7 deletions html-templates/login/login.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,10 @@
<button type="submit" class="btn btn-primary">{_ Login}</button>
</div>

<div class="form-group">
{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}
{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}
<div class="col-sm-offset-2 col-sm-10">
<p>{sprintf(_('You can %s, or %s now.'), $recoverLink, $registerLink)}</p>
</div>
</div>
{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}
{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}

<p>{sprintf(_('You can %s, or %s now.'), $recoverLink, $registerLink)}</p>
{/strip}

{foreach item=value key=name from=$postVars}
Expand Down
16 changes: 9 additions & 7 deletions html-templates/people/person.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

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

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

<div class="row">
<div id="photos" class="col-sm-3">
{avatar $Person size=200 imgCls="img-responsive"}
<div id="photo-thumbs" class="clearfix">
{foreach item=Photo from=$Person->Photos}
<a href="{$Photo->getThumbnailRequest(1024,768)}" class="photo-thumb" id="t{$Photo->ID}" title="{$Photo->Caption|escape}"><img src="{$Photo->getThumbnailRequest(48,48)}" /></a>
{/foreach}
<div class="text-center">
{avatar $Person size=200 imgCls="img-responsive"}
<div id="photo-thumbs" class="clearfix">
{foreach item=Photo from=$Person->Photos}
<a href="{$Photo->getThumbnailRequest(1024,768)}" class="photo-thumb" id="t{$Photo->ID}" title="{$Photo->Caption|escape}"><img src="{$Photo->getThumbnailRequest(48,48)}" /></a>
{/foreach}
</div>
</div>
</div>

Expand Down
201 changes: 101 additions & 100 deletions html-templates/projects/projectEdit.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,108 +12,109 @@
{block content}
{$Project = $data}

<header class="page-header">
<h2>
{if $Project->isPhantom}
{_ "Create new project"}
{else}
{_("Edit project %s")|sprintf:$Project->Title|escape}
{/if}
</h2>
</header>

{if !$Project->isValid}
<div class="error well">
<strong>{_ "There were problems with your entry:"}</strong>
<ul class="errors">
{foreach item=error key=field from=$Project->validationErrors}
<li>{$error}</li>
{/foreach}
</ul>
</div>
{/if}
<div class="container">
<div class="row">
<div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
<div class="page-header">
<h1>
{if $Project->isPhantom}
{_ "Create new project"}
{else}
{_("Edit project %s")|sprintf:$Project->Title|escape}
{/if}
</h1>
</div>

{if !$Project->isValid}
<div class="error well">
<strong>{_ "There were problems with your entry:"}</strong>
<ul class="errors">
{foreach item=error key=field from=$Project->validationErrors}
<li>{$error}</li>
{/foreach}
</ul>
</div>
{/if}

<form method="POST" class="form-horizontal">
<div class="control-group">
<label for="field-title" class="control-label">{_ "Title"}:</label>
<div class="controls">
<input name="Title" id="field-title" placeholder="{_ 'Train Schedule Analyzer'}"
value="{refill field=Title default=$Project->Title}" />
<form method="POST">
<div class="form-group">
<label for="field-title">{_ "Title"}:</label>
<input name="Title" id="field-title" class="form-control" placeholder="{_ 'Train Schedule Analyzer'}" value="{refill field=Title default=$Project->Title}" />
</div>
<div class="form-group">
<label for="field-url-users">{_ "Users' URL"}:</label>
<input type="url" name="UsersUrl" id="field-url-users" class="form-control" placeholder="{_ 'http://mypublicapp.org'}" value="{refill field=UsersUrl default=$Project->UsersUrl}" />
</div>
<div class="form-group">
<label for="field-url-developers">{_ "Developers' URL"}:</label>
<input type="url" name="DevelopersUrl" id="field-url-developers" class="form-control" placeholder="http://github.com/..." value="{refill field=DevelopersUrl default=$Project->DevelopersUrl}"/>
</div>
<div class="form-group">
<label for="topicTagsInput">{_ 'Topic Tags'}:</label>
<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)}"/>
</div>
<div class="form-group">
<label for="techTagsInput">{_ 'Technology Tags'}:</label>
<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)}"/>
</div>
<div class="form-group">
<label for="eventTagsInput">{_ 'Event Tags'}:</label>
<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)}"/>
</div>
<p id="project-stage"><b>{_ 'Stage'}:</b></p>
<div aria-labelledby="project-stage">
<div class="radio">
<label>
<input type="radio" name="Stage" value="Commenting" {refill field=Stage default=$Project->Stage|default:Commenting checked=Commenting}>
<b>{_ Commenting}</b>: {Laddr\Project::getStageDescription(Commenting)}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="Stage" value="Bootstrapping" {refill field=Stage default=$Project->Stage checked=Bootstrapping}>
<b>{_ Bootstrapping}</b>: {Laddr\Project::getStageDescription(Bootstrapping)}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="Stage" value="Prototyping" {refill field=Stage default=$Project->Stage checked=Prototyping}>
<b>{_ Prototyping}</b>: {Laddr\Project::getStageDescription(Prototyping)}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="Stage" value="Testing" {refill field=Stage default=$Project->Stage checked=Testing}>
<b>{_ Testing}</b>: {Laddr\Project::getStageDescription(Testing)}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="Stage" value="Maintaining" {refill field=Stage default=$Project->Stage checked=Maintaining}>
<b>{_ Maintaining}</b>: {Laddr\Project::getStageDescription(Maintaining)}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="Stage" value="Drifting" {refill field=Stage default=$Project->Stage checked=Drifting}>
<b>{_ Drifting}</b>: {Laddr\Project::getStageDescription(Drifting)}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="Stage" value="Hibernating" {refill field=Stage default=$Project->Stage checked=Hibernating}>
<b>{_ Hibernating}</b>: {Laddr\Project::getStageDescription(Hibernating)}
</label>
</div>
</div>
<div class="form-group">
<label for="README">{_ 'README(.md)'}</label>
<div class="controls">
<textarea name="README" class="input-block-level" rows="10">{refill field=README default=$Project->README}</textarea>
</div>
</div>
<button type="submit" class="btn btn-primary">{if $Project->isPhantom}{_ 'Create Project'}{else}{_ 'Save Changes'}{/if}</button>
</form>
</div>
</div>
<div class="control-group">
<label for="field-url-users" class="control-label">{_ "Users' URL"}:</label>
<div class="controls">
<input name="UsersUrl" id="field-url-users" placeholder="{_ 'http://mypublicapp.org'}"
value="{refill field=UsersUrl default=$Project->UsersUrl}" class="input-xxlarge" />
</div>
</div>
<div class="control-group">
<label for="field-url-developers" class="control-label">{_ "Developers' URL"}:</label>
<div class="controls">
<input name="DevelopersUrl" id="field-url-developers" placeholder="http://github.com/..."
value="{refill field=DevelopersUrl default=$Project->DevelopersUrl}" class="input-xxlarge"/>
</div>
</div>
<div class="control-group">
<label for="topicTagsInput" class="control-label">{_ 'Topic Tags'}:</label>
<div class="controls">
<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)}"/>
</div>
</div>
<div class="control-group">
<label for="techTagsInput" class="control-label">{_ 'Technology Tags'}:</label>
<div class="controls">
<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)}"/>
</div>
</div>
<div class="control-group">
<label for="eventTagsInput" class="control-label">{_ 'Event Tags'}:</label>
<div class="controls">
<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)}"/>
</div>
</div>
<div class="control-group">
<label class="control-label">{_ 'Stage'}:</label>
<div class="controls">
<label class="radio">
<input type="radio" name="Stage" value="Commenting" {refill field=Stage default=$Project->Stage|default:Commenting checked=Commenting}>
<strong>{_ Commenting}</strong>: {Laddr\Project::getStageDescription(Commenting)}
</label>
<label class="radio">
<input type="radio" name="Stage" value="Bootstrapping" {refill field=Stage default=$Project->Stage checked=Bootstrapping}>
<strong>{_ Bootstrapping}</strong>: {Laddr\Project::getStageDescription(Bootstrapping)}
</label>
<label class="radio">
<input type="radio" name="Stage" value="Prototyping" {refill field=Stage default=$Project->Stage checked=Prototyping}>
<strong>{_ Prototyping}</strong>: {Laddr\Project::getStageDescription(Prototyping)}
</label>
<label class="radio">
<input type="radio" name="Stage" value="Testing" {refill field=Stage default=$Project->Stage checked=Testing}>
<strong>{_ Testing}</strong>: {Laddr\Project::getStageDescription(Testing)}
</label>
<label class="radio">
<input type="radio" name="Stage" value="Maintaining" {refill field=Stage default=$Project->Stage checked=Maintaining}>
<strong>{_ Maintaining}</strong>: {Laddr\Project::getStageDescription(Maintaining)}
</label>
<label class="radio">
<input type="radio" name="Stage" value="Drifting" {refill field=Stage default=$Project->Stage checked=Drifting}>
<strong>{_ Drifting}</strong>: {Laddr\Project::getStageDescription(Drifting)}
</label>
<label class="radio">
<input type="radio" name="Stage" value="Hibernating" {refill field=Stage default=$Project->Stage checked=Hibernating}>
<strong>{_ Hibernating}</strong>: {Laddr\Project::getStageDescription(Hibernating)}
</label>
</div>
</div>
<div class="control-group">
<label for="README" class="control-label">{_ 'README(.md)'}</label>
<div class="controls">
<textarea name="README" class="input-block-level" rows="10">{refill field=README default=$Project->README}</textarea>
<br/><br/>
<input type="submit" class="btn-sm btn btn-default" value="{if $Project->isPhantom}{_ 'Create Project'}{else}{_ 'Save Changes'}{/if}"/>
</div>
</div>
</form>
</div>
{/block}
3 changes: 3 additions & 0 deletions html-templates/projects/projectSaved.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

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

<div class="page-header">
<h1>Project Created</h1>
</div>
{if $Project->isNew}
<p>{_("Your project has been created: %s")|sprintf:$projectLink}</p>
{else}
Expand Down
Loading