Skip to content
Browse files

update html for bootstrap v2.0.4 incompatibility

* "badge-error" -> "badge-important"
   According to bootstrap release-notes the former was only a docs fix
   suggesting it never worked, but it did work. So fixing the class
   name in our code base.

* Misc.:
 - Re-adding table-bordered on ResultPage, matching the JobPage.
 - quotes/whitespace
  • Loading branch information...
1 parent cc1e83b commit cc33ad5ef9bd25ce32fcf362118efb7376869070 @Krinkle Krinkle committed Jun 13, 2012
Showing with 6 additions and 6 deletions.
  1. +5 −5 inc/pages/HomePage.php
  2. +1 −1 inc/pages/ResultPage.php
View
10 inc/pages/HomePage.php
@@ -28,7 +28,7 @@ protected function initContent() {
$siteNameHtml = htmlspecialchars( $conf->web->title );
- $this->setTitle( "Home" );
+ $this->setTitle( 'Home' );
$this->setRawDisplayTitle(
'<div style="text-align: center;">' . $siteNameHtml . '</div>'
);
@@ -54,7 +54,7 @@ protected function initContent() {
. ' <input type="submit" value="Join the swarm" class="btn btn-primary">'
. '</form>';
} else {
- $html .= '<p><a href="' . swarmpath( "run/{$request->getSessionData( "username" )}/" )
+ $html .= '<p><a href="' . swarmpath( "run/{$request->getSessionData( 'username' )}/" )
. '" class="btn btn-primary btn-large">Join the swarm</a></p>';
}
} else {
@@ -101,7 +101,7 @@ public function getBrowsersOnlineHtml() {
$data = $this->getAction()->getData();
- $html = "";
+ $html = '';
$itemsPerRow = 6;
@@ -114,7 +114,7 @@ public function getBrowsersOnlineHtml() {
}
$isCurr = $uaID == $browserInfo->getSwarmUaID();
- $item = ""
+ $item = ''
. '<div class="span2">'
. '<div class="well well-small swarm-browseronline' . ( $isCurr ? " alert-info" : "" ) . '">'
@@ -136,7 +136,7 @@ public function getBrowsersOnlineHtml() {
"class" => "swarm-onlineclients " . (
$userAgent["stats"]["onlineClients"] > 0
? "badge"
- : ( $userAgent["stats"]["pendingRuns"] > 0 ? "badge badge-error" : "badge" )
+ : ( $userAgent['stats']['pendingRuns'] > 0 ? 'badge badge-important' : 'badge' )
),
"title" => $userAgent["stats"]["onlineClients"] . ' clients online',
), $userAgent["stats"]["onlineClients"] )
View
2 inc/pages/ResultPage.php
@@ -60,7 +60,7 @@ protected function initContent() {
}
if ( $data['otherRuns'] ) {
- $html .= '<table class="table swarm-results"><thead>'
+ $html .= '<table class="table table-bordered swarm-results"><thead>'
. JobPage::getUaHtmlHeader( $data['otherRuns']['userAgents'] )
. '</thead><tbody>'
. JobPage::getUaRunsHtmlRows( $data['otherRuns']['runs'], $data['otherRuns']['userAgents'] )

0 comments on commit cc33ad5

Please sign in to comment.
Something went wrong with that request. Please try again.