diff --git a/.holo/sources/laddr.toml b/.holo/sources/laddr.toml index ec2361fd..ef7154d0 100644 --- a/.holo/sources/laddr.toml +++ b/.holo/sources/laddr.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/CodeForPhilly/laddr" -ref = "refs/tags/v3.2.11" +ref = "refs/tags/v3.2.12" diff --git a/docs/mkdocs.studio.yml b/docs/mkdocs.studio.yml index 33882cb5..021f93be 100644 --- a/docs/mkdocs.studio.yml +++ b/docs/mkdocs.studio.yml @@ -2,5 +2,6 @@ extra: studio: name: codeforphilly-studio web_port: 9080 + static_port: 9081 docs_port: 9088 mysql_port: 9086 diff --git a/html-templates/projects/project.tpl b/html-templates/projects/project.tpl new file mode 100644 index 00000000..d8b6c2c4 --- /dev/null +++ b/html-templates/projects/project.tpl @@ -0,0 +1,334 @@ +{extends designs/site.tpl} + +{block title}{$data->Title|escape} — {_ 'Projects'} — {$dwoo.parent}{/block} + +{block content} + {$Project = $data} + +
+
+
+ {if $.User->hasAccountLevel('Staff')} + {_ "Edit Project"} +
+ +
+ {_ "Add Member"} + {_ "Log Buzz"} + {if $.User && ($Project->hasMember($.User) || $.Session->hasAccountLevel('Staff'))} + {_ "Post Update"} + {/if} + {if $.Session->hasAccountLevel('Staff')} + {_ "Manage Members"} + {/if} +
+
+ Delete Project + {/if} +
+
+ +

{$Project->Title|escape}

+
+ +
+
+ {if $Project->Stage} +

{_ "Stage"}

+ {if $Project->Stage == null} + {$Project->Stage} + {/if} + {if $Project->Stage == Commenting} +
+
+ {$Project->Stage} +
+
+ {/if} + {if $Project->Stage == Bootstrapping} +
+
+ {$Project->Stage} +
+
+ {/if} + {if $Project->Stage == Prototyping} +
+
+ {$Project->Stage} +
+
+ {/if} + {if $Project->Stage == Testing} +
+
+ {$Project->Stage} +
+
+ {/if} + {if $Project->Stage == Maintaining} +
+
+ {$Project->Stage} +
+
+ {/if} + {if $Project->Stage == Drifting} +
+
+ {$Project->Stage} +
+
+ {/if} + {if $Project->Stage == Hibernating} +
+
+ {$Project->Stage} +
+
+ {/if} + {/if} + {if $Project->README} +

{_ "README"}

+
+ {$Project->README|escape|markdown} +
+ {/if} + + {* +

Comments:

+
+ + +
+ {foreach item=Comment from=$Project->$Comments} +

+ {$Comment->Message} +

+ {/foreach} + *} + + {* if ($.User && $Project->hasMember($.User))} +
+ +
+ {/if *} + +

+ {_ "Project Activity"} +
+ {if $.User && $Project->hasMember($.User)} + {_ "Post Update"} + {_ "Log Buzz"} + {/if} +
+

+ + {foreach item=Article from=$Project->getActivity()} + {projectActivity $Article headingLevel=h3 showProject=no} + {foreachelse} + {_ "This project doesn't have any activity yet, post an update or log some buzz!"} + {/foreach} +
+ + +
+

{_ "Project Info"}

+ + +
+ {if $Project->UsersUrl} + + {icon "user"} {_ "Users' Site"} +
{$Project->UsersUrl|escape}
+ + {/if} + {if $Project->DevelopersUrl} + + {icon "cog"} {_ "Developers' Site"} +
{$Project->DevelopersUrl|escape}
+ + {/if} + {if $Project->ChatChannel} + {if Laddr::$chatLinker} + + {icon "comment"} {_ "Chat Channel"} +
#{$Project->ChatChannel|escape}
+ + {else} +

Chat Channel: #{$Project->ChatChannel|escape}

+ {/if} + {/if} +
+ + + {if $Project->Memberships} +

{_ "Members"}

+ + + {if $.User && $Project->hasMember($.User)} + + {_ "Add"} + {/if} + {/if} +
+ + + {if $Project->TechTags} + {_ "Tech"}: + + {/if} + + {if $Project->TopicTags} + {_ "Topics"}: + + {/if} + + {if $Project->EventTags} + {_ "Events"}: + + {/if} + +
+ +
+ {_ 'Spread the word on Twitter!'} +
+
+
+ +{/block} + +{block js-bottom} + {$dwoo.parent} + + + + {if $.User && ($Project->hasMember($.User) || $.Session->hasAccountLevel('Staff'))} + + {/if} + + {if $.Session->hasAccountLevel('Staff')} + + {/if} + + {jsmin "lib/epiceditor.js"} + {jsmin "pages/project.js"} +{/block} diff --git a/html-templates/projects/projects.tpl b/html-templates/projects/projects.tpl new file mode 100644 index 00000000..ee04b27b --- /dev/null +++ b/html-templates/projects/projects.tpl @@ -0,0 +1,112 @@ +{extends designs/site.tpl} + +{block title}{_ "Projects"} — {$dwoo.parent}{/block} + +{block js-bottom} + {$dwoo.parent} + {jsmin "features/sidebar-tags.js"} +{/block} + +{block content} +
+
+ {if $.User && $.User->hasAccountLevel('Staff')} +
+ +
+ {/if} +
+

{_ "Civic Projects Directory"} {$projectsTotal|number_format}

+
+ + {contentBlock "projects-browse-introduction"} + +
+
+
+ {_ "topics"} + {_ "tech"} + {_ "events"} + {_ "stages"} +
+ + {template tagLink tagData rootUrl linkCls=""} + {$tagData.Title}{if $tagData.itemsCount} {$tagData.itemsCount|number_format}{/if} + {/template} + +
+ {foreach item=tag from=$projectsTags.byTopic} + {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item list-group-item-action"} + {/foreach} +
+ + + +
+
+ {foreach item=Project from=$data} +
+
+

+ {$Project->Title|escape} + {if $Project->Stage} + {_ "$Project->Stage"} + {/if} +

+
+ {if $Project->README} +
{$Project->README|truncate:600|escape|markdown}
+ {/if} +
+ {if $Project->Memberships} + + {/if} +
+ {if $Project->UsersUrl}{icon "link"} {_ 'Public Site'}{/if} + {if $Project->DevelopersUrl}{icon "link"} {_ Developers}{/if} +
+
+
+ {foreachelse} + {capture assign=browseText}{_ 'browse without any filters'}{/capture} + {if count($conditions)} + {sprintf(_("No projects were found, try creating one or %s."), $browseText)} + {else} + {_ "No projects were found, try creating one."} + {/if} + {/foreach} +
+
+{/block} diff --git a/php-config/Emergence/Comments/CommentsRequestHandler.config.php b/php-config/Emergence/Comments/CommentsRequestHandler.config.d/staff-only.php similarity index 100% rename from php-config/Emergence/Comments/CommentsRequestHandler.config.php rename to php-config/Emergence/Comments/CommentsRequestHandler.config.d/staff-only.php diff --git a/php-config/Laddr/ProjectsRequestHandler.config.d/staff-only.php b/php-config/Laddr/ProjectsRequestHandler.config.d/staff-only.php new file mode 100644 index 00000000..b6ad975f --- /dev/null +++ b/php-config/Laddr/ProjectsRequestHandler.config.d/staff-only.php @@ -0,0 +1,3 @@ +