Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue 1 #21

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+3 −2
Open

fixed issue 1 #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ced4e91
fixed issue 1
chan-d Feb 5, 2016
9ed7ea1
removed psych gem
chan-d Feb 5, 2016
fac11aa
changed to $(#sidebar-config)
chan-d Feb 5, 2016
315ba5b
deleted commented out gem file
chan-d Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will not merge. This PR breaks existing javascript. Selector does not exist.

bind_sortable();
},
500: function(jqXHR, textStatus, errorThrown) {
Expand Down
4 changes: 2 additions & 2 deletions lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it matches the styles referenced in user-style.css

<div class="sidebar-body">
<ul id="archives">
<% sidebar.archives.each do |month| %>
<% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
Expand Down