Bladeren bron

Added alternate homepage headers

causefx 8 jaren geleden
bovenliggende
commit
e6f1e3ae89
3 gewijzigde bestanden met toevoegingen van 115 en 33 verwijderingen
  1. 1 0
      api/config/default.php
  2. 11 0
      api/functions/organizr-functions.php
  3. 103 33
      js/functions.js

+ 1 - 0
api/config/default.php

@@ -20,6 +20,7 @@ return array(
 	'buttonTextColor' => '',
 	'buttonHoverColor' => '',
     'buttonTextHoverColor' => '',
+	'alternateHomepageHeaders' => false,
     'lockScreen' => false,
     'theme'=>'Organizr',
     'style'=>'dark',

+ 11 - 0
api/functions/organizr-functions.php

@@ -13,6 +13,9 @@ function organizrSpecialSettings()
             ),
             'ombi' => array(
                 'enabled' => (qualifyRequest($GLOBALS['homepageOmbiAuth']) && $GLOBALS['homepageOmbiEnabled'] == true && $GLOBALS['ssoOmbi']) ? true : false,
+            ),
+            'options' => array(
+                'alternateHomepageHeaders' => $GLOBALS['alternateHomepageHeaders'],
             )
         )
     );
@@ -544,6 +547,14 @@ function getCustomizeAppearance()
                     'value' => $GLOBALS['loginWallpaper']
                 )
             ),
