diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-07 11:52:29 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-07 11:52:29 -0400 |
| commit | 22098c2551f02c170cfe62a124477eba4c80c044 (patch) | |
| tree | 386582083cd246c8088060eb1b8d98e4b8ba5c1c | |
| parent | fe5496d65c2eb39d8e529e68bedacef1b3ecef5f (diff) | |
small visual changes to show
| -rw-r--r-- | app/assets/stylesheets/matches.css.scss | 15 | ||||
| -rw-r--r-- | app/views/matches/show.html.erb | 41 |
2 files changed, 42 insertions, 14 deletions
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 3ef9170..84430d6 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -24,4 +24,19 @@ text-align: center; padding-top: 10px; background-color: rgb(238, 238, 255); +} + +#match-stats { + padding-bottom: 10px; + border-bottom: thick dashed #F0AD4E; +} + +#match-winner { + margin: 0 auto; + text-align: center; + font-size: 2em; +} + +#current-id { + display: none; }
\ No newline at end of file diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 16345ab..1f14e05 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -1,16 +1,29 @@ -<p> - <strong>Status:</strong> - <span id="current-id"> <%= @match.status %></span> -</p> -<p> - <strong>Tournament:</strong> - <%= @match.tournament.id %> -</p> +<div class="row" id="match-stats"> + <div class="col-md-4 col-sm-3 "> + <strong>Status:</strong> + <% case @match.status %> + <% when 0 %> + Match Not Started + <% when 1 %> + Match in Progress + <% when 2 %> + Peer Review in Progress + <% when 3 %> + Finished + <% end %> + <span id="current-id"> <%= @match.status %></span> + + </div> + <div class="col-md-4 col-sm-3"> + <strong>Tournament:</strong> + <%= @match.tournament.name %> + </div> -<p> - <strong>Name:</strong> - <%= @match.name %> -</p> + <div class="col-md-4 col-sm-3"> + <strong>Name:</strong> + <%= @match.name %> + </div> +</div> <!-- Match Status 0 => Created, waiting to start Match Status 1 => Match is running, waiting to finish @@ -45,8 +58,8 @@ </div> <% unless @match.winner.nil? %> - <p> - <strong>Winner:</strong> + <p id="match-winner"> + <strong>Winning Team:</strong> <%= @match.winner.users.collect{|u| u.user_name}.join(", ") %> </p> <% end %> |