From 2483fa9b0029b0593c4b5df115531cc66e12c279 Mon Sep 17 00:00:00 2001 From: Anthony Harley Date: Sun, 9 Apr 2017 12:19:13 -0400 Subject: [PATCH 1/9] Add permission check to page create --- html-templates/pages/pages.tpl | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/html-templates/pages/pages.tpl b/html-templates/pages/pages.tpl index 0c561e53..d0473f32 100644 --- a/html-templates/pages/pages.tpl +++ b/html-templates/pages/pages.tpl @@ -5,14 +5,15 @@ {block content}
- -
-
- {* field "Title" "Page Title" *} - -
-

Pages Directory

-
+ {if Emergence\CMS\PagesRequestHandler::checkWriteAccess(\Emergence\CMS\Page::create())} +
+
+ {* field "Title" "Page Title" *} + +
+

Pages Directory

+
+ {/if}
    {foreach item=Page from=$data} From e10d61534321eb4fc43e73596cc796ed7951dd2e Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 9 Apr 2017 12:40:37 -0400 Subject: [PATCH 2/9] Make navbar hover selectors more specific --- site-root/css/laddr/bootstrap-tweaks.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/site-root/css/laddr/bootstrap-tweaks.css b/site-root/css/laddr/bootstrap-tweaks.css index c42c158a..1a09a546 100644 --- a/site-root/css/laddr/bootstrap-tweaks.css +++ b/site-root/css/laddr/bootstrap-tweaks.css @@ -105,6 +105,10 @@ h1 .badge { } /* - Menus - */ -.dropdown:hover .dropdown-menu { - display: block; +@media (min-width: 1024px) { + /* Active submenu on hover, but only in desktop mode */ + .dropdown-toggle:hover + .dropdown-menu, + .dropdown-menu:hover { + display: block; + } } \ No newline at end of file From 44dad080374cb4cddbadb5e9a2df1a58d38247a7 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 9 Apr 2017 12:43:10 -0400 Subject: [PATCH 3/9] Fix typo in registration page hint --- html-templates/register/register.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html-templates/register/register.tpl b/html-templates/register/register.tpl index 98916d9e..3ae64948 100644 --- a/html-templates/register/register.tpl +++ b/html-templates/register/register.tpl @@ -46,7 +46,7 @@
    -

    Email address will be visible to other signed-in memebers.

    +

    Email address will be visible to other signed-in members.

    From 32014c34aee1eaa55e10c6eb875a2e11095071d2 Mon Sep 17 00:00:00 2001 From: Anthony Harley Date: Sun, 9 Apr 2017 13:15:30 -0400 Subject: [PATCH 4/9] Add paging to members page --- html-templates/people/people.tpl | 6 ++++ html-templates/subtemplates/paging.tpl | 30 +++++++++++++++++++ .../PeopleRequestHandler.config.d/paging.php | 3 ++ 3 files changed, 39 insertions(+) create mode 100644 html-templates/subtemplates/paging.tpl create mode 100644 php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php diff --git a/html-templates/people/people.tpl b/html-templates/people/people.tpl index 813dee76..945c9263 100644 --- a/html-templates/people/people.tpl +++ b/html-templates/people/people.tpl @@ -8,6 +8,8 @@ {/block} {block content} + {load_templates "subtemplates/paging.tpl"} +

    {_ "Registered Members"} {$membersTotal|number_format}

    @@ -46,6 +48,10 @@
    {if $.foreach.default.index % 6 == 5 || $.foreach.default.last}
{/if} {/foreach} + +
+ {pagingLinks $total pageSize=$limit} +
{/block} \ No newline at end of file diff --git a/html-templates/subtemplates/paging.tpl b/html-templates/subtemplates/paging.tpl new file mode 100644 index 00000000..4a539395 --- /dev/null +++ b/html-templates/subtemplates/paging.tpl @@ -0,0 +1,30 @@ +{template pagingLinks total pageSize=12 showAll=false} + +{/template} \ No newline at end of file diff --git a/php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php b/php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php new file mode 100644 index 00000000..1994dfa2 --- /dev/null +++ b/php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php @@ -0,0 +1,3 @@ + Date: Sun, 9 Apr 2017 13:20:27 -0400 Subject: [PATCH 5/9] Add emergence-github source --- php-config/Git.config.d/emergence-github.php | 13 +++++++++++++ php-config/Git.config.d/laddr.php | 9 ++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 php-config/Git.config.d/emergence-github.php diff --git a/php-config/Git.config.d/emergence-github.php b/php-config/Git.config.d/emergence-github.php new file mode 100644 index 00000000..f3c8d7bd --- /dev/null +++ b/php-config/Git.config.d/emergence-github.php @@ -0,0 +1,13 @@ + 'https://github.com/JarvusInnovations/emergence-github.git', + 'originBranch' => 'master', + 'workingBranch' => 'master', + 'trees' => [ + 'php-classes/Emergence/GitHub', + 'php-config/Emergence/GitHub', + 'php-config/Git.config.d/emergence-github.php', + 'site-root/connectors/github.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 1be98328..33f9eca1 100644 --- a/php-config/Git.config.d/laddr.php +++ b/php-config/Git.config.d/laddr.php @@ -16,18 +16,21 @@ 'php-classes' => [ 'exclude' => [ '#^/ReCaptcha/#', // exclude ReCaptcha library pulled from google repo - '#^/Emergence/Redirects/#' + '#^/Emergence/Redirects/#', + '#^/Emergence/GitHub/#' ] ], 'php-config' => [ 'exclude' => [ - '#^/Site.config.d/redirects.php$#' // exclude redirects library + '#^/Site.config.d/redirects\.php$#', // exclude redirects library + '#^/Emergence/GitHub/#' ] ], 'php-migrations', 'site-root' => [ 'exclude' => [ - '#^/redirects.php$#' // exclude redirects library + '#^/redirects\.php$#', // exclude redirects library + '#^/connectors/github\.php#' ] ] ] From cca855dea6b5c80630160d8c00de77cf57f6a3fb Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 9 Apr 2017 17:10:20 -0400 Subject: [PATCH 6/9] Update mappings for emergence-github source --- php-config/Git.config.d/emergence-github.php | 3 +++ php-config/Git.config.d/laddr.php | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/php-config/Git.config.d/emergence-github.php b/php-config/Git.config.d/emergence-github.php index f3c8d7bd..aeffcbd3 100644 --- a/php-config/Git.config.d/emergence-github.php +++ b/php-config/Git.config.d/emergence-github.php @@ -5,9 +5,12 @@ '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/laddr.php b/php-config/Git.config.d/laddr.php index 33f9eca1..5d7c8f85 100644 --- a/php-config/Git.config.d/laddr.php +++ b/php-config/Git.config.d/laddr.php @@ -9,7 +9,8 @@ 'event-handlers', 'html-templates' => [ 'exclude' => [ - '#^/redirects/#' // exclude redirects library + '#^/redirects/#', // exclude redirects library + '#^/connectors/github/#' ] ], 'locales', @@ -23,10 +24,15 @@ 'php-config' => [ 'exclude' => [ '#^/Site.config.d/redirects\.php$#', // exclude redirects library + '#^/Emergence/GitHub/#', + '#^/Emergence/People/User\.config\.d/github-token\.php$#' + ] + ], + 'php-migrations' => [ + 'exclude' => [ '#^/Emergence/GitHub/#' ] ], - 'php-migrations', 'site-root' => [ 'exclude' => [ '#^/redirects\.php$#', // exclude redirects library From 9a80412f4c128c0519b20678ae318b95dc743090 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sat, 5 Aug 2017 11:06:07 -0400 Subject: [PATCH 7/9] Clean up spacing --- html-templates/subtemplates/paging.tpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/html-templates/subtemplates/paging.tpl b/html-templates/subtemplates/paging.tpl index 4a539395..558abd8b 100644 --- a/html-templates/subtemplates/paging.tpl +++ b/html-templates/subtemplates/paging.tpl @@ -9,12 +9,12 @@ - + {foreach item=page from=range(1,ceil($total/$pageSize))} {math "($page-1)*$pageSize" assign=offset}
  • {$page}
    • {/foreach} - + {if $.get.offset < $total - $pageSize}
  • @@ -22,8 +22,6 @@
    • {/if} - - {/if} From 2f7ff4035b535e168d41c1b9c183990bd6c0ecaf Mon Sep 17 00:00:00 2001 From: Kurt Gawinowicz Date: Sat, 5 Aug 2017 11:26:58 -0400 Subject: [PATCH 8/9] Tweak people grid --- html-templates/people/people.tpl | 10 +++++----- site-root/css/laddr/bootstrap-tweaks.css | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/html-templates/people/people.tpl b/html-templates/people/people.tpl index 945c9263..480cba4e 100644 --- a/html-templates/people/people.tpl +++ b/html-templates/people/people.tpl @@ -41,13 +41,13 @@
    +
    {foreach item=Person from=$data} - {if $.foreach.default.index % 6 == 0}
    {/if} -
    - {personLink $Person photo=yes photoSize=150 linkCls="thumbnail text-center"} -
    - {if $.foreach.default.index % 6 == 5 || $.foreach.default.last}
    {/if} +
    + {personLink $Person photo=yes photoSize=150 linkCls="thumbnail text-center"} +
    {/foreach} +