Sync with BS3 master

17 files changed, 263 insertions, 266 deletions

diff --git a/templates/admin_external_wikis.tpl b/templates/admin_external_wikis.tpl
index e65204f..1d011b3 100644
--- a/templates/admin_external_wikis.tpl
+++ b/templates/admin_external_wikis.tpl
@@ -13,7 +13,7 @@
 <table class="panel">
 <tr><td>{tr}name{/tr}:</td><td><input type="text" maxlength="255" size="10" name="name" value="{$info.name|escape}" /></td></tr>
 <tr><td>{tr}URL (use $page to be replaced by the page name in the URL example: http://www.example.com/{$smarty.const.WIKI_PKG_URL}index.php?page=$page){/tr}:</td><td><input type="text" maxlength="255" size="40" name="extwiki" value="{$info.extwiki|escape}" /></td></tr>
-<tr class="panelsubmitrow"><td colspan="2"><input type="submit" class="ink-button" name="save" value="{tr}Save{/tr}" /></td></tr>
+<tr class="panelsubmitrow"><td colspan="2"><input type="submit" class="btn btn-default" name="save" value="{tr}Save{/tr}" /></td></tr>
 </table>
 </form>
 
diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl
index 91ef1f3..a4c7f79 100644
--- a/templates/admin_wiki.tpl
+++ b/templates/admin_wiki.tpl
@@ -6,7 +6,7 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiFeatures key=item item=output}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -15,7 +15,7 @@
 				</div>
 			{/foreach}
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Edit Page Sections" for="wiki_section_edit"}
 				{forminput}
 					<select name="wiki_section_edit" id="wiki_section_edit">
@@ -27,7 +27,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Tables syntax" for="wiki_tables"}
 				{forminput}
 					<select name="wiki_tables" id="wiki_tables">
@@ -39,7 +39,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="wikifeatures" value="{tr}Change preferences{/tr}" />
+				<input type="submit" class="btn btn-default" name="wikifeatures" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -49,7 +49,7 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiBooks key=item item=output}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -58,7 +58,7 @@
 				</div>
 			{/foreach}
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="wikibooks" value="{tr}Change preferences{/tr}" />
+				<input type="submit" class="btn btn-default" name="wikibooks" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -68,7 +68,7 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiInOut key=item item=output}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -77,7 +77,7 @@
 				</div>
 			{/foreach}
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="wikiinout" value="{tr}Change preferences{/tr}" />
+				<input type="submit" class="btn btn-default" name="wikiinout" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -87,7 +87,7 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiLists key=item item=output}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -97,7 +97,7 @@
 			{/foreach}
 
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="wikilistconf" value="{tr}Change preferences{/tr}" />
+				<input type="submit" class="btn btn-default" name="wikilistconf" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -106,7 +106,7 @@
 		{form}
 			{legend legend="Wiki Home Page"}
 				<input type="hidden" name="page" value="{$page}" />
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Disable Wiki Home Page" for="wiki_disable_auto_home"}
 					{forminput}
 						{html_checkboxes name="wiki_disable_auto_home" values="y" checked=$gBitSystem->getConfig('wiki_disable_auto_home') labels=false id="wiki_disabled_auto_home"}
@@ -114,7 +114,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Wiki Home Page" for="wiki_home_page"}
 					{forminput}
 						<input type="text" name="wiki_home_page" id="wiki_home_page" size="25" value="{$gBitSystem->getConfig('wiki_home_page')|escape}" />
@@ -123,12 +123,12 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="setwikihome" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="btn btn-default" name="setwikihome" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
 			{legend legend="Wiki Link Format"}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Wiki Link Format" for="wiki_page_regex"}
 					{forminput}
 						<select name="wiki_page_regex" id="wiki_page_regex">
@@ -146,26 +146,26 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="setwikiregex" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="btn btn-default" name="setwikiregex" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
 			{legend legend="Copyright Management"}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Enable Feature" for="wiki_copyrights"}
 					{forminput}
 						{html_checkboxes name="wiki_copyrights" values="y" checked=$gBitSystem->getConfig('wiki_copyrights') labels=false id="wiki_copyrights"}
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="License Page" for="wiki_license_page"}
 					{forminput}
 						<input type="text" name="wiki_license_page" id="wiki_license_page" value="{$wiki_license_page|escape}" />
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Submit Notice" for="wiki_submit_notice"}
 					{forminput}
 						<input type="text" name="wiki_submit_notice" id="wiki_submit_notice" value="{$wiki_submit_notice|escape}" />
@@ -173,7 +173,7 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="wikisetcopyright" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="btn btn-default" name="wikisetcopyright" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
@@ -181,7 +181,7 @@
 				{formfeedback warning="This feature has been disabled for now since it's not functional."}
 
 				{foreach from=$formWikiWatch key=item item=output}
-					<div class="control-group column-group gutters">
+					<div class="control-group">
 						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -191,7 +191,7 @@
 				{/foreach}
 
 				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="wikiwatch" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="btn btn-default" name="wikiwatch" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/form}
diff --git a/templates/books.tpl b/templates/books.tpl
index ff30b11..b29ddb3 100755
--- a/templates/books.tpl
+++ b/templates/books.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if count($showstructs) ne 0}
-	<div class="control-group column-group gutters">
+	<div class="control-group">
 		{formlabel label="Structures"}
 		{forminput}
 			<a id="show_strct" style="display:block;" href="javascript:show('showstructs');show('hide_strct');hide('show_strct')">{tr}show books{/tr}</a>
