Permalink
Browse files

changes to attachments pop_ups and admin toolbars to allow for smooth…

…er paginating.
  • Loading branch information...
1 parent 6e20499 commit 0b6a6d443df0064f0eeb79f3f12e87bd0041eeff @markdunford markdunford committed Aug 27, 2012
View
@@ -2,7 +2,8 @@ source "http://rubygems.org"
# Add dependencies required to use your gem here.
# Example:
-gem "rails", "~>3.0.0"
+gem "rails", "= 3.0.9"
+#gem "rails", "~>3.0.0"
gem "devise", "~> 1.1.2"
gem 'formtastic', "1.2.3"
gem 'polypaperclip', "0.1.13"
@@ -14,7 +15,7 @@ gem "friendly_id", "~> 3.1"
gem 'inherited_resources', '1.2.2'
gem 'acts_as_indexed'
gem 'aws-s3', :require => 'aws/s3'
-gem "acts_as_tree"
+gem "acts_as_tree", '= 0.1.1'
gem "acts_as_list"
gem "garb"
gem "bartt-ssl_requirement", :require => 'ssl_requirement'
View
Binary file not shown.
@@ -3,8 +3,8 @@
<% Attachment.content_types.each do |type| %>
<li><%= link_to type.pluralize.titleize, admin_attachments_path({:type => type}), :class => "awesome light" %></li>
<% end %>
+ <div class="clear"></div>
</ul>
-<% #debugger %>
<% if params[:type] &&
(
FileTest.exist?(File.join(::Rails.root.to_s, 'app', 'views', params[:controller],'_'+params[:type]+'.html.erb')) ||
@@ -1,4 +1,4 @@
-<div class="toolbar" style="margin-top:5px">
+<div class="toolbar" style="margin-bottom:15px; background-color: #555;">
<%= will_paginate(collection) %>
</div>
@@ -1,22 +1,28 @@
-<div class="toolbar" style="margin-bottom:5px">
- <% if current_user.can?("create","Model#{resource_class.to_s}") %>
- <%= link_to "+ Add #{resource_class.to_s}", new_resource_url, :class => "awesome large green floatRight" %>
- <% end %>
-
- <% if resource_class.respond_to?("find_with_index") %>
- <%= form_for "", collection_path, :html=> { :style => "float:right;", :method => :get} do |f| %>
- <%= link_to "Search", "#",
- :class => "awesome large light floatRight",
- :style => "margin-right:5px",
- :onclick => "$('#search').submit()"
- %>
- <% params.each do |name,value| -%>
- <% next if ["controller","action"].index(name) %>
- <%= hidden_field_tag name, value %>
- <% end -%>
- <%= f.text_field :s, :id => :s, :name => "s", :value => params[:s] %>
+<div class="toolbar" style="margin-bottom:15px; background-color: #555;">
+ <%= will_paginate(collection) %>
+</div>
+
+<div class="clear"></div>
+
+<div class="toolbar" style="margin-bottom:15px; background-color: #555; border-top: #fff;">
+ <div>
+ <% if current_user.can?("create","Model#{resource_class.to_s}") %>
+ <%= link_to "+ Add #{resource_class.to_s}", new_resource_url, :class => "awesome large green floatRight" %>
<% end %>
- <% end %>
- <%= will_paginate(collection) %>
+ <% if resource_class.respond_to?("find_with_index") %>
+ <%= form_for "", collection_path, :html=> { :style => "float:right;", :method => :get} do |f| %>
+ <%= link_to "Search", "#",
+ :class => "awesome large light floatRight",
+ :style => "margin-right:5px",
+ :onclick => "$('#search').submit()"
+ %>
+ <% params.each do |name,value| -%>
+ <% next if ["controller","action"].index(name) %>
+ <%= hidden_field_tag name, value %>
+ <% end -%>
+ <%= f.text_field :s, :id => :s, :name => "s", :value => params[:s] %>
+ <% end %>
+ <% end %>
+ </div>
</div>
View
@@ -9,6 +9,7 @@
require 'inherited_resources'
require 'acts_as_indexed'
require 'aws/s3'
+#require "acts_as_tree", "= 0.1.1"
require "acts_as_tree"
require "acts_as_list"
require "garb"
@@ -477,7 +477,7 @@ input#s{
margin-bottom: -54px;
margin-top: 12px;
float: right;
- margin-right: 450px;
+/* margin-right: 450px;*/
}
.image_subnav li{
float: left;
@@ -570,4 +570,8 @@ body.login form input.submit:hover{
.devise_links a:hover{
color: #fff;
background: none;
+}
+
+.toolbar .disabled {
+ display: none;
}
@@ -70,7 +70,7 @@ form.formtastic input.awesome,
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;}
-.pagination span.current { background: #fff;}
+.pagination span.current {background-color: #91bd09; color: #fff; padding: 4px 7px 6px 7px;}
.light.awesome, .light.awesome:visited,
.pagination a { background-color: #dfdfdf; color:#777777; text-shadow:1px 1px 0px #ffffff; border-color: #ddd; color: #999;

0 comments on commit 0b6a6d4

Please sign in to comment.