Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add feature contact pod admin

  • Loading branch information...
commit 491c2a537c66affc296bfa2c8cf65a614144fccb 1 parent e05edcf
@movilla movilla authored
View
4 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.
View
BIN  app/assets/images/icons/mail.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
12 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"
View
1  config/defaults.yml
@@ -85,6 +85,7 @@ defaults:
message_bus_api_key:
admins:
account:
+ podmin_email:
inline_resque_web: true
development:
View
3  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
View
3  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?"

how about renaming this to 'Technical Problem?'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ 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."
@prellele

how about renaming this to 'Technical Problem?'

Please sign in to comment.
Something went wrong with that request. Please try again.