+            'Options' => array(
+                array(
+                    'type' => 'switch',
+                    'name' => 'alternateHomepageHeaders',
+                    'label' => 'Alternate Homepage Titles',
+                    'value' => $GLOBALS['alternateHomepageHeaders']
+                )
+            ),
             'Colors & Themes' => array(
                 array(
                     'type' => 'input',

+ 103 - 33
js/functions.js

@@ -2460,28 +2460,46 @@ function buildRecent(array, type){
 	var video = (recent) ? (array.content.filter(p => p.type == "video").length > 0 ? true : false) : false;
 	var music = (recent) ? (array.content.filter(p => p.type == "music").length > 0 ? true : false) : false;
 	var dropdown = '';
+	var header = '';
+	var headerAlt = '';
 	dropdown += (recent && movie) ? `<li><a data-filter="recent-movie" server-filter="`+type+`" href="javascript:void(0);">Movies</a></li>` : '';
 	dropdown += (recent && tv) ? `<li><a data-filter="recent-tv" server-filter="`+type+`" href="javascript:void(0);">Shows</a></li>` : '';
 	dropdown += (recent && video) ? `<li><a data-filter="recent-video" server-filter="`+type+`" href="javascript:void(0);">Videos</a></li>` : '';
 	//dropdown += (recent && music) ? `<li><a data-filter="recent-music" server-filter="`+type+`" href="javascript:void(0);">Music</a></li>` : '';
+	var dropdownMenu = `
+	<div class="btn-group pull-right">
+		<button aria-expanded="false" data-toggle="dropdown" class="btn btn-info dropdown-toggle waves-effect waves-light" type="button">
+			<i class="fa fa-filter m-r-5"></i><span class="caret"></span>
+		</button>
+		<ul role="menu" class="dropdown-menu recent-filter">
+			<li><a data-filter="all" server-filter="`+type+`" href="javascript:void(0);">All</a></li>
+			<li class="divider"></li>
+			`+dropdown+`
+		</ul>
+	</div>`;
+	if(activeInfo.settings.homepage.options.alternateHomepageHeaders){
+		var headerAlt = `
+		<div class="col-md-12">
+			<h4 class="pull-left"><span lang="en">Recently Added</span></h4>
+			`+dropdownMenu+`
+			<hr>
+		</div>
+		`;
+	}else{
+		var header = `
+		<div class="panel-heading bg-info p-t-10 p-b-10">
+			<span class="pull-left m-t-5"><img class="lazyload homepageImageTitle" data-src="plugins/images/tabs/`+type+`.png"> &nbsp; <span lang="en">Recently Added</span></span>
+			`+dropdownMenu+`
+			<div class="clearfix"></div>
+		</div>
+		`;
+	}
 	return (recent) ? `
 	<div id="`+type+`Recent" class="row">
+		`+headerAlt+`
         <div class="col-lg-12">
             <div class="panel panel-default">
-                <div class="panel-heading bg-info p-t-10 p-b-10">
-					<span class="pull-left m-t-5"><img class="lazyload homepageImageTitle" data-src="plugins/images/tabs/`+type+`.png"> &nbsp; <span lang="en">Recently Added</span></span>
-					<div class="btn-group pull-right">
-	                    <button aria-expanded="false" data-toggle="dropdown" class="btn btn-info dropdown-toggle waves-effect waves-light" type="button">
-							<i class="fa fa-filter m-r-5"></i><span class="caret"></span>
-						</button>
-	                    <ul role="menu" class="dropdown-menu recent-filter">
-	                        <li><a data-filter="all" server-filter="`+type+`" href="javascript:void(0);">All</a></li>
-							<li class="divider"></li>
-							`+dropdown+`
-	                    </ul>
-	                </div>
-					<div class="clearfix"></div>
-				</div>
+				`+header+`
                 <div class="panel-wrapper p-b-0 collapse in">
 					<div class="`+type+`-recent-hidden hidden"></div>
                     <div class="owl-carousel owl-theme recent-items `+type+`-recent">
@@ -2510,6 +2528,8 @@ function buildPlaylist(array, type){
 	var hidden = '';
 	var count = 0;
 	var items = '';
+	var header = '';
+	var headerAlt = '';
 	if(playlist){
 		$.each(array.content, function(i,v) {
 			v.title = cleanPlaylistTitle(v.title);
@@ -2534,17 +2554,33 @@ function buildPlaylist(array, type){
 		</ul>
 		`;
 	}
+	if(activeInfo.settings.homepage.options.alternateHomepageHeaders){
+		var headerAlt = `
+		<div class="col-md-12">
+			<h4 class="pull-left"><span class="`+type+`-playlistTitle">`+first+`</span></h4>
+			<div class="btn-group pull-right">
+				`+builtDropdown+`
+			</div>
+			<hr>
+		</div>
+		`;
+	}else{
+		var header = `
+		<div class="panel-heading bg-info p-t-10 p-b-10">
+			<span class="pull-left m-t-5"><img class="lazyload homepageImageTitle" data-src="plugins/images/tabs/`+type+`.png"> &nbsp; <span class="`+type+`-playlistTitle">`+first+`</span></span>
+			<div class="btn-group pull-right">
+					`+builtDropdown+`
+			</div>
+			<div class="clearfix"></div>
+		</div>
+		`;
+	}
 	return (playlist) ? `
 	<div id="`+type+`Playlist" class="row">
+		`+headerAlt+`
         <div class="col-lg-12">
             <div class="panel panel-default">
-                <div class="panel-heading bg-info p-t-10 p-b-10">
-					<span class="pull-left m-t-5"><img class="lazyload homepageImageTitle" data-src="plugins/images/tabs/`+type+`.png"> &nbsp; <span class="`+type+`-playlistTitle">`+first+`</span></span>
-					<div class="btn-group pull-right">
-							`+builtDropdown+`
-	                </div>
-					<div class="clearfix"></div>
-				</div>
+                `+header+`
                 <div class="panel-wrapper p-b-0 collapse in">
                     `+items+`
                 </div>
@@ -2556,6 +2592,8 @@ function buildPlaylist(array, type){
 function buildRequest(array){
 	var requests = (typeof array.content !== 'undefined') ? true : false;
 	var dropdown = '';
+	var headerAlt = '';
+	var header = '';
 	var ombiButton = (activeInfo.settings.homepage.ombi.enabled == true) ? `<button href="#new-request" id="newRequestButton" class="btn btn-info waves-effect waves-light inline-popups" data-effect="mfp-zoom-out"><i class="fa fa-plus m-l-5"></i></button>` : '';
 	if(requests){
 		var builtDropdown = `
@@ -2596,17 +2634,33 @@ function buildRequest(array){
 
 		`;
 	}
+	if(activeInfo.settings.homepage.options.alternateHomepageHeaders){
+		var headerAlt = `
+		<div class="col-md-12">
+			<h4 class="pull-left"><span lang="en">Requested Content</span></h4>
+			<div class="btn-group pull-right">
+				`+builtDropdown+`
+			</div>
+			<hr>
+		</div>
+		`;
+	}else{
+		var header = `
+		<div class="panel-heading bg-info p-t-10 p-b-10">
+			<span class="pull-left m-t-5"><img class="lazyload homepageImageTitle" data-src="plugins/images/tabs/ombi.png"> &nbsp; Requested Content</span>
+			<div class="btn-group pull-right">
+					`+builtDropdown+`
+			</div>
+			<div class="clearfix"></div>
+		</div>
+		`;
+	}
 	return (requests) ? `
 	<div id="ombi-requests" class="row">
+		`+headerAlt+`
         <div class="col-lg-12">
             <div class="panel panel-default">
-                <div class="panel-heading bg-info p-t-10 p-b-10">
-					<span class="pull-left m-t-5"><img class="lazyload homepageImageTitle" data-src="plugins/images/tabs/ombi.png"> &nbsp; Requested Content</span>
-					<div class="btn-group pull-right">
-							`+builtDropdown+`
-	                </div>
-					<div class="clearfix"></div>
-				</div>
+				`+header+`
                 <div class="panel-wrapper p-b-0 collapse in">
 				<div class="owl-carousel owl-theme request-items">
 					`+buildRequestItem(array.content)+`
@@ -3072,6 +3126,8 @@ function buildDownloader(array, source){
 	var downloader = (queueItems || historyItems) ? true : false;
 	var state = '';
 	var active = '';
+	var headerAlt = '';
+	var header = '';
 	//console.log(array);
 	//console.log(queueItems);
 	//console.log(historyItems);
@@ -3119,14 +3175,28 @@ function buildDownloader(array, source){
 		`;
 	}
 	menu += '</ul>';
+	if(activeInfo.settings.homepage.options.alternateHomepageHeaders){
+		var headerAlt = `
+		<div class="col-md-12">
+			<h2 class="text-white m-0 pull-left text-uppercase"><img class="lazyload homepageImageTitle `+active+`" data-src="plugins/images/tabs/`+source+`.png">  &nbsp; `+state+`</h2>
+			`+menu+`
+			<hr>
+		</div>
+		`;
+	}else{
+		var header = `
+		<div class="white-box bg-info m-b-0 p-b-0 p-t-10 mailbox-widget">
+			<h2 class="text-white m-0 pull-left text-uppercase"><img class="lazyload homepageImageTitle `+active+`" data-src="plugins/images/tabs/`+source+`.png">  &nbsp; `+state+`</h2>
+			`+menu+`
+			<div class="clearfix"></div>
+		</div>
+		`;
+	}
 	return downloader ? `
 	<div class="row">
+		`+headerAlt+`
 		<div class="col-lg-12">
-	        <div class="white-box bg-info m-b-0 p-b-0 p-t-10 mailbox-widget">
-				<h2 class="text-white m-0 pull-left text-uppercase"><img class="lazyload homepageImageTitle `+active+`" data-src="plugins/images/tabs/`+source+`.png">  &nbsp; `+state+`</h2>
-	            `+menu+`
-				<div class="clearfix"></div>
-	        </div>
+	        `+header+`
 	        <div class="white-box p-0">
 	            <div class="tab-content m-t-0">`+listing+`</div>
 	        </div>