Fix footer (refs #91)

- Restore original design
- Remove icons not in second column
- Restore RSS and Security links
- Move Documentation to third column
- Move trademarks to their own line
- Add links to view source, edit the page, and report an issue

lib/devuan_helpers.rb

@@ -1,5 +1,24 @@
 module DevuanHelpers
 
+  PROJECT_URL = "https://git.devuan.org/devuan-editors/devuan-www"
+  GIT_BRANCH  = "beta.devuan.org"
+  EDIT_URL    = "#{PROJECT_URL}/edit/#{GIT_BRANCH}/source"
+  SRC_URL     = "#{PROJECT_URL}/tree/#{GIT_BRANCH}/source"
+
+  def relative_source_path
+    current_page.source_file.split('/source')[1]
+  end
+
+  def link_to_edit_page
+    link_to(t(:edit), File.join(EDIT_URL, relative_source_path))
+  end
+  def link_to_source
+    link_to(t(:view_source), File.join(SRC_URL, relative_source_path))
+  end
+  def link_to_new_issue
+    link_to(t(:issues), "#{PROJECT_URL}/issues/new?issue[label_ids][]=1291&issue[title]=#{current_page.url}")
+  end
+
   def bitcoin_address
     "1QFbx3bKA8LABAGEaSe7EiP9JCxe2j4fN7".freeze
   end
@@ -25,7 +44,7 @@ module DevuanHelpers
   end
 
   def email(email)
-    `echo #{email} | pandoc -f markdown_github -t html`.gsub(/<[\/]*p>/,'')
+    `echo #{email} | pandoc -f markdown_github -t html`.gsub(/<[\/]*>/,'')
   end
 
   def favicon_url

locales/en.yml

@@ -14,10 +14,12 @@ en:
   donate_now: "donate now!"
   download: Download
   download_more: more download options
+  edit: edit
   essential: essential
   essentials: Essentials
   featured: Featured
   free_software: Free Software
+  issues: report issues
   licenses: Software Licenses
   netinst_title: Devuan Network Installer for PC and other platforms
   operating_system: Operating System
@@ -38,6 +40,8 @@ en:
   os_sources_title: "Devuan is free software: download the source code!"
   os_support: Meet Devuan supporters
   os_support_title: "Peruse Devuan documentation and get help!"
+  os_team: team
+  os_team_title: Meet Devuan team
   os_title: Discover Devuan GNU+Linux Operating System
   release_notes: Release Notes
   site_title: "Devuan GNU+Linux Free/Libre Operating System"
@@ -47,6 +51,7 @@ en:
   tagline: "software freedom, your way"
   thank_you_for_supporting_devuan: Thank you for supporting Devuan
   toc: Table of Contents
+  view_source: view source
   copyright:
     fiscal:
       title: Learn about our fiscal sponsor

source/partials/_footer.erb

@@ -1,13 +1,9 @@
 <hr>
 <footer class="row" id="find">
   <section class="three columns">
-    <!-- <h4><%= t(:thank_you_for_supporting_devuan) %></h4> -->
+    <h4><%= t(:thank_you_for_supporting_devuan) %></h4>
     <p><%= t(:about_devuan) %>
-    <%= partial 'donate-button' %></br>
-Devuan is a registered trademark of the Dyne.org foundation.
-Debian is a registered trademark of Software in the Public Interest, Inc.
-Linux is a registered trademark of Linus Torvalds.
-</p>
+    <%= partial 'donate-button' %></p>
   </section>
   <section class="three columns">
     <h4><%= t(:essentials) %></h4>
@@ -15,20 +11,18 @@ Linux is a registered trademark of Linus Torvalds.
       <li><%= link_to icon('docs') + t(:toc), '/toc' %></li>
       <li><%= link_to icon('download') + t(:download), '/os/download' %></li>
       <li><%= link_to icon('devuan-talk') + t(:devuan_community), '/os/community'%></li>
-      <li><%= link_to icon('book') + t(:documentation), '/os/documentation' %></li>
-
-      <!-- <li><%= link_to icon('rss') + t(:os_feeds_title), '/os/feeds' %></li> -->
-      <!-- <li><%= link_to icon('bell') + t(:os_security_title), '/os/security' %></li> -->
+      <li><%= link_to icon('rss') + t(:os_feeds_title), '/os/feeds' %></li>
+      <li><%= link_to icon('bell') + t(:os_security_title), '/os/security' %></li>
     </ul>
   </section>
   <section class="three columns">
     <h4><%= t(:developers) %></h4>
     <ul>
-      <li><%= link_to icon('cog') + t(:development_kit), '/os/development-kit' %></li>
-      <li><%= link_to t(:source_code),   '/os/source-code' %></li>
-      <li><%= link_to t(:licenses),      '/os/free-software' %></li>
-      <li><a href="/os/team">Development Team</a></li>
-      <!-- <li><%= link_to t(:release_notes), '/os/releases/stable' %></li> -->
+      <li><%= link_to t(:development_kit), '/os/development-kit' %></li>
+      <li><%= link_to t(:documentation),   '/os/documentation' %></li>
+      <li><%= link_to t(:source_code),     '/os/source-code' %></li>
+      <li><%= link_to t(:licenses),        '/os/free-software' %></li>
+      <li><%= link_to t(:release_notes),   '/os/releases/stable' %></li>
     </ul>
   </section>
   <section class="three columns">
@@ -36,9 +30,9 @@ Linux is a registered trademark of Linus Torvalds.
     <ul>
       <li><%= link_to t(:os_partners_title),       '/os/partners' %></li>
       <li><%= link_to t(:os_press_releases_title), '/os/press/releases' %></li>
-      <li><%= link_to icon('newspaper-o') + t(:os_press_news_title),     '/os/press/in-the-news' %></li>
-      <!-- <li><%= link_to t(:os_press_title),          '/os/press' %></li> -->
-      <li><%= link_to icon('shopping-bag') + t(:os_shopping_title),       '/os/shopping' %></li>
+      <li><%= link_to t(:os_press_news_title),     '/os/press/in-the-news' %></li>
+      <li><%= link_to t(:os_press_title),          '/os/press' %></li>
+      <li><%= link_to t(:os_shopping_title),       '/os/shopping' %></li>
     </ul>
   </section>
   <p class="row" id="copyright">
@@ -56,5 +50,14 @@ Linux is a registered trademark of Linus Torvalds.
                 { :title => t('copyright.source.title') } %>
     <span>—</span>
     <%= link_to t('os_contact_anchor'), '/os/contact' %>
+    <span>—</span>
+    <%= link_to_source %> (<%= link_to_edit_page %>)
+    <span>—</span>
+    <%= link_to_new_issue %>
+  </p>
+  <p class="row trademarks">
+    <span>Devuan is a <a href="/os/download/devuan-trademark.pdf">registered trademark</a> of the Dyne.org foundation.</span>
+    <span>Debian is a registered trademark of Software in the Public Interest, Inc.</span>
+    <span>Linux is a registered trademark of Linus Torvalds.</span>
   </p>
 </footer>