From: Radek Czajka Date: Fri, 9 Jul 2021 13:42:19 +0000 (+0200) Subject: Remove overspecification from xsl. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/f3440f7131553b9cbf6d21683b09346bb74f3a66?hp=c6c257380f1ff975db6a54e96f3ab2a34aa166c2 Remove overspecification from xsl. --- diff --git a/src/documents/migrations/0001_initial.py b/src/documents/migrations/0001_initial.py index 094828c5..451029b7 100644 --- a/src/documents/migrations/0001_initial.py +++ b/src/documents/migrations/0001_initial.py @@ -100,7 +100,7 @@ class Migration(migrations.Migration): ('description', models.TextField(blank=True, default='', verbose_name='description')), ('created_at', models.DateTimeField(db_index=True, default=datetime.datetime.now, editable=False)), ('publishable', models.BooleanField(default=False, verbose_name='publishable')), - ('data', models.FileField(storage=django.core.files.storage.FileSystemStorage(location='/home/rczajka/for/fnp/redakcja/var/repo'), upload_to=dvcs.models.data_upload_to, verbose_name='data')), + ('data', models.FileField(storage=django.core.files.storage.FileSystemStorage(location=settings.CATALOGUE_REPO_PATH), upload_to=dvcs.models.data_upload_to, verbose_name='data')), ('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='author')), ('merge_parent', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='merge_children', to='documents.ChunkChange', verbose_name='merge parent')), ('parent', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='documents.ChunkChange', verbose_name='parent')), @@ -160,7 +160,7 @@ class Migration(migrations.Migration): ('description', models.TextField(blank=True, default='', verbose_name='description')), ('created_at', models.DateTimeField(db_index=True, default=datetime.datetime.now, editable=False)), ('publishable', models.BooleanField(default=False, verbose_name='publishable')), - ('data', models.FileField(storage=django.core.files.storage.FileSystemStorage(location='/home/rczajka/for/fnp/redakcja/var/imgrepo'), upload_to=dvcs.models.data_upload_to, verbose_name='data')), + ('data', models.FileField(storage=django.core.files.storage.FileSystemStorage(location=settings.CATALOGUE_IMAGE_REPO_PATH), upload_to=dvcs.models.data_upload_to, verbose_name='data')), ('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='author')), ('merge_parent', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='merge_children', to='documents.ImageChange', verbose_name='merge parent')), ('parent', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='documents.ImageChange', verbose_name='parent')), diff --git a/src/redakcja/static/css/html.css b/src/redakcja/static/css/html.css index 05c9e9ed..214e92a5 100644 --- a/src/redakcja/static/css/html.css +++ b/src/redakcja/static/css/html.css @@ -13,29 +13,6 @@ padding-left: 90px; } -/* - .htmlview[data-tag-names-visible] *[x-editable]:not(*[x-common])::before { - display: block; - float: left; - clear: left; - content: attr(x-node); - font-weight: bold; - font-style: normal; - font-variant:normal; - font-size: 8px; - line-height: 8px; - margin-bottom: 4px; - - padding: 3px 4px; - vertical-align: super; - background-color:#add8e6; - margin-left: -80px; - width: 70px; - text-align: center; - - -webkit-border-radius: 4px; - } - */ .htmlview *[x-node = 'RDF'][x-ns = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'] { display: none; } @@ -61,7 +38,7 @@ text-decoration: none; } -.htmlview h1 { +.htmlview .nazwa_utworu { font-size: 3em; margin: 1.5em 0; text-align: center; @@ -69,21 +46,30 @@ font-weight: bold; } -.htmlview h2 { +.htmlview .autor_utworu, +.htmlview .dzielo_nadrzedne, +.htmlview .naglowek_czesc, +.htmlview .srodtytul, +.htmlview .naglowek_akt +{ font-size: 2em; margin: 1.5em 0 0; font-weight: bold; line-height: 1.5em; } -.htmlview h3 { +.htmlview .podtytul, +.htmlview .naglowek_scena, +.htmlview .naglowek_rozdzial font-size: 1.5em; margin: 1.5em 0 0; font-weight: normal; line-height: 1.5em; } -.htmlview h4 { +.htmlview .naglowek_podrozdzial, +.htmlview .naglowek_osoba +{ font-size: 1em; margin: 1.5em 0 0; line-height: 1.5em; @@ -275,13 +261,14 @@ border-bottom: 0.1em solid #000; } -.htmlview p.sekcja_asterysk { +.htmlview hr.sekcja_asterysk { + border: none; padding: 0; margin: 1.5em 0; text-align: center; } -.htmlview p.sekcja_asterysk:after { +.htmlview hr.sekcja_asterysk:after { content: "*"; } @@ -298,6 +285,13 @@ font-style: italic; } + +.htmlview .indeks_dolny { + font-style: normal; + vertical-align: sub; + font-size: .9em; +} + .htmlview .wyroznienie { letter-spacing: 0.1em; } @@ -342,8 +336,7 @@ max-width: 20%; max-height: 24pt; margin-left: 0.5em; - overflow: hidden; - z-index: 500; + z-index: 500; } div[x-node] > .uwaga { @@ -352,6 +345,7 @@ div[x-node] > .uwaga { margin: 1em; max-width: 100%; max-height: 100%; + border: 1px solid black; } .htmlview .uwaga:hover { diff --git a/src/redakcja/static/xsl/wl2html_client.xsl b/src/redakcja/static/xsl/wl2html_client.xsl index b277c6a5..7afbf972 100644 --- a/src/redakcja/static/xsl/wl2html_client.xsl +++ b/src/redakcja/static/xsl/wl2html_client.xsl @@ -2,10 +2,6 @@ - - -
@@ -29,430 +21,10 @@
- - - - - - - -
- - - - -
-
- - - -
- - - - -
-
- - - -
- - - - -
-
- - - -
- - - - -
-
- - - - - - -

- - - - - -

-
- - - - -

- - - - - -

-
- - - - -

- - - - - -

-
- - - - -

- - - - - -

-
- - - - - -
- - - - -
-
- - - -
- - - - -
-
- - - - -
- - - - -
-
- - - - -
- - - - -
-
- - - - -
-
- - - - -
- - - -
-
- - - - - - - - - - -
- - - - - -
-
- - - - - - - - -
- - - - -
-
- - - -
- - - - - -
-
- - - -
- - - - - -
-
- - - - -
- - - - - -
-
- - - - - -

- - - - - -

-
- - - - -

- - - - - -

-
- - - - -

- - - - - -

-
- - - - - -

- - - - - -

-
- - - -

- - - - - -

-
- - - - - -

- - - - - -

-
- - - -

- - - - - -

-
- - - - - -
- - - - -
-
- - + +
@@ -462,17 +34,8 @@
- - -
- - - - -
-
- - + +
@@ -482,26 +45,6 @@
- - -
- - - - -
-
- - - -
- - - - -
-
-
@@ -514,45 +57,6 @@
- - - - -
- - - - - -
-
- - - -
- - - - - -
-
- - - -
- - - - - -
-
-
-
/ - - - - - - - - - - - - - - - + + @@ -663,57 +140,15 @@ - - - - - - - - - - - - + +
- - -
-
- - - -
-
- - - - - - - - - - - - - - + - + @@ -722,7 +157,6 @@ - @@ -731,7 +165,7 @@ - + @@ -748,22 +182,12 @@ - - - - - - - - - - + - @@ -778,26 +202,21 @@
- - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -813,19 +232,6 @@ - - - - - - - - - @@ -837,17 +243,6 @@ - - - - - - - -