PR#866: Update to new Fedora Docs links, fix Google+ URL, don't show Free Media - fedora-websites

fedora-websites

#866 Update to new Fedora Docs links, fix Google+ URL, don't show Free Media

Merged 5 years ago by ryanlerch. Opened 5 years ago by jflory7.

jflory7/fedora-websites change/getfedora-catches-docs into master

Use same URL schema for f*.fp.o links

Justin W. Flory • 5 years ago

47c90a5

Update Fedora Docs links, fix Google+ URL

Justin W. Flory • 5 years ago

ada2c7e

Free Media is offline for over two years now – avoid frustration and omit

Justin W. Flory • 5 years ago

ae32307

getfedora.org/data/templates/footer.html

file modified

+5 -5

		`@@ -14,18 +14,18 @@`
		`<h3 class="widget-title">${_('About')}</h3>`
		`<div class="widget-body">`
		`<dl>`
		`- <dd><a href="//docs.fedoraproject.org/fedora-project/project/fedora-overview.html">${_('About Fedora')}</a></dd>`
		`+ <dd><a href="//docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>`
		`<dd><a href="${path}/${lang}/sponsors">${_('Sponsors')}</a></dd>`
		`<dd><a href="//fedoramagazine.org">${_('Fedora Magazine')}</a></dd>`
		`- <dd><a href="https://fedoraproject.org/wiki/Legal:Main#Legal">${_('Legal')}</a></dd>`
		`- <dd><a href="//docs.fedoraproject.org/fedora-project/project/code-of-conduct.html">${_('Fedora Code of Conduct')}</a></dd>`
		`+ <dd><a href="//fedoraproject.org/wiki/Legal:Main#Legal">${_('Legal')}</a></dd>`
		`+ <dd><a href="//docs.fedoraproject.org/en-US/project/code-of-conduct/">${_('Fedora Code of Conduct')}</a></dd>`
		`</dl>`
		`<ul class="list-inline">`
		`<li>`
		`<a href="https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>`
		`</li>`
		`<li>`
		`- <a href="https://plus.google.com/112917221531140868607" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>`
		`+ <a href="https://plus.google.com/+Fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>`
		`</li>`
		`<li>`
		`<a href="https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>`
		`@@ -80,7 +80,7 @@`
		`<div class="row">`
		`<div class="col-md-2">`
		`<div class="widget-body">`
		`- <a href="http://www.redhat.com/"><img class="rh-logo" src="${path}/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a>`
		`+ <a href="https://www.redhat.com/"><img class="rh-logo" src="${path}/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a>`
		`</div>`
		`</div>`
		`<div class="col-md-7">`

getfedora.org/data/templates/generic/other-media-sources.html

file modified

+2 -2

		`@@ -6,7 +6,7 @@`
		`py:strip="">`

		`<h3>${_('Other ways of obtaining media')}</h3>`
		`- <p>${Markup(_('You may purchase installation media for Fedora from <a href="%s">online vendors</a> or a <a href="%s">local vendor</a> in your area.') % ('http://fedoraproject.org/wiki/Distribution/OnlineVendors', 'http://fedoraproject.org/wiki/Distribution/LocalVendors'))}</p>`
		`- <p>${Markup(_('Can\'t afford the price of installation media? Request Fedora installation media from the <a href="%s">Fedora Free Media Program</a>.') % ('http://fedoraproject.org/freemedia/FreeMedia-form.html'))}</p>`
		`+ <!-- TODO: Should we omit this section altogether? -->`
		`+ <p>${Markup(_('You may purchase installation media for Fedora from <a href="%s">online vendors</a> or a <a href="%s">local vendor</a> in your area.') % ('https://fedoraproject.org/wiki/Distribution/OnlineVendors', 'https://fedoraproject.org/wiki/Distribution/LocalVendors'))}</p>`

		`</html>`

jflory7 commented 5 years ago

This pull request does some miscellaneous housekeeping. It does the four things:

Updates footer links to new Fedora Docs URL scheme post-Antora ( @asamalik @bex may want to review)
Updates the Google+ URL in footer to use clean URL to point to Google+ page
Corrects order of "Planet Fedora" to "Fedora Planet", as both the logo and URL are ordered
Free Media program is offline for two years, so omitting from high visibility is better to avoid frustration

I wasn't able to test this because the Makefile was unable to complete for an item not being in a list it expected, but it was a value I had not worked with or changed. It would be helpful to have a closer look of this by someone else.

cc: @ryanlerch @robyduck @sijis

sijis commented on line 37 of getfedora.org/data/templates/footer.html 5 years ago

I'm not sure if this is correct. The title page list itself as 'Planet Fedora'.

sijis commented on line 6 of getfedora.org/data/templates/footer.html 5 years ago

Does this url support translation specific links as https://docs.fedoraproject.org/${lang}/project/?

sijis commented 5 years ago

A couple of comments but I don't see any major issues with this.
I'd like to hear something from other folks
/cc @ryanlerch @codeblock

Metadata Update from @sijis:
- Pull-request tagged with: docs, getfedora.org

5 years ago

bex commented 5 years ago

I believe we should begin dropping Google+ from our footers as the service is going away. We are losing users every week.

jflory7 commented 5 years ago

I'm not sure if this is correct. The title page list itself as 'Planet Fedora'.

I can work on correcting this.

Does this url support translation specific links as https://docs.fedoraproject.org/${lang}/project/?

Eventually it will, but I believe @asamalik and @jibecfed are working on this. I'm not sure it is ready yet.

I believe we should begin dropping Google+ from our footers as the service is going away. We are losing users every week.

Interesting, the data misuse completely slipped by me. I think it is a good idea to include Google+ in our footers until the end, though. Google's search engine unfairly gives extra visibility and a SEO boost to Google+. I imagine this will change over the next year, but I think it's valuable to include in the short-term.

sijis commented 5 years ago

@jflory7 You may want to rebase this PR.
I made a ton of changes to links after the GA release and i suspect there may be a conflict or two with this.

I do like the idea of leaving Google+ link available until its officially offline.

2 new commits added