major clean up for Smarty 3.0 and another pass at cleaning the top menus

13 files changed, 32 insertions, 31 deletions

diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 9ed7696..cf2bf0b 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -40,7 +40,7 @@
 					{if $feature == 'users_random_number_reg'}
 						{formfeedback warning=$warning}
 					{/if}
-					{formlabel label=`$output.label` for=$feature}
+					{formlabel label=$output.label for=$feature}
 					{forminput}
 						{if $output.type == 'text'}
 							{if $feature eq 'cookie_domain' && $gBitSystem->getConfig($feature) eq ''}
@@ -53,7 +53,7 @@
 						{else}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+						{formhelp note=$output.note page=$output.page link=$output.link}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -135,14 +135,14 @@
 
 			{foreach from=$registerSettings key=feature item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$feature}
+					{formlabel label=$output.label for=$feature}
 					{forminput}
 						{if $output.type == 'text'}
 							<input type="text" size="50" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 						{else}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+						{formhelp note=$output.note page=$output.page link=$output.link}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -161,14 +161,14 @@
 
 			{foreach from=$httpSettings key=feature item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$feature}
+					{formlabel label=$output.label for=$feature}
 					{forminput}
 						{if $output.type == 'text'}
 							<input type="text" size="50" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 						{else}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+						{formhelp note=$output.note page=$output.page link=$output.link}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -198,7 +198,7 @@
 								{else}
 									<input type="text" size="50" name="{$op_id}" id="{$op_id}" value="{$output.value|escape}" />
 								{/if}
