Skip to content

Commit

Permalink
Merge pull request #227 from CodeForPhilly/develop
Browse files Browse the repository at this point in the history 
Release: v3.0.0-beta.13
  • Loading branch information
@themightychris
themightychris committed Nov 18, 2020
2 parents 8452c86 + 8abc04f commit 4539afc
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 26 deletions.
5 changes: 4 additions & 1 deletion .holo/sources/emergence-saml2.toml
View file
@@ -1,3 +1,6 @@
[holosource]
url = "https://github.com/JarvusInnovations/emergence-saml2"
ref = "refs/heads/emergence/layer"
ref = "refs/heads/master"

[holosource.project]
holobranch = "emergence-layer"
16 changes: 9 additions & 7 deletions html-templates/blog/blogPost.tpl
View file
Expand Up @@ -76,22 +76,24 @@
<a href="{$Post->getURL()}/edit" class="btn btn-secondary">{*glyph "pencil"*} {_ Edit}</a>
<a href="{$Post->getURL()}/delete"
class="btn btn-danger confirm"
data-confirm-yes="Delete Post"
data-confirm-no="Don&rsquo;t Delete"
data-confirm-title="Deleting Post"
data-confirm-body="Are you sure you want to delete the post &ldquo;{$Post->Title|escape}?&rdquo;"
data-confirm-yes="{_ 'Delete Post'}"
data-confirm-no="{_ 'Don&rsquo;t Delete'}"
data-confirm-title="{_ 'Deleting Post'}"
data-confirm-body="{_ 'Are you sure you want to delete the post'} &ldquo;{$Post->Title|escape}?&rdquo;"
data-confirm-destructive="true"
data-confirm-success-target=".blog-post"
data-confirm-success-message="Blog post deleted">{*glyph "trash"*} {_ Delete}</a>
data-confirm-success-message="{_ 'Blog post deleted'}">{*glyph "trash"*} {_ Delete}</a>
</div>
</div>
{/if}

<h1 class="header-title"><a href="{$Post->getURL()}">{$Post->Title|escape}</a></h1>

{capture assign=authorData}{personLink $Post->Author photo=yes photoSize=36 pixelRatio=2 summary=no}{/capture}
{capture assign=authoredDate}<a href="{$Post->getURL()}">{timestamp $Post->Published}</a>{/capture}

<div class="article-meta">
by {personLink $Post->Author photo=yes photoSize=36 pixelRatio=2 summary=no}
on <a href="{$Post->getURL()}">{timestamp $Post->Published}</a>
{sprintf(_("on %s by %s"), $authorData, $authoredDate)}
</div>

{if $Post->Summary}
Expand Down
2 changes: 1 addition & 1 deletion html-templates/contact/contact.tpl
View file
Expand Up @@ -31,7 +31,7 @@

{field inputName=Name label=Name error=$validationErrors.Name required=true attribs='autofocus autocapitalize="words"'}
{field inputName=Email label=Email error=$validationErrors.Email type=email required=true}
{field inputName=Phone label=Phone error=$validationErrors.Phone type=tel hint='Optional. Include your area code.'}
{field inputName=Phone label=Phone error=$validationErrors.Phone type=tel hint='{_ "Optional. Include your area code."}'}

{textarea inputName=Message label=Message error=$validationErrors.Message required=true}

