From 66d5669dbcc042317ca5d10759276ea5813f7081 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Tue, 4 Mar 2014 18:52:58 -0500 Subject: minor color changes --- app/assets/stylesheets/scaffolds.css.scss | 4 ++-- app/views/layouts/application.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 2c8c009..e4b33b3 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -25,10 +25,10 @@ pre { a { color: #000; &:visited { - color: white; + color: #000; } &:hover { - color: white; + color: green; text-decoration: none; } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9cc30bc..cb4a3d6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@

- +

<%= form_tag("/search", method: "get", :class => "navbar-form navbar-right") do %> <%= text_field_tag(:query, nil, :placeholder => "Search") %> -- cgit v1.2.3-54-g00ecf From e586c3e2b30698ea5a1c83c19ea446c4be89fd54 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 4 Mar 2014 18:57:50 -0500 Subject: Here's to messing everything up. --- app/assets/javascripts/ajax.js | 6 +++++- app/controllers/tournaments_controller.rb | 9 ++------- app/views/tournaments/_selected.html.erb | 30 +++++------------------------- app/views/tournaments/index.html.erb | 27 +++++++++++++++++++++++++++ app/views/tournaments/new.html.erb | 12 ++++++++++-- config/routes.rb | 2 ++ start.sh | 2 +- 7 files changed, 52 insertions(+), 36 deletions(-) create mode 100644 app/views/tournaments/index.html.erb (limited to 'app') diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js index 31578dd..040c100 100644 --- a/app/assets/javascripts/ajax.js +++ b/app/assets/javascripts/ajax.js @@ -12,4 +12,8 @@ function populate() { ; } }; -} \ No newline at end of file + +//$.ajax(url: "/selected").done (html) -> $("#ajax-form").append html + +} + diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 27ba020..5c53693 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -15,6 +15,7 @@ class TournamentsController < ApplicationController # GET /tournaments/new def new @game_names = Game.all.collect + @game = params[:game] @tournament = Tournament.new end @@ -22,12 +23,6 @@ class TournamentsController < ApplicationController def edit end - def selected - render :update do |page| - page.replace_html 'ajax-form', :partial => 'selected' - end - end - # POST /tournaments # POST /tournaments.json def create @@ -76,6 +71,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:game_id) + params.require(:tournament).permit(:game_id, :game) end end diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index 302283d..3b14404 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -1,25 +1,5 @@ - \ No newline at end of file + + <%= content_tag(:p, "Hello World") %> + + +<%= tag(:label, for: 'GameType') %> \ No newline at end of file diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb new file mode 100644 index 0000000..26d0643 --- /dev/null +++ b/app/views/tournaments/index.html.erb @@ -0,0 +1,27 @@ +

Listing tournaments

+ + + + + + + + + + + + + <% @tournaments.each do |tournament| %> + + + + + + + <% end %> + +

Tournament ID	Show Tournament	Edit Tournament	Delete Tournament
<%= tournament.id %>	<%= link_to 'Show', tournament %>	<%= link_to 'Edit', edit_tournament_path(tournament) %>	<%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %>

+ +
+ +<%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning btn-lg" %> diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb index f1dec90..a6dfa4d 100644 --- a/app/views/tournaments/new.html.erb +++ b/app/views/tournaments/new.html.erb @@ -1,11 +1,19 @@ +<%= javascript_include_tag :defaults %> +

New tournament

-<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> +<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> <%= link_to 'Select', 'new?game=1', :class => "btn btn-warning btn-lg" %> + +

- <% render :partial => "selected" %> + <% if not @game.nil? %> + <%= render 'selected' %> + <% end %>

+<%= link_to 'Select', 'selected', :class => "btn btn-warning btn-lg" %> + <%= link_to 'Back', tournaments_path %> diff --git a/config/routes.rb b/config/routes.rb index 022ce42..2409eb2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,6 +17,8 @@ Leaguer::Application.routes.draw do resources :tournaments + #set 'selected' to: 'tournaments#selected' via: 'get' + resources :servers root to: 'static#homepage' diff --git a/start.sh b/start.sh index cb9cdda..2b58327 100755 --- a/start.sh +++ b/start.sh @@ -1,4 +1,4 @@ #!/bin/bash -nohup bundle exec rails server & +bundle exec rails server --daemon -- cgit v1.2.3-54-g00ecf