diff --git a/templates/copyrights.tpl b/templates/copyrights.tpl
index cb8bdff..da868f5 100644
--- a/templates/copyrights.tpl
+++ b/templates/copyrights.tpl
@@ -7,7 +7,7 @@
 	{legend legend="Copyright settings"}
 		{section name=i loop=$copyrights}
 			{form}
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Title" for="copyleft-title"}
 					{forminput}
 						<input size="40" type="text" name="copyrightTitle" id="copyleft-title" value="{$copyrights[i].title|escape}" />
@@ -15,7 +15,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Authors" for="copyleft-authors"}
 					{forminput}
 						<input size="40" type="text" name="copyrightAuthors" id="copyleft-authors" value="{$copyrights[i].authors|escape}" />
@@ -23,7 +23,7 @@
 					{/forminput}
 				</div>
 				
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Year" for="copyleft-year"}
 					{forminput}
 						<input size="4" type="text" name="copyrightYear" id="copyleft-year" value="{$copyrights[i].year|escape}" />
@@ -34,7 +34,7 @@
 				<div class="control-group submit">
 					<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
 					<input type="hidden" name="copyright_id" value="{$copyrights[i].copyright_id|escape}" />
-					<input type="submit" class="ink-button" name="editcopyright" value="{tr}edit{/tr}" />
+					<input type="submit" class="btn btn-default" name="editcopyright" value="{tr}edit{/tr}" />
 					<a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=up&amp;copyright_id={$copyrights[i].copyright_id}">{booticon iname="icon-cloud-upload" ipackage="icons" iexplain="move up"}</a>
 					<a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=down&amp;copyright_id={$copyrights[i].copyright_id}">{booticon iname="icon-cloud-download"  ipackage="icons"  iexplain="move down"}</a>
 					<a title="{tr}Delete this copyright{/tr}" href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=delete&amp;copyright_id={$copyrights[i].copyright_id}" 
@@ -46,7 +46,7 @@
 
 		{form legend="Add a new copyright setting"}
 			<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Title" for="copyleft-tit"}
 				{forminput}
 					<input size="40" type="text" name="copyrightTitle" id="copyleft-tit" />
@@ -54,7 +54,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Authors" for="copyleft-aut"}
 				{forminput}
 					<input size="40" type="text" name="copyrightAuthors" id="copyleft-aut" />
@@ -62,7 +62,7 @@
 				{/forminput}
 			</div>
 			
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Year" for="copyleft-yyyy"}
 				{forminput}
 					<input size="4" type="text" name="copyrightYear" id="copyleft-yyyy" />
@@ -71,7 +71,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="addcopyright" value="{tr}add{/tr}" />
+				<input type="submit" class="btn btn-default" name="addcopyright" value="{tr}add{/tr}" />
 			</div>
 		{/form}
 	</div><!-- end .body -->
diff --git a/templates/create_book.tpl b/templates/create_book.tpl
index 54de8b5..b360693 100644
--- a/templates/create_book.tpl
+++ b/templates/create_book.tpl
@@ -8,7 +8,7 @@
 
 	<div class="body">
 		{form legend="Create new Wiki Book"}
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formfeedback error=$errors.title}
 				{formlabel label="Book Title" for="name"}
 				{forminput}
@@ -17,7 +17,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Table of Contents<br />(optional)" for="chapters"}
 				{forminput}
 					<textarea rows="10" cols="50" name="chapters" id="chapters">{$chapters}</textarea>
@@ -26,7 +26,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" value="{tr}Create new book{/tr}" name="createstructure" />
+				<input type="submit" class="btn btn-default" value="{tr}Create new book{/tr}" name="createstructure" />
 			</div>
 		{/form}
 	</div><!-- end .body -->
diff --git a/templates/create_webhelp.tpl b/templates/create_webhelp.tpl
index c5c801f..9b5ad5a 100755
--- a/templates/create_webhelp.tpl
+++ b/templates/create_webhelp.tpl
@@ -24,7 +24,7 @@ Here you can generate static HTML files from Wiki Book.
   	<td><input type="text" name="top" value="{$struct_info.title|escape}" /></td>
   </tr>
   <tr>
-  	<td colspan="2"><input type="submit" class="ink-button" name="create" value="{tr}Create{/tr}" /></td>
+  	<td colspan="2"><input type="submit" class="btn btn-default" name="create" value="{tr}Create{/tr}" /></td>
   </tr>
 </table>
 </form>
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl
index 32b269e..7380608 100644
--- a/templates/edit_page.tpl
+++ b/templates/edit_page.tpl
@@ -57,14 +57,14 @@
 			<div class="admin box">{tr}The SandBox is a page where you can practice your editing skills, use the preview feature to preview the appeareance of the page, no versions are stored for this page.{/tr}</div>
 		{/if}
 
-		{form class="ink-form column-group gutters" enctype="multipart/form-data" id="editpageform"}
+		{form class="form-horizontal" enctype="multipart/form-data" id="editpageform"}
 			{jstabs}
 				{jstab title="Body"}
 					{legend legend="`$editLabel` Body"}
 						<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
 						<input type="hidden" name="content_id" value="{$pageInfo.content_id}" />
 
-						<div class="control-group column-group gutters">
+						<div class="control-group">
 							{formfeedback warning=$errors.title}
 							{formlabel label="$conDescr Title"}
 							{forminput}
@@ -77,7 +77,7 @@
 						</div>
 
 						{if $gBitSystem->isFeatureActive( 'wiki_description' )}
