Переглянути джерело

remove beerpay
add github in place of beerpay
add heartbeat

CauseFX 5 роки тому
батько
коміт
785cac8677
2 змінених файлів з 25 додано та 17 видалено
  1. 22 15
      api/pages/settings.php
  2. 3 2
      js/functions.js

+ 22 - 15
api/pages/settings.php

@@ -231,18 +231,15 @@ function get_page_settings($Organizr)
     											<li><a href="https://github.com/causefx/organizr" target="_blank"><i class="mdi mdi-github-box mdi-24px"></i></a></li>
     										</ul>
     										<hr>
-    										<div class="p-20 p-t-0 text-center">
-						                        <h4 class="font-medium">Backers</h4>
-						                        <ul class="dp-table m-t-30 backers-list"></ul>
-						                    </div>
+    										<a href="https://poeditor.com/join/project/T6l68hksTE" target="_blank">
+		                                        <div class="white-box bg-org">
+		                                            <h4 lang="en">Want to help translate?</h4>
+		                                            <p lang="en">Head on over to POEditor and help us translate Organizr into your language</p>
+		                                            <p lang="en">I will try and import new strings every Friday</p>
+		                                        </div>
+		                                    </a>
+    										
     									</div>
-    									<a href="https://poeditor.com/join/project/T6l68hksTE" target="_blank">
-	                                        <div class="white-box bg-org">
-	                                            <h4 lang="en">Want to help translate?</h4>
-	                                            <p lang="en">Head on over to POEditor and help us translate Organizr into your language</p>
-	                                            <p lang="en">I will try and import new strings every Friday</p>
-	                                        </div>
-	                                    </a>
     								</div>
                                     <div class="col-lg-6 col-sm-12 col-md-6">
                                         <div class="white-box bg-org">
@@ -275,6 +272,16 @@ function get_page_settings($Organizr)
 							            </div>
 							        </div>
     							</div>
+    							<div class="row">
+    							    <div class="col-lg-12">
+                                        <div class="white-box bg-org">
+	                                        <div class="p-20 p-t-0 text-center">
+							                    <h4 class="font-medium">Backers</h4>
+							                    <ul class="dp-table m-t-30 backers-list"></ul>
+							                </div>
+						                </div>
+                                    </div>
+    							</div>
                                 <div class="clearfix"></div>
                             </div>
                             <div role="tabpanel" class="tab-pane fade" id="settings-settings-donate">
@@ -282,7 +289,7 @@ function get_page_settings($Organizr)
                                     <div class="white-box bg-org">
                                         <ul class="nav nav-tabs tabs customtab">
                                             <li class="tab active">
-                                                <a href="#donate-beer" data-toggle="tab" aria-expanded="true"> <span class=""><i class="fa fa-beer text-warning"></i></span> <span class="hidden-xs" lang="en">Beerpay.io</span> </a>
+                                                <a href="#donate-github" data-toggle="tab" aria-expanded="true"> <span class=""><i class="fa fa-github text-warning"></i></span> <span class="hidden-xs" lang="en">Github Sponsor</span> </a>
                                             </li>
                                             <li class="tab">
                                                 <a href="#donate-paypal" data-toggle="tab" aria-expanded="true"> <span class=""><i class="fa fa-paypal text-info"></i></span> <span class="hidden-xs" lang="en">PayPal</span> </a>
@@ -304,9 +311,9 @@ function get_page_settings($Organizr)
                                             </li>
                                         </ul>
                                         <div class="tab-content">
-                                        	<div class="tab-pane active" id="donate-beer">
-                                                <blockquote>Want to show support on Beerpay.io?  Send me a beer :)<br/>Please click the button to continue.</blockquote>
-                                                <button onclick="window.open(\'https://beerpay.io/causefx/Organizr\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
+                                        	<div class="tab-pane active" id="donate-github">
+                                                <blockquote>Want to show support on Github?  Sponsor me :)<br/>Please click the button to continue.</blockquote>
+                                                <button onclick="window.open(\'https://github.com/sponsors/causefx\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
                                             </div>
                                             <div class="tab-pane" id="donate-paypal">
                                                 <blockquote>I have chosen to go with PayPal Pools so everyone can see how much people have donated.<br/>Please click the button to continue.</blockquote>

+ 3 - 2
js/functions.js

@@ -3392,7 +3392,8 @@ function newsLoad(){
             $.each(response, function(i,v) {
                 count++;
                 let alertDefined = (typeof v.important !== 'undefined' || v.important === false);
-                let alert = (alertDefined) ? '<small class="animated loop-animation flash text-white"><i class="ti-alert"></i>Important Message</small>' : '';
+                let alert = (alertDefined) ? '<span class="animated loop-animation flash text-danger">&nbsp; <i class="ti-alert"></i>&nbsp; Important Message</span>' : '';
+                let heartBeat = (alertDefined) ? '<div class="notify m-t-20 pull-right"><span class="heartbit"></span><span class="point"></span></div>' : '';
                 let newBody = `
                 <h5 class="pull-left">`+moment(v.date).format('LLL')+`</h5>
                 <h5 class="pull-right">`+v.author+`</h5>
@@ -3402,7 +3403,7 @@ function newsLoad(){
                 `;
                 if(count <= limit){
                     items[i] = {
-                        title:v.title,
+                        title:v.title + heartBeat,
                         body:newBody
                     }
                 }