From eb761d11ecd1ecfc2d8cc77b3dd98ad6fcf4a7ed Mon Sep 17 00:00:00 2001
From: Blaise Laflamme <blaise@laflamme.org>
Date: Wed, 12 Jan 2011 23:15:28 -0500
Subject: Changed google font link in paster templates

---
 pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl     | 3 +--
 pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl      | 3 +--
 .../pylons_basic/+package+/templates/mytemplate.mako_tmpl              | 3 +--
 .../pylons_minimal/+package+/templates/mytemplate.mako_tmpl            | 3 +--
 .../pylons_sqla/+package+/templates/mytemplate.mako_tmpl               | 3 +--
 .../routesalchemy/+package+/templates/mytemplate.pt_tmpl               | 3 +--
 .../paster_templates/starter/+package+/templates/mytemplate.pt_tmpl    | 3 +--
 .../starter_zcml/+package+/templates/mytemplate.pt_tmpl                | 3 +--
 pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl   | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
index 9cffd9dba..236424cae 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
index 8ed0c1457..557183a51 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl
index 9f36d99e7..e3fa39f28 100644
--- a/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl
+++ b/pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl
index 9f36d99e7..e3fa39f28 100644
--- a/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl
+++ b/pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl b/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl
index 261dbdff4..d12066ac8 100644
--- a/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl
+++ b/pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
index 9f36d99e7..e3fa39f28 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
index 9f36d99e7..e3fa39f28 100644
--- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl
index 9f36d99e7..e3fa39f28 100644
--- a/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
index 9f36d99e7..e3fa39f28 100644
--- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -7,8 +7,7 @@
 	<meta name="description" content="pyramid web application" />
 	<link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
 	<!--[if lte IE 6]>
 	<link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
 	<![endif]-->
-- 
cgit v1.2.3