nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2273 from Pistos/donate-optional

Browse source 
Make the donation form (right sidebar) optional.
This commit is contained in:
Daniel Grippi 2011-10-29 21:00:46 -07:00
commit d6b68d2f9b
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/views/shared/_right_sections.html.haml
View file

@ -69,13 +69,14 @@
.content .content
!= t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet)) != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet))
.section - if ! AppConfig['do_not_request_donations']
.title .section
= image_tag('/images/icons/coffee.png') .title
%h5 = image_tag('/images/icons/coffee.png')
= t('aspects.index.donate') %h5
.content = t('aspects.index.donate')
= t('aspects.index.keep_us_running', :pod => URI.parse(AppConfig[:pod_url]).host) .content
%br = t('aspects.index.keep_us_running', :pod => URI.parse(AppConfig[:pod_url]).host)
= render 'shared/donate' %br
= render 'shared/donate'

7
config/application.yml.example
View file

@ -67,6 +67,9 @@ defaults: &defaults
# Email to send spotlight suggestions to # Email to send spotlight suggestions to
spotlight_suggest_email: '' spotlight_suggest_email: ''
# Set this to true to remove the donation request form in the right sidebar
do_not_request_donations: false
# List of users who have admin privileges # List of users who have admin privileges
# (expressed as an array of local usernames) # (expressed as an array of local usernames)
admins: admins:
@ -183,10 +186,10 @@ defaults: &defaults
# The location of your redis cache. # The location of your redis cache.
# IMPORTANT: DO NOT CHANGE THIS IF YOU DO NOT KNOW WHAT YOU ARE DOING! # IMPORTANT: DO NOT CHANGE THIS IF YOU DO NOT KNOW WHAT YOU ARE DOING!
# #
# Leave this blank to use the same Redis database # Leave this blank to use the same Redis database
# that your Resque workers use (happy path). # that your Resque workers use (happy path).
# #
# This takes an ip (or DNS record). It assumes that your Redis database # This takes an ip (or DNS record). It assumes that your Redis database
# is running on the default Redis port. # is running on the default Redis port.
redis_location: '' redis_location: ''