Expand Down
12 changes: 6 additions & 6 deletions html-templates/pages/page.tpl
View file
Expand Up @@ -17,16 +17,16 @@
{if Emergence\CMS\PagesRequestHandler::checkWriteAccess($Page, true)}
<div class="btn-toolbar pull-right">
<div class="btn-group">
<a href="{$Page->getURL()}/edit" class="btn btn-secondary">Edit</a>&nbsp;
<a href="{$Page->getURL()}/edit" class="btn btn-secondary">{_ Edit}</a>&nbsp;
<a href="{$Page->getURL()}/delete"
class="btn btn-danger confirm"
data-confirm-yes="Delete Page"
data-confirm-no="Don&rsquo;t Delete"
data-confirm-title="Deleting Post"
data-confirm-body="Are you sure you want to delete the page &ldquo;{$Page->Title|escape}?&rdquo;"
data-confirm-yes="{_ 'Delete Page'}"
data-confirm-no="{_ 'Don&rsquo;t Delete'}"
data-confirm-title="{_ 'Deleting Post'}"
data-confirm-body="{_ 'Are you sure you want to delete the page'} &ldquo;{$Page->Title|escape}?&rdquo;"
data-confirm-destructive="true"
data-confirm-success-target=".cms-page"
data-confirm-success-message="Page deleted">{_ Delete}</a>
data-confirm-success-message="{_ 'Page deleted'}">{_ Delete}</a>
</div>
</div>
{/if}
Expand Down
12 changes: 6 additions & 6 deletions html-templates/subtemplates/blog.tpl
View file
Expand Up @@ -36,13 +36,13 @@
<a href="{$Post->getURL()}/edit" class="btn btn-sm btn-secondary">{icon "pencil"} <span class="sr-only">{_ Edit}</span></span></a>
<a href="{$Post->getURL()}/delete"
class="btn btn-sm btn-danger confirm"
data-confirm-yes="Delete Post"
data-confirm-no="Don&rsquo;t Delete"
data-confirm-title="Deleting Post"
data-confirm-body="Are you sure you want to delete the post &ldquo;{$Post->Title|escape}?&rdquo;"
data-confirm-yes="{_ 'Delete Post'}"
data-confirm-no="{_ 'Don&rsquo;t Delete'}"
data-confirm-title="{_ 'Deleting Post'}"
data-confirm-body="{_ 'Are you sure you want to delete the post'} &ldquo;{$Post->Title|escape}?&rdquo;"
data-confirm-destructive="true"
data-confirm-success-target=".blog-post"
data-confirm-success-message="Blog post deleted">{icon "trash"} <span class="sr-only">{_ Delete}</span></a>
data-confirm-success-message="{_ 'Blog post deleted'}">{icon "trash"} <span class="sr-only">{_ Delete}</span></a>
</div>
{/if}

Expand All @@ -69,7 +69,7 @@
{if $Post->Tags && $showCommentsSummary} &emsp; {/if}
{if $Post->Tags}
<small class="post-tags text-muted">
{icon "tag"}&nbsp;<span class="sr-only">Tags: </span>{foreach item=Tag from=$Post->Tags implode=', '}<a href="{$Tag->getURL()}">{$Tag->Title|escape}</a>{/foreach}
{icon "tag"}&nbsp;<span class="sr-only">{_ Tags}: </span>{foreach item=Tag from=$Post->Tags implode=', '}<a href="{$Tag->getURL()}">{$Tag->Title|escape}</a>{/foreach}
</small>
{/if}
</footer>
Expand Down
10 changes: 5 additions & 5 deletions html-templates/subtemplates/comments.tpl
View file
Expand Up @@ -53,13 +53,13 @@
{/if}
<a href="{$Comment->getURL()}/delete"
class="btn btn-sm btn-danger confirm"
data-confirm-yes="Delete Comment"
data-confirm-no="Don&rsquo;t Delete"
data-confirm-title="Deleting Comment"
data-confirm-body="Are you sure you want to delete this comment from {personName $Comment->Creator}?"
data-confirm-yes="{_ 'Delete Comment'}"
data-confirm-no="{_ 'Don&rsquo;t Delete'}"
data-confirm-title="{_ 'Deleting Comment'}"
data-confirm-body="{_ 'Are you sure you want to delete this comment from'} {personName $Comment->Creator}?"
data-confirm-destructive="true"
data-confirm-success-target=".comment"
data-confirm-success-message="Comment deleted">{_ Delete}</a>
data-confirm-success-message="{_ 'Comment deleted'}">{_ Delete}</a>
</div>
{/if}

Expand Down

0 comments on commit 4539afc

Please sign in to comment.