Merge from 3.0 branch till 1185.

1 files changed, 26 insertions, 0 deletions

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/default/templates/global.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/default/templates/global.tpl
new file mode 100644
index 00000000..3c89ddfc
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/default/templates/global.tpl
@@ -0,0 +1,26 @@
+{section name=glob loop=$globals}

+<a name="{$globals[glob].global_link}" id="{$globals[glob].global_link}"><!-- --></a>

+<div class="{cycle values="evenrow,oddrow"}">

+	

+	<div>

+		<span class="var-title">

+			<span class="var-type">{$globals[glob].global_type}</span>

+			<span class="var-name">{$globals[glob].global_name}</span>

+			{if $vars[vars].var_default} = <span class="var-default">{$globals[glob].global_value|replace:"\n":"<br />"}</span>{/if}

+			(line <span class="line-number">{if $globals[glob].slink}{$globals[glob].slink}{else}{$globals[glob].line_number}{/if}</span>)

+		</span>

+	</div>

+

+	{include file="docblock.tpl" sdesc=$globals[glob].sdesc desc=$globals[glob].desc tags=$globals[glob].tags}

+	

+	{if $globals[glob].global_conflicts.conflict_type}

+		<hr class="separator" />

+		<div><span class="warning">Conflicts with global variables:</span><br /> 

+			{section name=me loop=$globals[glob].global_conflicts.conflicts}

+				{$globals[glob].global_conflicts.conflicts[me]}<br />

+			{/section}

+		</div>

+	{/if}

+	

+</div>

+{/section}
\ No newline at end of file