diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 18:01:55 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 18:01:55 -0500 |
| commit | c8f60811cf0b748b237b71908640699816aebce8 (patch) | |
| tree | 90dbe1f5f68438450f69cb06469a1e7a9a89cb50 /app | |
| parent | 2005734a8ea64cd29d681db81c2bec45c64023b6 (diff) | |
| parent | 2c5ad6c3fd9cb4de8f393e745bf5c9d6daf4426d (diff) | |
Finished sessions and updated user model
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 33 | ||||
| -rw-r--r-- | app/views/static/homepage.html.erb | 2 |
3 files changed, 34 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 01058e3..7487f87 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,5 +5,4 @@ class ApplicationController < ActionController::Base #include sessionhelper for the session controller and view include SessionsHelper - end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000..8a81c0a --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,33 @@ +<!DOCTYPE html> +<html> +<head> + <title>Leaguer</title> + <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> + <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + <%= csrf_meta_tags %> +</head> +<body> +<div role="navigation" class="navbar navbar-inverse"> +<header> + <div class="navbar-brand no-dec"> + <%= link_to('Leaguer', '/', nil) %> + </div> + <div> + <%= form_tag("/search", method: "get", :class => "navbar-form navbar-right") do %> + <%= text_field_tag(:query, nil, :placeholder => "Search") %> + <%= submit_tag("Go", {:class => "btn btn-warning"}) %> + <% end %> + </div> +</header> + </div> + +<div class="container"> +<%= yield %> +</div> +<hr> +<footer id="footer"> +<p> Tomer Kimia Andrew Murrell Luke Shumaker Nathaniel Foy Davis Webb Guntas Grewal </p> +<p> The Leaguer System © <%= Time.now.year %> </p> </footer> + <%= debug(params) if Rails.env.development? %> +</body> +</html> diff --git a/app/views/static/homepage.html.erb b/app/views/static/homepage.html.erb index bca440a..760e087 100644 --- a/app/views/static/homepage.html.erb +++ b/app/views/static/homepage.html.erb @@ -2,7 +2,7 @@ <!-- Main jumbotron for a primary marketing message or call to action --> <div class="jumbotron"> - <h1>Welcome to Leauger</h1> + <h1>Welcome to Leaguer</h1> <p>This is a tournment management system designed to be used for any team sport. Our peer review system ensures that the best players move on to the next round! Try creating a new tournament and having people sign up for it. </p> <p id="jumbo-buttons"><%= link_to 'Log In / Sign Up', "#", :class => "btn btn-warning btn-lg", :role => "button" %> <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %> </p> </div> |