diff --git a/app/assets/Archive/javascripts/desktop.js b/app/assets/Archive/javascripts/desktop.js index ff5a54d72..442df6de7 100644 --- a/app/assets/Archive/javascripts/desktop.js +++ b/app/assets/Archive/javascripts/desktop.js @@ -10,10 +10,10 @@ //= require jquery.form //= require jquery.tinyscrollbar //= require jquery.miniColors.min +//= require select2 //= require bootstrap //= require orbitdesktopAPI //= require orbitTimeline //= require orbitdesktop //= require jquery.gridster -//= require desktop/books_pages -//= require select2 \ No newline at end of file +//= require desktop/books_pages \ No newline at end of file diff --git a/app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak b/app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak deleted file mode 100644 index 693835e51..000000000 --- a/app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak +++ /dev/null @@ -1,6 +0,0 @@ -$(".attributes").append('<%= escape_javascript(render :partial=>"attribute_field",:locals=>{:attribute_field=>@attribute_field,:attribute_field_counter=>@attribute_field_counter} )%>'); - $(".dataType").change(function () { - $(this).parents("legend").next("div").find("div[class^='type']").addClass("hide"); - $(this).parents("legend").next("div").find("."+$(this).find("option:selected").attr("ref")).removeClass("hide"); - - }) \ No newline at end of file diff --git a/app/assets/Archive/stylesheets/desktop/desktop-select2.css.erb b/app/assets/Archive/stylesheets/desktop/desktop-select2.css.erb index 6f41953bf..55bde5689 100644 --- a/app/assets/Archive/stylesheets/desktop/desktop-select2.css.erb +++ b/app/assets/Archive/stylesheets/desktop/desktop-select2.css.erb @@ -405,4 +405,4 @@ disabled look for disabled choices in the results dropdown background-size: 60px 40px !important; } .select2-search input { - background-position: 100% -21px !important; } } \ No newline at end of file + background-position: 100% -21px !important; } } diff --git a/app/assets/Archive/stylesheets/desktop/desktop-select2.scss b/app/assets/Archive/stylesheets/desktop/desktop-select2.scss index 64f87d996..a18218dd2 100644 --- a/app/assets/Archive/stylesheets/desktop/desktop-select2.scss +++ b/app/assets/Archive/stylesheets/desktop/desktop-select2.scss @@ -155,7 +155,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 } .select2-search input.select2-active { - background: #fff image-url('select2-spinner.gif') no-repeat 100%; + background: #fff url('select2/spinner.gif') no-repeat 100%; } .select2-container-active .select2-choice, @@ -273,7 +273,7 @@ disabled look for disabled choices in the results dropdown } .select2-more-results.select2-active { - background: #f4f4f4 image-url('select2-spinner.gif') no-repeat 100%; + background: #f4f4f4 url('select2/spinner.gif') no-repeat 100%; } .select2-more-results { @@ -352,7 +352,7 @@ disabled look for disabled choices in the results dropdown } .select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: #fff image-url('select2-spinner.gif') no-repeat 100% !important; + background: #fff url('select2/spinner.gif') no-repeat 100% !important; } .select2-default { diff --git a/app/views/layouts/desktop.html.erb b/app/views/layouts/desktop.html.erb index 0993aa6d3..3e4424eed 100644 --- a/app/views/layouts/desktop.html.erb +++ b/app/views/layouts/desktop.html.erb @@ -13,14 +13,13 @@ - <%= stylesheet_link_tag "desktop" %> - <%= javascript_include_tag "desktop" %> + <%= stylesheet_link_tag "desktop/desktop" %> + <%= javascript_include_tag "desktop/desktop" %> <%= yield :page_specific_css %> <%= yield :page_specific_javascript %> <%= csrf_meta_tag %> - <%= render 'layouts/orbit_bar' %> <%= yield %> diff --git a/config/environments/production.rb.bak b/config/environments/production.rb.bak deleted file mode 100644 index f52ead13c..000000000 --- a/config/environments/production.rb.bak +++ /dev/null @@ -1,54 +0,0 @@ -PrototypeR4::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # The production environment is meant for finished, "live" apps. - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Specifies the header that your server uses for sending files - config.action_dispatch.x_sendfile_header = "X-Sendfile" - - # For nginx: - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' - - # If you have no front-end server that supports something like X-Sendfile, - # just comment this out and Rails will serve the files - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Disable Rails's static asset server - # In production, Apache or nginx will already do this - config.serve_static_assets = false - - # Enable serving of images, stylesheets, and javascripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify - - - #compress both stylesheets and Javascripts - config.assets.js_compressor = :uglifier - config.assets.css_compressor = :scss -end