cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-04 13:43:48 +00:00
Code Issues Releases Wiki Activity

Updated layout

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-12-04 18:45:39 +00:00
parent c0e555edb3
commit 1591d8d7de
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/layouts/_header.html.erb
View File

@@ -4,12 +4,7 @@
<a class="navbar-brand navbar-custom-brand" href="/">WrestlingDev</a> <a class="navbar-brand navbar-custom-brand" href="/">WrestlingDev</a>
</div> </div>
<ul class="nav navbar-nav navbar-right navbar-custom-link"> <ul class="nav navbar-nav navbar-right navbar-custom-link">
<% if @tournament %>
<li><%= link_to "Brackets" , "/tournaments/#{@tournament.id}/brackets" %></li>
<li><%= link_to "Upcoming Matches" , "/tournaments/#{@tournament.id}/up_matches" %></li>
<li><%= link_to "Results" , "/tournaments/#{@tournament.id}/results" %></li>
<li><%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %></li>
<% end %>
<li><%= link_to "About", "/static_pages/about" %></li> <li><%= link_to "About", "/static_pages/about" %></li>
<% if user_signed_in? %> <% if user_signed_in? %>
<li><%=link_to "Log out", destroy_user_session_url ,:method => 'delete' %></li> <li><%=link_to "Log out", destroy_user_session_url ,:method => 'delete' %></li>

17
app/views/layouts/_lsidebar.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<!-- sidebar -->
<% if @tournament %>
<div class="affix" style="border-right:1px solid #000; padding-right: 1%;">
<ul class="">
<h5>Tournament Links</h5>
<li><%= link_to "Brackets" , "/tournaments/#{@tournament.id}/brackets" %></li>
<li><%= link_to "Upcoming Matches" , "/tournaments/#{@tournament.id}/up_matches" %></li>
<li><%= link_to "Results" , "/tournaments/#{@tournament.id}/results" %></li>
<li><%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %></li>
</ul>
</div>
<% end %>

2
app/views/layouts/_rsidebar.html.erb
View File

@@ -1,5 +1,5 @@
<div class="afs_ads">&nbsp;</div> <div class="afs_ads">&nbsp;</div>
<div class="well" id="blocked_message" style="display: none;"> <div class="well affix" id="blocked_message" style="display: none; width: 200px;">
<p>We've detected that you have an ad blocker enabled! Please consider disabling it for <strong>wrestlingdev.com</strong>. This site is free for users and supported by ads. Ad blockers also block performance monitoring that help us with user experience.</p> <p>We've detected that you have an ad blocker enabled! Please consider disabling it for <strong>wrestlingdev.com</strong>. This site is free for users and supported by ads. Ad blockers also block performance monitoring that help us with user experience.</p>
</div> </div>
<script> <script>

15
app/views/layouts/application.html.erb
View File

@@ -25,12 +25,15 @@
<div id="page-content"> <div id="page-content">
<div class="row no-margin"> <div class="row no-margin">
<div class="col-md-10"> <div class="col-md-2">
<div id="view"><%= yield %></div> <%= render 'layouts/lsidebar' %>
</div> </div>
<div class="col-md-2" style="padding-top: 2%;"> <div class="col-md-8" style="padding-left: 2%;">
<%= render 'layouts/rsidebar' %> <div id="view"><%= yield %></div>
</div> </div>
<div class="col-md-2" >
<%= render 'layouts/rsidebar' %>
</div>
</div> </div>
</div> </div>
<%= render 'layouts/footer' %> <%= render 'layouts/footer' %>

5
app/views/tournaments/show.html.erb
View File

@@ -1,8 +1,9 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<%= link_to 'Back to browse tournaments', '/tournaments', :class=>"btn btn-default" %>
<% if tournament_permissions(@tournament) %> <% if tournament_permissions(@tournament) %>
<%= link_to "Edit #{@tournament.name}", edit_tournament_path(@tournament), :class=>"btn btn-primary" %> | | <%= link_to "Edit #{@tournament.name}", edit_tournament_path(@tournament), :class=>"btn btn-primary" %>
<% end %> <% end %>
<%= link_to 'Back', '/tournaments', :class=>"btn btn-default" %>
<h1> <h1>
<%= @tournament.name %> <%= @tournament.name %>