From dc29525e5c8076b2db3e6c11b2842aa658e76661 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 28 Oct 2019 16:07:25 +0000
Subject: [PATCH] Console: Remove theme choice objects on /configui so we don't
 get snakes with noscript (thx drz3d)

---
 .../router/web/helpers/ConfigUIHelper.java    |  2 --
 .../resources/themes/console/dark/console.css | 18 ++++++++---------
 .../themes/console/light/console.css          | 20 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
index c0fe0090e4..ee35f426f8 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java
@@ -35,9 +35,7 @@ public String getSettings() {
             if (theme.equals(current))
                 buf.append(CHECKED);
             buf.append("value=\"").append(theme).append("\" id=\"").append(theme).append("\">" +
-                       "<object height=\"48\" width=\"48\" data=\"/themes/console/").append(theme).append("/images/thumbnail.png\">" +
                        "<img height=\"48\" width=\"48\" alt=\"\" src=\"/themes/console/").append(theme).append("/images/thumbnail.png\">" +
-                       "</object><br>" +
                        "<div class=\"themelabel\">").append(_t(theme)).append("</div>" +
                        "</div></label>\n");
         }
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 2235c22b92..c6e5330567 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -2919,16 +2919,16 @@ tr#addnew, tr#addnew:hover {
      background: #000;
 }
 
-.themechoice object {
+.themechoice img {
      opacity: 0.6;
 }
 
-.themechoice .optbox:checked + object {
+.themechoice .optbox:checked + img {
      filter: none;
      opacity: 1;
 }
 
-.themechoice:hover object {
+.themechoice:hover img {
      filter: drop-shadow(0 0 1px #f60);
      transition: ease transform 0.05s;
 }
@@ -2944,27 +2944,27 @@ tr#addnew, tr#addnew:hover {
      box-shadow: inset 0 0 0 1px #000 !important;
 }
 
-.themechoice .optbox:checked + object, .themechoice .optbox:checked + img {
+.themechoice .optbox:checked + img, .themechoice .optbox:checked + img {
      transform: scale(0.9);
 }
 
-.themechoice .optbox:hover + object ~ .themelabel {
+.themechoice .optbox:hover + img ~ .themelabel {
      color: #f60;
 }
 
-.themechoice .optbox:checked + object ~ .themelabel {
+.themechoice .optbox:checked + img ~ .themelabel {
      background: #030 !important;
      color: #ee9;
      font-weight: bold;
      box-shadow: none !important
 }
 
-.themechoice .optbox:focus + object ~ .themelabel {
+.themechoice .optbox:focus + img ~ .themelabel {
      color: #f60 !important;
      box-shadow: inset 0 0 10px 3px #000 !important;
 }
 
-.themechoice .optbox:active + object ~ .themelabel {
+.themechoice .optbox:active + img ~ .themelabel {
      color: #ee9 !important;
      box-shadow: inset 0 0 0 1px #000 !important;
 }
@@ -2979,7 +2979,7 @@ tr#addnew, tr#addnew:hover {
      position: absolute;
 }
 
-.themechoice object {
+.themechoice img {
      padding: 3px 0;
 }
 
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index d152749e33..7249af722c 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -4769,19 +4769,19 @@ body.iframed {
      transition: filter ease 0.3s 0s;
 }
 
-.themechoice:hover > object ~ .themelabel {
+.themechoice:hover > img ~ .themelabel {
      border-top: 1px solid #f60 !important;
      background: #fff !important;
      background: linear-gradient(to bottom, #fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%) !important;
      color: #f60;
 }
 
-.themechoice:active > object ~ .themelabel {
+.themechoice:active > img ~ .themelabel {
      background: #f60 !important;
      color: #fff;
 }
 
-.themechoice:hover > object {
+.themechoice:hover > img {
      filter: drop-shadow(0 0 1px #f60);
 }
 
@@ -4796,18 +4796,18 @@ body.iframed {
      position: absolute;
 }
 
-.themechoice .optbox + object {
+.themechoice .optbox + img {
      margin-left: -1px;
      margin-top: 6px;
      padding: 2px 0 !important;
      margin-bottom: 31px;
 }
 
-.themechoice img, .themechoice object {
+.themechoice img, .themechoice img {
      margin-bottom: 31px !important;
 }
 
-.themechoice .optbox:checked + object, .themechoice .optbox:checked + img {
+.themechoice .optbox:checked + img, .themechoice .optbox:checked + img {
      transform: scale(0.9);
      animation: glow 20s 10s infinite;
 }
@@ -4864,26 +4864,26 @@ div.themelabel {
      font-weight: bold;
 }
 
-.themechoice .optbox:checked + object ~ .themelabel {
+.themechoice .optbox:checked + img ~ .themelabel {
      background: #ddf !important;
      color: #338 !important;
      font-weight: bold;
 }
 
-.themechoice .optbox:focus + object ~ .themelabel {
+.themechoice .optbox:focus + img ~ .themelabel {
      color: #f60 !important;
      box-shadow: inset 0 0 0 1px #fff;
      background: linear-gradient(to right, #eef, #fff, #eef) !important;
 }
 
-.themechoice .optbox:active + object ~ .themelabel {
+.themechoice .optbox:active + img ~ .themelabel {
      color: #fff !important;
      box-shadow: inset 0 0 0 1px #fff;
      box-shadow: inset 0 0 0 1px #fff9ef, inset 2px 2px 3px #7f3000;
      background: #f60 !important;
 }
 
-.themechoice .optbox:checked:active + object ~ .themelabel {
+.themechoice .optbox:checked:active + img ~ .themelabel {
      color: #f60 !important;
      background: linear-gradient(to right, #eef, #fff, #eef) !important;
      box-shadow: inset 0 0 0 1px #fff !important;