From 11a5a478268cafd65081b6900538ed3f09452e7f Mon Sep 17 00:00:00 2001
From: digital-gnome <31593470+digital-gnome@users.noreply.github.com>
Date: Wed, 6 Dec 2017 09:37:23 -0500
Subject: [PATCH 1/2] Fix missing popups and styles

---
 web/skins/classic/css/classic/views/download.css | 4 ++++
 web/skins/classic/css/dark/views/download.css    | 4 ++++
 web/skins/classic/css/flat/views/download.css    | 4 ++++
 web/skins/classic/js/classic.js                  | 1 +
 web/skins/classic/js/dark.js                     | 1 +
 5 files changed, 14 insertions(+)
 create mode 100644 web/skins/classic/css/classic/views/download.css
 create mode 100644 web/skins/classic/css/dark/views/download.css
 create mode 100644 web/skins/classic/css/flat/views/download.css

diff --git a/web/skins/classic/css/classic/views/download.css b/web/skins/classic/css/classic/views/download.css
new file mode 100644
index 000000000..a7b34895d
--- /dev/null
+++ b/web/skins/classic/css/classic/views/download.css
@@ -0,0 +1,4 @@
+#content table.minor {
+    width: auto;
+}
+
diff --git a/web/skins/classic/css/dark/views/download.css b/web/skins/classic/css/dark/views/download.css
new file mode 100644
index 000000000..a7b34895d
--- /dev/null
+++ b/web/skins/classic/css/dark/views/download.css
@@ -0,0 +1,4 @@
+#content table.minor {
+    width: auto;
+}
+
diff --git a/web/skins/classic/css/flat/views/download.css b/web/skins/classic/css/flat/views/download.css
new file mode 100644
index 000000000..a7b34895d
--- /dev/null
+++ b/web/skins/classic/css/flat/views/download.css
@@ -0,0 +1,4 @@
+#content table.minor {
+    width: auto;
+}
+
diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js
index a3bb53de8..3e955401e 100644
--- a/web/skins/classic/js/classic.js
+++ b/web/skins/classic/js/classic.js
@@ -33,6 +33,7 @@ var popupSizes = {
     'device':       { 'width': 260, 'height': 150 },
     'devices':      { 'width': 400, 'height': 240 },
     'donate':       { 'width': 500, 'height': 280 },
+    'download':     { 'width': 350, 'height': 215 },
     'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
     'eventdetail':  { 'width': 600, 'height': 420 },
     'events':       { 'width': 1020, 'height': 780 },
diff --git a/web/skins/classic/js/dark.js b/web/skins/classic/js/dark.js
index e0142017f..c4cfd7c20 100644
--- a/web/skins/classic/js/dark.js
+++ b/web/skins/classic/js/dark.js
@@ -33,6 +33,7 @@ var popupSizes = {
     'device':       { 'width': 260, 'height': 150 },
     'devices':      { 'width': 400, 'height': 240 },
     'donate':       { 'width': 500, 'height': 280 },
+    'download':     { 'width': 350, 'height': 215 },
     'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
     'eventdetail':  { 'width': 600, 'height': 420 },
     'events':       { 'width': 960, 'height': 780 },

From 43bba23735c630599b1be74498663c15f2f19ca5 Mon Sep 17 00:00:00 2001
From: digital-gnome <31593470+digital-gnome@users.noreply.github.com>
Date: Wed, 6 Dec 2017 10:25:04 -0500
Subject: [PATCH 2/2] Fix filteradd complaining

---
 web/skins/classic/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 803916162..0bf3dd162 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -224,7 +224,7 @@ if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?>
       <li><a href="?view=montage"<?php echo $view=='montage'?' class="selected"':''?>><?php echo translate('Montage') ?></a></li>
 <?php
    }
-if (isset($_REQUEST['filter']['Query']['terms'])) {
+if (isset($_REQUEST['filter']['Query']['terms']['attr'])) {
   $terms = $_REQUEST['filter']['Query']['terms'];
   $count = 0;
   foreach ($terms as $term) {