Add feature contact pod admin

This commit is contained in:
movilla 2012-12-06 15:26:49 +01:00
parent e05edcfda6
commit 491c2a537c
6 changed files with 23 additions and 0 deletions

View file

@ -11,6 +11,10 @@
* Made loading of the configuration environment independent of Rails. * 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. * 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 ## Bug Fixes
* Force Typhoeus/cURL to use the CA bundle we query via the config. Also add a setting for extra verbose output. * Force Typhoeus/cURL to use the CA bundle we query via the config. Also add a setting for extra verbose output.

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

View file

@ -81,3 +81,15 @@
= t('aspects.index.keep_diaspora_running') = t('aspects.index.keep_diaspora_running')
%br %br
= render 'shared/donatediaspora' = 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"

View file

@ -85,6 +85,7 @@ defaults:
message_bus_api_key: message_bus_api_key:
admins: admins:
account: account:
podmin_email:
inline_resque_web: true inline_resque_web: true
development: development:

View file

@ -282,6 +282,9 @@ configuration: ## Section
## admin contact is neeeded, much like the postmaster role in mail ## admin contact is neeeded, much like the postmaster role in mail
## systems. Set only the username, NOT the full ID. ## systems. Set only the username, NOT the full ID.
#account: "podmaster" #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 is the background processing system used by Diaspora
## Resque web is an admin tool for it. This settings decides whether ## Resque web is an admin tool for it. This settings decides whether

View file

@ -240,6 +240,9 @@ en:
tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news" tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
email_feedback: "%{link} your feedback, if you prefer" email_feedback: "%{link} your feedback, if you prefer"
email_link: "Email" email_link: "Email"
any_problem: "Any Problem?"
contact_podmin: "Contact the administrator of your pod!"
mail_podmin: "Podmin E-Mail"
cubbies: cubbies:
heading: "Connect to Cubbi.es" heading: "Connect to Cubbi.es"
explanation: "Cubbi.es is the first Diaspora application under development." explanation: "Cubbi.es is the first Diaspora application under development."