Changeset 284

Timestamp:

May 6, 2007, 7:54:09 PM (16 years ago)

Author:

Peter Johansson

Message:

moved css generation to separate file

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/Makefile.am (modified) (2 diffs)
• lib/css.cc (copied) (copied from trunk/lib/html_utility.cc) (3 diffs)
• lib/css.h (copied) (copied from trunk/lib/html_utility.h) (3 diffs)
• lib/html_utility.cc (modified) (1 diff)
• lib/html_utility.h (modified) (1 diff)

trunk/bin/svndigest.cc

@@ -26 +26 @@
 
 #include "Configuration.h"
+#include "css.h"
 #include "Directory.h"
 #include "GnuplotFE.h"

trunk/lib/Makefile.am

@@ -26 +26 @@
 noinst_LTLIBRARIES = libsvndigest.la
 
-noinst_HEADERS = ColumnStream.h Commitment.h Configuration.h \
+noinst_HEADERS = ColumnStream.h Commitment.h Configuration.h css.h\
   Date.h Directory.h File.h Gnuplot.h GnuplotFE.h \
   HtmlStream.h html_utility.h Node.h Parser.h rmdirhier.h \
@@ -33 +33 @@
 
 libsvndigest_la_SOURCES = ColumnStream.cc Commitment.cc Configuration.cc \
-  Date.cc Directory.cc File.cc \
+  css.cc Date.cc Directory.cc File.cc \
   Gnuplot.cc GnuplotFE.cc HtmlStream.cc \
   html_utility.cc Node.cc Parser.cc rmdirhier.cc Stats.cc SVN.cc        \

trunk/lib/css.cc

@@ -22 +22 @@
 */
 
-#include "html_utility.h"
+#include "css.h"
+#include <config.h>
 
-#include "Commitment.h"
-#include "Configuration.h"
-#include "Date.h"
-#include "HtmlStream.h"
-#include "Stats.h"
-#include "SVNlog.h"
-#include "utility.h"
-#include <config.h> // this header file is created by configure
-
-#include <algorithm>
-#include <cassert>
 #include <fstream>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
 #include <string>
