update authentication system to Devise

app/views/channels/_edit.html.erb

@@ -1,10 +1,5 @@
 <div class="FL">
-<% flash.each do |name, msg| %>
-<div id="<%= name %>" class="fade" >
-  <p><%= msg %></p>
-  <div class="clear"></div>
-</div>
-<% end %>
+
   <%= form_for @channel, :html => {:method => 'put'} do |c| %>
    <% unless session[:errors].nil?
       session[:errors].each do |attr, msg|
@@ -109,12 +104,12 @@
     </table>
   <% end %>
 
-  <br /><br />
+  <br><br>
 
   <h4><%= t(:channel_clear_message) %></h4>
   <%= button_to t(:channel_clear), { :controller => 'channels', :action => 'clear', :id => @channel.id }, :data => { :confirm => t(:confirm_channel_clear) } %>
 
-  <br /><br />
+  <br><br>
 
   <h4><%= t(:channel_delete_message) %></h4>
   <%= button_to t(:channel_delete), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) } %>
@@ -124,17 +119,17 @@
     <li>
       <h2><%= t(:help) %></h2>
       <%= t(:help_channel_public) %>
-      <br /><br />
+      <br><br>
       <%= t(:help_channel_url) %>
-      <br /><br />
+      <br><br>
       <%= t(:help_channel_video) %>
-      <br /><br />
+      <br><br>
       <%= t(:help_channel_fields) %>
-      <br /><br />
+      <br><br>
       <%= t(:help_channel_clear) %>
-      <br /><br />
+      <br><br>
       <%= t(:help_channel_ranking) %>
-      <br /><br />
+      <br><br>
     </li>
   </ul>
 </div>

app/views/channels/_import.html.erb

@@ -1,18 +1,13 @@
 <div class="FL">
   <%= t(:upload_select) %>
-  <br /><br />
-<% flash.each do |name, msg| %>
-<div id="<%= name %>" class="fade" >
-    <p><%= msg %></p>
-    <div class="clear"></div>
-  </div>
-<% end %>
+  <br>
+
   <%= form_for :upload, :url => upload_channel_path(@channel), :html => { :multipart => true } do |f| %>
     <%= f.file_field :csv %>
-    <br /><br />
+    <br><br>
     <%= t(:time_zone) %>
     <%= time_zone_select 'feed', 'time_zone', nil, :default => 'UTC' %>
-    <br /><br />
+    <br><br>
     <%= f.submit t(:upload), :disable_with => t(:uploading) %>
   <% end %>
 
@@ -28,14 +23,14 @@
           <div class="code"><%= "#{@api_domain}update" %></div>
           <%= t(:help_channel_post_example) %>
           <div class="code"><%= "#{@api_domain}update?key=#{@key}&field1=0" %></div>
-          <br /><br />
+          <br><br>
 
           <div class="helplink">(<a target="_blank" href="/docs/channels#get_feed"><%= t(:help_options) %></a>)</div>
           <h2><%= t(:help_channel_feed) %></h2>
           <%= t(:help_channel_view) %>
-          <br />
+          <br>
           <div class="code"><%= link_to "#{@api_domain}channels/#{@channel.id}/feed.json?key=#{@key}", "#{@api_domain}channels/#{@channel.id}/feed.json?key=#{@key}", :target => '_blank' %></div>
-          <br />
+          <br>
 
         </li>
 

app/views/channels/_public_show.html.erb

@@ -18,7 +18,7 @@
       <%= f.error_messages %>
       <input name='userlogin' class='userlogin' />
       <%= f.text_area :body, :rows => 7, :cols => 54 %>
-      <br />
+      <br>
       <%= submit_tag %>
     <% end %>
   </div>
@@ -56,7 +56,7 @@ function commentflag(m_id, user_id)
          type: 'POST',
          data: {user_id : user_id},
          success: function(data) {
-       $('#commentflag' + m_id).parent().parent().append("<span id='votemsg" + m_id + "'><br /><br /><%= t(:comment_reported) %></span>");
+       $('#commentflag' + m_id).parent().parent().append("<span id='votemsg" + m_id + "'><br><br><%= t(:comment_reported) %></span>");
        $('#imgflag' + m_id).attr('src', '/images/flag_red.gif');
        $('#flaglink' + m_id).removeAttr('onclick');
        $('#flaglink' + m_id).unbind('mouseenter mouseleave');

app/views/channels/index.html.erb

@@ -32,7 +32,7 @@
 
         </table>
 
-        <br />
+        <br>
 
       <% end %>
 
@@ -43,16 +43,16 @@
 
       <% if is_admin? %>
 
-        <br /><br /><br />
+        <br><br><br>
 
         <% @channels.each do |c| %>
           <% if c.social %>
             <%= t(:social_channel) %>: <%= link_to c.name, (Rails.env == 'production') ? "http://www.socialsensornetwork.com/#{c.slug}" : "/s/#{c.slug}" %>
-            <br />
+            <br>
           <% end %>
         <% end %>
 
-        <br />
+        <br>
 
         <%= link_to t(:social_channel_create), :controller => 'channels', :action => 'social_new' %>
       <% end %>

app/views/channels/public.html.erb

@@ -1,9 +1,9 @@
 <div class="row">
 
   <div class="col-xs-12 col-sm-9">
-    <h4 class="breadcrumb"><%= flash[:notice] %></h4>
+    <h4 class="breadcrumb"><%= @header %></h4>
     <%= render :partial => 'list' %>
-    <br />
+    <br>
     <%= will_paginate @channels %>
   </div>
 

app/views/channels/social_new.html.erb

@@ -76,9 +76,9 @@
     <li>
       <h2><%= t(:help) %></h2>
       <%= t(:help_social_channel) %>
-      <br /><br />
+      <br><br>
       <div class="code">http://www.socialsensornetwork.com/<b>slug</b></div>
-      <br />
+      <br>
       <%= t(:help_social_channel_public) %>
     </li>
   </ul>

app/views/channels/social_show.html.erb

@@ -93,7 +93,7 @@
     
     <% if !@channel.description.blank? %>
       <div class="default_text"><%= t(:channel_directions) %>: <%= @channel.description %></div>
-      <br />
+      <br>
     <% end %>
   
     <%= form_tag "#{@post_url}" do %>
@@ -122,19 +122,19 @@
       </table>
     <% end %>
     
-    <br /><br />
+    <br><br>
   
     <div style="float: left; width: 600px;">
       
       <iframe width="600" height="300" frameborder="0" scrolling="no" style="border: 1px solid #cccccc;" src="<%= @api_domain %>channels/<%= @channel.id %>/maps/default?width=600&height=300&results=100&round=2&status=true&dynamic=true"></iframe>
       
       <% @fields.each do |f| %>
-        <br /><br />
+        <br><br>
         <iframe width="600" height="300" frameborder="0" style="border: 1px solid #cccccc;" src="<%= @api_domain %>channels/<%= @channel.id %>/charts/<%= f[-1] %>?width=600&height=300&results=100&round=2&color=C46353&location=true&dynamic=true&push=false&max=20000&min=-20000"></iframe>
       <% end %>
    
       <div id="footer">
-        <br /><br />
+        <br><br>
         &copy;2011 Social Sensor Network - Powered by <a href="https://www.thingspeak.com/">ThingSpeak</a>
       </div>
 

app/views/channels/watched.html.erb

@@ -5,7 +5,7 @@
 
     <% if @channels.empty? %>
       <%= t(:watched_empty) %>
-      <br /><br />
+      <br><br>
       <%= link_to t(:watched_find), public_channels_path %>
     <% else %>
       <%= render :partial => 'list' %>