diff --git a/controller/action/MailActions.class.php b/controller/action/MailActions.class.php index 5c686657..e5d094b3 100644 --- a/controller/action/MailActions.class.php +++ b/controller/action/MailActions.class.php @@ -28,14 +28,16 @@ class MailActions extends Actions $mcApi = new Mailchimp(); $mcListId = $_POST['listId']; $mergeFields = isset($_POST['mergeFields']) ? unserialize($_POST['mergeFields']) : []; - if ($mcApi->listSubscribe($mcListId, $email, $mergeFields, 'html', false)) + $success = $mcApi->listSubscribe($mcListId, $email, $mergeFields, 'html', false); + if ($success) { Session::set(Session::KEY_MAILCHIMP_LIST_IDS, array_merge(Session::get(Session::KEY_MAILCHIMP_LIST_IDS, []), [$mcListId])); Session::set('list_success', __('Great success! Welcome to LBRY.')); } else { - Session::set('list_error', __('Something went wrong adding you to the list.')); + $error = $mcApi->errorMessage ?: __('Something went wrong adding you to the list.'); + Session::set('list_error', $error); } } diff --git a/view/Response.class.php b/view/Response.class.php index 74aab04a..7a3d0286 100644 --- a/view/Response.class.php +++ b/view/Response.class.php @@ -1,5 +1,4 @@ - - - - - - - - <?php echo $title ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - -
-
- - + + + + + + + + + <?php echo $title ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + +
+
+ + \ No newline at end of file diff --git a/view/mail/joinList.php b/view/mail/joinList.php index 53cf48de..395c78ac 100644 --- a/view/mail/joinList.php +++ b/view/mail/joinList.php @@ -1,3 +1,8 @@ + + + ga('send', 'event', 'Sign Up', 'Join List', ''); + +
diff --git a/view/nav/globalItems.php b/view/nav/globalItems.php index 0c9bf806..7579476e 100644 --- a/view/nav/globalItems.php +++ b/view/nav/globalItems.php @@ -19,4 +19,4 @@
Reddit -
+ \ No newline at end of file diff --git a/view/page/home.php b/view/page/home.php index 5cf93a38..6c367deb 100644 --- a/view/page/home.php +++ b/view/page/home.php @@ -1,61 +1,71 @@ -
- - - true]) ?> -
-
-
-
-
-

Stream, Share, Earn.

-
- - -
- - - others in - - ', $labels) ?> - -
-
-
- Fund LBRY -
-
- Learn More -
-
-
- -
-
-
-
- -
- -Stream, Share, Earn. -
-

Join a fully distributed network that makes information open to everyone.

-
-
- Get LBRY -
-
- Learn More -
-
-
+
+ + + true]) ?> +
+
+
+
+
+

Stream, Share, Earn.

+
+ + +
+ + + others in + + ', $labels) ?> + +
+
+
+ Fund LBRY +
+
+ Learn More +
+
+
+ +
+
+
+
+
LBRY
+
+
+
+ +
+
+
+
+
+
+ +Stream, Share, Earn. +
+

Join a fully distributed network that makes information open to everyone.

+
+
+ Get LBRY +
+
+ Learn More +
+
+
*/ ?> \ No newline at end of file diff --git a/view/page/navframe.php b/view/page/navframe.php new file mode 100644 index 00000000..61279681 --- /dev/null +++ b/view/page/navframe.php @@ -0,0 +1,4 @@ + + + + false]) ?> \ No newline at end of file diff --git a/view/page/team.php b/view/page/team.php index 2b83e4b6..e939bb8c 100644 --- a/view/page/team.php +++ b/view/page/team.php @@ -21,18 +21,20 @@
- photo of Jeremy Kauffman + photo of Jeremy Kauffman-

Jeremy Kauffman

Founder, Director

- Shortly after graduating from RPI with degrees in physics and computer science, Jeremy founded TopScore. TopScore is a SaaS tool powering tens of millions in event and activity registrations. + Jeremy is the founder and CEO of TopScore, a startup that + processes millions of dollars monthly in event and activity registrations. + Jeremy attended Rensselaer Polytechnic Institute, where he received degrees in physics and computer science.

Jeremy knows how to build and scale a startup starting from day one. He knows how to deliver usable products and get those products in front of the right people.

