diff --git a/lib/thirdparty/LBRY.class.php b/lib/thirdparty/LBRY.class.php index 4c9e860a..a5547b01 100644 --- a/lib/thirdparty/LBRY.class.php +++ b/lib/thirdparty/LBRY.class.php @@ -5,6 +5,10 @@ class LBRY { public static function getApiUrl($endpoint) { + if (!strlen(Config::get(Config::LBRY_API_SERVER)) > 0) { + throw new Exception("API server URL is missing from `/data/config.php`"); + } + return Config::get(Config::LBRY_API_SERVER) . $endpoint; } @@ -27,7 +31,7 @@ class LBRY public static function editEmailSettings($token, $email, $isPrimary =null, $isEnabled = null) { - return Curl::post(static::getApiUrl('/user/email/edit'),['auth_token' => $token],['email' => $email],['is_primary' => $isPrimary],['is_enabled' => $isEnabled]); + return Curl::post(static::getApiUrl('/user/email/edit'), ['auth_token' => $token], ['email' => $email], ['is_primary' => $isPrimary], ['is_enabled' => $isEnabled]); } public static function emailStatus($token) @@ -38,7 +42,7 @@ class LBRY public static function applyTags($type, $token, $tags) { - return Curl::post(static::getApiUrl('/user/tag/edit'),['auth_token' => $token],[$type => $tags]); + return Curl::post(static::getApiUrl('/user/tag/edit'), ['auth_token' => $token], [$type => $tags]); } public static function unsubscribe($email) diff --git a/view/template/mail/_settingsForm.php b/view/template/mail/_settingsForm.php index 945cb309..79d209bd 100644 --- a/view/template/mail/_settingsForm.php +++ b/view/template/mail/_settingsForm.php @@ -11,8 +11,44 @@
Your email preferences have been updated.
+ +
+

Fine-tune your newsletter

+
+ +
+ + $enabled): ?> + +
+
+
+ +
+ +
+ + value="" /> + + +
+
+ + +
+ +
+ +
+ +
+ + +
+
+
-

Where do you want to receive email?

+

Quick Unsubscribe

@@ -35,39 +71,11 @@
+ +
If you toggle "off" and hit "Save", you will be removed from all of our mailing lists.
-
-

What do you want to receive email about?

-
-
- - $enabled): ?> - -
-
-
- -
-
- - value="" /> - - -
-
- -
- -
- -
- -
- - -
-
+
- \ No newline at end of file + diff --git a/web/scss/_slider.scss b/web/scss/_slider.scss index 6518f507..bad75152 100644 --- a/web/scss/_slider.scss +++ b/web/scss/_slider.scss @@ -3,69 +3,73 @@ $unchecked-color: #888; .slider-checkbox { position: relative; + input { - margin: 0px; - margin-top: 1px; + width: 40px; height: 20px; + top: 0; left: 0; + + background-color: red; cursor: pointer; - opacity: 0; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; - filter: alpha(opacity=0); - -moz-opacity: 0; - -khtml-opacity: 0; + margin: 1px 0 0 0; opacity: 0; position: absolute; z-index: 1; - top: 0px; - left: 0px; - background: red; - width: 40px; - height: 20px; + + &:not(:checked) + .label { + &::before { + background-color: $unchecked-color; + content: "\f00d"; + padding-left: 18px; + text-align: center; + } + + &::after { + left: 1px; + } + } + &:checked + .label { - &:before { + &::before { background-color: $checked-color; content: "\f00c"; - padding-left: 6px; + padding-right: 17px; + text-align: center; } - &:after { + + &::after { left: 21px; } } } + .label { + padding-left: 40px; position: relative; - padding-left: 46px; - &:before, &:after { + + &::before, + &::after { + border-radius: 0; position: absolute; - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; transition: background-color 0.3s, left 0.3s; } - &:before { - content: "\f00d"; - color: #fff; + + &::before { + width: 40px; height: 20px; + top: 0; left: 0; + box-sizing: border-box; + color: white; font-family: 'FontAwesome', sans-serif; - padding-left: 23px; font-size: 12px; line-height: 20px; - background-color: $unchecked-color; - left: 0px; - top: 0px; - height: 20px; - width: 40px; - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; } - &:after { + + &::after { + width: 18px; height: 18px; + + background-color: white; content: ""; - letter-spacing: 20px; - background: #fff; - left: 1px; top: 1px; - height: 18px; - width: 18px; } } -} \ No newline at end of file +}