Made "Login" two words and did some nicer capitalization

PeteyPii · Nov 10, 2014 · f0ed83b · f0ed83b
1 parent 14f5783
commit f0ed83b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/server/Templates/createleague.html b/server/Templates/createleague.html
@@ -17,8 +17,8 @@
       <div class="navbar-collapse">
         <ul class="nav navbar-nav">
           <li><a href="Home">Home</a></li>
-          <li><a href="Login">Login</a></li>
-          <li><a href="Signup">Sign Up</a></li>
+          <li><a href="LogIn">Log In</a></li>
+          <li><a href="SignUp">Sign Up</a></li>
           <li class="active"><a href="#"> Create a League </a> </li>
           <li><a href="Leagues">View Leagues</a></li>
         </ul>

diff --git a/server/Templates/home.html b/server/Templates/home.html
@@ -18,8 +18,8 @@
         <div class="navbar-collapse">
           <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
-            <li><a href="Login">Login</a></li>
-            <li><a href="Signup">Sign Up</a></li>
+            <li><a href="LogIn">Log In</a></li>
+            <li><a href="SignUp">Sign Up</a></li>
             <li><a href="CreateLeague">Create a League</a> </li>
             <li><a href="Leagues">View Leagues</a></li>
           </ul>
@@ -30,7 +30,7 @@
       <div class="well text-center" style="display: inline-block; padding: 40px;">
         <div class="text-center">
           <h3>Play Fantasy with your Friends!</h3>
-          <p><a class="btn btn-su btn-success" href="Signup" role="button">Sign up today</a> or <a class="btn btn-lg btn-success" href="Login" role "button">Login</a></p>
+          <p><a class="btn btn-su btn-success" href="SignUp" role="button">Sign up today</a> or <a class="btn btn-lg btn-success" href="LogIn" role "button">LogIn</a></p>
         </div>
       </div>
     </section>

diff --git a/server/Templates/league.html b/server/Templates/league.html
@@ -18,8 +18,8 @@
         <div class="navbar-collapse">
           <ul class="nav navbar-nav">
             <li><a href="Home">Home</a></li>
-            <li><a href="Login">Login</a></li>
-            <li><a href="Signup">Sign Up</a></li>
+            <li><a href="LogIn">Log In</a></li>
+            <li><a href="SignUp">Sign Up</a></li>
             <li><a href="CreateLeague"> Create a League </a> </li>
             <li><a href="Leagues">View Leagues</a></li>
           </ul>

diff --git a/server/Templates/leagues.html b/server/Templates/leagues.html
@@ -18,8 +18,8 @@
         <div class="navbar-collapse">
           <ul class="nav navbar-nav">
             <li><a href="Home">Home</a></li>
-            <li><a href="Login">Login</a></li>
-            <li><a href="Signup">Sign Up</a></li>
+            <li><a href="LogIn">Log In</a></li>
+            <li><a href="SignUp">Sign Up</a></li>
             <li><a href="CreateLeague">Create a League</a></li>
             <li class="active"><a href="#">View Leagues</a></li>
           </ul>

diff --git a/server/Templates/login.html b/server/Templates/login.html
@@ -17,8 +17,8 @@
       <div class="navbar-collapse">
         <ul class="nav navbar-nav">
           <li><a href="Home">Home</a></li>
-          <li class="active"><a href="#">Login</a></li>
-          <li><a href="Signup">Sign Up</a></li>
+          <li class="active"><a href="#">Log In</a></li>
+          <li><a href="SignUp">Sign Up</a></li>
           <li><a href="CreateLeague"> Create a League </a> </li>
           <li><a href="Leagues">View Leagues</a></li>
         </ul>

diff --git a/server/Templates/signup.html b/server/Templates/signup.html
@@ -17,7 +17,7 @@
       <div class="navbar-collapse">
         <ul class="nav navbar-nav">
           <li><a href="Home">Home</a></li>
-          <li><a href="Login">Login</a></li>
+          <li><a href="LogIn">Log In</a></li>
           <li class="active"><a href="#">Sign Up</a></li>
           <li><a href="CreateLeague"> Create a League </a> </li>
           <li><a href="Leagues">View Leagues</a></li>

diff --git a/server/server.py b/server/server.py
@@ -29,7 +29,7 @@ def login_status():
     return False
 
 
-@app.route('/Signup', methods=['GET', 'POST'])
+@app.route('/SignUp', methods=['GET', 'POST'])
 def sign_up():
   error = None
   if request.method == 'POST':
@@ -67,12 +67,12 @@ def sign_up():
 
     session["logged_in"] = False
     session["username"] = ""
-    return redirect('Login')
+    return redirect('LogIn')
   else:
     return render_template('signup.html', error=error)
 
 
-@app.route('/Login', methods=['GET', 'POST'])
+@app.route('/LogIn', methods=['GET', 'POST'])
 def log_in():
   if request.method == 'GET':
     error = None
@@ -112,7 +112,7 @@ def create_league():
   loggedIn = login_status()
   if loggedIn == False:
     session["mustLogIn"] = True
-    return redirect('Login')
+    return redirect('LogIn')
 
   if request.method == 'GET':
     return render_template('createleague.html')
@@ -162,7 +162,7 @@ def load_home():
  return render_template('home.html')
 
 
-@app.route('/Logout')
+@app.route('/LogOut')
 def logout():
   session.pop('logged_in', None)
   return redirect(url_for('home'))
@@ -173,7 +173,7 @@ def show_leagues():
   loggedIn = login_status()
   if loggedIn == False:
     session["mustLogIn"] = True
-    return redirect('Login')
+    return redirect('LogIn')
 
   leagues = db.get_groups_in(session['username'])
   for league in leagues:
@@ -186,7 +186,7 @@ def show_group(groupid):
   loggedIn = login_status()
   if loggedIn == False:
     session["mustLogIn"] = True
-    return redirect('Login')
+    return redirect('LogIn')
 
   creator = db.get_group_creator(groupid)
   if creator != session['username']: