Merge branch 'master' of github.com:bitweaver/kernel

4 files changed, 16 insertions, 16 deletions

diff --git a/templates/admin_packages.tpl b/templates/admin_packages.tpl
index 774c17c..ee60e05 100644
--- a/templates/admin_packages.tpl
+++ b/templates/admin_packages.tpl
@@ -45,10 +45,10 @@
 
 				{$install_unavailable}
 
-				<div class="bit-columns">
+				<div class="bw-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && !$package.service && !$package.required}
-					<div class="bit-column-cell">
+					<div class="bw-column-cell">
 					<div class="well">
 						<div class="form-group clear">
 							<div class="formlabel">
@@ -93,10 +93,10 @@
 					{tr}A service package is a package that allows you to extend the way you display bitweaver content - such as <em>categorising your content</em>. Activating more than one of any service type might lead to conflicts.<br />
 					We therefore recommend that you <em>	enable only one of each</em> <strong>service type</strong>.{/tr}
 				</p>
-				<div class="bit-columns">
+				<div class="bw-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && $package.service && !$package.required}
-					<div class="bit-column-cell">
+					<div class="bw-column-cell">
 					<div class="well">
 						<div class="form-group">
 							<div class="formlabel">
@@ -145,10 +145,10 @@
 
 		{jstab title="Required"}
 			{legend legend="Required packages installed on your system"}
-				<div class="bit-columns">
+				<div class="bw-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && !$package.service && $package.required}
-					<div class="bit-column-cell">
+					<div class="bw-column-cell">
 					<div class="well">
 						<div class="form-group">
 							<div class="formlabel">
@@ -166,10 +166,10 @@
 				</div>
 			{/legend}
 			{legend legend="Required services installed on your system"}
-				<div class="bit-columns">
+				<div class="bw-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && $package.service && $package.required}
-					<div class="bit-column-cell">
+					<div class="bw-column-cell">
 					<div class="well">
 						<div class="form-group">
 							<div class="formlabel">
@@ -287,10 +287,10 @@
 
 				<hr style="clear:both" />
 
-				<div class="bit-columns">
+				<div class="bw-columns">
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if ((1 or $package.tables) && !$package.required && !$package.installed) }
-					<div class="bit-column-cell">
+					<div class="bw-column-cell">
 					<div class="well">
 						<div class="form-group clear">
 							<div class="formlabel">
diff --git a/templates/pagination.tpl b/templates/pagination.tpl
index 259797e..9499338 100644
--- a/templates/pagination.tpl
+++ b/templates/pagination.tpl
@@ -38,7 +38,7 @@
 		{/if}
 	{/capture}
 	{assign var=pageUrlVar value=$smarty.capture.string|regex_replace:'/"/':'%22'}
-	{assign var=pageUrl value="`$smarty.server.SCRIPT_URL``$pgnUrl`?`$pageUrlVar`"}
+	{assign var=pageUrl value="`$smarty.server.SCRIPT_URL`?`$pageUrlVar`"}
 {/if}
 
 {if $listInfo.total_pages > 1 && $listInfo.page_records}
diff --git a/templates/top.tpl b/templates/top.tpl
index 0cf04e4..f06197a 100644
--- a/templates/top.tpl
+++ b/templates/top.tpl
@@ -1,5 +1,5 @@
-<div id="bittop">
-	<div class="bittop-wrapper">
+<div id="bw-top">
+	<div class="bw-top-wrapper">
 		<a class="brand" href="{$smarty.const.BIT_ROOT_URL}" {if $gBitSystem->getConfig('site_slogan')} title="{$gBitSystem->getConfig('site_slogan')|escape}" {/if}>{$gBitSystem->getConfig('site_title')}</a>
 		<div class="pull-right">
 			{if $gBitUser->isRegistered()}
diff --git a/templates/top_bar.tpl b/templates/top_bar.tpl
index 583f129..ae99cd5 100644
--- a/templates/top_bar.tpl
+++ b/templates/top_bar.tpl
@@ -1,11 +1,11 @@
 {strip}
-<nav class="navbar navbar-default {if $gBitSystem->getConfig('layout-header')}navbar-static-top{/if}" id="bittopbar">
+<nav class="navbar navbar-default {if $gBitSystem->getConfig('layout-header')}navbar-static-top{/if}" id="bw-top-bar">
 	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bit-top-menu">{booticon iname="fa-bars"}</button>
+		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bw-top-menu">{booticon iname="fa-bars"}</button>
 		<a class="navbar-brand" href="{$smarty.const.BIT_ROOT_URL}" {if $gBitSystem->getConfig('site_slogan')} title="{$gBitSystem->getConfig('site_slogan')|escape}" {/if}>{$gBitSystem->getConfig('site_title')}</a>
 	</div>
 	{if $gBitSystem->mAppMenu}
-	<div class="collapse navbar-collapse" id="bit-top-menu">
+	<div class="collapse navbar-collapse" id="bw-top-menu">
 		{if $gBitSystem->mAppMenu.bar}
 		<ul class="nav navbar-nav">
 			{foreach key=key item=menu from=$gBitSystem->mAppMenu.bar}