Skip to content

Commit

Permalink
Kick out Growler (proto), welcome Gritter (jquery)
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Lecavelier committed Oct 16, 2013
1 parent 1a36690 commit 532d323
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 388 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Expand Up @@ -51,6 +51,9 @@ gem 'twitter'
gem "jquery-rails", "~> 3.0.4"
gem "jquery-ui-rails", "~> 4.0.4"

# Growler replacement
gem "gritter", "~> 1.0.3"

gem 'rails_autolink', '~> 1.1.0'
gem 'dynamic_form', '~> 1.1.4'

Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/administration.html.erb
Expand Up @@ -6,8 +6,8 @@
<title><%= this_blog.blog_name %><%= controller.controller_name %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="imagetoolbar" content="no" />
<%= stylesheet_link_tag "growler", "bootstrap", "administration_structure", "lightbox", "jquery-ui" %>
<%= javascript_include_tag "jquery", "jquery_ujs", "jquery-ui", "bootstrap", "publify", "publify_jquery", "lightbox", "growler", "publify_carousel", "administration", "administration_jquery" %>
<%= stylesheet_link_tag "growler", "bootstrap", "administration_structure", "lightbox", "jquery-ui", "gritter" %>
<%= javascript_include_tag "jquery", "jquery_ujs", "jquery-ui", "bootstrap", "publify", "publify_jquery", "lightbox", "publify_carousel", "administration", "administration_jquery", "gritter" %>
<style type="text/css">
#carousel-content .slide { width: <%= this_blog.image_thumb_size %>; }
@font-face {
Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/_page_header.html.erb
Expand Up @@ -12,8 +12,8 @@
<%- if feed_rss %>
<link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>" />
<%- end %>
<%= javascript_include_tag 'jquery', 'jquery_ujs', 'cookies', 'publify', :cache => true %>
<%= stylesheet_link_tag 'coderay', 'user-styles', :cache => true %>
<%= javascript_include_tag 'jquery', 'jquery_ujs', 'cookies', 'publify', 'gritter', :cache => true %>
<%= stylesheet_link_tag 'coderay', 'user-styles', 'gritter', :cache => true %>
<%= javascript_include_tag "lang/#{Localization.lang.to_s}" if File.exists? File.join(::Rails.root.to_s, 'public', 'lang', Localization.lang.to_s) %>
<%= javascript_tag "window._token = '#{form_authenticity_token}'"%>
<%= page_header_includes %>
Expand Down
21 changes: 21 additions & 0 deletions config/locales/gflash.en.yml
@@ -0,0 +1,21 @@
en:
gflash:
#
# These are the translations for the different titles.
#
titles:
notice: "Notice"
success: "Success"
warning: "Warning"
error: "Error"
progress: "Progress"
#
# Add gflash messages for controller actions:
# products:
# create:
# notice: "This is a notification"
# error: "Something went wrong"
#
# Inside controller:
# gflash :notice, :error
#
168 changes: 0 additions & 168 deletions public/javascripts/growler.js

This file was deleted.

0 comments on commit 532d323

Please sign in to comment.