Merge pull request #958 from payten/fix-fonts-for-pui-under-prefix

Ensure asset paths in public CSS files are rewritten to include the prefix
archivesspace · Sep 6, 2017 · b3c7d97 · b3c7d97
2 parents 62c158f + 67337fe
commit b3c7d97
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/common/aspace-rails/asset_path_rewriter.rb b/common/aspace-rails/asset_path_rewriter.rb
@@ -63,6 +63,7 @@ def rewrite(prefix, base_dir)
       return unless success
 
       rewrite_files = []
+      rewrite_files += Dir.glob(File.join(base_dir, "assets", "*.css"))
       rewrite_files += Dir.glob(File.join(base_dir, "assets", "themes", "**", "*.css"))
       rewrite_files += Dir.glob(File.join(base_dir, "assets", "archivesspace", "**", "*.css"))
 
@@ -77,6 +78,8 @@ def rewrite(prefix, base_dir)
   def rewrite_for_prefix(path, prefix)
     css = File.read(path)
     css.gsub!(%r{url\(/assets/}, "url(#{prefix}assets/")
+    css.gsub!(%r{url\("/assets/}, "url(\"#{prefix}assets/")
+    css.gsub!(%r{url\('/assets/}, "url('#{prefix}assets/")
     File.open(path, "w") do |fh|
       fh.write(css)
     end