Skip to content

Commit

Permalink
Small Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
geoffhumphrey committed Feb 5, 2016
1 parent 3c0d4a2 commit 85b8727
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 81 deletions.
11 changes: 11 additions & 0 deletions css/bruxellensis.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,11 @@ footer .navbar {
}

/** Sponsors **/

.bcoem-sponsor-container {
padding: 15px;
}

.bcoem-sponsor-name h5 {
font-size: 1.15em;
padding: 0;
Expand Down Expand Up @@ -1429,6 +1434,12 @@ footer .navbar {
margin: 0;
}

/* Winner Display */

.bcoem-winner-table {
margin-bottom: 45px;
}

/** Admin **/

.bcoem-admin-dashboard-accordion .panel-default {
Expand Down
2 changes: 1 addition & 1 deletion css/bruxellensis.min.css
View file

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions css/claussenii.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1402,6 +1402,11 @@ footer .navbar {
}

/** Sponsors **/

.bcoem-sponsor-container {
padding: 15px;
}

.bcoem-sponsor-name h5 {
font-size: 1.15em;
padding: 0;
Expand Down Expand Up @@ -1434,6 +1439,12 @@ footer .navbar {
margin: 0;
}

/* Winner Display */

.bcoem-winner-table {
margin-bottom: 45px;
}

/** Admin **/

.bcoem-admin-dashboard-accordion .panel-default {
Expand Down
2 changes: 1 addition & 1 deletion css/claussenii.min.css
View file

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions css/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,11 @@ footer .navbar {
}

/** Sponsors **/

.bcoem-sponsor-container {
padding: 15px;
}

.bcoem-sponsor-name h5 {
font-size: 1.15em;
padding: 0;
Expand Down Expand Up @@ -1422,6 +1427,12 @@ footer .navbar {
margin: 0;
}

/* Winner Display */

.bcoem-winner-table {
margin-bottom: 45px;
}

/** Admin **/

.bcoem-admin-dashboard-accordion .panel-default {
Expand Down
2 changes: 1 addition & 1 deletion css/default.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sections/sponsors.sec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
if (($sponsors_endRow == 0) && ($sponsors_hloopRow1++ != 0)) $page_info1 .= "<section class='row'>";

// Layout Column DIV
$page_info1 .= "<section class=\"col-lg-3 col-md-6 col-sm-9 col-xs-12\">";
$page_info1 .= "<section class=\"col-lg-3 col-md-6 col-sm-9 col-xs-12 bcoem-sponsor-container\">";

// Sponsor Name
$page_info1 .= "<section class=\"bcoem-sponsor-name\">";
Expand Down
47 changes: 22 additions & 25 deletions sections/winners.sec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@

// Build page headers
$header1_1 .= "<h3>Table ".$row_tables['tableNumber'].": ".$row_tables['tableName']." (".$entry_count." ".$entries.")</h3>";
$header1_2 .= "<h3>Table ".$row_tables['tableNumber'].": ".$row_tables['tableName']." (".$entry_count." ".$entries.")</h3><p>No winners have been entered yet for this table. Please check back later.</p>";
$header1_2 .= "<div class=\"bcoem-winner-table\"><h3>Table ".$row_tables['tableNumber'].": ".$row_tables['tableName']." (".$entry_count." ".$entries.")</h3><p>No winners have been entered yet for this table. Please check back later.</p></div>";

// Build table headers
$table_head1 .= "<tr>";
$table_head1 .= "<th width=\"1%\" nowrap>Place</th>";
$table_head1 .= "<th width=\"25%\">Brewer(s)</th>";
$table_head1 .= "<th width=\"25%\">Entry Name</th>";
$table_head1 .= "<th width=\"25%\">Style</th>";
$table_head1 .= "<th>Club</th>";
if ($filter == "scores") $table_head1 .= "<th width=\"1%\" nowrap>Score</th>";
$table_head1 .= "<th>Brewer(s)</th>";
$table_head1 .= "<th><span class=\"hidden-xs hidden-sm hidden-md\">Entry </span>Name</th>";
$table_head1 .= "<th>Style</th>";
$table_head1 .= "<th class=\"hidden-xs hidden-sm hidden-md\">Club</th>";
if ($filter == "scores") $table_head1 .= "<th class=\"hidden-xs hidden-sm hidden-md\" nowrap>Score</th>";
$table_head1 .= "</tr>";

// Build table body
Expand All @@ -99,30 +99,25 @@
$table_body1 .= "</td>";
}

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td>";
$table_body1 .= "<td>";
$table_body1 .= $row_scores['brewerFirstName']." ".$row_scores['brewerLastName'];
if ($row_scores['brewCoBrewer'] != "") $table_body1 .= "<br>Co-Brewer: ".$row_scores['brewCoBrewer'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td>";
$table_body1 .= "<td>";
$table_body1 .= $row_scores['brewName'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td>";
$table_body1 .= "<td>";
$table_body1 .= $style.": ".$row_scores['brewStyle'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td>";
$table_body1 .= "<td class=\"hidden-xs hidden-sm hidden-md\">";
$table_body1 .= $row_scores['brewerClubs'];
$table_body1 .= "</td>";

if ($filter == "scores") {
if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td>";
$table_body1 .= "<td class=\"hidden-xs hidden-sm hidden-md\">";
$table_body1 .= $row_scores['scoreEntry'];
$table_body1 .= "</td>";
}
Expand Down Expand Up @@ -162,15 +157,17 @@
} );
} );
</script>
<?php echo $header1_1; ?>
<table class="table table-responsive table-striped table-bordered table-responsive" id="sortable<?php echo $random1; ?>">
<thead>
<?php echo $table_head1; ?>
</thead>
<tbody>
<?php echo $table_body1; ?>
</tbody>
</table>
<div class="bcoem-winner-table">
<?php echo $header1_1; ?>
<table class="table table-responsive table-striped table-bordered" id="sortable<?php echo $random1; ?>">
<thead>
<?php echo $table_head1; ?>
</thead>
<tbody>
<?php echo $table_body1; ?>
</tbody>
</table>
</div>
<?php
} else echo $header1_2;
} // end if ($entry_count > 0);
Expand Down
49 changes: 23 additions & 26 deletions sections/winners_category.sec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
$table_bodyX = table body info
$messageX = various messages to display
$print_page_link = "<p><span class='icon'><img src='".$base_url."images/printer.png' border='0' alt='Print' title='Print' /></span><a id='modal_window_link' class='data' href='".$base_url."output/print.php?section=".$section."&amp;action=print' title='Print'>Print This Page</a></p>";
$print_page_link = "<p><span class='icon'><img src='".$base_url."images/printer.png' border='0' alt='Print' title='Print' /></span><a id='modal_window_link' href='".$base_url."output/print.php?section=".$section."&amp;action=print' title='Print'>Print This Page</a></p>";
$competition_logo = "<img src='".$base_url."user_images/".$_SESSION['contestLogo']."' width='".$_SESSION['prefsCompLogoSize']."' style='float:right; padding: 5px 0 5px 5px' alt='Competition Logo' title='Competition Logo' />";
Declare all variables empty at the top of the script. Add on later...
Expand Down Expand Up @@ -72,12 +72,12 @@

// Build table headers
$table_head1 .= "<tr>";
$table_head1 .= "<th width=\"1%\" nowrap>Place</th>";
$table_head1 .= "<th width=\"20%\">Brewer(s)</th>";
$table_head1 .= "<th width=\"20%\">Entry Name</th>";
$table_head1 .= "<th width=\"20%\">Style</th>";
$table_head1 .= "<th>Club</th>";
if ($filter == "scores") $table_head1 .= "<th width=\"1%\" nowrap>Score</th>";
$table_head1 .= "<thnowrap>Place</th>";
$table_head1 .= "<th>Brewer(s)</th>";
$table_head1 .= "<th><span class=\"hidden-xs hidden-sm hidden-md\">Entry </span>Name</th>";
$table_head1 .= "<th>Style</th>";
$table_head1 .= "<th class=\"hidden-xs hidden-sm hidden-md\">Club</th>";
if ($filter == "scores") $table_head1 .= "<th class=\"hidden-xs hidden-sm hidden-md\" nowrap>Score</th>";
$table_head1 .= "</tr>";

// Build table body
Expand All @@ -101,30 +101,25 @@
$table_body1 .= "</td>";
}

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td>";
$table_body1 .= "<td>";
$table_body1 .= $row_scores['brewerFirstName']." ".$row_scores['brewerLastName'];
if ($row_scores['brewCoBrewer'] != "") $table_body1 .= "<br>Co-Brewer: ".$row_scores['brewCoBrewer'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td>";
$table_body1 .= $row_scores['brewName'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td>";
$table_body1 .= $style.": ".$row_scores['brewStyle'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td class=\"hidden-xs hidden-sm hidden-md\">";
$table_body1 .= $row_scores['brewerClubs'];
$table_body1 .= "</td>";

if ($filter == "scores") {
if ($action == "print") $table_body1 .= "<td>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td class=\"hidden-xs hidden-sm hidden-md\">";
$table_body1 .= $row_scores['scoreEntry'];
$table_body1 .= "</td>";
}
Expand Down Expand Up @@ -163,15 +158,17 @@
]
} );
} );
</script>
<table class="table table-responsive table-striped table-bordered table-responsive" id="sortable<?php echo $random1; ?>">
<thead>
<?php echo $table_head1; ?>
</thead>
<tbody>
<?php echo $table_body1; ?>
</tbody>
</table>
</script>
<div class="bcoem-winner-table">
<table class="table table-responsive table-striped table-bordered" id="sortable<?php echo $random1; ?>">
<thead>
<?php echo $table_head1; ?>
</thead>
<tbody>
<?php echo $table_body1; ?>
</tbody>
</table>
</div>
<?php } // end if > 0
} // end foreach
?>
Expand Down
49 changes: 23 additions & 26 deletions sections/winners_subcategory.sec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
$table_bodyX = table body info
$messageX = various messages to display
$print_page_link = "<p><span class='icon'><img src='".$base_url."images/printer.png' border='0' alt='Print' title='Print' /></span><a id='modal_window_link' class='data' href='".$base_url."output/print.php?section=".$section."&amp;action=print' title='Print'>Print This Page</a></p>";
$print_page_link = "<p><span class='icon'><img src='".$base_url."images/printer.png' border='0' alt='Print' title='Print' /></span><a id='modal_window_link' href='".$base_url."output/print.php?section=".$section."&amp;action=print' title='Print'>Print This Page</a></p>";
$competition_logo = "<img src='".$base_url."user_images/".$_SESSION['contestLogo']."' width='".$_SESSION['prefsCompLogoSize']."' style='float:right; padding: 5px 0 5px 5px' alt='Competition Logo' title='Competition Logo' />";
Declare all variables empty at the top of the script. Add on later...
Expand Down Expand Up @@ -77,12 +77,12 @@

