diff --git a/app/Http/Controllers/ForumCategoryController.php b/app/Http/Controllers/ForumCategoryController.php new file mode 100644 index 000000000..721c8ea00 --- /dev/null +++ b/app/Http/Controllers/ForumCategoryController.php @@ -0,0 +1,66 @@ +parent_id != 0) { + return redirect()->route('forums.show', ['id' => $forum->id]); + } + + // Check if the user has permission to view the forum + $category = Forum::findOrFail($forum->id); + if ($category->getPermission()->show_forum != true) { + return redirect()->route('forums.index') + ->withErrors('You Do Not Have Access To This Category!'); + } + + // Fetch topics->posts in descending order + $topics = $forum->sub_topics()->latest('pinned')->latest('last_reply_at')->latest()->paginate(25); + + return view('forum.category', [ + 'forum' => $forum, + 'topics' => $topics, + 'category' => $category, + 'num_posts' => $num_posts, + 'num_forums' => $num_forums, + 'num_topics' => $num_topics, + ]); + } +} diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 4b6590bb0..6b5118435 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -331,13 +331,13 @@ class ForumController extends Controller } /** - * Show The Forum Category. + * Show Forums And Topics Inside. * * @param $id * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function category($id) + public function show($id) { // Find the topic $forum = Forum::findOrFail($id); @@ -350,21 +350,21 @@ class ForumController extends Controller $num_topics = Topic::count(); // Check if this is a category or forum - if ($forum->parent_id != 0) { - return redirect()->route('forum_display', ['id' => $forum->id]); + if ($forum->parent_id == 0) { + return redirect()->route('forums.categories.show', ['id' => $forum->id]); } // Check if the user has permission to view the forum - $category = Forum::findOrFail($forum->id); + $category = Forum::findOrFail($forum->parent_id); if ($category->getPermission()->show_forum != true) { - return redirect()->route('forum_index') - ->withErrors('You Do Not Have Access To This Category!'); + return redirect()->route('forums.index') + ->withErrors('You Do Not Have Access To This Forum!'); } // Fetch topics->posts in descending order - $topics = $forum->sub_topics()->latest('pinned')->latest('last_reply_at')->latest()->paginate(25); + $topics = $forum->topics()->latest('pinned')->latest('last_reply_at')->latest()->paginate(25); - return view('forum.category', [ + return view('forum.display', [ 'forum' => $forum, 'topics' => $topics, 'category' => $category, diff --git a/app/Http/Controllers/InviteController.php b/app/Http/Controllers/InviteController.php index 33d525163..901f2e2d1 100644 --- a/app/Http/Controllers/InviteController.php +++ b/app/Http/Controllers/InviteController.php @@ -23,6 +23,25 @@ use Illuminate\Support\Facades\Mail; class InviteController extends Controller { + /** + * Invite Tree. + * + * @param \Illuminate\Http\Request $request + * @param $username + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index(Request $request, $username) + { + $user = $request->user(); + $owner = User::where('username', '=', $username)->firstOrFail(); + abort_unless($user->group->is_modo || $user->id === $owner->id, 403); + + $invites = Invite::with(['sender', 'receiver'])->where('user_id', '=', $owner->id)->latest()->paginate(25); + + return view('user.invites', ['owner' => $owner, 'invites' => $invites, 'route' => 'invite']); + } + /** * Invite Form. * @@ -30,7 +49,7 @@ class InviteController extends Controller * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function invite(Request $request) + public function create(Request $request) { $user = $request->user(); @@ -58,7 +77,7 @@ class InviteController extends Controller * @return Illuminate\Http\RedirectResponse * @throws \Exception */ - public function process(Request $request) + public function store(Request $request) { $current = new Carbon(); $user = $request->user(); @@ -69,14 +88,14 @@ class InviteController extends Controller } if ($user->invites <= 0) { - return redirect()->route('invite') + return redirect()->route('invites.create') ->withErrors('You do not have enough invites!'); } $exist = Invite::where('email', '=', $request->input('email'))->first(); if ($exist) { - return redirect()->route('invite') + return redirect()->route('invites.create') ->withErrors('The email address your trying to send a invite to has already been sent one.'); } @@ -106,7 +125,7 @@ class InviteController extends Controller } if ($v->fails()) { - return redirect()->route('invite') + return redirect()->route('invites.create') ->withErrors($v->errors()); } else { Mail::to($request->input('email'))->send(new InviteUser($invite)); @@ -118,7 +137,7 @@ class InviteController extends Controller // Activity Log \LogActivity::addToLog("Member {$user->username} has sent a invite to {$invite->email} ."); - return redirect()->route('invite') + return redirect()->route('invites.create') ->withSuccess('Invite was sent successfully!'); } } @@ -131,7 +150,7 @@ class InviteController extends Controller * * @return Illuminate\Http\RedirectResponse */ - public function reProcess(Request $request, $id) + public function send(Request $request, $id) { $user = $request->user(); $invite = Invite::findOrFail($id); @@ -139,7 +158,7 @@ class InviteController extends Controller abort_unless($invite->user_id === $user->id, 403); if ($invite->accepted_by !== null) { - return redirect()->route('user_invites', ['id' => $user->id]) + return redirect()->route('invites.index', ['username' => $user->username]) ->withErrors('The invite you are trying to resend has already been used.'); } @@ -148,26 +167,7 @@ class InviteController extends Controller // Activity Log \LogActivity::addToLog("Member {$user->username} has resent invite to {$invite->email} ."); - return redirect()->route('user_invites', ['id' => $user->id]) + return redirect()->route('invites.index', ['username' => $user->username]) ->withSuccess('Invite was resent successfully!'); } - - /** - * Invite Tree. - * - * @param \Illuminate\Http\Request $request - * @param $username - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function invites(Request $request, $username) - { - $user = $request->user(); - $owner = User::where('username', '=', $username)->firstOrFail(); - abort_unless($user->group->is_modo || $user->id === $owner->id, 403); - - $invites = Invite::with(['sender', 'receiver'])->where('user_id', '=', $owner->id)->latest()->paginate(25); - - return view('user.invites', ['owner' => $owner, 'invites' => $invites, 'route' => 'invite']); - } } diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php index 763b2698f..7c5db7e97 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -48,7 +48,7 @@ class PostController extends Controller // The user has the right to create a post here? if (! $category->getPermission()->reply_topic || ($topic->state == 'close' && ! $request->user()->group->is_modo)) { - return redirect()->route('forum_index') + return redirect()->route('forums.index') ->withErrors('You Cannot Reply To This Topic!'); } diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index a2b6e740d..92e1b0819 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -78,7 +78,8 @@ class RssController extends Controller 'torrent_repository' => $torrent_repository, 'categories' => Category::all()->sortBy('position'), 'types' => Type::all()->sortBy('position'), - 'user' => $user, ]); + 'user' => $user, + ]); } /** diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php index 3c315e663..86a0f20bd 100644 --- a/app/Http/Controllers/SubscriptionController.php +++ b/app/Http/Controllers/SubscriptionController.php @@ -102,7 +102,7 @@ class SubscriptionController extends Controller $params = []; } if (! isset($logger)) { - $logger = 'forum_display'; + $logger = 'forums.show'; $params = ['id' => $forum->id]; } @@ -136,7 +136,7 @@ class SubscriptionController extends Controller $params = []; } if (! isset($logger)) { - $logger = 'forum_display'; + $logger = 'forums.show'; $params = ['id' => $forum->id]; } diff --git a/app/Http/Controllers/TopicController.php b/app/Http/Controllers/TopicController.php index 7586d907b..ccdbf8708 100644 --- a/app/Http/Controllers/TopicController.php +++ b/app/Http/Controllers/TopicController.php @@ -33,50 +33,6 @@ use App\Achievements\UserMadeFirstPost; class TopicController extends Controller { - /** - * Show Forums And Topics Inside. - * - * @param $id - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function display($id) - { - // Find the topic - $forum = Forum::findOrFail($id); - - // Total Forums Count - $num_forums = Forum::count(); - // Total Posts Count - $num_posts = Post::count(); - // Total Topics Count - $num_topics = Topic::count(); - - // Check if this is a category or forum - if ($forum->parent_id == 0) { - return redirect()->route('forum_category', ['id' => $forum->id]); - } - - // Check if the user has permission to view the forum - $category = Forum::findOrFail($forum->parent_id); - if ($category->getPermission()->show_forum != true) { - return redirect()->route('forum_index') - ->withErrors('You Do Not Have Access To This Forum!'); - } - - // Fetch topics->posts in descending order - $topics = $forum->topics()->latest('pinned')->latest('last_reply_at')->latest()->paginate(25); - - return view('forum.display', [ - 'forum' => $forum, - 'topics' => $topics, - 'category' => $category, - 'num_posts' => $num_posts, - 'num_forums' => $num_forums, - 'num_topics' => $num_topics, - ]); - } - /** * Show The Topic. * @@ -104,7 +60,7 @@ class TopicController extends Controller // The user can post a topic here ? if ($category->getPermission()->read_topic != true) { // Redirect him to the forum index - return redirect()->route('forum_index') + return redirect()->route('forums.index') ->withErrors('You Do Not Have Access To Read This Topic!'); } @@ -136,7 +92,7 @@ class TopicController extends Controller // The user has the right to create a topic here? if ($category->getPermission()->start_topic != true) { - return redirect()->route('forum_index') + return redirect()->route('forums.index') ->withErrors('You Cannot Start A New Topic Here!'); } @@ -163,7 +119,7 @@ class TopicController extends Controller // The user has the right to create a topic here? if ($category->getPermission()->start_topic != true) { - return redirect()->route('forum_index') + return redirect()->route('forums.index') ->withErrors('You Cannot Start A New Topic Here!'); } @@ -193,7 +149,7 @@ class TopicController extends Controller ]); if ($v->fails()) { - return redirect()->route('forum_index') + return redirect()->route('forums.index') ->withErrors($v->errors()); } else { $topic->save(); @@ -210,7 +166,7 @@ class TopicController extends Controller ]); if ($v->fails()) { - return redirect()->route('forum_index') + return redirect()->route('forums.index') ->withErrors($v->errors()); } else { $post->save(); @@ -354,7 +310,7 @@ class TopicController extends Controller $posts->delete(); $topic->delete(); - return redirect()->route('forum_display', ['id' => $topic->forum->id]) + return redirect()->route('forums.show', ['id' => $topic->forum->id]) ->withSuccess('This Topic Is Now Deleted!'); } diff --git a/app/Http/Controllers/TopicLabelController.php b/app/Http/Controllers/TopicLabelController.php index de2e4166d..4d518af0b 100644 --- a/app/Http/Controllers/TopicLabelController.php +++ b/app/Http/Controllers/TopicLabelController.php @@ -18,13 +18,13 @@ use App\Models\Topic; class TopicLabelController extends Controller { /** - * Forum Tag System. + * Apply/Remove Approved Label. * * @param $id * * @return Illuminate\Http\RedirectResponse */ - public function approvedTopic($id) + public function approve($id) { $topic = Topic::findOrFail($id); if ($topic->approved == 0) { @@ -38,7 +38,14 @@ class TopicLabelController extends Controller ->withInfo('Label Change Has Been Applied'); } - public function deniedTopic($id) + /** + * Apply/Remove Denied Label. + * + * @param $id + * + * @return Illuminate\Http\RedirectResponse + */ + public function deny($id) { $topic = Topic::findOrFail($id); if ($topic->denied == 0) { @@ -52,7 +59,14 @@ class TopicLabelController extends Controller ->withInfo('Label Change Has Been Applied'); } - public function solvedTopic($id) + /** + * Apply/Remove Solved Label. + * + * @param $id + * + * @return Illuminate\Http\RedirectResponse + */ + public function solve($id) { $topic = Topic::findOrFail($id); if ($topic->solved == 0) { @@ -66,7 +80,14 @@ class TopicLabelController extends Controller ->withInfo('Label Change Has Been Applied'); } - public function invalidTopic($id) + /** + * Apply/Remove Invalid Label. + * + * @param $id + * + * @return Illuminate\Http\RedirectResponse + */ + public function invalid($id) { $topic = Topic::findOrFail($id); if ($topic->invalid == 0) { @@ -80,7 +101,14 @@ class TopicLabelController extends Controller ->withInfo('Label Change Has Been Applied'); } - public function bugTopic($id) + /** + * Apply/Remove Bug Label. + * + * @param $id + * + * @return Illuminate\Http\RedirectResponse + */ + public function bug($id) { $topic = Topic::findOrFail($id); if ($topic->bug == 0) { @@ -94,7 +122,14 @@ class TopicLabelController extends Controller ->withInfo('Label Change Has Been Applied'); } - public function suggestionTopic($id) + /** + * Apply/Remove Suggestion Label. + * + * @param $id + * + * @return Illuminate\Http\RedirectResponse + */ + public function suggest($id) { $topic = Topic::findOrFail($id); if ($topic->suggestion == 0) { @@ -108,7 +143,14 @@ class TopicLabelController extends Controller ->withInfo('Label Change Has Been Applied'); } - public function implementedTopic($id) + /** + * Apply/Remove Implemented Label. + * + * @param $id + * + * @return Illuminate\Http\RedirectResponse + */ + public function implement($id) { $topic = Topic::findOrFail($id); if ($topic->implemented == 0) { diff --git a/resources/js/wysibb/preset/phpbb3.js b/resources/js/wysibb/preset/phpbb3.js index a111ac9df..6947e1313 100644 --- a/resources/js/wysibb/preset/phpbb3.js +++ b/resources/js/wysibb/preset/phpbb3.js @@ -39,7 +39,7 @@ WBBPRESET = { { title: CURLANG.add_attach, html: - '
', }, diff --git a/resources/lang/en/staff.php b/resources/lang/en/staff.php index 7dbabc9e6..53cb683a2 100644 --- a/resources/lang/en/staff.php +++ b/resources/lang/en/staff.php @@ -28,8 +28,10 @@ return [ 'please-moderate' => 'Please Moderate This Torrent!', 'polls' => 'Polls', 'reports-log' => 'Reports Log', + 'rooms' => 'Rooms', 'rss' => 'RSS', 'staff-dashboard' => 'Staff Dashboard', + 'statuses' => 'Statuses', 'torrent-categories' => 'Torrent Categories', 'torrent-moderation' => 'Torrent Moderation', 'torrent-tools' => 'Torrent Tools', diff --git a/resources/views/Staff/application/index.blade.php b/resources/views/Staff/application/index.blade.php index c939544b4..40ef1e4cf 100644 --- a/resources/views/Staff/application/index.blade.php +++ b/resources/views/Staff/application/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Applications - Staff Dashboard - {{ config('other.title') }} + Applications - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -32,7 +32,7 @@ @lang('common.no') - User + @lang('common.user') Email Type Image Proofs @@ -40,7 +40,7 @@ Created On Status Moderated By - Action + @lang('common.action') diff --git a/resources/views/Staff/application/show.blade.php b/resources/views/Staff/application/show.blade.php index ae14b189e..4afbf0133 100644 --- a/resources/views/Staff/application/show.blade.php +++ b/resources/views/Staff/application/show.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Application - Staff Dashboard - {{ config('other.title') }} + Application - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -123,13 +123,13 @@ @else - Action + @lang('common.action')
  • @@ -36,10 +36,10 @@ URL Method IP - User Agent + @lang('common.user') Agent Username Created On - Action + @lang('common.action') diff --git a/resources/views/Staff/authentication/index.blade.php b/resources/views/Staff/authentication/index.blade.php index 303928ef8..43675db35 100644 --- a/resources/views/Staff/authentication/index.blade.php +++ b/resources/views/Staff/authentication/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Failed Login Log - Staff Dashboard - {{ config('other.title') }} + Failed Login Log - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -34,7 +34,7 @@ # - User ID + @lang('common.user') ID Username IP Address Created On diff --git a/resources/views/Staff/backup/index.blade.php b/resources/views/Staff/backup/index.blade.php index dd6321732..00062218a 100644 --- a/resources/views/Staff/backup/index.blade.php +++ b/resources/views/Staff/backup/index.blade.php @@ -1,18 +1,18 @@ @extends('layout.default') @section('title') - @lang('backup.backup') @lang('backup.manager') - Staff Dashboard + <title>@lang('backup.backup') @lang('backup.manager') - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • diff --git a/resources/views/Staff/ban/index.blade.php b/resources/views/Staff/ban/index.blade.php index 6fcc36d7f..63c3e73e1 100644 --- a/resources/views/Staff/ban/index.blade.php +++ b/resources/views/Staff/ban/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Bans - Staff Dashboard - {{ config('other.title') }} + Bans - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -24,7 +24,7 @@ @section('content')
    -

    User Bans

    +

    @lang('common.user') Bans

    @@ -34,7 +34,7 @@ ID - User + @lang('common.user') Judge Ban Reason Unban Reason diff --git a/resources/views/Staff/category/create.blade.php b/resources/views/Staff/category/create.blade.php index 75508be4d..7e3bd1680 100755 --- a/resources/views/Staff/category/create.blade.php +++ b/resources/views/Staff/category/create.blade.php @@ -3,12 +3,12 @@ @section('breadcrumb')
  • @@ -24,13 +24,13 @@
    @csrf
    - +
    - + diff --git a/resources/views/Staff/category/edit.blade.php b/resources/views/Staff/category/edit.blade.php index e52298a5e..9822b6ad8 100755 --- a/resources/views/Staff/category/edit.blade.php +++ b/resources/views/Staff/category/edit.blade.php @@ -3,37 +3,37 @@ @section('breadcrumb')
    • @endsection @section('content')
    -

    Edit A Category

    +

    @lang('common.edit') A Category

    @method('PATCH') @csrf
    - +
    - + diff --git a/resources/views/Staff/category/index.blade.php b/resources/views/Staff/category/index.blade.php index 9e6e25d2e..700a8bb01 100755 --- a/resources/views/Staff/category/index.blade.php +++ b/resources/views/Staff/category/index.blade.php @@ -3,12 +3,12 @@ @section('breadcrumb')
    • @endsection @@ -22,8 +22,8 @@ - - + + @@ -31,7 +31,7 @@ - + @@ -90,12 +90,12 @@ diff --git a/resources/views/Staff/chat/bot/edit.blade.php b/resources/views/Staff/chat/bot/edit.blade.php index f1e88593b..9b345098e 100644 --- a/resources/views/Staff/chat/bot/edit.blade.php +++ b/resources/views/Staff/chat/bot/edit.blade.php @@ -7,7 +7,7 @@ @section('breadcrumb')
  • diff --git a/resources/views/Staff/chat/bot/index.blade.php b/resources/views/Staff/chat/bot/index.blade.php index d9433b3ab..9c2d75320 100644 --- a/resources/views/Staff/chat/bot/index.blade.php +++ b/resources/views/Staff/chat/bot/index.blade.php @@ -3,7 +3,7 @@ @section('breadcrumb')
  • @@ -21,12 +21,12 @@
    • PositionName@lang('common.position')@lang('common.name') Icon Image Movie MetaGame Meta Music Meta No MetaAction@lang('common.action')
    - Edit + @lang('common.edit') @csrf @method('DELETE') - +
    - - + + - + diff --git a/resources/views/Staff/chat/room/chatroom_modals.blade.php b/resources/views/Staff/chat/room/chatroom_modals.blade.php index b13984d46..864d7ea8f 100644 --- a/resources/views/Staff/chat/room/chatroom_modals.blade.php +++ b/resources/views/Staff/chat/room/chatroom_modals.blade.php @@ -4,18 +4,18 @@
    -

    Edit Chatroom ({{ $chatroom->name }})

    +

    @lang('common.edit') Chatroom ({{ $chatroom->name }})

    @csrf

    Please enter the new name you want to use for {{ $chatroom->name }}

    - +
    - +
    @@ -30,17 +30,18 @@
    -

    Delete Chatroom ({{ $chatroom->name }}) Permanently

    +

    @lang('common.delete') Chatroom ({{ $chatroom->name }}) Permanently

    @csrf + @method('DELETE')

    Are you sure about this ?

    - +
    diff --git a/resources/views/Staff/chat/room/index.blade.php b/resources/views/Staff/chat/room/index.blade.php index 0da126b31..8fb471b67 100644 --- a/resources/views/Staff/chat/room/index.blade.php +++ b/resources/views/Staff/chat/room/index.blade.php @@ -3,7 +3,7 @@ @section('breadcrumb')
  • @@ -31,11 +31,11 @@ @csrf

    Please enter the name of the chatroom you would like to create.

    - +
    - +
    @@ -49,8 +49,8 @@
    • - - + + diff --git a/resources/views/Staff/chat/status/chatstatuses_modals.blade.php b/resources/views/Staff/chat/status/chatstatuses_modals.blade.php index fc77f69e8..c578e35f1 100644 --- a/resources/views/Staff/chat/status/chatstatuses_modals.blade.php +++ b/resources/views/Staff/chat/status/chatstatuses_modals.blade.php @@ -4,20 +4,20 @@
    -

    Edit Chat Status ({{ $chatstatus->name }})

    +

    @lang('common.edit') Chat Status ({{ $chatstatus->name }})

    @csrf

    Please enter the new settings you want to use for {{ $chatstatus->name }}

    - +
    - +
    @@ -32,17 +32,18 @@
    -

    Delete Chat Status ({{ $chatstatus->name }}) Permanently

    +

    @lang('common.delete') Chat Status ({{ $chatstatus->name }}) Permanently

    @csrf + @method('DELETE')

    Are you sure about this ?

    - +
    diff --git a/resources/views/Staff/chat/status/index.blade.php b/resources/views/Staff/chat/status/index.blade.php index d2b72b4c0..ecaf49e62 100644 --- a/resources/views/Staff/chat/status/index.blade.php +++ b/resources/views/Staff/chat/status/index.blade.php @@ -1,10 +1,9 @@ -@@ -1,158 +0,0 @@ @extends('layout.default') @section('breadcrumb')
  • @@ -16,7 +15,7 @@ @section('content')
    -

    User Chat Statuses

    +

    @lang('common.user') Chat Statuses

    {{--Add Chatroom Modal--}} @@ -32,13 +31,13 @@ @csrf

    Please fill in all fields for the chat status you would like to create.

    - +
    - +
    @@ -52,10 +51,10 @@
    • - + - + diff --git a/resources/views/Staff/cheater/index.blade.php b/resources/views/Staff/cheater/index.blade.php index fa4fc7820..ea47ef87c 100644 --- a/resources/views/Staff/cheater/index.blade.php +++ b/resources/views/Staff/cheater/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Possible Leech Cheaters - Staff Dashboard - {{ config('other.title') }} + Possible Leech Cheaters - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -33,7 +33,7 @@
    • NamePosition@lang('common.name')@lang('common.position') Icon Command StatusAction@lang('common.action')
    IDNameAction@lang('common.name')@lang('common.action')
    IDName@lang('common.name') Color IconAction@lang('common.action')
    - + diff --git a/resources/views/Staff/command/index.blade.php b/resources/views/Staff/command/index.blade.php index 8c8fc3382..bdc46b3e4 100644 --- a/resources/views/Staff/command/index.blade.php +++ b/resources/views/Staff/command/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Commands - Staff Dashboard - {{ config('other.title') }} + Commands - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • diff --git a/resources/views/Staff/dashboard/index.blade.php b/resources/views/Staff/dashboard/index.blade.php index 54666a5e1..04c92c5d0 100644 --- a/resources/views/Staff/dashboard/index.blade.php +++ b/resources/views/Staff/dashboard/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Staff Dashboard - {{ config('other.title') }} + @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
    • @endsection @@ -21,7 +21,7 @@
    -

    Staff Dashboard

    +

    @lang('staff.staff-dashboard')

    diff --git a/resources/views/Staff/forum/create.blade.php b/resources/views/Staff/forum/create.blade.php index 77b901dea..08ce989d8 100755 --- a/resources/views/Staff/forum/create.blade.php +++ b/resources/views/Staff/forum/create.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Add Forums - Staff Dashboard - {{ config('other.title') }} + Add Forums - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -64,7 +64,7 @@
    - + diff --git a/resources/views/Staff/forum/edit.blade.php b/resources/views/Staff/forum/edit.blade.php index a5228a307..d73309afa 100755 --- a/resources/views/Staff/forum/edit.blade.php +++ b/resources/views/Staff/forum/edit.blade.php @@ -1,29 +1,29 @@ @extends('layout.default') @section('title') - Edit Forums - Staff Dashboard - {{ config('other.title') }} + @lang('common.edit') Forums - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
    • @endsection @section('content')
    -

    Edit: {{ $forum->name }}

    +

    @lang('common.edit'): {{ $forum->name }}

    @csrf @@ -66,7 +66,7 @@
    - +
    User@lang('common.user') Group Joined Last Login
    - + - - + + - @foreach ($categories as $c) + @foreach ($categories as $category) + + + - - - - @foreach ($c->getForumsInCategory()->sortBy('position') as $f) + @foreach ($category->getForumsInCategory()->sortBy('position') as $forum) + + + - - - @endforeach @endforeach diff --git a/resources/views/Staff/gift/index.blade.php b/resources/views/Staff/gift/index.blade.php index 2db9d11b7..6a12c478e 100644 --- a/resources/views/Staff/gift/index.blade.php +++ b/resources/views/Staff/gift/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Gifting - Staff Dashboard - {{ config('other.title') }} + Gifting - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -24,7 +24,7 @@ @section('content')

    Gifts

    -
    + @csrf
    diff --git a/resources/views/Staff/group/create.blade.php b/resources/views/Staff/group/create.blade.php index 3d6b9f3d7..a627530f6 100644 --- a/resources/views/Staff/group/create.blade.php +++ b/resources/views/Staff/group/create.blade.php @@ -3,12 +3,12 @@ @section('breadcrumb')
  • @@ -28,8 +28,8 @@
    • Name@lang('common.name') TypePositionAction@lang('common.position')@lang('common.action')
    - {{ $c->name }} + {{ $category->name }} + + Category + + {{ $category->position }} + + + @csrf + @method('DELETE') + + Category{{ $c->position }}Delete
    - ---- {{ $f->name }} + ---- {{ $forum->name }} + + Forum + + {{ $forum->position }} + +
    + @csrf + @method('DELETE') + +
    		Forum{{ $f->position }}Delete
    - - + + @@ -51,12 +51,12 @@ diff --git a/resources/views/Staff/group/edit.blade.php b/resources/views/Staff/group/edit.blade.php index 065791fa8..ebe0855eb 100644 --- a/resources/views/Staff/group/edit.blade.php +++ b/resources/views/Staff/group/edit.blade.php @@ -3,18 +3,18 @@ @section('breadcrumb')
    • @endsection @@ -30,8 +30,8 @@
    NamePosition@lang('common.name')@lang('common.position') Level Color Icon
    - - + + diff --git a/resources/views/Staff/group/index.blade.php b/resources/views/Staff/group/index.blade.php index 42cc0fa8d..c08fe050a 100644 --- a/resources/views/Staff/group/index.blade.php +++ b/resources/views/Staff/group/index.blade.php @@ -3,12 +3,12 @@ @section('breadcrumb')
    • @endsection @@ -22,8 +22,8 @@ - - + + diff --git a/resources/views/Staff/invite/index.blade.php b/resources/views/Staff/invite/index.blade.php index b85740250..01791241e 100644 --- a/resources/views/Staff/invite/index.blade.php +++ b/resources/views/Staff/invite/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - Invites Log - Staff Dashboard - {{ config('other.title') }} + Invites Log - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • diff --git a/resources/views/Staff/logs/index.blade.php b/resources/views/Staff/logs/index.blade.php index 2ff932753..f1a9ff4f2 100755 --- a/resources/views/Staff/logs/index.blade.php +++ b/resources/views/Staff/logs/index.blade.php @@ -87,7 +87,7 @@ class="glyphicon glyphicon-download-alt"> Download file - Delete file + class="glyphicon glyphicon-trash"> @lang('common.delete') file diff --git a/resources/views/Staff/masspm/index.blade.php b/resources/views/Staff/masspm/index.blade.php index 743b746e1..38804ef14 100644 --- a/resources/views/Staff/masspm/index.blade.php +++ b/resources/views/Staff/masspm/index.blade.php @@ -1,17 +1,17 @@ @extends('layout.default') @section('title') - MassPM - Staff Dashboard - {{ config('other.title') }} + MassPM - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('meta') - + @endsection @section('breadcrumb')
  • @@ -24,7 +24,7 @@ @section('content')

    Mass PM

    - + @csrf
    diff --git a/resources/views/Staff/moderation/index.blade.php b/resources/views/Staff/moderation/index.blade.php index 0d2ac4958..7f1fb893c 100644 --- a/resources/views/Staff/moderation/index.blade.php +++ b/resources/views/Staff/moderation/index.blade.php @@ -1,13 +1,13 @@ @extends('layout.default') @section('title') - Moderation - Staff Dashboard - {{ config('other.title') }} + Moderation - @lang('staff.staff-dashboard') - {{ config('other.title') }} @endsection @section('breadcrumb')
  • @@ -24,7 +24,7 @@
    • - + @@ -61,7 +61,7 @@ {{-- Torrent Postpone Modal --}} - + - - + + @@ -206,17 +206,17 @@ class="{{ config('other.font-awesome') }} fa-thumbs-up">Approve + class="{{ config('other.font-awesome') }} fa-pencil">@lang('common.edit') - + @@ -285,8 +285,8 @@ - - + + @@ -322,7 +322,7 @@ {{-- Torrent Postpone Modal --}} + class="{{ config('other.font-awesome') }} fa-pencil">@lang('common.edit')
    NamePosition@lang('common.name')@lang('common.position') Level Color Icon
    IDNamePosition@lang('common.name')@lang('common.position') Level Color Icon
    SinceName@lang('common.name') Category Type Size
    SinceName@lang('common.name') Category Type Size Uploader Staff ApproveEditDelete@lang('common.edit')@lang('common.delete')
    Edit {{-- Torrent Delete Modal --}}
    SinceName@lang('common.name') Category Type SizeStaff Approve PostponeEditDelete@lang('common.edit')@lang('common.delete')
    Edit {{-- Torrent Delete Modal --}}