diff --git a/controller/action/DeveloperActions.class.php b/controller/action/DeveloperActions.class.php index 329ee7ef..c3019704 100644 --- a/controller/action/DeveloperActions.class.php +++ b/controller/action/DeveloperActions.class.php @@ -47,6 +47,14 @@ class DeveloperActions extends Actions ]; } + + public static function prepareQuickstartInstallPartial(array $vars) + { + return $vars + [ + 'version' => 'foo' + ]; + } + public static function prepareFormNewDeveloperRewardPartial(array $vars) { return $vars + [ diff --git a/controller/action/DownloadActions.class.php b/controller/action/DownloadActions.class.php index a6743b4b..227c3817 100644 --- a/controller/action/DownloadActions.class.php +++ b/controller/action/DownloadActions.class.php @@ -8,15 +8,15 @@ class DownloadActions extends Actions switch ($ext) { case 'deb': - $uri = GitHub::getDownloadUrl(OS::OS_LINUX); + $uri = GitHub::getAppDownloadUrl(OS::OS_LINUX); break; case 'dmg': - $uri = GitHub::getDownloadUrl(OS::OS_OSX); + $uri = GitHub::getAppDownloadUrl(OS::OS_OSX); break; case 'msi': - $uri = GitHub::getDownloadUrl(OS::OS_WINDOWS); + $uri = GitHub::getAppDownloadUrl(OS::OS_WINDOWS); break; } @@ -68,7 +68,7 @@ class DownloadActions extends Actions 'osIcon' => $osIcon, 'prefineryUser' => $user ?: [], 'downloadHtml' => View::exists('download/' . $partial) ? - View::render('download/' . $partial, ['downloadUrl' => Github::getDownloadUrl($os)]) : + View::render('download/' . $partial, ['downloadUrl' => Github::getAppDownloadUrl($os)]) : false ]]; } diff --git a/lib/thirdparty/Github.class.php b/lib/thirdparty/Github.class.php index 86149032..676a212c 100644 --- a/lib/thirdparty/Github.class.php +++ b/lib/thirdparty/Github.class.php @@ -2,7 +2,7 @@ class Github { - public static function getDownloadUrl($os, $cache = true) + public static function getAppDownloadUrl($os, $cache = true) { if (!in_array($os, array_keys(OS::getAll()))) { @@ -32,6 +32,39 @@ class Github return null; } + public static function getDaemonDownloadUrl($os, $cache = true) + { + if (!in_array($os, array_keys(OS::getAll()))) + { + throw new DomainException('Unknown OS'); + } + + try + { + $releaseData = static::get('/repos/lbryio/lbry/releases/latest', $cache); + foreach ($releaseData['assets'] as $asset) + { + echo '
';
+        print_r($asset);
+        echo '
'; + $ext = substr($asset['name'], -4); + if ( + ($os == OS::OS_LINUX && ($ext == '.deb' || in_array($asset['content_type'], ['application/x-debian-package', 'application/x-deb']))) || + ($os == OS::OS_OSX && ($ext == '.dmg' || in_array($asset['content_type'], ['application/x-diskcopy', 'application/x-apple-diskimage']))) || + ($os == OS::OS_WINDOWS && $ext == '.exe') + ) + { + return $asset['browser_download_url']; + } + } + } + catch (Exception $e) + { + } + + return null; + } + public static function get($endpoint, $cache = true) { $twoHoursInSeconds = 7200; diff --git a/view/template/developer/_quickstartInstall.php b/view/template/developer/_quickstartInstall.php index a26baf1d..60911c4c 100644 --- a/view/template/developer/_quickstartInstall.php +++ b/view/template/developer/_quickstartInstall.php @@ -1,4 +1,9 @@

Download

+
+  
+  
+  
+
diff --git a/view/template/nav/_footer.php b/view/template/nav/_footer.php index 0e8e792e..e032a4d8 100644 --- a/view/template/nav/_footer.php +++ b/view/template/nav/_footer.php @@ -4,20 +4,18 @@ -
-
- -
+
+
diff --git a/view/template/nav/_globalItems.php b/view/template/nav/_globalItems.php index c7abb883..31232b22 100644 --- a/view/template/nav/_globalItems.php +++ b/view/template/nav/_globalItems.php @@ -1,7 +1,7 @@ __('nav.get'), - '/news' => __('nav.news'), - '/learn' => __('nav.learn') + '/learn' => __('nav.learn'), + '/news' => __('nav.news') ] as $url => $label): ?>
> diff --git a/view/template/nav/_header.php b/view/template/nav/_header.php index f6de72a9..7fe71c50 100644 --- a/view/template/nav/_header.php +++ b/view/template/nav/_header.php @@ -2,28 +2,27 @@ false, - 'isAbsolute' => false + 'isAbsolute' => false, + 'isLogoOnly' => false ], EXTR_SKIP) ?>
-
- - - - -
-
- -
+ +
+ + + + +
+
+ +
+
diff --git a/view/template/page/home.php b/view/template/page/home.php index 7c3d7b33..07dc0225 100644 --- a/view/template/page/home.php +++ b/view/template/page/home.php @@ -1,27 +1,27 @@ -
+
>
- true]) ?> + false, 'isLogoOnly' => false]) ?>
-
-
-
-

