diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html index ba387833..971cde22 100644 --- a/appview/pages/templates/layouts/base.html +++ b/appview/pages/templates/layouts/base.html @@ -60,6 +60,7 @@ {{ block "extrameta" . }}{{ end }} + {{ block "topbarLayout" . }}
diff --git a/appview/pages/templates/timeline/fragments/newsletter.html b/appview/pages/templates/timeline/fragments/newsletter.html new file mode 100644 index 00000000..3e05d912 --- /dev/null +++ b/appview/pages/templates/timeline/fragments/newsletter.html @@ -0,0 +1,16 @@ +{{ define "timeline/fragments/newsletter" }} +
+
+

We've got a newsletter! Punch in your email to get our updates sent straight to your inbox.

+ + + + + +
+
+ +{{ end }} diff --git a/appview/pages/templates/timeline/fragments/newsletterWidget.html b/appview/pages/templates/timeline/fragments/newsletterWidget.html new file mode 100644 index 00000000..d8c86387 --- /dev/null +++ b/appview/pages/templates/timeline/fragments/newsletterWidget.html @@ -0,0 +1,17 @@ +{{ define "timeline/fragments/newsletterWidget" }} +
+ +

We've got a newsletter! Punch in your email to subscribe.

+
+ + + + +
+
+ +{{ end }} diff --git a/appview/pages/templates/timeline/fragments/trendingSidebar.html b/appview/pages/templates/timeline/fragments/trendingSidebar.html new file mode 100644 index 00000000..47e6aeb1 --- /dev/null +++ b/appview/pages/templates/timeline/fragments/trendingSidebar.html @@ -0,0 +1,21 @@ +{{ define "timeline/fragments/trendingSidebar" }} +
+

+ Trending + {{ i "trending-up" "size-4 flex-shrink-0" }} +

+ {{ if .Repos }} +
+ {{ range $index, $repo := .Repos }} +
+ {{ template "user/fragments/repoCard" (list $ $repo true) }} +
+ {{ end }} +
+ {{ else }} +
+ No trending repositories this week +
+ {{ end }} +
+{{ end }} diff --git a/appview/pages/templates/timeline/home.html b/appview/pages/templates/timeline/home.html index 32ff79bb..d1804d16 100644 --- a/appview/pages/templates/timeline/home.html +++ b/appview/pages/templates/timeline/home.html @@ -29,7 +29,8 @@ {{ template "features1" . }} {{ template "features2" . }} {{ template "recentUpdates" . }} - {{ template "community" . }} + {{ template "newsletter" . }} + {{ end }} @@ -503,28 +504,28 @@ {{ end }} -{{ define "community" }} +{{ define "newsletter" }}
-

Join the network

+

Stay in the loop

- You can participate in the Tangled network with an AT account. If you - don't know what that is, you can sign up for one below. + We've got a newsletter! Punch in your email to stay updated on what we're shipping at Tangled.

-
- - + + + + +
{{ end }} diff --git a/appview/pages/templates/timeline/timeline.html b/appview/pages/templates/timeline/timeline.html index ffff8418..5bb7c751 100644 --- a/appview/pages/templates/timeline/timeline.html +++ b/appview/pages/templates/timeline/timeline.html @@ -7,8 +7,31 @@ {{ end }} +{{ define "mainLayout" }} +
+
+
{{ block "content" . }}{{ end }}
+
+
+{{ end }} + {{ define "content" }} +
+ {{ template "timeline/fragments/newsletter" . }} {{ template "timeline/fragments/goodfirstissues" . }} {{ template "timeline/fragments/trending" . }} - {{ template "timeline/fragments/timeline" . }} +
+ +
+
+ + {{ template "timeline/fragments/timeline" . }} +
+ +
{{ end }}