diff options
| -rw-r--r-- | .compass/config.rb | 8 | ||||
| -rw-r--r-- | app/views/layouts/admin.rhtml | 4 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | public/admin/images/glyphicons-halflings-white.png (renamed from public/adminbootstraptheme/images/glyphicons-halflings-white.png) | bin | 8777 -> 8777 bytes | |||
| -rw-r--r-- | public/admin/images/glyphicons-halflings.png (renamed from public/adminbootstraptheme/images/glyphicons-halflings.png) | bin | 13826 -> 13826 bytes | |||
| -rw-r--r-- | public/admin/javascripts/bootstrap-collapse.js (renamed from public/adminbootstraptheme/javascripts/bootstrap-collapse.js) | 0 | ||||
| -rw-r--r-- | public/admin/javascripts/bootstrap-tab.js (renamed from public/adminbootstraptheme/javascripts/bootstrap-tab.js) | 0 | ||||
| -rw-r--r-- | public/admin/javascripts/jquery-ui.min.js (renamed from public/adminbootstraptheme/javascripts/jquery-ui.min.js) | 0 | ||||
| -rw-r--r-- | public/admin/stylesheets/admin.css (renamed from public/adminbootstraptheme/stylesheets/admin.css) | 0 |
10 files changed, 8 insertions, 8 deletions
diff --git a/.compass/config.rb b/.compass/config.rb index 5d0cbeae8..5e8e8cc2d 100644 --- a/.compass/config.rb +++ b/.compass/config.rb @@ -3,13 +3,13 @@ require 'bootstrap-sass' # Set this to the root of your project when deployed: -http_path = "/adminbootstraptheme/" -css_dir = "public/adminbootstraptheme/stylesheets" +http_path = "/admin/" +css_dir = "public/admin/stylesheets" http_css_dir = "stylesheets" sass_dir = "app/sass" -images_dir = "public/adminbootstraptheme/images" +images_dir = "public/admin/images" http_images_dir = "images" -javascripts_dir = "public/adminbootstraptheme/javascripts" +javascripts_dir = "public/admin/javascripts" output_style = :compact #output_style = :compressed diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml index 647284382..447b24537 100644 --- a/app/views/layouts/admin.rhtml +++ b/app/views/layouts/admin.rhtml @@ -4,9 +4,9 @@ <meta http-equiv="content-type" content="text/html;charset=UTF-8" > <title><%= site_name %> admin<%= @title ? ":" : "" %> <%=@title%></title> - <%= javascript_include_tag '/javascripts/jquery.js', '/adminbootstraptheme/javascripts/jquery-ui.min.js', '/adminbootstraptheme/javascripts/bootstrap-collapse', '/adminbootstraptheme/javascripts/bootstrap-tab', '/adminbootstraptheme/javascripts/admin' %> + <%= javascript_include_tag '/javascripts/jquery.js', '/admin/javascripts/jquery-ui.min.js', '/admin/javascripts/bootstrap-collapse', '/admin/javascripts/bootstrap-tab', '/admin/javascripts/admin' %> <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%> - <%= stylesheet_link_tag "/adminbootstraptheme/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> </head> <body class="admin"> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 9eb967578..950918f02 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -13,7 +13,7 @@ <%= render :partial => 'general/stylesheet_includes' %> <% if is_admin? %> - <%= stylesheet_link_tag "/adminbootstraptheme/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> <% end %> <%= javascript_include_tag 'jquery.js', 'jquery-ui.min','jquery.cookie.js', 'general.js' %> diff --git a/config/routes.rb b/config/routes.rb index 2fad56bec..4e9cbc052 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -34,7 +34,7 @@ ActionController::Routing::Routes.draw do |map| general.random_request '/random', :action => 'random_request' # Add a route for admin.js to the general controller - general.admin_js '/adminbootstraptheme/javascripts/admin.js', :action => 'admin_js' + general.admin_js '/admin/javascripts/admin.js', :action => 'admin_js' end map.with_options :controller => 'request' do |request| diff --git a/public/adminbootstraptheme/images/glyphicons-halflings-white.png b/public/admin/images/glyphicons-halflings-white.png Binary files differindex 3bf6484a2..3bf6484a2 100644 --- a/public/adminbootstraptheme/images/glyphicons-halflings-white.png +++ b/public/admin/images/glyphicons-halflings-white.png diff --git a/public/adminbootstraptheme/images/glyphicons-halflings.png b/public/admin/images/glyphicons-halflings.png Binary files differindex 79bc568c2..79bc568c2 100644 --- a/public/adminbootstraptheme/images/glyphicons-halflings.png +++ b/public/admin/images/glyphicons-halflings.png diff --git a/public/adminbootstraptheme/javascripts/bootstrap-collapse.js b/public/admin/javascripts/bootstrap-collapse.js index 9a364468b..9a364468b 100644 --- a/public/adminbootstraptheme/javascripts/bootstrap-collapse.js +++ b/public/admin/javascripts/bootstrap-collapse.js diff --git a/public/adminbootstraptheme/javascripts/bootstrap-tab.js b/public/admin/javascripts/bootstrap-tab.js index 26c9ece75..26c9ece75 100644 --- a/public/adminbootstraptheme/javascripts/bootstrap-tab.js +++ b/public/admin/javascripts/bootstrap-tab.js diff --git a/public/adminbootstraptheme/javascripts/jquery-ui.min.js b/public/admin/javascripts/jquery-ui.min.js index f00a62f13..f00a62f13 100644 --- a/public/adminbootstraptheme/javascripts/jquery-ui.min.js +++ b/public/admin/javascripts/jquery-ui.min.js diff --git a/public/adminbootstraptheme/stylesheets/admin.css b/public/admin/stylesheets/admin.css index 9c98ac432..9c98ac432 100644 --- a/public/adminbootstraptheme/stylesheets/admin.css +++ b/public/admin/stylesheets/admin.css |