-							<div class="control-group column-group gutters">
+							<div class="control-group">
 								{formlabel label="Summary" for="summary"}
 								{forminput}
 									<input size="50" type="text" class="input-block-level" name="summary" id="summary" value="{$pageInfo.summary|escape:html}" />
@@ -93,7 +93,7 @@
 						{textarea edit=$pageInfo.data}
 
 						{if $footnote}
-							<div class="control-group column-group gutters">
+							<div class="control-group">
 								{formlabel label="Footnotes" for="footnote"}
 								{forminput}
 									<textarea class="input-block-level" name="footnote" id="footnote" rows="8">{$footnote|escape}</textarea>
@@ -103,7 +103,7 @@
 						{/if}
 
 						{if $page ne 'SandBox'}
-							<div class="control-group column-group gutters">
+							<div class="control-group">
 								{formlabel label="Comment" for="edit_comment"}
 								{forminput}
 									<input size="50" type="text" class="input-block-level" name="edit_comment" id="edit_comment" value="{$pageInfo.edit_comment}" />
@@ -113,8 +113,7 @@
 						{/if}
 
 						{if $gBitUser->hasPermission( 'p_wiki_save_minor' )}
-							<div class="control-group column-group gutters">
-								{formlabel label="" for="isminor"}
+							<div class="control-group">
 								{forminput}
 								<label class="checkbox">
 									<input type="checkbox" name="isminor" id="isminor" value="on" {if $pageInfo.isminor}checked="checked" {/if}/>Minor save
@@ -146,30 +145,30 @@
 
 				{if $gBitSystem->isFeatureActive( 'wiki_copyrights' )}
 					{jstab title="Copyright"}
-						<div class="control-group column-group gutters">
+						<div class="control-group">
 							{legend legend="Copyright Settings" for="copyrightTitle"}
-								<div class="control-group column-group gutters">
+								<div class="control-group">
 									{formlabel label="Title" for="copyrightTitle"}
 									{forminput}
 										<input size="40" type="text" class="input-block-level" name="copyrightTitle" id="copyrightTitle" value="{$copyrightTitle|escape}" />
 									{/forminput}
 								</div>
 
-								<div class="control-group column-group gutters">
+								<div class="control-group">
 									{formlabel label="Authors" for="copyrightAuthors"}
 									{forminput}
 										<input size="40" type="text" class="input-block-level" name="copyrightAuthors" id="copyrightAuthors" value="{$copyrightAuthors|escape}" />
 									{/forminput}
 								</div>
 
-								<div class="control-group column-group gutters">
+								<div class="control-group">
 									{formlabel label="Year" for="copyrightYear"}
 									{forminput}
 										<input size="4" type="text" class="input-block-level" name="copyrightYear" id="copyrightYear" value="{$copyrightYear|escape}" />
 									{/forminput}
 								</div>
 
-								<div class="control-group column-group gutters">
+								<div class="control-group">
 									{formlabel label="License"}
 									{forminput}
 										<a href="{$smarty.const.WIKI_PKG_URL}index.php?page={$wiki_license_page}">{tr}{$wiki_license_page}{/tr}</a>
@@ -178,7 +177,7 @@
 								</div>
 
 								{if $wiki_submit_notice neq ""}
-									<div class="control-group column-group gutters">
+									<div class="control-group">
 										{formlabel label="Important"}
 										{forminput}
 											{$wiki_submit_notice}
@@ -194,7 +193,7 @@
 				{if $gBitSystem->isFeatureActive( 'wiki_url_import' )}
 					{jstab title="Import HMTL"}
 						{legend legend="Import HMTL"}
-							<div class="control-group column-group gutters">
+							<div class="control-group">
 								{formlabel label="Import HTML from URL" for="suck_url"}
 								{forminput}
 									<input type="text" class="input-block-level" size="50" name="suck_url" id="suck_url" value="{$suck_url|escape}" />
@@ -202,7 +201,7 @@
 								{/forminput}
 							</div>
 
-							<div class="control-group column-group gutters">
+							<div class="control-group">
 								{forminput}
 								<label class="checkbox">
 									<input type="checkbox" name="parsehtml" id="parsehtml" {if $parsehtml eq 'y'}checked="checked"{/if} />Try to convert HTML to wiki
@@ -222,17 +221,15 @@
 						*}
 
 							<div class="control-group submit">
-								<input type="submit" class="ink-button" name="do_suck" value="{tr}Import{/tr}" />
+								<input type="submit" class="btn btn-default" name="do_suck" value="{tr}Import{/tr}" />
 							</div>
 						{/legend}
 					{/jstab}
 				{/if}
 			{/jstabs}
 			<div class="control-group submit">
-				{forminput class='button-toolbar'}
-					<input type="submit" class="ink-button green" name="fSavePage" value="{tr}Save{/tr}" />
-					<input type="submit" class="ink-button" name="fCancel" value="{tr}Cancel{/tr}" />
-					<input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" />
+				{forminput}
+					<input type="submit" class="btn btn-primary" name="fSavePage" value="{tr}Save{/tr}" /> <input type="submit" class="btn pull-right" name="fCancel" value="{tr}Cancel{/tr}" /> <input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" />
 				{/forminput}
 			</div>
 
diff --git a/templates/import_phpwiki.tpl b/templates/import_phpwiki.tpl
index e6d8318..6a48caf 100644
--- a/templates/import_phpwiki.tpl
+++ b/templates/import_phpwiki.tpl
@@ -24,7 +24,7 @@
 	<input checked="checked" type="radio" name="remo" value="n" /> {tr}no{/tr}</td>
 </tr>
 <tr class="panelsubmitrow">
