Skip to content

Commit

Permalink
miscellaneous fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
skamansam committed Jun 8, 2015
1 parent 80d5a14 commit 32ce43a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions admin/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@
$(".reorderable")
.disableSelection();


//the following is for tagsinput typeahead
$('.tag-list-for-post')
if( $('.tag-list-for-post').size > 0){
$('.tag-list-for-post')
.tagsinput('input')
.typeahead({
prefetch: '/posts/tags.json'
Expand All @@ -222,7 +222,7 @@
this.tagsinput('input')
.typeahead('setQuery', '');
}, $('input')));

};

$('select#post_editor_select')
.on('change', function() {
Expand Down
2 changes: 1 addition & 1 deletion admin/views/layouts/application.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
%meta{:content => 'text/html; charset=utf-8', 'http-equiv' => 'Content-Type'}
%meta{:name => :viewport, :content => 'width=device-width,initial-scale=1'}
%title= @title.present? ? "#{@title} | pSaMS Admin" : "pSaMS Admin"
=favicon_tag 'favicon.ico'
=favicon_tag '../assets/images/favicon.ico'
%link{:href => 'http://fonts.googleapis.com/css?family=Varela', :rel => :stylesheet}
=stylesheet_link_tag 'application'
- @plugin_context ||= "admin.#{request.route_obj.controller}.#{request.route_obj.action}"
Expand Down
4 changes: 2 additions & 2 deletions app/presenters/comment_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ def initialize(comment)
@avatar = Plugin.apply_filter('comment_avatar', comment.email, comment.freeze)
@body_class = Plugin.apply_filter('comment_body_class', "comment.body",comment.freeze)
@title_class = Plugin.apply_filter('comment_title_class', "comment.title",comment.freeze)
@updated_at = Plugin.apply_filter('comment_updated_at', comment.updated_at,comment.freeze)
@created_at = Plugin.apply_filter('comment_created_at', comment.created_at,comment.freeze)
@updated_at = Plugin.apply_filter('comment_updated_at', comment.updated_at.localtime, comment.freeze)
@created_at = Plugin.apply_filter('comment_created_at', comment.created_at.localtime,comment.freeze)
@id = Plugin.apply_filter('comment_id', comment.id,comment.freeze)
@comments = CommentsPresenter.new(comment.comments)
end
Expand Down
4 changes: 2 additions & 2 deletions app/presenters/post_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def initialize(post)
@author_string = Plugin.apply_filter('post_author', post.account,post.freeze)
@body_class = Plugin.apply_filter('post_body_class', "body", post.freeze)
@title_class = Plugin.apply_filter('post_title_class', "title",post.freeze)
@updated_at = Plugin.apply_filter('post_updated_at', post.updated_at,post.freeze)
@created_at = Plugin.apply_filter('post_created_at', post.created_at,post.freeze)
@updated_at = Plugin.apply_filter('post_updated_at', post.updated_at.localtime,post.freeze)
@created_at = Plugin.apply_filter('post_created_at', post.created_at.localtime,post.freeze)
@id = Plugin.apply_filter('post_id', post.id,post.freeze)
@tags = Plugin.apply_filter('post_tags', post.tags,post.freeze)
@account = Plugin.apply_filter('post_account', post.account,post.freeze)
Expand Down

0 comments on commit 32ce43a

Please sign in to comment.