-#include <sys/param.h>
-#include <unistd.h>
-#include <vector>
 
 namespace theplu{
 namespace svndigest{
 
-  std::string anchor(const std::string& href, 
-                     const std::string& name, u_int level, 
-                     const std::string& title)
-  {
-    std::stringstream ss;
-    HtmlStream hs(ss);
-    ss << "<a title=\"";
-    hs << title; 
-    ss << "\" href=\"";
-    for (size_t i=0; i<level; ++i)
-      ss << "../";
-    hs << href; 
-    ss << "\">"; 
-    hs << name; 
-    ss << "</a>";
-    return ss.str();
-  }
-
-  
   void print_css(const std::string& str)
   {
@@ -179 +144 @@
     s << " padding: 0 1em .1em 0;\n";
     s << "}\n";
-
-
-
-
     s << "table.listings {\n";
     s << " clear: both;\n";
@@ -234 +195 @@
 
 
-  void print_main_page(const std::string& dir, const SVNlog& log,
-                       const Stats& stats)
-  {
-    std::string filename="index.html";
-    std::ofstream os(filename.c_str());
-    print_header(os, dir, 0, "all", "main", "index.html");
-
-    using namespace std;
-    set<string> authors;
-    authors.insert(log.author().begin(), log.author().end());
-    // erase invalid authors
-    authors.erase("");
-    authors.erase("no author");
-
-    vector<Commitment> latest_commit;
-    latest_commit.reserve(authors.size());
-    for (set<string>::const_iterator i(authors.begin()); i!=authors.end(); ++i)
-      latest_commit.push_back(log.latest_commit(*i));
-
-    print_general_information(os, log, authors.size());
-    sort(latest_commit.begin(), latest_commit.end(), GreaterRevision());
-    print_authors(os, latest_commit, stats);
-    print_recent_logs(os, log);
-    os << "<hr width=100% />";
-    print_footer(os);
-    os.close();
-
-  }
-
-  void print_general_information(std::ostream& os, const SVNlog& log, 
-                                 size_t nof_authors)
-  { 
-    Date begin(log.date()[0]);
-    if (log.date().size()>1)
-      begin = std::min(begin, Date(log.date()[1]));
-    Date end(log.date().back());
-    Date now;
-    std::string timefmt("%a, %e %b %Y");
-
-    os << "<div class=\"main\">" 
-       << "<table class=\"main\"><thead><tr><th colspan=\"2\">" 
-       << "General Information"
-       << "</th></tr></thead>\n"
-       << "<tr><td>First Revision:</td><td>" 
-       << begin(timefmt) << "</td></tr>\n"
-       << "<tr><td>Latest Revision:</td><td>" 
-       << end(timefmt) << "</td></tr>\n"
-       << "<tr><td>Report Generated:</td><td>" 
-       << now(timefmt) << "</td></tr>\n"
-       << "<tr><td>Repository Age:</td><td>"; 
-    os << now.difftime(begin);
-    os << "</td></tr>\n"
-       << "<tr><td>Number of Authors:</td><td>" << nof_authors
-       << "</td></tr>\n"
-       << "<tr><td>Revisions:</td><td>" << log.revision().size() 
-       << "</td></tr>\n"
-       << "</table></div>\n";
-  }
-
-
-  void print_footer(std::ostream& os)
-  {
-    Date date;
-    os << "<p align=center><font size=-2>\nGenerated on "
-       << date("%a %b %d %H:%M:%S %Y") << " (UTC) by "
-       << anchor("http://lev.thep.lu.se/trac/svndigest/", 
-                 PACKAGE_STRING, 0, "")
-       << "</font>\n</p>\n</div>\n</body>\n</html>\n";
-  }
-
-
-  void print_header(std::ostream& os, std::string title, u_int level,
-                    std::string user, std::string item, std::string path)
-  {
-    os << "<!DOCTYPE html\n"
-       << "PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
-       << "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
-       << "<html xmlns=\"http://www.w3.org/1999/xhtml\""
-       << " xml:lang=\"en\" lang=\"en\"><head>\n"
-       << "<head>\n"
-       << "<title> " << title << " - svndigest</title>\n"
-       << "</head>\n"
-       << "<link rel=\"stylesheet\" "
-       << "href=\"";
-    for (u_int i=0; i<level; ++i)
-      os << "../";
-    os << "svndigest.css\" type=\"text/css\" />\n"
-       << "<body>\n"
-       << "<div id=\"menu\">"
-       << "<ul><li></li>";
-    if (item=="main")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor("index.html", "Main", level, "Main page");
-    os << "</li>";
-
-    if (item=="total")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(user+"/total/"+path, "Total", level, 
-           "View statistics of all lines");
-    os << "</li>";
-
-    if (item=="code")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(user+"/code/"+path, "Code", level, 
-                 "View statistics of code lines");
-    os << "</li>";
-
-    if (item=="comments")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(user+"/comments/"+path, "Comment", level, 
-                 "View statistics of comment lines");
-    os << "</li>";
-
-
-    if (item=="empty")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(user+"/empty/"+path, "Other", level, 
-                 "View statistics of empty lines");
-    os << "</li>"
-       << "</ul></div>"
-       << "<div id=\"main\">\n";
-  }
-
-
-  void print_authors(std::ostream& os, 
-                     const std::vector<Commitment>& lc,
-                     const Stats& stats)
-  {
-    os << "<div class=\"main\">"
-       << "<table class=\"main\"><thead><tr><th colspan=\"2\">" 
-       << "Authors"
-       << "</th></tr></thead>\n";
-
-    os << "<tr><td>Author</td>" 
-       << "<td>Number of Lines</td>"
-       << "<td>Code Lines</td>"
-       << "<td>Comment Lines</td>"
-       << "<td>Latest Commitment</td>"
-       <<"</tr>";
-
-    std::string timefmt("%b %d %H:%M:%S %Y");
-    using namespace std;
-    for (vector<Commitment>::const_iterator i=lc.begin(); i!=lc.end(); ++i) {
-      os << "<tr><td>" 
-         << anchor(string(i->author()+"/total/index.html"),i->author())
-         << "</td><td>" << stats.lines(i->author()) << " (" 
-         << 100*stats.lines(i->author())/stats.lines() << "%)</td>"
-         << "<td>" << stats.code(i->author()) << " (" 
-         << 100*stats.code(i->author())/stats.code() << "%)</td>"
-         << "<td>" << stats.comments(i->author()) << " (" 
-         << 100*stats.comments(i->author())/stats.comments() << "%)</td>"
-         << "<td>" << i->date()(timefmt) << "</td>"
-         <<"</tr>";
-    }
-
-    os << "</table></div>\n";
-    
-  }
-
-
-  void print_recent_logs(std::ostream& os, const SVNlog& log)
-  {
-    os << "<div class=\"main\">\n"
-       << "<table class=\"main\"><thead><tr><th colspan=\"2\">" 
-       << "Recent Log"
-       << "</th></tr></thead>\n";
-
-    std::vector<std::string>::const_reverse_iterator a=log.author().rbegin();
-    std::vector<std::string>::const_reverse_iterator d=log.date().rbegin();
-    std::vector<std::string>::const_reverse_iterator m=log.message().rbegin();
-    std::vector<size_t>::const_reverse_iterator r=log.revision().rbegin();
-    assert(log.author().size()==log.date().size());
-    assert(log.author().size()==log.message().size());
-    assert(log.author().size()==log.revision().size());
-    os << "<tr><td>Author</td><td>Date</td><td>Rev</td><td>Message</td></tr>\n";
-    HtmlStream hs(os);
-    std::string timefmt("%b %d %H:%M:%S %Y");
-    const size_t maxlength = 80;
-    const Configuration* conf = Configuration::instance();
-    for (size_t i=0; i<10 && a!=log.author().rend(); ++i) {
-      os << "<tr><td>" << anchor(*a+"/total/index.html",*a) << "</td>";
-      Date date(*d);
-      os << "<td>" << date(timefmt) << "</td>";
-      os << "<td>"; 
-      os << trac_revision(*r);
-      os << "</td>";
-      os << "<td>";
-      std::string mess = *m;
-      // replace newlines with space
-      std::replace(mess.begin(), mess.end(), '\n', ' ');
-      mess = htrim(mess);
-      // truncate message if too long
-      if (mess.size()>maxlength)
-        mess = mess.substr(0,maxlength-3) + "...";
-
-      if (conf->trac_ticket().empty())
-        hs << mess;
-      else { // make anchors to trac
-        char c;
-        std::stringstream ss(mess);
-        for (ss.get(c); ss.good(); ss.get(c)) {
-          if (c=='#') {
-            int ticket=0;
-            ss >> ticket;
-            if (!ss.fail()){
-              std::stringstream s;
-              s << ticket;
-              os << anchor(conf->trac_ticket()+s.str(),"#"+s.str()); 
-            }
-            else {
-              ss.clear(std::ios::goodbit);
-              hs << c;
-            }
-          }
-          else
-            hs << c;
-        }
-      }
-
-      os << "</td></tr>";
-      ++a;
-      ++d;
-      ++m;
-      ++r;
-    }
-    os << "</table></div>\n";
-  }
-
-
-  std::string trac_revision(size_t r)
-  {
-    Configuration* conf = Configuration::instance();
-    std::stringstream ss;
-    if (conf->trac_revision().empty())
-      ss << r; 
-    else {
-      std::stringstream rev;
-      rev << r;
-      ss << anchor(conf->trac_revision()+rev.str(), rev.str());
-    }
-    return ss.str();
-  }
-
 }} // end of namespace svndigest and namespace theplu

trunk/lib/css.h

@@ -1 @@
-#ifndef _theplu_svndigest_html_utility_
-#define _theplu_svndigest_html_utility_
+#ifndef _theplu_svndigest_css_
+#define _theplu_svndigest_css_
 
 // $Id$
@@ -25 +25 @@
 */
 
-#include <iostream>
-#include <fstream>
-#include <iosfwd>
-#include <set>
 #include <string>
-#include <vector>
 
 namespace theplu{
 namespace svndigest{
-
-  class Commitment;
-  class Date;
-  class Stats;
-  class SVNlog;
-
-  ///
-  /// @brief create anchor
-  ///
-  /// @param href address to link to
-  /// @param name text visible on page
-  /// @param level '../' is added @a level times before @a href
-  /// @param title title of anchor
-  ///
-  std::string anchor(const std::string& href, 
-                     const std::string& name, u_int level=0, 
-                     const std::string& title="");
 
   ///
@@ -57 +35 @@
   void print_css(const std::string& str);
 
-  void print_authors(std::ostream& os, 
-                     const std::vector<Commitment>& latest_commit,
-                     const Stats& stats);
-
-  ///
-  /// called by print_main_page
-  ///
-  void print_general_information(std::ostream&, const SVNlog&, size_t);
-
-  ///
-  /// @brief print main page
-  ///
-  void print_main_page(const std::string&, const SVNlog&, const Stats&);
-    
-  void print_recent_logs(std::ostream&, const SVNlog& log);
-    
-  ///
-  /// @brief print html footer of page
-  ///
-  void print_footer(std::ostream&);
-    
-  ///
-  /// @brief print html header of page
-  ///
-  /// \param os stream to print to
-  /// \param name
-  /// \param level
-  /// \param 
-  void print_header(std::ostream& os, std::string name, u_int level, 
-                    std::string user, std::string item, std::string path);
-
-
-  ///
-  /// @return if trac-revision is set in config file anchor to trac is
-  /// given otherwise just a string corresponding to passed parameter.
-  ///
-  std::string trac_revision(size_t);
-
 }} // end of namespace svndigest end of namespace theplu
 

trunk/lib/html_utility.cc

@@ -66 +66 @@
 
   
-  void print_css(const std::string& str)
-  {
-    std::ofstream s(str.c_str());
-    s << "<-- svndigest.css generated by " << PACKAGE_STRING << "\n"
-
-      << "Copyright (C) 2006, 2007 Peter Johansson\n\n"
-      << "This file is part of svndigest, " 
-      << "http://lev.thep.lu.se/trac/svndigest\n\n"
-
-      << "svndigest is free software; you can redistribute it and/or " 
-      << "modify it\n"
-      << "under the terms of the GNU General Public License as published by\n"
-      << "the Free Software Foundation; either version 2 of the License, or\n"
-      << "(at your option) any later version.\n\n"
-
-      << "svndigest is distributed in the hope that it will be useful, but\n"
-      << "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-      << "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
-      << "General Public License for more details.\n\n"
-
-      << "You should have received a copy of the GNU General Public License\n"
-      << "along with this program; if not, write to the Free Software\n"
-      << "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
-      << "02111-1307, USA.\n\n"
-
-      << "This file was initially inspired by the cascading style sheet\n"
-      << "within the Trac open source project (http://trac.edgewall.org/)\n"
-      << "Copyright (C) 2003-2006 Edgewall Software\n"
-      << "All rights reserved.\n\n"
-
-      << "Redistribution and use in source and binary forms, with or without\n"
-      << "modification, are permitted provided that the following conditions\n"
-      << "are met:\n\n"
-      
-      << "1. Redistributions of source code must retain the above copyright\n"
-      << "   notice, this list of conditions and the following disclaimer.\n"
-      << "2. Redistributions in binary form must reproduce the above " 
-      << "copyright\n"
-      << "   notice, this list of conditions and the following disclaimer in\n"
-      << "   the documentation and/or other materials provided with the\n"
-      << "   distribution.\n"
-      << "3. The name of the author may not be used to endorse or promote\n"
-      << "   products derived from this software without specific prior\n"
-      << "   written permission.\n\n"
-      
-      << "THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS\n"
-      << "OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n"
-      << "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"
-      << "ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\n"
-      << "DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n"
-      << "DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\n"
-      << "GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n"
-      << "INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n"
-      << "WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n"
-      << "NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n"
-      << "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->\n";
-
-
-    s << "body {\n";
-    s << " background: #fff; \n";
-    s << " color: #000; \n";
-    s << " margin: 0px; \n";
-    s << " padding: 0; \n";
-    s << "} \n";
-    s << "\n";
-    s << "#menu {\n";
-    s << " background: #eee;\n";
-    s << " width: 100%;\n";
-    s << " margin: 0px;\n";
-    s << " padding: 0px;\n";
-    s << "}\n\n";
-    s << "#menu ul\n";
-    s << "{ \n";
-    s << "padding: 0px;\n";
-    s << "margin: 0px;list-style-type: none; text-align: center;"
-      << "border-bottom: 1px solid black;}\n";
-    s << "#menu ul li { display: inline; border-right: 1px solid black;}\n";
-    s << "#menu ul li a {text-decoration: none; padding-right: 1em;" 
-      << "padding-left: 1em; margin: 0px;}\n";
-    s << "#menu ul li a:hover{ color: #000; background: #ddd;}\n";
-    s << "#menu ul li.highlight a {color: #fff; background: #777; }";
-    s << "\n";
-    s << "#main {\n";
-    s << " margin: 10px; \n";
-    s << "}\n";
-    s << "\n";
-    s << "body, th, td {\n";
-    s << " font: normal 13px verdana,arial,'Bitstream Vera Sans',"
-      << "helvetica,sans-serif;\n";
-    s << "}\n";
-    s << ":link, :visited {\n";
-    s << " text-decoration: none;\n";
-    s << " color: #b00;\n";
-    s << "}\n";
-    s << "\n";
-    s << "div.main {\n";
-    s << "margin-top: 50px;\n";          
-    s << "margin-left: 50px;\n";
-    s << " \n";
-    s << "}\n";
-    s << "table.main {\n"; 
-    s << " text-align: left;\n";
-    s << " padding: 0 1em .1em 0;\n";
-    s << "}\n";
-    s << "table.main th {\n";
-    s << " text-align: left;\n";
-    s << " padding: 0 1em 0.5em 0;\n";
-    s << " font-size: 150%;\n";
-    s << " font-wheight: bold;\n";
-    s << "}\n";
-    s << "table.main td {\n";
-    s << " padding: 0 1em .1em 0;\n";
-    s << "}\n";
-
-
-
-
-    s << "table.listings {\n";
-    s << " clear: both;\n";
-    s << " border-bottom: 1px solid #d7d7d7;\n";
-    s << " border-collapse: collapse;\n";
-    s << " border-spacing: 0;\n";
-    s << " margin-top: 1em;\n";
-    s << " width: 100%;\n";
-    s << "}\n";
-    s << "\n";
-    s << "table.listings th {\n";
-    s << " text-align: left;\n";
-    s << " padding: 0 1em .1em 0;\n";
-    s << " font-size: 12px\n";
-    s << "}\n";
-    s << "table.listings thead { background: #f7f7f0 }\n";
-    s << "table.listings thead th {\n";
-    s << " border: 1px solid #d7d7d7;\n";
-    s << " border-bottom-color: #999;\n";
-    s << " font-size: 11px;\n";
-    s << " font-wheight: bold;\n";
-    s << " padding: 2px .5em;\n";
-    s << " vertical-align: bottom;\n";
-    s << "}\n";
-    s << "\n";
-    s << "table.listings tbody td a:hover, table.listing tbody th a:hover {\n";
-    s << " background-color: transparent;\n";
-    s << "}\n";
-    s << "\n";
-    s << "table.listings tbody td, table.listing tbody th {\n";
-    s << " border: 1px dotted #ddd;\n";
-    s << " padding: .33em .5em;\n";
-    s << " vertical-align: top;\n";
-    s << "}\n";
-    s << "\n";
-    s << "table.listings tbody td a:hover, table.listing tbody th a:hover {\n";
-    s << " background-color: transparent;\n";
-    s << "}\n";
-    s << "table.listings tbody tr { border-top: 1px solid #ddd }\n";
-    s << "table.listings tbody tr.light { background-color: #fcfcfc }\n";
-    s << "table.listings tbody tr.dark { background-color: #f7f7f7 }\n";
-    s << "table.listings tbody tr:hover { background: #eed }\n";
-    s << "table.listings tbody td { text-align: left }\n";
-    s << "table.listings tbody td.directory a { font-weight: bold }\n";
-    s << "\n";
-    s << ".sep { color: #666}\n";
-    s << "\n";
-    s << "\n";
-    s.close();
-  }
-
-
   void print_main_page(const std::string& dir, const SVNlog& log,
                        const Stats& stats)

trunk/lib/html_utility.h

@@ -52 +52 @@
                      const std::string& title="");
 
-  ///
-  /// \brief printing cascading style sheet to file name @a str.
-  ///
-  void print_css(const std::string& str);
-
   void print_authors(std::ostream& os, 
                      const std::vector<Commitment>& latest_commit,