-  <td colspan="2"><input type="submit" class="ink-button" name="import" value="{tr}Import{/tr}" /></td>
+  <td colspan="2"><input type="submit" class="btn btn-default" name="import" value="{tr}Import{/tr}" /></td>
 </tr>
 </table>
 </form>
diff --git a/templates/list_pages.tpl b/templates/list_pages.tpl
index 49d6d9d..dca741d 100644
--- a/templates/list_pages.tpl
+++ b/templates/list_pages.tpl
@@ -3,237 +3,234 @@
 
 <div class="listing wiki">
 	<header>
+		<div class="floaticon">
+		{form class="form-inline" }
+			<input type="hidden" name="sort_mode" value="{$sort_mode}" />
+			{booticon iname="icon-search"  ipackage="icons"  iexplain="Search"}  
+			<label>{tr}Title{/tr}: <input class="input-small" type="text" name="find_title" value="{$find_title|default:$smarty.request.find_title|escape}" /></label>  <label>{tr}Author{/tr}: <input class="input-small" type="text" name="find_author" value="{$find_author|default:$smarty.request.find_author|escape}" /></label> <label>{tr}Last Editor{/tr}: <input class="input-small" type="text" name="find_last_editor" value="{$find_last_editor|default:$smarty.request.find_last_editor|escape}" /></label>  <input type="submit" class="btn btn-xs" name="search" value="{tr}Find{/tr}" /> 
+		{/form}
+		</div>
 		<h1>{tr}{$gBitSystem->getBrowserTitle()}{/tr}</h1>
 	</header>
-<div class="body">
 
-	<div class="large-100">
-	{form class="form-inline push-right" }
-		<input type="hidden" name="sort_mode" value="{$sort_mode}" />
-		{booticon iname="icon-search"  ipackage="icons"  iexplain="Search"}  
-		<label>{tr}Title{/tr}: <input class="input-small" type="text" name="find_title" value="{$find_title|default:$smarty.request.find_title|escape}" /></label>  <label>{tr}Author{/tr}: <input class="input-small" type="text" name="find_author" value="{$find_author|default:$smarty.request.find_author|escape}" /></label> <label>{tr}Last Editor{/tr}: <input class="input-small" type="text" name="find_last_editor" value="{$find_last_editor|default:$smarty.request.find_last_editor|escape}" /></label>  <input type="submit" class="btn btn-mini" name="search" value="{tr}Find{/tr}" /> 
-	{/form}
-	</div>
+	{pagination}
 
 	{formfeedback error=$errors}
 
-	<div class="large-100">
+	<div class="body">
 
 		{form id="checkform"}
