From 75ac3db89a194c66263252986ccf9e270af73e6e Mon Sep 17 00:00:00 2001 From: Lee Lawlor Date: Wed, 15 Oct 2014 21:47:51 -0400 Subject: [PATCH] fix column width and plugin styles --- app/views/channels/watched.html.erb | 8 ++-- app/views/plugins/edit.html.erb | 25 +++++----- app/views/plugins/index.html.erb | 65 +++++++++++++------------- app/views/plugins/new.html.erb | 65 +++++++++++++------------- app/views/users/edit.html.erb | 66 ++++++++++++++------------- app/views/users/edit_profile.html.erb | 49 ++++++++++---------- 6 files changed, 143 insertions(+), 135 deletions(-) diff --git a/app/views/channels/watched.html.erb b/app/views/channels/watched.html.erb index f26e8a1..2e6a9f9 100644 --- a/app/views/channels/watched.html.erb +++ b/app/views/channels/watched.html.erb @@ -4,9 +4,11 @@

<%= t(:watched_channels) %>

<% if @channels.empty? %> - <%= t(:watched_empty) %> -

- <%= link_to t(:watched_find), public_channels_path %> +
+ <%= t(:watched_empty) %> +

+ <%= link_to t(:watched_find), public_channels_path %> +
<% else %> <%= render :partial => 'list' %> <% end %> diff --git a/app/views/plugins/edit.html.erb b/app/views/plugins/edit.html.erb index cf3234e..eeb8cd4 100644 --- a/app/views/plugins/edit.html.erb +++ b/app/views/plugins/edit.html.erb @@ -18,24 +18,12 @@
  1. <%= link_to t(:plugins), plugins_path %>
    2. -
  2. <%= link_to plugin_path(@plugin.id) do %><%= t(:plugin) %> <%= @plugin.id %><% end %>
    3. +
  3. <%= link_to plugin_path(@plugin.id), target: '_blank' do %><%= t(:plugin) %> <%= @plugin.id %><% end %>
  4. <%= t(:edit) %>
<%= form_for @plugin, :html => {:method => 'put', :class => 'form-horizontal'} do |c| %> <%= error_messages_for 'plugin', :header_message => t(:try_again), :message => t(:plugin_error) %> - - -
-
-
- -
-
-
@@ -57,6 +45,17 @@
<%= c.text_area :js, :class => 'form-control', :rows => 14 %>
+
+
+
+ +
+
+
+

<%= c.submit t(:plugin_save), :class => 'btn btn-primary' %>

diff --git a/app/views/plugins/index.html.erb b/app/views/plugins/index.html.erb index a5b640d..810f83e 100644 --- a/app/views/plugins/index.html.erb +++ b/app/views/plugins/index.html.erb @@ -3,40 +3,43 @@

<%= t(:plugins) %>

- <%= link_to t(:plugin_new), new_plugin_path, class: 'btn btn-primary' %> -

+
- <% if @plugins.length > 0 %> - - - - - - - - <% @plugins.each do |p| %> - - - - - <% end %> - + <%= link_to t(:plugin_new), new_plugin_path, class: 'btn btn-primary' %> +

-
<%= t(:plugin_name) %> <%= t(:created) %> -
-

- - - <%= p.name %> - -

-
- <%= 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', 'data-no-turbolink' => 'true' %> -
- 		<%= p.created_at.strftime("%Y-%m-%d") %>
- <% end %> + <% if @plugins.length > 0 %> + + + + + + + + <% @plugins.each do |p| %> + + + + + <% end %> + +
<%= t(:plugin_name) %> <%= t(:created) %> +
+

+ + + <%= p.name %> + +

+
+ <%= 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', 'data-no-turbolink' => 'true' %> +
+ 		<%= p.created_at.strftime("%Y-%m-%d") %>
+ <% end %> + +