diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 17:57:24 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 17:57:24 -0500 |
| commit | c6ba6c11c7f0665064efdfc9385a5b8e1deaee50 (patch) | |
| tree | 6c48690a8873b8e3f3aeb0fadd137801cb548994 /app/views | |
| parent | 134360da46c1f8e5153c1c9eb5180ac990150d93 (diff) | |
| parent | d37bfd1e96f01d6f0fae275924e89dfe17a94938 (diff) | |
mergin' the wizard
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/games/index.html.erb | 6 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 7 | ||||
| -rw-r--r-- | app/views/tournaments/index.html.erb | 27 | ||||
| -rw-r--r-- | app/views/users/edit.html.erb | 6 | ||||
| -rw-r--r-- | app/views/users/show.json.jbuilder | 1 |
5 files changed, 9 insertions, 38 deletions
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 6779307..ac362cd 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -1,6 +1,6 @@ <h1>Listing games</h1> -<table class="table table-hover"> +<table> <thead> <tr> <th>Name</th> @@ -32,4 +32,8 @@ <br> +<<<<<<< HEAD +<%= link_to 'New Game', new_game_path %> +======= <%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> +>>>>>>> aca85cf084702c29014a17eafb090421061fae8b diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6fdbbec..e13a8df 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,10 +20,11 @@ <div id="log-buttons"> <% if signed_in? %> <%= current_user.user_name.upcase %> - <button type="button" class="btn btn-danger" ><%= link_to "Sign out", session_path("current"), method: "delete" %></button> + <%= link_to "Sign out", session_path("/signout"), method: "delete", :class => "signout", :role => "button" %> <% else %> - <button type="button" class="btn btn-info" ><%= link_to "Log in", new_session_path %></button> - <button type="button" class="btn btn-success"><%= link_to "Sign up", new_user_path %></button> + <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> + <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" + %> <% end %> </div> </nav></header> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb deleted file mode 100644 index 6006cad..0000000 --- a/app/views/tournaments/index.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -<h1>Listing tournaments</h1> - -<table> - <thead> - <tr> - <th></th> - <th></th> - <th></th> - <th></th> - </tr> - </thead> - - <tbody> - <% @tournaments.each do |tournament| %> - <tr> - <td><%= tournament.game %></td> - <td><%= link_to 'Show', tournament %></td> - <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td> - <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td> - </tr> - <% end %> - </tbody> -</table> - -<br> - -<%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning btn-lg" %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb deleted file mode 100644 index 99bd4cc..0000000 --- a/app/views/users/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -<h1>Editing user</h1> - -<%= render 'form' %> - -<%= link_to 'Show', @user %> | -<%= link_to 'Back', users_path %> diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder deleted file mode 100644 index 1262e80..0000000 --- a/app/views/users/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @user, :id, :name, :pw_hash, :created_at, :updated_at |