Merge pull request #225 from CodeForPhilly/develop

Release: v3.0.0-beta.12

.github/workflows/holo.yml

@@ -0,0 +1,53 @@
+name: Projections
+
+on:
+  push:
+    tags:
+      - 'v3.*'
+
+
+jobs:
+  holobranch-projections:
+    runs-on: ubuntu-latest
+    steps:
+    - name: 'Update holobranch: emergence/skeleton/v3'
+      uses: JarvusInnovations/hologit@actions/projector/v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        HAB_LICENSE: accept
+      with:
+        ref: releases/v3
+        holobranch: emergence-skeleton
+        commit-to: emergence/skeleton/v3
+    - name: 'Update holobranch: emergence/vfs-site/v3'
+      uses: JarvusInnovations/hologit@actions/projector/v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        HAB_LICENSE: accept
+      with:
+        ref: releases/v3
+        holobranch: emergence-vfs-site
+        commit-to: emergence/vfs-site/v3
+    - name: 'Update v3.laddr.us'
+      env:
+        VFS_DEV_TOKEN: ${{ secrets.VFS_DEV_TOKEN }}
+      run: |
+        # pull latest commit
+        curl -X POST \
+          --silent \
+          --show-error \
+          --fail \
+          -H "Authorization: Token ${VFS_DEV_TOKEN}" \
+          -H "Accept: application/json" \
+          "http://v3.laddr.us/site-admin/sources/laddr/pull?fetch=true" \
+          | jq '.'
+
+        # sync VFS to git
+        curl -X POST \
+          --silent \
+          --show-error \
+          --fail \
+          -H "Authorization: Token ${VFS_DEV_TOKEN}" \
+          -H "Accept: application/json" \
+          "http://v3.laddr.us/site-admin/sources/laddr/sync-to-vfs" \
+          | jq '.'

.gitignore

@@ -1 +1,2 @@
 .emergence
+.php_cs.cache

.holo/branches/emergence-site/_layer-events.toml

@@ -0,0 +1,3 @@
+[holomapping]
+holosource = "=>emergence-layer"
+files = "**"

.holo/sources/layer-events.toml

@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/EmergencePlatform/layer-events.git"
+ref = "refs/heads/releases/v2"

.php_cs.dist

@@ -0,0 +1,39 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    //->exclude('somedir')
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        /**
+         * Tap the most thoroughly-considered and
+         * widely-adopted presets for minimizing errors
+         */
+        '@PSR1' => true,
+        '@PSR2' => true,
+        // '@PSR12' => true, // not supported yet
+        '@Symfony' => true,
+
+        /**
+         * Apply a consistent order to class members.
+         *
+         * https://mlocati.github.io/php-cs-fixer-configurator/#version:2.16|fixer:ordered_class_elements
+         *
+         * Compatible with @Symfony
+         */
+        'ordered_class_elements' => true,
+
+        /**
+         * Symfony only cares about blank lines before returns,
+         * but phpcsfixer's default includes a few more cases.
+         *
+         * https://mlocati.github.io/php-cs-fixer-configurator/#version:2.16|fixer:blank_line_before_statement
+         *
+         * Compatible with @Symfony
+         */
+        'blank_line_before_statement' => true,
+    ])
+    ->setFinder($finder)
+;

