Changeset 683488
- Timestamp:
- 03/18/2013 04:21:34 AM (13 years ago)
- Location:
- bracketpress/trunk
- Files:
-
- 6 edited
-
bracketpress.php (modified) (1 diff)
-
includes/models/match.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
-
templates/bracket_display.php (modified) (6 diffs)
-
templates/bracket_edit.js (modified) (4 diffs)
-
templates/bracket_edit.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
bracketpress/trunk/bracketpress.php
r677166 r683488 5 5 Author: Scott Hack and Nick Temple 6 6 Author URI: http://www.bracketpress.com 7 Version: 1. 2.17 Version: 1.4.0 8 8 */ 9 9 -
bracketpress/trunk/includes/models/match.php
r677166 r683488 175 175 // Final Four 176 176 switch ($id) { 177 case 15: $next_game = array(6 1, 0); break;177 case 15: $next_game = array(62, 0); break; 178 178 case 30: $next_game = array(61, 1); break; 179 case 45: $next_game = array(62, 0); break;180 case 60: $next_game = array(6 2, 1); break;179 case 45: $next_game = array(62, 1); break; 180 case 60: $next_game = array(61, 0); break; 181 181 182 182 case 61: $next_game = array(63, 0); break; … … 252 252 // Special case tournament bracket 253 253 if ($id > 60) { 254 if ($id == 61) $previous = array( 15, 30);255 if ($id == 62) $previous = array( 45, 60);254 if ($id == 61) $previous = array(60, 30); 255 if ($id == 62) $previous = array(15, 45); 256 256 if ($id == 63) $previous = array(61, 62); 257 257 } -
bracketpress/trunk/readme.txt
r677166 r683488 52 52 == Changelog == 53 53 54 = 1.4.0 = 55 * Updated for 2013 region display order and final 4 matching. 56 54 57 = 1.2.1 = 55 58 * Fixed problem where randomization led to a unchangeable bracket due to user_id not being stored. … … 102 105 == Upgrade Notice == 103 106 107 = 1.4.0 = 108 * Critical update for 2013: the region order and final 4 matchup has been changed from 2012. Please update now! 109 104 110 = 1.2.1 = 105 111 * Out if beta! Please upgrade. -
bracketpress/trunk/templates/bracket_display.php
r677166 r683488 99 99 <span class="seed <?php echo $class1 ?>"> 100 100 <?php if ($winner1) { ?> 101 <span class="org_win1"><?php echo $winner1 ?></span>101 <span class="org_win1"><?php echo $winner1 ?></span> 102 102 <?php } ?> 103 104 103 <?php if ($team1) { ?> 105 <span class="team_ids"> <?php if ($show_seed) echo $team1->seed; ?></span> <?php print bracketpress_display_name($team1->name) ?></span> 106 <?php } ?> 107 <em class="score"><?php ?></em> 104 <span class="team_ids"> <?php if ($show_seed) echo $team1->seed; ?></span> <?php print bracketpress_display_name($team1->name) ?> 105 <?php } ?> 106 <em class="score"><?php // echo $this_match_id ?></em> 107 </span> 108 108 109 </p> 109 110 <p class="slot slot2 team_<?php echo $team2->ID ?>" <?php echo $id2 ?>> 110 111 <span class="seed <?php echo $class2 ?>"> 111 112 <?php if ($winner2) { ?> 112 <span class="org_win2"><?php echo $winner2 ?></span>113 <span class="org_win2"><?php echo $winner2 ?></span> 113 114 <?php } ?> 114 115 <?php if ($team2) { ?> 115 <span class="team_ids"> <?php if ($show_seed) echo $team2->seed; ?></span> <?php print bracketpress_display_name($team2->name) ?> 116 <span class="team_ids"> <?php if ($show_seed) echo $team2->seed; ?></span> <?php print bracketpress_display_name($team2->name) ?> 117 <?php } ?> 118 <em class="score"><?php ?></em> 116 119 </span> 117 <?php } ?>118 <em class="score"><?php ?></em>119 120 </p> 120 121 </div> … … 199 200 <div id="round<?php print $num ?>" class="round"> 200 201 <h3>Round <?php print $name ?> (2013 NCAA Men's Basketball Tournament)</h3> 201 202 202 <div class="region region1"> 203 <h4 class="region1"> SOUTH</h4>204 <?php bracketpress_partial_display_round($num, BRACKETPRESS_REGION_ SOUTH); ?>203 <h4 class="region1">MIDWEST</h4> 204 <?php bracketpress_partial_display_round($num, BRACKETPRESS_REGION_MIDWEST); ?> 205 205 </div> 206 206 <div class="region region2"> … … 209 209 </div> 210 210 <div class="region region3"> 211 <h4 class="region3"> EAST </h4> 211 <h4 class="region3"> SOUTH </h4> 212 <?php bracketpress_partial_display_round($num, BRACKETPRESS_REGION_SOUTH); ?> 213 </div> 214 <div class="region region4"> 215 <h4 class="region4">EAST</h4> 212 216 <?php bracketpress_partial_display_round($num, BRACKETPRESS_REGION_EAST); ?> 213 </div>214 <div class="region region4">215 <h4 class="region4">MIDWEST</h4>216 <?php bracketpress_partial_display_round($num, BRACKETPRESS_REGION_MIDWEST); ?>217 217 </div> 218 218 </div> … … 263 263 Round One (2013 NCAA Men's Basketball Tournament) 264 264 </h3> 265 265 266 <div class="region region1"> 266 <h4 class="region1 first_region"> SOUTH</h4>267 <?php bracketpress_partial_display_seed(BRACKETPRESS_REGION_ SOUTH) ?>267 <h4 class="region1 first_region">MIDWEST</h4> 268 <?php bracketpress_partial_display_seed(BRACKETPRESS_REGION_MIDWEST) ?> 268 269 </div> 269 270 <div class="region region2"> … … 272 273 </div> 273 274 <div class="region region3"> 274 <h4 class="region3 first_region">EAST</h4> 275 <h4 class="region3 first_region">SOUTH</h4> 276 <?php bracketpress_partial_display_seed(BRACKETPRESS_REGION_SOUTH) ?> 277 </div> 278 <div class="region region4"> 279 <h4 class="region4 first_region">EAST</h4> 275 280 <?php bracketpress_partial_display_seed(BRACKETPRESS_REGION_EAST) ?> 276 281 </div> 277 <div class="region region4"> 278 <h4 class="region4 first_region">MIDWEST</h4> 279 <?php bracketpress_partial_display_seed(BRACKETPRESS_REGION_MIDWEST) ?> 280 </div> 282 283 281 284 </div> 282 285 … … 294 297 <div class="region"> 295 298 <?php 299 300 /** 301 * This is the final four, and unforunately, the game order depends on the ordering 302 * of the matches. 303 */ 296 304 297 305 $matchlist = bracketpress()->matchlist; -
bracketpress/trunk/templates/bracket_edit.js
r666871 r683488 110 110 111 111 sel_match = get_sel_match(15); 112 if (sel_match['winner_id']) set_team(6 1, 1, sel_match.winner_id);112 if (sel_match['winner_id']) set_team(62, 1, sel_match.winner_id); 113 113 114 114 sel_match = get_sel_match(30); … … 116 116 117 117 sel_match = get_sel_match(45); 118 if (sel_match['winner_id']) set_team(62, 1, sel_match.winner_id);118 if (sel_match['winner_id']) set_team(62, 2, sel_match.winner_id); 119 119 120 120 sel_match = get_sel_match(60); 121 if (sel_match['winner_id']) set_team(6 2, 2, sel_match.winner_id);121 if (sel_match['winner_id']) set_team(61, 1, sel_match.winner_id); 122 122 123 123 sel_match = get_sel_match(61); … … 491 491 492 492 // Add the items 493 set_team(61, 1, $('#get_team_selector_ south_match15').val(), winner );493 set_team(61, 1, $('#get_team_selector_midwest_match60').val(), winner ); 494 494 set_team(61, 2, $('#get_team_selector_west_match30').val(), winner ); 495 495 … … 499 499 500 500 // Add the items 501 set_team(62, 1, $('#get_team_selector_ east_match45').val(), winner );502 set_team(62, 2, $('#get_team_selector_ midwest_match60').val(), winner );501 set_team(62, 1, $('#get_team_selector_south_match15').val(), winner ); 502 set_team(62, 2, $('#get_team_selector_east_match45').val(), winner ); 503 503 504 504 // Clear and create the final round -
bracketpress/trunk/templates/bracket_edit.php
r673588 r683488 289 289 </div> 290 290 </div> 291 <!-- Bracket --> 291 292 292 293 293 </div>
Note: See TracChangeset
for help on using the changeset viewer.