// Build table headers
$table_head1 .= "<tr>";
$table_head1 .= "<th width=\"1%\" nowrap>Place</th>";
$table_head1 .= "<th width=\"25%\">Brewer(s)</th>";
$table_head1 .= "<th width=\"25%\">Entry Name</th>";
$table_head1 .= "<th nowrap>Place</th>";
$table_head1 .= "<th>Brewer(s)</th>";
$table_head1 .= "<th><span class=\"hidden-xs hidden-sm hidden-md\">Entry </span>Name</th>";
$table_head1 .= "<th width=\"25%\">Style</th>";
$table_head1 .= "<th>Club</th>";
if ($filter == "scores") $table_head1 .= "<th width=\"1%\" nowrap>Score</th>";
$table_head1 .= "<th class=\"hidden-xs hidden-sm hidden-md\">Club</th>";
if ($filter == "scores") $table_head1 .= "<th class=\"hidden-xs hidden-sm hidden-md\" nowrap>Score</th>";
$table_head1 .= "</tr>";

// Build table body
Expand All @@ -97,41 +97,36 @@
$table_body1 .= "<tr>";

if ($action == "print") {
$table_body1 .= "<td class='data' style='bdr1B'>";
$table_body1 .= "<td>";
$table_body1 .= display_place($row_scores['scorePlace'],1);
$table_body1 .= "</td>";
}

