IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/custom-theme' of github.com:ONLYOFFICE/AppServer into feature/custom-theme

Browse Source
This commit is contained in:
Vlada Gazizova 2022-11-11 15:31:36 +03:00
commit 450739da91
2 changed files with 108 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/ASC.Web.Api/Api/Settings/SettingsController.cs
View File

@ -394,9 +394,22 @@ public class SettingsController : BaseSettingsController
var settingItem = settings.Themes.SingleOrDefault(r => r.Id == item.Id);
if (settingItem != null)
{
settingItem.AccentColor = item.AccentColor;
settingItem.ButtonsMain = item.ButtonsMain;
settingItem.TextColor = item.TextColor;
if (item.Main != null)
{
settingItem.Main = new CustomColorThemesSettingsColorItem
{
Accent = item.Main.Accent,
Buttons = item.Main.Buttons
};
}
if (item.Text != null)
{
settingItem.Text = new CustomColorThemesSettingsColorItem
{
Accent = item.Text.Accent,
Buttons = item.Text.Buttons
};
}
}
else
{

123
web/ASC.Web.Core/Utility/Settings/CustomColorThemesSettings.cs
View File

@ -63,53 +63,114 @@ public class CustomColorThemesSettings : ISettings<CustomColorThemesSettings>
public class CustomColorThemesSettingsItem
{
public int Id { get; set; }
public string AccentColor { get; set; }
public string ButtonsMain { get; set; }
public string TextColor { get; set; }
public CustomColorThemesSettingsColorItem Main { get; set; }
public CustomColorThemesSettingsColorItem Text { get; set; }
public static List<CustomColorThemesSettingsItem> Default => new List<CustomColorThemesSettingsItem>
{
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 1,
AccentColor = "#4781D1",
ButtonsMain = "#5299E0",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#4781D1",
Buttons = "#5299E0"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
},
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 2,
AccentColor = "#F97A0B",
ButtonsMain = "#FF9933",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#F97A0B",
Buttons = "#FF9933"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
},
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 3,
AccentColor = "#2DB482",
ButtonsMain = "#22C386",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#2DB482",
Buttons = "#22C386"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
},
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 4,
AccentColor = "#F2675A",
ButtonsMain = "#F27564",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#F2675A",
Buttons = "#F27564"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
},
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 5,
AccentColor = "#6D4EC2",
ButtonsMain = "#8570BD",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#6D4EC2",
Buttons = "#8570BD"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
},
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 6,
AccentColor = "#11A4D4",
ButtonsMain = "#13B7EC",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#11A4D4",
Buttons = "#13B7EC"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
},
new CustomColorThemesSettingsItem {
new CustomColorThemesSettingsItem
{
Id = 7,
AccentColor = "#444444",
ButtonsMain = "#6E6E6E",
TextColor = "#FFFFFF"
Main = new CustomColorThemesSettingsColorItem
{
Accent = "#444444",
Buttons = "#6E6E6E"
},
Text = new CustomColorThemesSettingsColorItem
{
Accent = "#FFFFFF",
Buttons = "#FFFFFF"
}
}
};
}
public class CustomColorThemesSettingsColorItem
{
public string Accent { get; set; }
public string Buttons { get; set; }
}