From d5b9b7162cbc3b9a6c0b41153221c0092b1d2ec1 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 22 May 2017 13:07:31 -0500
Subject: [PATCH] /user_upgrades/new: fix page wrapper id.

* Move related css to user_upgrades.scss.
* Delete users/upgrade_information.html.erb as it is unused.
---
 .../stylesheets/specific/user_upgrades.scss   |  56 ++++++++++
 app/assets/stylesheets/specific/users.scss    |  55 ----------
 app/controllers/users_controller.rb           |   2 +-
 app/views/user_upgrades/new.html.erb          |   4 +-
 app/views/user_upgrades/show.html.erb         |   4 +-
 app/views/users/upgrade_information.html.erb  | 102 ------------------
 6 files changed, 61 insertions(+), 162 deletions(-)
 create mode 100644 app/assets/stylesheets/specific/user_upgrades.scss
 delete mode 100644 app/views/users/upgrade_information.html.erb

diff --git a/app/assets/stylesheets/specific/user_upgrades.scss b/app/assets/stylesheets/specific/user_upgrades.scss
new file mode 100644
index 000000000..34ddc1e02
--- /dev/null
+++ b/app/assets/stylesheets/specific/user_upgrades.scss
@@ -0,0 +1,56 @@
+div#c-user-upgrades {
+  div#a-new {
+    max-width: 40em;
+    font-size: 1.2em;
+
+    form.stripe {
+      display: inline;
+    }
+
+    div.section {
+      margin-bottom: 2em;
+    }
+
+    div#feature-comparison {
+      overflow: hidden;
+      margin-bottom: 1em;
+
+      table {
+        width: 100%;
+
+        colgroup {
+          width: 10em;
+        }
+
+        colgroup#basic {
+        }
+
+        colgroup#gold  {
+          background-color: #FFF380;
+        }
+
+        colgroup#platinum {
+          background-color: #eee;
+        }
+
+        td, th {
+          text-align: center;
+          vertical-align: top;
+          padding: 0.5em 0;
+        }
+
+        tbody {
+          tr:hover {
+            background-color: #FEF;
+          }
+        }
+
+        p.cost-footnote {
+          font-size: 80%;
+          color: gray;
+          margin: 0;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/specific/users.scss b/app/assets/stylesheets/specific/users.scss
index 87b3b8533..eeea777a1 100644
--- a/app/assets/stylesheets/specific/users.scss
+++ b/app/assets/stylesheets/specific/users.scss
@@ -86,59 +86,4 @@ div#c-users {
       margin-bottom: 2em;
     }
   }
-
-  div#a-upgrade-information {
-    max-width: 40em;
-    font-size: 1.2em;
-
-    form.stripe {
-      display: inline;
-    }
-
-    div.section {
-      margin-bottom: 2em;
-    }
-
-    div#feature-comparison {
-      overflow: hidden;
-      margin-bottom: 1em;
-
-      table {
-        width: 100%;
-
-        colgroup {
-          width: 10em;
-        }
-
-        colgroup#basic {
-        }
-
-        colgroup#gold  {
-          background-color: #FFF380;
-        }
-
-        colgroup#platinum {
-          background-color: #eee;
-        }
-
-        td, th {
-          text-align: center;
-          vertical-align: top;
-          padding: 0.5em 0;
-        }
-
-        tbody {
-          tr:hover {
-            background-color: #FEF;
-          }
-        }
-
-        p.cost-footnote {
-          font-size: 80%;
-          color: gray;
-          margin: 0;
-        }
-      }
-    }
-  }
 }
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 039f2c662..d501df51f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
   respond_to :html, :xml, :json
-  before_filter :member_only, :only => [:edit, :update, :upgrade]
+  before_filter :member_only, :only => [:edit, :update]
   skip_before_filter :api_check
 
   def new
diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb
index b2a7c41d1..85b4639b0 100644
--- a/app/views/user_upgrades/new.html.erb
+++ b/app/views/user_upgrades/new.html.erb
@@ -1,5 +1,5 @@
-<div id="c-users">
-  <div id="a-upgrade-information">
+<div id="c-user-upgrades">
+  <div id="a-new">
     <h1>Upgrade Account</h1>
 
     <% unless params[:user_id] %>
