fix weather homepage

api/classes/organizr.class.php

@@ -6177,6 +6177,95 @@ class Organizr
 		}
 	}
 	
+	public function CBPFWTabs()
+	{
+		return '
+		<script>
+		/**
+		* cbpFWTabs.js v1.0.0
+		* http://www.codrops.com
+		*
+		* Licensed under the MIT license.
+		* http://www.opensource.org/licenses/mit-license.php
+		*
+		* Copyright 2014, Codrops
+		* http://www.codrops.com
+		*/
+		;( function( window ) {
+			\'use strict\';
+		
+			function extend( a, b ) {
+				for( var key in b ) {
+					if( b.hasOwnProperty( key ) ) {
+						a[key] = b[key];
+					}
+				}
+				return a;
+			}
+		
+			function CBPFWTabs( el, options ) {
+				this.el = el;
+				this.options = extend( {}, this.options );
+		        extend( this.options, options );
+		        this._init();
+			}
+		
+			CBPFWTabs.prototype.options = {
+				start : 0
+			};
+		
+			CBPFWTabs.prototype._init = function() {
+				// tabs elems
+				this.tabs = [].slice.call( this.el.querySelectorAll( \'nav > ul > li\' ) );
+				// content items
+				this.items = [].slice.call( this.el.querySelectorAll( \'.content-wrap > section\' ) );
+				// current index
+				this.current = -1;
+				// show current content item
+				try{
+					if(this.tabs[0].innerHTML.indexOf(\'#settings\') >= 0){
+						this._show(' . $this->config['defaultSettingsTab'] . ');
+						let tabId = $(this.items[' . $this->config['defaultSettingsTab'] . ']).attr("id") + "-anchor";
+						$("#" + tabId).click();
+						$("#" + tabId + " a").click();
+					}else{
+						this._show();
+					}
+				}catch{
+					this._show();
+				}
+				// init events
+				this._initEvents();
+			};
+		
+			CBPFWTabs.prototype._initEvents = function() {
+				var self = this;
+				this.tabs.forEach( function( tab, idx ) {
+					tab.addEventListener( \'click\', function( ev ) {
+						ev.preventDefault();
+						self._show( idx );
+					} );
+				} );
+			};
+		
+			CBPFWTabs.prototype._show = function( idx ) {
+				if( this.current >= 0 ) {
+					this.tabs[ this.current ].className = this.items[ this.current ].className = \'\';
+				}
+				// change current
+				this.current = idx != undefined ? idx : this.options.start >= 0 && this.options.start < this.items.length ? this.options.start : 0;
+				this.tabs[ this.current ].className = \'tab-current\';
+				this.items[ this.current ].className = \'content-current\';
+			};
+		
+			// add to global namespace
+			window.CBPFWTabs = CBPFWTabs;
+		
+		})( window );
+		</script>
+		';
+	}
+	
 	public function socksHeadingHTML($app)
 	{
 		return '

api/pages/settings.php

@@ -14,89 +14,6 @@ function get_page_settings($Organizr)
 	$Organizr->writeLog('success', 'Admin Function -  Accessed Settings Page', $Organizr->user['username']);
 	return $Organizr->pluginFiles('js', true) . '
 <script>
-	/**
-	 * cbpFWTabs.js v1.0.0
-	 * http://www.codrops.com
-	 *
-	 * Licensed under the MIT license.
-	 * http://www.opensource.org/licenses/mit-license.php
-	 *
-	 * Copyright 2014, Codrops
-	 * http://www.codrops.com
-	 */
-	;( function( window ) {
-	
-		\'use strict\';
-	
-		function extend( a, b ) {
-			for( var key in b ) {
-				if( b.hasOwnProperty( key ) ) {
-					a[key] = b[key];
-				}
-			}
-			return a;
-		}
-	
-		function CBPFWTabs( el, options ) {
-			this.el = el;
-			this.options = extend( {}, this.options );
-	        extend( this.options, options );
-	        this._init();
-		}
-	
-		CBPFWTabs.prototype.options = {
-			start : 0
-		};
-	
-		CBPFWTabs.prototype._init = function() {
-			// tabs elems
-			this.tabs = [].slice.call( this.el.querySelectorAll( \'nav > ul > li\' ) );
-			// content items
-			this.items = [].slice.call( this.el.querySelectorAll( \'.content-wrap > section\' ) );
-			// current index
-			this.current = -1;
-			// show current content item
-			try{
-				if(this.tabs[0].innerHTML.indexOf(\'#settings\') >= 0){
-					this._show(' . $Organizr->config['defaultSettingsTab'] . ');
-					let tabId = $(this.items[' . $Organizr->config['defaultSettingsTab'] . ']).attr("id") + "-anchor";
-					$("#" + tabId).click();
-					$("#" + tabId + " a").click();
-				}else{
-					this._show();
-				}
-			}catch{
-				this._show();
-			}
-			// init events
-			this._initEvents();
-		};
-	
-		CBPFWTabs.prototype._initEvents = function() {
-			var self = this;
-			this.tabs.forEach( function( tab, idx ) {
-				tab.addEventListener( \'click\', function( ev ) {
-					ev.preventDefault();
-					self._show( idx );
-				} );
-			} );
-		};
-	
-		CBPFWTabs.prototype._show = function( idx ) {
-			if( this.current >= 0 ) {
-				this.tabs[ this.current ].className = this.items[ this.current ].className = \'\';
-			}
-			// change current
-			this.current = idx != undefined ? idx : this.options.start >= 0 && this.options.start < this.items.length ? this.options.start : 0;
-			this.tabs[ this.current ].className = \'tab-current\';
-			this.items[ this.current ].className = \'content-current\';
-		};
-	
-		// add to global namespace
-		window.CBPFWTabs = CBPFWTabs;
-	
-	})( window );
-
     (function() {
         updateCheck();
         authDebugCheck();

index.php

@@ -246,6 +246,7 @@ echo $Organizr->googleTracking();
 echo $Organizr->pluginFiles('js');
 echo $Organizr->formKey();
 echo $Organizr->loadCalendarJS();
+echo $Organizr->CBPFWTabs();
 ?>
 </body>
 

js/functions.js

@@ -189,7 +189,7 @@ function formatDebug(result){
             formatted = result;
 
     }
-    return '<pre class="whitebox bg-org text-success">' + formatted + '</pre>';
+    return '<pre class="whitebox bg-org text-success default-scroller">' + formatted + '</pre>';
 }
 function getDebugPreInfo(){
     var formatted = 'Version: ' + activeInfo.version +
@@ -10714,6 +10714,11 @@ function loadJavascript(script = null, defer = false){
 		}
 	}
 }
+
+function tabShit(){
+
+}
+
 function launch(){
 	console.info('https://docs.organizr.app/books/setup-features/page/organizr-20--%3E-21-migration-guide');
 	organizrConsole('API V2 API','If you see a 404 Error for api/v2/launch below this line, you have not setup the new location block... See URL above this line', 'error');