[Blends-commit] [SCM] website branch, master, updated. 70331813060f0e77ec242d7f3a1ff983897a800c
The following commit has been merged in the master branch:
commit 70331813060f0e77ec242d7f3a1ff983897a800c
Author: Ole Streicher
Date: Fri Feb 19 13:44:21 2016 +0100
Add new Debian Astro logo
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
index 02adee1..953052c 100644
--- a/webtools/templates/debian-astro_idx.xhtml
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -108,6 +108,14 @@
${howtosetlang}
${updatetimestamp}
+
+ The Debian Astro logo was created by
+ http://www.mariahammerstrom.com";>Maria Hammerstrøm
+ and is under the license
+ http://www.gnu.org/copyleft/lgpl.html";>LGPL-3 or
+ http://creativecommons.org/licenses/by-sa/3.0/";>CC BY-SA
3.0
+ by your choice.
+
diff --git a/www/css/blends.css b/www/css/blends.css
index 3f43c67..ee02dd8 100644
--- a/www/css/blends.css
+++ b/www/css/blends.css
@@ -108,3 +108,6 @@ h1#med {
background-image: url('/img/splash_med.png');
}
+h1#astro {
+ background-image: url('/img/splash_astro.png');
+}
diff --git a/www/img/splash_astro.png b/www/img/splash_astro.png
new file mode 100644
index 000..4d2f5e6
Binary files /dev/null and b/www/img/splash_astro.png differ
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. f35736ec0a22fd69a34f829ea012883d92fb7aee
The following commit has been merged in the master branch:
commit f35736ec0a22fd69a34f829ea012883d92fb7aee
Author: Ole Streicher
Date: Fri Feb 19 13:46:07 2016 +0100
Add the Debian-Astro logo to www-src as well
diff --git a/www-src/css/blends.css b/www-src/css/blends.css
index 3f43c67..ee02dd8 100644
--- a/www-src/css/blends.css
+++ b/www-src/css/blends.css
@@ -108,3 +108,6 @@ h1#med {
background-image: url('/img/splash_med.png');
}
+h1#astro {
+ background-image: url('/img/splash_astro.png');
+}
diff --git a/www/img/splash_astro.png b/www-src/img/splash_astro.png
similarity index 100%
copy from www/img/splash_astro.png
copy to www-src/img/splash_astro.png
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. 92207a78f92d9fac6d34aa25baae9e76302b2486
The following commit has been merged in the master branch:
commit 92207a78f92d9fac6d34aa25baae9e76302b2486
Author: Iain R. Learmonth
Date: Fri Feb 19 13:34:14 2016 +
Added custom CSS for astro splash
diff --git a/www/css/blends.css b/www/css/blends.css
index ee02dd8..9736f25 100644
--- a/www/css/blends.css
+++ b/www/css/blends.css
@@ -111,3 +111,8 @@ h1#med {
h1#astro {
background-image: url('/img/splash_astro.png');
}
+
+.astro-splash {
+ background-color: #ff;
+ background-image: none !important;
+}
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. e90119beee1f29d97cade5c632a4317c1155225b
The following commit has been merged in the master branch:
commit e90119beee1f29d97cade5c632a4317c1155225b
Author: Ole Streicher
Date: Fri Feb 19 16:07:11 2016 +0100
Put nice background image for splash banner
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
index 953052c..bcc53d4 100644
--- a/webtools/templates/debian-astro_idx.xhtml
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -34,7 +34,7 @@
-
+
$projectname
diff --git a/www-src/img/bg_astro.jpg b/www-src/img/bg_astro.jpg
new file mode 100644
index 000..2618c5d
Binary files /dev/null and b/www-src/img/bg_astro.jpg differ
diff --git a/www/astro/contact.html b/www/astro/contact.html
index fc25c52..f073124 100644
--- a/www/astro/contact.html
+++ b/www/astro/contact.html
@@ -36,7 +36,7 @@
- Debian Astro Contact
+ Debian Astro Contact
The primary point of contact for astronomy related topics in Debian is
the Debian Astro Maintainers team. You can contact the team by email
diff --git a/www/astro/contribute.html b/www/astro/contribute.html
index a98e838..e135652 100644
--- a/www/astro/contribute.html
+++ b/www/astro/contribute.html
@@ -36,7 +36,7 @@
- Contributing to Debian Astro
+ Contributing to Debian Astro
Like Debian itself, Debian Astro is a volunteer project that is
developed in the open. Our packaging code is organized in
http://anonscm.debian.org/cgit/debian-astro/packages/";>
diff --git a/www/css/blends.css b/www/css/blends.css
index 9736f25..6112603 100644
--- a/www/css/blends.css
+++ b/www/css/blends.css
@@ -113,6 +113,5 @@ h1#astro {
}
.astro-splash {
- background-color: #ff;
- background-image: none !important;
+ background-image: url('/img/bg_astro.png') !important;
}
diff --git a/www/img/bg_astro.jpg b/www/img/bg_astro.jpg
new file mode 100644
index 000..2618c5d
Binary files /dev/null and b/www/img/bg_astro.jpg differ
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. d05b01a9a85858d9c86b9f5df1f3eda94e5eb1a7
The following commit has been merged in the master branch:
commit d05b01a9a85858d9c86b9f5df1f3eda94e5eb1a7
Author: Ole Streicher
Date: Fri Feb 19 17:26:42 2016 +0100
Replace norway letter with html entity
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
index bcc53d4..4a36a65 100644
--- a/webtools/templates/debian-astro_idx.xhtml
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -110,7 +110,7 @@
${updatetimestamp}
The Debian Astro logo was created by
- http://www.mariahammerstrom.com";>Maria Hammerstrøm
+ http://www.mariahammerstrom.com";>Maria Hammerstrøm
and is under the license
http://www.gnu.org/copyleft/lgpl.html";>LGPL-3 or
http://creativecommons.org/licenses/by-sa/3.0/";>CC BY-SA
3.0
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. f7fff0848b10bb1d9fa14c2b79de590f9c8be91f
The following commit has been merged in the master branch:
commit f7fff0848b10bb1d9fa14c2b79de590f9c8be91f
Author: Ole Streicher
Date: Fri Feb 19 17:40:35 2016 +0100
suffix of bd_astro image corrected
diff --git a/www/css/blends.css b/www/css/blends.css
index 6112603..357d487 100644
--- a/www/css/blends.css
+++ b/www/css/blends.css
@@ -113,5 +113,5 @@ h1#astro {
}
.astro-splash {
- background-image: url('/img/bg_astro.png') !important;
+ background-image: url('/img/bg_astro.jpg') !important;
}
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. c437840db552644ae90cbfe15e9e7ee987b9803e
The following commit has been merged in the master branch:
commit c437840db552644ae90cbfe15e9e7ee987b9803e
Author: Ole Streicher
Date: Fri Feb 19 19:59:30 2016 +0100
Enable unicode for debian-astro_idx
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 58e479f..d312366 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -203,7 +203,7 @@ for lang in languages:
os.unlink(outputfile)
except: # simply continue if file does not exist
pass
- f = open(outputfile, 'w')
+ f = codecs.open(outputfile, "w", "utf-8")
try:
print >> f, template.generate(**data).render('xhtml')
except UnicodeDecodeError, errtxt:
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