diff --git a/app/views/user_upgrades/show.html.erb b/app/views/user_upgrades/show.html.erb
index 9c691f7f7..e4046b87e 100644
--- a/app/views/user_upgrades/show.html.erb
+++ b/app/views/user_upgrades/show.html.erb
@@ -1,5 +1,5 @@
-<div id="c-users">
-  <div id="a-upgrade-result">
+<div id="c-user-upgrades">
+  <div id="a-show">
     <% if flash[:success] %>
       <h1>Congradulations!</h1>
 
diff --git a/app/views/users/upgrade_information.html.erb b/app/views/users/upgrade_information.html.erb
deleted file mode 100644
index f4ca556b6..000000000
--- a/app/views/users/upgrade_information.html.erb
+++ /dev/null
@@ -1,102 +0,0 @@
-<div id="c-users">
-  <div id="a-upgrade-information">
-    <h1>Upgrade Your Account</h1>
-
-    <p class="copy">Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.</p>
-
-    <div id="feature-comparison">
-      <table>
-        <thead>
-          <tr>
-            <th></th>
-            <th>Basic</th>
-            <th>Gold</th>
-            <th>Platinum</th>
-          </tr>
-        </thead>
-        <tbody>
-          <colgroup id="labels"></colgroup>
-          <colgroup id="basic"></colgroup>
-          <colgroup id="gold"></colgroup>
-          <colgroup id="platinum"></colgroup>
-          <tr>
-            <td>Cost</td>
-            <td>Free</td>
-            <td>$20<p class="cost-footnote">One time fee</p></td>
-            <td>$40<p class="cost-footnote">One time fee</p></td>
-          </tr>
-          <tr>
-            <td>Tag Limit</td>
-            <td>2</td>
-            <td>6</td>
-            <td>12</td>
-          </tr>
-          <tr>
-            <td>Favorite Limit</td>
-            <td>10,000</td>
-            <td>20,000</td>
-            <td>Unlimited</td>
-          </tr>
-          <tr>
-            <td>Page Limit</td>
-            <td>1,000</td>
-            <td>2,000</td>
-            <td>5,000</td>
-          </tr>
-          <% if SavedSearch.enabled? %>
-            <tr>
-              <td>Saved Searches</td>
-              <td>No</td>
-              <td>Yes</td>
-              <td>Yes</td>
-            </tr>
-          <% end %>
-          <tr>
-            <td>See Censored Tags</td>
-            <td>No</td>
-            <td>Yes</td>
-            <td>Yes</td>
-          </tr>
-          <tr>
-            <td>API Hourly Limit</td>
-            <td>3,000</td>
-            <td>10,000</td>
-            <td>20,000</td>
-          </tr>
-          <tr>
-            <td>Database Timeout</td>
-            <td>3 sec</td>
-            <td>6 sec</td>
-            <td>9 sec</td>
-          </tr>
-          <tr>
-            <td>Variable Posts Per Page</td>
-            <td>No</td>
-            <td>Yes</td>
-            <td>Yes</td>
-          </tr>
-          <tr>
-            <td>Name Changes</td>
-            <td>No</td>
-            <td>Yes</td>
-            <td>Yes</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <p><strong>Upgrading from Gold to Platinum will only cost $20.</strong> If you have any further questions or concerns, feel free to contact me at <%= mail_to Danbooru.config.contact_email, nil, :encode => :javascript %>.</p>
-
-    <% if CurrentUser.user.level < User::Levels::GOLD %>
-      <%= stripe_button("Upgrade to Gold", 2000) %>
-      <%= stripe_button("Upgrade to Platinum", 4000) %>
-    <% elsif CurrentUser.user.level < User::Levels::PLATINUM %>
-      <%= stripe_button("Upgrade Gold to Platinum", 2000) %>
-    <% end %>
-  </div>
-</div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Upgrade - <%= Danbooru.config.app_name %>
-<% end %>