else {
$table_body1 .= "<td class='data'>";
$table_body1 .= "<td>";
$table_body1 .= display_place($row_scores['scorePlace'],2);
$table_body1 .= "</td>";
}

if ($action == "print") $table_body1 .= "<td class='data' style='bdr1B'>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td>";
$table_body1 .= $row_scores['brewerFirstName']." ".$row_scores['brewerLastName'];
if ($row_scores['brewCoBrewer'] != "") $table_body1 .= "<br>Co-Brewer: ".$row_scores['brewCoBrewer'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td class='data' style='bdr1B'>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td>";
$table_body1 .= $row_scores['brewName'];
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td class='data' style='bdr1B'>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td>";
$table_body1 .= $style.": ".$style_long;
$table_body1 .= "</td>";

if ($action == "print") $table_body1 .= "<td class='data' style='bdr1B'>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td class=\"hidden-xs hidden-sm hidden-md\">";
$table_body1 .= $row_scores['brewerClubs'];
$table_body1 .= "</td>";

if ($filter == "scores") {
if ($action == "print") $table_body1 .= "<td class='data' style='bdr1B'>";
else $table_body1 .= "<td class='data'>";
$table_body1 .= "<td class=\"hidden-xs hidden-sm hidden-md\">";
$table_body1 .= $row_scores['scoreEntry'];
$table_body1 .= "</td>";
}
Expand Down Expand Up @@ -164,14 +159,16 @@
} );
} );
</script>
<table class="dataTable" id="sortable<?php echo $random1; ?>">
<thead>
<?php echo $table_head1; ?>
</thead>
<tbody>
<?php echo $table_body1; ?>
</tbody>
</table>
<div class="bcoem-winner-table">
<table class="table table-responsive table-striped table-bordered" id="sortable<?php echo $random1; ?>">
<thead>
<?php echo $table_head1; ?>
</thead>
<tbody>
<?php echo $table_body1; ?>
</tbody>
</table>
</div>
<?php }
}
}
Expand Down

0 comments on commit 85b8727

Please sign in to comment.