Loading Changelog.md +1 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ * Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282) ## Features * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290) # 0.6.3.0 Loading app/assets/images/buttons/liberapay-button.svg 0 → 100644 +10 −0 Original line number Diff line number Diff line <svg xmlns="http://www.w3.org/2000/svg" width="83" height="30"> <rect id="back" fill="#f6c915" x="1" y=".5" width="82" height="29" rx="4"/> <svg viewBox="0 0 80 80" height="16" width="16" x="7" y="7"> <g transform="translate(-78.37-208.06)" fill="#1a171b"> <path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"/> <path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.364 5.355-1.094 1.609-.728 2.979-1.747 4.111-3.055 1.131-1.307 2.01-2.877 2.64-4.714.628-1.835.943-3.858.943-6.071 0-2.161-.479-3.998-1.433-5.506-.956-1.508-2.615-2.263-4.978-2.263-1.61 0-3.118.151-4.525.453l-5.28 21.948"/> </g> </svg> <text fill="#1a171b" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif" font-weight="700" font-size="14" x="50" y="20">Donate</text> </svg> app/helpers/application_helper.rb +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ module ApplicationHelper AppConfig.settings.source_url.presence || "#{root_path.chomp('/')}/source.tar.gz" end def donations_enabled? AppConfig.settings.paypal_donations.enable? || AppConfig.settings.liberapay_username.present? || AppConfig.bitcoin_donation_address.present? end def timeago(time, options={}) timeago_tag(time, options.merge(:class => 'timeago', :title => time.iso8601, :force => true)) if time end Loading app/views/shared/_donatepod.html.haml +26 −12 Original line number Diff line number Diff line - if AppConfig.settings.paypal_donations.enable? %p PayPal: %br %form{action: "https://www.paypal.com/cgi-bin/webscr", method: "post", target: "_blank"} %input{name: "cmd", type: "hidden", value: "_s-xclick"} - if AppConfig.settings.paypal_donations.paypal_hosted_button_id.present? %input{name: "hosted_button_id", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_hosted_button_id} %input{name: "hosted_button_id", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_hosted_button_id} - if AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted.present? %input{name: "encrypted", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted} %input{name: "encrypted", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted} %input{name: "currency_code", type: "hidden", value: AppConfig.settings.paypal_donations.currency} %input{name: "submit", type: "submit", value: t("aspects.index.donate"), class: "btn btn-default"} %input.btn.btn-default{name: "submit", type: "submit", value: t("aspects.index.donate")} - if AppConfig.settings.liberapay_username.present? %p Liberapay: %br %a{id: "liberapay-button", href: "https://liberapay.com/#{AppConfig.settings.liberapay_username}/donate"} = image_tag "buttons/liberapay-button.svg", alt: t("aspects.index.donate"), title: t("aspects.index.donate_liberapay") - if AppConfig.bitcoin_donation_address %p Bitcoin: %br %input{type: "text", id: "bitcoin_address", value: AppConfig.bitcoin_donation_address, readonly: true} app/views/streams/main_stream.html.haml +1 −1 Original line number Diff line number Diff line Loading @@ -124,7 +124,7 @@ .content != t("bookmarklet.explanation", link: link_to(t("bookmarklet.post_something"), bookmarklet_code)) - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address - if donations_enabled? .section.collapsed .title %h5.title-header Loading Loading
Changelog.md +1 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ * Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282) ## Features * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290) # 0.6.3.0 Loading
app/assets/images/buttons/liberapay-button.svg 0 → 100644 +10 −0 Original line number Diff line number Diff line <svg xmlns="http://www.w3.org/2000/svg" width="83" height="30"> <rect id="back" fill="#f6c915" x="1" y=".5" width="82" height="29" rx="4"/> <svg viewBox="0 0 80 80" height="16" width="16" x="7" y="7"> <g transform="translate(-78.37-208.06)" fill="#1a171b"> <path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"/> <path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.364 5.355-1.094 1.609-.728 2.979-1.747 4.111-3.055 1.131-1.307 2.01-2.877 2.64-4.714.628-1.835.943-3.858.943-6.071 0-2.161-.479-3.998-1.433-5.506-.956-1.508-2.615-2.263-4.978-2.263-1.61 0-3.118.151-4.525.453l-5.28 21.948"/> </g> </svg> <text fill="#1a171b" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif" font-weight="700" font-size="14" x="50" y="20">Donate</text> </svg>
app/helpers/application_helper.rb +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ module ApplicationHelper AppConfig.settings.source_url.presence || "#{root_path.chomp('/')}/source.tar.gz" end def donations_enabled? AppConfig.settings.paypal_donations.enable? || AppConfig.settings.liberapay_username.present? || AppConfig.bitcoin_donation_address.present? end def timeago(time, options={}) timeago_tag(time, options.merge(:class => 'timeago', :title => time.iso8601, :force => true)) if time end Loading
app/views/shared/_donatepod.html.haml +26 −12 Original line number Diff line number Diff line - if AppConfig.settings.paypal_donations.enable? %p PayPal: %br %form{action: "https://www.paypal.com/cgi-bin/webscr", method: "post", target: "_blank"} %input{name: "cmd", type: "hidden", value: "_s-xclick"} - if AppConfig.settings.paypal_donations.paypal_hosted_button_id.present? %input{name: "hosted_button_id", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_hosted_button_id} %input{name: "hosted_button_id", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_hosted_button_id} - if AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted.present? %input{name: "encrypted", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted} %input{name: "encrypted", type: "hidden", value: AppConfig.settings.paypal_donations.paypal_unhosted_button_encrypted} %input{name: "currency_code", type: "hidden", value: AppConfig.settings.paypal_donations.currency} %input{name: "submit", type: "submit", value: t("aspects.index.donate"), class: "btn btn-default"} %input.btn.btn-default{name: "submit", type: "submit", value: t("aspects.index.donate")} - if AppConfig.settings.liberapay_username.present? %p Liberapay: %br %a{id: "liberapay-button", href: "https://liberapay.com/#{AppConfig.settings.liberapay_username}/donate"} = image_tag "buttons/liberapay-button.svg", alt: t("aspects.index.donate"), title: t("aspects.index.donate_liberapay") - if AppConfig.bitcoin_donation_address %p Bitcoin: %br %input{type: "text", id: "bitcoin_address", value: AppConfig.bitcoin_donation_address, readonly: true}
app/views/streams/main_stream.html.haml +1 −1 Original line number Diff line number Diff line Loading @@ -124,7 +124,7 @@ .content != t("bookmarklet.explanation", link: link_to(t("bookmarklet.post_something"), bookmarklet_code)) - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address - if donations_enabled? .section.collapsed .title %h5.title-header Loading