Compare commits
3 Commits
e6f8947c08
...
d0d1c652fe
Author | SHA1 | Date | |
---|---|---|---|
d0d1c652fe | |||
0a1bef37fe | |||
2a825da32e |
@ -130,7 +130,6 @@ namespace Yavsc.Services
|
|||||||
public bool Part(string cxId, string roomName, string reason)
|
public bool Part(string cxId, string roomName, string reason)
|
||||||
{
|
{
|
||||||
ChatRoomInfo chanInfo;
|
ChatRoomInfo chanInfo;
|
||||||
var userName = ChatUserNames[cxId];
|
|
||||||
if (Channels.TryGetValue(roomName, out chanInfo))
|
if (Channels.TryGetValue(roomName, out chanInfo))
|
||||||
{
|
{
|
||||||
if (!chanInfo.Users.Contains(cxId))
|
if (!chanInfo.Users.Contains(cxId))
|
||||||
|
@ -6,7 +6,9 @@ namespace Yavsc
|
|||||||
public class SiteSettings
|
public class SiteSettings
|
||||||
{
|
{
|
||||||
public string Title { get; set; } = "Yavsc";
|
public string Title { get; set; } = "Yavsc";
|
||||||
|
|
||||||
public string Slogan { get; set; } = "";
|
public string Slogan { get; set; } = "";
|
||||||
|
public string Banner { get; set; } = "";
|
||||||
|
|
||||||
public string StyleSheet { get; set; } = "site.css";
|
public string StyleSheet { get; set; } = "site.css";
|
||||||
public string FavIcon { get; set; } = "favicon.ico";
|
public string FavIcon { get; set; } = "favicon.ico";
|
||||||
|
@ -3,18 +3,23 @@ using Yavsc.Models.Blog;
|
|||||||
|
|
||||||
namespace Yavsc.ViewModels.Blog;
|
namespace Yavsc.ViewModels.Blog;
|
||||||
|
|
||||||
public class BlogPostEditViewModel : BlogPostBase
|
|
||||||
|
public class BlogPostCreateViewModel : BlogPostBase
|
||||||
|
{
|
||||||
|
public bool Publish { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BlogPostEditViewModel : BlogPostCreateViewModel
|
||||||
{
|
{
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
|
|
||||||
public required long Id { get; set; }
|
public required long Id { get; set; }
|
||||||
|
|
||||||
public bool Publish { get; set; }
|
|
||||||
|
|
||||||
public BlogPostEditViewModel()
|
public BlogPostEditViewModel()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ namespace Yavsc.Controllers
|
|||||||
[Authorize()]
|
[Authorize()]
|
||||||
public IActionResult Create(string title)
|
public IActionResult Create(string title)
|
||||||
{
|
{
|
||||||
var result = new BlogPostBase
|
var result = new BlogPostCreateViewModel
|
||||||
{
|
{
|
||||||
Title = title
|
Title = title
|
||||||
};
|
};
|
||||||
|
@ -26,8 +26,13 @@ pushInProd: publish
|
|||||||
@sudo sync
|
@sudo sync
|
||||||
@sudo systemctl start $(SERVICE_PROD)
|
@sudo systemctl start $(SERVICE_PROD)
|
||||||
|
|
||||||
|
%.css: %.scss
|
||||||
|
scss $^ > $@
|
||||||
|
|
||||||
%.min.js: %.js
|
%.min.js: %.js
|
||||||
jsmin < $^ > $@
|
jsmin < $^ > $@
|
||||||
|
|
||||||
%.min.css: %.css
|
%.min.css: %.css
|
||||||
jsmin < $^ > $@
|
jsmin < $^ > $@
|
||||||
|
|
||||||
|
css: wwwroot/css/site.css
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
@act.Description </p>
|
@act.Description </p>
|
||||||
|
|
||||||
@if (act.Children.Count>0) {
|
@if (act.Children.Count>0) {
|
||||||
<a asp-route-id="@act.Code" class="btn btn-default">
|
<a asp-route-id="@act.Code" class="btn btn-light">
|
||||||
@foreach (Activity c in act.Children) {
|
@foreach (Activity c in act.Children) {
|
||||||
@Html.DisplayFor(subact=>c)
|
@Html.DisplayFor(subact=>c)
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,10 @@
|
|||||||
<script src="~/js/site.js" asp-append-version="true"></script>
|
<script src="~/js/site.js" asp-append-version="true"></script>
|
||||||
@await RenderSectionAsync("header", false)
|
@await RenderSectionAsync("header", false)
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body style="background-image: url('@Config.SiteSetup.Banner');
|
||||||
|
background-position: 0%;
|
||||||
|
background-attachment: fixed;
|
||||||
|
">
|
||||||
<partial name="_Nav" />
|
<partial name="_Nav" />
|
||||||
@RenderSection("ctxmenu", required: false)
|
@RenderSection("ctxmenu", required: false)
|
||||||
@if (ViewData["Notify"] != null)
|
@if (ViewData["Notify"] != null)
|
||||||
|
@ -1,24 +1,18 @@
|
|||||||
|
|
||||||
<nav class="navbar navbar-expand-sm navbar-dark bg-dark" aria-label="Yavsc">
|
<nav class="navbar navbar-expand-sm navbar-dark bg-dark" aria-label="Yavsc">
|
||||||
|
<a class="navbar-brand" href="#">@Config.SiteSetup.Title</a>
|
||||||
<a href="~/" class="navbar-brand"><img src="~/images/it/free-sofware.svg" class="icon-banner" alt="Lua"></a>
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
||||||
|
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
|
||||||
data-bs-target="#navbar" aria-controls="navbar"
|
data-bs-target="#navbar" aria-controls="navbar"
|
||||||
aria-expanded="true" aria-label="Toggle navigation">
|
aria-expanded="true" aria-label="Toggle navigation">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
</button>
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="navbar" style="background-image: @Config.SiteSetup.Banner;">
|
||||||
<div class="collapse navbar-collapse" id="navbar">
|
|
||||||
<ul class="navbar-nav me-auto" >
|
<ul class="navbar-nav me-auto" >
|
||||||
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/">Home</a></li>
|
<li class="nav-item"><a class="nav-link active" aria-current="page" href="/">Home</a></li>
|
||||||
<li class="nav-item"><a asp-controller="Blogspot" asp-action="Index" class="nav-link">@SR["Blogs"]</a></li>
|
<li class="nav-item"><a asp-controller="Blogspot" asp-action="Index" class="nav-link">@SR["Blogs"]</a></li>
|
||||||
<li class="nav-item"><a asp-controller="Home" asp-action="Chat" class="nav-link">@SR["Chat"]</a></li>
|
<li class="nav-item"><a asp-controller="Home" asp-action="Chat" class="nav-link">@SR["Chat"]</a></li>
|
||||||
<li class="nav-item"><a asp-controller="Home" asp-action="Contact" class="nav-link">@SR["Contact"]</a></li>
|
<li class="nav-item"><a asp-controller="Home" asp-action="Contact" class="nav-link">@SR["Contact"]</a></li>
|
||||||
<li class="nav-item"><a asp-controller="Home" asp-action="About" class="nav-link">@SR["About"]</a></li>
|
<li class="nav-item"><a asp-controller="Home" asp-action="About" class="nav-link">@SR["About"]</a></li>
|
||||||
|
|
||||||
<partial name="_LoginPartial" />
|
<partial name="_LoginPartial" />
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
.navbar-dark .navbar-toggler-icon {
|
.navbar-dark .navbar-toggler-icon {
|
||||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); }
|
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); }
|
||||||
|
|
||||||
/* bootstrap.css | http://localhost:5000/lib/bootstrap/css/bootstrap.css */
|
|
||||||
div.carousel-inner > div.item > div.carousel-caption-s {
|
div.carousel-inner > div.item > div.carousel-caption-s {
|
||||||
margin: .5em;
|
margin: .5em;
|
||||||
background-color: rgba(0, 0, 0, 0.6);
|
background-color: rgba(0, 0, 0, 0.6);
|
||||||
@ -25,19 +24,11 @@ img.blogphoto {
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: 100%; }
|
max-height: 100%; }
|
||||||
|
|
||||||
.cmtdatetime {
|
|
||||||
font-style: italic;
|
|
||||||
font-size: x-small;
|
|
||||||
}
|
|
||||||
|
|
||||||
.blogcomment {
|
|
||||||
display: inline-block;
|
|
||||||
padding: .3em;
|
|
||||||
border: solid black 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type='checkbox'] {
|
input[type='checkbox'] {
|
||||||
appearance: auto;
|
appearance: auto;
|
||||||
min-width: 1em;
|
min-width: 1em;
|
||||||
min-height: 1em;
|
min-height: 1em; }
|
||||||
}
|
|
||||||
|
.container {
|
||||||
|
background-color: #000000cf;
|
||||||
|
color: #ffffff; }
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
|
||||||
|
|
||||||
.grants-page {
|
.grants-page {
|
||||||
.card {
|
.card {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
@ -23,10 +25,6 @@
|
|||||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
|
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* bootstrap.css | http://localhost:5000/lib/bootstrap/css/bootstrap.css */
|
|
||||||
|
|
||||||
|
|
||||||
div.carousel-inner > div.item > div.carousel-caption-s {
|
div.carousel-inner > div.item > div.carousel-caption-s {
|
||||||
margin: .5em;
|
margin: .5em;
|
||||||
background-color: rgba(0,0,0,.6);
|
background-color: rgba(0,0,0,.6);
|
||||||
@ -39,3 +37,14 @@ img.blogphoto {
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input[type='checkbox'] {
|
||||||
|
appearance: auto;
|
||||||
|
min-width: 1em;
|
||||||
|
min-height: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container {
|
||||||
|
background-color: #000000cf;
|
||||||
|
color:#ffffff;
|
||||||
|
}
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 8.1 KiB |
Reference in New Issue
Block a user