Base round of UI updates for new version of Bootstrap

BootstrapMediaWiki.skin.php

@@ -84,24 +84,26 @@ public function execute() {
 
 		$this->html('headelement');
 		?>
-		<div class="navbar navbar-fixed-top">
-			<div class="navbar-inner">
+		<div class="navbar navbar-default navbar-fixed-top" role="navigation">
 				<div class="container">
 					<!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-					<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</a>
-					<a class="brand" href="<?php echo $this->data['nav_urls']['mainpage']['href'] ?>" title="<?php echo $wgSitename ?>"><?php echo isset( $wgLogo ) && $wgLogo ? "<img src='{$wgLogo}' alt='Logo'/> " : ''; echo $wgSitenameshort ?: $wgSitename; ?></a>
-
-					<div class="nav-collapse">
-						<ul class="nav">
+					<div class="navbar-header">
+						<button class="navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-collapse">
+							<span class="sr-only">Toggle navigation</span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+						</button>
+						<a class="navbar-brand" href="<?php echo $this->data['nav_urls']['mainpage']['href'] ?>" title="<?php echo $wgSitename ?>"><?php echo isset( $wgLogo ) && $wgLogo ? "<img src='{$wgLogo}' alt='Logo'/> " : ''; echo $wgSitenameshort ?: $wgSitename; ?></a>
+					</div>
+
+					<div class="collapse navbar-collapse">
+						<ul class="nav navbar-nav">
 							<li>
 							<a href="<?php echo $this->data['nav_urls']['mainpage']['href'] ?>">Home</a>
 							</li>
 							<li class="dropdown">
-								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Tools <b class="caret"></b></a>
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Tools <span class="caret"></span></a>
 								<ul class="dropdown-menu">
 									<li><a href="<?php echo $url_prefix; ?>Special:RecentChanges" class="recent-changes"><i class="icon-edit"></i> Recent Changes</a></li>
 									<li><a href="<?php echo $url_prefix; ?>Special:SpecialPages" class="special-pages"><i class="icon-star-empty"></i> Special Pages</a></li>
@@ -128,28 +130,27 @@ public function execute() {
 						if ( count( $this->data['content_actions']) > 0 ) {
 							$content_nav = $this->get_array_links( $this->data['content_actions'], 'Page', 'page' );
 							?>
-							<ul class="nav pull-right content-actions"><?php echo $content_nav; ?></ul>
+							<ul class="nav navbar-right content-actions"><?php echo $content_nav; ?></ul>
 							<?php
 						}//end if
 					} else {  // else if is logged in
 						?>
-						<ul class="nav pull-right">
+						<ul class="nav navbar-right">
 							<li>
 							<?php echo Linker::linkKnown( SpecialPage::getTitleFor( 'Userlogin' ), wfMsg( 'login' ) ); ?>
 							</li>
 						</ul>
 						<?php
 					}
 					?>
-					</div>
-					<form class="navbar-search pull-right" action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
+					<form class="navbar-search navbar-form navbar-right" action="<?php $this->text( 'wgScript' ) ?>" id="searchform" role="search">
 						<div>
-							<input type="search" name="search" placeholder="Search" title="Search <?php echo $wgSitename; ?> [ctrl-option-f]" accesskey="f" id="searchInput" autocomplete="off">
+							<input class="form-control" type="search" name="search" placeholder="Search" title="Search <?php echo $wgSitename; ?> [ctrl-option-f]" accesskey="f" id="searchInput" autocomplete="off">
 							<input type="hidden" name="title" value="Special:Search">
 						</div>
 					</form>
+					</div>
 				</div>
-			</div>
 		</div><!-- topbar -->
 		<?php
 		if( $subnav_links = $this->get_page_links('Bootstrap:Subnav') ) {

README.md

@@ -32,12 +32,12 @@ Once you've enabled the skin, you'll want to create a few pages.
 This MediaWiki page will contain what appears in your footer.  I've set mine to the following:
 
 	<div class="row">
-		<div class="span6">
+		<div class="col-md-6">
 			=== Stuff ===
 			* [[Link to some place]]
 			* [[Another link]]
 		</div>
-		<div class="span6">
+		<div class="col-md-6">
 			=== More Stuff ===
 			* [http://external.resource.org Go here]
 		</div>
@@ -82,7 +82,7 @@ Usage:
 ### Create: Template:Pop
 This template is used to do Bootstrap popovers!
 
-	<span data-original-title="{{{2}}}" data-content="{{{3}}}" class="pop">{{{1}}}</span>
+	<span title="{{{2}}}" data-content="{{{3}}}" data-toggle="popover">{{{1}}}</span>
 
 Usage: