From 6c5b4fd4233ff8406d75fc18078ea3286d2197b2 Mon Sep 17 00:00:00 2001
From: Laura Hausmann
Date: Fri, 3 Jan 2020 23:09:43 +0100
Subject: [PATCH] small update
---
.idea/.idea.c3stream/.idea/contentModel.xml | 7 ++-----
LICENSE | 21 +++++++++++++++++++++
Pages/Conference.cshtml | 2 +-
Pages/Description.cshtml | 7 ++++++-
Pages/Index.cshtml | 2 +-
Pages/Shared/_Layout.cshtml | 6 +++---
README.md | 1 +
c3stream.cs | 1 -
wwwroot/css/site.css | 4 ++++
9 files changed, 39 insertions(+), 12 deletions(-)
create mode 100644 LICENSE
create mode 100644 README.md
diff --git a/.idea/.idea.c3stream/.idea/contentModel.xml b/.idea/.idea.c3stream/.idea/contentModel.xml
index 241199f..40115c0 100644
--- a/.idea/.idea.c3stream/.idea/contentModel.xml
+++ b/.idea/.idea.c3stream/.idea/contentModel.xml
@@ -3,8 +3,6 @@
-
-
@@ -14,11 +12,9 @@
-
-
-
+
@@ -49,6 +45,7 @@
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..c852e61
--- /dev/null
+++ b/LICENSE
@@ -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.
diff --git a/Pages/Conference.cshtml b/Pages/Conference.cshtml
index b17e3fc..da9e70c 100644
--- a/Pages/Conference.cshtml
+++ b/Pages/Conference.cshtml
@@ -102,7 +102,7 @@
}
-
+
@if (isWatched) {
diff --git a/Pages/Description.cshtml b/Pages/Description.cshtml
index 3a9fe4f..bea30b8 100644
--- a/Pages/Description.cshtml
+++ b/Pages/Description.cshtml
@@ -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>";
+ }
}
@title - @speakers
-@Html.Raw(description.Replace("\n", "
"))
\ No newline at end of file
+
+ @Html.Raw(description.Replace("\n", "
").Replace("
", "").Replace("
", ""))
+
\ No newline at end of file
diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
index 60a8f89..94af6ef 100644
--- a/Pages/Index.cshtml
+++ b/Pages/Index.cshtml
@@ -17,7 +17,7 @@
Welcome to c3stream!
Your bookmark link:
-
@c3stream.MainUrl?bookmark=@HttpContext.Session.GetString("bookmark")
+
https://@Request.Host.Value?bookmark=@HttpContext.Session.GetString("bookmark")
36c3
35c3
diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml
index 2eb3458..e25d992 100644
--- a/Pages/Shared/_Layout.cshtml
+++ b/Pages/Shared/_Layout.cshtml
@@ -11,7 +11,7 @@