From ddda28102cd553b136a15654b4910bde3a9e8e96 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Sun, 18 Jun 2017 13:00:41 +0200
Subject: [PATCH] Clean up the footer links a bit
closes #7446
---
Changelog.md | 1 +
app/assets/stylesheets/footer.scss | 10 +++++-----
app/assets/stylesheets/navbar_left.scss | 4 ++--
app/views/layouts/_footer.html.haml | 7 +++----
app/views/shared/_links.haml | 6 ++----
app/views/streams/main_stream.html.haml | 5 +++++
6 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index 11f045a166..993ece9efa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
* Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295)
+* Add links to discourse to footer and sidebar [#7446](https://github.com/diaspora/diaspora/pull/7446)
# 0.6.6.0
diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss
index ad1c398a2a..99bb281581 100644
--- a/app/assets/stylesheets/footer.scss
+++ b/app/assets/stylesheets/footer.scss
@@ -5,6 +5,11 @@ html {
body { margin-bottom: 150px; }
+.powered-by-diaspora a {
+ color: $link-grey;
+ font-weight: bold;
+}
+
footer.footer {
background-color: $background-grey;
border-top: 1px solid $border-grey;
@@ -15,11 +20,6 @@ footer.footer {
position: absolute;
width: 100%;
- .powered-by-diaspora {
- color: $link-grey;
- font-weight: bold;
- }
-
ul#footer_nav {
margin: 0;
padding: 0;
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index 498b4fde57..319a38e9f6 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -114,7 +114,8 @@
padding: 10px 20px 0;
.excellence-box,
- .info-links {
+ .info-links,
+ .powered-box {
border-top: 1px solid $border-grey;
padding: 5px;
}
@@ -175,7 +176,6 @@
ul {
list-style: none;
- margin-bottom: 5px;
padding-left: 0;
}
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index ab82635072..cfa2f167a2 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,7 +1,6 @@
%footer.footer
.container
- .pull-left
- .powered-by-diaspora
- =t("layouts.application.powered_by")
+ .powered-by-diaspora.pull-left
+ = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
%ul#footer_nav.pull-right
- = render :partial =>'shared/links'
+ = render partial: "shared/links"
diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml
index 8be514a17c..2032d6197b 100644
--- a/app/views/shared/_links.haml
+++ b/app/views/shared/_links.haml
@@ -1,11 +1,9 @@
-%li= link_to "diasporafoundation.org", "https://diasporafoundation.org"
-%li= link_to "Wiki", "https://wiki.diasporafoundation.org"
%li= link_to t("layouts.application.discourse"), "https://discourse.diasporafoundation.org"
%li= link_to t("layouts.application.whats_new"), changelog_url
%li= link_to t("layouts.header.code") + " " + pod_version,
source_url.to_s,
title: t("layouts.application.source_package")
%li= link_to t("layouts.application.statistics_link"), statistics_path
-%li= link_to(t("layouts.application.toggle"), toggle_mobile_path)
+%li= link_to t("layouts.application.toggle"), toggle_mobile_path
- if AppConfig.settings.terms.enable?
- %li= link_to(t("_terms"), terms_path)
+ %li= link_to t("_terms"), terms_path
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 29da6a6c9d..3a8b0225aa 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -170,6 +170,11 @@
%ul
= render "shared/links"
+ .powered-box
+ .content
+ .powered-by-diaspora.text-center
+ = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
+
.col-md-9
.stream_container#aspect_stream_container
= render "aspects/aspect_stream", stream: @stream
--
GitLab