From 1591d8d7deaa25fe26878c10ce88ccd7b41a20ce Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Fri, 4 Dec 2015 18:45:39 +0000
Subject: [PATCH] Updated layout

---
 app/views/layouts/_header.html.erb     |  7 +------
 app/views/layouts/_lsidebar.html.erb   | 17 +++++++++++++++++
 app/views/layouts/_rsidebar.html.erb   |  2 +-
 app/views/layouts/application.html.erb | 15 +++++++++------
 app/views/tournaments/show.html.erb    |  5 +++--
 5 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 app/views/layouts/_lsidebar.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 3d8463b..7944337 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -4,12 +4,7 @@
         <a class="navbar-brand navbar-custom-brand" href="/">WrestlingDev</a>
       </div>
         <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>
             <% if user_signed_in? %>
                 <li><%=link_to "Log out", destroy_user_session_url ,:method => 'delete' %></li>
diff --git a/app/views/layouts/_lsidebar.html.erb b/app/views/layouts/_lsidebar.html.erb
new file mode 100644
index 0000000..ea27ae6
--- /dev/null
+++ b/app/views/layouts/_lsidebar.html.erb
@@ -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 %>
+        
+        
\ No newline at end of file
diff --git a/app/views/layouts/_rsidebar.html.erb b/app/views/layouts/_rsidebar.html.erb
index 644d7e2..af1ef11 100644
--- a/app/views/layouts/_rsidebar.html.erb
+++ b/app/views/layouts/_rsidebar.html.erb
@@ -1,5 +1,5 @@
 	<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>
         </div>
 <script>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3daf884..86f2808 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,12 +25,15 @@
 
                   <div id="page-content">
                     <div class="row no-margin">
-                      <div class="col-md-10">
-                        <div id="view"><%= yield %></div>
-                      </div>
-		      <div class="col-md-2" style="padding-top: 2%;">
-			<%= render 'layouts/rsidebar' %>
-		      </div>
+                        <div class="col-md-2">
+              			      <%= render 'layouts/lsidebar' %>
+              		      </div>
+                        <div class="col-md-8" style="padding-left: 2%;">
+                          <div id="view"><%= yield %></div>
+                        </div>
+            		      <div class="col-md-2" >
+            			      <%= render 'layouts/rsidebar' %>
+            		      </div>
                     </div>
                   </div>
                   <%= render 'layouts/footer' %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index d4d02d5..6a83049 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,8 +1,9 @@
 <p id="notice"><%= notice %></p>
+<%= link_to 'Back to browse tournaments', '/tournaments', :class=>"btn btn-default" %>
 <% 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 %>
-<%= link_to 'Back', '/tournaments', :class=>"btn btn-default" %>
+
 
 <h1>
   <%= @tournament.name %>