- Jeremy has been responsible for the packing, presentation, and strategy of LBRY, as well as some design aspects. Jeremy is a longtime fan of BitTorrent. + Jeremy is responsible for the packing, presentation, and strategy of LBRY, as well as some design aspects. He is a longtime BitTorrent community enthusiast.

@@ -45,13 +47,17 @@
Founder, Developer

- Because graduating from RPI with degrees in physics and computer science seemed hip, Jimmy did the same. After, Jimmy found himself mired in government bureaucracy, spending too much time to get too little done. + Because graduating from RPI with degrees in physics and computer science is the hip thing to do, Jimmy did the same. + After, he found himself mired in government bureaucracy, spending too much time to get too little done.

- Ready to work on a project he believed in, Jimmy quit his national security job to start LBRY several months ago. Jimmy created the LBRY protocol and the first LBRY application. + Ready to work on a project he believed in, Jimmy quit his national security job to start LBRY. + Jimmy created the LBRY protocol and the first LBRY application. +

+

+ Jimmy is a Bitcoin fanatic and has been since its early days. He has long been interested in the benefits of decentralization.

-
@@ -61,37 +67,95 @@

Mike Vine

Technology Evangelist

- With a humble BA in Philosophy from Tulane University, Mike has built a successful financial services marketing company, Centinel Consulting. Centinel recently built a client’s website from 20K visitors per month to 150K, and manages email marketing lists and social media accounts with hundreds of thousands of followers. + With a humble BA in Philosophy from Tulane University, Mike has + built a successful financial services marketing company, Centinel Consulting. + Centinel has helped clients grow from close to nothing to hundreds of thousands of visitors. He manages + email marketing lists and social media accounts of the same size.

- Mike has been involved with the Bitcoin community since the early days. His friends have launched companies like Lamassu BTM, Coinapult, and Shapeshift. Now, he wants a turn to help change the world by harnessing blockchain technology. Mike heads up LBRY’s marketing efforts and serves as an ambassador for our platform to media, investors, and the public. + Mike has been involved with the Bitcoin community since the early days. His friends have launched companies like + Lamassu BTM, + Coinapult, + Shapeshift. + Now, he wants a turn to help change the world by harnessing blockchain technology. + Mike heads up LBRY’s marketing efforts and serves as an ambassador for our platform to media, investors, and the public.

+
+
+ photo of Jack Robison +
+

Jack Robison

+
Core Developer
+

+ Jack's path to developer with LBRY is fairly typical: + + face sixty years in prison for innocent chemistry experiments; lose interest in chemistry; + program insane electric guitars for Kiss; + decide to revolutionize the internet. +

+

+ Jack was one of the first people to discover LBRY and took to it so fast he may understand more + about it than anyone. +

+ Jack has Asperger's Syndrome and is actively involved in the autism community. He was a regular on Wrong Planet's + Autism Talk TV, has appeared on + National Public Radio, the New York Times, and presents around the country. +

+
+
+

Advisory Team

+
+ +
+ Photo of Alex Tabarrok +
+

Alex Tabarrok

+
Advisor, Economics
+

Alex Tabarrok is Bartley J. Madden Chair in Economics at the Mercatus Center + and a professor of economics at George Mason University. He specializes in intellectual property reform, the effectiveness of markets, and the justice system. +

+

Tabarrok is the coauthor, with Mercatus colleague Tyler Cowen, of the popular economics blog Marginal Revolution + and cofounder of the online educational platform Marginal Revolution University. + He is the coauthor of + Modern Principles of Economics, + and author of the recent book + Launching the Innovation Renaissance. + His articles have appeared in the New York Times, the Washington Post, the Wall Street Journal, and many + other prestigious publications. +

+

Tabarrok received his PhD in economics from + George Mason University. +

+
*/ ?>
Photo of Stephan Kinsella
-

Stephan Kinsella

-
Advisor, Legal
-

- Stephan is a registered patent attorney in Houston and a former partner in the Intellectual Property Practice Group of Duane Morris LLP - and General Counsel for Applied Optoelectronics, Inc. He is the founder and director of the Center for the Study of Innovative Freedom. He has over twenty years’ law firm and in-house experience in patent, IP, - and general commercial and corporate law. Stephan has published numerous articles and books on IP law and legal topics including - - International Investment, Political Risk, and Dispute Resolution: A Practitioner’s Guide - (Oxford University Press, 2005) - and - - Against Intellectual Property - (Mises Institute, 2008). -

