merge recent changes into HEAD

6 files changed, 38 insertions, 10 deletions

diff --git a/templates/display_toc_inc.tpl b/templates/display_toc_inc.tpl
new file mode 100644
index 0000000..914adaf
--- /dev/null
+++ b/templates/display_toc_inc.tpl
@@ -0,0 +1,18 @@
+{strip}
+{if $subtree}
+	<ul class="toc">
+		<li>
+			{section name=ix loop=$subtree}
+				{if $subtree[ix].pos eq ''}
+					<h3>{$subtree[ix].title} {if $subtree[ix].page_alias}({/if}{$subtree[ix].page_alias}{if $subtree[ix].page_alias}){/if}</h3>
+				{else}
+					{if $subtree[ix].first}<ul>{else}</li>{/if}
+					{if $subtree[ix].last}</ul>{else}
+						<li><strong>{$subtree[ix].pos}</strong> <a href="{$smarty.const.BIT_ROOT_URL}index.php?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title}{if $subtree[ix].page_alias} ({$subtree[ix].page_alias}){/if}</a>
+					{/if}
+				{/if}
+			{/section}
+		</li>
+	</ul><!-- end outermost .toc -->
+{/if}
+{/strip}
diff --git a/templates/edit_structure.tpl b/templates/edit_structure.tpl
index 89cd2f4..1ab4fc0 100644
--- a/templates/edit_structure.tpl
+++ b/templates/edit_structure.tpl
@@ -1,4 +1,5 @@
 {strip}
+{formfeedback hash=$feedback}
 {jstabs}
 	{jstab title="Edit Structure"}
 		{include file="bitpackage:liberty/edit_structure_inc.tpl"}
diff --git a/templates/edit_structure_alias.tpl b/templates/edit_structure_alias.tpl
index 1093968..e27676b 100644
--- a/templates/edit_structure_alias.tpl
+++ b/templates/edit_structure_alias.tpl
@@ -24,7 +24,7 @@
 			{section name=ix loop=$subtree}
 				{if $subtree[ix].pos eq ''}
 					{if $structureInfo.structure_id eq $subtree[ix].structure_id}<div class="highlight">{/if}
-						<a href="{$PHP_SELF}?structure_id={$subtree[ix].structure_id}&amp;tab=alias">{$subtree[ix].title}</a>
+						<a href="{$smarty.server.PHP_SELF}?structure_id={$subtree[ix].structure_id}&amp;tab=alias">{$subtree[ix].title}</a>
 					{if $structureInfo.structure_id eq $subtree[ix].structure_id}</div>{/if}
 				{else}
 					{if $subtree[ix].first}<ul>{else}</li>{/if}
@@ -32,7 +32,7 @@
 						<li>
 							{if $structureInfo.structure_id eq $subtree[ix].structure_id}<div class="highlight">{/if}
 								<strong>{$subtree[ix].pos}</strong> 
-								<a href="{$PHP_SELF}?structure_id={$subtree[ix].structure_id}&amp;tab=alias">{$subtree[ix].title}</a>
+								<a href="{$smarty.server.PHP_SELF}?structure_id={$subtree[ix].structure_id}&amp;tab=alias">{$subtree[ix].title}</a>
 							{if $structureInfo.structure_id eq $subtree[ix].structure_id}</div>{/if}
 					{/if}
 				{/if}
diff --git a/templates/edit_structure_content.tpl b/templates/edit_structure_content.tpl
index d1fb164..327e8c2 100644
--- a/templates/edit_structure_content.tpl
+++ b/templates/edit_structure_content.tpl
@@ -47,7 +47,7 @@
 			{section name=ix loop=$subtree}
 				{if $subtree[ix].pos eq ''}
 					{if $structureInfo.structure_id eq $subtree[ix].structure_id}<div class="highlight">{/if}
