public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaning up django collection pipeline.

Browse source
This commit is contained in:
Samuel Clay 2022-01-20 16:32:37 -05:00
parent ced2e7d6a6
commit 0011249cad
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ansible.cfg
View file

@ -7,6 +7,7 @@ private_key_file = /srv/secrets-newsblur/keys/docker.key
remote_tmp = ~/.ansible/tmp
forks = 20
interpreter_python = python3
stdout_callback = debug
[inventory]
enable_plugins = ini, constructed

14
media/css/jquery-ui/jquery-ui.theme.css vendored
View file

@ -196,31 +196,31 @@ a.ui-button:active,
}
.ui-icon,
.ui-widget-content .ui-icon {
background-image: url("images/ui-icons_444444_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_444444_256x240.png");
}
.ui-widget-header .ui-icon {
background-image: url("images/ui-icons_444444_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_444444_256x240.png");
}
.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon,
.ui-button:hover .ui-icon,
.ui-button:focus .ui-icon {
background-image: url("images/ui-icons_555555_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_555555_256x240.png");
}
.ui-state-active .ui-icon,
.ui-button:active .ui-icon {
background-image: url("images/ui-icons_ffffff_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_ffffff_256x240.png");
}
.ui-state-highlight .ui-icon,
.ui-button .ui-state-highlight.ui-icon {
background-image: url("images/ui-icons_777620_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_777620_256x240.png");
}
.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon {
background-image: url("images/ui-icons_cc0000_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_cc0000_256x240.png");
}
.ui-button .ui-icon {
background-image: url("images/ui-icons_777777_256x240.png");
background-image: url("/media/css/jquery-ui/image/ui-icons_777777_256x240.png");
}
/* positioning */

18
utils/pipeline_utils.py
View file

@ -8,14 +8,14 @@ from pipeline.storage import PipelineManifestStorage
class PipelineStorage(PipelineManifestStorage):
def url(self, *args, **kwargs):
if settings.DEBUG_ASSETS:
# print(f"Pre-Pipeline storage: {args} {kwargs}")
print(f"Pre-Pipeline storage: {args} {kwargs}")
kwargs['name'] = re.sub(r'\.[a-f0-9]{12}\.(css|js)$', r'.\1', args[0])
args = args[1:]
url = super().url(*args, **kwargs)
if settings.DEBUG_ASSETS:
url = url.replace(settings.STATIC_URL, settings.MEDIA_URL)
url = re.sub(r'\.[a-f0-9]{12}\.(css|js)$', r'.\1', url)
# print(f"Pipeline storage: {args} {kwargs} {url}")
print(f"Pipeline storage: {args} {kwargs} {url}")
return url
class GzipPipelineStorage(GZIPMixin, PipelineManifestStorage):
@ -41,10 +41,10 @@ class AppDirectoriesFinder(PipelineAppDirectoriesFinder):
'*.markdown',
'*.php',
'*.txt',
# '*.gif',
# '*.png',
# '*.jpg',
# '*.svg',
# '*.gif', # due to django_extensions/css/jquery.autocomplete.css: django_extensions/img/indicator.gif
'*.png',
'*.jpg',
# '*.svg', # due to admin/css/base.css: admin/img/sorting-icons.svg
'*.ico',
'*.icns',
'*.psd',
@ -78,9 +78,9 @@ class FileSystemFinder(PipelineFileSystemFinder):
'*.markdown',
'*.php',
'*.txt',
# '*.gif',
# '*.png',
# '*.jpg',
'*.gif',
'*.png',
'*.jpg',
'*media/**/*.svg',
'*.ico',
'*.icns',