fixed bug #2660 - get rid of 'meta robots noindex' tag in html files

svn: r11764
This commit is contained in:
Stéphane Charette 2009-01-30 18:08:33 +00:00
parent 33a6a2fc79
commit 539066320f
2 changed files with 11 additions and 12 deletions

View File

@ -363,17 +363,16 @@ class BasePage:
of.write('<!DOCTYPE html PUBLIC \n') of.write('<!DOCTYPE html PUBLIC \n')
of.write('\t"-//W3C//DTD XHTML 1.0 Strict//EN" \n') of.write('\t"-//W3C//DTD XHTML 1.0 Strict//EN" \n')
of.write('\t\t"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n') of.write('\t\t"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n')
of.write('<html xmlns="http://www.w3.org/1999/xhtml" ')
xmllang = Utils.xml_lang() xmllang = Utils.xml_lang()
of.write('xml:lang="%s" lang="%s">\n' % (xmllang, xmllang)) of.write('<html xmlns="http://www.w3.org/1999/xhtml" '
'xml:lang="%s" lang="%s">\n' % (xmllang, xmllang))
of.write('<head>\n') of.write('<head>\n')
of.write('\t<title>%s - %s</title>\n' % (html_escape(self.title_str), html_escape(title))) of.write('\t<title>%s - %s</title>\n' % (html_escape(self.title_str), html_escape(title)))
of.write('\t<meta http-equiv="Content-Type" content="text/html; ') of.write('\t<meta http-equiv="Content-Type" content="text/html; charset=%s" />\n'
of.write('charset=%s" />\n' % self.report.encoding) % self.report.encoding)
of.write('\t<meta name="robots" content="noindex" />\n') of.write('\t<meta name="generator" content="%s %s %s" />\n' %
of.write('\t<meta name="generator" content="GRAMPS 3.1.x: ') (const.PROGRAM_NAME, const.VERSION, const.URL_HOMEPAGE))
of.write('http://www.gramps-project.org" />\n')
of.write('\t<meta name="author" content="%s" />\n' % self.author) of.write('\t<meta name="author" content="%s" />\n' % self.author)
# Link to screen stylesheet # Link to screen stylesheet
@ -385,7 +384,7 @@ class BasePage:
# Link to printer stylesheet # Link to printer stylesheet
fname = os.path.join("styles", "Web_Print-Default.css") fname = os.path.join("styles", "Web_Print-Default.css")
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
of.write(' <link href="%s" rel="stylesheet" type="text/css" ' of.write('\t<link href="%s" rel="stylesheet" type="text/css" '
'media="print" />\n' % url) 'media="print" />\n' % url)
# Link to GRAMPS favicon # Link to GRAMPS favicon

View File

@ -685,15 +685,15 @@ class WebCalReport(Report):
of.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n') of.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n')
of.write(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n') of.write(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n')
of.write('<html xmlns="http://www.w3.org/1999/xhtml" ')
xmllang = Utils.xml_lang() xmllang = Utils.xml_lang()
of.write('xml:lang="%s" lang="%s">\n' % (xmllang, xmllang)) of.write('<html xmlns="http://www.w3.org/1999/xhtml" '
'xml:lang="%s" lang="%s">\n' % (xmllang, xmllang))
of.write('<head>\n') of.write('<head>\n')
of.write('\t<title>%s</title>\n\n' % title) of.write('\t<title>%s</title>\n\n' % title)
of.write('\t<meta http-equiv="Content-Type" content="text/html;charset=%s" />\n' of.write('\t<meta http-equiv="Content-Type" content="text/html;charset=%s" />\n'
% self.encoding) % self.encoding)
of.write('\t<meta name="robots" content="noindex" />\n') of.write('\t<meta name="generator" content="%s %s %s" />\n' %
of.write('\t<meta name="generator" content="GRAMPS 3.1.x: http://www.gramps-project.org" />\n') (const.PROGRAM_NAME, const.VERSION, const.URL_HOMEPAGE))
of.write('\t<meta name="author" content="%s" />\n\n' % self.author) of.write('\t<meta name="author" content="%s" />\n\n' % self.author)
subdirs = ['..'] * nr_up subdirs = ['..'] * nr_up