[noosfero/noosfero][next] asset-pipeline: remove old code
Bráulio Bhavamitra
gitlab at gitlab.com
Fri Apr 10 10:09:01 BRT 2015
Bráulio Bhavamitra pushed to next at Noosfero / noosfero
Commits:
75d2b5b0 by Braulio Bhavamitra at 2015-04-10T10:05:37Z
asset-pipeline: remove old code
- - - - -
2 changed files:
- − app/views/layouts/chat.html.erb
- config/environments/production.rb
Changes:
=====================================
app/views/layouts/chat.html.erb deleted
=====================================
--- a/app/views/layouts/chat.html.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
- <head>
- <title><%= h page_title %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta name="description" content="<%= @environment.name %>" />
- <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
- <%= noosfero_javascript %>
- <%= javascript_include_tag 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat' %>
- <%= noosfero_stylesheets %>
- <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
- <%= stylesheet_link_tag theme_stylesheet_path %>
- <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
- <script type='text/javascript'>
- var $presence_status_label = {
- chat: '<%= _('Online') %>',
- dnd: '<%= _('Busy') %>',
- '': '<%= _('Offline') %>'
- };
- var $own_name = '<%= user.name %>';
- var $starting_chat_notice = '<%= _("starting chat with %{name}") %>';
- var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>';
- var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>';
- var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
- var $balloon_template = '<div data-who="%{who}" class="message %{who}"><img class="avatar" src="%{avatar_url}"/><% comment_balloon do %><h5 class="%{who}-name">%{name}</h5><span class="time">%{time}</span><p>%{message}</p><% end %></div>';
- </script>
- </head>
- <body id='chat'>
- <div id='title-bar'>
- <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
- </div>
- <div id='buddy-list'>
- <div id='environment-logo'>
- <%= image_tag "#{theme_path}/images/thin-logo.png", :title => environment.name, :alt => environment.name %>
- </div>
- <div class='toolbar'>
- <div id='user-status'><%= user_status_menu('icon-menu-offline', _('Offline')) %></div>
- <div class='dialog-error' style='display: none'></div>
- </div>
- <ul class='buddy-list'>
- <!-- <li class='offline'><a id='%{jid_id}' class='icon-menu-offline-11' href='#'>%{name}</a></li> -->
- </ul>
- </div>
- <div id='chat-window' class='tabs-bottom'>
- <div id='tabs'>
- <ul>
- <!-- <li class="tab"><a href="#{href}">#{label}</a></li> -->
- </ul>
- </div>
- <!--
- <div id='#conversation-%{jid_id}' class='conversation'>
- <div class='history'>
- <div class='message %{who}'><img class='avatar' src='%{avatar_url}' /><h5 class='%{who}-info'>%{name}</h5><span class='time'>%{time}</span><p>%{message}</p></div>
- </div>
- <div class='input-div'>
- <div class='icon-chat'></div>
- <textarea type='textarea' data-to='%{jid}'></textarea>
- </div>
- </div>
- -->
- </div>
- <%= yield %>
- </body>
-</html>
=====================================
config/environments/production.rb
=====================================
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -23,10 +23,6 @@ Noosfero::Application.configure do
File.basename file
end.compact
- # fallback to assets pipeline if a precompiled asset is missed
- config.assets.digest = true
- config.assets.cache_store = :assets_live_compile_store
-
# Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/75d2b5b053ca56669cf6a964e1346f30d6bdc9b2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150410/60d22ec7/attachment-0001.html>
More information about the Noosfero-dev
mailing list