expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

renaming CSS files for clarity

Browse Source
This commit is contained in:
Philip Sargent 2021-04-15 12:34:51 +01:00
parent 38a63641bc
commit 3e50d0edca
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/TESTS/tests.py
View File

@ -289,13 +289,13 @@ class PageTests(TestCase):
def test_page_site_media_css(self): def test_page_site_media_css(self):
# Flat file tests. # Flat file tests.
response = self.client.get('/site_media/css/main3.css') response = self.client.get('/site_media/css/trog3.css')
if response.status_code != 200: if response.status_code != 200:
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
if response.status_code != 302: if response.status_code != 302:
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
content = response.content.decode() # need to check it is not just an error page content = response.content.decode() # need to check it is not just an error page
ph = r'This text is used by the test system to determine that main3.css loaded correctly' ph = r'This text is used by the test system to determine that trog3.css loaded correctly'
phmatch = re.search(ph, content) phmatch = re.search(ph, content)
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'") self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'")

6
core/admin.py
View File

@ -61,16 +61,16 @@ class LogbookEntryAdmin(TroggleModelAdmin):
inlines = (PersonTripInline, QMsFoundInline) inlines = (PersonTripInline, QMsFoundInline)
class Media: class Media:
css = { css = {
"all": ("css/troggleadmin.css",) "all": ("css/troggleadmin.css",) # this does not exist
} }
actions=('export_logbook_entries_as_html','export_logbook_entries_as_txt') actions=('export_logbook_entries_as_html','export_logbook_entries_as_txt')
def export_logbook_entries_as_html(self, modeladmin, request, queryset): def export_logbook_entries_as_html(self, modeladmin, request, queryset):
response=downloadLogbook(request=request, queryset=queryset, extension='html') response=downloadLogbook(request=request, queryset=queryset, extension='html') #fails, no queryset
return response return response
def export_logbook_entries_as_txt(self, modeladmin, request, queryset): def export_logbook_entries_as_txt(self, modeladmin, request, queryset):
response=downloadLogbook(request=request, queryset=queryset, extension='txt') response=downloadLogbook(request=request, queryset=queryset, extension='txt') #fails, no queryset
return response return response

0
media/css/main2.css → media/css/main2-redundant.css
View File

2
media/css/main3.css → media/css/trog3.css
View File

@ -2,7 +2,7 @@ html, body {
height: 100%; height: 100%;
} }
/* This text is used by the test system to determine that main3.css loaded correctly */ /* This text is used by the test system to determine that trog3.css loaded correctly */
.caption { font-size: 8pt; margin-bottom: 0pt; } .caption { font-size: 8pt; margin-bottom: 0pt; }
.centre { text-align: center; } .centre { text-align: center; }
.plus2pt { font-size: 160%; } .plus2pt { font-size: 160%; }

2
templates/base.html
View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="troggle-style"/> <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/trog3.css" title="troggle-style"/>
<title>{% block title %}Troggle{% endblock %}</title> <title>{% block title %}Troggle{% endblock %}</title>
<!-- <script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> --> <!-- <script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> -->