From 92403cc9e07514bf5bc191eff015fa69a8b2eaf3 Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Jul 03 2016 19:55:28 +0000 Subject: fix template for unofficial images and drop whitespaces - thx veon --- diff --git a/labs.fedoraproject.org/data/content/design-suite/download/index.html b/labs.fedoraproject.org/data/content/design-suite/download/index.html index ce33857..014e418 100644 --- a/labs.fedoraproject.org/data/content/design-suite/download/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/download/index.html @@ -27,7 +27,7 @@
- +
diff --git a/labs.fedoraproject.org/data/templates/generic/blurb.html b/labs.fedoraproject.org/data/templates/generic/blurb.html deleted file mode 100644 index fbb0cfc..0000000 --- a/labs.fedoraproject.org/data/templates/generic/blurb.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - -
-
-

${Markup(_('Although this spin failed to compose for the final release, the nightly test compose contains the same package set, and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-i386-CHECKSUM'})} -

-
-
- - - - \ No newline at end of file diff --git a/labs.fedoraproject.org/data/templates/generic/unofficial.html b/labs.fedoraproject.org/data/templates/generic/unofficial.html new file mode 100644 index 0000000..70f8fb9 --- /dev/null +++ b/labs.fedoraproject.org/data/templates/generic/unofficial.html @@ -0,0 +1,18 @@ + + + + +
+
+

${Markup(_('Although this spin failed to compose for the final release, the nightly test compose contains the same package set, and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-i386-CHECKSUM'})} +

+
+
+ + + + \ No newline at end of file diff --git a/spins.fedoraproject.org/data/content/soas/download/index.html b/spins.fedoraproject.org/data/content/soas/download/index.html index df97cfd..1920b8b 100644 --- a/spins.fedoraproject.org/data/content/soas/download/index.html +++ b/spins.fedoraproject.org/data/content/soas/download/index.html @@ -26,7 +26,7 @@
- +
diff --git a/spins.fedoraproject.org/data/templates/generic/blurb.html b/spins.fedoraproject.org/data/templates/generic/blurb.html deleted file mode 100644 index fbb0cfc..0000000 --- a/spins.fedoraproject.org/data/templates/generic/blurb.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - -
-
-

${Markup(_('Although this spin failed to compose for the final release, the nightly test compose contains the same package set, and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-i386-CHECKSUM'})} -

-
-
- - - - \ No newline at end of file diff --git a/spins.fedoraproject.org/data/templates/generic/unofficial.html b/spins.fedoraproject.org/data/templates/generic/unofficial.html new file mode 100644 index 0000000..70f8fb9 --- /dev/null +++ b/spins.fedoraproject.org/data/templates/generic/unofficial.html @@ -0,0 +1,18 @@ + + + + +
+
+

${Markup(_('Although this spin failed to compose for the final release, the nightly test compose contains the same package set, and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-i386-CHECKSUM'})} +

+
+
+ + + + \ No newline at end of file