diff --git a/Gemfile b/Gemfile
index 922cd9e..03d0975 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.6'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -12,10 +12,6 @@ gem 'cancan', '~> 1.6.7'
gem 'squeel', '~> 0.9.3'
gem 'sentient_user', '~> 0.3.2'
gem 'userstamp_basic', '~> 0.1.0'
-gem 'active_scaffold', '~> 3.2.3'
-# git: 'https://github.com/activescaffold/active_scaffold.git'
-# path: '/home/clyfe/dev/active_scaffold'
-gem 'pjax_rails', '~> 0.2.0'
gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git'
gem 'nilify_blanks', '~> 1.0.0'
gem 'rails_config', '~> 0.2.4'
@@ -34,17 +30,21 @@ gem 'acts_as_nested_interval', '~> 0.0.5'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'compass-rails', '~> 1.0.0.rc.2'
gem 'sass-rails', " ~> 3.2.3"
+ gem 'compass-rails', '~> 1.0.0.rc.2'
+ gem 'bootstrap-sass', '~> 2.0.3'
gem 'coffee-rails', "~> 3.2.1"
gem 'uglifier', '>= 1.0.3'
gem 'therubyracer'
- gem 'bootstrap-sass', '~> 2.0.1'
end
gem 'jquery-rails'
gem 'dalli', '~> 1.1.3'
# gem 'foreigner' ?
+gem 'active_scaffold', '~> 3.2.12'
+# git: 'https://github.com/activescaffold/active_scaffold.git'
+# path: '/home/clyfe/dev/active_scaffold'
+gem 'pjax_rails', '~> 0.2.0'
group :development do
gem 'capistrano', '~> 2.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d7c98a4..478b4c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,36 +13,36 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
+ mail (~> 2.4.4)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
+ sprockets (~> 2.1.3)
active-model-email-validator (1.0.2)
activemodel
mail
- active_scaffold (3.2.11)
+ active_scaffold (3.2.12)
rails (>= 3.1.3)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_nested_interval (0.0.5)
@@ -82,8 +82,8 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- compass-rails (1.0.1)
- compass (~> 0.12.0)
+ compass-rails (1.0.2)
+ compass (>= 0.12.0, < 0.14)
concerned_with (0.1.0)
daemons (1.0.10)
dalli (1.1.5)
@@ -106,30 +106,34 @@ GEM
faker (1.0.1)
i18n (~> 0.4)
ffi (1.0.11)
- file-tail (1.0.8)
- tins (~> 0.3)
+ file-tail (1.0.10)
+ tins (~> 0.4.3)
fssm (0.2.9)
gem_plugin (0.2.3)
- guard (1.0.3)
- ffi (>= 0.5.0)
+ guard (1.1.1)
+ listen (>= 0.4.2)
thor (>= 0.14.6)
guard-rspec (0.6.0)
guard (>= 0.10.0)
guard-spork (0.5.2)
guard (>= 0.10.0)
spork (>= 0.8.4)
- highline (1.6.12)
+ highline (1.6.13)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.3)
+ journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.3)
- libnotify (0.7.2)
+ libnotify (0.7.3)
libv8 (3.3.10.4)
libwebsocket (0.1.3)
addressable
+ listen (0.4.5)
+ rb-fchange (~> 0.0.5)
+ rb-fsevent (~> 0.9.1)
+ rb-inotify (~> 0.8.8)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -139,7 +143,7 @@ GEM
mongrel (1.2.0.pre2)
daemons (~> 1.0.10)
gem_plugin (~> 0.2.3)
- multi_json (1.3.5)
+ multi_json (1.3.6)
mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -151,13 +155,13 @@ GEM
nilify_blanks (1.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
- nokogiri (1.5.2)
+ nokogiri (1.5.4)
orm_adapter (0.0.7)
pjax_rails (0.2.1)
jquery-rails
polyamorous (0.5.0)
activerecord (~> 3.0)
- polyglot (0.3.3)
+ polyglot (0.3.2)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -165,28 +169,31 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.2)
+ railties (= 3.2.6)
rails-backbone (0.7.2)
coffee-script (~> 2.2.0)
ejs (~> 1.0.0)
railties (>= 3.1.0)
rails_config (0.2.7)
activesupport (>= 3.0)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
+ rb-fchange (0.0.5)
+ ffi
+ rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
@@ -215,7 +222,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.21.2)
+ selenium-webdriver (2.22.2)
childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3)
@@ -247,9 +254,9 @@ GEM
switch_user (0.6.0)
therubyracer (0.10.1)
libv8 (~> 3.3.10)
- thor (0.14.6)
+ thor (0.15.2)
tilt (1.3.3)
- tins (0.4.2)
+ tins (0.4.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
@@ -269,9 +276,9 @@ PLATFORMS
DEPENDENCIES
active-model-email-validator (~> 1.0.2)
- active_scaffold (~> 3.2.3)
+ active_scaffold (~> 3.2.12)
acts_as_nested_interval (~> 0.0.5)
- bootstrap-sass (~> 2.0.1)
+ bootstrap-sass (~> 2.0.3)
cancan (~> 1.6.7)
capistrano (~> 2.9.0)
capistrano-ext (~> 1.2.1)
@@ -294,7 +301,7 @@ DEPENDENCIES
navigasmic (~> 0.5.6)!
nilify_blanks (~> 1.0.0)
pjax_rails (~> 0.2.0)
- rails (= 3.2.2)
+ rails (= 3.2.6)
rails-backbone (~> 0.7.0)
rails_config (~> 0.2.4)
rb-inotify (~> 0.8.8)
diff --git a/app/assets/images/messages/error.png b/app/assets/images/messages/error.png
deleted file mode 100644
index 8f95270..0000000
Binary files a/app/assets/images/messages/error.png and /dev/null differ
diff --git a/app/assets/images/messages/notice.png b/app/assets/images/messages/notice.png
deleted file mode 100644
index d8f1239..0000000
Binary files a/app/assets/images/messages/notice.png and /dev/null differ
diff --git a/app/assets/images/messages/warning.png b/app/assets/images/messages/warning.png
deleted file mode 100644
index 81ac5be..0000000
Binary files a/app/assets/images/messages/warning.png and /dev/null differ
diff --git a/app/assets/images/theme/arrow.png b/app/assets/images/theme/arrow.png
deleted file mode 100644
index d5c4235..0000000
Binary files a/app/assets/images/theme/arrow.png and /dev/null differ
diff --git a/app/assets/images/theme/bgd.jpg b/app/assets/images/theme/bgd.jpg
deleted file mode 100644
index c5c446d..0000000
Binary files a/app/assets/images/theme/bgd.jpg and /dev/null differ
diff --git a/app/assets/images/theme/boxbar-background.png b/app/assets/images/theme/boxbar-background.png
deleted file mode 100644
index 7a9986a..0000000
Binary files a/app/assets/images/theme/boxbar-background.png and /dev/null differ
diff --git a/app/assets/images/theme/button-background-active.png b/app/assets/images/theme/button-background-active.png
deleted file mode 100644
index 10cda11..0000000
Binary files a/app/assets/images/theme/button-background-active.png and /dev/null differ
diff --git a/app/assets/images/theme/button-background.png b/app/assets/images/theme/button-background.png
deleted file mode 100644
index d19090c..0000000
Binary files a/app/assets/images/theme/button-background.png and /dev/null differ
diff --git a/app/assets/images/theme/check.png b/app/assets/images/theme/check.png
deleted file mode 100755
index 731c64f..0000000
Binary files a/app/assets/images/theme/check.png and /dev/null differ
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index cc59a5b..13f4fc3 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -9,9 +9,9 @@
#= require jquery_ujs
#= require jquery.pjax
#= require pjax/page_triggers
-#= require active_scaffold
#= require slides
#= require bootstrap
+#= require active_scaffold
#= require_self
$ ->
diff --git a/app/helpers/domains_helper.rb b/app/helpers/domains_helper.rb
index 76472b2..98aabc8 100644
--- a/app/helpers/domains_helper.rb
+++ b/app/helpers/domains_helper.rb
@@ -3,7 +3,6 @@ module DomainsHelper
cannot?(:crud_permissions, record) ? "shared-domain" : ''
end
- # Makes a link out of domain name.
# Indents and dedents to create a tree structure,
# assuming that the records are sorted in preorder.
# Adds a visual cue if the record is shared via permissions feature.
@@ -16,7 +15,7 @@ module DomainsHelper
end
elements << ''
end
- elements << link_to(record.name, "http://#{record.name}")
+ elements << record.name
unless can?(:crud_permissions, record)
who = "#{record.user.name} #{mail_to(record.user.email)}"
elements << <<-HTM
diff --git a/app/views/hosts/_list_record_columns.html.erb b/app/views/hosts/_list_record_columns.html.erb
deleted file mode 100644
index c5f0637..0000000
--- a/app/views/hosts/_list_record_columns.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%# meaningful names for empty columns instead tiny dash "-" %>
-
-<% columns.each do |column| %>
- <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
- <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
-
- <% if column.name == :name %>
- |
- <% column_value = 'Manage All Records (0)' if column_value == '-' %>
- <%= if authorized
- link = render_list_column(column_value, column, record)
- link_to link, "http://#{link}"
- else
- column_value
- end %>
- |
- <% else %>
-
- <%= authorized ? render_list_column(column_value, column, record) : column_value %>
- |
- <% end %>
-
-<% end -%>
diff --git a/app/assets/images/slides/background.jpg b/vendor/assets/images/slides/background.jpg
similarity index 100%
rename from app/assets/images/slides/background.jpg
rename to vendor/assets/images/slides/background.jpg
diff --git a/app/assets/images/slides/loading.gif b/vendor/assets/images/slides/loading.gif
similarity index 100%
rename from app/assets/images/slides/loading.gif
rename to vendor/assets/images/slides/loading.gif
diff --git a/app/assets/images/slides/navigation-next.png b/vendor/assets/images/slides/navigation-next.png
similarity index 100%
rename from app/assets/images/slides/navigation-next.png
rename to vendor/assets/images/slides/navigation-next.png
diff --git a/app/assets/images/slides/navigation-previous.png b/vendor/assets/images/slides/navigation-previous.png
similarity index 100%
rename from app/assets/images/slides/navigation-previous.png
rename to vendor/assets/images/slides/navigation-previous.png
diff --git a/app/assets/images/slides/pagination.png b/vendor/assets/images/slides/pagination.png
similarity index 100%
rename from app/assets/images/slides/pagination.png
rename to vendor/assets/images/slides/pagination.png
diff --git a/app/assets/stylesheets/slides.css.erb b/vendor/assets/javascripts/slides.css.erb
similarity index 100%
rename from app/assets/stylesheets/slides.css.erb
rename to vendor/assets/javascripts/slides.css.erb
diff --git a/app/assets/javascripts/slides.js b/vendor/assets/javascripts/slides.js
similarity index 100%
rename from app/assets/javascripts/slides.js
rename to vendor/assets/javascripts/slides.js