Add CustomCss tab at Skins Admin.

sunengine · Jan 16, 2020 · d78bc34 · d78bc34
1 parent d7c4d38
commit d78bc34
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/Client/src/admin/skins/CustomCssAdmin.vue b/Client/src/admin/skins/CustomCssAdmin.vue
@@ -1,12 +1,5 @@
 <template>
 	<div class="custom-css-admin q-gutter-y-md">
-		<q-input
-			filled
-			input-class="custom-css-admin__text-area"
-			type="textarea"
-			v-model="customCss"
-		/>
-		<div class="clear"></div>
 		<div class="flex">
 			<q-btn
 				no-caps
@@ -24,6 +17,13 @@
 				:label="$tl('refreshBtn')"
 			/>
 		</div>
+		<q-input
+			filled
+			:label="$tl('cssInput')"
+			input-class="custom-css-admin__text-area"
+			type="textarea"
+			v-model="customCss"
+		/>
 	</div>
 </template>
 

diff --git a/Client/src/i18n/en-us/admin.js b/Client/src/i18n/en-us/admin.js
@@ -489,6 +489,7 @@ export default {
 	},
 	CustomCssAdmin: {
 		title: "Custom CSS",
+		cssInput: "Custom CSS",
 		saveBtn: "@:Global.btn.save",
 		refreshBtn: "Reload from server",
 		reloadSuccessNotify: "Css reloaded from server",

diff --git a/Client/src/i18n/ru/admin.js b/Client/src/i18n/ru/admin.js
@@ -528,6 +528,7 @@ export default {
 	},
 	CustomCssAdmin: {
 		title: "Произвольный CSS",
+		cssInput: "Произвольный CSS",
 		saveBtn: "@:Global.btn.save",
 		refreshBtn: "Перегрузить с сервера",
 		reloadSuccessNotify: "Данные перезагружены с сервера",

diff --git a/Client/src/statics/config.js b/Client/src/statics/config.js
@@ -65,5 +65,5 @@ else if (config.Global.SiteUrl.startsWith("https://"))
 	config.Global.SiteSchema = "https://";
 else throw "SiteUrl in config.js have to start with 'http://' or 'https://'.";
 
-document.writeln(`<link href="${config.Global.CustomCssUrl}" rel="stylesheet" />`);
+document.writeln(`<link href="${config.Global.CustomCssUrl}?customcssver=111111" rel="stylesheet" />`);
 
diff --git a/Config.template/Init/Materials/index-page.html b/Config.template/Init/Materials/index-page.html
@@ -51,6 +51,6 @@ <h1 class="index-page__header index-page__demo-header">Sun<wbr/>Engine
             <span class="index-page__info-block-accent">Moderator</span>,
             <span class="index-page__info-block-accent">Admin</span>.</p>
         <p>Пароль: <span class="index-page__info-block-accent">password</span>.</p>
-        <p class="index-page__version">Версия: <span class="num">v2.1.3</span></p>
+        <p class="index-page__version">Версия: <span class="num">v2.2.0</span></p>
     </div>
 </div>
diff --git a/Server/SunEngine.Admin/Services/ConfigurationAdminService.cs b/Server/SunEngine.Admin/Services/ConfigurationAdminService.cs
@@ -16,6 +16,8 @@ public class ConfigurationAdminService
 		protected IConfigurationRoot configurationRoot { get; }
 		protected IOptionsMonitor<GlobalOptions> globalOptions { get; }
 
+		protected Random ran = new Random();
+
 		public ConfigurationAdminService(
 			IPathService pathService,
 			IConfigurationRoot configurationRoot)
@@ -89,18 +91,27 @@ public void UpdateClientScripts()
 				$"// auto-start\n{json}\n // auto-end", RegexOptions.Singleline);
 			File.WriteAllText(configJsPath, configJs);
 
-			UpdateScriptsVersion();
+			UpdateConfigVersion();
 		}
 
-		protected void UpdateScriptsVersion()
+		public void UpdateConfigVersion()
 		{
-			var ran = new Random();
-
 			var indexHtmlPath = pathService.Combine(PathNames.WwwRootDirName, "index.html");
 			string text = File.ReadAllText(indexHtmlPath);
 			Regex reg = new Regex("configver=\\d+\"");
 			text = reg.Replace(text, $"configver={ran.Next()}\"");
 			File.WriteAllText(indexHtmlPath, text);
 		}
+
+		public void UpdateCustomCssVersion()
+		{
+			UpdateConfigVersion();
+
+			var configJsPath =  pathService.Combine(PathNames.WwwRootDirName,"statics" ,"config.js");
+			string text = File.ReadAllText(configJsPath);
+			Regex reg = new Regex("customcssver=\\d+\"");
+			text = reg.Replace(text, $"customcssver={ran.Next()}\"");
+			File.WriteAllText(configJsPath, text);
+		}
 	}
 }
diff --git a/Server/SunEngine.Admin/Services/SkinsAdminService.cs b/Server/SunEngine.Admin/Services/SkinsAdminService.cs
@@ -193,6 +193,8 @@ public void UpdateCustomCss(string cssText)
 				File.Delete(customCssPath);
 
 			File.WriteAllText(customCssPath, cssText);
+
+			configurationAdminService.UpdateCustomCssVersion();
 		}
 
 		public List<SkinInfo> GetAllSkins(SkinType skinType)