mergin with master

Leandro Santos
1 parent 0531c6a2
Showing 10 changed files with 8 additions and 67 deletions Show diff stats
app/helpers/layout_helper.rb
app/models/user.rb
app/views/shared/logged_in/xmpp_chat.html.erb
app/views/shared/not_found.html.erb
db/schema.rb
plugins/notification/install.rb
plugins/notification/public/javascripts/lobby_note.js
public/javascripts/application.js
public/javascripts/strophejs-1.1.3/examples/attach/__init__.py
public/javascripts/strophejs-1.1.3/examples/attach/attacher/__init__.py
@@ -45,8 +45,6 @@ module LayoutHelper
     standard_stylesheets = [
       'application',
       'search',
-      'thickbox',
-      'lightbox',
       'colorbox',
       'selectordie',
       'inputosaurus',
@@ -102,7 +102,6 @@ class User &lt; ActiveRecord::Base
   validates_length_of       :email,    :within => 3..100, :if => (lambda {|user| !user.email.blank?})
   validates_uniqueness_of   :login, :email, :case_sensitive => false, :scope => :environment_id
   before_save :encrypt_password
-  before_save :normalize_email, if: proc{ |u| u.email.present? }
   validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
@@ -349,11 +348,6 @@ class User &lt; ActiveRecord::Base
   end
   protected
-
-    def normalize_email
-      self.email = self.email.squish.downcase
-    end
-
     # before filter
     def encrypt_password
       return if password.blank?
@@ -105,7 +105,3 @@
     </div>
   </div>
-  <a href='#' id='chat-online-users-title' onclick='return false;'>
-    <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
-  </a>
-</div>
@@ -11,7 +11,7 @@
       <%= button :home, _('Go to the home page'), '/' %>
        <% if logged_in? %>
           <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
-          <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
+          <%= modal_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
       <% end %>
     <% end %>
     <form action="/search">
@@ -241,14 +241,6 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
     t.datetime "updated_at"
   end
-  create_table "chat_messages", :force => true do |t|
-    t.integer  "to_id"
-    t.integer  "from_id"
-    t.string   "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "comments", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -263,8 +255,6 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
-    t.text     "setting"
-    t.integer  "paragraph_id"
   end
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -718,21 +708,21 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
   create_table "users", :force => true do |t|
     t.string   "login"
     t.string   "email"
-    t.string   "crypted_password",           :limit => 40
-    t.string   "salt",                       :limit => 40
+    t.string   "crypted_password",          :limit => 40
+    t.string   "salt",                      :limit => 40
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "remember_token"
     t.datetime "remember_token_expires_at"
     t.text     "terms_of_use"
-    t.string   "terms_accepted",             :limit => 1
+    t.string   "terms_accepted",            :limit => 1
     t.integer  "environment_id"
     t.string   "password_type"
-    t.boolean  "enable_email",                             :default => false
-    t.string   "last_chat_status",                         :default => ""
-    t.string   "chat_status",                              :default => ""
+    t.boolean  "enable_email",                            :default => false
+    t.string   "last_chat_status",                        :default => ""
+    t.string   "chat_status",                             :default => ""
     t.datetime "chat_status_at"
-    t.string   "activation_code",            :limit => 40
+    t.string   "activation_code",           :limit => 40
     t.datetime "activated_at"
     t.string   "return_to"
     t.datetime "last_login_at"
@@ -1191,40 +1191,3 @@ function stop_fetching(element){
 }
 window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };
-
-function getQueryParams(qs) {
-  qs = qs.split("+").join(" ");
-  var params = {},
-      tokens,
-      re = /[?&]?([^=]+)=([^&]*)/g;
-  while (tokens = re.exec(qs)) {
-      params[decodeURIComponent(tokens[1])]
-          = decodeURIComponent(tokens[2]);
-  }
-  return params;
-}
-
-var fullwidth=false;
-function toggle_fullwidth(itemId){
-  if(fullwidth){
-    jQuery(itemId).removeClass("fullwidth");
-    jQuery("#fullscreen-btn").show()
-    jQuery("#exit-fullscreen-btn").hide()
-    fullwidth = false;
-  }
-  else{
-    jQuery(itemId).addClass("fullwidth");
-    jQuery("#exit-fullscreen-btn").show()
-    jQuery("#fullscreen-btn").hide()
-    fullwidth = true;
-  }
-}
-
-function fullscreenPageLoad(itemId){
-  jQuery(document).ready(function(){
-    var $_GET = getQueryParams(document.location.search);
-    if ($_GET['fullscreen']==1){
-      toggle_fullwidth(itemId);
-    }
-  });
-}
	@@ -105,7 +105,3 @@		@@ -105,7 +105,3 @@
105		105
106	</div>	106	</div>
107	</div>	107	</div>
108	- <a href='#' id='chat-online-users-title' onclick='return false;'>
109	- <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
110	- </a>
111	-</div>
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	<%= button :home, _('Go to the home page'), '/' %>	11	<%= button :home, _('Go to the home page'), '/' %>
12	<% if logged_in? %>	12	<% if logged_in? %>
13	<% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>	13	<% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
14	- <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>	14	+ <%= modal_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
15	<% end %>	15	<% end %>
16	<% end %>	16	<% end %>
17	<form action="/search">	17	<form action="/search">
	@@ -1191,40 +1191,3 @@ function stop_fetching(element){		@@ -1191,40 +1191,3 @@ function stop_fetching(element){
1191	}	1191	}
1192		1192
1193	window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };	1193	window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };
1194	-
1195	-function getQueryParams(qs) {
1196	- qs = qs.split("+").join(" ");
1197	- var params = {},
1198	- tokens,
1199	- re = /[?&]?([^=]+)=([^&]*)/g;
1200	- while (tokens = re.exec(qs)) {
1201	- params[decodeURIComponent(tokens[1])]
1202	- = decodeURIComponent(tokens[2]);
1203	- }
1204	- return params;
1205	-}
1206	-
1207	-var fullwidth=false;
1208	-function toggle_fullwidth(itemId){
1209	- if(fullwidth){
1210	- jQuery(itemId).removeClass("fullwidth");
1211	- jQuery("#fullscreen-btn").show()
1212	- jQuery("#exit-fullscreen-btn").hide()
1213	- fullwidth = false;
1214	- }
1215	- else{
1216	- jQuery(itemId).addClass("fullwidth");
1217	- jQuery("#exit-fullscreen-btn").show()
1218	- jQuery("#fullscreen-btn").hide()
1219	- fullwidth = true;
1220	- }
1221	-}
1222	-
1223	-function fullscreenPageLoad(itemId){
1224	- jQuery(document).ready(function(){
1225	- var $_GET = getQueryParams(document.location.search);
1226	- if ($_GET['fullscreen']==1){
1227	- toggle_fullwidth(itemId);
1228	- }
1229	- });
1230	-}