Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

install/upgrade refactoring to consolidate all use cases and implement IInstallable interface for modules, moved tenant creation to site management UI, fixed z-order issues in Blazor theme, enhanced JS Interop methods to support integrity and crossorigin

Browse Source
This commit is contained in:
Shaun Walker
2020-04-30 13:58:04 -04:00
parent 099fddf2b6
commit 34538dd945
44 changed files with 1051 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
View File

@ -16,7 +16,6 @@
.main .top-row {
background-color: #e6e6e6;
border-bottom: 1px solid #d6d5d5;
z-index: 9999;
}
.sidebar {
@ -42,6 +41,10 @@
margin-bottom: 0;
}
.app-controlpanel {
z-index: 9999;
}
.app-menu .nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
@ -97,19 +100,21 @@
position: fixed;
left: 275px;
top: 0;
z-index: 1;
z-index: 3
}
.sidebar {
width: 250px;
height: 100vh;
position: sticky;
top: 0;
z-index: 1
}
.main .top-row {
position: sticky;
top: 0;
z-index: 2
}
.main > div {
@ -154,10 +159,23 @@
}
@media (max-width: 767px) {
.breadcrumbs {
position: fixed;
top: 150px;
width: 100%;
left: 0;
z-index: 1;
}
.sidebar {
margin-top: 3.5rem;
position: fixed;
width: 100%;
z-index: 2;
}
.main .top-row {
z-index: 2;
}
.main > .top-row.px-4 {
@ -172,13 +190,6 @@
margin-left: auto;
}
.breadcrumbs {
position: fixed;
top: 150px;
width: 100%;
left: 0;
}
.main > .container {
margin-top: 200px;
}

28
Oqtane.Server/wwwroot/js/interop.js
View File

@ -48,7 +48,7 @@ window.interop = {
}
}
},
includeLink: function (id, rel, url, type) {
includeLink: function (id, rel, url, type, integrity, crossorigin) {
var link;
if (id !== "") {
link = document.getElementById(id);
@ -66,6 +66,12 @@ window.interop = {
if (type !== "") {
link.type = type;
}
if (integrity !== "") {
link.integrity = integrity;
}
if (crossorigin !== "") {
link.crossorigin = crossorigin;
}
document.head.appendChild(link);
}
else {
@ -78,9 +84,15 @@ window.interop = {
if (type !== "" && link.type !== type) {
link.setAttribute('type', type);
}
if (integrity !== "" && link.integrity !== integrity) {
link.setAttribute('integrity', integrity);
}
if (crossorigin !== "" && link.crossorigin !== crossorigin) {
link.setAttribute('crossorigin', crossorigin);
}
}
},
includeScript: function (id, src, content, location) {
includeScript: function (id, src, content, location, integrity, crossorigin) {
var script;
if (id !== "") {
script = document.getElementById(id);
@ -92,6 +104,12 @@ window.interop = {
}
if (src !== "") {
script.src = src;
if (integrity !== "") {
script.integrity = integrity;
}
if (crossorigin !== "") {
script.crossorigin = crossorigin;
}
}
else {
script.innerHTML = content;
@ -108,6 +126,12 @@ window.interop = {
if (script.src !== src) {
script.src = src;
}
if (integrity !== "" && script.integrity !== integrity) {
script.setAttribute('integrity', integrity);
}
if (crossorigin !== "" && script.crossorigin !== crossorigin) {
script.setAttribute('crossorigin', crossorigin);
}
}
else {
if (script.innerHTML !== content) {