small update
This commit is contained in:
parent
178dfb7186
commit
6c5b4fd423
|
@ -3,8 +3,6 @@
|
|||
<component name="ContentModelStore">
|
||||
<e p="$USER_HOME$/Library/Caches/Rider2019.3/extResources" t="IncludeRecursive" />
|
||||
<e p="$USER_HOME$/Library/Caches/Rider2019.3/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_c3stream.-879192168.00" t="ExcludeRecursive" />
|
||||
<e p="$APPLICATION_CONFIG_DIR$/javascript/extLibs/http_kit.fontawesome.com_c1a632a160.js" t="IncludeRecursive" />
|
||||
<e p="$APPLICATION_CONFIG_DIR$/javascript/extLibs/http_pro.fontawesome.com_releases_v5.11.2_css_all.css" t="IncludeRecursive" />
|
||||
<e p="$PROJECT_DIR$" t="IncludeRecursive">
|
||||
<e p=".gitignore" t="Include" />
|
||||
<e p="appsettings.Development.json" t="Include" />
|
||||
|
@ -14,11 +12,9 @@
|
|||
<e p="c3stream.csproj" t="IncludeRecursive" />
|
||||
<e p="c3stream.sln" t="IncludeFlat" />
|
||||
<e p="data" t="Include">
|
||||
<e p="33c3.json" t="Include" />
|
||||
<e p="34c3.json" t="Include" />
|
||||
<e p="35c3.json" t="Include" />
|
||||
<e p="_c3stream.json" t="Include" />
|
||||
</e>
|
||||
<e p="LICENSE" t="Include" />
|
||||
<e p="obj" t="ExcludeRecursive">
|
||||
<e p="Debug" t="Include">
|
||||
<e p="netcoreapp3.1" t="Include">
|
||||
|
@ -49,6 +45,7 @@
|
|||
<e p="Properties" t="Include">
|
||||
<e p="launchSettings.json" t="Include" />
|
||||
</e>
|
||||
<e p="README.md" t="Include" />
|
||||
<e p="Startup.cs" t="Include" />
|
||||
<e p="Types.cs" t="Include" />
|
||||
<e p="wwwroot" t="Include">
|
||||
|
|
21
LICENSE
Normal file
21
LICENSE
Normal file
|
@ -0,0 +1,21 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2020 Laura Hausmann
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
|
@ -102,7 +102,7 @@
|
|||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
<a href="/Description?guid=@talk.Guid?.ToString()" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Description">
|
||||
<a href="/Description?bookmark=@Request.Query["bookmark"]&guid=@talk.Guid?.ToString()" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Description">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</a>
|
||||
@if (isWatched) {
|
||||
|
|
|
@ -19,6 +19,11 @@
|
|||
var title = talk.Talk.Title;
|
||||
var speakers = talk.Talk.Persons.Aggregate((s, s1) => $"{s}, {s1}");
|
||||
var description = talk.Talk.Description;
|
||||
if (string.IsNullOrEmpty(description)) {
|
||||
description = "<missing description>";
|
||||
}
|
||||
}
|
||||
<h3>@title - <i>@speakers</i></h3>
|
||||
<p style="text-align: justify">@Html.Raw(description.Replace("\n", "<br/>"))</p>
|
||||
<p style="text-align: justify">
|
||||
@Html.Raw(description.Replace("\n", "<br/>").Replace("<p>", "").Replace("</p>", ""))
|
||||
</p>
|
|
@ -17,7 +17,7 @@
|
|||
<div style="text-align: center">
|
||||
<h1>Welcome to c3stream!</h1>
|
||||
Your bookmark link:<br/>
|
||||
<code>@c3stream.MainUrl?bookmark=@HttpContext.Session.GetString("bookmark")</code><br/><br/>
|
||||
<code>https://@Request.Host.Value?bookmark=@HttpContext.Session.GetString("bookmark")</code><br/><br/>
|
||||
<div class="btn-group">
|
||||
<a type="button" class="btn btn-primary" href="/Conference?c=36c3&bookmark=@HttpContext.Session.GetString("bookmark")">36c3</a>
|
||||
<a type="button" class="btn btn-primary" href="/Conference?c=35c3&bookmark=@HttpContext.Session.GetString("bookmark")">35c3</a>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<body>
|
||||
<header>
|
||||
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
|
||||
<div class="container">
|
||||
<div class="container-fluid" style="width: 90%">
|
||||
<a class="navbar-brand" asp-area="" asp-page="/Index">c3stream</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
|
||||
aria-expanded="false" aria-label="Toggle navigation">
|
||||
|
@ -20,14 +20,14 @@
|
|||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
<div class="container">
|
||||
<div class="container-fluid" style="width: 90%">
|
||||
<main role="main" class="pb-3">
|
||||
@RenderBody()
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<footer class="border-top footer text-muted">
|
||||
<div class="container">
|
||||
<div class="container-fluid" style="width: 90%; text-align: center">
|
||||
© 2020 - c3stream - <a href="/Privacy">Privacy</a> -
|
||||
c3stream is not associated with media.ccc.de in any way and is just providing an easy way to store watched talks.
|
||||
</div>
|
||||
|
|
1
README.md
Normal file
1
README.md
Normal file
|
@ -0,0 +1 @@
|
|||
c3stream is a small proxy site meant for saving watched status & watch-later-lists for media.ccc.de talks. Test in production at https://c3stream.de
|
|
@ -9,7 +9,6 @@ namespace c3stream {
|
|||
public const string DbFile = "_c3stream.json";
|
||||
public const string CachePath = "/mnt/storage/archive/Video/congress/";
|
||||
public const string CacheUrl = "https://mirror.c3stream.de/";
|
||||
public const string MainUrl = "https://c3stream.de/";
|
||||
public static object Lock = new object();
|
||||
public static string DbPath = Path.Combine(DataPath, DbFile);
|
||||
|
||||
|
|
|
@ -69,3 +69,7 @@ body {
|
|||
white-space: nowrap;
|
||||
line-height: 60px; /* Vertically center the text there */
|
||||
}
|
||||
|
||||
.table td {
|
||||
vertical-align: middle;
|
||||
}
|
Loading…
Reference in a new issue