The following commit has been merged in the master branch:
commit c28c481491f9c9bc2b605fe78247b9c59356ea6a
Author: Ole Streicher <oleb...@debian.org>
Date:   Mon Mar 21 10:15:28 2016 +0100

    Reformat maintainer stats to fit into Debian Astro Web pages

diff --git a/www/astro/contribute.html b/www/astro/contribute.html
index e135652..205376c 100644
--- a/www/astro/contribute.html
+++ b/www/astro/contribute.html
@@ -109,6 +109,11 @@
        of the Debian Astro Pure Blend:
        <ul>
          <li>
+           <a href="maintstats.html">
+             Maintainer statistics
+           </a>
+         </li>
+         <li>
            <a href="http://blends.debian.org/astro/bugs/";>
              Coloured bugs page
            </a>
@@ -118,11 +123,6 @@
              Coloured package list (thermometer)
            </a>
          </li>
-         <li>
-           <a href="http://blends.debian.org/astro/maintstats/";>
-             Maintainer statistics
-           </a>
-         </li>
        </ul>
     </div>
     <div id="footer">
diff --git a/www/astro/maintstats.html b/www/astro/maintstats.html
new file mode 100644
index 0000000..da5b9b8
--- /dev/null
+++ b/www/astro/maintstats.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+  <head>
+    <title>Debian Astro Maintainer Statistics</title>
+    <meta http-equiv="Content-Type" content="application/xhtml+xml; 
charset=UTF-8" />
+    <link href="http://www.debian.org/debhandheld.css"; media="screen"
+         rel="stylesheet" type="text/css" />
+    <link href="http://www.debian.org/debian.css"; rel="stylesheet"
+         type="text/css" />
+    <link href="http://blends.debian.org/css/blends.css"; rel="stylesheet"
+         type="text/css" />
+    <link rel="shortcut icon" href="http://www.debian.org/favicon.ico"; />
+  </head>
+  <body>
+    <div id="header">
+      <div id="upperheader">
+       <div id="logo">
+         <a href="http://www.debian.org/"; title="Debian Home">
+           <img src= "http://www.debian.org/Pics/openlogo-50.png";
+                alt="Debian" width="50" height= "61" /></a>
+         </div>
+         <p class="section">Pure Blend</p>
+       </div>
+       <div id="navbar">
+         <ul> 
+           <li><a href="index.html">Debian Astro</a></li>
+           <li><a href="tasks">Packages</a></li>
+           <li><a href="contact.html">Contact</a></li>
+           <li><a href="contribute.html">Contribute</a></li>
+         </ul>
+       </div>
+      <p id="breadcrumbs">
+       <a href="http://blends.debian.org";>Debian Pure Blends</a>
+       / <a href="index.html">Debian Astro</a>
+       / <a href="contribute.html">contribute</a>
+       / maintainer statistics
+      </p>
+    </div><!-- end header -->
+    <div id="content">
+      <h1>Debian Astro Maintainer Statistics</h1>
+      <div class="line">
+       <div class="col50">
+         <img 
src="http://blends.debian.net/liststats/authorstat_debian-astro.png";
+               title="Active writers on debian-as...@lists.debian.org"
+              alt="Bar chart of active writers on mailing list"
+              width="100%">
+       </div>
+       <div class="col50">
+         <img 
src="http://blends.debian.net/liststats/commitstat_debian-astro.png";
+               title="Commits SVN/Git"
+              alt="Bar chart of Commits to Debian Astro repositories obtained 
via teammetrics project"
+              width="100%">
+       </div>
+      </div>
+      <div class="line">
+       <div class="col50">
+         <img 
src="http://blends.debian.net/liststats/authorstat_debian-astro-packaging.png";
+               title="Active writers development list 
debian-astro-packag...@lists.alioth.debian.org"
+              alt="Bar chart of active writers on packaging list"
+              width="100%">
+       </div>
+       <div class="col50">
+         <img 
src="http://blends.debian.net/liststats/uploaders_debian-astro.png";
+               title="Uploaders of Debian Astro packages"
+              alt="Bar chart of Debian Astro uploaders"
+              width="100%">
+       </div>
+      </div>
+      <div class="line">
+       <div class="col50">
+         <img src="http://blends.debian.net/liststats/bugs_debian-astro.png";
+               title="Bugs closed by Debian Astro team members"
+              alt="Bar chart of bugs closed by Debian Astro team members"
+              width="100%">
+       </div>
+       <div class="col50">
+         <img 
src="http://blends.debian.net/liststats/maintainer_per_package_debian-astro.png";
+               title="Bugs closed by Debian Astro team members"
+              alt="Bar chart of bugs closed by Debian Astro team members"
+              width="100%">
+       </div>
+      </div>
+    </div>
+    
+    <div id="footer">
+      <p>
+       The source code powering these pages is available
+       <a href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
+       <br />
+       Debian is a registered trademark of
+       <a href="http://www.spi-inc.org/";>Software in the Public Interest</a>.
+      </p>
+    </div>
+  </body>
+</html>
diff --git a/www/astro/maintstats/index.html b/www/astro/maintstats/index.html
deleted file mode 100644
index 96b58fc..0000000
--- a/www/astro/maintstats/index.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html>
-       <head>
-                       <title>Maintainer Statistics &middot; Debian Astro Pure 
Blend</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta name="robots" content="noindex" />
-        <link href="/css/debian.css" rel="stylesheet" type="text/css">
-        <link href="/css/blends.css" rel="stylesheet" type="text/css">
-        <link rel="shortcut icon" href="/img/favicon.ico">
-
-       </head>
-
-       <body>
-                       <div id="header">
-               <div id="wikisection">
-                       <p class="section"><a href="/" title="Debian Astro Pure 
Blend">Astro Pure Blend</a></p>
-               </div>
-
-               <div id="upperheader">
-                       <div id="logo">
-                               <a href="http://www.debian.org"; title="Debian 
Home">
-                                       <img src="/img/openlogo-50.png" 
alt="Debian" width="50" height="61">
-                               </a>
-                       </div>
-               </div> <!-- end upperheader -->
-
-               <div id="navbar">
-                       <p class="hidecss"><a href="#content">Skip 
Quicknav</a></p>
-                       <ul>
-                               <li><a href="/astro/">Home</a></li>
-<li><a href="/astro/tasks/">Tasks</a>
-<li><a href="/astro/bugs/">Bugs</a></li>
-<li><a href="/astro/thermometer/">Thermometer</a></li>
-<li><a href="/astro/maintstats/">Maintainer Stats</a></li>
-
-                       </ul>
-               </div> <!-- end navbar -->
-
-               <p id="breadcrumbs">&nbsp;Debian Astro Pure Blend<span 
class="sep">/</span>Maintainer Statistics</p>
-       </div>
-
-
-
-               <div id="content">
-                       <h1>Debian Astro Maintainer Statistics</h1>
-
-<p>
-<img src="http://blends.debian.net/liststats/authorstat_debian-astro.png";
-          title="Active writers on debian-as...@lists.debian.org"
-              alt="Bar chart of active writers on mailing list">
-</p>
-<p>
-<img src="http://blends.debian.net/liststats/commitstat_debian-astro.png";
-          title="Commits SVN/Git"
-              alt="Bar chart of Commits to Debian Astro repositories obtained 
via teammetrics project">
-</p>
-<p>
-<img 
src="http://blends.debian.net/liststats/authorstat_debian-astro-packaging.png";
-          title="Active writers development list 
debian-astro-packag...@lists.alioth.debian.org"
-              alt="Bar chart of active writers on packaging list">
-</p>
-<p>
-<img src="http://blends.debian.net/liststats/uploaders_debian-astro.png";
-          title="Uploaders of Debian Astro packages"
-              alt="Bar chart of Debian Astro uploaders">
-</p>
-<p>
-<img src="http://blends.debian.net/liststats/bugs_debian-astro.png";
-          title="Bugs closed by Debian Astro team members"
-              alt="Bar chart of bugs closed by Debian Astro team members">
-</p>
-<p>
-<img 
src="http://blends.debian.net/liststats/maintainer_per_package_debian-astro.png";
-          title="Number of maintainers per package"
-              alt="Bar chart of number of maintainers per package">
-</p>
-
-
-               </div>
-
-               <div id="footer">
-<div id="fineprint">
-    <p>
-    The source code powering these pages is available <a 
href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
-    <br />
-    Contact: <a href="mailto:debian-as...@lists.debian.org";>Debian Astro Pure 
Blend</a> (<a href="https://lists.debian.org/debian-astro/";>archives</a>)
-     or <a href="irc://irc.debian.org/debian-astro">#debian-astro</a> on 
irc.debian.org.
-    <br />
-    Debian is a registered trademark of <a 
href="http://www.spi-inc.org/";>Software in the Public Interest</a>.
-    </p>
-</div>
-</div>
-
-
-       </body>
-</html>

-- 
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

Reply via email to