-								{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+								{formhelp note=$output.note page=$output.page link=$output.link}
 							{/forminput}
 						</div>
 					{/foreach}
diff --git a/templates/admin_login_role.tpl b/templates/admin_login_role.tpl
index 7b1a0f3..9097087 100644
--- a/templates/admin_login_role.tpl
+++ b/templates/admin_login_role.tpl
@@ -40,7 +40,7 @@
 					{if $feature == 'users_random_number_reg'}
 						{formfeedback warning=$warning}
 					{/if}
-					{formlabel label=`$output.label` for=$feature}
+					{formlabel label=$output.label for=$feature}
 					{forminput}
 						{if $output.type == 'text'}
 							{if $feature eq 'cookie_domain' && $gBitSystem->getConfig($feature) eq ''}
@@ -53,7 +53,7 @@
 						{else}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+						{formhelp note=$output.note page=$output.page link=$output.link}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -120,14 +120,14 @@
 
 			{foreach from=$registerSettings key=feature item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$feature}
+					{formlabel label=$output.label for=$feature}
 					{forminput}
 						{if $output.type == 'text'}
 							<input type="text" size="50" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 						{else}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+						{formhelp note=$output.note page=$output.page link=$output.link}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -146,14 +146,14 @@
 
 			{foreach from=$httpSettings key=feature item=output}
 				<div class="control-group">
-					{formlabel label=`$output.label` for=$feature}
+					{formlabel label=$output.label for=$feature}
 					{forminput}
 						{if $output.type == 'text'}
 							<input type="text" size="50" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 						{else}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
 						{/if}
-						{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+						{formhelp note=$output.note page=$output.page link=$output.link}
 					{/forminput}
 				</div>
 			{/foreach}
@@ -183,7 +183,7 @@
 								{else}
 									<input type="text" size="50" name="{$op_id}" id="{$op_id}" value="{$output.value|escape}" />
 								{/if}
-								{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+								{formhelp note=$output.note page=$output.page link=$output.link}
 							{/forminput}
 						</div>
 					{/foreach}
diff --git a/templates/admin_users.tpl b/templates/admin_users.tpl
index e05ae02..79de81f 100644
--- a/templates/admin_users.tpl
+++ b/templates/admin_users.tpl
@@ -14,10 +14,10 @@
 	<input type="hidden" name="page" value="{$page}" />
 	{foreach from=$formFeatures key=feature item=output}
 		<div class="control-group">
-			{formlabel label=`$output.label` for=$feature}
+			{formlabel label=$output.label for=$feature}
 			{forminput}
 				{html_checkboxes name="settings[$feature]" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-				{formhelp note=`$output.note` page=`$output.link`}
+				{formhelp note=$output.note page=$output.link}
 			{/forminput}
 		</div>
 	{/foreach}
diff --git a/templates/edit_personal_page.tpl b/templates/edit_personal_page.tpl
index 9a47e94..61227df 100644
--- a/templates/edit_personal_page.tpl
+++ b/templates/edit_personal_page.tpl
@@ -22,7 +22,7 @@
 		<script type="text/javascript">/* <![CDATA[ */
 			alert( "{$errors.edit_conflict|strip_tags}" );
 		/* ]]> */</script>
-		{formfeedback warning=`$errors.edit_conflict`}
+		{formfeedback warning=$errors.edit_conflict}
 	{/if}
 
 	<div class="body">
@@ -70,7 +70,7 @@
 						<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
 
 						<div class="control-group">
-							{formfeedback warning=`$errors.title`}
+							{formfeedback warning=$errors.title}
 							{formlabel label="$conDescr Title" for="title"}
 							{forminput}
 								{if $gBitUser->hasPermission( 'p_wiki_rename_page' ) || !$pageInfo.page_id}
diff --git a/templates/login.tpl b/templates/login.tpl
index 6dd3ee2..3dd33b5 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,7 +1,7 @@
 {strip}
 <div class="span4 display login ">
 
-	{include file=bitpackage:users/login_inc.tpl}
+	{include file="bitpackage:users/login_inc.tpl"}
 
 </div><!-- end .login -->
 {/strip}
diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl
index 3bada4f..b0865ba 100644
--- a/templates/menu_users.tpl
+++ b/templates/menu_users.tpl
@@ -2,7 +2,8 @@
 {if !$icons_only}
 	{assign var=location value=menu}
 {/if}
-<ul>
+<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
+<ul class="dropdown-menu">
 	{if $gBitUser->isRegistered()}
 		<li><a class="item" href="{$gBitSystem->getConfig('users_login_homepage',"`$smarty.const.USERS_PKG_URL`my.php")}">{booticon iname="icon-circle-arrow-right"   iexplain="My Personal Page" ilocation=$location}</a></li>
 		{if $gBitUser->hasPermission( 'p_users_view_user_homepage' )}
diff --git a/templates/my_group_edit.tpl b/templates/my_group_edit.tpl
index 46fd951..e00a387 100644
--- a/templates/my_group_edit.tpl
+++ b/templates/my_group_edit.tpl
@@ -95,7 +95,7 @@
 									<td>{$foundUsers[ix].login}</td>
 									<td>{$foundUsers[ix].real_name}</td>
 									<td>{$foundUsers[ix].user_id}</td>
-									<td class="actionicon">{smartlink ititle="Select User" group_id=`$groupInfo.group_id` assignuser=`$foundUsers[ix].user_id`}</td>
+									<td class="actionicon">{smartlink ititle="Select User" group_id=$groupInfo.group_id assignuser=$foundUsers[ix].user_id}</td>
 								</tr>
 							{/section}
 						</table>
diff --git a/templates/my_role_edit.tpl b/templates/my_role_edit.tpl
index f3771af..4dbb4ac 100644
--- a/templates/my_role_edit.tpl
+++ b/templates/my_role_edit.tpl
@@ -95,7 +95,7 @@
 									<td>{$foundUsers[ix].login}</td>
 									<td>{$foundUsers[ix].real_name}</td>
 									<td>{$foundUsers[ix].user_id}</td>
-									<td class="actionicon">{smartlink ititle="Select User" role_id=`$roleInfo.role_id` assignuser=`$foundUsers[ix].user_id`}</td>
+									<td class="actionicon">{smartlink ititle="Select User" role_id=$roleInfo.role_id assignuser=$foundUsers[ix].user_id}</td>
 								</tr>
 							{/section}
 						</table>
diff --git a/templates/register.tpl b/templates/register.tpl
index 443231c..dcd7c0f 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -201,7 +201,7 @@
 					{else}
 						<input type="text" size="50" name="{$op_name}" id="{$op_id}" value="{$output.value|escape}" />
 					{/if}
-					{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+					{formhelp note=$output.note page=$output.page link=$output.link}
 				{/forminput}
 			</div>
 		{/foreach}
diff --git a/templates/role_register.tpl b/templates/role_register.tpl
index 84e37c7..324a9c8 100644
--- a/templates/role_register.tpl
+++ b/templates/role_register.tpl
@@ -208,7 +208,7 @@
 							{else}
 								<input type="text" size="50" name="{$op_name}" id="{$op_id}" value="{$output.value|escape}" />
 							{/if}
-							{formhelp note=`$output.note` page=`$output.page` link=`$output.link`}
+							{formhelp note=$output.note page=$output.page link=$output.link}
 						{/forminput}
 					</div>
 				{/foreach}
diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl
index 5acdfbe..7947128 100644
--- a/templates/user_assigned_modules.tpl
+++ b/templates/user_assigned_modules.tpl
@@ -25,15 +25,15 @@
 											{tr}Position {$modules.$area[ix].ord}{/tr}<br />
 											{$modules.$area[ix].name}
 											<div style="text-align:center;">
-												{smartlink ititle="Up" ibiticon="liberty/move_up" fMove=up fPackage=$fPackage fModule=`$modules.$area[ix].module_id`}
-												{smartlink ititle="Down" ibiticon="liberty/move_down" fMove=down fPackage=$fPackage fModule=`$modules.$area[ix].module_id`}
+												{smartlink ititle="Up" ibiticon="liberty/move_up" fMove=up fPackage=$fPackage fModule=$modules.$area[ix].module_id}
+												{smartlink ititle="Down" ibiticon="liberty/move_down" fMove=down fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{if $colkey eq 'right'}
-													{smartlink ititle="Move to Left" ibiticon="liberty/move_left" fMove=left fPackage=$fPackage fModule=`$modules.$area[ix].module_id`}
+													{smartlink ititle="Move to Left" ibiticon="liberty/move_left" fMove=left fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{elseif $colkey eq 'left'}
-													{smartlink ititle="Move to Right" ibiticon="liberty/move_right" fMove=right fPackage=$fPackage fModule=`$modules.$area[ix].module_id`}
+													{smartlink ititle="Move to Right" ibiticon="liberty/move_right" fMove=right fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{/if}
 												{if $column[ix].type ne 'P'}
-													{smartlink ititle="Unassign" booticon="icon-trash" ionclick="return confirm('Are you sure you want to remove `$modules.$area[ix].name`?');" fMove=unassign fPackage=$fPackage fModule=`$modules.$area[ix].module_id`}
+													{smartlink ititle="Unassign" booticon="icon-trash" ionclick="return confirm('Are you sure you want to remove `$modules.$area[ix].name`?');" fMove=unassign fPackage=$fPackage fModule=$modules.$area[ix].module_id}
 												{/if}
 											</div>
 										</td>
diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index fe2f059..8650aea 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -140,7 +140,7 @@
 								<label><input type="radio" name="site_display_utc" value="Fixed" {if $editUser->mPrefs.site_display_utc eq 'Fixed'}checked="checked"{/if} />{tr}Fixed{/tr}</label>
 								<br />
 								<select name="site_display_timezone" id="site_display_timezone">
-									{html_options values=$userTimezones output=$userTimezones selected=`$editUser->mPrefs.site_display_timezone`}
+									{html_options values=$userTimezones output=$userTimezones selected=$editUser->mPrefs.site_display_timezone}
 								</select>
 								{formhelp note="Internal data is stored using UTC time stamps, these can then be displayed using your current browser timezone offset (which ignores daylight saving), or a fixed timezone which will also manage the correct daylight saving"}
 							{/forminput}
diff --git a/users_rss.php b/users_rss.php
index c9d092e..70a5e74 100644
--- a/users_rss.php
+++ b/users_rss.php
@@ -57,7 +57,7 @@ if( !$gBitUser->hasPermission( 'p_users_view_user_list' ) ) {
 		if( $gBitUser->hasPermission( 'p_users_admin' ) ) {
 			$item->description .= tra( "Email Address" ).': <a href="mailto:'.$feed['email'].'">'.$feed['email'].'</a><br />';
 		}
-		require_once $gBitSmarty->_get_plugin_filepath( 'modifier', 'bit_short_datetime' );
+		$gBitSmarty->loadPlugin( 'smarty_modifier_bit_short_datetime' );
 		$item->description .= tra( "Member Since" ).": ".smarty_modifier_bit_short_datetime( $feed['registration_date'] ).'<br />';
 
 		$item->date = ( int )$feed['registration_date'];