From e1c6a175b0361ca59a4b3100137fe15ce3b47767 Mon Sep 17 00:00:00 2001 From: Peter Deltchev Date: Sat, 24 Oct 2015 18:50:45 -0700 Subject: [PATCH] Implemented a "Powered by Pony.fm" attribution in the site's footer. --- config/ponyfm.php | 14 ++++++++++++++ resources/assets/styles/layout.less | 4 ++-- resources/environments/.env.example | 2 +- resources/environments/.env.local | 8 ++++---- resources/environments/.env.production | Bin 552 -> 580 bytes resources/environments/.env.stage | Bin 559 -> 587 bytes resources/views/shared/_app_layout.blade.php | 13 +++++++++---- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/config/ponyfm.php b/config/ponyfm.php index 1203dd76..add3e98f 100644 --- a/config/ponyfm.php +++ b/config/ponyfm.php @@ -40,4 +40,18 @@ return [ 'google_analytics_id' => env('GOOGLE_ANALYTICS_ID', null), + /* + |-------------------------------------------------------------------------- + | Show "Powered by Pony.fm" footer? + |-------------------------------------------------------------------------- + | + | If true, a "Powered by Pony.fm" footer is used to comply with the + | license's attribution requirement. This should only be disabled on + | the official Pony.fm website, since that already shares its name with + | the open-source project. + | + */ + + 'use_powered_by_footer' => env('USE_POWERED_BY_FOOTER', true), + ]; diff --git a/resources/assets/styles/layout.less b/resources/assets/styles/layout.less index 110b1383..77990e01 100644 --- a/resources/assets/styles/layout.less +++ b/resources/assets/styles/layout.less @@ -122,13 +122,13 @@ header { } } - &.x-poniverseCredit { + &.x-attribution { position: absolute; bottom: 0; max-width: 100%; margin: 0; padding: 0; - text-align: center; + text-align: right; a { padding: 10px; diff --git a/resources/environments/.env.example b/resources/environments/.env.example index 3e28b6b7..663e44a8 100644 --- a/resources/environments/.env.example +++ b/resources/environments/.env.example @@ -1,6 +1,6 @@ APP_ENV=local APP_DEBUG=true -APP_URL=http://pony.fm.local/ +APP_URL=http://ponyfm-dev.poni/ APP_KEY=SomeRandomString DB_HOST=localhost diff --git a/resources/environments/.env.local b/resources/environments/.env.local index 4b58c75c..5503e87a 100644 --- a/resources/environments/.env.local +++ b/resources/environments/.env.local @@ -1,6 +1,6 @@ APP_ENV=local APP_DEBUG=true -APP_URL=http://pony.fm.local/ +APP_URL=http://ponyfm-dev.poni/ APP_KEY=q5lKAapzJwZas0izFS1CfCn3oX8Kk2jj DB_HOST=localhost @@ -18,9 +18,9 @@ MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null -PONI_CLIENT_ID= -PONI_CLIENT_SECRET= +PONI_CLIENT_ID=null +PONI_CLIENT_SECRET=null PONYFM_DATASTORE=/vagrant-files -GOOGLE_ANALYTICS_ID=UA-29463256-1 +GOOGLE_ANALYTICS_ID=null diff --git a/resources/environments/.env.production b/resources/environments/.env.production index 49e132d863f825f20e347c205502696264162106..2d9a778d360fed6315916c37d45bd5e25a24e78d 100644 GIT binary patch literal 580 zcmV-K0=xYHM@dveQdv+`0LzACBEM zcYo-j$)y81u5^6ObkYQ*iavQtp4ljsFcs!}BEirQ%Gt17I#kat%r4f_4=W#P7xQ;> zDjiaUPeUok*R>2;FJhmeaG~lfK zIy+{we4G`^h0n8a*J?gR?}eEFMohe<)dZcx;8D@=w4sI_nB;e*4zw92FSGaB;1NiT zY&(Ji1m9K1kFm{;9YlPnfkYR}0U&G0fr7C@z4t z{a>a2!w(@HC(;?(myD;+bFf+IC9OOTG0*@7=Z4mH2Dw;gVrf{DwnUu+%$Vtv5t?`; z6rXf(DAf7!hEd#TN5**ZVi&l!PqS(lf|F|O5^{N@QCrX!waHB`{!zl`LyXPHNPg@6 S!Gnvr>IIm)W7XH29(S+D~mR+g&vZQxy z!kcMK77NVDzUazE3sb?%c|-1Uvm+s>Qj|)jAS{{1oxXJ&f}ic-{66L3gE!RS_~<$t z?*H`K7(aPFIghI_Kvv*)1iEMGz!S8IfLozu%7kFWfTZ<=k_${!zD~cs}TNJr6 zL=bTLBKpDVQ$6`jfe#^$lu&l&Ifn?BEiA&NWc1g|7IXLsx+{9aAi}7>Rz;>r4TDo? zBd5YkQSns)xdXpD*Gd&w7CU4})F5HCt%HD$C)^K&k-It`RO+eZF~G^9`Ik@>U`3=(&O{`H%d)%QbEO1$zIBt#}}^oQJvb*Q7R`KK+FtC20*#wmTXIc)Fc` zAU!ZD>F6@3ulJ^^{)jE++*Zh;eF*st8$Yh{yKg9-Xu~=43eRJp`I(Bxga(q5BGTU= z*)5UhIiu&8^oPW2o^!u(2l zAi(^evPLuU1JM-7vCU%Ec#w++%G=WsXHAh1n+V7~;)v2adAsuO$WXO6C`RhvAE@^| qdPNKhp63$b<5xj1+~{UhG9{{L8!_Wp&9YEXIRDurq{W%~6o?lCITdyQ diff --git a/resources/environments/.env.stage b/resources/environments/.env.stage index 7f820962cb39a5e3c7c157a078dabc0a7e781d46..1646235553d4261015cd2e792fb7dd0fb996f9aa 100644 GIT binary patch literal 587 zcmV-R0<`@AM@dveQdv+`0Ft23JENoJ$lvr!eUkz&8?8mV8r%z&-VNf8Pq4GJd_$X4 z$u6Y}GA>-=Co%F5Qj_GyOy#1m8#I_Q4-q11LvgC<%7*$|Tsv)RX#Y2X{%I8C6{ZF}p70kklZODcr*kx@ zMMOBed-YdQYe4oy#&W()%Rn3{mvhpmCbQ6gsj5mhlhvZs=_Qfv2O3)e`d ZteWP$oEr6uT8dbX`-Rb6*i;3VCIq+~BP;*_ literal 559 zcmV+~0?_>cM@dveQdv+`0F5?5>lLc4UvjG=IEQQ#c)p)&F2_2y16E|mV=>caq}4mgw_Iqmqn)93ZGAU9 z`_kdZz;B5B=`8+anTOUE_|_17BlnjQR&mJa;WaT`ddYU2Hl@fQlA&*0#$K@(uEHS0 z0n^hk90D?oO@ZJ-?3Rlxe7{cF(4>&0!jGy&7mxhdp(s;UvV`5E8ryZuYx;>>d+^o~ z8xCKY?gOSypFRCk*U4Xf?MF<`b_0c3C`0Dz)UkOnt<0_OX0u3EzbY55V{6{d?zdGq zukfQ(0%dF7+KF~1ew8Ofl0pBq8#Hdp|#Doq=Ln22r@qbfh zCfB2u{EiwdcT(SLl3%N+1wv8jV~-h82^}nC`Nzvq5BbhbNC@UALfUtC0zu z7FPRbFF==f89|nZLs(Bz`4OLb0`{Y}>wey$NV%Pp5I|7Sz-Rkz)5kc2dF>sC{=9+~ zdD;*?5OTj!Wvi}(VhSJg2#+Z;C7J-`VQ8zo>K{Ca{JHqo0{CLNs%np{LuK9*qf%!_C6vyeVtRwNf#IS>*I xg!Po~)dEJt?o~x?l@6PHZlEUa>yA0MDTcvYY!Fz-%3Y7asELU@jsx!sUdsVf6D|M% diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php index cb769311..22904a48 100644 --- a/resources/views/shared/_app_layout.blade.php +++ b/resources/views/shared/_app_layout.blade.php @@ -81,10 +81,15 @@
  • Login
  • Register
    • @endif -
  • - - A community project by - Poniverse logo +
  • + + @if(config('ponyfm.use_powered_by_footer')) + Powered by + Pony.fm logo + @else + A community project by + Poniverse logo + @endif