Merge pull request #205 from CodeForPhilly/develop

Release: laddr v3.0.0-beta.3

Author: themightychris

README.md

@@ -39,13 +39,11 @@ At that point you should be able to see an instance at http://localhost:7080 and
 
 ### Extend Laddr
 
-*TODO: Extending project docs*
+For a permanent instance of laddr, you might want to consider deploying an *extending* project rather than laddr itself. [CodeForPhilly.org](https://codeforphilly.org) for example, is deployed from [a repository](https://github.com/CodeForPhilly/codeforphilly.org) that only contains a layer of customization that gets applied on top of laddr's repository. This gives you a place to change things like your brigade's logo or add new features without forking your own whole version of laddr.
 
-```bash
-# build the codeforphilly example extending project instead
-export EMERGENCE_HOLOBRANCH=example-codeforphilly
-watch-site
-```
+To start a new extending project, initialize a new repository and copy the [`.holo/`](https://github.com/CodeForPhilly/codeforphilly.org/tree/develop/.holo) tree from the codeforphilly repository as a starting point. Replace `codeforphilly` with an identifier of your choice for your own project (maybe the repository name) in `.holo/config.toml` and rename `.holo/branches/emergence-site/_codeforphilly.toml` to match.
+
+Then follow the same steps above to launch the project inside a container.
 
 ## Support
 

html-templates/people/people.tpl

@@ -19,7 +19,7 @@
     <div class="row">
         <div class="col-sm-4 col-md-3">
             <div class="tags-ct">
-                <div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">
+                <div class="btn-group btn-group-justified btn-group-sm margin-bottom" role="group">
                     <a href="#members-by-tech" class="tagFilter active btn btn-secondary" role="button" data-group="byTech">{_ "skills"}</a>
                     <a href="#members-by-project" class="tagFilter btn btn-secondary" role="button" data-group="byTopic">{_ "topics"}</a>
                 </div>

html-templates/projects/projects.tpl

@@ -25,7 +25,7 @@
 
     <div class="row">
         <div class="col-sm-4 col-md-3 tags-ct">
-            <div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">
+            <div class="btn-group btn-group-justified btn-group-sm margin-bottom" role="group">
                 <a href="#projects-by-topic" class="active btn btn-secondary" role="button" data-group="byTopic">{_ "topics"}</a>
                 <a href="#projects-by-tech" class="btn btn-secondary" role="button" data-group="byTech">{_ "tech"}</a>
                 <a href="#projects-by-event" class="btn btn-secondary" role="button" data-group="byEvent">{_ "events"}</a>

html-templates/subtemplates/buzz.tpl

@@ -29,9 +29,9 @@
         </div>
         <footer class="post-footer card-footer">
             {if Laddr\ProjectBuzzRequestHandler::checkWriteAccess($Buzz)}
-                <div class="btn-group pull-right">
-                    <a href="{$Buzz->getURL()}/edit" class="btn btn-sm btn-secondary">{icon "pencil"} <span class="sr-only">{_ Edit}</span></a>
-                    <a href="{$Buzz->getURL()}/delete" class="btn btn-sm btn-danger">{icon "trash"} <span class="sr-only">{_ Delete}</span></a>
+                <div class="btn-group-sm pull-right">
+                    <a href="{$Buzz->getURL()}/edit" class="btn btn-secondary">{icon "pencil"} <span class="sr-only">{_ Edit}</span></a>
+                    <a href="{$Buzz->getURL()}/delete" class="btn btn-danger">{icon "trash"} <span class="sr-only">{_ Delete}</span></a>
                 </div>
             {/if}
 

html-templates/subtemplates/people.tpl

@@ -12,7 +12,7 @@
     {if $urlOnly}
         {$src}
     {else}
-        <img width={$size} height={$size} alt="{personName $Person}" src="{$src}" class="avatar{if $imgCls} {$imgCls}{/if}">
+        <img height={$size} alt="{personName $Person}" src="{$src}" class="avatar{if $imgCls} {$imgCls}{/if}">
     {/if}
 {/strip}{/template}
 
@@ -28,8 +28,8 @@
             {else}
                 {capture assign=src}//www.gravatar.com/avatar/{$Person->Email|strtolower|md5}?size={$pixels}&rating=g&default={Laddr::$gravatarDefault}{/capture}
             {/if}
-            <div><img src="{$src}" class="avatar {if $imgCls}{$imgCls}{/if}" width="{$photoSize}" height="{$photoSize}" /></div>
+            <img src="{$src}" class="avatar {if $imgCls}{$imgCls}{/if}" width="{$photoSize}" height="{$photoSize}" />
         {/if}
-        <div class="name {$imgCls} mb-4">{personName $Person summary=$summary}</div>
+        <span class="name">{personName $Person summary=$summary}</span>
     </a>
 {/strip}{/template}

html-templates/subtemplates/updates.tpl

@@ -22,9 +22,9 @@
         </div>
         <footer class="post-footer card-footer clearfix">
             {if Laddr\ProjectUpdatesRequestHandler::checkWriteAccess($Update)}
-                <div class="btn-group pull-right">
-                    <a href="{$Update->getURL()}/edit" class="btn btn-sm btn-secondary">{icon "pencil"} <span class="sr-only">{_ Edit}</span></a>
-                    <a href="{$Update->getURL()}/delete" class="btn btn-sm btn-danger">{icon "trash"} <span class="sr-only">{_ Delete}</span></a>
+                <div class="btn-group-sm pull-right">
+                    <a href="{$Update->getURL()}/edit" class="btn btn-secondary">{icon "pencil"} <span class="sr-only">{_ Edit}</span></a>
+                    <a href="{$Update->getURL()}/delete" class="btn btn-danger">{icon "trash"} <span class="sr-only">{_ Delete}</span></a>
                 </div>
             {/if}
 

php-classes/Laddr.php

@@ -11,7 +11,7 @@ class Laddr
     public static function __classLoaded()
     {
         if (empty(static::$siteName)) {
-            static::$siteName = Site::getConfig('label');
+            static::$siteName = Site::getConfig('label') ?: 'Brigade';
         }
 
         if (empty(static::$siteAbbr)) {

php-config/Laddr.config.d/branding.php

@@ -1,5 +1,5 @@
 <?php
 
-Laddr::$siteName = _('Brigade');
-#Laddr::$siteAbbr = _('CfP');
+// Laddr::$siteName = _('Code for Philly');
+// Laddr::$siteAbbr = _('CfP');
 Laddr::$siteSlogan = _('We\'re part of [a national alliance](https://brigade.codeforamerica.org) of community organizers, developers, and designers that are putting technology to work in service of our local communities. We believe that government can work, for the people, by the people, in the digital age, if we all help.');