Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/cydrobolt/polr.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChaoyi Zha <summermontreal@gmail.com>2016-12-28 17:52:35 +0300
committerChaoyi Zha <summermontreal@gmail.com>2016-12-28 17:52:35 +0300
commita3c697a865bd8f8ec1bc3174eca6711ac9e30eb2 (patch)
tree9ca00dba9ecb7cae61ac297a365840dd627c0eda
parentfb9a79c6bf9dc17c920ab6cb72ac6ad3d69f1298 (diff)
Fix small bugs & styling
-rw-r--r--app/Http/Controllers/StatsController.php3
-rw-r--r--public/css/stats.css4
-rw-r--r--resources/views/link_stats.blade.php2
-rw-r--r--resources/views/snippets/navbar.blade.php20
4 files changed, 16 insertions, 13 deletions
diff --git a/app/Http/Controllers/StatsController.php b/app/Http/Controllers/StatsController.php
index ec72562..edf2d44 100644
--- a/app/Http/Controllers/StatsController.php
+++ b/app/Http/Controllers/StatsController.php
@@ -51,13 +51,14 @@ class StatsController extends Controller {
$link = Link::where('short_url', $short_url)
->first();
- $link_id = $link->id;
// Return 404 if link not found
if ($link == null) {
return redirect(route('admin'))->with('error', 'Cannot show stats for nonexistent link.');
}
+ $link_id = $link->id;
+
if ( (session('username') != $link->creator) && !self::currIsAdmin() ) {
return redirect(route('admin'))->with('error', 'You do not have permission to view stats for this link.');
}
diff --git a/public/css/stats.css b/public/css/stats.css
index 9f1eb51..d012685 100644
--- a/public/css/stats.css
+++ b/public/css/stats.css
@@ -10,3 +10,7 @@
width: 100%;
height: 32em;
}
+
+.ng-root {
+ margin-bottom: 4em;
+}
diff --git a/resources/views/link_stats.blade.php b/resources/views/link_stats.blade.php
index f5f3e8c..df3e59b 100644
--- a/resources/views/link_stats.blade.php
+++ b/resources/views/link_stats.blade.php
@@ -59,8 +59,6 @@
</div>
</div>
-
-
</div>
@endsection
diff --git a/resources/views/snippets/navbar.blade.php b/resources/views/snippets/navbar.blade.php
index 02a6ede..2329bc4 100644
--- a/resources/views/snippets/navbar.blade.php
+++ b/resources/views/snippets/navbar.blade.php
@@ -9,21 +9,21 @@
<!-- Output sign in/sign out buttons appropriately -->
<div class="navbar-header">
- <a class="navbar-brand" href="{{route('index')}}">{{env('APP_NAME')}}</a>
+ <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><a href="{{ route('about') }}">About</a></li>
@if (empty(session('username')))
- <li class="visible-xs"><a href="{{route('login')}}">Sign In</a></li>
+ <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>
+ <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>
+ <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>
@@ -52,9 +52,9 @@
<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>
+ <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>