Clean up all route files, alias routes etc.

This commit is contained in:
James Brooks
2015-08-07 14:52:44 +01:00
parent 5858d8063b
commit cefabcef2d
14 changed files with 183 additions and 110 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
<br>
<form method="POST" action="{{ route('login', [], false) }}" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">
<form method="POST" action="{{ route('auth.login', [], false) }}" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@if(Session::has('error'))
@@ -21,6 +21,8 @@
</div>
<form method="POST" action="/auth/2fa" accept-charset="UTF-8">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
<p>{{ trans('dashboard.login.two-factor') }}</p>
@@ -12,7 +12,7 @@
<a role="menuitem" tabindex="-1" href="{{ url('dashboard/user') }}">{{ trans('dashboard.team.profile') }}</a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="{{ route('logout') }}">{{ trans('dashboard.logout') }}</a>
<a role="menuitem" tabindex="-1" href="{{ route('auth.logout') }}">{{ trans('dashboard.logout') }}</a>
</li>
</ul>
</div>
@@ -26,45 +26,45 @@
</div>
<ul>
<li {!! set_active('dashboard') !!}>
<a href="{{ route('dashboard') }}">
<a href="{{ route('dashboard.index') }}">
<i class="icon ion-speedometer"></i>
<span>{{ trans('dashboard.dashboard') }}</span>
</a>
</li>
<li {!! set_active('dashboard/incidents*') !!} {!! set_active('dashboard/schedule*') !!}>
<a href="{{ route('dashboard.incidents') }}">
<a href="{{ route('dashboard.incidents.index') }}">
<i class="icon ion-android-alert"></i>
<span>{{ trans('dashboard.incidents.incidents') }}</span>
<span class="label label-info">{{ $incident_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/templates*') !!}>
<a href="{{ route('dashboard.templates') }}">
<a href="{{ route('dashboard.templates.index') }}">
<i class="icons ion-document-text"></i>
<span>{{ trans('dashboard.incidents.incident-templates') }}</span>
</a>
</li>
<li {!! set_active('dashboard/components*') !!}>
<a href="{{ route('dashboard.components') }}">
<a href="{{ route('dashboard.components.index') }}">
<i class="icons ion-outlet"></i>
<span>{{ trans('dashboard.components.components') }}</span>
<span class="label label-info">{{ $component_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/team*') !!}>
<a href="{{ route('dashboard.team') }}">
<a href="{{ route('dashboard.team.index') }}">
<i class="icons ion-ios-people"></i>
<span>{{ trans('dashboard.team.team') }}</span>
</a>
</li>
<li {!! set_active('dashboard/metrics*') !!}>
<a href="{{ route('dashboard.metrics') }}">
<a href="{{ route('dashboard.metrics.index') }}">
<i class="icon ion-stats-bars"></i>
<span>{{ trans('dashboard.metrics.metrics') }}</span>
</a>
</li>
<li {!! set_active('dashboard/subscribers*') !!}>
<a href="{{ route('dashboard.subscribers') }}">
<a href="{{ route('dashboard.subscribers.index') }}">
<i class="icons ion-email"></i>
<span>{{ trans('dashboard.subscribers.subscribers') }}</span>
</a>
@@ -87,7 +87,7 @@
<a href="{{ route('status-page') }}"><i class="icon ion-monitor"></i></a>
</li>
<li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.logout') }}">
<a href="{{ route('logout') }}"><i class="icon ion-log-out"></i></a>
<a href="{{ route('auth.logout') }}"><i class="icon ion-log-out"></i></a>
</li>
</ul>
</div>
+2 -2
View File
@@ -14,8 +14,8 @@
@if($current_user)
<a href="/auth/logout" class="icon-link"><i class="ion-android-exit"></i> {{ trans('dashboard.logout') }}</a>
@endif
<a href="/rss" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a>
<a href="/atom" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.atom-feed') }}</a>
<a href="{{ route('feed.rss') }}" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a>
<a href="{{ route('feed.atom') }}" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.atom-feed') }}</a>
</div>
</div>
</div>