Fixed the PresetTheme stuff !wip

pull/2194/head
Jamie Rees 7 years ago
parent bb1795345b
commit e3f5f032c0

@ -17,56 +17,56 @@
} }
var appName = customization.ApplicationName; var appName = customization.ApplicationName;
if(string.IsNullOrEmpty(appName)) if (string.IsNullOrEmpty(appName))
{ {
appName = "Ombi"; appName = "Ombi";
} }
} }
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<!-- <!--
bbbbbbbb bbbbbbbb
OOOOOOOOO b::::::b iiii OOOOOOOOO b::::::b iiii
OO:::::::::OO b::::::b i::::i OO:::::::::OO b::::::b i::::i
OO:::::::::::::OO b::::::b iiii OO:::::::::::::OO b::::::b iiii
O:::::::OOO:::::::O b:::::b O:::::::OOO:::::::O b:::::b
O::::::O O::::::O mmmmmmm mmmmmmm b:::::bbbbbbbbb iiiiiii O::::::O O::::::O mmmmmmm mmmmmmm b:::::bbbbbbbbb iiiiiii
O:::::O O:::::O mm:::::::m m:::::::mm b::::::::::::::bb i:::::i O:::::O O:::::O mm:::::::m m:::::::mm b::::::::::::::bb i:::::i
O:::::O O:::::Om::::::::::mm::::::::::mb::::::::::::::::b i::::i O:::::O O:::::Om::::::::::mm::::::::::mb::::::::::::::::b i::::i
O:::::O O:::::Om::::::::::::::::::::::mb:::::bbbbb:::::::b i::::i O:::::O O:::::Om::::::::::::::::::::::mb:::::bbbbb:::::::b i::::i
O:::::O O:::::Om:::::mmm::::::mmm:::::mb:::::b b::::::b i::::i O:::::O O:::::Om:::::mmm::::::mmm:::::mb:::::b b::::::b i::::i
O:::::O O:::::Om::::m m::::m m::::mb:::::b b:::::b i::::i O:::::O O:::::Om::::m m::::m m::::mb:::::b b:::::b i::::i
O:::::O O:::::Om::::m m::::m m::::mb:::::b b:::::b i::::i O:::::O O:::::Om::::m m::::m m::::mb:::::b b:::::b i::::i
O::::::O O::::::Om::::m m::::m m::::mb:::::b b:::::b i::::i O::::::O O::::::Om::::m m::::m m::::mb:::::b b:::::b i::::i
O:::::::OOO:::::::Om::::m m::::m m::::mb:::::bbbbbb::::::bi::::::i O:::::::OOO:::::::Om::::m m::::m m::::mb:::::bbbbbb::::::bi::::::i
OO:::::::::::::OO m::::m m::::m m::::mb::::::::::::::::b i::::::i OO:::::::::::::OO m::::m m::::m m::::mb::::::::::::::::b i::::::i
OO:::::::::OO m::::m m::::m m::::mb:::::::::::::::b i::::::i OO:::::::::OO m::::m m::::m m::::mb:::::::::::::::b i::::::i
OOOOOOOOO mmmmmm mmmmmm mmmmmmbbbbbbbbbbbbbbbb iiiiiiii OOOOOOOOO mmmmmm mmmmmm mmmmmmbbbbbbbbbbbbbbbb iiiiiiii
--> -->
<meta charset="utf-8"/> <meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge"> <meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="description" content="Ombi, media request tool"> <meta name="description" content="Ombi, media request tool">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@appName</title> <title>@appName</title>
<meta property="og:title" content=“@appName”/> <meta property="og:title" content=“@appName” />
<meta property="og:image" content="~/images/logo.png"/> <meta property="og:image" content="~/images/logo.png" />
<meta property="og:site_name" content=“@appName”/> <meta property="og:site_name" content=“@appName” />
<base href="/@baseUrl"/> <base href="/@baseUrl" />
<link rel="apple-touch-icon" sizes="180x180" href="~/images/favicon/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="~/images/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="~/images/favicon/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="~/images/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="~/images/favicon/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="~/images/favicon/favicon-16x16.png">
@ -80,39 +80,35 @@ O:::::::OOO:::::::Om::::m m::::m m::::mb:::::bbbbbb::::::bi::::::i
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="~/loading.css" asp-append-version="true"/> <link rel="stylesheet" href="~/loading.css" asp-append-version="true" />
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true"/> <link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
<script src="~/dist/vendor.js" asp-append-version="true" defer></script> <script src="~/dist/vendor.js" asp-append-version="true" defer></script>
<script src="~/dist/main.js" asp-append-version="true" defer></script> <script src="~/dist/main.js" asp-append-version="true" defer></script>
</head> </head>
<body> <body>
@{ @{
if (customization.HasPresetTheme) if (customization.HasPresetTheme)
{ {
if (!string.IsNullOrEmpty(baseUrl)) if (!string.IsNullOrEmpty(baseUrl))
{ {
if (!customization.PresetThemeContent.Contains("/" + baseUrl)) if (!customization.PresetThemeContent.Contains("/" + baseUrl))
{ {
var index = customization.PresetThemeContent.IndexOf("/api/"); var index = customization.PresetThemeContent.IndexOf("/api/");
customization.PresetThemeContent = customization.PresetThemeContent.Insert(index, "/" + baseUrl); if (index > 0)
} else {
{ customization.PresetThemeContent = customization.PresetThemeContent.Insert(index, "/" + baseUrl);
var startIndex = customization.PresetThemeContent.IndexOf("href="); }
var index = customization.PresetThemeContent.IndexOf("/api/"); }
customization.PresetThemeContent = customization.PresetThemeContent.Remove(startIndex+6, (index-(startIndex+6))); }
index = customization.PresetThemeContent.IndexOf("/api/");
customization.PresetThemeContent = customization.PresetThemeContent.Insert(index, "/" + baseUrl);
}
}
<style> <style>
@Html.Raw(customization.PresetThemeContent) @Html.Raw(customization.PresetThemeContent)
</style> </style>
} }
if (!string.IsNullOrEmpty(customization.CustomCssLink)) if (!string.IsNullOrEmpty(customization.CustomCssLink))
{ {
<link rel="stylesheet" href="@customization.CustomCssLink" asp-append-version="true"/> <link rel="stylesheet" href="@customization.CustomCssLink" asp-append-version="true" />
} }
} }

Loading…
Cancel
Save