Skip to content
This repository was archived by the owner on Feb 16, 2019. It is now read-only.

Show sub-namespaces on namespace page #13

Closed
arjenjb wants to merge 4 commits into from
Closed

Show sub-namespaces on namespace page #13

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e480d56
show sub-namespaces on namespace page
arjenjb May 17, 2012
2acd321
Merge branch 'master' of https://github.com/fabpot/Sami
arjenjb May 18, 2012
50cc67a
fixed layout
arjenjb May 18, 2012
fc8f6e1
cs
arjenjb May 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Sami/Project.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,23 @@ public function getNamespaceInterfaces($namespace)
return $this->namespaceInterfaces[$namespace];
}

public function getNamespaceSubNamespaces($parent)
Copy link
Member

@fabpot fabpot May 18, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just get the subnamespaces by parsing the namespace?

Copy link
Author

@arjenjb arjenjb May 18, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? What information could I extract from the parent
namespace about the sub namespaces? You would need to walk the namespace
array to find it's children.

Copy link
Contributor

@mtdowling mtdowling Aug 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this PR would close #119, providing a list of child namespaces on a namespace page.

{
$prefix = $parent;
if (strlen($prefix)) $prefix .= '\\';
Copy link
Member

@fabpot fabpot May 18, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You must always use {} for conditions, even if there is only one statement (the same goes below for the other condition).

$len = strlen($prefix);

$subNamespaces = array();

foreach ($this->namespaces as $sub)
{
Copy link
Member

@fabpot fabpot May 18, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{ should be on the previous line.

if (substr($sub, 0, $len) == $prefix && strpos(substr($sub, $len), '\\') === false)
$subNamespaces[$sub] = $sub;
}

return $subNamespaces;
}

public function addClass(ClassReflection $class)
{
$this->classes[$class->getName()] = $class;
Expand Down
1 change: 1 addition & 0 deletions Sami/Renderer/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ protected function renderNamespaceTemplates(array $namespaces, Project $project,

$variables = array(
'namespace' => $namespace,
'namespaces' => $project->getNamespaceSubNamespaces($namespace),
'classes' => $project->getNamespaceClasses($namespace),
'interfaces' => $project->getNamespaceInterfaces($namespace),
'exceptions' => $project->getNamespaceExceptions($namespace),
Expand Down
10 changes: 10 additions & 0 deletions Sami/Resources/themes/default/namespace.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@
{% block content %}
<h1>{{ namespace_link(namespace, {'target': 'main'}) }}</h1>

{% if namespaces %}
<h2>Namespaces</h2>
<ul>
{% for subnamespace in namespaces %}
<li>{{ namespace_link(subnamespace, {'target': 'main' }) }}</li>
{% endfor %}
</ul>
{% endif %}

{% if classes %}
<h2>Classes</h2>
<ul>
{% for class in classes %}
<li>{{ class_link(class, {'target': 'main'}) }}</li>
Expand Down
17 changes: 15 additions & 2 deletions Sami/Resources/themes/default/pages/namespace.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends page_layout %}

{% from "macros.twig" import class_link %}
{% from "macros.twig" import class_link, namespace_link %}

{% block title %}{{ namespace }} | {{ parent() }}{% endblock %}

Expand All @@ -12,7 +12,20 @@
{% endblock %}

{% block content %}
{% if namespaces %}
<h2>Namespaces</h2>
<table>
{% for subnamespace in namespaces %}
<tr>
<td>{{ namespace_link(subnamespace, {'target': 'main' }) }}</td>
<td class="last">&nbsp;</td>
</tr>
{% endfor %}
</table>
{% endif %}

{% if classes %}
<h2>Classes</h2>
<table>
{% for class in classes %}
<tr>
Expand All @@ -22,7 +35,7 @@
{% endfor %}
</table>
{% endif %}

Copy link
Contributor

@aik099 aik099 Aug 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this was added by mistake.

Copy link
Contributor

@mtdowling mtdowling Aug 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found some issues with this PR, so I'm working on an alternative that I'll submit this weekend.

On Aug 23, 2014, at 1:39 AM, Alexander Obuhovich [email protected] wrote:

In Sami/Resources/themes/default/pages/namespace.twig:

@@ -22,7 +35,7 @@
{% endfor %}

{% endif %}

  • I guess this was added by mistake.

—
Reply to this email directly or view it on GitHub.

{% if interfaces %}
<h2>Interfaces</h2>
<table>
Expand Down