From bf4b6bd3c608fefb8965780b55ce69816b2a3d08 Mon Sep 17 00:00:00 2001
From: Kevin Dexter <kevinscottdexter@gmail.com>
Date: Tue, 9 Jan 2018 19:04:14 -0500
Subject: [PATCH 01/32] Project Roles/Applications

WIP -- Roles for projects where users can apply for a position (role).
---
 html-templates/projects/project.tpl           | 259 +++++++++++++++++-
 html-templates/projects/roleAdded.tpl         |  12 +
 .../projects/roleApplicationAdded.tpl         |  12 +
 html-templates/projects/roleModified.tpl      |  12 +
 html-templates/projects/roleRemoved.tpl       |  14 +
 php-classes/Laddr/Project.php                 |  26 +-
 php-classes/Laddr/ProjectRole.php             |  46 ++++
 php-classes/Laddr/ProjectsRequestHandler.php  | 106 +++++++
 php-classes/Laddr/RoleApplication.php         |  61 +++++
 site-root/js/pages/project.js                 |  23 +-
 10 files changed, 564 insertions(+), 7 deletions(-)
 create mode 100644 html-templates/projects/roleAdded.tpl
 create mode 100644 html-templates/projects/roleApplicationAdded.tpl
 create mode 100644 html-templates/projects/roleModified.tpl
 create mode 100644 html-templates/projects/roleRemoved.tpl
 create mode 100644 php-classes/Laddr/ProjectRole.php
 create mode 100644 php-classes/Laddr/RoleApplication.php

diff --git a/html-templates/projects/project.tpl b/html-templates/projects/project.tpl
index 5407acd1..b312f601 100644
--- a/html-templates/projects/project.tpl
+++ b/html-templates/projects/project.tpl
@@ -4,7 +4,47 @@
 
 {block content}
     {$Project = $data}
