Merge pull request #242 from tidusjar/dev

1.7.2

PlexRequests.Services/Notification/EmailMessageNotification.cs

@@ -84,11 +84,8 @@ namespace PlexRequests.Services.Notification
                 case NotificationType.Test:
                     await EmailTest(model, emailSettings);
                     break;
-
-                default:
-                    throw new ArgumentOutOfRangeException();
             }
-            
+
         }
 
         private EmailNotificationSettings GetConfiguration()
@@ -168,7 +165,7 @@ namespace PlexRequests.Services.Notification
                     // Note: since we don't have an OAuth2 token, disable
                     // the XOAUTH2 authentication mechanism.
                     client.AuthenticationMechanisms.Remove("XOAUTH2");
-                    
+
                     client.Authenticate(settings.EmailUsername, settings.EmailPassword);
 
                     await client.SendAsync(message);
@@ -185,7 +182,7 @@ namespace PlexRequests.Services.Notification
         {
             var message = new MimeMessage
             {
-                Body = new TextPart("plain") {Text= "This is just a test! Success!"},
+                Body = new TextPart("plain") { Text = "This is just a test! Success!" },
                 Subject = "Plex Requests: Test Message!",
             };
             message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));

PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.css

@@ -14,6 +14,14 @@
   .home {
     padding-top: 4rem; } }
 
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+  color: #fff; }
+
+hr {
+  border-color: #777; }
+
 .btn {
   border-radius: 0.25rem !important; }
 
@@ -219,7 +227,7 @@ label {
   position: absolute;
   right: 45px;
   z-index: 3;
-  top: 13px;
+  top: 10px;
   box-shadow: 0 0 0; }
 
 .input-group-addon .btn-group .btn {
@@ -238,9 +246,10 @@ label {
   padding: 12px 8px; }
 
 #updateAvailable {
-  background-color: #ffa400;
+  background-color: #df691a;
   text-align: center;
-  font-size: 15px; }
+  font-size: 15px;
+  padding: 3px 0; }
 
 .checkbox label {
   display: inline-block;

PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.scss

@@ -33,6 +33,16 @@ $i:
     }
 }
 
+.navbar-default .navbar-nav > .active > a, 
+.navbar-default .navbar-nav > .active > a:hover, 
+.navbar-default .navbar-nav > .active > a:focus {
+    color: #fff;
+}
+
+hr {
+    border-color: #777;
+}
+
 .btn {
     border-radius: .25rem $i;
 }
@@ -279,7 +289,7 @@ $border-radius: 10px;
     position: absolute;
     right: 45px;
     z-index: 3;
-    top: 13px;
+    top: 10px;
     box-shadow: 0 0 0;
 }
 
@@ -303,9 +313,10 @@ $border-radius: 10px;
 }
 
 #updateAvailable {
-    background-color:  rgb(255, 164, 0);
+    background-color: #df691a;
     text-align: center;
     font-size: 15px;
+    padding: 3px 0;
 }
 
 .checkbox label {

PlexRequests.UI/Content/Themes/PlexBootstrapCustom.css

@@ -14,6 +14,17 @@
   .home {
     padding-top: 4rem; } }
 
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+  color: #fff; }
+
+hr {
+  border-color: #777; }
+
+body.update-available {
+  margin-top: 80px; }
+
 .btn {
   border-radius: 0.25rem !important; }
 
@@ -219,7 +230,7 @@ label {
   position: absolute;
   right: 45px;
   z-index: 3;
-  top: 13px;
+  top: 10px;
   box-shadow: 0 0 0; }
 
 .input-group-addon .btn-group .btn {
@@ -238,9 +249,10 @@ label {
   padding: 12px 8px; }
 
 #updateAvailable {
-  background-color: #ffa400;
+  background-color: #df691a;
   text-align: center;
-  font-size: 15px; }
+  font-size: 15px;
+  padding: 3px 0; }
 
 .checkbox label {
   display: inline-block;

PlexRequests.UI/Content/Themes/PlexBootstrapCustom.scss

@@ -34,6 +34,20 @@ $i:
     }
 }
 
+.navbar-default .navbar-nav > .active > a, 
+.navbar-default .navbar-nav > .active > a:hover, 
+.navbar-default .navbar-nav > .active > a:focus {
+    color: #fff;
+}
+
+hr {
+    border-color: #777;
+}
+
+body.update-available {
+    margin-top: 80px;
+}
+
 .btn {
     border-radius: .25rem $i;
 }
@@ -280,7 +294,7 @@ $border-radius: 10px;
     position: absolute;
     right: 45px;
     z-index: 3;
-    top: 13px;
+    top: 10px;
     box-shadow: 0 0 0;
 }
 
@@ -304,9 +318,10 @@ $border-radius: 10px;
 }
 
 #updateAvailable {
-    background-color:  rgb(255, 164, 0);
+    background-color: #df691a;
     text-align: center;
     font-size: 15px;
+    padding: 3px 0;
 }
 
 .checkbox label {

PlexRequests.UI/Modules/ApprovalModule.cs

@@ -50,7 +50,7 @@ namespace PlexRequests.UI.Modules
             ISettingsService<SonarrSettings> sonarrSettings, ISickRageApi srApi, ISettingsService<SickRageSettings> srSettings,
             ISettingsService<HeadphonesSettings> hpSettings, IHeadphonesApi hpApi, ISettingsService<PlexRequestSettings> pr) : base("approval", pr)
         {
-			this.RequiresClaims(UserClaims.Admin, UserClaims.PowerUser);
+			this.RequiresClaims(UserClaims.Admin);
 
             Service = service;
             CpService = cpService;

PlexRequests.UI/PlexRequests.UI.csproj

@@ -499,7 +499,7 @@
     <Content Include="Views\Admin\Headphones.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Views\Admin\SlackNotifications.cshtml">
+    <Content Include="Views\AdminNotifications\SlackNotifications.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="Web.Debug.config">

PlexRequests.UI/Views/Admin/Authentication.cshtml

@@ -122,11 +122,10 @@
 
         $('#requestToken').click(function (e) {
             e.preventDefault();
-            var url = createBaseUrl(base, "admin/requestauth");
             var $form = $("#mainForm");
             $.ajax({
                 type: $form.prop("method"),
-                url: url,
+                url: "requestauth",
                 data: $form.serialize(),
                 dataType: "json",
                 success: function (response) {
@@ -149,8 +148,7 @@
 
         function loadUserList() {
             $('#users').html("");
-            var url = "admin/getusers";
+            var url = "getusers";
-            url = createBaseUrl(base, url);
             $.ajax({
                 type: "Get",
                 url: url,

PlexRequests.UI/Views/Shared/_Layout.cshtml

@@ -97,6 +97,7 @@
                     var status = createBaseUrl(urlBase, '/admin/status');
                     $('#updateAvailable').html("<i class='fa fa-cloud-download' aria-hidden='true'></i> There is a new update available! Click <a style='color: white' href='" + status + "'>Here!</a>");
                     $('#updateAvailable').removeAttr("hidden");
+                    $('body').addClass('update-available')
                 }
             },
             error: function (e) {

appveyor.yml

@@ -3,9 +3,9 @@ configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '1.7.1'
+  assembly_version: '1.7.2'
   assembly_file_version: '{version}'
-  assembly_informational_version: '1.7.1' 
+  assembly_informational_version: '1.7.2' 
 before_build:
 - cmd: appveyor-retry nuget restore
 build: