update table styles

app/views/api_keys/_index.html.erb

@@ -1,9 +1,9 @@
 <div class="FL">
   <h3><%= t(:api_key_write) %></h3>
-  <%= @write_key %>
+  <code class="large"><%= @write_key %></code>
   <br><br>
 
-  <%= button_to t(:api_key_write_new), channel_api_keys_path(@channel, :write => 1), :data => { :confirm => t(:confirm_new_api_key) } %>
+  <%= button_to t(:api_key_write_new), channel_api_keys_path(@channel, :write => 1), :data => { :confirm => t(:confirm_new_api_key) }, class: 'btn btn-warning btn-sm' %>
 
   <br><br>
 
@@ -12,7 +12,7 @@
       <table>
         <tr>
           <td><%= t(:api_key_key) %>:</td>
-          <td><%= read_key %></td>
+          <td><code class="large"><%= read_key %></code></td>
         </tr>
         <tr>
           <td class="VAT"><%= t(:note) %>:</td>
@@ -24,16 +24,16 @@
         <tr>
           <td></td>
           <td>
-            <div class="FL"><%= f.submit t(:note_save) %></div>
+            <div class="FL"><%= f.submit t(:note_save), class: 'btn btn-primary btn-sm btn-margin' %></div>
             <% end %>
-            <%= button_to t(:api_key_delete), channel_api_key_path(@channel, read_key), :method => 'delete', :data => { :confirm => t(:confirm_read_key_delete) } %></td>
+            <%= button_to t(:api_key_delete), channel_api_key_path(@channel, read_key), :method => 'delete', :data => { :confirm => t(:confirm_read_key_delete) }, class: 'btn btn-danger btn-sm btn-margin' %></td>
         </tr>
       </table>
       <br><br>
 
   <% end %>
 
-  <%= button_to t(:api_key_read_new), channel_api_keys_path(@channel, :write => 0) %>
+  <%= button_to t(:api_key_read_new), channel_api_keys_path(@channel, :write => 0), class: 'btn btn-warning btn-sm' %>
   <br>
 </div>
 <div id="sidebar_old">

app/views/channels/index.html.erb

@@ -5,6 +5,8 @@
 
     <div class="col-pad" data-no-turbolink>
 
+      <%= button_to t(:channel_create), channels_path, :method => :post, :class => 'btn btn-primary' %><br>
+
       <% if @channels.length > 0 %>
 
         <table class="table table-striped table-bordered tablesorter">
@@ -19,16 +21,19 @@
               <tr>
                 <td>
 
-                  <a href="/channels/<%= channel.id %>">
-                    <i class="fa fa-<%= 'un' if channel.public_flag == true %>lock fa-fw"></i>
-                    <%= channel.name %>
-                  </a>
-                  <br>
-                  <%= link_to t(:private_link), channel_path(channel.id, :anchor => 'privateview') %>  |
-                  <%= link_to t(:public_link), channel_path(channel.id, :anchor => 'publicview') %> |
-                  <%= link_to t(:settings_link), channel_path(channel.id, :anchor => 'channelsettings') %>  |
-                  <%= link_to t(:api_key_link), channel_path(channel.id, :anchor => 'apikeys') %>  |
-                  <%= link_to t(:data_import_link), channel_path(channel.id, :anchor => 'dataimport') %>
+                  <h4 style="margin-top: 0;">
+                    <a href="/channels/<%= channel.id %>">
+                      <i class="fa fa-<%= 'un' if channel.public_flag == true %>lock fa-fw"></i>
+                      <%= channel.name %>
+                    </a>
+                  </h4>
+                  <div class="btn-group btn-group-sm hidden-xs hidden-sm">
+                    <%= link_to t(:private_link), channel_path(channel.id, :anchor => 'privateview'), class: 'btn btn-default' %>
+                    <%= link_to t(:public_link), channel_path(channel.id, :anchor => 'publicview'), class: 'btn btn-default' %>
+                    <%= link_to t(:settings_link), channel_path(channel.id, :anchor => 'channelsettings'), class: 'btn btn-default' %>
+                    <%= link_to t(:api_key_link), channel_path(channel.id, :anchor => 'apikeys'), class: 'btn btn-default' %>
+                    <%= link_to t(:data_import_link), channel_path(channel.id, :anchor => 'dataimport'), class: 'btn btn-default' %>
+                  </div>
 
                 </td>
                 <td><%= channel.created_at.strftime("%Y-%m-%d") %></td>
@@ -38,8 +43,6 @@
         </table>
       <% end %>
 
-      <%= button_to t(:channel_create), channels_path, :method => :post, :class => 'btn btn-primary' %>
-
       <% if current_admin_user.present? %>
         <br><br><br>
         <% @channels.each do |c| %>
@@ -72,9 +75,3 @@
 
 </div>
 
-<script>
-  $(document).on('page:load ready', function() {
-    $('.tablesorter').tablesorter();
-  });
-</script>
-

app/views/plugins/index.html.erb

@@ -3,36 +3,43 @@
 
     <h4 class='breadcrumb'><%= t(:plugins) %></h4>
 
-    <% if @plugins.length > 0 %>
-      <table class="table table-striped table-bordered">
-        <tr>
-          <th><%= t(:plugin_name) %></th>
-          <th><%= t(:action) %></th>
-        </tr>
-
-        <% @plugins.each do |p| %>
-        <tr>
-          <td>
-            <i class="fa fa-<%= 'un' if p.private_flag != true %>lock fa-fw"></i>
-            <%= p.name %>
-          </td>
-          <td>
-            <%= link_to t(:view).downcase, plugin_path(p.id), :target => '_blank' %>
-            &nbsp;
-            <%= link_to t(:edit).downcase, edit_plugin_path(p.id) %>
-          </td>
-        </tr>
-        <% end %>
-
-      </table>
-
-      <br><br>
-    <% end %>
-
     <%= form_for :plugin do |p| %>
       <input name='userlogin' class='userlogin' />
       <%= p.submit t(:plugin_create), :class => 'btn btn-primary' %>
     <% end %>