-
+    
+    <form id="modify-role" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/modify-role" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-member-title" class="modal-title">{_ "Edit project role"}</h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group" style="display: none;">
+                        <label for="inputRoleId" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRoleId" class="form-control" name="role_id" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputRole" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRole" class="form-control" name="role" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputRoleDescription" class="col-sm-2 control-label">{_ "Description"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputRoleDescription" class="form-control" name="description" value="" required></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputUsername" class="col-sm-2 control-label">{_ "Username"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputUsername" class="form-control" name="username" placeholder="{_ 'optional'}">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Save Role"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
     <div class="page-header">
         <div class="btn-toolbar pull-right">
             <div class="btn-group">
@@ -12,12 +52,15 @@
                 {if $.User}
                     <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                     <ul class="dropdown-menu">
+                        <li><a href="#add-role" data-toggle="modal">{_ "Add Role"}</a></li>
                         <li><a href="#add-member" data-toggle="modal">{_ "Add Member"}</a></li>
                         <li><a href="/project-buzz/create?ProjectID={$Project->ID}">{_ "Log Buzz"}</a></li>
                         {if $.User && ($Project->hasMember($.User) || $.Session->hasAccountLevel('Staff'))}
+                            <li><a href="/project-applications/view?ProjectID={$Project->ID}">{_ "Role Applications"}</a></li>
                             <li><a href="#post-update" data-toggle="modal">{_ "Post Update"}</a></li>
                         {/if}
                         {if $.Session->hasAccountLevel('Staff')}
+                            <li><a href="#manage-roles" data-toggle="modal">{_ "Manage Roles"}</a></li>
                             <li><a href="#manage-members" data-toggle="modal">{_ "Manage Members"}</a></li>
                         {/if}
                     </ul>
@@ -158,6 +201,105 @@
                 {/if}
             </div>
                 
+            <!--  PROJECT ROLES BLOCK  -->
+            <h3> Filled Roles</h3>
+            <table id='role_table' width="100%" style="margin-bottom: 10px">
+            {foreach item=Role from=$Project->Roles}
+                {$Person = $Role->Person}
+                    {if $Person}
+                        <tr>
+                            <td rowspan="2" width="70px">
+                                <a
+                                    href="/members/{$Person->Username}"
+                                    class="member-thumbnail"
+                                    data-toggle="tooltip"
+                                    data-placement="bottom"
+                                    title="{projectMemberTitle $Role} {tif $Role->PersonID>0 ? '&mdash;' : '&mdash; Vacant'} {personName $Person}"
+                                >
+                                    {if $Project->MaintainerID == $Person->ID}
+                                        {avatar $Person size=64}
+                                    {else}
+                                        {avatar $Person size=48}
+                                    {/if}
+                                </a>
+                            </td>
+                            <td>
+                                {$Role->Role}
+                            </td>
+                            <td style="text-align:right">
+                                {if $.Session->hasAccountLevel('Staff')}
+                                    {if $Role->PersonID != $Project->MaintainerID}
+                                        <a href="/projects/{$Project->Handle}/change-maintainer?username={$Role->Person->Username|escape:url}" data-toggle="modal" title="Make maintainer" style="margin-left: 4px">
+                                            <span class="glyphicon glyphicon-transfer"></span>
+                                        </a>
+                                    {/if}
+                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}"  data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-edit"></span>
+                                    </a>
+                                    <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" data-toggle="modal" title="Trash" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-trash"></span>
+                                    </a>
+                                {/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=3>
+                                {personName $Person}
+                            </td>
+                        </tr>
+                    {/if}
+            {foreachelse}
+                <tr>
+                    <td colspan=3>
+                        <span class="muted">{_ "No filled roles"}</span>
+                    </td>
+                </tr>
+            {/foreach}
+            </table>
+            
+            <h3> Vacant Roles</h3>
+            <table id="open_role_table" width="100%">
+            {foreach item=Role from=$Project->Roles}
+                {$Person = $Role->Person}
+                    {if !$Person}
+                        <tr>
+                            <td>
+                                {$Role->Role}
+                            </td>
+                            <td style="text-align:right">
+                                <a href="role_application" data-toggle="modal" data-role="{$Role->ID}" data-role_title="{$Project->Title} -- {$Role->Role}" title="Apply" style="margin-left: 4px">
+                                    <span class="glyphicon glyphicon-ok"></span>
+                                </a>
+                                {if $.Session->hasAccountLevel('Staff')}
+                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}"  data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-edit"></span>
+                                    </a>
+                                    <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" data-toggle="modal" title="Trash" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-trash"></span>
+                                    </a>
+                                {/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=2>
+                                {$Role->Description}
+                            </td>
+                        </tr>
+                    {/if}
+            {foreachelse}
+                <tr>
+                    <td colspan=3>
+                        <span class="muted">{_ "No vacant roles"}</span>
+                    </td>
+                </tr>
+            {/foreach}
+            </table>
+
+            {if $.Session->hasAccountLevel('Staff')}
+                <a class="btn btn-success btn-sm add-person" href="#add-role" data-toggle="modal">+ {_ "Add"}</a>
+            {/if}
+            <hr>
+            
             <!--  MEMBERS BLOCK  -->
             {if $Project->Memberships}
                 <h3>Members</h3>
@@ -229,6 +371,68 @@
 {block js-bottom}
     {$dwoo.parent}
 
+    <form id="add-role" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-role" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-member-title" class="modal-title">{_ "Add project role"}</h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="inputRole" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRole" class="form-control" name="role" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputRoleDescription" class="col-sm-2 control-label">{_ "Description"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputRoleDescription" class="form-control" name="description" required></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputUsername" class="col-sm-2 control-label">{_ "Username"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputUsername" class="form-control" name="username" placeholder="{_ 'optional'}">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Add Role"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
+    <form id="add-application" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-application" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-application-title" class="modal-title"></h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group" style="display: none;">
+                        <label for="inputRoleId" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRoleId" class="form-control" name="role_id" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputApplication" class="col-sm-2 control-label">{_ "Application"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputApplication" class="form-control" name="application" placeholder="{_ 'optional'}"></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Apply"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
     <form id="add-member" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-member" method="POST">
         <div class="modal-dialog">    
             <div class="modal-content">    
@@ -280,6 +484,56 @@
     {/if}
 
     {if $.Session->hasAccountLevel('Staff')}
+        <div id="manage-roles" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="manage-roles-title">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                        <h2 id="manage-roles-title" class="modal-title">{_ "Manage project roles"}</h2>
+                    </div>
+                    <div class="modal-body">
+                        <table class="table table-hover">
+                            <thead>
+                                <tr>
+                                    <th>Role</th>
+                                    <th>Description</th>
+                                    <th>Person</th>
+                                    <th><span class="sr-only">Remove Role</span></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {foreach item=Role from=$Project->Roles}
+                                    <tr>
+                                        <td>{$Role->Role}</td>
+                                        <td>{$Role->Description}</td>
+                                        {if $Role->PersonID==null}
+                                            <td>Vacant</td>
+                                        {else}
+                                            <td>{personLink $Role->Person}</td>
+                                        {/if}
+                                        <td width="60px">
+                                            {if $Role->PersonID != $Project->MaintainerID}
+                                                <a href="/projects/{$Project->Handle}/change-maintainer?username={$Role->Person->Username|escape:url}" data-toggle="modal" title="Make maintainer" style="margin-left: 4px">
+                                                    <span class="glyphicon glyphicon-transfer"></span>
+                                                </a>
+                                            {/if}
+                                            <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}"  title="Trash" style="margin-left: 4px">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {foreachelse}
+                                    <tr>
+                                        <td class="muted" colspan="4">{_ "None registered"}</td>
+                                    </tr>
+                                {/foreach}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        
         <div id="manage-members" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="manage-members-title">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -324,9 +578,6 @@
         </div>
     {/if}
 
-{/block}
-
-{block js-bottom}
     {jsmin "epiceditor.js"}
     {jsmin "pages/project.js"}
 {/block}
diff --git a/html-templates/projects/roleAdded.tpl b/html-templates/projects/roleAdded.tpl
new file mode 100644
index 00000000..e715c87d
--- /dev/null
+++ b/html-templates/projects/roleAdded.tpl
@@ -0,0 +1,12 @@
+{extends designs/site.tpl}
+
+{block title}{_ "Roles"} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {capture assign=project}{projectLink $Project}{/capture}
+
+    <div class="page-header">
+        <h1>Role Added</h1>
+    </div>
+    <p class="lead">{sprintf(_("%s has been added to %s"), $data->Role, $project)}</p>
+{/block}
\ No newline at end of file
diff --git a/html-templates/projects/roleApplicationAdded.tpl b/html-templates/projects/roleApplicationAdded.tpl
new file mode 100644
index 00000000..1e08c9c1
--- /dev/null
+++ b/html-templates/projects/roleApplicationAdded.tpl
@@ -0,0 +1,12 @@
+{extends designs/site.tpl}
+
+{block title}{_ "Roles"} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {capture assign=project}{projectLink $Project}{/capture}
+
+    <div class="page-header">
+        <h1>Application Added</h1>
+    </div>
+    <p class="lead">{sprintf(_(Your application for "%s has been added to %s"), $data->Role, $project)}</p>
+{/block}
\ No newline at end of file
diff --git a/html-templates/projects/roleModified.tpl b/html-templates/projects/roleModified.tpl
new file mode 100644
index 00000000..76ed7c53
--- /dev/null
+++ b/html-templates/projects/roleModified.tpl
@@ -0,0 +1,12 @@
+{extends designs/site.tpl}
+
+{block title}{_ "Roles"} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {capture assign=project}{projectLink $Project}{/capture}
+
+    <div class="page-header">
+        <h1>Role Modified</h1>
+    </div>
+    <p class="lead">{sprintf(_("%s has been modified for %s"), $data->Role, $project)}</p>
+{/block}
\ No newline at end of file
diff --git a/html-templates/projects/roleRemoved.tpl b/html-templates/projects/roleRemoved.tpl
new file mode 100644
index 00000000..2052d488
--- /dev/null
+++ b/html-templates/projects/roleRemoved.tpl
@@ -0,0 +1,14 @@
+{extends designs/site.tpl}
+
+{block title}Roles &mdash; {$dwoo.parent}{/block}
+
+{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">
+            <h1>Role Removed</h1>
+        </div>
+        <p>{if $data && $data->Role}({$data->Role|escape}){/if} has been removed from {projectLink $Project}</p>
+    </div>
+</div>
+{/block}
\ No newline at end of file
diff --git a/php-classes/Laddr/Project.php b/php-classes/Laddr/Project.php
index 6ba50e1e..18de4cdb 100644
--- a/php-classes/Laddr/Project.php
+++ b/php-classes/Laddr/Project.php
@@ -84,6 +84,27 @@ class Project extends \VersionedRecord
             'linkForeign' => 'MemberID',
             'indexField' => 'ID'
         ],
+        'Roles' => [
+            'type' => 'one-many',
+            'class' => ProjectRole::class,
+            'foreign' => 'ProjectID'
+        ],
+        'OpenRoles' => [
+            'type' => 'one-many',
+            'class' => ProjectRole::class,
+            'foreign' => 'ProjectID',
+            'conditions' => [
+                'PersonID IS NULL'
+            ]
+        ],
+        'FilledRoles' => [
+            'type' => 'one-many',
+            'class' => ProjectRole::class,
+            'foreign' => 'ProjectID',
+            'conditions' => [
+                'PersonID IS NOT NULL'
+            ]
+        ],
         'Memberships' => [
             'type' => 'one-many',
             'class' => ProjectMember::class,
@@ -142,6 +163,7 @@ class Project extends \VersionedRecord
     public static $dynamicFields = [
         'Maintainer',
         'Members',
+        'Roles',
         'Memberships',
         'Tags',
         'TopicTags',
@@ -192,9 +214,9 @@ public function save($deep = true)
         parent::save($deep);
 
         if (!$this->Members) {
-            ProjectMember::create([
+            ProjectRole::create([
                 'ProjectID' => $this->ID,
-                'MemberID' => $this->Maintainer->ID,
+                'PersonID' => $this->Maintainer->ID,
                 'Role' => 'Founder' // _("Founder") -- placeholder to make this string translatable, actual translation is done during rendering though
             ], true);
         }
diff --git a/php-classes/Laddr/ProjectRole.php b/php-classes/Laddr/ProjectRole.php
new file mode 100644
index 00000000..d00c9bcc
--- /dev/null
+++ b/php-classes/Laddr/ProjectRole.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Laddr;
+
+use Emergence\People\Person;
+
+
+class ProjectRole extends \ActiveRecord
+{
+    // ActiveRecord configuration
+    public static $tableName = 'project_roles'; // the name of this model's table
+
+    // controllers will use these values to figure out what templates to use
+    public static $singularNoun = 'project role'; // a singular noun for this model's object
+    public static $pluralNoun = 'project roles'; // a plural noun for this model's object
+
+    // gets combined with all the extended layers
+    public static $fields = [
+        'ProjectID' => 'uint',
+        'PersonID' => [
+            'type' =>'uint',
+            'default'=>null
+        ],
+        'Role' => 'string',
+        'Description' => [
+            'type' =>'string',
+            'default'=>null
+        ]
+    ];
+
+    public static $relationships = [
+        'Project' => [
+            'type' => 'one-one',
+            'class' => Project::class
+        ],
+        'Person' => [
+            'type' => 'one-one',
+            'class' => Person::class
+        ]
+    ];
+
+    public static $dynamicFields = [
+        'Project',
+        'Person'
+    ];
+}
diff --git a/php-classes/Laddr/ProjectsRequestHandler.php b/php-classes/Laddr/ProjectsRequestHandler.php
index 677894ef..e398f457 100644
--- a/php-classes/Laddr/ProjectsRequestHandler.php
+++ b/php-classes/Laddr/ProjectsRequestHandler.php
@@ -18,6 +18,14 @@ class ProjectsRequestHandler extends \RecordsRequestHandler
     public static function handleRecordRequest(\ActiveRecord $Project, $action = false)
     {
         switch ($action ? $action : $action = static::shiftPath()) {
+            case 'add-role':
+                return static::handleAddRoleRequest($Project);
+            case 'modify-role':
+                return static::handleModifyRoleRequest($Project);
+            case 'remove-role':
+                return static::handleRemoveRoleRequest($Project);
+            case 'add-application':
+                return static::handleAddRoleApplicationRequest($Project);
             case 'add-member':
                 return static::handleAddMemberRequest($Project);
             case 'remove-member':
@@ -84,6 +92,104 @@ public static function handleBrowseRequest($options = [], $conditions = [], $res
         return parent::handleBrowseRequest($options, $conditions, $responseID, $responseData);
     }
 
+    public static function handleAddRoleRequest(Project $Project)
+    {
+        $GLOBALS['Session']->requireAuthentication();
+
+        $Person = User::getByUsername($_POST['username']);
+
+        $recordData = [
+            'ProjectID' => $Project->ID,
+            'PersonID' => (!$Person)?null:$Person->ID
+        ];
+
+        $ProjectRole = ProjectRole::create($recordData);
+
+        if (!empty($_POST['role'])) {
+            $ProjectRole->Role = $_POST['role'];
+        }
+        
+        if (!empty($_POST['description'])) {
+            $ProjectRole->Description = $_POST['description'];
+        }
+
+        $ProjectRole->save();
+
+        return static::respond('roleAdded', [
+            'data' => $ProjectRole,
+            'Project' => $Project,
+            'Member' => $Person
+        ]);
+    }
+    
+    public static function handleModifyRoleRequest(Project $Project)
+    {
+        $GLOBALS['Session']->requireAuthentication();
+
+        $Person = User::getByUsername($_POST['username']);
+
+        $recordData = [
+            'ProjectID' => $Project->ID,
+            'PersonID' => (!$Person)?null:$Person->ID
+        ];
+
+        $ProjectRole = ProjectRole::create($recordData);
+
+        if (!empty($_POST['role'])) {
+            $ProjectRole->Role = $_POST['role'];
+        }
+        
+        if (!empty($_POST['description'])) {
+            $ProjectRole->Description = $_POST['description'];
+        }
+
+        $ProjectRole->save();
+
+        return static::respond('roleModified', [
+            'data' => $ProjectRole,
+            'Project' => $Project,
+            'Member' => $Person
+        ]);
+    }
+    
+    public static function handleAddRoleApplicationRequest(Project $Project){
+        $GLOBALS['Session']->requireAuthentication();
+        
+    }
+    
+    public static function handleRemoveRoleRequest(Project $Project)
+    {
+        $GLOBALS['Session']->requireAuthentication();
+
+        if (empty($_REQUEST['role_id'])) {
+            return static::throwError(_('Parameter "role_id" required'));
+        }
+        
+        $ProjectRole = ProjectRole::getByWhere([
+            'ProjectID' => $Project->ID,
+            'ID' => $_REQUEST['role_id']
+        ]);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            return static::respond('confirm', [
+                'question' => sprintf(
+                    _('Are you sure you want to remove %s from %s?'),
+                    htmlspecialchars($Role->Role),
+                    htmlspecialchars($Project->Title)
+                )
+            ]);
+        }
+
+        if ($ProjectRole) {
+            $ProjectRole->destroy();
+        }
+
+        return static::respond('roleRemoved', [
+            'data' => $ProjectRole,
+            'Project' => $Project
+        ]);
+    }
+    
     public static function handleAddMemberRequest(Project $Project)
     {
         $GLOBALS['Session']->requireAuthentication();
diff --git a/php-classes/Laddr/RoleApplication.php b/php-classes/Laddr/RoleApplication.php
new file mode 100644
index 00000000..1e7832d1
--- /dev/null
+++ b/php-classes/Laddr/RoleApplication.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Laddr;
+
+use Emergence\People\Person;
+
+
+class RoleApplication extends \ActiveRecord
+{
+    // ActiveRecord configuration
+    public static $tableName = 'role_applications'; // the name of this model's table
+
+    // controllers will use these values to figure out what templates to use
+    public static $singularNoun = 'role application'; // a singular noun for this model's object
+    public static $pluralNoun = 'role applications'; // a plural noun for this model's object
+
+    // gets combined with all the extended layers
+    public static $fields = [
+        'ProjectID'   => 'uint',
+        'PersonID'    => 'uint',
+        'RoleID'      => 'uint',
+        'Application' => 'string',
+        'Status'      => [
+            'type' => 'enum',
+            'values' => [
+                'Pending',
+                'Accepted',
+                'Rejected'
+            ],
+            'default' => 'Pending'
+        ]
+    ];
+
+    public static $relationships = [
+        'Project' => [
+            'type' => 'one-one',
+            'class' => Project::class
+        ],
+        'Person' => [
+            'type' => 'one-one',
+            'class' => Person::class
+        ],
+        'ProjectRole' => [
+            'type' => 'one-one',
+            'class' => ProjectRole::class
+        ]
+    ];
+    
+    public static $indexes = [
+        'ProjectRoleApplication' => [
+            'fields' => ['ProjectID', 'PersonID', 'RoleID'],
+            'unique' => true
+        ]
+    ];
+
+    public static $dynamicFields = [
+        'Project',
+        'Person',
+        'Role'
+    ];
+}
\ No newline at end of file
diff --git a/site-root/js/pages/project.js b/site-root/js/pages/project.js
index 8552489d..e5c1ff4c 100644
--- a/site-root/js/pages/project.js
+++ b/site-root/js/pages/project.js
@@ -32,4 +32,25 @@
             epicEditor.importFile('README', $textarea.val());
         });
     });
-})();
\ No newline at end of file
+})();
+
+$( "#open_role_table" ).on( "click", "a[title^='Apply']", function( event ) {
+    $('#add-application').modal({show: 'true'});
+    $("#inputRoleId").val($( this ).attr( "data-role_id"));
+});
+
+$( "#open_role_table" ).on( "click", "a[title^='Edit Role']", function( event ){
+    $('#modify-role').modal({show: 'true'});
+    $("#inputRoleId").val($( this ).attr( "data-role_id"));
+    $("#inputRole").val($( this ).attr( "data-role_name"));
+    $("#inputRoleDescription").val($( this ).attr( "data-role_description"));
+    $("#inputUsername").val($( this ).attr( "data-role_person"));
+});
+
+$( "#role_table" ).on( "click", "a[title^='Edit Role']", function( event ) {
+    $('#modify-role').modal({show: 'true'});
+    $("#inputRoleId").val($( this ).attr( "data-role_id"));
+    $("#inputRole").val($( this ).attr( "data-role_name"));
+    $("#inputRoleDescription").val($( this ).attr( "data-role_description"));
+    $("#inputUsername").val($( this ).attr( "data-role_person"));
+});
\ No newline at end of file

From 7aa4e51caf61c25c08eb851af26d5085c48b6fa8 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Mon, 26 Feb 2018 14:15:49 -0500
Subject: [PATCH 02/32] Don't show person summary details in blog post byline

---
 html-templates/blog/blogPost.tpl       | 2 +-
 html-templates/subtemplates/people.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html-templates/blog/blogPost.tpl b/html-templates/blog/blogPost.tpl
index 91ae2395..39d73b32 100644
--- a/html-templates/blog/blogPost.tpl
+++ b/html-templates/blog/blogPost.tpl
@@ -90,7 +90,7 @@
                 <h1 class="header-title"><a href="{$Post->getURL()}">{$Post->Title|escape}</a></h1>
 
                 <div class="article-meta">
-                    by {personLink $Post->Author photo=yes photoSize=36 pixelRatio=2}
+                    by {personLink $Post->Author photo=yes photoSize=36 pixelRatio=2 summary=no}
                     on <a href="{$Post->getURL()}">{timestamp $Post->Published}</a>
                 </div>
 
diff --git a/html-templates/subtemplates/people.tpl b/html-templates/subtemplates/people.tpl
index a04174d4..f6027a35 100644
--- a/html-templates/subtemplates/people.tpl
+++ b/html-templates/subtemplates/people.tpl
@@ -16,7 +16,7 @@
     {/if}
 {/strip}{/template}
 
-{template personLink Person photo=no photoSize=64 pixelRatio=2 linkCls=no imgCls=no nameCls=no}{strip}
+{template personLink Person photo=no photoSize=64 pixelRatio=2 linkCls=no imgCls=no nameCls=no summary=yes}{strip}
     <a href="{$Person->getURL()}" title="{personName $Person}" {if $linkCls}class="{$linkCls}"{/if}>
         {if $photo}
             {$pixels = $photoSize}
@@ -30,6 +30,6 @@
             {/if}
             <img src="{$src}" class="avatar {if $imgCls}{$imgCls}{/if}" width="{$photoSize}" height="{$photoSize}" />
         {/if}
-        <span class="name {$imgCls}">{personName $Person}</span>
+        <span class="name {$imgCls}">{personName $Person summary=$summary}</span>
     </a>
 {/strip}{/template}

From 81e11c8edafde57d697dcd95232180196d70475e Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Fri, 6 Apr 2018 22:53:43 -0400
Subject: [PATCH 03/32] Add emergence-saml2 and emergence-slack layers

---
 php-config/Git.config.d/emergence-saml2.php | 19 ++++++++
 php-config/Git.config.d/emergence-slack.php | 14 ++++++
 php-config/Git.config.d/laddr.php           | 52 +++++++++++++++------
 3 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 php-config/Git.config.d/emergence-saml2.php
 create mode 100644 php-config/Git.config.d/emergence-slack.php

diff --git a/php-config/Git.config.d/emergence-saml2.php b/php-config/Git.config.d/emergence-saml2.php
new file mode 100644
index 00000000..190f39c8
--- /dev/null
+++ b/php-config/Git.config.d/emergence-saml2.php
@@ -0,0 +1,19 @@
+<?php
+
+Git::$repositories['emergence-saml2'] = [
+    'remote' => 'https://github.com/JarvusInnovations/emergence-saml2.git',
+    'originBranch' => 'master',
+    'workingBranch' => 'master',
+    'trees' => [
+        'php-classes/Emergence/SAML2',
+
+        'php-config/Emergence/SAML2',
+        'php-config/Git.config.d/emergence-saml2.php',
+        'php-config/Git.config.d/simplesamlphp-saml2.php',
+        'php-config/Git.config.d/xmlseclibs.php',
+        'php-config/SAML2/Compat/ContainerSingleton.config.php',
+        'php-config/TableManagerRequestHandler.config.d/emergence-saml2.php',
+
+        'site-root/connectors/saml2.php'
+    ]
+];
\ No newline at end of file
diff --git a/php-config/Git.config.d/emergence-slack.php b/php-config/Git.config.d/emergence-slack.php
new file mode 100644
index 00000000..f473821d
--- /dev/null
+++ b/php-config/Git.config.d/emergence-slack.php
@@ -0,0 +1,14 @@
+<?php
+
+Git::$repositories['emergence-slack'] = [
+    'remote' => 'https://github.com/JarvusInnovations/emergence-slack.git',
+    'originBranch' => 'master',
+    'workingBranch' => 'master',
+    'trees' => [
+        'html-templates/connectors/slack',
+        'php-classes/Emergence/Slack',
+        'php-config/Emergence/Slack',
+        'php-config/Git.config.d/emergence-slack.php',
+        'site-root/connectors/slack.php'
+    ]
+];
\ No newline at end of file
diff --git a/php-config/Git.config.d/laddr.php b/php-config/Git.config.d/laddr.php
index 5d7c8f85..fca6d183 100644
--- a/php-config/Git.config.d/laddr.php
+++ b/php-config/Git.config.d/laddr.php
@@ -9,23 +9,41 @@
         'event-handlers',
         'html-templates' => [
             'exclude' => [
-                '#^/redirects/#', // exclude redirects library
-                '#^/connectors/github/#'
+                // exclude files from emergence-redirects
+                '#^/redirects/#',
+                
+                // exclude files from emergence-github
+                '#^/connectors/github/#',
+                
+                // exclude files from emergence-slack
+                '#^/connectors/slack/#'
             ]
         ],
         'locales',
-        'php-classes' => [
-            'exclude' => [
-                '#^/ReCaptcha/#', // exclude ReCaptcha library pulled from google repo
-                '#^/Emergence/Redirects/#',
-                '#^/Emergence/GitHub/#'
-            ]
-        ],
+        'php-classes/Drewm',
+        'php-classes/Emergence/Events',
+        'php-classes/Laddr',
+        'php-classes/RemoteSystems',
+        'php-classes/Laddr.php',
         'php-config' => [
             'exclude' => [
-                '#^/Site.config.d/redirects\.php$#', // exclude redirects library
+                // exclude files from emergence-redirects
+                '#^/Site.config.d/redirects\.php$#',
+                
+                // exclude files from emergence-github
                 '#^/Emergence/GitHub/#',
-                '#^/Emergence/People/User\.config\.d/github-token\.php$#'
+                '#^/Emergence/People/User\.config\.d/github-token\.php$#',
+                
+                // exclude files from emergence-slack
+                '#^/Emergence/Slack/#',
+                
+                // exclude files from emergence-saml2
+                '#^/Emergence/SAML2/#',
+                '#^/SAML2/Compat/ContainerSingleton\.config\.php#',
+                '#^/TableManagerRequestHandler\.config\.d/emergence-saml2\.php#',
+                '#^/Git\.config\.d/simplesamlphp-saml2\.php#',
+                '#^/Git\.config\.d/xmlseclibs\.php#'
+                
             ]
         ],
         'php-migrations' => [
@@ -35,8 +53,16 @@
         ],
         'site-root' => [
             'exclude' => [
-                '#^/redirects\.php$#', // exclude redirects library
-                '#^/connectors/github\.php#'
+                // exclude files from emergence-redirects
+                '#^/redirects\.php$#',
+                
+                '#^/connectors/github\.php#',
+                
+                // exclude files from emergence-slack
+                '#^/connectors/slack\.php#',
+                
+                // exclude files from emergence-saml2
+                '#^/connectors/saml2\.php#',
             ]
         ]
     ]

From bec4a1cb75a46616d70ef422972d4dc725941dbe Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Sun, 8 Apr 2018 21:30:10 -0400
Subject: [PATCH 04/32] Switch default branch to develop

---
 php-config/Git.config.d/laddr.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/php-config/Git.config.d/laddr.php b/php-config/Git.config.d/laddr.php
index fca6d183..d3c3c8e6 100644
--- a/php-config/Git.config.d/laddr.php
+++ b/php-config/Git.config.d/laddr.php
@@ -2,9 +2,8 @@
 
 Git::$repositories['laddr'] = [
     'remote' => 'https://github.com/CfABrigadePhiladelphia/laddr.git',
-    'originBranch' => 'releases/v2',
-    'workingBranch' => 'releases/v2',
-    'localOnly' => true,
+    'originBranch' => 'develop',
+    'workingBranch' => 'develop',
     'trees' => [
         'event-handlers',
         'html-templates' => [
@@ -66,4 +65,4 @@
             ]
         ]
     ]
-];
\ No newline at end of file
+];

