Merge pull request #3827 from diasp/feature/1338-links-sidebar

Show links in sidebar #1338

Changelog.md

@@ -29,6 +29,7 @@
 * Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
 * Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
 * User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828), [#3874](https://github.com/diaspora/diaspora/issues/3874), [#3806](https://github.com/diaspora/diaspora/issues/3806).
+* Show links in sidebar [#3827](https://github.com/diaspora/diaspora/pull/3827)
 
 ## Bug Fixes
 

app/assets/stylesheets/application.css.sass

@@ -2170,6 +2170,10 @@ h1.tag
       :padding 8px
       :color #999
       :font-size 11px
+    li
+      :list-style none
+      :float left
+      :padding-right 10px
     :margin
       :bottom 25px
 

app/views/layouts/application.html.haml

@@ -66,7 +66,11 @@
       %a{:id=>"back-to-top", :title=>"#{t('.back_to_top')}", :href=>"#"}
         ⇧
 
-    = render :partial =>'shared/footer'
+    %footer
+      .container
+        %ul#footer_nav
+          = render :partial =>'shared/links'
+        = image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"
 
     = include_chartbeat
-    = include_mixpanel_guid
+    = include_mixpanel_guid

app/views/shared/_footer.html.haml

@@ -1,11 +0,0 @@
-%footer
-  .container
-    %ul#footer_nav
-      %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-      %li= link_to 'github', "https://github.com/diaspora/diaspora"
-      %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
-      %li= link_to t('layouts.application.whats_new'), 'https://github.com/diaspora/diaspora/blob/master/Changelog.md'
-      %li.separator= "|"
-      %li= link_to(t('layouts.header.code')+ " " + pod_version, "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/)
-      %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
-    = image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"

app/views/shared/_links.haml

@@ -0,0 +1,6 @@
+%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
+%li= link_to 'github', "https://github.com/diaspora/diaspora"
+%li= link_to t('layouts.header.blog'), "http://blog.diasporafoundation.org/"
+%li= link_to t('layouts.application.whats_new'), 'https://github.com/diaspora/diaspora/blob/master/Changelog.md'
+%li= link_to(t('layouts.header.code') + " " + pod_version, "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/)
+%li= link_to(t('layouts.application.toggle'), toggle_mobile_path)

app/views/shared/_right_sections.html.haml

@@ -93,3 +93,9 @@
       %br
       %br
       = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
+
+.section
+  .title
+  %ul.content
+    = render "shared/links"
+