+    <br>
+
+    <% if @plugins.length > 0 %>
+      <table class="table table-striped table-bordered tablesorter">
+        <thead>
+          <tr>
+            <th><%= t(:plugin_name) %> <i class="fa fa-unsorted"></i></th>
+              <th><%= t(:created) %> <i class="fa fa-unsorted"></i></td>
+          </tr>
+        </thead>
+        <tbody>
+          <% @plugins.each do |p| %>
+          <tr>
+            <td>
+              <h4 style="margin-top: 0;">
+                <a href="<%= plugin_path(p.id) %>" target="_blank">
+                  <i class="fa fa-<%= 'un' if p.private_flag != true %>lock fa-fw"></i>
+                  <%= p.name %>
+                </a>
+              </h4>
+              <div class="btn-group btn-group-sm">
+                <%= link_to T(:view), plugin_path(p.id), :target => '_blank', class: 'btn btn-default' %>
+                <%= link_to T(:edit), edit_plugin_path(p.id), class: 'btn btn-default' %>
+              </div>
+            </td>
+            <td><%= p.created_at.strftime("%Y-%m-%d") %></td>
+          </tr>
+          <% end %>
+        </tbody>
+
+      </table>
+    <% end %>
+
   </div>
 
   <div id="sidebar" class="col-xs-12 col-sm-6">

app/views/users/_list_channels.html.erb

@@ -0,0 +1,37 @@
+<h3><%= t(:user_public_channels) %> <%= @user.login %></h3>
+
+<% if @channels.present? && @channels.count > 0 %>
+  <table class="table table-striped table-bordered  tablesorter">
+    <thead>
+      <tr>
+        <th class="col-sm-5 col-xs-5"><%= t(:channel_name) %> <i class="fa fa-unsorted"></i></th>
+        <th class="col-sm-5 col-xs-5"><%= t(:channel_description) %> <i class="fa fa-unsorted"></i></td>
+        <th class="col-sm-2 col-xs-2"><%= t(:tags) %> <i class="fa fa-unsorted"></i></td>
+      </tr>
+    </thead>
+    <tbody>
+
+      <% @channels.each do |channel| %>
+        <tr>
+          <td>
+            <h4 style="margin-top: 0;">
+              <%= link_to channel.name, channel_path(channel.id) %>
+            </h4>
+            <%= link_to T(:view), channel_path(channel.id), class: 'btn btn-default btn-sm' %>
+          <td><%= channel.description %></td>
+          <td>
+            <% channel.tags.each do |tag| %>
+              <a href="/channels/public?tag=<%=u tag.name %>"><%= tag.name %></a><% unless tag == channel.tags.last %>, <% end %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+
+    </tbody>
+  </table>
+  <br>
+  <%= will_paginate @channels %>
+<% else %>
+  <%= t(:user_no_public_channels) %>
+<% end %>
+

app/views/users/list_channels.html.erb

@@ -1,19 +1,2 @@
-<h3><%= t(:user_public_channels) %> <%= @user.login %></h3>
-
-<% if @channels.present? && @channels.count > 0 %>
-  <table class="table table-striped table-bordered">
-    <tr><th><%= t(:channel_name) %></th><th><%= t(:channel_description) %></th><th><%= t(:tags) %></th></tr>
-    <% @channels.each do |m| %>
-      <tr<%= cycle('', raw(' class="stripe"')) %>>
-        <td><%= link_to m.name, channel_path(m.id) %></td>
-        <td><%= m.description %></td>
-        <td><%= m.list_tags %></td>
-      </tr>
-    <% end %>
-  </table>
-  <br>
-  <%= will_paginate @channels %>
-<% else %>
-  <%= t(:user_no_public_channels) %>
-<% end %>
+<%= render 'list_channels' %>
 

app/views/users/profile.html.erb

@@ -6,14 +6,15 @@
   </div>
 
   <h2><%= t(:profile_for) %> <%= @user.login %></h2>
-  <%= link_to t(:channels_public_view), list_channels_path(@user.login) %>
-  <br><br>
   <%= t(:member_since) %> <%= @user.created_at.strftime('%B %-d, %Y') %>
   <br><br>
   <%= t(:profile_website) %>: <%= link_to @user.website, @user.website %>
   <br><br>
   <%= t(:profile_bio) %>: <%= @user.bio %>
+  <br><br>
+  <%= render 'list_channels' %>
 
 <% else %>
   <%= t(:profile_not_public) %>
-<% end %>
+<% end %>
+

app/views/users/show.html.erb

@@ -21,8 +21,8 @@
       <tr>
         <td><%= t(:api_key) %></td>
         <td>
-          <%= @user.api_key %><br>
-          <%= button_to t(:api_key_new), user_new_api_key_path, :data => { :confirm => t(:confirm_new_user_api_key) }, :class => 'btn btn-primary btn-sm' %>
+          <code><%= @user.api_key %></code><br><br>
+          <%= button_to t(:api_key_new), user_new_api_key_path, :data => { :confirm => t(:confirm_new_user_api_key) }, :class => 'btn btn-warning btn-sm' %>
         </td>
       </tr>