From 491c2a537c66affc296bfa2c8cf65a614144fccb Mon Sep 17 00:00:00 2001 From: movilla Date: Thu, 6 Dec 2012 15:26:49 +0100 Subject: [PATCH] Add feature contact pod admin --- Changelog.md | 4 ++++ app/assets/images/icons/mail.png | Bin 0 -> 415 bytes app/views/shared/_right_sections.html.haml | 12 ++++++++++++ config/defaults.yml | 1 + config/diaspora.yml.example | 3 +++ config/locales/diaspora/en.yml | 3 +++ 6 files changed, 23 insertions(+) create mode 100644 app/assets/images/icons/mail.png diff --git a/Changelog.md b/Changelog.md index 240155584..93f3a10b6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -11,6 +11,10 @@ * Made loading of the configuration environment independent of Rails. * Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead. +## Features + +* Add possibility to contact the administrator. [#3792](https://github.com/diaspora/diaspora/pull/3792) + ## Bug Fixes * Force Typhoeus/cURL to use the CA bundle we query via the config. Also add a setting for extra verbose output. diff --git a/app/assets/images/icons/mail.png b/app/assets/images/icons/mail.png new file mode 100644 index 0000000000000000000000000000000000000000..44b5eeea4d482412d4e7a0ed6fceb19d7b30d328 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^A|N&g8<1QX;1>s^7>k44ofy`glX(f`uqAoByDx`7I;J!1GQWSVMZs7*%d%R_7YEDSN1zRY9>}+i_f1lg){athY_K;~$LoRL2^<*+wAh(zCX5RVD%QEwd9XHrcEn!@< zH`ePB^Nife-=Cu{-T0OhFXF_ZeS7&Nw*yX>)SCaj3pvOZ!Jzy=r)9$}b}`Mr)d?In z4DTo9<;XL795S0^r*bxT|E)TfRqN)lc=|O?U6THQdj`X4o^32@+w3PV^D<;#8`yJk zr{K2zjp`3vFI8UJ%b0w7`T+&=_3K{CGIxv3ku+pjr!tq}b4hu6^^C?Bvs;wTn`t|9 z7R=eyS1++rHbGA$!E=*rbh1^#+z*SMJ4$xU6S98(m7P_q_0orzvqOQQ$KdJe=d#Wz Gp$PyjF{UH{ literal 0 HcmV?d00001 diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml index 565e15dcd..d40ea5818 100644 --- a/app/views/shared/_right_sections.html.haml +++ b/app/views/shared/_right_sections.html.haml @@ -81,3 +81,15 @@ = t('aspects.index.keep_diaspora_running') %br = render 'shared/donatediaspora' + +- if AppConfig.admins.podmin_email.present? + .section + .title + = image_tag('icons/mail.png') + %h5 + = t('aspects.index.help.any_problem') + .content + = t('aspects.index.help.contact_podmin') + %br + %br + = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button" diff --git a/config/defaults.yml b/config/defaults.yml index f75a930bf..a46a1a62b 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -85,6 +85,7 @@ defaults: message_bus_api_key: admins: account: + podmin_email: inline_resque_web: true development: diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example index b44f9e22b..4e28d975c 100644 --- a/config/diaspora.yml.example +++ b/config/diaspora.yml.example @@ -282,6 +282,9 @@ configuration: ## Section ## admin contact is neeeded, much like the postmaster role in mail ## systems. Set only the username, NOT the full ID. #account: "podmaster" + + ## E-Mail address users can contact the administrator + #podmin_email: 'podmin@example.org' ## Resque is the background processing system used by Diaspora ## Resque web is an admin tool for it. This settings decides whether diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 1c206b0f0..c0d6816f2 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -240,6 +240,9 @@ en: tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news" email_feedback: "%{link} your feedback, if you prefer" email_link: "Email" + any_problem: "Any Problem?" + contact_podmin: "Contact the administrator of your pod!" + mail_podmin: "Podmin E-Mail" cubbies: heading: "Connect to Cubbi.es" explanation: "Cubbi.es is the first Diaspora application under development."