-						<a href="{$PHP_SELF}?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title}</a>
+						<a href="{$smarty.server.PHP_SELF}?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title}</a>
 					{if $structureInfo.structure_id eq $subtree[ix].structure_id}</div>{/if}
 				{else}
 					{if $subtree[ix].first}<ul>{else}</li>{/if}
@@ -55,7 +55,7 @@
 						<li>
 							{if $structureInfo.structure_id eq $subtree[ix].structure_id}<div class="highlight">{/if}
 								<strong>{$subtree[ix].pos}</strong>&nbsp;
-								<a href="{$PHP_SELF}?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title}</a>
+								<a href="{$smarty.server.PHP_SELF}?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title}</a>
 							{if $structureInfo.structure_id eq $subtree[ix].structure_id}</div>{/if}
 					{/if}
 				{/if}
diff --git a/templates/edit_structure_inc.tpl b/templates/edit_structure_inc.tpl
index 0b26df7..752a679 100644
--- a/templates/edit_structure_inc.tpl
+++ b/templates/edit_structure_inc.tpl
@@ -26,7 +26,11 @@
 			<li><a id="tree-moveDown"  href="javascript:void(0)">{biticon ipackage=liberty iexplain="Down"   iname=nav_down}</a></li>
 			<li><a id="tree-moveLeft"  href="javascript:void(0)">{biticon ipackage=liberty iexplain="Left"   iname=nav_prev}</a></li>
 			<li><a id="tree-moveRight" href="javascript:void(0)">{biticon ipackage=liberty iexplain="Right"  iname=nav_next}</a></li>
-			<li><a id="tree-remove"    href="javascript:void(0)">{biticon ipackage=liberty iexplain="Remove" iname=delete}</a></li>
+			{if !$no_delete}
+				<li><a id="tree-remove"    href="javascript:void(0)">{biticon ipackage=liberty iexplain="Remove" iname=delete}</a></li>
+			{else}
+				<input id="tree-remove" type="hidden" value="dummy">
+			{/if}
 			<li><a id="tree-convert"   href="javascript:void(0)">{biticon ipackage=liberty iexplain="Folder" iname=tree-folder} &larr; &rarr; {biticon ipackage=liberty iexplain="Document" iname=tree-doc}</a></li>
 			<li><div id="tree-tooltip" class="tree-tooltip"></div>
 		</ul>
@@ -43,7 +47,10 @@
 		</noscript>
 		<input type="submit" name="submit_structure" value="Save Changes" />
 	</div>
-	{formhelp note="To nest items, you first need to convert a page to a folder.<br />You can only delete a folder when it is empty"}
+	{formhelp note="To nest items, you first need to convert a page to a folder."}
+	{if !$no_delete}
+		{formhelp note="You can only delete a folder when it is empty."}
+	{/if}
 {/form}
 {/strip}
 
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 98a4273..c8c71ca 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_liberty/templates/header_inc.tpl,v 1.3 2006/01/10 21:13:43 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_liberty/templates/header_inc.tpl,v 1.4 2006/01/14 19:54:56 squareing Exp $ *}
 {strip}
 {if $structureInfo}
 	<link rel="index" title="{tr}Contents{/tr}" href="index.php?structure_id={$structureInfo.root_structure_id}" />
@@ -13,9 +13,11 @@
 	{/if}
 {/if}
 {if $loadDynamicTree}
-	<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/jscompressor.php?jsfile=libs/mygosu/ie5.js"></script>
-	<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/jscompressor.php?jsfile=libs/mygosu/DynamicTreeBuilder.js"></script>
-	<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/jscompressor.php?jsfile=libs/mygosu/plugins.js"></script>
+	<!--[if lte IE 5.0]>
+		<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/mygosu/ie5.js"></script>
+	<![endif]-->
+	<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/mygosu/DynamicTreeBuilder.js"></script>
+	<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/mygosu/plugins.js"></script>
 	<link rel="stylesheet" type="text/css" href="{$smarty.const.UTIL_PKG_URL}javascript/libs/mygosu/DynamicTree.css" />
 {/if}
 {/strip}