From ced4e9102a0c2df9ce7f708957a2dee81594d39b Mon Sep 17 00:00:00 2001
From: chan-d <chan.danny516@gmail.com>
Date: Fri, 5 Feb 2016 11:34:24 -0800
Subject: [PATCH 1/4] fixed issue 1

---
 Gemfile                                                       | 1 +
 app/assets/javascripts/sidebar.js                             | 2 +-
 .../app/views/archives_sidebar/_content.html.erb              | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 563515183..88a2ed25c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,6 +73,7 @@ gem 'recaptcha', require: 'recaptcha/rails', branch: 'rails3'
 gem 'rubypants', '~> 0.2.0'
 gem 'twitter', '~> 5.14.0'
 gem 'uuidtools', '~> 2.1.1'
+gem 'psych', '~> 2.0', '>= 2.0.17'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index 548bb6471..2ac26bec5 100644
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -11,7 +11,7 @@ var bind_sortable = function() {
         url: '/admin/sidebar/sortable',
         statusCode: {
           200: function(data, textStatus, jqXHR) {
-            $('#sidebar-config').replaceWith(data.html);
+            $('#sidebar_config').replaceWith(data.html);
             bind_sortable();
           },
           500: function(jqXHR, textStatus, errorThrown) {
diff --git a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
index 7d74c3347..1ea942567 100644
--- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
+++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
@@ -1,6 +1,6 @@
 <% unless sidebar.archives.blank? %>
-  <h3 class="sidebar_title"><%= sidebar.title %></h3>
-  <div class="sidebar_body">
+  <h3 class="sidebar-title"><%= sidebar.title %></h3>
+  <div class="sidebar-body">
     <ul id="archives">
       <% sidebar.archives.each do |month| %>
         <% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>

From 9ed7ea1ef90d0de0f672db775cd66e1ee5b65410 Mon Sep 17 00:00:00 2001
From: chan-d <chan.danny516@gmail.com>
Date: Fri, 5 Feb 2016 11:55:45 -0800
Subject: [PATCH 2/4] removed psych gem

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 88a2ed25c..cebf9d05e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'recaptcha', require: 'recaptcha/rails', branch: 'rails3'
 gem 'rubypants', '~> 0.2.0'
 gem 'twitter', '~> 5.14.0'
 gem 'uuidtools', '~> 2.1.1'
-gem 'psych', '~> 2.0', '>= 2.0.17'
+# gem 'psych', '~> 2.0', '>= 2.0.17'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

From fac11aa20ca907a81991523a2b4643452ba55925 Mon Sep 17 00:00:00 2001
From: chan-d <chan.danny516@gmail.com>
Date: Fri, 5 Feb 2016 11:59:43 -0800
Subject: [PATCH 3/4] changed to $(#sidebar-config)

---
 app/assets/javascripts/sidebar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index 2ac26bec5..548bb6471 100644
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -11,7 +11,7 @@ var bind_sortable = function() {
         url: '/admin/sidebar/sortable',
         statusCode: {
           200: function(data, textStatus, jqXHR) {
-            $('#sidebar_config').replaceWith(data.html);
+            $('#sidebar-config').replaceWith(data.html);
             bind_sortable();
           },
           500: function(jqXHR, textStatus, errorThrown) {

From 315ba5b2adbb9b6a144631e094809ba408f37dfe Mon Sep 17 00:00:00 2001
From: chan-d <chan.danny516@gmail.com>
Date: Fri, 5 Feb 2016 12:03:02 -0800
Subject: [PATCH 4/4] deleted commented out gem file

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index cebf9d05e..325249d9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'recaptcha', require: 'recaptcha/rails', branch: 'rails3'
 gem 'rubypants', '~> 0.2.0'
 gem 'twitter', '~> 5.14.0'
 gem 'uuidtools', '~> 2.1.1'
-# gem 'psych', '~> 2.0', '>= 2.0.17'
+
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console