-

- He received an LL.M. in international business law from King’s College London, a JD from the Paul M. Hebert Law Center at LSU, - and BSEE and MSEE degrees from LSU. His websites are stephankinsella.com - and kinsellalaw.com -

+

Stephan Kinsella

+
Advisor, Legal
+

+ Stephan is a registered patent attorney and has over twenty years’ experience in patent, intellectual property, + and general commercial and corporate law. He is the founder and director of the Center for the Study of Innovative Freedom. + Stephan has published numerous articles and books on intellectual property law and legal topics including + + International Investment, Political Risk, and Dispute Resolution: A Practitioner’s Guide + + and + + Against Intellectual Property + . +

+

+ He received an LL.M. in international business law from King’s College London, a JD from the Paul M. Hebert Law Center at + Lousiana State University, + as well as BSEE and MSEE degrees. His websites are stephankinsella.com + and kinsellalaw.com +

+

Newest Member

diff --git a/view/page/why.php b/view/page/why.php index 9b330816..ef06a733 100644 --- a/view/page/why.php +++ b/view/page/why.php @@ -8,7 +8,7 @@
-

If you made the fuckin' music, and you made the art, and you put it into the world, I should be able to use it however the fuck I want. I'ma pay you, I'ma give you a percentage, but you shouldn't be able to tell me I can't use it. You was inspired by the world; allow the world to be inspired by your shit and to use your shit.

+

If you made the music, and you made the art, and you put it into the world, I should be able to use it however I want. I'ma pay you, I'ma give you a percentage, but you shouldn't be able to tell me I can't use it. You was inspired by the world; allow the world to be inspired by your shit and to use your shit.

J. Cole, Note to Self
diff --git a/web/img/alex-tabarrok-644x450.jpg b/web/img/alex-tabarrok-644x450.jpg new file mode 100644 index 00000000..89879fd2 Binary files /dev/null and b/web/img/alex-tabarrok-644x450.jpg differ diff --git a/web/img/cover-home-full.jpg b/web/img/cover-home-full.jpg new file mode 100644 index 00000000..6ac04c73 Binary files /dev/null and b/web/img/cover-home-full.jpg differ diff --git a/web/img/jack-robison-644x450.jpg b/web/img/jack-robison-644x450.jpg new file mode 100644 index 00000000..412d2459 Binary files /dev/null and b/web/img/jack-robison-644x450.jpg differ diff --git a/web/js/global.js b/web/js/global.js index 5ef9d57b..676e0317 100644 --- a/web/js/global.js +++ b/web/js/global.js @@ -1,3 +1,5 @@ +document.domain = 'lbry.io'; + jQuery.fn.extend({ jFor: function() { var self = $(this), @@ -20,6 +22,19 @@ $(document).ready(function() { labelCycles = body.find('.label-cycle'); //should use better pattern but we have so little JS right now body.on('click', 'a', onAnchorClick); + + if (window.twttr) + { + twttr.ready(function (twttr) { + twttr.events.bind('follow', onTwitterFollow); + }); + } + + window.fbAsyncInit = function() + { + window.FB.Event.subscribe('edge.create', onFacebookLike); + }; + //$(window).scroll(onBodyScroll); if (labelCycles.length) @@ -94,6 +109,17 @@ $(document).ready(function() { .height(width * ratio); } } + + function onTwitterFollow (intentEvent) + { + if (!intentEvent) return; + ga('send', 'social', 'Twitter', 'follow', window.location.href); + } + + function onFacebookLike(url) + { + ga('send', 'social', 'Facebook', 'like', window.location.href); + } $('.video > iframe').each(function() { var iframe = $(this); diff --git a/web/scss/_content.scss b/web/scss/_content.scss index 40d216e3..239edab7 100644 --- a/web/scss/_content.scss +++ b/web/scss/_content.scss @@ -1,4 +1,10 @@ @import "global"; +.content-constrained +{ + max-width: $max-content-width; /*we have more padding than desirable so numbers from ol can exceed container*/ + margin-left: auto; + margin-right: auto; +} .content { margin-left: auto;