From 77ffe1f1b7760c444afc3e031ea9f50086723a7c Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 6 Jan 2020 13:33:37 +0100
Subject: [PATCH] update info page

---
 .idea/.idea.c3stream/.idea/contentModel.xml |  2 --
 Pages/Conference.cshtml                     |  8 ++++----
 Pages/Info.cshtml                           | 10 +++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.idea/.idea.c3stream/.idea/contentModel.xml b/.idea/.idea.c3stream/.idea/contentModel.xml
index c9d3755..80798a6 100644
--- a/.idea/.idea.c3stream/.idea/contentModel.xml
+++ b/.idea/.idea.c3stream/.idea/contentModel.xml
@@ -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" />
diff --git a/Pages/Conference.cshtml b/Pages/Conference.cshtml
index e4b24e2..48782c5 100644
--- a/Pages/Conference.cshtml
+++ b/Pages/Conference.cshtml
@@ -65,20 +65,20 @@
             <td>@talk.OriginalLanguage</td>
             <td>
                 <div class="btn-group w-100" role="group">
-                    <a href="@talk.FrontendLink.AbsoluteUri" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Play">
+                    <a href="@talk.FrontendLink.AbsoluteUri" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Play">
                         <i class="fas fa-play-circle"></i>
                     </a>
                     @if (System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, conference.Acronym, file))) {
-                        <a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Mirror">
+                        <a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Mirror">
                             <i class="fas fa-cloud-download"></i>
                         </a>
                     }
                     else {
-                        <a href="/" target="_blank" type="button" class="btn btn-primary disabled">
+                        <a href="/" type="button" class="btn btn-primary disabled">
                             <i class="fas fa-cloud-download"></i>
                         </a>
                     }
-                    <a href="/Info?guid=@talk.Guid&bookmark=@Request.Query["bookmark"]" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Info">
+                    <a href="/Info?guid=@talk.Guid&bookmark=@Request.Query["bookmark"]" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Info">
                         <i class="fas fa-info-circle"></i>
                     </a>
                     @if (isWatched) {
diff --git a/Pages/Info.cshtml b/Pages/Info.cshtml
index 88203e4..084a762 100644
--- a/Pages/Info.cshtml
+++ b/Pages/Info.cshtml
@@ -49,10 +49,10 @@
 }
 
 @if (System.IO.File.Exists(logoPath)) {
-    <img src="@(c3stream.CacheUrl + $"{conference.Acronym}/logo.png")" alt="Conference logo" style="height: 100px; float: right;"/>
+    <img src="@(c3stream.CacheUrl + $"{conference.Acronym}/logo.png")" alt="Conference logo" style="max-height: 110px; float: right;"/>
 }
 else {
-    <img src="@conference.LogoUri" alt="Conference logo" style="height: 100px; float: right;"/>
+    <img src="@conference.LogoUri" alt="Conference logo" style="max-height: 110px; float: right;"/>
 }
 
 @if (isWatched) {
@@ -67,16 +67,16 @@ else {
 
 <h5>@eventName - @category - @talk.Date?.Date.ToShortDateString()</h5>
 <div class="btn-group" role="group" style="margin-bottom: 10px">
-    <a href="@talk.FrontendLink.AbsoluteUri" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="right" title="Play">
+    <a href="@talk.FrontendLink.AbsoluteUri" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="right" title="Play">
         <i class="fas fa-play-circle"></i>
     </a>
     @if (System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, conference.Acronym, file))) {
-        <a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="right" title="Mirror">
+        <a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="right" title="Mirror">
             <i class="fas fa-cloud-download"></i>
         </a>
     }
     else {
-        <a href="/" target="_blank" type="button" class="btn btn-primary disabled">
+        <a href="/" type="button" class="btn btn-primary disabled">
             <i class="fas fa-cloud-download"></i>
         </a>
     }