Merge pull request #167 from CodeForPhilly/development

Release: laddr v2.3.6
CodeForPhilly · Feb 22, 2017 · 087e912 · 087e912
2 parents d121db9 + 168bd1f
commit 087e912
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 4 deletions.
diff --git a/html-templates/bigscreen.tpl b/html-templates/bigscreen.tpl
@@ -29,6 +29,7 @@
 
         .screenshot {
             box-shadow: rgba(0, 0, 0, 0.8) 0px 0px 15px;
+            max-width: 90%;
         }
     </style>
 {/block}

diff --git a/html-templates/checkin/checkinComplete.tpl b/html-templates/checkin/checkinComplete.tpl
@@ -1,6 +1,6 @@
 {extends designs/site.tpl}
 
-{block title}How to help &mdash; {$dwoo.parent}{/block}
+{block title}Checkin Complete &mdash; {$dwoo.parent}{/block}
 
 {block content}
     {$Checkin = $data}

diff --git a/html-templates/includes/home.meetups.tpl b/html-templates/includes/home.meetups.tpl
@@ -3,13 +3,13 @@
 {load_templates subtemplates/people.tpl}
 
 {if $nextMeetup}
-    <h2>{_ "Next Meetup"}</h2>
+    <h2>{_ "Next Meetup"} <i style="color:#dd3333" class="fa fa-meetup" aria-hidden="true"></i></h2>
     {meetup $nextMeetup}
 {/if}
 
 {if count($futureMeetups)}
-    <h2>{_ "Future Meetups"}</h2>
+    <h2>{_ "Future Meetups"} <i style="color:#dd3333" class="fa fa-meetup" aria-hidden="true"></i></h2>
     {foreach item=futureMeetup from=$futureMeetups}
         {meetup $futureMeetup}
     {/foreach}
-{/if}
+{/if}
diff --git a/html-templates/includes/site.js-top.tpl b/html-templates/includes/site.js-top.tpl
@@ -0,0 +1 @@
+<script src="https://use.fontawesome.com/c71ea157d8.js"></script>
diff --git a/html-templates/projects/project.tpl b/html-templates/projects/project.tpl
@@ -32,7 +32,58 @@
         <div class="col-md-8">
             {if $Project->Stage}
                 <h2>{_ "Stage"}</h2>
+                {if $Project->Stage == null}
                 <span class="label label-info" data-toggle="tooltip" data-placement="bottom" title="{Laddr\Project::getStageDescription($Project->Stage)}">{$Project->Stage}</span>
+                {/if}
+                {if $Project->Stage == Commenting}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100" style="width: 10%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Hibernating)|escape}">
+                    <span class="show">{$Project->Stage}</span>
+                    </div>
+                </div>
+                {/if}
+                {if $Project->Stage == Bootstrapping}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" style="width: 30%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Bootstrapping)|escape}">
+                    <span class="show">{$Project->Stage}</span>
+                    </div>
+                </div>
+                {/if}
+                {if $Project->Stage == Prototyping}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: 70%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Prototyping)|escape}">
+                    {$Project->Stage}
+                    </div>
+                </div>
+                {/if}
+                {if $Project->Stage == Testing}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="90" aria-valuemin="0" aria-valuemax="100" style="width: 90%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Testing)|escape}">
+                    {$Project->Stage}
+                    </div>
+                </div>
+                {/if}
+                {if $Project->Stage == Maintaining}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Maintaining)|escape}">
+                    {$Project->Stage}
+                    </div>
+                </div>
+                {/if}
+                {if $Project->Stage == Drifting}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Drifting)|escape}">
+                    <span class="show">{$Project->Stage}</span>
+                    </div>
+                </div>
+                {/if}
+                {if $Project->Stage == Hibernating}
+                <div class="progress">
+                    <div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%;" data-toggle="tooltip" title="{Laddr\Project::getStageDescription(Hibernating)|escape}">
+                    {$Project->Stage}
+                    </div>
+                </div>
+                {/if}
             {/if}  
             {if $Project->README}
                 <h2>{_ "README"}</h2>

diff --git a/php-classes/Laddr/ProjectBuzz.php b/php-classes/Laddr/ProjectBuzz.php
@@ -71,6 +71,11 @@ class ProjectBuzz extends \ActiveRecord
         'Project'
     ];
 
+    public function getTitle()
+    {
+        return $this->Headline;
+    }
+
     public function validate($deep = true)
     {
         parent::validate($deep);

diff --git a/site-root/img/screenshot-checkin.png b/site-root/img/screenshot-checkin.png