From 77c416597a84bb6fd272920af3a65e46d3701ade Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Mon, 11 Feb 2019 16:29:00 +0000 Subject: [PATCH] Removing bootstrap buttons all over the place and replacing with font awesome icons --- app/views/layouts/_cdn.html.erb | 17 ++++-- app/views/layouts/_tournament-navbar.html.erb | 13 ++-- app/views/schools/show.html.erb | 40 ++++--------- .../static_pages/my_tournaments.html.erb | 34 ++++------- app/views/tournaments/index.html.erb | 26 ++++---- app/views/tournaments/show.html.erb | 60 +++++++------------ app/views/weights/show.html.erb | 19 +++--- app/views/wrestlers/show.html.erb | 12 +--- 8 files changed, 89 insertions(+), 132 deletions(-) diff --git a/app/views/layouts/_cdn.html.erb b/app/views/layouts/_cdn.html.erb index f923e78..02a3c20 100644 --- a/app/views/layouts/_cdn.html.erb +++ b/app/views/layouts/_cdn.html.erb @@ -6,13 +6,20 @@ + + + - - - - - diff --git a/app/views/layouts/_tournament-navbar.html.erb b/app/views/layouts/_tournament-navbar.html.erb index 81f864e..c34ea47 100644 --- a/app/views/layouts/_tournament-navbar.html.erb +++ b/app/views/layouts/_tournament-navbar.html.erb @@ -4,22 +4,25 @@
    -
  • <%= link_to "" , "/tournaments/#{@tournament.id}", class: "glyphicon glyphicon-home" %>
    • +
  • <%= link_to " Tournament Home" , "/tournaments/#{@tournament.id}", class: "fas fa-home" %>
  • - Brackets + Tournament Results
      +
    • Results
      • +
    • <%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %>
      • +
    • Brackets
      • <% @tournament.weights.sort_by{|weight| weight.max }.each do |weight| %>
    • <%= link_to "#{weight.max}" , "/tournaments/#{@tournament.id}/brackets/#{weight.id}" %>
      • <% end %>
    • <%= link_to "All Brackets (Printable)", "/tournaments/#{@tournament.id}/all_brackets?print=true", target: :_blank %>
    • -
  • <%= link_to "Bout Board" , "/tournaments/#{@tournament.id}/up_matches" %>
    • -
  • <%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %>
    • +
  • <%= link_to " Bout Board" , "/tournaments/#{@tournament.id}/up_matches", class: "fas fa-list-alt" %>
    • + <% if can? :manage, @tournament %>
  • - Tournament Director Links + Tournament Director Links
    • Pages
      • diff --git a/app/views/schools/show.html.erb b/app/views/schools/show.html.erb index 1966497..dc81ca7 100644 --- a/app/views/schools/show.html.erb +++ b/app/views/schools/show.html.erb @@ -1,12 +1,7 @@ - <% if can? :manage, @school %> - <%= link_to "Edit #{@school.name}", edit_school_path(@school),:class=>"btn btn-primary" %> | - <% end %> - <%= link_to "#{@school.name} Stat Summary", "/schools/#{@school.id}/stats",:class=>"btn btn-primary" %> -
      -

      Name: <%= @school.name %> + <% if can? :manage, @school %><%= link_to " Edit", edit_school_path(@school),:class=>"fas fa-edit" %><% end %>

      @@ -21,20 +16,12 @@

      Tournament: <%= @school.tournament.name %> -

      - - - - - -
      - <% if can? :manage, @school %> - <%= link_to "New #{@school.name} Wrestler" , "/wrestlers/new?school=#{@school.id}", :class=>"btn btn-success"%> - <% end %> +

      + <%= link_to "#{@school.name} Stat Summary", "/schools/#{@school.id}/stats",:class=>"btn btn-sm btn-primary" %>

      - - +

      Roster

      +
      @@ -43,14 +30,14 @@ - + <% if can? :manage, @school %><% end %> <% @wrestlers.sort_by{|w| w.weight.max}.each do |wrestler| %> - + - + <% if can? :manage, wrestler.school %> + + <% end %> <% end %> diff --git a/app/views/static_pages/my_tournaments.html.erb b/app/views/static_pages/my_tournaments.html.erb index ca5e33f..5ffaf5c 100644 --- a/app/views/static_pages/my_tournaments.html.erb +++ b/app/views/static_pages/my_tournaments.html.erb @@ -5,64 +5,52 @@ // pagingType: "bootstrap"; // } ); -<% if user_signed_in? %> - <%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %> -<% end %>
      -
      -
      NameTeam Points Scored Extra? Next Bout/MatActions<%= link_to " New Wrestler" , "/wrestlers/new?school=#{@school.id}", :class=>"fas fa-plus"%>
      <%= wrestler.name %><%= link_to "#{wrestler.name}", wrestler %> <%= wrestler.weight.max %> <%= wrestler.original_seed %> @@ -60,13 +47,12 @@ Yes <% end %> <%= wrestler.next_match_bout_number %> <%= wrestler.next_match_mat_name %> - <%= link_to 'Show', wrestler , :class=>"btn btn-default btn-sm" %> - <% if can? :manage, wrestler.school %> - <%= link_to 'Edit', edit_wrestler_path(wrestler),:class=>"btn btn-primary btn-sm" %> - <%= link_to 'Destroy', wrestler, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> - <% end %> - + <%= link_to '', edit_wrestler_path(wrestler),:class=>"fas fa-edit" %> + <%= link_to '', wrestler, method: :delete, data: { confirm: "Are you sure you want to delete #{wrestler.name}? This will delete all of his matches." }, :class=>"fas fa-trash-alt" %> +
      +
      - + <% end %> <% @tournaments.each do |tournament| %> - + - <% end %> - <% end %>
      Name Date<% if user_signed_in? %><%= link_to ' New Tournament', new_tournament_path, :class=>"fas fa-plus" %>
      <%= tournament.name %><%= link_to "#{tournament.name}", tournament %> <%= tournament.date %><%= link_to 'Show', tournament, :class=>"btn btn-default btn-sm" %> <% if can? :manage, tournament %> - <%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary btn-sm" %> - <% end %> - <% if can? :destroy, tournament %> - <%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> + + <%= link_to '', edit_tournament_path(tournament), :class=>"fas fa-edit" %> + <% if can? :destroy, tournament %> + <%= link_to '', tournament, method: :delete, data: { confirm: "Are you sure you want to delete #{tournament.name}?" }, :class=>"fas fa-trash-alt" %> + <% end %> +

      -
      <% if @schools.size > 0 %>

      My Schools


      -
      - +
      - <% @schools.each do |school| %> - + - <% end %> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index f250520..1b04805 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -9,33 +9,29 @@ // pagingType: "bootstrap"; // } ); -<% if user_signed_in? %> - <%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %> -<% end %> -
      -
      -
      Name Tournament Name Tournament Date
      <%= school.name %><%= link_to "#{school.name}", school %> <%= school.tournament.name %> <%= school.tournament.date %><%= link_to 'Show', school, :class=>"btn btn-default btn-sm" %> - <% if can? :manage, school %> - <%= link_to 'Edit', edit_school_path(school), :class=>"btn btn-primary btn-sm" %> - <% end %> -
      +
      +
      - + <% end %> <% @tournaments.each do |tournament| %> - + - + + <% end %> <% end %> diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 913138c..4f3c4fe 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -27,16 +27,11 @@

      School Lineups


      -<% if can? :manage, @tournament %> - <%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}", :class=>"btn btn-success btn-sm" %> -
      -
      -<% end %> -
      Name Date<% if user_signed_in? %><%= link_to ' New Tournament', new_tournament_path, :class=>"fas fa-plus" %>
      <%= tournament.name %><%= link_to "#{tournament.name}", tournament %> <%= tournament.date %><%= link_to 'Show', tournament, :class=>"btn btn-default btn-sm" %> <% if can? :manage, tournament %> - <%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary btn-sm" %> - <% end %> - <% if can? :destroy, tournament %> - <%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> - <% end %> - + <%= link_to '', edit_tournament_path(tournament), :class=>"fas fa-edit" %> + <% if can? :destroy, tournament %> + <%= link_to '', tournament, method: :delete, data: { confirm: "Are you sure you want to delete #{tournament.name}?" }, :class=>"fas fa-trash-alt" %> + <% end %> +
      +
      - + <% if can? :manage, @tournament %><% end %> @@ -44,14 +39,15 @@ <% @schools.each do |school| %> - - <% end %> + <% end %> @@ -63,31 +59,26 @@

      Weight Class Seeds


      -<% if can? :manage, @tournament %> - <%= link_to "New #{@tournament.name} Weight" , "/weights/new?tournament=#{@tournament.id}", :class=>"btn btn-success btn-sm" %> -
      -
      -<% end %> -
      Name<%= link_to " New School" , "/schools/new?tournament=#{@tournament.id}", :class=>"fas fa-plus" %>
      <%= school.name %><%= link_to 'Show', school, :class=>"btn btn-default btn-sm" %> + <%= link_to "#{school.name}", school %> <% if can? :manage, school %> - <%= link_to 'Edit', edit_school_path(school), :class=>"btn btn-primary btn-sm" %> - <% end %> - <% if can? :manage, @tournament %> - <%= link_to 'Destroy', school, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> + <%= link_to '', edit_school_path(school), :class=>"fas fa-edit" %> + <% if can? :manage, @tournament %> + <%= link_to '', school, method: :delete, data: { confirm: "Are you sure you want to delete #{school.name}?" }, :class=>"fas fa-trash-alt" %> + <% end %> +
      +
      - + <% if can? :manage, @tournament %><% end %> <% @weights.each do |weight| %> - + - <% end %> - <% end %> @@ -96,29 +87,24 @@ <% if can? :manage, @tournament %>

      -

      Mats

      -
      - <%= link_to "New #{@tournament.name} Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"btn btn-success btn-sm" %> -
      -
      -
      Weight Class Bracket Size<%= link_to " New Weight Class" , "/weights/new?tournament=#{@tournament.id}", :class=>"fas fa-plus" %>
      <%= weight.max %><%= link_to "#{weight.max} lbs", weight %> <%= weight.bracket_size %><%= link_to 'Show', weight, :class=>"btn btn-default btn-sm" %> <% if can? :manage, @tournament %> - <%= link_to 'Edit', edit_weight_path(weight), :class=>"btn btn-primary btn-sm" %> - <%= link_to 'Destroy', weight, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> + + <%= link_to '', edit_weight_path(weight), :class=>"fas fa-edit" %> + <%= link_to '', weight, method: :delete, data: { confirm: "Are you sure you want to delete the #{weight.max} weight class?" }, :class=>"fas fa-trash-alt" %> +
      +

      Mats


      +
      - + <% @mats.each do |mat| %> - - <% if can? :manage, @tournament %> - <%= link_to 'Show', mat, :class=>"btn btn-default btn-sm" %> - <%= link_to 'Destroy', mat, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> + <% end %> - <% end %> diff --git a/app/views/weights/show.html.erb b/app/views/weights/show.html.erb index bf0a016..65c9c4b 100644 --- a/app/views/weights/show.html.erb +++ b/app/views/weights/show.html.erb @@ -1,15 +1,12 @@ +

      Weight Class:<%= @weight.max %> <% if can? :manage, @tournament %><%= link_to " Edit", edit_weight_path(@weight), :class=>"fas fa-edit" %><% end %>

      <% if can? :manage, @tournament %> - <%= link_to "Edit #{@weight.max} Weight Class", edit_weight_path(@weight), :class=>"btn btn-primary" %> | <%= form_for(@weight, url: regen_weight_path(@weight.id), :method => "post") do |f| %> - <%= submit_tag "Regenerate Weight Class Matches", :class=>"btn btn-default"%> + <%= submit_tag "Regenerate Weight Class Matches", :class=>"btn btn-sm btn-default"%> <% end %> <% end %> - -
      -

      Weight Class:<%= @weight.max %>



      -
      Name<%= link_to " New Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"fas fa-plus" %>
      <%= mat.name %> + <%= link_to "Mat #{mat.name}", mat %> + <%= link_to '', mat, method: :delete, data: { confirm: "Are you sure you want to delete Mat #{mat.name}?" }, :class=>"fas fa-trash-alt" %> +
      +
      @@ -18,7 +15,6 @@ - <% if can? :manage, @tournament %><% end %> @@ -26,7 +22,7 @@ <% @wrestlers.sort_by{|w| [w.original_seed ? 0 : 1, w.original_seed || 0]}.each do |wrestler| %> <% if wrestler.weight_id == @weight.id %> - + <% if can? :manage, @tournament %> - + <% end %> <% end %> @@ -54,7 +51,7 @@

      *All wrestlers without a seed (determined by tournament director) will be assigned a random seed.

      <% if can? :manage, @tournament %>
      - <%= submit_tag "Save", :class=>"btn btn-success"%> + <%= submit_tag "Save Seeds", :class=>"btn btn-success"%> <% end %> <% end %> diff --git a/app/views/wrestlers/show.html.erb b/app/views/wrestlers/show.html.erb index 4055051..626d01e 100644 --- a/app/views/wrestlers/show.html.erb +++ b/app/views/wrestlers/show.html.erb @@ -1,17 +1,11 @@ - - - <%= link_to "Back to #{@school.name}", "/schools/#{@school.id}", :class=>"btn btn-default" %> - <% if can? :manage, @school %> - | <%= link_to "Edit #{@wrestler.name}", edit_wrestler_path(@wrestler), :class=>"btn btn-primary" %> - <% end %> -<% cache ["#{@wrestler.id}", @wrestler] do %> +<%= link_to "Back to #{@school.name}", "/schools/#{@school.id}", :class=>"btn btn-sm btn-default" %>

      Name: - <%= @wrestler.name %> + <%= @wrestler.name %> <% if can? :manage, @school %><%= link_to " Edit", edit_wrestler_path(@wrestler), :class=>"fas fa-edit" %><% end %>

      - +<% cache ["#{@wrestler.id}", @wrestler] do %>

      School: <%= @wrestler.school.name %>

      NameRecord Seed Criteria Extra?Actions for wrestler
      <%= wrestler.name %><%= link_to "#{wrestler.name}", wrestler %> <%= wrestler.school.name %> <% if can? :manage, @tournament %> @@ -43,8 +39,9 @@ Yes <% end %><%= link_to 'Show', wrestler , :class=>"btn btn-default btn-sm" %> - <%= link_to 'Destroy', wrestler, method: :delete, data: { confirm: 'Are you sure?' } , :class=>"btn btn-danger btn-sm" %> + <%= link_to '', wrestler, method: :delete, data: { confirm: "Are you sure you want to delete #{wrestler.name}?" } , :class=>"fas fa-trash-alt" %> +