Admins can manage sponsors, and other admin UX changes

Summary:
* New "Manage Sponsors" section in the admin area
* Other UX updates in the admin area

Resolves T239, T227, T240

Test Plan:
* Check the Manage Sponsors screen
* Make sure you can update the status of a sponsor
* Check rest of admin area against [the mockups](https://opengovfoundation.github.io/madison-mockups/admin/sponsors.html)

Reviewers: doshitan

Reviewed By: doshitan

Maniphest Tasks: T240, T239, T227

Differential Revision: https://phabricator.opengovfoundation.org/D140

Author: sethetter

app/Http/Controllers/AdminController.php

@@ -7,6 +7,7 @@
 use App\Models\Setting;
 use App\Models\User;
 use App\Models\Role;
+use App\Models\Sponsor;
 use App\Http\Requests\Admin as Requests;
 use SiteConfigSaver;
 
@@ -20,7 +21,23 @@ public function __construct()
     public function usersIndex(Requests\Users\Index $request)
     {
         $users = User::all();
-        return view('users.list', compact('users'));
+        return view('admin.manage-users', compact('users'));
+    }
+
+    public function sponsorsIndex(Requests\Sponsors\Index $request)
+    {
+        $limit = $request->input('limit', 10);
+        $sponsors = Sponsor::paginate($limit);
+        return view('admin.manage-sponsors', compact('sponsors'));
+    }
+
+    public function sponsorsPutStatus(Requests\Sponsors\PutStatus $request, Sponsor $sponsor)
+    {
+        $sponsor->status = $request->input('status');
+        $sponsor->save();
+
+        flash(trans('messages.sponsor.status_updated'));
+        return redirect()->route('admin.sponsors.index');
     }
 
     public function usersPostAdmin(Requests\Users\PostAdmin $request, User $user)
@@ -88,12 +105,18 @@ public function siteSettingsIndex(Requests\SiteSettings\Index $request)
             }
         }
 
+        // We have to put the key into the desc properties since `groupBy` gets rid of them
+        $groupedSettingsDesc = collect($allSettingsDesc)->map(function ($setting, $key) {
+            $setting['key'] = $key;
+            return $setting;
+        })->groupBy('group');
+
         // reset config() to full settings
         (new \App\Config\Bootstrap\LoadConfiguration())
             ->bootstrap(app());
 
         return view('admin.site-settings', compact([
-            'allSettingsDesc',
+            'groupedSettingsDesc',
             'currentSettings',
             'options',
         ]));
@@ -231,14 +254,17 @@ public static function getSiteSettingKeys()
     {
         return [
             'madison.date_format' => [
+                'group' => 'date_time',
                 'type' => 'select',
                 'choices' => static::validDateFormats(),
             ],
             'madison.time_format' => [
+                'group' => 'date_time',
                 'type' => 'select',
                 'choices' => static::validTimeFormats(),
             ],
             'madison.google_analytics_property_id' => [
+                'group' => 'google_analytics',
                 'type' => 'text',
             ],
         ];

app/Http/Controllers/SponsorController.php

@@ -103,15 +103,6 @@ public function update(Requests\Update $request, Sponsor $sponsor)
         }
     }
 
-    public function updateStatus(Requests\UpdateStatus $request, Sponsor $sponsor)
-    {
-        $sponsor->status = $request->input('status');
-        $sponsor->save();
-
-        flash(trans('messages.sponsor.status_updated'));
-        return redirect()->route('sponsors.index', ['sponsor' => $sponsor->id]);
-    }
-
     /**
      * Lists documents for a given sponsor.
      */

app/Http/Requests/Admin/Sponsors/Index.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Admin\Sponsors;
+
+use App\Http\Requests\AdminRequest;
+
+class Index extends AdminRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+
+}

app/Http/Requests/Admin/Sponsors/PutStatus.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Requests\Admin\Sponsors;
+
+use App\Models\Sponsor;
+use App\Http\Requests\AdminRequest;
+
+class PutStatus extends AdminRequest
+{
+    public function rules()
+    {
+        return [
+            'status' => 'in:' . implode(',', Sponsor::getStatuses()),
+        ];
+    }
+}

app/Http/Requests/Sponsor/UpdateStatus.php

@@ -42,7 +42,7 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-        $url = route('sponsors.index', ['id' => [$this->sponsorMember->sponsor->id]]);
+        $url = route('sponsors.documents.index', $this->sponsorMember->sponsor);
 
         return (new MailMessage)
                     ->subject(trans(static::baseMessageLocation().'.added_to_sponsor', [

app/Notifications/AddedToSponsor.php

@@ -42,7 +42,7 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-        $url = route('sponsors.index', ['all' => 'true', 'id' => [$this->sponsor->id]]);
+        $url = route('admin.sponsors.index');
 
         return (new MailMessage)
                     ->subject(trans(static::baseMessageLocation().'.subject', ['name' => $this->sponsor->name]))

app/Notifications/SponsorNeedsApproval.php

@@ -15,7 +15,7 @@ $(function () {
   });
 
   $.fn.select2.defaults.set('theme', 'bootstrap');
-  $('select').select2();
+  $('select:not(.no-select2)').select2();
 });
 
 window.loadTranslations = function (msgIds) {

resources/assets/js/app.js

@@ -224,7 +224,7 @@
 
         'status' => 'Status',
         'statuses' => [
-            \App\Models\Sponsor::STATUS_ACTIVE => 'Active',
+            \App\Models\Sponsor::STATUS_ACTIVE => 'Approved',
             \App\Models\Sponsor::STATUS_PENDING => 'Pending',
         ],
 
@@ -403,16 +403,21 @@
         'admin_label' => 'Site Administration: :page',
         'featured_documents' => 'Featured Documents',
         'manage_users' => 'Manage Users',
+        'manage_sponsors' => 'Manage Sponsors',
         'updated_featured_documents' => 'Feature documents updated',
         'site_settings' => 'Site Settings',
         'custom_pages' => 'Custom Pages',
         'pages' => 'Pages',
         'add_featured_document' => 'Add Featured Document',
 
+        'setting_groups' => [
+            'date_time' => 'Date & Time',
+            'google_analytics' => 'Google Analytics',
+        ],
         'madison' => [
             'date_format' => 'Date Format',
             'time_format' => 'Time Format',
-            'google_analytics_property_id' => 'Google Analytics Property Id',
+            'google_analytics_property_id' => 'Google Analytics Key',
             'google_analytics_property_id_help' => 'The UA-XXXXX-Y string identifying which Google Analytics property you wish to track traffic against',
         ],
     ],

resources/lang/en/messages.php

@@ -0,0 +1,20 @@
+@extends('layouts.app')
+
+@section('pageTitle', trans('messages.admin.manage_sponsors'))
+
+@section('content')
+    <div class="page-header">
+        <h1>{{ trans('messages.sponsor.list') }}</h1>
+        @include('components.breadcrumbs.admin')
+    </div>
+
+    @include('components.errors')
+
+    <div class="row">
+        @include('admin.partials.admin-sidebar')
+
+        <div class="col-md-9">
+            @include('sponsors.partials.table', ['sponsors' => $sponsors])
+        </div>
+    </div>
+@endsection