.phpcs.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+    <!-- See list of available standards: https://github.com/squizlabs/PHP_CodeSniffer/tree/master/src/Standards -->
+    <rule ref="PSR1"/>
+    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
+    <rule ref="Symfony"/>
+
+    <file>app</file>
+    <file>bootstrap</file>
+    <file>config</file>
+    <file>database</file>
+    <file>resources</file>
+    <file>routes</file>
+    <file>tests</file>
+
+    <exclude-pattern>bootstrap/cache/*</exclude-pattern>
+    <exclude-pattern>bootstrap/autoload.php</exclude-pattern>
+    <exclude-pattern>*/migrations/*</exclude-pattern>
+    <exclude-pattern>*/seeds/*</exclude-pattern>
+    <exclude-pattern>*.blade.php</exclude-pattern>
+    <exclude-pattern>*.js</exclude-pattern>
+
+    <!-- Show progression -->
+    <arg value="p"/>
+</ruleset>

html-templates/blog/blogPosts.tpl

@@ -5,35 +5,36 @@
     {cssmin "pages/article.css"}
 {/block}
 
-{block title}Blog — {$dwoo.parent}{/block}
+{block title}{_ 'Blog'} — {$dwoo.parent}{/block}
 
 {block "content"}
     {load_templates "subtemplates/blog.tpl"}
     {load_templates "subtemplates/paging.tpl"}
 
     <div class="row">
         <div class="col-md-8 col-md-offset-2">
-    
+
             <header class="page-header">
-                <a href="/blog/create" class="btn btn-success pull-right">New Post</a>
+                <a href="/blog/create" class="btn btn-success pull-right">{_ "New Post"}</a>
 
-                <h1>Blog Feed</h1>
+                <h1>{_ "Blog Feed"}</h1>
             </header>
-            
+
             <section class="page-section article-collection">
             {foreach item=BlogPost from=$data}
                 {blogPost $BlogPost useSummary=true showBody=false headingLevel="h2"}
             {foreachelse}
-                <p class="empty-text">Stay tuned for the first post&hellip;</p>
+                <p class="empty-text">{_ "Stay tuned for the first post"}&hellip;</p>
             {/foreach}
             </section>
 
             {if $total > $limit}
             <footer class="page-footer">
-                <strong>{$total|number_format} posts:</strong> {pagingLinks $total pageSize=$limit}
+              {capture assign=totalPosts}{$total|number_format}{pagingLinks $total pageSize=$limit}{/capture}
+                <strong>{sprintf(_("%s posts:"), $totalPosts)}</strong>
             </footer>
             {/if}
 
         </div>
     </div>
-{/block}
+{/block}

html-templates/checkin/checkinComplete.tpl

@@ -1,14 +1,20 @@
 {extends designs/site.tpl}
 
-{block title}Checkin Complete — {$dwoo.parent}{/block}
+{block title}{_ "Checkin Complete"} — {$dwoo.parent}{/block}
 
 {block content}
     {$Checkin = $data}
 
     <div class="page-header">
         <h1>{_ "Success!"}</h1>
     </div>
-    <p>Thanks for checking in {if $Checkin->Project}to {projectLink $Checkin->Project}{/if} @ {Laddr::$siteName|escape}!</p>
+    {capture assign=checkinProject}{projectLink $Checkin->Project}{/capture}
+    {capture assign=checkinSiteName}{Laddr::$siteName|escape}{/capture}
+      {if $Checkin->Project}
+        <p>{sprintf(_("Thanks for checking in to %s @ %s!"), $checkinProject, $checkinSiteName)}</p>
+      {else}
+        <p>{sprintf(_("Thanks for checking in @ %s!"), $checkinSiteName)}</p>
+      {/if}
     <h2>{_ "Things to do next:"}</h2>
     <ul>
         {if $Checkin->Project}
@@ -23,4 +29,4 @@
             <li><a href="/develop#/html-templates/checked-in.tpl">{_ "Add stuff to this list"}</a></li>
         {/if}
     </ul>
-{/block}
+{/block}

html-templates/checkin/latestEvents.tpl

@@ -9,10 +9,10 @@
 
     <table width="600">
         <tr>
-            <th align="left">Meetup ID</th>
-            <th align="left">First Checkin</th>
-            <th align="left">Last Checkin</th>
-            <th align="right">Checkins</th>
+            <th align="left">{_ "Meetup ID"}</th>
+            <th align="left">{_ "First Checkin"}</th>
+            <th align="left">{_ "Last Checkin"}</th>
+            <th align="right">{_ "Checkins"}</th>
         </tr>
         {foreach item=row from=$data}
             <tr>
@@ -23,4 +23,4 @@
             </tr>
         {/foreach}
     </table>
-{/block}
+{/block}

html-templates/checkin/topMembers.tpl

@@ -9,8 +9,8 @@
 
     <table width="350">
         <tr>
-            <th align="left">Member</th>
-            <th align="right">Event checkins</th>
+            <th align="left">{_ Member}</th>
+            <th align="right">{_ "Event checkins"}</th>
         </tr>
         {foreach item=row from=$data}
             <tr>
@@ -19,4 +19,4 @@
             </tr>
         {/foreach}
     </table>
-{/block}
+{/block}

html-templates/confirm.tpl

@@ -5,15 +5,15 @@
     <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
         <div class="page-header">
             {if $data->getTitle()}
-                <h1>Delete {$data->getTitle()}</h1>
+                <h1>{_ Delete} {$data->getTitle()}</h1>
             {else}
-                <h1>Please confirm</h1>
+                <h1>{_ "Please confirm"}</h1>
             {/if}
         </div>
         <p class="confirm">{$question}</p>
         <form method="POST">
-            <button type="button" class="btn btn-secondary margin-right" name="Sure" value="No" onclick="javascript:history.go(-1);">No</button>
-            <button type="submit" class="btn btn-danger" name="Sure">Yes</button>
+            <button type="button" class="btn btn-secondary margin-right" name="Sure" value="No" onclick="javascript:history.go(-1);">{_ No}</button>
+            <button type="submit" class="btn btn-danger" name="Sure">{_ Yes}</button>
         </form>
     </div>
 </div>

html-templates/contact/contact.tpl

@@ -1,6 +1,6 @@
 {extends designs/site.tpl}
 
-{block "title"}Contact — {$dwoo.parent}{/block}
+{block "title"}{_ 'Contact'} — {$dwoo.parent}{/block}
 
 {block js-top}
     {$dwoo.parent}
@@ -15,15 +15,15 @@
         <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 
             <div class="page-header">
-                <h1>Contact Us</h1>
+                <h1>{_ "Contact Us"}</h1>
             </div>
 
             {contentBlock "contact-introduction"}
 
             <form action="/contact" method="POST" class="contact-form">
                 {if $validationErrors}
                     <div class="alert alert-danger">
-                        Please double-check the fields highlighted below.
+                        {_ "Please double-check the fields highlighted below."}
                     </div>
                 {/if}
 
@@ -43,9 +43,9 @@
                     <p class="text-danger">{$validationErrors.ReCaptcha}</p>
                 {/if}
 
-                <button type="submit" class="btn btn-primary">Send</button>
+                <button type="submit" class="btn btn-primary">{_ Send}</button>
             </form>
 
         </div>
     </div>
-{/block}
+{/block}