-			<div class="ink-navigation">
-				<ul class="pills blue">
-					<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by"}</li>
-					{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
-						<li class="large-20">{smartlink ititle="Page Name" isort="title" icontrol=$listInfo}</li>
+			<ul class="list-inline navbar">
+				<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by"}</li>
+				{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
+					<li>{smartlink ititle="Page Name" isort="title" icontrol=$listInfo}</li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' )}
+					<li>{smartlink ititle="Last Modified" iorder="desc" idefault=1 isort="last_modified" icontrol=$listInfo}</li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
+					<li>{smartlink ititle="Author" isort="creator_user" icontrol=$listInfo}</li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'wiki_list_user' )}
+					<li>{smartlink ititle="Last Editor" isort="modifier_user" icontrol=$listInfo}</li>
+				{/if}
+				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_sort' serviceHash=$gContent->mInfo}
+			</ul>
+
+			<input type="hidden" name="offset" value="{$offset}" />
+			<input type="hidden" name="sort_mode" value="{$sort_mode}" />
+
+			<div class="clear"></div>
+
+			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_options'}
+
+			<table class="table data">
+				<caption>{tr}WikiPages Listing{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
+				<tr>
+					{*  at the moment, the only working option to use the checkboxes for is deleting pages. so for now the checkboxes are visible iff $p_wiki_remove_page is set. Other applications make sense as well (categorize, convert to pdf, etc). Add necessary corresponding permission here: *}
+
+					{if $gBitUser->hasPermission( 'p_wiki_remove_page' )}              {* ... "or $gBitUser->hasPermission( 'bit_p_other_sufficient_condition_for_checkboxes' )"  *}
+						{assign var='checkboxes_on' value='y'}
+					{else}
+						{assign var='checkboxes_on' value='n'}
 					{/if}
-					{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' )}
-						<li class="large-20">{smartlink ititle="Last Modified" iorder="desc" idefault=1 isort="last_modified" icontrol=$listInfo}</li>
+					{counter name=cols start=-1 print=false}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_page_id' )}
+						<th>{smartlink ititle="Page ID" isort="page_id" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
-						<li class="large-20">{smartlink ititle="Author" isort="creator_user" icontrol=$listInfo}</li>
+					{if $gBitSystem->isFeatureActive( 'wiki_list_content_id' )}
+						<th>{smartlink ititle="Content ID" isort="content_id" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
 					{/if}
-					{if $gBitSystem->isFeatureActive( 'wiki_list_user' )}
-						<li class="large-20">{smartlink ititle="Last Editor" isort="modifier_user" icontrol=$listInfo}</li>
+					{if $gBitSystem->isFeatureActive( 'wiki_list_hits' )}
+						<th>{smartlink ititle="Hits" isort="hits" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
 					{/if}
-					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_sort' serviceHash=$gContent->mInfo}
-				</ul>
-			</div>
-
-				<input type="hidden" name="offset" value="{$offset}" />
-				<input type="hidden" name="sort_mode" value="{$sort_mode}" />
+					{if $gBitSystem->isFeatureActive( 'wiki_list_lastver' )}
+						<th>{smartlink ititle="Last Version" isort="version" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_comment' )}
+						<th>{smartlink ititle="Comment" isort="edit_comment" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_status' )}
+						<th>{smartlink ititle="Status" isort="flag" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_versions' )}
+						<th>{smartlink ititle="Version" isort="versions" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_links' )}
+						<th>{smartlink ititle="Links" isort="links" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_backlinks' )}
+						<th>{smartlink ititle="Backlinks" isort="backlinks" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_format_guid' )}
+						<th>{smartlink ititle="GUID" isort="format_guid" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'wiki_list_size' )}
+						<th>{smartlink ititle="Size" isort="size" icontrol=$listInfo}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+					{if $gBitUser->hasPermission( 'p_wiki_update_page' )}
+						<th style="width:1px;">{tr}Actions{/tr}</th>
+						{counter name=cols assign=cols print=false}
+					{/if}
+				</tr>
 
-				<div class="clear"></div>
+				{cycle values="even,odd" print=false}
+				{section name=changes loop=$listpages}
+					<tr class="{cycle advance=false}">
+						<td colspan="{$cols}">
+							{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
+								<h3><a href="{$listpages[changes].display_url}" title="{$listpages[changes].summary}">{$listpages[changes].title|escape}</a></h3>
+							{else}
+								<a href="{$listpages[changes].display_url}" title="{$listpages[changes].page_id}">Page #{$listpages[changes].page_id}</a>
+							{/if}
 
-				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_options'}
+							{if $gBitSystem->isFeatureActive( 'wiki_list_creator' ) && $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' ) }
+								<span style="display:block; width:50%; float:left;">
+									{tr}Created:{/tr} {displayname real_name=$listpages[changes].creator_real_name user=$listpages[changes].creator_user}
+									, {$listpages[changes].created|bit_short_datetime}
+								</span>
+								<span style="display:block; width:50%; float:right;">
+									{if ($listpages[changes].version <= 1)}
+										{tr}No edits since creation{/tr}
+									{else}
+										{tr}Last Edited:{/tr} {displayname real_name=$listpages[changes].modifier_real_name user=$listpages[changes].modifier_user}
+										, {$listpages[changes].last_modified|bit_short_datetime}
+									{/if}
+								</span>
+							{else}
+								{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
+									{tr}Created by{/tr} {displayname real_name=$listpages[changes].creator_real_name user=$listpages[changes].creator_user}
+								{/if}
+								, {$listpages[changes].created|bit_short_datetime}
+								{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' ) && ($listpages[changes].version > 1)}
+									<br />
+									{tr}Last modified{/tr}
+									{if $listpages[changes].editor != $listpages[changes].creator}
+										&nbsp;{tr}by{/tr} {displayname real_name=$listpages[changes].modifier_real_name user=$listpages[changes].modifier_user}
+									{/if}
+									, {$listpages[changes].last_modified|bit_short_datetime}
+								{/if}
+							{/if}
+						</td>
 
-				<table class="table data">
-					<caption>{tr}WikiPages Listing{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
-					<tr>
-						{*  at the moment, the only working option to use the checkboxes for is deleting pages. so for now the checkboxes are visible iff $p_wiki_remove_page is set. Other applications make sense as well (categorize, convert to pdf, etc). Add necessary corresponding permission here: *}
+						<td style="text-align:right; vertical-align:top;">
+							{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_actions' serviceHash=$listpages[changes]}
+						</td>
+					</tr>
 
-						{if $gBitUser->hasPermission( 'p_wiki_remove_page' )}              {* ... "or $gBitUser->hasPermission( 'bit_p_other_sufficient_condition_for_checkboxes' )"  *}
-							{assign var='checkboxes_on' value='y'}
-						{else}
-							{assign var='checkboxes_on' value='n'}
-						{/if}
-						{counter name=cols start=-1 print=false}
+					<tr class="{cycle}">
 						{if $gBitSystem->isFeatureActive( 'wiki_list_page_id' )}
-							<th>{smartlink ititle="Page ID" isort="page_id" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:center;">{$listpages[changes].page_id}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_content_id' )}
-							<th>{smartlink ititle="Content ID" isort="content_id" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:center;">{$listpages[changes].content_id}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_hits' )}
-							<th>{smartlink ititle="Hits" isort="hits" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:center;">{$listpages[changes].hits|default:0}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_lastver' )}
-							<th>{smartlink ititle="Last Version" isort="version" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:center;">{$listpages[changes].version}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_comment' )}
-							<th>{smartlink ititle="Comment" isort="edit_comment" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td>{$listpages[changes].edit_comment}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_status' )}
-							<th>{smartlink ititle="Status" isort="flag" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:center;">
+								{if $listpages[changes].flag eq 'locked'}
+									{booticon iname="icon-lock" ipackage="icons" iexplain="locked"}
+								{else}
+									{booticon ipackage="icons" iname="icon-asterisk" iexplain="unlocked"}
+								{/if}
+							</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_versions' )}
-							<th>{smartlink ititle="Version" isort="versions" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							{if $gBitSystem->isFeatureActive( 'wiki_history' )}
+								<td style="text-align:center;">{smartlink ititle=$listpages[changes].version ifile='page_history.php' page_id=$listpages[changes].page_id}</td>
+							{else}
+								<td style="text-align:center;">{$listpages[changes].version}</td>
+							{/if}
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_links' )}
-							<th>{smartlink ititle="Links" isort="links" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:center;">{$listpages[changes].links|default:"0"}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_backlinks' )}
-							<th>{smartlink ititle="Backlinks" isort="backlinks" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							{if $gBitSystem->isFeatureActive( 'wiki_backlinks' ) && $listpages[changes].backlinks > 0}
+								<td style="text-align:center;"><a href="{$smarty.const.WIKI_PKG_URL}backlinks.php?page={$listpages[changes].title|escape:"url"}">{$listpages[changes].backlinks|default:"0"}</a></td>
+							{else}
+								<td style="text-align:center;">{$listpages[changes].backlinks|default:"0"}</td>
+							{/if}
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_format_guid' )}
-							<th>{smartlink ititle="GUID" isort="format_guid" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td>{$listpages[changes].format_guid}</td>
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'wiki_list_size' )}
-							<th>{smartlink ititle="Size" isort="size" icontrol=$listInfo}</th>
-							{counter name=cols assign=cols print=false}
+							<td style="text-align:right;">{$listpages[changes].len|display_bytes}</td>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_wiki_update_page' )}
-							<th style="width:1px;">{tr}Actions{/tr}</th>
-							{counter name=cols assign=cols print=false}
+							<td class="actionicon">
+								<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
+								{if $checkboxes_on eq 'y'} <input type="checkbox" name="checked[]" value="{$listpages[changes].page_id}" /> {/if}
+							</td>
 						{/if}
 					</tr>
+				{sectionelse}
+					<tr class="norecords"><td colspan="{$cols}">
+						{tr}No records found{/tr}
+					</td></tr>
+				{/section}
+			</table>
 
-					{cycle values="even,odd" print=false}
-					{section name=changes loop=$listpages}
-						<tr class="{cycle advance=false}">
-							<td colspan="{$cols}">
-								{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
-									<h3><a href="{$listpages[changes].display_url}" title="{$listpages[changes].summary}">{$listpages[changes].title|escape}</a></h3>
-								{else}
-									<a href="{$listpages[changes].display_url}" title="{$listpages[changes].page_id}">Page #{$listpages[changes].page_id}</a>
-								{/if}
-
-								{if $gBitSystem->isFeatureActive( 'wiki_list_creator' ) && $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' ) }
-									<span style="display:block; width:50%; float:left;">
-										{tr}Created:{/tr} {displayname real_name=$listpages[changes].creator_real_name user=$listpages[changes].creator_user}
-										, {$listpages[changes].created|bit_short_datetime}
-									</span>
-									<span style="display:block; width:50%; float:right;">
-										{if ($listpages[changes].version <= 1)}
-											{tr}No edits since creation{/tr}
-										{else}
-											{tr}Last Edited:{/tr} {displayname real_name=$listpages[changes].modifier_real_name user=$listpages[changes].modifier_user}
-											, {$listpages[changes].last_modified|bit_short_datetime}
-										{/if}
-									</span>
-								{else}
-									{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
-										{tr}Created by{/tr} {displayname real_name=$listpages[changes].creator_real_name user=$listpages[changes].creator_user}
-									{/if}
-									, {$listpages[changes].created|bit_short_datetime}
-									{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' ) && ($listpages[changes].version > 1)}
-										<br />
-										{tr}Last modified{/tr}
-										{if $listpages[changes].editor != $listpages[changes].creator}
-											&nbsp;{tr}by{/tr} {displayname real_name=$listpages[changes].modifier_real_name user=$listpages[changes].modifier_user}
-										{/if}
-										, {$listpages[changes].last_modified|bit_short_datetime}
-									{/if}
-								{/if}
-							</td>
-
-							<td style="text-align:right; vertical-align:top;">
-								{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_actions' serviceHash=$listpages[changes]}
-							</td>
-						</tr>
-
-						<tr class="{cycle}">
-							{if $gBitSystem->isFeatureActive( 'wiki_list_page_id' )}
-								<td style="text-align:center;">{$listpages[changes].page_id}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_content_id' )}
-								<td style="text-align:center;">{$listpages[changes].content_id}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_hits' )}
-								<td style="text-align:center;">{$listpages[changes].hits|default:0}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_lastver' )}
-								<td style="text-align:center;">{$listpages[changes].version}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_comment' )}
-								<td>{$listpages[changes].edit_comment}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_status' )}
-								<td style="text-align:center;">
-									{if $listpages[changes].flag eq 'locked'}
-										{booticon iname="icon-lock" ipackage="icons" iexplain="locked"}
-									{else}
-										{booticon ipackage="icons" iname="icon-asterisk" iexplain="unlocked"}
-									{/if}
-								</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_versions' )}
-								{if $gBitSystem->isFeatureActive( 'wiki_history' )}
-									<td style="text-align:center;">{smartlink ititle=$listpages[changes].version ifile='page_history.php' page_id=$listpages[changes].page_id}</td>
-								{else}
-									<td style="text-align:center;">{$listpages[changes].version}</td>
-								{/if}
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_links' )}
-								<td style="text-align:center;">{$listpages[changes].links|default:"0"}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_backlinks' )}
-								{if $gBitSystem->isFeatureActive( 'wiki_backlinks' ) && $listpages[changes].backlinks > 0}
-									<td style="text-align:center;"><a href="{$smarty.const.WIKI_PKG_URL}backlinks.php?page={$listpages[changes].title|escape:"url"}">{$listpages[changes].backlinks|default:"0"}</a></td>
-								{else}
-									<td style="text-align:center;">{$listpages[changes].backlinks|default:"0"}</td>
-								{/if}
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_format_guid' )}
-								<td>{$listpages[changes].format_guid}</td>
-							{/if}
-							{if $gBitSystem->isFeatureActive( 'wiki_list_size' )}
-								<td style="text-align:right;">{$listpages[changes].len|display_bytes}</td>
-							{/if}
-							{if $gBitUser->hasPermission( 'p_wiki_update_page' )}
-								<td class="actionicon">
-									<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
-									{if $checkboxes_on eq 'y'} <input type="checkbox" name="checked[]" value="{$listpages[changes].page_id}" /> {/if}
-								</td>
-							{/if}
-						</tr>
-					{sectionelse}
-						<tr class="norecords"><td colspan="{$cols}">
-							{tr}No records found{/tr}
-						</td></tr>
-					{/section}
-				</table>
-
-				{if $checkboxes_on eq 'y'}
-					<div style="text-align:right;">
-						<script type="text/javascript">/* <![CDATA[ check / uncheck all */
-							document.write("<label for=\"switcher\">{tr}Select All{/tr} <input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" /></label>");
-						/* ]]> */</script>
-						<br />
-						<select name="batch_submit" onchange="this.form.submit();">
-							<option value="" selected="selected">{tr}with checked{/tr}:</option>
-							{if $gBitUser->hasPermission( 'p_wiki_remove_page' )}
-								<option value="remove_pages">{tr}remove{/tr}</option>
-							{/if}
-						</select>
+			{if $checkboxes_on eq 'y'}
+				<div style="text-align:right;">
+					<script type="text/javascript">/* <![CDATA[ check / uncheck all */
+						document.write("<label for=\"switcher\">{tr}Select All{/tr} <input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" /></label>");
+					/* ]]> */</script>
+					<br />
+					<select name="batch_submit" onchange="this.form.submit();">
+						<option value="" selected="selected">{tr}with checked{/tr}:</option>
+						{if $gBitUser->hasPermission( 'p_wiki_remove_page' )}
+							<option value="remove_pages">{tr}remove{/tr}</option>
+						{/if}
+					</select>
 
-						<noscript>
-							<div><input type="submit" class="ink-button" value="{tr}Submit{/tr}" /></div>
-						</noscript>
-					</div>
-				{/if}
+					<noscript>
+						<div><input type="submit" class="btn btn-default" value="{tr}Submit{/tr}" /></div>
+					</noscript>
+				</div>
+			{/if}
+		{/form}
 
-			{/form}
 	</div><!-- end .body -->
-	{pagination}
 </div><!-- end .wiki -->
 {/strip}
diff --git a/templates/page_action_bar.tpl b/templates/page_action_bar.tpl
index f716969..dfb7fd9 100644
--- a/templates/page_action_bar.tpl
+++ b/templates/page_action_bar.tpl
@@ -47,7 +47,7 @@
 			{/if}
 	{/strip}{/capture}
 	{if $smarty.capture.navbarlist ne ''}
-		<ul class="inline navbar">
+		<ul class="list-inline navbar">
 			{$smarty.capture.navbarlist}
 		</ul>
 	{/if}
diff --git a/templates/page_history.tpl b/templates/page_history.tpl
index 44b47ec..1eee68a 100644
--- a/templates/page_history.tpl
+++ b/templates/page_history.tpl
@@ -109,7 +109,7 @@
 
 			{if $gBitUser->hasPermission( 'p_wiki_remove_page' )}
 				<div style="text-align:right;">
-					<input type="submit" class="ink-button" name="delete" value="{tr}Delete selected versions{/tr}" />
+					<input type="submit" class="btn btn-default" name="delete" value="{tr}Delete selected versions{/tr}" />
 				</div>
 			{/if}
 		{/form}
diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl
index 24c5704..cd49496 100644
--- a/templates/page_icons.tpl
+++ b/templates/page_icons.tpl
@@ -34,9 +34,9 @@
 		{/if}
 
 		{if ($structureInfo.structure_id) && ($gStructure->mInfo.creator_user_id == $gBitUser->mUserId || $gContent->hasUserPermission( 'p_wiki_admin_book' ))}
-			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{booticon iname="icon-book"  ipackage="icons"  iexplain="Edit book"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{booticon iname="icon-cogs"  ipackage="icons"  iexplain="Edit book"}</a>
 		{elseif is_a($gContent,'BitBook') && $gContent->hasUpdatePermission()}
-			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?content_id={$gContent->mContentId}">{booticon iname="icon-book-edit"  ipackage="icons"  iexplain="Edit book"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?content_id={$gContent->mContentId}">{booticon iname="icon-cogs"  ipackage="icons"  iexplain="Edit book"}</a>
 		{/if}
 
 		{if $gBitUser->isRegistered() and $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'users_watches' ) }
@@ -72,14 +72,17 @@
 		{/if}
 
 		{if $gBitSystem->isFeatureActive( 'wiki_backlinks' ) and $backlinks}
-			<div class="ink-dropdown">
-				<button class="ink-button toggle" data-target="#bldropdown">Backlinks<span class="icon-arrow-left"></span></button>
-				<ul class="dropdown-menu" id="bldropdown">
+			<div class="btn-group">
+				<button class="btn btn-xs dropdown-toggle" data-toggle="dropdown">
+				  <i class="icon-link"></i>
+				  <span class="caret"></span>
+				</button>
+				<ul class="dropdown-menu pull-right">
 					{foreach key=contentId item=backPage from=$backlinks}
 						<li><a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage|escape|truncate:30:"&hellip":true}</a></li>
 					{/foreach}
 				</ul>
-			</div>
+			  </div>
 		{/if}
 
 		{if count($showstructs) gt 0}
diff --git a/templates/page_permissions.tpl b/templates/page_permissions.tpl
index 69854a6..c31234d 100644
--- a/templates/page_permissions.tpl
+++ b/templates/page_permissions.tpl
@@ -11,7 +11,7 @@
 			<input type="hidden" name="page_id" value="{$gContent->mInfo.page_id}" />
 			<input type="hidden" name="tab" value="email" />
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Email"}
 				{forminput}
 					<input type="text" name="email" size="35" />
@@ -20,7 +20,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="addemail" value="{tr}Add email address{/tr}" />
+				<input type="submit" class="btn btn-default" name="addemail" value="{tr}Add email address{/tr}" />
 			</div>
 		{/form}
 
diff --git a/templates/print_pages.tpl b/templates/print_pages.tpl
index bb1adf7..245ca4f 100644
--- a/templates/print_pages.tpl
+++ b/templates/print_pages.tpl
@@ -9,7 +9,7 @@
 				<input type="hidden" name="sendarticles" value="{$form_sendarticles|escape}" />
 				<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
 
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Wiki Pages" for="pages"}
 					{forminput}
 						<select name="title" id="pages">
@@ -21,25 +21,25 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					{formlabel label="Filter" for="find"}
 					{forminput}
 						<input type="text" name="find" id="find" value="{$find|escape}" />
-						&nbsp;<input type="submit" class="ink-button" name="filter" value="{tr}filter{/tr}" />
+						&nbsp;<input type="submit" class="btn btn-default" name="filter" value="{tr}filter{/tr}" />
 						{formhelp note="To find specific pages more easily, you can apply a filter here."}
 					{/forminput}
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="addpage" value="{tr}add page{/tr}" />
-					&nbsp;<input type="submit" class="ink-button" name="clearpages" value="{tr}clear pages{/tr}" />
+					<input type="submit" class="btn btn-default" name="addpage" value="{tr}add page{/tr}" />
+					&nbsp;<input type="submit" class="btn btn-default" name="clearpages" value="{tr}clear pages{/tr}" />
 				</div>
 			{/form}
 
 			{form legend="Selected Wiki Pages" ipackage="wiki" ifile="print_multi_pages.php"}
 				<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
 				
-				<div class="control-group column-group gutters">
+				<div class="control-group">
 					<ul>
 						{section name=ix loop=$printpages}
 							<li>{$printpages[ix]}</li>
@@ -48,7 +48,7 @@
 				</div>
 				
 				<div class="control-group submit">
-					<input type="submit" class="ink-button" name="print" value="{tr}print{/tr}" />
+					<input type="submit" class="btn btn-default" name="print" value="{tr}print{/tr}" />
 				</div>
 			{/form}
 	</div><!-- end .body -->
diff --git a/templates/remove_page.tpl b/templates/remove_page.tpl
index a973f2b..762a5d1 100644
--- a/templates/remove_page.tpl
+++ b/templates/remove_page.tpl
@@ -12,21 +12,21 @@
 
 			{formfeedback warning="These actions are permanent and cannot be undone"}
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Page to remove"}
 				{forminput}
 					{$page}
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Version"}
 				{forminput}
 					{$version}
 				{/forminput}
 			</div>
 
-			<div class="control-group column-group gutters">
+			<div class="control-group">
 				{formlabel label="Remove all versions" for="all"}
 				{forminput}
 					<input type="checkbox" name="all" id="all" />
@@ -34,7 +34,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="ink-button" name="remove" value="{tr}remove{/tr}" />
+				<input type="submit" class="btn btn-default" name="remove" value="{tr}remove{/tr}" />
 			</div>
 		{/form}
 	</div> <!-- end .body -->
diff --git a/templates/rename_page.tpl b/templates/rename_page.tpl
index 7aa7525..2a42102 100644
--- a/templates/rename_page.tpl
+++ b/templates/rename_page.tpl
@@ -11,7 +11,7 @@
 				<tr><td>
 						{tr}New name{/tr}:</td><td>
 						<input type="text" name="newpage" value="{$page|escape}" size="35" />
-						<input type="submit" class="ink-button" name="rename" value="{tr}Rename{/tr}" />
+						<input type="submit" class="btn btn-default" name="rename" value="{tr}Rename{/tr}" />
 				</td></tr>
 			</table>
 		</form>
diff --git a/templates/rollback.tpl b/templates/rollback.tpl
index ca51e66..6bd8f6e 100644
--- a/templates/rollback.tpl
+++ b/templates/rollback.tpl
@@ -4,6 +4,6 @@
 <form action="{$smarty.const.WIKI_PKG_URL}rollback.php" method="post">
 <input type="hidden"  name="content_id" value="{$gContent->mContentId}" />
 <input type="hidden" name="version" value="{$version|escape}" />
-<input type="submit" class="ink-button" name="rollback" value="{tr}rollback{/tr}" />
+<input type="submit" class="btn btn-default" name="rollback" value="{tr}rollback{/tr}" />
 </form>
 </div>