[150] fix universe

pull/1351/head
meisnate12 2 years ago
parent 461c0f5495
commit ac1b32b88b

@ -1 +1 @@
1.18.3-develop149 1.18.3-develop150

@ -16,13 +16,14 @@ translations:
templates: templates:
universe: universe:
conditionals: conditionals:
my_mdblist_list: mdblist_list:
conditions: conditions:
- trakt_list.exists: false - trakt_list_<<key>>.exists: false
imdb_list.exists: false imdb_list_<<key>>.exists: false
mdblist_list_<<key>>.exists: false
value: <<mdblist_url>> value: <<mdblist_url>>
default: default:
mdblist_list_<<key>>: <<my_mdblist_list>> mdblist_list_<<key>>: <<mdblist_list>>
name_mapping_<<key>>: <<name_mapping>> name_mapping_<<key>>: <<name_mapping>>
minimum_items: 2 minimum_items: 2
optional: optional:

@ -379,6 +379,38 @@ table.clearTable, table.clearTable tbody, table.clearTable tr, table.clearTable
table.dualTable td, table.dualTable th { table.dualTable td, table.dualTable th {
padding-left: 15px !important; padding-left: 15px !important;
} }
.image-accordion {
background-color: #eee;
color: #444;
cursor: pointer;
padding: 18px;
width: 100%;
border: none;
text-align: left;
outline: none;
font-size: 15px;
transition: 0.4s;
}
.image-active, .image-accordion:hover {
background-color: #ccc;
}
.image-panel {
padding: 0 18px;
background-color: white;
max-height: 0;
overflow: hidden;
transition: max-height 0.2s ease-out;
}
.image-accordion:after {
content: '\02795'; /* Unicode character for "plus" sign (+) */
font-size: 13px;
color: #777;
float: right;
margin-left: 5px;
}
.image-active:after {
content: "\2796"; /* Unicode character for "minus" sign (-) */
}
table.image-table { table.image-table {
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
@ -386,7 +418,7 @@ table.image-table {
border-collapse: separate; border-collapse: separate;
} }
table.image-table td { table.image-table td {
padding: 15px padding: 15px;
text-align: center; text-align: center;
background-color: #1D1D1D background-color: #1D1D1D
} }

@ -1,6 +1,22 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$("#bing").load("https://raw.githubusercontent.com/meisnate12/PMM-Image-Sets/master/movies/readme.md"); $("#bing").load("https://raw.githubusercontent.com/meisnate12/PMM-Image-Sets/master/movies/readme.md");
var acc = document.getElementsByClassName("image-accordion");
var i;
for (i = 0; i < acc.length; i++) {
acc[i].addEventListener("click", function() {
this.classList.toggle("image-active");
var parent = this.parentElement;
var panel = this.nextElementSibling;
if (panel.style.maxHeight){
panel.style.maxHeight = null;
} else {
panel.style.maxHeight = panel.scrollHeight + "px";
parent.style.maxHeight = parseInt(parent.style.maxHeight) + panel.scrollHeight + "px";
}
});
}
}); });
</script> </script>

@ -399,6 +399,7 @@ class DataFile:
error_text = "- does not exist" error_text = "- does not exist"
elif var_key[:-7] in variables and variables[var_key[:-7]]: elif var_key[:-7] in variables and variables[var_key[:-7]]:
error_text = "- exists" error_text = "- exists"
con_var_value = var_key[:-7]
elif var_key.endswith(".not"): elif var_key.endswith(".not"):
if var_key[:-4] in variables: if var_key[:-4] in variables:
con_var_value = variables[var_key[:-4]] con_var_value = variables[var_key[:-4]]
@ -422,7 +423,7 @@ class DataFile:
logger.trace(f'Condition {i} Failed: {var_key}{error_text}') logger.trace(f'Condition {i} Failed: {var_key}{error_text}')
condition_passed = False condition_passed = False
if condition_passed: if condition_passed:
logger.debug(f'Conditional Variable: {final_key} is "{condition["value"]}"') logger.trace(f'Conditional Variable: {final_key} is "{condition["value"]}"')
condition_found = True condition_found = True
if condition["value"] is not None: if condition["value"] is not None:
variables[final_key] = condition["value"] variables[final_key] = condition["value"]
@ -432,11 +433,11 @@ class DataFile:
break break
if not condition_found: if not condition_found:
if "default" in con_value: if "default" in con_value:
logger.debug(f'Conditional Variable: {final_key} defaults to "{con_value["default"]}"') logger.trace(f'Conditional Variable: {final_key} defaults to "{con_value["default"]}"')
variables[final_key] = con_value["default"] variables[final_key] = con_value["default"]
variables[f"{final_key}_encoded"] = util.quote(con_value["default"]) variables[f"{final_key}_encoded"] = util.quote(con_value["default"])
else: else:
logger.debug(f"Conditional Variable: {final_key} added as optional variable") logger.trace(f"Conditional Variable: {final_key} added as optional variable")
optional.append(str(final_key)) optional.append(str(final_key))
optional.append(f"{final_key}_encoded") optional.append(f"{final_key}_encoded")

Loading…
Cancel
Save