From b5bf27ddc4ddac64a14fa82c2262acb10b5335cf Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Mon, 25 Jul 2005 20:02:56 +0000
Subject: Merge recent changes R1 1.0.2 beta --> HEAD

---
 templates/center_user_wiki_page.tpl | 1 +
 templates/menu_users.tpl            | 1 -
 templates/my_images.tpl             | 2 +-
 templates/user_tasks.tpl            | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index 3f774a4..eefedcf 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -42,6 +42,7 @@
 						{/if}
 
 						{$parsed}
+						<div style="clear:both"></div>
 					</div><!-- end .content -->
 				</div><!-- end .body -->
 			{/jstab}
diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl
index 1fa272f..deac899 100644
--- a/templates/menu_users.tpl
+++ b/templates/menu_users.tpl
@@ -6,7 +6,6 @@
 		{if $gBitSystem->isPackageActive( 'wiki' )}
 			<li><a class="item" href="{$gBitLoc.USERS_PKG_URL}edit_personal_page.php">{biticon ipackage=liberty iname=edit iforce=icon} {tr}Edit My Homepage{/tr}</a></li>
 		{/if}
-		<li><a class="item" href="{$gBitLoc.LIBERTY_PKG_URL}list_content.php">{biticon ipackage=liberty iname=spacer iforce=icon} {tr}All available Content{/tr}</a></li>
 		{if $gBitSystemPrefs.feature_user_layout eq 'h'}
 			{assign var="myLayoutConfig" value="My Homepage"}
 		{else if $gBitSystem->isFeatureActive( 'feature_user_layout' )}
diff --git a/templates/my_images.tpl b/templates/my_images.tpl
index 21442f3..68846ba 100644
--- a/templates/my_images.tpl
+++ b/templates/my_images.tpl
@@ -16,7 +16,7 @@
 				{formlabel label="Self Portrait" for="fPortraitFile"}
 				{if $gBitUser->mInfo.portrait_url}
 					{forminput}
-						<img src="{$gQueryUser->minfo.portrait_url}?{php}print time();{/php}" alt="{tr}self portrait{/tr}" /><br />
+						<img src="{$gQueryUser->mInfo.portrait_url}?{php}print time();{/php}" alt="{tr}self portrait{/tr}" /><br />
 						<input type="submit" value="{tr}delete self portrait{/tr}" name="fSubmitDeletePortait" id="fSubmitDeletePortait"/>
 					{/forminput}
 				{/if}
diff --git a/templates/user_tasks.tpl b/templates/user_tasks.tpl
index a1d8367..24007de 100644
--- a/templates/user_tasks.tpl
+++ b/templates/user_tasks.tpl
@@ -1,6 +1,6 @@
 {strip}
-<div class="floaticon">{bithelp}</div>
 
+<div class="floaticon">{bithelp}</div>
 <div class="display usertasks">
 	<div class="header">
 		<h1>{tr}Tasks{/tr}</h1>
-- 
cgit v1.3