summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-03 14:09:32 -0500
committerAndrewMurrell <amurrel@purdue.edu>2014-03-03 14:09:32 -0500
commit455fa5b30e224407e4fdca46d087ba300a050567 (patch)
treebb0f189632a0fd83fbb797bc012d0a27c2c66f14
parent39e0c9ca280d16817eb8d7683d80788f2544ae5f (diff)
Made it possible to log in from the sign up page. As in I put a link under the mess I made.
-rw-r--r--app/views/users/new.html.erb5
-rwxr-xr-xgenerate.sh2
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 715d40e..2a745cc 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -54,4 +54,7 @@
<p>
<input name="commit" type="submit" value="Save User" />
</p>
-</form> \ No newline at end of file
+</form>
+
+<%= link_to 'Already Have an Account? Log in', "signin", :class => "btn btn-warning btn-lg" %>
+
diff --git a/generate.sh b/generate.sh
index 7f0467c..4d70de1 100755
--- a/generate.sh
+++ b/generate.sh
@@ -14,7 +14,7 @@ NOTEST='--skip-test-unit'
set -x
bundle exec rails generate scaffold server --force $NOTEST
-bundle exec rails generate scaffold tournament game:references --force $NOTEST
+bundle exec rails generate scaffold tournament game:references $NOTEST
bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
bundle exec rails generate scaffold team $NOTEST
bundle exec rails generate scaffold alert author:references message:text $NOTEST