Merge pull request publiclab#389 from jywarren/bootstrap3-fixes

assorted fixes for bootstrap 3

app/assets/javascripts/dragdrop.js

@@ -40,13 +40,13 @@ $('.dropzone').fileupload({
     'nid':$D.nid
   },
   start: function(e) {
-    $('.progress').show()
+    $('#imagebar .progress').show()
     $('#imagebar .uploading').show()
     $('#imagebar .prompt').hide()
     $('.dropzone').removeClass('hover');
   },
   done: function (e, data) {
-    $('.progress').hide()
+    $('#imagebar .progress').hide()
     $('#imagebar .uploading').hide()
     $('#imagebar .prompt').show()
     var is_image = false
@@ -83,7 +83,7 @@ $('.dropzone').fileupload({
   },
   progressall: function (e, data) {
     var progress = parseInt(data.loaded / data.total * 100, 10);
-    $('.progress .progress-bar').css(
+    $('#imagebar .progress .progress-bar').css(
       'width',
       progress + '%'
     );

app/assets/javascripts/like.js

@@ -10,7 +10,7 @@ function changelikecount(value,node_id) {
   $('#like-count-'+node_id).html("(" + count + ")");
 }
 function shownotliked(node_id) {
-  $('#like-star-'+node_id)[0].className = "fa fa-star-empty";
+  $('#like-star-'+node_id)[0].className = "fa fa-star-o";
 }
 function showliked(node_id) {
   $('#like-star-'+node_id)[0].className = "fa fa-star";

app/assets/stylesheets/style.css

@@ -53,6 +53,10 @@ h4,h5,h6, h1 small, h3 small {
   margin-top:8px;
 }
 
+#content p img {
+  max-width: 100%;
+}
+
 /* fontawesome default color */
 a .fa { color:#222; }
 a .fa-white,
@@ -204,6 +208,10 @@ body { padding-top: 70px; }
   margin-top: 8px;
 }
 
+#tags .label {
+  line-height: 2em;
+}
+
 /* Styles for specific areas of the site */
 
 .note-show .main-image {

app/controllers/search_controller.rb

@@ -59,7 +59,7 @@ def typeahead
       matches << "<i data-url='"+match.path+"' class='fa fa-"+match.icon+"'></i> "+match.title
     end
     DrupalUsers.limit(5)
-               .order("nid DESC")
+               .order("uid DESC")
                .where('name LIKE ? AND access != 0', "%" + params[:id] + "%").each do |match|
       matches << "<i data-url='/profile/"+match.name+"' class='fa fa-user'></i> "+match.name
     end

app/controllers/tag_controller.rb

@@ -30,9 +30,9 @@ def show
                         .page(params[:page])
                         .order("node_revisions.timestamp DESC")
     end
-      @notes = nodes if @node_type == "note"
-      @wikis = nodes if @node_type == "page"
-      @nodes = nodes if @node_type == "map"
+    @notes = nodes if @node_type == "note"
+    @wikis = nodes if @node_type == "page"
+    @nodes = nodes if @node_type == "map"
     @title = params[:id]
     set_sidebar :tags, [params[:id]]
   end

app/views/editor/_main_image.html.erb

@@ -11,7 +11,7 @@
 
       <!-- http://stackoverflow.com/questions/11235206/twitter-bootstrap-form-file-element-upload-button -->
       <label class="" for="fileinput">
-        <input id="fileinput" type="file" name="image[photo]" style="display:none;" />
+        <input id="side-fileinput" type="file" name="image[photo]" style="display:none;" />
         <a class="hidden-xs">choose one</a>
         <span class="visible-xs">
           <i class="fa fa-upload"></i> 

app/views/home/dashboard.html.erb

@@ -50,7 +50,7 @@
     </div>
     <script>
       (function(){
-        $('a#comments-tab').on('shown',function (e) {
+        $('a#comments-tab').on('shown.bs.tab',function (e) {
           $.ajax({
             url : '/dashboard/comments',
             type: 'GET',

app/views/map/_maps.html.erb

@@ -9,7 +9,7 @@
       <%= node.drupal_content_field_mappers.collect(&:field_mappers_value).uniq.join(', ') %>
       <% unless !node.map || node.map.captured_on == "" %>| <%= time_ago_in_words(node.map.captured_on) %> ago<% end %>
       | <a href="<%= node.path %>#comments"><i style="color:#888;" class="fa fa-comment-alt"></i> <%= node.comment_count %></a>
-      | <i style="color:#888;" class="fa fa-star-empty"></i> <%= node.likes %>
+      | <i style="color:#888;" class="fa fa-star-o"></i> <%= node.likes %>
       <% if current_user && current_user.role == "admin" %>| <%= link_to "/map/delete/"+node.id.to_s, :confirm => 'Are you sure?' do %>
           <i class="fa fa-trash"></i>
         <% end %><% end %>

app/views/notes/_comment.html.erb

@@ -6,7 +6,7 @@
 
     <div class="navbar-text pull-left">
       <% if comment.author %>
-        <% if comment.author.user.photo_file_name %>
+        <% if comment.author.user && comment.author.user.photo_file_name %>
           <img style="width:32px;margin-right:6px;" class="img-circle" src="<%= comment.author.user.photo_path(:thumb) %>" /> 
         <% end %>
         <a href="/profile/<%= comment.author.name %>"><%= comment.author.name %></a>

app/views/notes/_notes.html.erb

@@ -2,7 +2,7 @@
 <div id="notes">
     <div class="row">
     <% notes.each_with_index do |node,i| %>
-      <div class="col-md-3 clearfix note" style="overflow:hidden;">
+      <div class="<% if @widget %>col-xs-3 col-sm-3 <% end %>col-md-3 clearfix note" style="overflow:hidden;">
         <% if node.main_image %>
           <a <% if @widget %>target="_blank"<% end %> href="<%= node.path %>"><img src="<%= node.main_image.path(:default) %>" style="width:100%;" /></a>
         <% end %>
@@ -20,28 +20,28 @@
             | <a <% if @widget %>target="_blank"<% end %> href="<%= node.path %>#comments"><i style="color:#888;" class="fa fa-comment-o"></i> <%= node.comment_count %></a>
           <% else %>
             last edit by <a <% if @widget %>target="_blank"<% end %> href="/profile/<%= node.latest.author.name %>"><%= node.latest.author.name %></a> 
-            <%= time_ago_in_words(Time.new(node.latest.timestamp)) %> ago
+            <%= time_ago_in_words(Time.at(node.latest.timestamp)) %> ago
           <% end %>
           | <i class="hidden-xs hidden-sm fa fa-eye"></i> <%= number_with_delimiter(node.totalcount) %> <span class="hidden-xs hidden-sm">views</span>
           | <i style="<% if node.likes > 0 %>color:#db4;<% else %>color:#888;<% end %>" class="fa fa-star-o"></i> <%= node.likes %>
         </small></p>
 
         <% if @compact.nil? %>
-        <p><%= raw strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(100) if node.body %></p>
-        <p>
-          <% if logged_in_as(['admin','moderator']) %><a class="btn btn-default btn-xs" href="/moderate/spam/<%= node.id %>"><i class="fa fa-ban"></i> Spam</a><% end %>
-          <a href="<%= node.path %>">Read more &raquo;</a>
-        </p>
+          <p><%= raw strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(100) if node.body %></p>
+          <p>
+            <% if logged_in_as(['admin','moderator']) %><a class="btn btn-default btn-xs" href="/moderate/spam/<%= node.id %>"><i class="fa fa-ban"></i> Spam</a><% end %>
+            <a href="<%= node.path %>">Read more &raquo;</a>
+          </p>
         <% end %>
         <% if params[:mod] %>
-        <a class="btn btn-default btn-xs" href="#"><i class="fa fa-ban-circle"></i> Spam</a>
+          <a class="btn btn-default btn-xs" href="#"><i class="fa fa-ban-circle"></i> Spam</a>
         <% end %>
         <hr style="display:none;" class="bottom" />
       </div>
-      <hr class="visible-xs visible-sm" />
+      <% unless @widget %><hr class="visible-xs visible-sm" /><% end %>
     <% if ((i+1)/4.0).to_i == ((i+1)/4.0) %>
     </div>
-    <hr class="visible-xs visible-sm grid" />
+    <% unless @widget %><hr class="visible-xs visible-sm grid" /><% end %>
     <div class="row">
     <% end %>
     <% end %>

app/views/notes/_tagged_notes.html.erb

@@ -10,7 +10,7 @@
         | <%= time_ago_in_words(node.created_at) %> ago
         | <a href="<%= node.path %>#comments"><i style="color:#888;" class="fa fa-comment-alt"></i> <%= node.comment_count %></a>
         | <%= number_with_delimiter(node.totalcount) %> views
-        | <i style="color:#888;" class="fa fa-star-empty"></i> <%= node.likes %>
+        | <i style="color:#888;" class="fa fa-star-o"></i> <%= node.likes %>
       </small></p>
       <p class="hidden-lg"><%= raw strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(150) %></p>
       <p class="visible-lg"><small><%= raw (strip_tags(sanitize(RDiscount.new(node.body).to_html)).truncate(150)) %></small></p>

app/views/notes/index.html.erb

@@ -7,36 +7,35 @@
 <% end %>
 <div class="col-md-9">
   <% if params[:controller] == "search" %>
-    <h3 style="margin-top:0;">Search results for <i style="color:#aaa;"><%= params[:id] %></i> <small>(<a href="/search/advanced/<%= params[:id] %>">advanced search</a>)</h3>
+    <h3>Search results for <i style="color:#aaa;"><%= params[:id] %></i> <small>(<a href="/search/advanced/<%= params[:id] %>">advanced search</a>)</h3>
   <% elsif params[:controller] == "tag" %>
-    <h3 style="margin-top:0;">Notes tagged with <i style="color:#aaa;"><%= params[:id] %></i></h3>
+    <h3>Notes tagged with <i style="color:#aaa;"><%= params[:id] %></i></h3>
   <% elsif params[:action] == "popular" %>
-    <h2 style="margin-top:0;">Popular research notes</h2>
+    <h2>Popular research notes</h2>
   <% elsif params[:action] == "author_topic" %>
-    <h3 style="margin-top:0;">Research on "<%= @tagnames.join(', ') %>" by <a href="/people/<%= @user.name %>"><%= @user.name %></a> <br /><small><%= @user.node_count %> research notes and wiki edits starting <%= time_ago_in_words(@user.created_at) %> ago</small></h3>
+    <h3>Research on "<%= @tagnames.join(', ') %>" by <a href="/people/<%= @user.name %>"><%= @user.name %></a> <br /><small><%= @user.node_count %> research notes and wiki edits starting <%= time_ago_in_words(@user.created_at) %> ago</small></h3>
   <% elsif params[:action] == "author" %>
-    <h3 style="margin-top:0;">Research by <a href="/people/<%= @user.name %>"><%= @user.name %></a> <small><%= @user.node_count %> research notes and wiki edits <% if @user.notes.length > 0 %>starting <%= time_ago_in_words(@user.created_at) %> ago<% end %></small></h3>
+    <h3>Research by <a href="/people/<%= @user.name %>"><%= @user.name %></a> <small><%= @user.node_count %> research notes and wiki edits <% if @user.notes.length > 0 %>starting <%= time_ago_in_words(@user.created_at) %> ago<% end %></small></h3>
   <% else %>
-    <h2 style="margin-top:0;">Research notes <small class="hidden-sm">ideas & documentation from contributors like you</small></h2>
+    <h2>Research notes <small class="hidden-sm">ideas & documentation from contributors like you</small></h2>
   <% end %>
   <% if params[:controller] == "notes" && (params[:action] == "popular" || params[:action] == "index" || params[:action] == "liked") %>
-    <div class="navbar">
-      <div class="navbar-inner">
-        <ul class="nav">
-          <li<% if params[:action] == "index" %> class="active"<% end %>><a href="/notes/">Recent</a></li>
-          <li<% if params[:action] == "popular" %> class="active"<% end %>><a href="/notes/popular/">Popular</a></li>
-          <li<% if params[:action] == "liked" %> class="active"<% end %>><a href="/notes/liked/"><i class="fa fa-star-empty"></i><span class="hidden-sm"> Liked</span></a></li>
-
-          <li><a href="/wiki/">Wiki<span class="hidden-sm"> pages</span></a></li>
-        </ul>
 
-        <%= render :partial => "notes/format_toggle" %>
-        <% if params[:action] == "liked" %><a style="margin-right:4px;" class="pull-right btn btn-default btn-sm" href="/feed/liked.rss"><i class="fa fa-rss"></i></a><% end %>
+    <%= render :partial => "notes/format_toggle" %>
+    <% if params[:action] == "liked" %><a style="margin-right:4px;" class="pull-right btn btn-default btn-sm" href="/feed/liked.rss"><i class="fa fa-rss"></i></a><% end %>
+
+    <ul class="nav nav-tabs">
+        <li<% if params[:action] == "index" %> class="active"<% end %>><a href="/notes/">Recent</a></li>
+        <li<% if params[:action] == "popular" %> class="active"<% end %>><a href="/notes/popular/">Popular</a></li>
+        <li<% if params[:action] == "liked" %> class="active"<% end %>><a href="/notes/liked/"><i class="fa fa-star-o"></i><span class="hidden-sm"> Liked</span></a></li>
+
+        <li><a href="/wiki/">Wiki<span class="hidden-sm"> pages</span></a></li>
+    </ul>
 
-      </div>
-    </div>
   <% end %>
 
+  <br />
+
   <%= render :partial => "notes/notes" %>
 
   <hr />

app/views/notes/show.html.erb

@@ -61,7 +61,7 @@
   <hr style="margin-top:10px;" />
 
   <% @node.power_tag_objects('barnstar').each do |tag| %>
-    <p style="color:#aaa;"><i style="color:#db4;" class="fa fa-large fa fa-star-empty"></i> <i><a href="/profile/<%= @node.author.name %>"><%= @node.author.name %></a> was awarded <a href="/wiki/barnstars#<%= tag.name.split('-').each{|w| w.capitalize!}.join('+') %>+Barnstar">the <%= tag.name.split(':').last.split('-').each{|w| w.capitalize!}.join(' ') %> Barnstar</a> by <a href="/profile/<%= tag.author.username %>"><%= tag.author.username %></a> for their work in this research note.</i></p>
+    <p style="color:#aaa;"><i style="color:#db4;" class="fa fa-large fa fa-star-o"></i> <i><a href="/profile/<%= @node.author.name %>"><%= @node.author.name %></a> was awarded <a href="/wiki/barnstars#<%= tag.name.split('-').each{|w| w.capitalize!}.join('+') %>+Barnstar">the <%= tag.name.split(':').last.split('-').each{|w| w.capitalize!}.join(' ') %> Barnstar</a> by <a href="/profile/<%= tag.author.username %>"><%= tag.author.username %></a> for their work in this research note.</i></p>
     <hr />
   <% end %>
 

app/views/search/index.html.erb

@@ -2,7 +2,7 @@
 
 <div class="col-md-9">
 
-    <h3 style="margin-top:0;">Search results for <i style="color:#aaa;"><%= params[:id] %></i> <small>(<a href="/search/advanced/<%= params[:id] %>">advanced search</a>)</h3>
+    <h3>Search results for <i style="color:#aaa;"><%= params[:id] %></i> <small>(<a href="/search/advanced/<%= params[:id] %>">advanced search</a>)</h3>
 
   <% if @notes.length == 0 %>
 

app/views/search/map.html.erb

@@ -1,5 +1,5 @@
-<%= render :partial => "home/sidebar" %>
-<div class="col-md-9">
+
+<div class="col-md-8">
 
   <h3 style="margin-top:0;">User map</h3>
 

app/views/sidebar/_related.html.erb

@@ -62,7 +62,7 @@
       <% @users.each do |author| %>
       <p>
         <i class="fa fa-user"></i>
-        <a href="/profile/<%= author %>"><%= author %></a>
+        <a href="/profile/<%= author.name %>"><%= author.name %></a>
       </p>
       <% end %>
       <p><a href="/contributors/<%= params[:id] %>"><i class="fa fa-list"></i> View all &raquo;</a></p>

app/views/tag/blog.html.erb

@@ -46,7 +46,7 @@
             <% if params[:controller] == "notes" && params[:action] == "popular" %>
             | <%= number_with_delimiter(node.totalcount) %> views
             <% else %>
-            | <i style="color:#888;" class="fa fa-star-empty"></i> <%= node.likes %>
+            | <i style="color:#888;" class="fa fa-star-o"></i> <%= node.likes %>
             <% end %>
           </small></p>
           <p><%= raw auto_link(node.latest.render_body, :sanitize => false) %></p>

app/views/tag/show.html.erb

@@ -50,7 +50,7 @@
       <% else %>
       <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Follow <b><%= params[:id] %></b></a>
       <% end %>
-      <a class="btn btn-sm" rel="popover" data-placement="bottom" data-html="true" data-title="Users following this tag" data-content="<% DrupalTag.followers(params[:id]).each do |user| %><i class='fa fa-star-empty'></i> <a href='/profile/<%= user.username %>'><%= user.username %></a><br /><% end %><% if DrupalTag.follower_count(params[:id]) == 0 %><i>None</i><% end %>"><%= DrupalTag.follower_count(params[:id]) %> <i class="fa fa-user"></i> <span class="caret"></span></a>
+      <a class="btn btn-sm" rel="popover" data-placement="bottom" data-html="true" data-title="Users following this tag" data-content="<% DrupalTag.followers(params[:id]).each do |user| %><i class='fa fa-star-o'></i> <a href='/profile/<%= user.username %>'><%= user.username %></a><br /><% end %><% if DrupalTag.follower_count(params[:id]) == 0 %><i>None</i><% end %>"><%= DrupalTag.follower_count(params[:id]) %> <i class="fa fa-user"></i> <span class="caret"></span></a>
     <% end %>
   </div>
   <!-- AJAXify -->

app/views/tag/widget.html.erb

@@ -2,8 +2,11 @@
 <link href="/lib/fontawesome/css/font-awesome.min.css" media="all" rel="stylesheet" type="text/css" />
 
 <style>
+  body {
+    padding-top: 0;
+  }
   #notes {
-    padding:0;
+    padding: 0;
   }
 </style>
 

app/views/users/likes.html.erb

@@ -18,7 +18,7 @@
 </div>
 
 <div class="col-md-9">
-  <h3 style="margin-top:0;"><i class="fa fa-star-empty"></i> Liked by <a href="/profile/<%= @user.name %>"><%= @user.name %></a></h3>
+  <h3 style="margin-top:0;"><i class="fa fa-star-o"></i> Liked by <a href="/profile/<%= @user.name %>"><%= @user.name %></a></h3>
 
   <hr />
 

app/views/users/profile.html.erb

@@ -2,15 +2,15 @@
  <% if @user.user && @user.user.photo_file_name %><img class="img-rounded" id="profile-photo" style="width:100%;margin-bottom:10px;" src="<%= @user.user.photo_path(:thumb) %>" /><% end %>
 
   <!--<a href="#" class="btn btn-default btn-block"><i class="fa fa-envelope"></i> Send message</a>-->
-  <a href="#" class="btn btn-default btn-block disabled"><i class="fa fa-eye-open"></i> Follow <%= @user.name %></a>
+  <a href="#" class="btn btn-default btn-block disabled"><i class="fa fa-eye"></i> Follow <%= @user.name %></a>
   <% if @user.user.nil? && current_user && current_user.role == "admin" %>
     <a href="/admin/migrate/<%= @user.uid %>" class="btn btn-block"><i class="fa fa-bolt"></i> Migrate to new site</a>
   <% end %>
   <% if @user.user && current_user && current_user.role == "admin" && @user.user.role != "admin" %>
     <a href="/admin/promote/admin/<%= @user.user.id %>" class="btn btn-default btn-block"><i class="fa fa-certificate"></i> Make admin</a>
   <% end %>
   <% if @user.user && current_user && current_user.role == "admin" && @user.role == "moderator" %>
-    <a href="/admin/demote/basic/<%= @user.user.id %>" class="btn btn-default btn-block"><i class="fa fa-ban-circle"></i> Revert to basic user</a>
+    <a href="/admin/demote/basic/<%= @user.user.id %>" class="btn btn-default btn-block"><i class="fa fa-ban"></i> Revert to basic user</a>
   <% end %>
   <% if @user.user && current_user && (current_user.role == "admin" || current_user.role == "moderator") && @user.role == "basic" %>
     <a href="/admin/promote/moderator/<%= @user.user.id %>" class="btn btn-default btn-block"><i class="fa fa-certificate"></i> Make moderator</a>
@@ -19,7 +19,7 @@
   <% if current_user && (current_user.role == "admin" || current_user.role == "moderator") && @user.status == 0 %>
     <a href="/unban/<%= @user.id %>" class="btn btn-default btn-block"><i class="fa fa-thumbs-up"></i> Unban user</a>
   <% elsif current_user && (current_user.role == "admin" || current_user.role == "moderator") && @user.status == 1 %>
-    <a data-confirm="Are you sure? The user will no longer be able to log in or publish." href="/ban/<%= @user.id %>" class="btn btn-default btn-block"><i class="fa fa-ban-circle"></i> Ban user</a>
+    <a data-confirm="Are you sure? The user will no longer be able to log in or publish." href="/ban/<%= @user.id %>" class="btn btn-default btn-block"><i class="fa fa-ban"></i> Ban user</a>
   <% end %>
 
   <% if @user.user && !@user.user.reset_key.nil? && current_user && current_user.role == "admin" %>
@@ -63,7 +63,7 @@
       <% if current_user && current_user.role == "admin" %> | <%= @user.email %><% end %>
       <% if @user.role == "moderator" %> | <i class="fa fa-certificate"></i> Moderator<% end %>
       <% if @user.role == "admin" %> | <i class="fa fa-certificate"></i> Admin<% end %>
-      <% if @user.status == 0 %> | <i class="fa fa-ban-circle" style="color:#a00;"></i> Banned<% end %>
+      <% if @user.status == 0 %> | <i class="fa fa-ban" style="color:#a00;"></i> Banned<% end %>
     </small>
   </h3>
 
@@ -73,7 +73,7 @@
 
   <% if @user.user %>
   <% @user.user.barnstars.each do |tag| %>
-    <p style="color:#aaa;"><i style="color:#db4;" class="fa fa-large fa fa-star-empty"></i> <i><a href="/profile/<%= tag.node.author.name %>"><%= tag.node.author.name %></a> was awarded <a href="/wiki/barnstars#<%= tag.name.split('-').each{|w| w.capitalize!}.join('+') %>+Barnstar">the <%= tag.name.split(':').last.split('-').each{|w| w.capitalize!}.join(' ') %> Barnstar</a> by <a href="/profile/<%= tag.author.username %>"><%= tag.author.username %></a> for their work published in <a href="<%= tag.node.path %>"><%= tag.node.title %></a>.</i></p>
+    <p style="color:#aaa;"><i style="color:#db4;" class="fa fa-large fa fa-star-o"></i> <i><a href="/profile/<%= tag.node.author.name %>"><%= tag.node.author.name %></a> was awarded <a href="/wiki/barnstars#<%= tag.name.split('-').each{|w| w.capitalize!}.join('+') %>+Barnstar">the <%= tag.name.split(':').last.split('-').each{|w| w.capitalize!}.join(' ') %> Barnstar</a> by <a href="/profile/<%= tag.author.username %>"><%= tag.author.username %></a> for their work published in <a href="<%= tag.node.path %>"><%= tag.node.title %></a>.</i></p>
     <hr />
   <% end %>
   <% end %>