{{global.tagline}}

-

{{global.sentence}}

+
+
+
+

Content Freedom

+

Watch, read or play what you choose. Earn 100% of the price you decide.

+

You control your data. You own the network. Indeed, you are the network.

+

Find Hollywood films, college lessons, amazing streamers and more on the first open, global, and distributed digital bazaar.

- {{global.get}} + Join LBRY
- {{global.learn}} + {{global.learn}}
-
- -
+
@@ -37,8 +37,9 @@
-
+
*/ ?>
+ false]) ?> diff --git a/web/scss/_basic.scss b/web/scss/_basic.scss index 73bcc505..46bd46f4 100644 --- a/web/scss/_basic.scss +++ b/web/scss/_basic.scss @@ -114,7 +114,7 @@ a:hover img } } -.btn-primary, .btn-alt +.btn-primary, .btn-alt, .btn-link { cursor: pointer; display: inline-block; @@ -129,6 +129,17 @@ a:hover img margin-left: 8px; } } +.btn-link +{ + @include anchor($color-primary); +} +.btn-large +{ + height: $spacing-vertical * 2; + line-height: $spacing-vertical * 2; + font-size: 1.5em; + padding: 0 30px; +} .btn-primary { color: white; diff --git a/web/scss/_content.scss b/web/scss/_content.scss index dbbeb68b..26e2bcb4 100644 --- a/web/scss/_content.scss +++ b/web/scss/_content.scss @@ -45,15 +45,15 @@ &.content-dark { - color: #e8e8e8; + color: $color-content-dark; h1, h2, h3, h4, h5, h6 { color: #fff; } .link-primary { color: $color-light-alt; } - .meta { color: #dddddd; } + .meta { color: $color-meta-dark; } } &:not(.content-dark), &.content-light { - color: #333; + color: $color-content-light; h1, h2, h3, h4, h5, h6 { color: $color-text-dark; @@ -174,7 +174,6 @@ margin-left: auto; margin-right: auto; } - } .content-inset { diff --git a/web/scss/_global.scss b/web/scss/_global.scss index d3959b3c..61f7de2c 100644 --- a/web/scss/_global.scss +++ b/web/scss/_global.scss @@ -8,6 +8,9 @@ $color-text-dark: #000; $color-money: #216C2A; $color-meta-light: #505050; $color-meta-lighter: #999999; +$color-meta-dark: #dddddd; +$color-content-light: #333333; +$color-content-dark: #e8e8e8; $color-info-bg: #3a779d; $font-size: 16px; diff --git a/web/scss/_header.scss b/web/scss/_header.scss index 9329d14a..aa6e1126 100644 --- a/web/scss/_header.scss +++ b/web/scss/_header.scss @@ -1,6 +1,7 @@ @import "global"; -$color-nav-border: #ddd; +$color-nav-border-light: #ddd; +$color-nav-border-dark: #ddd; .header { @@ -41,7 +42,7 @@ $color-nav-border: #ddd; .header-light { color: $color-text-dark; - border-bottom: 1px $color-nav-border solid; + border-bottom: 1px $color-nav-border-light solid; background-color: white; .logo-light { display: none; } } @@ -119,11 +120,24 @@ $color-nav-border: #ddd; text-align: center; font-size: 0.8em; line-height: $spacing-vertical * 2; - color: #666; - border-top: 1px $color-nav-border solid; - border-bottom: 1px $color-nav-border solid; padding: $spacing-vertical / 2 0; @include jumpingScrollbarFix(); + img + { + display: block; + margin-left: auto; + margin-right: auto; + } +} +.footer-standard--light +{ + color: $color-content-light; + border-top: 1px $color-nav-border-light solid; + border-bottom: 1px $color-nav-border-light solid; +} +.footer-standard--dark +{ + color: $color-content-dark; } .footer-img-link {