Merge master into ashazar-master

1 files changed, 37 insertions, 26 deletions

diff --git a/resources/views/snippets/navbar.blade.php b/resources/views/snippets/navbar.blade.php
index cba28bd..02a6ede 100644
--- a/resources/views/snippets/navbar.blade.php
+++ b/resources/views/snippets/navbar.blade.php
@@ -6,16 +6,27 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
+
         <!-- Output sign in/sign out buttons appropriately -->
         <div class="navbar-header">
             <a class="navbar-brand" href="{{route('index')}}">{{env('APP_NAME')}}</a>
         </div>
 
         <ul id="navbar" class="nav navbar-collapse collapse navbar-nav" id="nbc">
-            <li><a href="about">About</a></li>
-            <li class="visible-xs"><a href="{{route('login')}}">Sign In</a></li>
-            <li class="visible-xs"><a href="{{route('admin')}}">Dashboard</a></li>
+		    <li><a href="about">About</a></li>
+
+            @if (empty(session('username')))
+                <li class="visible-xs"><a href="{{route('login')}}">Sign In</a></li>
+                @if (env('POLR_ALLOW_ACCT_CREATION'))
+                    <li class="visible-xs"><a href="{{route('signup')}}">Sign Up</a></li>
+                @endif
+            @else
+                <li class="visible-xs"><a href="{{route('admin')}}">Dashboard</a></li>
+                <li class="visible-xs"><a href="{{route('admin')}}#settings">Settings</a></li>
+                <li class="visible-xs"><a href="{{route('logout')}}">Logout</a></li>
+            @endif
         </ul>
+
         <ul id="navbar" class="nav pull-right navbar-nav hidden-xs">
             <li class="divider-vertical"></li>
 
@@ -23,31 +34,31 @@
                 @if (env('POLR_ALLOW_ACCT_CREATION'))
                     <li><a href="{{route('signup')}}">Sign Up</a></li>
                 @endif
-            <li class="dropdown">
-                <a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
-                <div class="dropdown-menu pull-right login-dropdown-menu" id="dropdown">
-                    <h2>Login</h2>
-                    <form action="login" method="POST" accept-charset="UTF-8">
-                        <input type="text" name="username" placeholder='Username' size="30" class="form-control login-form-field" />
-                        <input type="password" name="password" placeholder='Password' size="30" class="form-control login-form-field" />
-                        <input type="hidden" name='_token' value='{{csrf_token()}}' />
-                        <input class="btn btn-success form-control login-form-submit" type="submit" name="login" value="Sign In" />
-                    </form>
-                </div>
-            </li>
-            @else
-            <div class='nav pull-right navbar-nav'>
-                <li class='dropdown'>
-                <a class="dropdown-toggle login-name" href="#" data-toggle="dropdown">{{session('username')}} <strong class="caret"></strong></a>
-                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu">
-                        <li><a tabindex="-1" href="{{route('admin')}}">Dashboard</a></li>
-                        <li><a tabindex="-1" href="{{route('admin')}}#settings">Settings</a></li>
-                        <li><a tabindex="-1" href="{{route('logout')}}">Logout</a></li>
-                    </ul>
+
+                <li class="dropdown">
+                    <a class="dropdown-toggle" href="#" data-toggle="dropdown">Sign In <strong class="caret"></strong></a>
+                    <div class="dropdown-menu pull-right login-dropdown-menu" id="dropdown">
+                        <h2>Login</h2>
+                        <form action="login" method="POST" accept-charset="UTF-8">
+                            <input type="text" name="username" placeholder='Username' size="30" class="form-control login-form-field" />
+                            <input type="password" name="password" placeholder='Password' size="30" class="form-control login-form-field" />
+                            <input type="hidden" name='_token' value='{{csrf_token()}}' />
+                            <input class="btn btn-success form-control login-form-submit" type="submit" name="login" value="Sign In" />
+                        </form>
+                    </div>
                 </li>
-            </div>
+            @else
+                <div class='nav pull-right navbar-nav'>
+                    <li class='dropdown'>
+                    <a class="dropdown-toggle login-name" href="#" data-toggle="dropdown">{{session('username')}} <strong class="caret"></strong></a>
+                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu">
+                            <li><a tabindex="-1" href="{{route('admin')}}">Dashboard</a></li>
+                            <li><a tabindex="-1" href="{{route('admin')}}#settings">Settings</a></li>
+                            <li><a tabindex="-1" href="{{route('logout')}}">Logout</a></li>
+                        </ul>
+                    </li>
+                </div>
             @endif
-
         </ul>
     </nav>
 </div>