GNOME.org
 

[gnumeric] Tools: update news-to-html to new regime.

commit af0f442b176c069142572f2a2829e609a237aca7
Author: Morten Welinder <terra gnome org>
Date:   Mon Mar 17 21:16:28 2014 -0400

    Tools: update news-to-html to new regime.

 tools/ChangeLog    |    5 ++++
 tools/news-to-html |   55 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 52 insertions(+), 8 deletions(-)
---
diff --git a/tools/ChangeLog b/tools/ChangeLog
index d637234..d2139b8 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-17  Morten Welinder  <terra gnome org>
+
+       * news-to-html: Update boilerplate stuff.  Handle links to Redhat
+       bugzilla.
+
 2014-03-03  Morten Welinder <terra gnome org>
 
        * Release 1.12.12
diff --git a/tools/news-to-html b/tools/news-to-html
index 2404a66..c5092f2 100644
--- a/tools/news-to-html
+++ b/tools/news-to-html
@@ -11,6 +11,7 @@ $version2 =~ s/^(\d+\.\d+)\..*/$1/;
 
 my $bug_prefix = "https://bugzilla.gnome.org/show_bug.cgi?id=";;
 my $debian_bug_prefix = "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=";;
+my $redhat_bug_prefix = "https://bugzilla.redhat.com/show_bug.cgi?id=";;
 
 my $state = 0;
 my $who = undef;
@@ -102,6 +103,7 @@ sub add_to_item {
     my ($txt) = @_;
 
     $txt =~ s{Debian\s+\#(\d\d\d\d\d+)}{Debian <a href=\"$debian_bug_prefix$1\"\>Bug $1</a>}g;
+    $txt =~ s{Redhat\s+\#(\d\d\d\d\d+)}{Redhat <a href=\"$redhat_bug_prefix$1\"\>Bug $1</a>}g;
     $txt =~ s{\#(\d\d\d\d\d+)}{<a href=\"$bug_prefix$1\"\>Bug $1</a>}g;
 
     $item .= "\n\t$txt";
@@ -111,11 +113,38 @@ sub add_to_item {
 # -----------------------------------------------------------------------------
 
 sub prolog {
-    print "<!--#set var=\"title\" value=\"$module $version\" -->";
-    print "<!--#set var=\"rootdir\" value=\"../..\" -->";
-    print "<!--#include virtual=\"../../header-begin.shtml\" -->\n";
-    print "<!--#include virtual=\"../../header-end.shtml\" -->\n\n";
-
+    print <<PROLOG;
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<!-- MARKER: start-header -->
+<head>
+<title>Gnumeric</title>
+<link rel="stylesheet" href="/style/style.css" type="text/css" />
+<link rel="icon" type="image/png" href="/logo.png" />
+</head>
+<body>
+<div id="wrap">
+  <a href="/"><div id="header">
+    <h1 id="logo-text"><span>Gnumeric</span></h1>
+    <p id="slogan">Free, Fast, Accurate &mdash; Pick Any Three!</p>
+    <img id="logo" src="/gnumeric.png" alt="logo" class="float-right"/>
+    </div></a>
+
+  <div id="nav">
+    <ul>
+      <li><a href="/">Home</a></li>
+      <li><a href="/development.html">Development</a></li>
+      <li><a href="/contact.html">Contact</a></li>
+    </ul>
+  </div>
+
+  <div id="content-wrap">
+    <!-- MARKER: start-main -->
+    <div id="fullmain">
+      <div class="generalitem">
+PROLOG
+;
     print "  <h2>$module $version aka &quot;TBD&quot; is now available.</h2>\n";
     print "  <p>The Gnumeric Team is pleased to announce the availability of\n";
     print "  $module version $version.</p>\n";
@@ -123,6 +152,7 @@ sub prolog {
     print "  <ul>\n";
     print "  <li>...</li>\n";
     print "  </ul>\n\n";
+    print "  <p>Details of changes by contributor:</p>\n";
     print "  <ul>\n";
 }
 
@@ -133,12 +163,21 @@ sub epilog {
 
     print "  </ul>\n";
 
-    print "  <h2>Availability</h2>\n";
+    print "      </div>\n";
+    print "      <div class=\"generalitem\">\n";
+    print "        <h2><span class=\"gnumeric-bullet\"></span>Availability</h2>\n";
     print "  <blockquote>\n";
     print "    <p><a href=\"$link\">$link</a></p>\n";
     print "  </blockquote>\n";
-
-    print "<!--#include virtual=\"../../footer.shtml\" -->\n";
+    print "      </div>\n";
+    print "    </div>\n";
+    print "    <!-- MARKER: end-main -->\n";
+    print "    <!-- MARKER: start-sidebar -->\n";
+    print "    <!-- MARKER: end-sidebar -->\n";
+    print "  </div>\n";
+    print "</div>\n";
+    print "</body>\n";
+    print "</html>\n";
 }
 
 # -----------------------------------------------------------------------------
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]