From 8b968f24f6052c6103aa90da42e48a9d379288e2 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 10 Apr 2018 19:11:05 -0400
Subject: [PATCH 05/32] Update clone-from-git.md

---
 docs/laddr/development/clone-from-git.md | 55 ++++++++++++++----------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/docs/laddr/development/clone-from-git.md b/docs/laddr/development/clone-from-git.md
index 3847fda3..69aa1697 100644
--- a/docs/laddr/development/clone-from-git.md
+++ b/docs/laddr/development/clone-from-git.md
@@ -1,16 +1,33 @@
 # Clone Laddr from git
+
 This guide is for developers who want to work on Laddr's core code. It will walk you through
 setting up a fresh site instance and cloning a version of Laddr into it from a remote git
 repository.
 
 ## Step 1: Obtain an emergence host
+
 You will need a host server dedicated to running emergence. If you don't have access to one already,
-the easiest way to get started is to spin up a small **Ubuntu 14.04 LTS** virtual machine with a cloud
+the easiest way to get started is to spin up a small **Ubuntu 16.04 LTS** virtual machine with a cloud
 provider like Digital Ocean, Google Cloud Compute, AWS, or countless others. Once you are logged in
-to your fresh Ubuntu 14.04 machine, follow [emergence's installation guide][emergence-install]
+to your fresh Ubuntu 16.04 machine, follow [emergence's installation guide][emergence-install]
 to prepare it for hosting emergence-powered sites like Laddr.
 
-## Step 2: Create a site
+Alternatively, if you're familiar with Docker, you can spin up an emergence container:
+
+```bash
+docker run -d \
+    -it \
+    --name emergence \
+    -v /emergence:/emergence \
+    -p 127.0.0.10:80:80 \
+    -p 127.0.0.10:3306:3306 \
+    -p 127.0.0.10:9083:9083 \
+    jarvus/emergence \
+    tmux new -s emergence emergence-kernel
+```
+
+## Step 2: Create a site for your laddr development instance
+
 Laddr is based on emergence's `skeleton-v2` site template. Unlike when provising a *deployment*
 instance of Laddr, for development you want to create a site extending Laddr's parent
 site like Laddr does rather than Laddr itself. Laddr's code will be cloned from git and applied
@@ -20,30 +37,24 @@ Use emergence's host control panel to create a new site with your desired hostna
 be sure to select `skeleton-v2.emr.ge` as the parent hostname. After the site is created login to <kbd>/develop</kbd>
 with your initial user developer account.
 
-## Step 3: Configure git link
-To configure a link between your emergence instance and a git repository, create a file called
-<kbd>Git.config.php</kbd> in the top level of the `php-config` directory and copy its initial contents
-from the [latest version of Laddr's development Git.config.php][Git.config.php]
+## Step 3: Configure mapping to the laddr git repository
+
+To configure a link between your emergence instance and a git repository, create a new file at `php-config/Git.config.d/laddr.php` and copy its initial contents
+from the [the file at the same path in Laddr's develop branch][git-config]
 on Github.
 
-You may change `originBranch` to select a different source and change `workingBranch` to change which branch you'll
-be initially setup to commit to (both can be set to the same thing.)
+Optionally, edit the `remote` option to point at your own fork, and switch it to the SSH protocol if you'd like to be able to push changes from the web UI.
 
-See the [emergence manual page on git integration][emergence-git] for full details on all the configuration
-options.
+## Step 4: Initialize git repository
 
-## Step 4: Initialize git links
-Visit <kbd>/git/status</kbd> to view initialize the link with the configured git repository. If you are
-cloning via HTTPS or don't need to push changes back to origin from the web interfaces, you can leave the deploy key field
-empty and skip setting one up. Without a deploy key you will need to SSH into the server and use the git CLI to push changes.
-[Setting up a deploy key][emergence-git] will enable you to use emergence's (currently minimal) web interface
-for commiting/pushing changes.
+Visit <kbd>/site-admin/sources</kbd> to view initialize the configured git repository. If you are
+cloning via HTTPS you will need to SSH into the server and use the git CLI to push changes. If you switch the remote to an SSH git URL before initializing, a deploy key will be generated for you that you can install on GitHub before continueing to enable web-based read/write access.
 
 ## Step 5: Pull code from git
-Visit <kbd>/git/status</kbd> and click **Pull** if needed to pull the latest commits from github into your
-git working copy. Then click the **Disk -> VFS** button to import the git working tree copy into your
+
+Visit <kbd>/site-admin/sources/laddr</kbd> and click **Pull** if needed to pull the latest commits from github into your
+git working copy. Then click the **Sync** -> **Update emergence VFS** button to import the git working tree copy into your
 emergence instance.
 
-[emergence-install]: http://emr.ge/docs/setup/ubuntu/14.04
-[emergence-git]: http://emr.ge/docs/git/init
-[Git.config.php]: https://github.com/CfABrigadePhiladelphia/laddr/blob/development/php-config/Git.config.php
\ No newline at end of file
+[emergence-install]: https://emergenceplatform.gitbook.io/emergence-book/server-setup/installation/ubuntu-16.04
+[git-config]: https://github.com/CodeForPhilly/laddr/blob/develop/php-config/Git.config.d/laddr.php

From 767bb5e234cf3664fae7bc8580ae014a97f07c4d Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 10 Apr 2018 19:14:19 -0400
Subject: [PATCH 06/32] Update clone-from-git.md

---
 docs/laddr/development/clone-from-git.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/laddr/development/clone-from-git.md b/docs/laddr/development/clone-from-git.md
index 69aa1697..76c98d16 100644
--- a/docs/laddr/development/clone-from-git.md
+++ b/docs/laddr/development/clone-from-git.md
@@ -47,8 +47,8 @@ Optionally, edit the `remote` option to point at your own fork, and switch it to
 
 ## Step 4: Initialize git repository
 
-Visit <kbd>/site-admin/sources</kbd> to view initialize the configured git repository. If you are
-cloning via HTTPS you will need to SSH into the server and use the git CLI to push changes. If you switch the remote to an SSH git URL before initializing, a deploy key will be generated for you that you can install on GitHub before continueing to enable web-based read/write access.
+Visit <kbd>/site-admin/sources</kbd> to initialize the configured git repository. If you switch the remote to an SSH git URL before initializing, a deploy key will be generated for you that you can install on GitHub before continueing to enable web-based read/write access. Otherwise, if you are
+cloning via HTTPS, you will need to SSH into the server and use the git CLI to push changes after initializing the repository.
 
 ## Step 5: Pull code from git
 
@@ -56,5 +56,9 @@ Visit <kbd>/site-admin/sources/laddr</kbd> and click **Pull** if needed to pull
 git working copy. Then click the **Sync** -> **Update emergence VFS** button to import the git working tree copy into your
 emergence instance.
 
+## Next steps
+
+If you run into any trouble, need to reconfigure the repository, or execute any advanced maneuvers, use `emergence-git-shell my-instance-name laddr` on your host machine to drop into a properly-configured git shell where you can make full use of the git CLI client without any permissions issues.
+
 [emergence-install]: https://emergenceplatform.gitbook.io/emergence-book/server-setup/installation/ubuntu-16.04
 [git-config]: https://github.com/CodeForPhilly/laddr/blob/develop/php-config/Git.config.d/laddr.php

From 9533fc09953c62d65aa0cfed442fb39e74b32e3c Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 10 Apr 2018 20:49:17 -0400
Subject: [PATCH 07/32] Load upstream icon subtemplate across site

---
 html-templates/designs/site.subtemplates.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html-templates/designs/site.subtemplates.tpl b/html-templates/designs/site.subtemplates.tpl
index ac8de7dd..885e8376 100644
--- a/html-templates/designs/site.subtemplates.tpl
+++ b/html-templates/designs/site.subtemplates.tpl
@@ -1,5 +1,6 @@
 {load_templates subtemplates/personName.tpl}
 {load_templates subtemplates/glyphicons.tpl}
+{load_templates subtemplates/icon.tpl}
 {load_templates subtemplates/timestamp.tpl}
 {load_templates subtemplates/people.tpl}
 {load_templates subtemplates/contentBlocks.tpl}

From 2625e3964b375771fda64ad53207864851c5f8b4 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 10 Apr 2018 20:49:46 -0400
Subject: [PATCH 08/32] Convert checkbox subtemplate markup to bootstrap

---
 html-templates/subtemplates/forms.tpl | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/html-templates/subtemplates/forms.tpl b/html-templates/subtemplates/forms.tpl
index 68bde6c0..5a1664c5 100644
--- a/html-templates/subtemplates/forms.tpl
+++ b/html-templates/subtemplates/forms.tpl
@@ -37,21 +37,24 @@
 {/template}
 
 {template checkbox inputName value label='' error='' hint='' attribs='' default=null class=null unsetValue=null}
-    <div class="form-group">
-        {capture assign=html}
+    <div class="checkbox">
+        {if $unsetValue !== null}
+            <input type="hidden" name="{$inputName|escape}" value="{$unsetValue|escape}">
+        {/if}
+        
+        <label>
             <input type="checkbox"
-                class="field-control form-control {$class}"
+                class="{$class}"
                 name="{$inputName|escape}"
                 value="{$value|escape}"
                 {$attribs}
                 {refill field=$inputName default=$default checked=$value}>
-        {/capture}
-    
-        {if $unsetValue !== null}
-            <input type="hidden" name="{$inputName|escape}" value="{$unsetValue|escape}">
-        {/if}
-    
-        {labeledField html=$html type=checkbox label=$label error=$error hint=$hint required=$required}
+
+            {$label}
+        </label>
+
+        {if $error}<p class="error-text">{$error}</p>{/if}
+        {if $hint}<p class="hint help-block">{$hint}</p>{/if}
     </div>
 {/template}
 

From c89976305935f1d93ff1ccf9aab746766bebbb72 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 10 Apr 2018 20:50:05 -0400
Subject: [PATCH 09/32] Add 'auto' option for timestamp times

---
 html-templates/subtemplates/timestamp.tpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/html-templates/subtemplates/timestamp.tpl b/html-templates/subtemplates/timestamp.tpl
index 337721a9..c85c4973 100644
--- a/html-templates/subtemplates/timestamp.tpl
+++ b/html-templates/subtemplates/timestamp.tpl
@@ -1 +1,8 @@
-{template timestamp timestamp time=no}<time datetime="{date($.const.DATE_W3C, $timestamp)}" title="{$timestamp|date_format:"%c"}">{$timestamp|date_format:tif($time, "%-d %b %Y&mdash;%I:%M %P", "%-d %b %Y")}</time>{/template}
\ No newline at end of file
+{template timestamp timestamp time=no}{strip}
+    {if $time === 'auto'}
+        {$time = tif(date('Hi', $timestamp) == '0000' ? false : true)}
+    {/if}
+    <time datetime="{date($.const.DATE_W3C, $timestamp)}" title="{$timestamp|date_format:"%c"}">
+        {$timestamp|date_format:tif($time, "%-d %b %Y&mdash;%I:%M %P", "%-d %b %Y")}
+    </time>
+{/strip}{/template}
\ No newline at end of file

From 26aa7aac5764c0cbe816a45adfd258232e979ef2 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 10 Apr 2018 20:51:08 -0400
Subject: [PATCH 10/32] Update events feature and add full schedule CRUD

---
 html-templates/events/event.tpl               | 175 ++++++++++--------
 html-templates/events/eventEdit.tpl           |  16 +-
 html-templates/events/eventSaved.tpl          |   2 +-
 html-templates/events/eventSegment.tpl        |  63 +++++++
 html-templates/events/eventSegmentEdit.tpl    |  85 +++++++++
 html-templates/events/eventSegmentSaved.tpl   |  19 ++
 html-templates/events/subtemplates.tpl        |  16 ++
 php-classes/Emergence/Events/Event.php        |  13 +-
 php-classes/Emergence/Events/EventSegment.php |  29 ++-
 .../Events/EventSegmentsRequestHandler.php    |  14 ++
 .../Emergence/Events/EventsRequestHandler.php |  30 +++
 11 files changed, 374 insertions(+), 88 deletions(-)
 create mode 100644 html-templates/events/eventSegment.tpl
 create mode 100644 html-templates/events/eventSegmentEdit.tpl
 create mode 100644 html-templates/events/eventSegmentSaved.tpl
 create mode 100644 html-templates/events/subtemplates.tpl
 create mode 100644 php-classes/Emergence/Events/EventSegmentsRequestHandler.php

diff --git a/html-templates/events/event.tpl b/html-templates/events/event.tpl
index ee9ed9a0..4225c688 100644
--- a/html-templates/events/event.tpl
+++ b/html-templates/events/event.tpl
@@ -1,107 +1,130 @@
 {extends "designs/site.tpl"}
 
-{block title}{_ 'Event'} &mdash; {$dwoo.parent}{/block}
+{block title}{$data->Title|escape} &mdash; {$dwoo.parent}{/block}
+
+{block css}
+    {$dwoo.parent}
+
+    <style>
+        .event-description p:last-child {
+            margin-bottom: 0;
+        }
+
+        .event-details dt {
+            font-size: 130%;
+        }
+        .event-details dd {
+            margin-bottom: 1em;
+        }
+
+        .event-segments h4 {
+            margin-top: 0;
+        }
+        .event-segments dl {
+            margin-bottom: 0;
+        }
+        .event-segments dd {
+            margin-bottom: 0.5em;
+        }
+        .event-segments .event-location {
+            display: block;
+            margin-top: 1em;
+            margin-bottom: 1em;
+        }
+        .event-segments .event-location dt {
+            font-size: 200%;
+        }
+    </style>
+{/block}
 
 {block content}
     {$Event = $data}
+    {load_templates "subtemplates.tpl"}
 
     <div class="page-header">
-        {*
         <ol class="breadcrumb">
             <li><a href="/events">{_ "Events"}</a></li>
-            <li><a href="{$Event->getUrl()}">{$Event->Title|escape}</a></li>
+            <li>{tif $Event->EndTime > $.now ? 'Upcoming' : 'Past'}</li>
         </ol>
-        *}
         <div class="btn-toolbar pull-right">
             {if $.User}
-                <form action="{$Event->getUrl(edit)}">
-                    <button class="btn btn-success" type="submit">{glyph "pencil"}&nbsp;{_ "Edit Event&hellip;"}</button>
-                </form>
+                <a class="btn btn-success" href="{$Event->getUrl(edit)}">{glyph "pencil"}&nbsp;{_ "Edit Event"}</a>
+                <a class="btn btn-success" href="{$Event->getUrl('segments/*create')}">{glyph "plus"}&nbsp;{_ "Add Segment"}</a>
             {/if}
         </div>
         <h1>{$Event->Title|escape}</h1>
     </div>
-    <div class="row">
-        <div class="col-md-3">
-            <ul class="row list-unstyled">
-                {if $Event->Status != 'published'}
-                    <li class="col-sm-3 col-md-12">
-                        <p>
-                            <b>Status</b><br/>
-                            {$Event->Status}
-                        </p>
-                    </li>
-                {/if}
-
-                <li class="col-sm-3 col-md-12">
-                    <p>
-                        <b>Start time</b><br/>
-                        {timestamp $Event->StartTime time=yes}
-                    </p>
-                </li>
-
-                {if $Event->EndTime}
-                <li class="col-sm-3 col-md-12">
-                    <p>
-                        <b>End time</b><br/>
-                        {timestamp $Event->EndTime time=yes}
-                    </p>
-                </li>
-                {/if}
-
-                {if $Event->Location}
-                <li class="col-sm-3 col-md-12">
-                    <p>
-                        <b>Location</b><br/>
-                        <a href="https://www.google.com/maps?q={$Event->Location|escape:url}">{$Event->Location|escape}</a>
-                    </p>
-                </li>
-                {/if}
-            </ul>
-        </div>
 
+    <div class="row">
         <div class="col-md-9">
             {if $Event->Description}
-                <div class="well">
-                    <div class="content-markdown event-description">{$Event->Description|truncate:600|escape|markdown}</div>
-                </div>
+                <div class="content-markdown event-description well">{$Event->Description|escape|markdown}</div>
             {/if}
 
             {if $Event->Segments}
-                <h2>Segments</h2>
+                <section class="event-segments">
+                    <h2>Schedule</h2>
 
-                {$lastDate = null}
+                    {$lastDate = null}
+                    {$lastLocationName = null}
+                    {$lastLocationAddress = null}
 
-                {foreach item=Segment from=$Event->Segments}
-                    {$thisDate = date("l, F jS", $Segment->StartTime)}
+                    {foreach item=Segment from=$Event->Segments}
+                        {$thisDate = date("l, F jS", $Segment->StartTime)}
 
-                    {if $lastDate != $thisDate}
-                        {if $lastDate}
-                            </dl>
+                        {if $lastDate != $thisDate}
+                            {if $lastDate}
+                                </dl>
+                            {/if}
+                            <h3>{$thisDate}</h3>
+                            <dl class="dl-horizontal">
+                            {$lastDate = $thisDate}
+                            {$lastLocationName = null}
+                            {$lastLocationAddress = null}
                         {/if}
-                        <h3>{$thisDate}</h3>
-                        <dl class="dl-horizontal">
-                        {$lastDate = $thisDate}
-                    {/if}
-                            <dt>{time_range $Segment->StartTime $Segment->EndTime}</dt>
-                            <dd>
-                                <a href="{$Event->getUrl("segments/$Segment->Handle")}">{$Segment->Title|escape}</a>
-                                {if $Segment->LocationName || $Segment->LocationAddress}
-                                    <p>
-                                        <strong>Location</strong>
-                                        <a target="_blank" href="https://maps.google.com?q={implode(', ', array_filter(array($Segment->LocationName, $Segment->LocationAddress)))|escape:url}">
-                                            {if $Segment->LocationName && $Segment->LocationAddress}
-                                                {$Segment->LocationName|escape} ({$Segment->LocationAddress|escape})
-                                            {else}
-                                                {$Segment->LocationName|default:$Segment->LocationAddress|escape}
-                                            {/if}
-                                        </a>
-                                    </p>
+                                {if
+                                    (
+                                        $Segment->LocationName != $lastLocationName
+                                        || $Segment->LocationAddress != $lastLocationAddress
+                                    )
+                                    && ($Segment->LocationName || $Segment->LocationAddress)
+                                }
+                                    <div class="event-location">
+                                        <dt>{icon "map-marker"}</dt>
+                                        <dd>{eventLocation name=$Segment->LocationName address=$Segment->LocationAddress}</dd>
+                                    </div>
                                 {/if}
-                                <div class="content-markdown event-segment-description">{$Segment->Description|escape|markdown}</div>
-                            </dd>
-                {/foreach}
+                                <dt>{time_range $Segment->StartTime $Segment->EndTime}</dt>
+                                <dd>
+                                    <h4><a href="{$Segment->getUrl()}">{$Segment->Title|escape}</a></h4>
+                                    <div class="content-markdown event-segment-description">{$Segment->Description|escape|markdown}</div>
+                                </dd>
+
+                        {$lastLocationName = $Segment->LocationName}
+                        {$lastLocationAddress = $Segment->LocationAddress}
+                    {/foreach}
+                </foreach>
             {/if}
         </div>
+        
+        <dl class="event-details col-md-3">
+            {if $Event->Status != 'published'}
+                <dt>Status</dt>
+                <dd>{$Event->Status}</dd>
+            {/if}
+
+            <dt>Starts</dt>
+            <dd>{timestamp $Event->StartTime time='auto'}</dd>
+
+            {if $Event->EndTime}
+                <dt>Ends</dt>
+                <dd>{timestamp $Event->EndTime time='auto'}</dd>
+            {/if}
+
+            {if $Event->LocationName || $Event->LocationAddress}
+                <dt>Location</dt>
+                <dd>{eventLocation name=$Event->LocationName address=$Event->LocationAddress}</dd>
+            {/if}
+        </dl>
     </div>
 {/block}
\ No newline at end of file
diff --git a/html-templates/events/eventEdit.tpl b/html-templates/events/eventEdit.tpl
index f7aa6c19..39b3f126 100644
--- a/html-templates/events/eventEdit.tpl
+++ b/html-templates/events/eventEdit.tpl
@@ -54,16 +54,20 @@
                         </select>
                     </div>
                     <div class="form-group">
-                        <label for="field-time-start">{_ "StartTime"}:</label>
-                        <input type="date" name="StartTime" id="field-time-start" class="form-control" value="{refill field=StartTime default=$Event->StartTime}"/>
+                        <label for="field-time-start">{_ "Start time"}:</label>
+                        <input type="datetime-local" name="StartTime" id="field-time-start" class="form-control" value="{refill field=StartTime default=tif($Event->StartTime, date('Y-m-d\TH:i', $Event->StartTime))}"/>
                     </div>
                     <div class="form-group">
-                        <label for="field-time-end">{_ "EndTime"}:</label>
-                        <input type="date" name="EndTime" id="field-time-end" class="form-control" value="{refill field=EndTime default=$Event->EndTime}"/>
+                        <label for="field-time-end">{_ "End time"}:</label>
+                        <input type="datetime-local" name="EndTime" id="field-time-end" class="form-control" value="{refill field=EndTime default=tif($Event->EndTime, date('Y-m-d\TH:i', $Event->EndTime))}"/>
                     </div>
                     <div class="form-group">
-                        <label for="field-location">{_ "Location"}:</label>
-                        <input type="text" name="Location" id="field-location" class="form-control" placeholder="908 N 3rd St, Philadelphia PA" value="{refill field=Location default=$Event->Location}"/>
+                        <label for="field-location-name">{_ "Location name"}:</label>
+                        <input type="text" name="LocationName" id="field-location-name" class="form-control" placeholder="Localhost" value="{refill field=LocationName default=$Event->LocationName}"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="field-location-address">{_ "Location address"}:</label>
+                        <input type="text" name="LocationAddress" id="field-location-address" class="form-control" placeholder="908 N 3rd St, Philadelphia PA" value="{refill field=LocationAddress default=$Event->LocationAddress}"/>
                     </div>
 
                     <div class="form-group">
diff --git a/html-templates/events/eventSaved.tpl b/html-templates/events/eventSaved.tpl
index bf936baf..1a900e85 100644
--- a/html-templates/events/eventSaved.tpl
+++ b/html-templates/events/eventSaved.tpl
@@ -8,7 +8,7 @@
     {capture assign=eventLink}<a href="{$Event->getUrl()|escape}">{$Event->getTitle()|escape}</a>{/capture}
 
     <div class="page-header">
-        <h1>Event Created</h1>
+        <h1>Event Saved</h1>
     </div>
     {if $Event->isNew}
         <p>{_("Your event has been created: %s")|sprintf:$eventLink}</p>
diff --git a/html-templates/events/eventSegment.tpl b/html-templates/events/eventSegment.tpl
new file mode 100644
index 00000000..72d79ab2
--- /dev/null
+++ b/html-templates/events/eventSegment.tpl
@@ -0,0 +1,63 @@
+{extends "designs/site.tpl"}
+
+{block title}{$data->Title|escape} @ {$data->Event->Title|escape} &mdash; {$dwoo.parent}{/block}
+
+{block css}
+    {$dwoo.parent}
+
+    <style>
+        .event-segment-description p:last-child {
+            margin-bottom: 0;
+        }
+
+        .event-segment-details dt {
+            font-size: 130%;
+        }
+        .event-segment-details dd {
+            margin-bottom: 1em;
+        }
+    </style>
+{/block}
+
+{block content}
+    {$Segment = $data}
+    {$Event = $Segment->Event}
+    {load_templates "subtemplates.tpl"}
+
+    <div class="page-header">
+        <ol class="breadcrumb">
+            <li><a href="/events">{_ "Events"}</a></li>
+            <li><a href="{$Event->getUrl()}">{$Event->Title|escape}</a></li>
+            <li>Schedule</li>
+        </ol>
+        <div class="btn-toolbar pull-right">
+            {if $.User}
+                <a class="btn btn-success" href="{$Segment->getUrl(edit)}">{glyph "pencil"}&nbsp;{_ "Edit Segment"}</a>
+            {/if}
+        </div>
+        <h1>{$Segment->Title|escape}</h1>
+    </div>
+
+    <div class="row">
+        <div class="col-md-9">
+            {if $Segment->Description}
+                <div class="content-markdown event-segment-description well">{$Segment->Description|escape|markdown}</div>
+            {/if}
+        </div>
+        
+        <dl class="event-segment-details col-md-3">
+            <dt>Starts</dt>
+            <dd>{timestamp $Segment->StartTime time='auto'}</dd>
+
+            {if $Segment->EndTime}
+                <dt>Ends</dt>
+                <dd>{timestamp $Segment->EndTime time='auto'}</dd>
+            {/if}
+
+            {if $Segment->LocationName || $Segment->LocationAddress}
+                <dt>Location</dt>
+                <dd>{eventLocation name=$Segment->LocationName address=$Segment->LocationAddress}</dd>
+            {/if}
+        </dl>
+    </div>
+{/block}
\ No newline at end of file
diff --git a/html-templates/events/eventSegmentEdit.tpl b/html-templates/events/eventSegmentEdit.tpl
new file mode 100644
index 00000000..84883e44
--- /dev/null
+++ b/html-templates/events/eventSegmentEdit.tpl
@@ -0,0 +1,85 @@
+{extends designs/site.tpl}
+
+{block title}{if $data->isPhantom}{_ 'Create'}{else}{_('Edit %s')|sprintf:$data->Title|escape}{/if} &mdash; {_ 'Events'} &mdash; {$dwoo.parent}{/block}
+
+{block js-bottom}
+    {$dwoo.parent}
+    {jsmin "epiceditor.js"}
+    {jsmin "pages/event-edit.js"}
+{/block}
+
+{block content}
+    {$Segment = $data}
+
+    <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 $Segment->isPhantom}
+                            {_ "Create new event segment"}
+                        {else}
+                            {_("Edit event segment %s")|sprintf:$Segment->Title|escape}
+                        {/if}
+                    </h1>
+                </div>
+
+                {if !$Segment->isValid}
+                    <div class="error well">
+                        <strong>{_ "There were problems with your entry:"}</strong>
+                        <ul class="errors">
+                        {foreach item=error key=field from=$Segment->validationErrors}
+                            <li>{$error}</li>
+                        {/foreach}
+                        </ul>
+                    </div>
+                {/if}
+
+                <form method="POST">
+                    <div class="form-group">
+                        <label for="field-event">{_ "Event"}:</label>
+                        <select name="EventID" id="field-event" class="form-control">
+                            {foreach item=Event from=Emergence\Events\Event::getAll(array(Order=StartTime))}
+                                <option value="{$Event->ID}" {refill field=EventID default=$Segment->EventID selected=$Event->ID}>{date('Y-m-d', $Event->StartTime)}: {$Event->Title|escape}</option>
+                            {/foreach}
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="field-title">{_ "Title"}:</label>
+                        <input name="Title" id="field-title" class="form-control" placeholder="{_ 'Opening Remarks'}" value="{refill field=Title default=$Segment->Title}" />
+                    </div>
+                    <div class="form-group">
+                        <label for="field-handle">{_ "Handle"} ({_ "optional"}):</label>
+                        <input name="Handle" id="field-handle" class="form-control" placeholder="{_ 'opening-remarks'}" value="{refill field=Handle default=$Segment->Handle}" />
+                        <p class="help-block">Must be unique &mdash; leave blank to auto-generate</p>
+                    </div>
+                    <div class="form-group">
+                        <label for="field-time-start">{_ "Start time"}:</label>
+                        <input type="datetime-local" name="StartTime" id="field-time-start" class="form-control" value="{refill field=StartTime default=tif($Segment->StartTime, date('Y-m-d\TH:i', $Segment->StartTime))}"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="field-time-end">{_ "End time"}:</label>
+                        <input type="datetime-local" name="EndTime" id="field-time-end" class="form-control" value="{refill field=EndTime default=tif($Segment->EndTime, date('Y-m-d\TH:i', $Segment->EndTime))}"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="field-location-name">{_ "Location name"}:</label>
+                        <input type="text" name="LocationName" id="field-location-name" class="form-control" placeholder="Localhost" value="{refill field=LocationName default=$Segment->LocationName}"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="field-location-address">{_ "Location address"}:</label>
+                        <input type="text" name="LocationAddress" id="field-location-address" class="form-control" placeholder="908 N 3rd St, Philadelphia PA" value="{refill field=LocationAddress default=$Segment->LocationAddress}"/>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="field-description">{_ 'Description(.md)'}</label>
+                        <div class="controls">
+                            <textarea name="Description" class="input-block-level" rows="10">{refill field=Description default=$Segment->Description}</textarea>
+                        </div>
+                    </div>
+
+                    <button type="submit" class="btn btn-primary">{if $Segment->isPhantom}{_ 'Create Event Segment'}{else}{_ 'Save Changes'}{/if}</button>
+                </form>
+            </div>
+        </div>
+    </div>
+{/block}
\ No newline at end of file
diff --git a/html-templates/events/eventSegmentSaved.tpl b/html-templates/events/eventSegmentSaved.tpl
new file mode 100644
index 00000000..de1f5859
--- /dev/null
+++ b/html-templates/events/eventSegmentSaved.tpl
@@ -0,0 +1,19 @@
+{extends designs/site.tpl}
+
+{block title}Saved {$data->Title|escape} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {$Segment = $data}
+
+    {capture assign=linkHtml}<a href="{$Segment->getUrl()|escape}">{$Segment->getTitle()|escape}</a>{/capture}
+
+    <div class="page-header">
+        <h1>Event Segment Saved</h1>
+    </div>
+
+    {if $Segment->isNew}
+        <p>{_("Your event has been created: %s")|sprintf:$linkHtml}</p>
+    {else}
+        <p>{_("Your changes to %s have been saved.")|sprintf:$linkHtml}</p>
+    {/if}
+{/block}
\ No newline at end of file
diff --git a/html-templates/events/subtemplates.tpl b/html-templates/events/subtemplates.tpl
new file mode 100644
index 00000000..3d316c7a
--- /dev/null
+++ b/html-templates/events/subtemplates.tpl
@@ -0,0 +1,16 @@
+{template eventLocation name address link=yes}
+    {if $link}
+        <a target="_blank" href="https://maps.google.com?q={implode(', ', array_filter(array($name, $address)))|escape:url}">
+    {/if}
+
+    {if $name && $address}
+        {$name|escape} <br />
+        @ {$address|escape}
+    {else}
+        {$name|default:$address|escape}
+    {/if}
+    
+    {if $link}
+        </a>
+    {/if}
+{/template}
\ No newline at end of file
diff --git a/php-classes/Emergence/Events/Event.php b/php-classes/Emergence/Events/Event.php
index 177e69d9..5aab1856 100644
--- a/php-classes/Emergence/Events/Event.php
+++ b/php-classes/Emergence/Events/Event.php
@@ -27,10 +27,10 @@ class Event extends \VersionedRecord
             'default' => 'published'
         ],
         'StartTime' => [
-            'type' => 'timestamp'
+            'type' => 'datetime'
         ],
         'EndTime' => [
-            'type' => 'timestamp',
+            'type' => 'datetime',
             'default' => null
         ],
         'LocationName' => [
@@ -99,6 +99,15 @@ class Event extends \VersionedRecord
         // TODO: validate that EndTime > StartTime if set
     ];
 
+
+    public function getSegmentByHandle($handle)
+    {
+        return EventSegment::getByWhere([
+            'EventID' => $this->ID,
+            'Handle' => $handle
+        ]);
+    }
+
     public function getIsAllDay()
     {
         $start = getdate($this->StartTime);
diff --git a/php-classes/Emergence/Events/EventSegment.php b/php-classes/Emergence/Events/EventSegment.php
index 07e23907..5fbbd1c6 100644
--- a/php-classes/Emergence/Events/EventSegment.php
+++ b/php-classes/Emergence/Events/EventSegment.php
@@ -20,10 +20,10 @@ class EventSegment extends \VersionedRecord
         'Title',
         'Handle',
         'StartTime' => [
-            'type' => 'timestamp'
+            'type' => 'datetime'
         ],
         'EndTime' => [
-            'type' => 'timestamp'
+            'type' => 'datetime'
         ],
         'LocationName' => [
             'type' => 'string',
@@ -48,7 +48,7 @@ class EventSegment extends \VersionedRecord
 
     public static $relationships = [
         'Event' => [
-            'type' => 'one-many',
+            'type' => 'one-one',
             'class' => Event::class
         ]
     ];
@@ -84,4 +84,27 @@ public function save($deep = true)
         // call parent
         parent::save();
     }
+
+    public function getURL($suffix = '/', $params = [])
+    {
+        $url = $this->Event->getURL();
+
+        if (!$url) {
+            return null;
+        }
+
+        $url .= '/segments/'.$this->getHandle();
+
+        $suffix = ltrim($suffix, '/');
+
+        if ($suffix) {
+            $url .= '/'.$suffix;
+        }
+
+        if (!empty($params)) {
+            $url .= '?'.http_build_query($params);
+        }
+
+        return $url;
+    }
 }
\ No newline at end of file
diff --git a/php-classes/Emergence/Events/EventSegmentsRequestHandler.php b/php-classes/Emergence/Events/EventSegmentsRequestHandler.php
new file mode 100644
index 00000000..fe2f01de
--- /dev/null
+++ b/php-classes/Emergence/Events/EventSegmentsRequestHandler.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Emergence\Events;
+
+
+class EventSegmentsRequestHandler extends \RecordsRequestHandler
+{
+    // RecordRequestHandler configuration
+    public static $recordClass = EventSegment::class;
+    public static $accountLevelRead = false;
+    public static $accountLevelBrowse = false;
+    public static $accountLevelWrite = 'Staff';
+    public static $browseOrder = ['StartTime'];
+}
\ No newline at end of file
diff --git a/php-classes/Emergence/Events/EventsRequestHandler.php b/php-classes/Emergence/Events/EventsRequestHandler.php
index 6a018e10..cc4572a4 100644
--- a/php-classes/Emergence/Events/EventsRequestHandler.php
+++ b/php-classes/Emergence/Events/EventsRequestHandler.php
@@ -57,4 +57,34 @@ public static function handleBrowseRequest($options = [], $conditions = [], $res
 
         return parent::handleBrowseRequest($options, $conditions, $responseID, $responseData);
     }
+
+    public static function handleRecordRequest(\ActiveRecord $Event, $action = false)
+    {
+        switch ($action ?: $action = static::shiftPath()) {
+            case 'segments':
+                return static::handleSegmentsRequest($Event);
+            default:
+                return parent::handleRecordRequest($Event, $action);
+        }
+    }
+
+    public static function handleSegmentsRequest(Event $Event)
+    {
+        if (!$segmentHandle = static::shiftPath()) {
+            return static::respond('eventSegments', [
+                'data' => $Event->Segments,
+                'total' => count($Event->Segments)
+            ]);
+        }
+        
+        if ($segmentHandle == '*create') {
+            return EventSegmentsRequestHandler::handleCreateRequest(EventSegment::create(['Event' => $Event]));
+        }
+
+        if (!$Segment = $Event->getSegmentByHandle($segmentHandle)) {
+            return EventSegmentsRequestHandler::throwNotFoundError('Segment not found');
+        }
+
+        return EventSegmentsRequestHandler::handleRecordRequest($Segment);
+    }
 }
\ No newline at end of file

From c5b7e4138f82e06d8bb7d0fad4af1b7953750a75 Mon Sep 17 00:00:00 2001
From: Andrew Natoli <AndrewNatoli@AndrewNatoli.com>
Date: Mon, 4 Jun 2018 17:18:04 -0400
Subject: [PATCH 11/32] Updated "brigades using laddr" section of readme

Fixed Code for Miami URL and removed Code for Charlotte
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 10ffab0f..452caeae 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,10 @@ Join Code for Philly's Slack channel for Laddr, you can self-register via codefo
 ## Brigades using Laddr
 - [Code for Philly](http://codeforphilly.org)
 - [Code for Dayton](http://codefordayton.org)
-- [Code for Miami](http://projects.codeformiami.org)
+- [Code for Miami](http://codefor.miami/)
 - [Code for Croatia](http://codeforcroatia.org)
 - [Creative Commons Korea](http://labs.cckorea.org/)
 - [Code for Cary](http://www.codeforcary.org/)
-- [Code for Charlotte](http://codeforcharlotte.org)
 - [Code for Durham](http://codefordurham.com/)
 - [Code for Raleigh](http://www.codeforraleigh.com/)
 

From cbbeab1057ca6b31f099084b857caa0cae546768 Mon Sep 17 00:00:00 2001
From: Andrew Natoli <AndrewNatoli@AndrewNatoli.com>
Date: Fri, 15 Jun 2018 19:36:13 -0400
Subject: [PATCH 12/32] Updated Open Charlotte site in README + laddr skeleton
 URL

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 452caeae..b4f0d8a3 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ Join Code for Philly's Slack channel for Laddr, you can self-register via codefo
 - [Code for Cary](http://www.codeforcary.org/)
 - [Code for Durham](http://codefordurham.com/)
 - [Code for Raleigh](http://www.codeforraleigh.com/)
+- [Open Charlotte Brigade](https://brigade.opencharlotte.org/)
 
 ## Requirements
 Laddr is built on the Emergence PHP framework and deployement engine, and requires an Emergence server to host it.
@@ -56,7 +57,7 @@ it will configure services on the machine as-needed to host an instance of the a
 sites, clones, or child sites. The guides for Ubuntu and Gentoo are most up-to-date: http://emr.ge/docs/setup
 
 ## Installation via Emergence (linked child)
--  Create an emergence site that extends v1.laddr.io (access key: MaPG1YxorgU6ew64)
+-  Create an emergence site that extends v2.laddr.us
 
 ## Installation from Git
 -  Create an emergence site that extends skeleton.emr.ge (access key: 8U6kydil36bl3vlJ)

From c9a590c4b73fc1efa5ede25f5f140663efc33ebd Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 19 Jun 2018 00:53:33 -0400
Subject: [PATCH 13/32] Remove Code for Miami

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index b4f0d8a3..4f711e95 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,6 @@ Join Code for Philly's Slack channel for Laddr, you can self-register via codefo
 ## Brigades using Laddr
 - [Code for Philly](http://codeforphilly.org)
 - [Code for Dayton](http://codefordayton.org)
-- [Code for Miami](http://codefor.miami/)
 - [Code for Croatia](http://codeforcroatia.org)
 - [Creative Commons Korea](http://labs.cckorea.org/)
 - [Code for Cary](http://www.codeforcary.org/)

From f5a4f67341e83378c8f3eef8e1f977ac6dac372c Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Fri, 27 Jul 2018 21:52:56 -0400
Subject: [PATCH 14/32] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4f711e95..bc40cf3c 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Laddr -- pronounced "ladder" and named after the essential tool for fire brigades -- is a web application designed to create an online home-base for [Code for America brigades](http://brigade.codeforamerica.org).
 
 ## Hosting
-Code for Philly hosts and maintains instances for free for other brigades on our multi-tenant infrastructure. Email [hello@codeforphilly.org](mailto:hello@codeforphilly.org) to get started with a sandbox instance.
+Code for Philly hosts and maintains instances for free for other brigades on our multi-tenant infrastructure. Make a post to the [Hosting Requests](http://forum.laddr.us/c/hosting-requests) category of Laddr's support forum to get started with a sandbox instance.
 
 ## Help / Support / Questions / Chat
 Guides and support are available at our Discourse foreum at [forum.laddr.us](http://forum.laddr.us/)

From 60226bb82c18bb1b64b1aac99dc3a1ebf19698e9 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Wed, 26 Dec 2018 08:13:15 -0500
Subject: [PATCH 15/32] chore: initialize .holo/config.toml

---
 .holo/config.toml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .holo/config.toml

diff --git a/.holo/config.toml b/.holo/config.toml
new file mode 100644
index 00000000..a1916c01
--- /dev/null
+++ b/.holo/config.toml
@@ -0,0 +1,2 @@
+[holo]
+name = "laddr"

From 189d248be0c1f28c66a875a651044920e4286a92 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Wed, 26 Dec 2018 08:13:57 -0500
Subject: [PATCH 16/32] chore: initialize .holo/sources/skeleton-v2 config

---
 .holo/sources/skeleton-v2.toml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .holo/sources/skeleton-v2.toml

diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
new file mode 100644
index 00000000..00775e0b
--- /dev/null
+++ b/.holo/sources/skeleton-v2.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
+ref = "refs/heads/skeleton"

From cd73976dca7eb76da4542126a0f6d62351559822 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Wed, 26 Dec 2018 08:03:28 -0500
Subject: [PATCH 17/32] chore: initialize .holo/branches/skeleton config

---
 .holo/branches/skeleton/_laddr.toml       | 3 +++
 .holo/branches/skeleton/_skeleton-v2.toml | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 .holo/branches/skeleton/_laddr.toml
 create mode 100644 .holo/branches/skeleton/_skeleton-v2.toml

diff --git a/.holo/branches/skeleton/_laddr.toml b/.holo/branches/skeleton/_laddr.toml
new file mode 100644
index 00000000..ada5da65
--- /dev/null
+++ b/.holo/branches/skeleton/_laddr.toml
@@ -0,0 +1,3 @@
+[holomapping]
+files = "**"
+after = "skeleton-v2"
diff --git a/.holo/branches/skeleton/_skeleton-v2.toml b/.holo/branches/skeleton/_skeleton-v2.toml
new file mode 100644
index 00000000..b07feeca
--- /dev/null
+++ b/.holo/branches/skeleton/_skeleton-v2.toml
@@ -0,0 +1,5 @@
+[holomapping]
+files = [
+    "**",
+    "!site-root/sass/**"
+]

From a5162c9bf84cf5ecc018b2db520a452f5a064399 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Mon, 7 Jan 2019 20:02:45 -0500
Subject: [PATCH 18/32] chore: switch skeleton-v2 branch to emergence-skeleton

---
 .holo/sources/skeleton-v2.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
index 00775e0b..2ddcea63 100644
--- a/.holo/sources/skeleton-v2.toml
+++ b/.holo/sources/skeleton-v2.toml
@@ -1,3 +1,3 @@
 [holosource]
 url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
-ref = "refs/heads/skeleton"
+ref = "refs/heads/emergence-skeleton"

From 00598389771bcd924f71d80116a716376c205ef3 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Mon, 7 Jan 2019 20:02:51 -0500
Subject: [PATCH 19/32] chore: add .studiorc studio environment

---
 .studiorc | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .studiorc

diff --git a/.studiorc b/.studiorc
new file mode 100644
index 00000000..e682e5d4
--- /dev/null
+++ b/.studiorc
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+hab pkg install emergence/studio
+source "$(hab pkg path emergence/studio)/studio.sh"

From d666449a73c02ea170d85a16127b20120b09c155 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Mon, 7 Jan 2019 20:03:34 -0500
Subject: [PATCH 20/32] chore: update skeleton holobranch name to
 emergence-skeleton

---
 .holo/branches/{skeleton => emergence-skeleton}/_laddr.toml       | 0
 .holo/branches/{skeleton => emergence-skeleton}/_skeleton-v2.toml | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .holo/branches/{skeleton => emergence-skeleton}/_laddr.toml (100%)
 rename .holo/branches/{skeleton => emergence-skeleton}/_skeleton-v2.toml (100%)

diff --git a/.holo/branches/skeleton/_laddr.toml b/.holo/branches/emergence-skeleton/_laddr.toml
similarity index 100%
rename from .holo/branches/skeleton/_laddr.toml
rename to .holo/branches/emergence-skeleton/_laddr.toml
diff --git a/.holo/branches/skeleton/_skeleton-v2.toml b/.holo/branches/emergence-skeleton/_skeleton-v2.toml
similarity index 100%
rename from .holo/branches/skeleton/_skeleton-v2.toml
rename to .holo/branches/emergence-skeleton/_skeleton-v2.toml

From 18afcb2b1d78b91a3bfe66b1a592afed91af4389 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Mon, 7 Jan 2019 20:05:51 -0500
Subject: [PATCH 21/32] chore: fork off emergence-site holobranch

---
 .holo/branches/emergence-site/_laddr.toml       | 3 +++
 .holo/branches/emergence-site/_skeleton-v2.toml | 5 +++++
 .holo/branches/emergence-skeleton.toml          | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 .holo/branches/emergence-site/_laddr.toml
 create mode 100644 .holo/branches/emergence-site/_skeleton-v2.toml
 create mode 100644 .holo/branches/emergence-skeleton.toml

diff --git a/.holo/branches/emergence-site/_laddr.toml b/.holo/branches/emergence-site/_laddr.toml
new file mode 100644
index 00000000..9f7f75b0
--- /dev/null
+++ b/.holo/branches/emergence-site/_laddr.toml
@@ -0,0 +1,3 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml
new file mode 100644
index 00000000..fdee02a3
--- /dev/null
+++ b/.holo/branches/emergence-site/_skeleton-v2.toml
@@ -0,0 +1,5 @@
+[holomapping]
+files = [
+    "*/**",
+    "!site-root/sass/**"
+]
diff --git a/.holo/branches/emergence-skeleton.toml b/.holo/branches/emergence-skeleton.toml
new file mode 100644
index 00000000..45d9325b
--- /dev/null
+++ b/.holo/branches/emergence-skeleton.toml
@@ -0,0 +1,2 @@
+[holobranch]
+lens = false
\ No newline at end of file

From ce67963e9417670d6119ed1fa3b01407fd0bc790 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Mon, 7 Jan 2019 20:06:22 -0500
Subject: [PATCH 22/32] chore: update .holo/config.toml kind to holospace

---
 .holo/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.holo/config.toml b/.holo/config.toml
index a1916c01..4da1d2ff 100644
--- a/.holo/config.toml
+++ b/.holo/config.toml
@@ -1,2 +1,2 @@
-[holo]
+[holospace]
 name = "laddr"

From 9ebd73876024a93050eb59ac6a759a090ef01082 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Mon, 7 Jan 2019 20:09:41 -0500
Subject: [PATCH 23/32] fix: exclude sass lens and built css from skeleton-v2

---
 .holo/branches/emergence-site/_skeleton-v2.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml
index fdee02a3..b9328c91 100644
--- a/.holo/branches/emergence-site/_skeleton-v2.toml
+++ b/.holo/branches/emergence-site/_skeleton-v2.toml
@@ -1,5 +1,7 @@
 [holomapping]
 files = [
     "*/**",
-    "!site-root/sass/**"
+    "!site-root/sass/**",
+    "!site-root/css/**",
+    "!.holo/lenses/sass.toml"
 ]

From 2c65682f0dae88a698f5ed70a90ce12bc56dbf85 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Tue, 8 Jan 2019 11:39:48 -0500
Subject: [PATCH 24/32] fix: add use statement to catch TableNotFoundException

---
 php-classes/Laddr/Project.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/php-classes/Laddr/Project.php b/php-classes/Laddr/Project.php
index 18de4cdb..95204fff 100644
--- a/php-classes/Laddr/Project.php
+++ b/php-classes/Laddr/Project.php
@@ -3,13 +3,14 @@
 namespace Laddr;
 
 use DB;
+use TableNotFoundException;
 use HandleBehavior;
-use Tag, TagItem;
+use Tag;
+use TagItem;
 use Comment;
 use Emergence\People\Person;
 use Emergence\People\IPerson;
 
-
 class Project extends \VersionedRecord
 {
     public static $stageDescriptions = [];

From 7db23af38b831f7ce11f87cd125e778274cd16bb Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Tue, 8 Jan 2019 11:41:25 -0500
Subject: [PATCH 25/32] fix: point logo link to home page

---
 html-templates/includes/site.header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html-templates/includes/site.header.tpl b/html-templates/includes/site.header.tpl
index a303301f..379e12c7 100644
--- a/html-templates/includes/site.header.tpl
+++ b/html-templates/includes/site.header.tpl
@@ -10,7 +10,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#"> {include includes/site.brand.tpl}</a>
+            <a class="navbar-brand" href="/"> {include includes/site.brand.tpl}</a>
         </div>
 
 

From 2e9c1a26a986627939e8e9558d44759da6ebf052 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 8 Jan 2019 19:19:36 +0000
Subject: [PATCH 26/32] feat: add codeforphilly holobranch example

---
 .holo/branches/codeforphilly/_codeforphilly.toml | 3 +++
 .holo/branches/codeforphilly/_laddr.toml         | 3 +++
 .holo/branches/codeforphilly/_skeleton-v2.toml   | 2 ++
 .holo/sources/codeforphilly.toml                 | 3 +++
 4 files changed, 11 insertions(+)
 create mode 100644 .holo/branches/codeforphilly/_codeforphilly.toml
 create mode 100644 .holo/branches/codeforphilly/_laddr.toml
 create mode 100644 .holo/branches/codeforphilly/_skeleton-v2.toml
 create mode 100644 .holo/sources/codeforphilly.toml

diff --git a/.holo/branches/codeforphilly/_codeforphilly.toml b/.holo/branches/codeforphilly/_codeforphilly.toml
new file mode 100644
index 00000000..e9a07744
--- /dev/null
+++ b/.holo/branches/codeforphilly/_codeforphilly.toml
@@ -0,0 +1,3 @@
+[holomapping]
+files = "*/**"
+after = [ "laddr" ]
diff --git a/.holo/branches/codeforphilly/_laddr.toml b/.holo/branches/codeforphilly/_laddr.toml
new file mode 100644
index 00000000..ad787e40
--- /dev/null
+++ b/.holo/branches/codeforphilly/_laddr.toml
@@ -0,0 +1,3 @@
+[holomapping]
+files = "*/**"
+after = [ "skeleton-v2" ]
diff --git a/.holo/branches/codeforphilly/_skeleton-v2.toml b/.holo/branches/codeforphilly/_skeleton-v2.toml
new file mode 100644
index 00000000..76c4570c
--- /dev/null
+++ b/.holo/branches/codeforphilly/_skeleton-v2.toml
@@ -0,0 +1,2 @@
+[holomapping]
+files = "*/**"
diff --git a/.holo/sources/codeforphilly.toml b/.holo/sources/codeforphilly.toml
new file mode 100644
index 00000000..c84c3da8
--- /dev/null
+++ b/.holo/sources/codeforphilly.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/CodeForPhilly/codeforphilly.org"
+ref = "refs/heads/master"

From aea642d3ee34bdd591d9f9b0c1ae9a80cb296517 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 8 Jan 2019 20:10:42 +0000
Subject: [PATCH 27/32] fix: don't exclude css from skeleton-v2, need for
 site-admin

---
 .holo/branches/emergence-site/_skeleton-v2.toml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml
index b9328c91..76c4570c 100644
--- a/.holo/branches/emergence-site/_skeleton-v2.toml
+++ b/.holo/branches/emergence-site/_skeleton-v2.toml
@@ -1,7 +1,2 @@
 [holomapping]
-files = [
-    "*/**",
-    "!site-root/sass/**",
-    "!site-root/css/**",
-    "!.holo/lenses/sass.toml"
-]
+files = "*/**"

From 714f30e270dd27784c82f27f24d7e7ccdda8826e Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 8 Jan 2019 21:37:04 +0000
Subject: [PATCH 28/32] fix: update function signature for checkWriteAccess

---
 php-classes/Laddr/ProjectBuzzRequestHandler.php    | 2 +-
 php-classes/Laddr/ProjectUpdatesRequestHandler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php-classes/Laddr/ProjectBuzzRequestHandler.php b/php-classes/Laddr/ProjectBuzzRequestHandler.php
index 58da9ca0..26ba0bf2 100644
--- a/php-classes/Laddr/ProjectBuzzRequestHandler.php
+++ b/php-classes/Laddr/ProjectBuzzRequestHandler.php
@@ -44,7 +44,7 @@ protected static function onRecordSaved(ActiveRecord $Buzz, $requestData)
         $Buzz->save();
     }
 
-    public static function checkWriteAccess(ActiveRecord $ProjectUpdate, $suppressLogin = false)
+    public static function checkWriteAccess(ActiveRecord $ProjectUpdate = null, $suppressLogin = false)
     {
         // only allow creating, editing your own, and staff editing
         if (!$ProjectUpdate->isPhantom && ($ProjectUpdate->CreatorID != $GLOBALS['Session']->PersonID) && !$GLOBALS['Session']->hasAccountLevel('Staff')) {
diff --git a/php-classes/Laddr/ProjectUpdatesRequestHandler.php b/php-classes/Laddr/ProjectUpdatesRequestHandler.php
index 68f2fe67..2f4a8640 100644
--- a/php-classes/Laddr/ProjectUpdatesRequestHandler.php
+++ b/php-classes/Laddr/ProjectUpdatesRequestHandler.php
@@ -19,7 +19,7 @@ public static function handleBrowseRequest($options = [], $conditions = [], $res
         return parent::handleBrowseRequest($options, $conditions, $responseID, $responseData);
     }
 
-    public static function checkWriteAccess(\ActiveRecord $ProjectUpdate, $suppressLogin = false)
+    public static function checkWriteAccess(\ActiveRecord $ProjectUpdate = null, $suppressLogin = false)
     {
         // only allow creating, editing your own, and staff editing
         if (!$ProjectUpdate->isPhantom && ($ProjectUpdate->CreatorID != $GLOBALS['Session']->PersonID) && !$GLOBALS['Session']->hasAccountLevel('Staff')) {

From 5707d1dc8c700ecd9b6fff4de56925254dfa4750 Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Wed, 9 Jan 2019 00:05:15 +0000
Subject: [PATCH 29/32] refactor: migrate Git configs to holomappings

---
 .../emergence-skeleton/_emergence-github.toml |  4 ++
 .../_emergence-redirects.toml                 |  4 ++
 .../emergence-skeleton/_emergence-saml2.toml  |  4 ++
 .../emergence-skeleton/_emergence-slack.toml  |  4 ++
 .holo/branches/emergence-skeleton/_laddr.toml |  2 +-
 .../emergence-skeleton/_skeleton-v2.toml      |  5 +-
 .../php-classes/ReCaptcha.toml                |  6 ++
 .holo/sources/emergence-github.toml           |  3 +
 .holo/sources/emergence-redirects.toml        |  3 +
 .holo/sources/emergence-saml2.toml            |  3 +
 .holo/sources/emergence-slack.toml            |  3 +
 .holo/sources/recaptcha.toml                  |  3 +
 php-config/Git.config.d/emergence-github.php  | 16 -----
 .../Git.config.d/emergence-redirects.php      | 17 -----
 php-config/Git.config.d/emergence-saml2.php   | 19 ------
 php-config/Git.config.d/emergence-slack.php   | 14 ----
 php-config/Git.config.d/laddr.php             | 68 -------------------
 php-config/Git.config.d/recaptcha.php         | 10 ---
 18 files changed, 39 insertions(+), 149 deletions(-)
 create mode 100644 .holo/branches/emergence-skeleton/_emergence-github.toml
 create mode 100644 .holo/branches/emergence-skeleton/_emergence-redirects.toml
 create mode 100644 .holo/branches/emergence-skeleton/_emergence-saml2.toml
 create mode 100644 .holo/branches/emergence-skeleton/_emergence-slack.toml
 create mode 100644 .holo/branches/emergence-skeleton/php-classes/ReCaptcha.toml
 create mode 100644 .holo/sources/emergence-github.toml
 create mode 100644 .holo/sources/emergence-redirects.toml
 create mode 100644 .holo/sources/emergence-saml2.toml
 create mode 100644 .holo/sources/emergence-slack.toml
 create mode 100644 .holo/sources/recaptcha.toml
 delete mode 100644 php-config/Git.config.d/emergence-github.php
 delete mode 100644 php-config/Git.config.d/emergence-redirects.php
 delete mode 100644 php-config/Git.config.d/emergence-saml2.php
 delete mode 100644 php-config/Git.config.d/emergence-slack.php
 delete mode 100644 php-config/Git.config.d/laddr.php
 delete mode 100644 php-config/Git.config.d/recaptcha.php

diff --git a/.holo/branches/emergence-skeleton/_emergence-github.toml b/.holo/branches/emergence-skeleton/_emergence-github.toml
new file mode 100644
index 00000000..b1d3ace4
--- /dev/null
+++ b/.holo/branches/emergence-skeleton/_emergence-github.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-skeleton/_emergence-redirects.toml b/.holo/branches/emergence-skeleton/_emergence-redirects.toml
new file mode 100644
index 00000000..b1d3ace4
--- /dev/null
+++ b/.holo/branches/emergence-skeleton/_emergence-redirects.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-skeleton/_emergence-saml2.toml b/.holo/branches/emergence-skeleton/_emergence-saml2.toml
new file mode 100644
index 00000000..b1d3ace4
--- /dev/null
+++ b/.holo/branches/emergence-skeleton/_emergence-saml2.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-skeleton/_emergence-slack.toml b/.holo/branches/emergence-skeleton/_emergence-slack.toml
new file mode 100644
index 00000000..b1d3ace4
--- /dev/null
+++ b/.holo/branches/emergence-skeleton/_emergence-slack.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-skeleton/_laddr.toml b/.holo/branches/emergence-skeleton/_laddr.toml
index ada5da65..9f7f75b0 100644
--- a/.holo/branches/emergence-skeleton/_laddr.toml
+++ b/.holo/branches/emergence-skeleton/_laddr.toml
@@ -1,3 +1,3 @@
 [holomapping]
-files = "**"
+files = "*/**"
 after = "skeleton-v2"
diff --git a/.holo/branches/emergence-skeleton/_skeleton-v2.toml b/.holo/branches/emergence-skeleton/_skeleton-v2.toml
index b07feeca..76c4570c 100644
--- a/.holo/branches/emergence-skeleton/_skeleton-v2.toml
+++ b/.holo/branches/emergence-skeleton/_skeleton-v2.toml
@@ -1,5 +1,2 @@
 [holomapping]
-files = [
-    "**",
-    "!site-root/sass/**"
-]
+files = "*/**"
diff --git a/.holo/branches/emergence-skeleton/php-classes/ReCaptcha.toml b/.holo/branches/emergence-skeleton/php-classes/ReCaptcha.toml
new file mode 100644
index 00000000..34ec5f9e
--- /dev/null
+++ b/.holo/branches/emergence-skeleton/php-classes/ReCaptcha.toml
@@ -0,0 +1,6 @@
+[holomapping]
+holosource = "recaptcha"
+root = "src/ReCaptcha"
+files = "**/*.php"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/sources/emergence-github.toml b/.holo/sources/emergence-github.toml
new file mode 100644
index 00000000..c1b7278e
--- /dev/null
+++ b/.holo/sources/emergence-github.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-github"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-redirects.toml b/.holo/sources/emergence-redirects.toml
new file mode 100644
index 00000000..bbe39017
--- /dev/null
+++ b/.holo/sources/emergence-redirects.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-redirects"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-saml2.toml b/.holo/sources/emergence-saml2.toml
new file mode 100644
index 00000000..dc487480
--- /dev/null
+++ b/.holo/sources/emergence-saml2.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-saml2"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-slack.toml b/.holo/sources/emergence-slack.toml
new file mode 100644
index 00000000..d92ce542
--- /dev/null
+++ b/.holo/sources/emergence-slack.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-slack"
+ref = "refs/heads/master"
diff --git a/.holo/sources/recaptcha.toml b/.holo/sources/recaptcha.toml
new file mode 100644
index 00000000..2ea6fd9e
--- /dev/null
+++ b/.holo/sources/recaptcha.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/google/recaptcha"
+ref = "refs/heads/master"
diff --git a/php-config/Git.config.d/emergence-github.php b/php-config/Git.config.d/emergence-github.php
deleted file mode 100644
index aeffcbd3..00000000
--- a/php-config/Git.config.d/emergence-github.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-Git::$repositories['emergence-github'] = [
-    'remote' => 'https://github.com/JarvusInnovations/emergence-github.git',
-    'originBranch' => 'master',
-    'workingBranch' => 'master',
-    'trees' => [
-        'html-templates/connectors/github',
-        'php-classes/Emergence/GitHub',
-        'php-config/Emergence/GitHub',
-        'php-config/Emergence/People/User.config.d/github-token.php',
-        'php-config/Git.config.d/emergence-github.php',
-        'php-migrations/Emergence/GitHub',
-        'site-root/connectors/github.php'
-    ]
-];
\ No newline at end of file
diff --git a/php-config/Git.config.d/emergence-redirects.php b/php-config/Git.config.d/emergence-redirects.php
deleted file mode 100644
index 4bb9bde4..00000000
--- a/php-config/Git.config.d/emergence-redirects.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-Git::$repositories['emergence-redirects'] = [
-    'remote' => 'https://github.com/JarvusInnovations/emergence-redirects.git',
-    'originBranch' => 'master',
-    'workingBranch' => 'master',
-    'trees' => [
-        'html-templates/redirects',
-
-        'php-classes/Emergence/Redirects',
-
-        'php-config/Git.config.d/emergence-redirects.php',
-        'php-config/Site.config.d/redirects.php',
-
-        'site-root/redirects.php'
-    ]
-];
\ No newline at end of file
diff --git a/php-config/Git.config.d/emergence-saml2.php b/php-config/Git.config.d/emergence-saml2.php
deleted file mode 100644
index 190f39c8..00000000
--- a/php-config/Git.config.d/emergence-saml2.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-Git::$repositories['emergence-saml2'] = [
-    'remote' => 'https://github.com/JarvusInnovations/emergence-saml2.git',
-    'originBranch' => 'master',
-    'workingBranch' => 'master',
-    'trees' => [
-        'php-classes/Emergence/SAML2',
-
-        'php-config/Emergence/SAML2',
-        'php-config/Git.config.d/emergence-saml2.php',
-        'php-config/Git.config.d/simplesamlphp-saml2.php',
-        'php-config/Git.config.d/xmlseclibs.php',
-        'php-config/SAML2/Compat/ContainerSingleton.config.php',
-        'php-config/TableManagerRequestHandler.config.d/emergence-saml2.php',
-
-        'site-root/connectors/saml2.php'
-    ]
-];
\ No newline at end of file
diff --git a/php-config/Git.config.d/emergence-slack.php b/php-config/Git.config.d/emergence-slack.php
deleted file mode 100644
index f473821d..00000000
--- a/php-config/Git.config.d/emergence-slack.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-Git::$repositories['emergence-slack'] = [
-    'remote' => 'https://github.com/JarvusInnovations/emergence-slack.git',
-    'originBranch' => 'master',
-    'workingBranch' => 'master',
-    'trees' => [
-        'html-templates/connectors/slack',
-        'php-classes/Emergence/Slack',
-        'php-config/Emergence/Slack',
-        'php-config/Git.config.d/emergence-slack.php',
-        'site-root/connectors/slack.php'
-    ]
-];
\ No newline at end of file
diff --git a/php-config/Git.config.d/laddr.php b/php-config/Git.config.d/laddr.php
deleted file mode 100644
index d3c3c8e6..00000000
--- a/php-config/Git.config.d/laddr.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-Git::$repositories['laddr'] = [
-    'remote' => 'https://github.com/CfABrigadePhiladelphia/laddr.git',
-    'originBranch' => 'develop',
-    'workingBranch' => 'develop',
-    'trees' => [
-        'event-handlers',
-        'html-templates' => [
-            'exclude' => [
-                // exclude files from emergence-redirects
-                '#^/redirects/#',
-                
-                // exclude files from emergence-github
-                '#^/connectors/github/#',
-                
-                // exclude files from emergence-slack
-                '#^/connectors/slack/#'
-            ]
-        ],
-        'locales',
-        'php-classes/Drewm',
-        'php-classes/Emergence/Events',
-        'php-classes/Laddr',
-        'php-classes/RemoteSystems',
-        'php-classes/Laddr.php',
-        'php-config' => [
-            'exclude' => [
-                // exclude files from emergence-redirects
-                '#^/Site.config.d/redirects\.php$#',
-                
-                // exclude files from emergence-github
-                '#^/Emergence/GitHub/#',
-                '#^/Emergence/People/User\.config\.d/github-token\.php$#',
-                
-                // exclude files from emergence-slack
-                '#^/Emergence/Slack/#',
-                
-                // exclude files from emergence-saml2
-                '#^/Emergence/SAML2/#',
-                '#^/SAML2/Compat/ContainerSingleton\.config\.php#',
-                '#^/TableManagerRequestHandler\.config\.d/emergence-saml2\.php#',
-                '#^/Git\.config\.d/simplesamlphp-saml2\.php#',
-                '#^/Git\.config\.d/xmlseclibs\.php#'
-                
-            ]
-        ],
-        'php-migrations' => [
-            'exclude' => [
-                '#^/Emergence/GitHub/#'
-            ]
-        ],
-        'site-root' => [
-            'exclude' => [
-                // exclude files from emergence-redirects
-                '#^/redirects\.php$#',
-                
-                '#^/connectors/github\.php#',
-                
-                // exclude files from emergence-slack
-                '#^/connectors/slack\.php#',
-                
-                // exclude files from emergence-saml2
-                '#^/connectors/saml2\.php#',
-            ]
-        ]
-    ]
-];
diff --git a/php-config/Git.config.d/recaptcha.php b/php-config/Git.config.d/recaptcha.php
deleted file mode 100644
index 2835e0df..00000000
--- a/php-config/Git.config.d/recaptcha.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-Git::$repositories['ReCaptcha'] = [
-    'remote' => 'https://github.com/google/recaptcha.git',
-    'originBranch' => 'master',
-    'workingBranch' => 'master',
-    'trees' => [
-        'php-classes/ReCaptcha' => 'src/ReCaptcha'
-    ]
-];
\ No newline at end of file

From b9b2f762e5a825337363b24f62dd958bc0c456c5 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Wed, 9 Jan 2019 18:46:10 +0000
Subject: [PATCH 30/32] refactor: prefix codeforphilly holobranch with example-

---
 .../{codeforphilly => example-codeforphilly}/_codeforphilly.toml  | 0
 .../branches/{codeforphilly => example-codeforphilly}/_laddr.toml | 0
 .../{codeforphilly => example-codeforphilly}/_skeleton-v2.toml    | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename .holo/branches/{codeforphilly => example-codeforphilly}/_codeforphilly.toml (100%)
 rename .holo/branches/{codeforphilly => example-codeforphilly}/_laddr.toml (100%)
 rename .holo/branches/{codeforphilly => example-codeforphilly}/_skeleton-v2.toml (100%)

diff --git a/.holo/branches/codeforphilly/_codeforphilly.toml b/.holo/branches/example-codeforphilly/_codeforphilly.toml
similarity index 100%
rename from .holo/branches/codeforphilly/_codeforphilly.toml
rename to .holo/branches/example-codeforphilly/_codeforphilly.toml
diff --git a/.holo/branches/codeforphilly/_laddr.toml b/.holo/branches/example-codeforphilly/_laddr.toml
similarity index 100%
rename from .holo/branches/codeforphilly/_laddr.toml
rename to .holo/branches/example-codeforphilly/_laddr.toml
diff --git a/.holo/branches/codeforphilly/_skeleton-v2.toml b/.holo/branches/example-codeforphilly/_skeleton-v2.toml
similarity index 100%
rename from .holo/branches/codeforphilly/_skeleton-v2.toml
rename to .holo/branches/example-codeforphilly/_skeleton-v2.toml

From d383386e0284cd22200dc2c62af5c93731a5b89b Mon Sep 17 00:00:00 2001
From: Chris Alfano <calfano@codeforamerica.org>
Date: Tue, 5 Feb 2019 19:05:06 -0500
Subject: [PATCH 31/32] docs: first pass at README updates

---
 README.md | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index bc40cf3c..69449713 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,36 @@
 # laddr
 
-Laddr -- pronounced "ladder" and named after the essential tool for fire brigades -- is a web application designed to create an online home-base for [Code for America brigades](http://brigade.codeforamerica.org).
+Laddr -- pronounced "ladder" and named after the essential tool for fire brigades -- is an online homebase for your local [Code for America Brigade](http://brigade.codeforamerica.org). It is designed to be cheap-to-host and easy-to-hack platform for civic hacking groups to maintain an online precense and automate support for their real-world operations.
 
-## Hosting
-Code for Philly hosts and maintains instances for free for other brigades on our multi-tenant infrastructure. Make a post to the [Hosting Requests](http://forum.laddr.us/c/hosting-requests) category of Laddr's support forum to get started with a sandbox instance.
+## Getting started
 
-## Help / Support / Questions / Chat
-Guides and support are available at our Discourse foreum at [forum.laddr.us](http://forum.laddr.us/)
+There are three ways to get started with Laddr:
 
-Join Code for Philly's Slack channel for Laddr, you can self-register via codeforphilly.org: [codeforphilly.org/chat/laddr](https://codeforphilly.org/chat/laddr)
+- [Request free hosting of a copy for your brigade](http://forum.laddr.us/c/hosting-requests), courtesy of Code for Philly
+- [Clone laddr](#clone-laddr) to work on and contribute to its core, shared functionality
+- [Extend laddr](#extend-laddr) to create a workspace for customizing a copy of laddr for your brigade without forking the whole thing
+
+### Clone Laddr
+
+*TODO: document me*
+
+### Extend Laddr
+
+*TODO: document me*
+
+## Support
+
+- [Laddr forum/wiki](http://forum.laddr.us/)
+- [#laddr channel in Code for Philly's Slack](https://codeforphilly.org/chat/laddr)
+- #laddr channel in Code for America's Slack
+- [laddr issues on GitHub](https://github.com/CodeForPhilly/laddr/issues)
+
+Guides and support are available at our Discourse forum at
+
+Join Code for Philly's Slack channel for Laddr, you can self-register via codeforphilly.org:
 
 ## Features
+
 - [Projects Directory]
   - Each project can have a users URL, developers URL, markdown README
   - Projects can be tagged by topic, tech, and event
@@ -39,7 +59,9 @@ Join Code for Philly's Slack channel for Laddr, you can self-register via codefo
   - Croatian and Korean translations in progress
 
 ## Brigades using Laddr
+
 - [Code for Philly](http://codeforphilly.org)
+  - [Extending repository](https://github.com/CodeForPhilly/codeforphilly.org)
 - [Code for Dayton](http://codefordayton.org)
 - [Code for Croatia](http://codeforcroatia.org)
 - [Creative Commons Korea](http://labs.cckorea.org/)
@@ -48,21 +70,6 @@ Join Code for Philly's Slack channel for Laddr, you can self-register via codefo
 - [Code for Raleigh](http://www.codeforraleigh.com/)
 - [Open Charlotte Brigade](https://brigade.opencharlotte.org/)
 
-## Requirements
-Laddr is built on the Emergence PHP framework and deployement engine, and requires an Emergence server to host it.
-
-Emergence takes just a few minutes to setup on a Linux VM, and is designed to have a fresh system to itself. Once launched
-it will configure services on the machine as-needed to host an instance of the application along with any other
-sites, clones, or child sites. The guides for Ubuntu and Gentoo are most up-to-date: http://emr.ge/docs/setup
-
-## Installation via Emergence (linked child)
--  Create an emergence site that extends v2.laddr.us
-
-## Installation from Git
--  Create an emergence site that extends skeleton.emr.ge (access key: 8U6kydil36bl3vlJ)
--  Upload contents of git repository using WebDAV client (CyberDuck is the best open-source option)
-
-
 [Projects Directory]: http://codeforphilly.org/projects
 [Projects list available via dynamic CSV]: http://codeforphilly.org/projects.csv
 [Members Directory]: http://codeforphilly.org/people

From 0edbe8360f954e7a79cbb35f48fdc62e91149c5d Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 5 Feb 2019 20:25:12 -0500
Subject: [PATCH 32/32] commit lingering roles edits from laddr-v2-dev instance

---
 html-templates/projects/project.tpl          |  64 +++++------
 html-templates/projects/projects.tpl         | 106 +++++++++++++------
 php-classes/Laddr/ProjectsRequestHandler.php |  32 +++++-
 site-root/js/pages/project.js                |   1 +
 4 files changed, 139 insertions(+), 64 deletions(-)

diff --git a/html-templates/projects/project.tpl b/html-templates/projects/project.tpl
index b312f601..dbe0971d 100644
--- a/html-templates/projects/project.tpl
+++ b/html-templates/projects/project.tpl
@@ -45,6 +45,34 @@
         </div>
     </form>
     
+    <form id="add-application" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-application" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-application-title" class="modal-title"></h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group" style="display: none;">
+                        <label for="inputRoleId" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRoleId" class="form-control" name="role_id" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputApplication" class="col-sm-2 control-label">{_ "Application"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputApplication" class="form-control" name="application" placeholder="{_ 'optional'}"></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Apply"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
     <div class="page-header">
         <div class="btn-toolbar pull-right">
             <div class="btn-group">
@@ -233,7 +261,7 @@
                                             <span class="glyphicon glyphicon-transfer"></span>
                                         </a>
                                     {/if}
-                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}"  data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
+                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}" data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
                                         <span class="glyphicon glyphicon-edit"></span>
                                     </a>
                                     <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" data-toggle="modal" title="Trash" style="margin-left: 4px">
@@ -267,11 +295,11 @@
                                 {$Role->Role}
                             </td>
                             <td style="text-align:right">
-                                <a href="role_application" data-toggle="modal" data-role="{$Role->ID}" data-role_title="{$Project->Title} -- {$Role->Role}" title="Apply" style="margin-left: 4px">
+                                <a href="role_application" data-toggle="modal" data-role="{$Role->ID}" data-role_name="{$Role->Role}" data-role_title="{$Project->Title} -- {$Role->Role}" title="Apply" style="margin-left: 4px">
                                     <span class="glyphicon glyphicon-ok"></span>
                                 </a>
                                 {if $.Session->hasAccountLevel('Staff')}
-                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}"  data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
+                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}" data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
                                         <span class="glyphicon glyphicon-edit"></span>
                                     </a>
                                     <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" data-toggle="modal" title="Trash" style="margin-left: 4px">
@@ -405,34 +433,6 @@
         </div>
     </form>
     
-    <form id="add-application" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-application" method="POST">
-        <div class="modal-dialog">    
-            <div class="modal-content">    
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                    <h2 id="add-application-title" class="modal-title"></h2>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group" style="display: none;">
-                        <label for="inputRoleId" class="col-sm-2 control-label">{_ "Role"}</label>
-                        <div class="col-sm-10">
-                            <input type="text" id="inputRoleId" class="form-control" name="role_id" required>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="inputApplication" class="col-sm-2 control-label">{_ "Application"}</label>
-                        <div class="col-sm-10">
-                            <textarea rows="4" cols="50" id="inputApplication" class="form-control" name="application" placeholder="{_ 'optional'}"></textarea>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button class="btn btn-primary">{_ "Apply"}</button>
-                </div>
-            </div>
-        </div>
-    </form>
-    
     <form id="add-member" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-member" method="POST">
         <div class="modal-dialog">    
             <div class="modal-content">    
@@ -517,7 +517,7 @@
                                                     <span class="glyphicon glyphicon-transfer"></span>
                                                 </a>
                                             {/if}
-                                            <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}"  title="Trash" style="margin-left: 4px">
+                                            <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" title="Trash" style="margin-left: 4px">
                                                 <span class="glyphicon glyphicon-trash"></span>
                                             </a>
                                         </td>
diff --git a/html-templates/projects/projects.tpl b/html-templates/projects/projects.tpl
index 37f30536..b8cbaf8a 100644
--- a/html-templates/projects/projects.tpl
+++ b/html-templates/projects/projects.tpl
@@ -24,37 +24,83 @@
     {contentBlock "projects-browse-introduction"}
 
     <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">
-                <a href="#projects-by-topic" class="active btn btn-default" role="button" data-group="byTopic">{_ "topics"}</a>
-                <a href="#projects-by-tech" class="btn btn-default" role="button" data-group="byTech">{_ "tech"}</a>
-                <a href="#projects-by-event" class="btn btn-default" role="button" data-group="byEvent">{_ "events"}</a>
-                <a href="#projects-by-event" class="btn btn-default" role="button" data-group="byStage">{_ "stages"}</a>
-            </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>
-            {/template}
+        <div class="col-sm-4 col-md-3">
+            
+            <form id="add-application" class="" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-application" method="POST">
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Commenting" checked>
+                        <b>{_ Commenting}</b>: {Laddr\Project::getStageDescription(Commenting)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Bootstrapping" checked>
+                        <b>{_ Bootstrapping}</b>: {Laddr\Project::getStageDescription(Bootstrapping)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Prototyping" checked>
+                        <b>{_ Prototyping}</b>: {Laddr\Project::getStageDescription(Prototyping)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Testing" checked>
+                        <b>{_ Testing}</b>: {Laddr\Project::getStageDescription(Testing)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Maintaining" checked>
+                        <b>{_ Maintaining}</b>: {Laddr\Project::getStageDescription(Maintaining)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Drifting" checked>
+                        <b>{_ Drifting}</b>: {Laddr\Project::getStageDescription(Drifting)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Hibernating">
+                        <b>{_ Hibernating}</b>: {Laddr\Project::getStageDescription(Hibernating)}
+                    </label>
+                </div>
+                <div class="">
+                        <button class="btn btn-primary">{_ "Apply"}</button>
+                </div>
+            </form>
 
-            <div class="tags list-group byTopic">
-                {foreach item=tag from=$projectsTags.byTopic}
-                    {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
-                {/foreach}
-            </div>
-            <div class="tags list-group byTech" style="display: none">
-                {foreach item=tag from=$projectsTags.byTech}
-                    {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
-                {/foreach}
-            </div>
-            <div class="tags list-group byEvent" style="display: none">
-                {foreach item=tag from=$projectsTags.byEvent}
-                    {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
-                {/foreach}
-            </div>
-            <div class="tags list-group byStage" style="display: none">
-                {foreach item=stage from=$projectsStages}
-                    <a class="list-group-item" href="/projects?stage={$stage.Stage}">{$stage.Stage} <span class="badge pull-right">{$stage.itemsCount|number_format}</span></a>
-                {/foreach}
+        
+            <div class="tags-ct">
+                <div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">
+                    <a href="#projects-by-topic" class="active btn btn-default" role="button" data-group="byTopic">{_ "topics"}</a>
+                    <a href="#projects-by-tech" class="btn btn-default" role="button" data-group="byTech">{_ "tech"}</a>
+                    <a href="#projects-by-event" class="btn btn-default" role="button" data-group="byEvent">{_ "events"}</a>
+                </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>
+                {/template}
+    
+                <div class="tags list-group byTopic">
+                    {foreach item=tag from=$projectsTags.byTopic}
+                        {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
+                    {/foreach}
+                </div>
+                <div class="tags list-group byTech" style="display: none">
+                    {foreach item=tag from=$projectsTags.byTech}
+                        {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
+                    {/foreach}
+                </div>
+                <div class="tags list-group byEvent" style="display: none">
+                    {foreach item=tag from=$projectsTags.byEvent}
+                        {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
+                    {/foreach}
+                </div>
             </div>
         </div>
         <div class="col-sm-8 col-md-9">
diff --git a/php-classes/Laddr/ProjectsRequestHandler.php b/php-classes/Laddr/ProjectsRequestHandler.php
index e398f457..67365f1a 100644
--- a/php-classes/Laddr/ProjectsRequestHandler.php
+++ b/php-classes/Laddr/ProjectsRequestHandler.php
@@ -56,7 +56,10 @@ public static function handleBrowseRequest($options = [], $conditions = [], $res
 
         // apply stage filter
         if (!empty($_REQUEST['stage'])) {
-            $conditions['Stage'] = $_REQUEST['stage'];
+            $conditions['Stage'] = [
+                'operator' => 'in',
+                'values' => is_array($_REQUEST['stage']) ? $_REQUEST['stage'] : explode(',', $_REQUEST['stage'])
+            ];
         }
 
         $responseData['projectsTotal'] = Project::getCount();
@@ -155,6 +158,31 @@ public static function handleModifyRoleRequest(Project $Project)
     public static function handleAddRoleApplicationRequest(Project $Project){
         $GLOBALS['Session']->requireAuthentication();
         
+        $Person = User::getByUsername($_POST['username']);
+
+        $recordData = [
+            'ProjectID' => $Project->ID,
+            'PersonID' => (!$Person)?null:$Person->ID,
+            'Status' => 'Pending'
+        ];
+
+        $RoleApplication = RoleApplication::create($recordData);
+
+        if (!empty($_POST['role'])) {
+            $RoleApplication->RoleID = $_POST['role'];
+        }
+        
+        if (!empty($_POST['application'])) {
+            $RoleApplication->Application = $_POST['application'];
+        }
+
+        $RoleApplication->save();
+
+        return static::respond('roleAdded', [
+            'data' => $RoleApplication,
+            'Project' => $Project,
+            'Member' => $Person
+        ]);
     }
     
     public static function handleRemoveRoleRequest(Project $Project)
@@ -174,7 +202,7 @@ public static function handleRemoveRoleRequest(Project $Project)
             return static::respond('confirm', [
                 'question' => sprintf(
                     _('Are you sure you want to remove %s from %s?'),
-                    htmlspecialchars($Role->Role),
+                    htmlspecialchars($ProjectRole->Role),
                     htmlspecialchars($Project->Title)
                 )
             ]);
diff --git a/site-root/js/pages/project.js b/site-root/js/pages/project.js
index e5c1ff4c..141fa79b 100644
--- a/site-root/js/pages/project.js
+++ b/site-root/js/pages/project.js
@@ -36,6 +36,7 @@
 
 $( "#open_role_table" ).on( "click", "a[title^='Apply']", function( event ) {
     $('#add-application').modal({show: 'true'});
+    $("#add-application-title").text($( this ).attr( "data-role_name"));
     $("#inputRoleId").val($( this ).attr( "data-role_id"));
 });