Browse Source

edited css for music
Carousel edits for margins
hide ombi button if SSO not enabled

causefx 8 years ago
parent
commit
d2d6c68971
3 changed files with 26 additions and 194 deletions
  1. 4 4
      css/organizr.css
  2. 4 38
      js/custom.js
  3. 18 152
      js/functions.js

+ 4 - 4
css/organizr.css

@@ -206,7 +206,7 @@ h2.m-b-0.font-medium.pull-right {
   position: absolute;
   position: absolute;
   left:0px;
   left:0px;
   overflow: hidden;
   overflow: hidden;
-  filter: blur(0px) grayscale(1);
+  filter: contrast(309%) brightness(5%) saturate(32) grayscale(96%);
 }
 }
 .el-element-overlay .el-card-item .el-overlay-1 img.imageSourceRight {
 .el-element-overlay .el-card-item .el-overlay-1 img.imageSourceRight {
   width: 56%;
   width: 56%;
@@ -214,7 +214,7 @@ h2.m-b-0.font-medium.pull-right {
   position: absolute;
   position: absolute;
   right:0px;
   right:0px;
   overflow: hidden;
   overflow: hidden;
-  filter: blur(0px) grayscale(1)
+  filter: contrast(309%) brightness(5%) saturate(32) grayscale(96%);
 }
 }
 img.imageSourceTop {
 img.imageSourceTop {
   top: -37px;
   top: -37px;
@@ -223,7 +223,7 @@ img.imageSourceTop {
   display: block;
   display: block;
   z-index: -1;
   z-index: -1;
   overflow: hidden;
   overflow: hidden;
-  filter: blur(4px) grayscale(1)
+  filter: contrast(309%) brightness(5%) saturate(32) grayscale(96%);
 }
 }
 img.imageSourceBottom {
 img.imageSourceBottom {
   top: -114px;
   top: -114px;
@@ -232,7 +232,7 @@ img.imageSourceBottom {
   display: block;
   display: block;
   z-index: -1;
   z-index: -1;
   overflow: hidden;
   overflow: hidden;
-  filter: blur(4px) grayscale(1)
+  filter: contrast(309%) brightness(5%) saturate(32) grayscale(96%);
 }
 }
 .recent-cover .hover-homepage-item {
 .recent-cover .hover-homepage-item {
   position: relative;
   position: relative;

+ 4 - 38
js/custom.js

@@ -1579,45 +1579,11 @@ $(document).on("click", ".metadata-get", function(e) {
             autoplay: true,
             autoplay: true,
             slideSpeed : 300,
             slideSpeed : 300,
             paginationSpeed : 400,
             paginationSpeed : 400,
-            margin:40,
             nav:false,
             nav:false,
-            autoplay:true,
-            dots:false,
-            responsive:{
-                0:{
-                    items:2
-                },
-                500:{
-                    items:3
-                },
-                650:{
-                    items:4
-                },
-                800:{
-                    items:5
-                },
-                950:{
-                    items:6
-                },
-                992:{
-                    items:4
-                },
-                1250:{
-                    items:5
-                },
-                1400:{
-                    items:6
-                },
-                1550:{
-                    items:7
-                },
-                1700:{
-                    items:8
-                },
-                1850:{
-                    items:9
-                }
-            }
+			dots:false,
+			margin:10,
+			autoWidth:true,
+			items:4
         });
         });
     }).fail(function(xhr) {
     }).fail(function(xhr) {
         console.error("Organizr Function: API Connection Failed");
         console.error("Organizr Function: API Connection Failed");

+ 18 - 152
js/functions.js

@@ -2434,12 +2434,13 @@ function buildPlaylist(array, type){
 function buildRequest(array){
 function buildRequest(array){
 	var requests = (typeof array.content !== 'undefined') ? true : false;
 	var requests = (typeof array.content !== 'undefined') ? true : false;
 	var dropdown = '';
 	var dropdown = '';
+	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){
 	if(requests){
 		var builtDropdown = `
 		var builtDropdown = `
 		<button aria-expanded="false" data-toggle="dropdown" class="btn btn-info dropdown-toggle waves-effect waves-light" type="button">
 		<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>
 			<i class="fa fa-filter m-r-5"></i><span class="caret"></span>
 		</button>
 		</button>
-		<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>
+		`+ombiButton+`
 		<div role="menu" class="dropdown-menu request-filter">
 		<div role="menu" class="dropdown-menu request-filter">
 			<div class="checkbox checkbox-success m-l-20 checkbox-circle">
 			<div class="checkbox checkbox-success m-l-20 checkbox-circle">
 				<input id="request-filter-available" data-filter="request-available" class="filter-request-input" type="checkbox" checked="">
 				<input id="request-filter-available" data-filter="request-available" class="filter-request-input" type="checkbox" checked="">
@@ -2604,7 +2605,7 @@ function processRequest(id,type){
 //Ombi actions
 //Ombi actions
 function ombiActions(id,action,type){
 function ombiActions(id,action,type){
 	//console.log(id,action,type);
 	//console.log(id,action,type);
-	var msg = (activeInfo.user.groupID <= 1) ? '<a href="https://github.com/tidusjar/Ombi/issues/2176" target="_blank">Not Org Fault - Ask Obmi</a>' : 'Connection Error to Request Server';
+	var msg = (activeInfo.user.groupID <= 1) ? '<a href="https://github.com/tidusjar/Ombi/issues/2176" target="_blank">Not Org Fault - Ask Ombi</a>' : 'Connection Error to Request Server';
 	ajaxloader('.preloader-'+id,'in');
 	ajaxloader('.preloader-'+id,'in');
 	organizrAPI('POST','api/?v1/ombi',{id:id, action:action, type:type}).success(function(data) {
 	organizrAPI('POST','api/?v1/ombi',{id:id, action:action, type:type}).success(function(data) {
 		var response = JSON.parse(data);
 		var response = JSON.parse(data);
@@ -3179,57 +3180,12 @@ function homepageRecent(type, timeout=30000){
 		document.getElementById('homepageOrder'+type+'recent').innerHTML = '';
 		document.getElementById('homepageOrder'+type+'recent').innerHTML = '';
 		$('#homepageOrder'+type+'recent').html(buildRecent(response.data, type));
 		$('#homepageOrder'+type+'recent').html(buildRecent(response.data, type));
 		$('.recent-items').owlCarousel({
 		$('.recent-items').owlCarousel({
-    	    margin:40,
     	    nav:false,
     	    nav:false,
     		autoplay:false,
     		autoplay:false,
             dots:false,
             dots:false,
-    	    responsive:{
-    	        0:{
-    	            items:2
-    	        },
-    	        500:{
-    	            items:3
-    	        },
-    	        650:{
-    	            items:4
-    	        },
-    	        800:{
-    	            items:5
-    	        },
-    	        950:{
-    	            items:6
-    	        },
-    	        1100:{
-    	            items:7
-    	        },
-    	        1250:{
-    	            items:8
-    	        },
-    	        1400:{
-    	            items:9
-    	        },
-    	        1550:{
-    	            items:10
-    	        },
-    	        1700:{
-    	            items:11
-    	        },
-    	        1850:{
-    	            items:12
-    	        },
-    	        2000:{
-    	            items:13
-    	        },
-    	        2150:{
-    	            items:14
-    	        },
-    	        2300:{
-    	            items:15
-    	        },
-    	        2450:{
-    	            items:16
-    	        }
-    	    }
+			margin:10,
+		    autoWidth:true,
+		    items:4
     	})
     	})
 	}).fail(function(xhr) {
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");
 		console.error("Organizr Function: API Connection Failed");
@@ -3252,57 +3208,12 @@ function homepagePlaylist(type, timeout=30000){
 		document.getElementById('homepageOrder'+type+'playlist').innerHTML = '';
 		document.getElementById('homepageOrder'+type+'playlist').innerHTML = '';
 		$('#homepageOrder'+type+'playlist').html(buildPlaylist(response.data, type));
 		$('#homepageOrder'+type+'playlist').html(buildPlaylist(response.data, type));
 		$('.playlist-items').owlCarousel({
 		$('.playlist-items').owlCarousel({
-    	    margin:40,
-    	    nav:false,
-    		autoplay:false,
-            dots:false,
-    	    responsive:{
-    	        0:{
-    	            items:2
-    	        },
-    	        500:{
-    	            items:3
-    	        },
-    	        650:{
-    	            items:4
-    	        },
-    	        800:{
-    	            items:5
-    	        },
-    	        950:{
-    	            items:6
-    	        },
-    	        1100:{
-    	            items:7
-    	        },
-    	        1250:{
-    	            items:8
-    	        },
-    	        1400:{
-    	            items:9
-    	        },
-    	        1550:{
-    	            items:10
-    	        },
-    	        1700:{
-    	            items:11
-    	        },
-    	        1850:{
-    	            items:12
-    	        },
-    	        2000:{
-    	            items:13
-    	        },
-    	        2150:{
-    	            items:14
-    	        },
-    	        2300:{
-    	            items:15
-    	        },
-    	        2450:{
-    	            items:16
-    	        }
-    	    }
+			nav:false,
+			autoplay:false,
+			dots:false,
+			margin:10,
+			autoWidth:true,
+			items:4
     	})
     	})
 	}).fail(function(xhr) {
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");
 		console.error("Organizr Function: API Connection Failed");
@@ -3316,57 +3227,12 @@ function homepageRequests(timeout=600000){
 			$('#homepageOrderombi').html(buildRequest(response.data));
 			$('#homepageOrderombi').html(buildRequest(response.data));
 		}
 		}
 		$('.request-items').owlCarousel({
 		$('.request-items').owlCarousel({
-    	    margin:40,
-    	    nav:false,
-    		autoplay:false,
-            dots:false,
-    	    responsive:{
-    	        0:{
-    	            items:2
-    	        },
-    	        500:{
-    	            items:3
-    	        },
-    	        650:{
-    	            items:4
-    	        },
-    	        800:{
-    	            items:5
-    	        },
-    	        950:{
-    	            items:6
-    	        },
-    	        1100:{
-    	            items:7
-    	        },
-    	        1250:{
-    	            items:8
-    	        },
-    	        1400:{
-    	            items:9
-    	        },
-    	        1550:{
-    	            items:10
-    	        },
-    	        1700:{
-    	            items:11
-    	        },
-    	        1850:{
-    	            items:12
-    	        },
-    	        2000:{
-    	            items:13
-    	        },
-    	        2150:{
-    	            items:14
-    	        },
-    	        2300:{
-    	            items:15
-    	        },
-    	        2450:{
-    	            items:16
-    	        }
-    	    }
+			nav:false,
+			autoplay:false,
+			dots:false,
+			margin:10,
+			autoWidth:true,
+			items:4
     	})
     	})
 	}).fail(function(xhr) {
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");
 		console.error("Organizr Function: API Connection Failed");