Changeset 400 for trunk

Timestamp:

Jun 28, 2007, 2:19:31 AM (16 years ago)

Author:

Peter Johansson

Message:

fixes #225 and fixes other issues to conform into XHTML 1.0 Strict. Still using tag <font> though (see #226)

Location:

trunk

Files:

• lib/Directory.cc (modified) (3 diffs)
• lib/File.cc (modified) (4 diffs)
• lib/Trac.cc (modified) (6 diffs)
• lib/css.cc (modified) (1 diff)
• lib/first_page.cc (modified) (3 diffs)
• lib/html_utility.cc (modified) (3 diffs)
• test/trac.cc (modified) (1 diff)

trunk/lib/Directory.cc

@@ -163 +163 @@
                    local_path()+"/index.html");
     path_anchor(os);
-    os << "<p align=center>\n<img src='"; 
+    os << "<p class=\"plot\">\n<img src='"; 
     for (size_t i=0; i<level_; ++i)
       os << "../";
@@ -171 +171 @@
     else
       os << imagedir << "/index.png";
-    os << "' alt='[plot]' border=0><br>\n";
+    os << "' alt='[plot]' /></p>\n";
     os << "<h3>File Summary";
     if (user!="all")
@@ -238 +238 @@
     os << "</table>\n";
     print_author_summary(os, line_type, log);
-    os << "</p>\n";
+    os << "\n";
     print_footer(os);
     os.close(); 

trunk/lib/File.cc

@@ -84 +84 @@
   void File::print_blame(std::ofstream& os) const
   {
-    os << "<br><h3>Blame Information</h3>";
+    os << "<br /><h3>Blame Information</h3>";
     os << "<table class=\"blame\">\n";
     os << "<thead>\n";
@@ -115 +115 @@
       std::string color;
       if (using_dates)
-        color=hex(static_cast<int>(k*Date(blame.date()).seconds()+m),2);
+        color = hex(static_cast<int>(k*Date(blame.date()).seconds()+m),2);
       else
-        color=hex(static_cast<int>(k*blame.revision()+m),2);
+        color = hex(static_cast<int>(k*blame.revision()+m),2);
       os << "<tr>\n<td class=\"number\"><font color=\"#" << color 
          << color << color << "\">" << blame.revision()
-         << "</td>\n<td class=\"date\"><font color=\"#" << color 
-         << color << color << "\">" << Date(blame.date())("%e %b %y")
-         << "</td>\n<td class=\"author\">";
+         << "</font></td>\n<td class=\"date\"><font color=\"#" << color 
+         << color << color << "\">" 
+         << Date(blame.date())("%e %b %y")
+         << "</font></td>\n<td class=\"author\">";
       hs << blame.author();
       os << "</td>\n<td class=\"number\">" << blame.line_no()+1
@@ -261 +262 @@
     path_anchor(os);
 
-    os << "<p align=center>\n<img src='"; 
+    os << "<p class=\"plot\">\n<img src='"; 
     for (size_t i=0; i<level_; ++i)
       os << "../";
@@ -269 +270 @@
     else
       os << imagefile;
-    os << "' alt='[plot]' border=0>\n</p>";
+    os << "' alt='[plot]' />\n</p>";
 
     print_author_summary(os, line_type, log);
-    os << "</p>\n";
+    os << "\n";
 
     print_blame(os);

trunk/lib/Trac.cc

@@ -205 +205 @@
     if (node.empty())
       href = std::string(Configuration::instance().trac_root()+
-                         "changeset?new="+new_rev+"&old="+old_rev);
+                         "changeset?new="+new_rev+"&old="+old_rev);
     else
       href = std::string(Configuration::instance().trac_root()+
-                         "changeset?new="+new_rev+"&new_path="+node+"&old="+
-                         old_rev+"&old_path="+node);
+                         "changeset?new="+new_rev+"&new_path="+node+
+                         "&old="+old_rev+"&old_path="+node);
     hs_.stream() << anchor(href, anchor_text(first_orig,first, last_trunc)); 
     return true;
@@ -240 +240 @@
     }
     std::string href(Configuration::instance().trac_root()+
-                     "changeset?new_path="+new_path+"&old_path="+old_path);
+                     "changeset?new_path="+new_path+"&amp;old_path="+old_path);
     hs_.stream() << anchor(href, anchor_text(first_orig,first, last_trunc)); 
     return true;
@@ -282 +282 @@
     
     std::string href(Configuration::instance().trac_root()+
-                     "changeset?new="+new_rev+"&new_path="+new_path+
-                     "&old="+old_rev+"&old_path="+old_path);
+                     "changeset?new="+new_rev+"&amp;new_path="+new_path+
+                     "&amp;old="+old_rev+"&amp;old_path="+old_path);
     hs_.stream() << anchor(href, anchor_text(first_orig,first, last_trunc)); 
     return true;
@@ -327 +327 @@
     }
     std::string href(Configuration::instance().trac_root()+"log/?rev="+
-                     rev+"&stop_rev="+stop_rev);
+                     rev+"&amp;stop_rev="+stop_rev);
     hs_.stream() << anchor(href, anchor_text(first_orig,first, last_trunc)); 
     return true;
@@ -358 +358 @@
     ++first; // eating ']'
     std::string href(Configuration::instance().trac_root()+"log/?rev="+
-                     rev+"&stop_rev="+stop_rev);
+                     rev+"&amp;stop_rev="+stop_rev);
     hs_.stream() << anchor(href, anchor_text(first_orig,first, last_trunc)); 
     return true;
@@ -395 +395 @@
     if (!node.empty() && node[0]=='/')
       href = std::string(Configuration::instance().trac_root()+"log"+node+
-                         "?rev="+rev+"&stop_rev="+stop_rev);
+                         "?rev="+rev+"&amp;stop_rev="+stop_rev);
     else
       href = std::string(Configuration::instance().trac_root()+"log/"+node+
-                         "?rev="+rev+"&stop_rev="+stop_rev);
+                         "?rev="+rev+"&amp;stop_rev="+stop_rev);
       
     hs_.stream() << anchor(href, anchor_text(first_orig,first, last_trunc)); 

trunk/lib/css.cc

@@ -149 +149 @@
     s << "}\n\n";
 
+
+    s << "p.plot { text-align: center; }\n";
+    s << "p.plot img { border: 0; }\n";
+
+    s << "p.footer {\n";
+    s << "text-align: center;\n";
+    s << "font-size: 70%;\n";
+    s << "}\n\n";
+
     s << "table.blame {\n";
     s << " clear: both;\n";

trunk/lib/first_page.cc

@@ -24 +24 @@
 #include "first_page.h"
 
-#include "html_utility.h"
-
 #include "Commitment.h"
 #include "Configuration.h"
 #include "Date.h"
 #include "HtmlStream.h"
+#include "html_utility.h"
 #include "Stats.h"
 #include "SVNlog.h"
@@ -201 +200 @@
       }
 
-      os << "</td></tr>";
+      os << "</td></tr>\n";
       ++a;
       ++d;
@@ -216 +215 @@
     stats.plot_summary(name);
     os << "<div class=\"main\">\n";
-    os << "<img src='" << name << "' alt='[plot]'>"; 
+    os << "<img src='" << name << "' alt='[plot]'/>"; 
     os << "</div>";
   }

trunk/lib/html_utility.cc

@@ -57 +57 @@
   {
     Date date;
-    os << "<p align=center><font size=-2>\nGenerated on "
+    os << "<p class=\"footer\">\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";
+       << "\n</p>\n</div>\n</body>\n</html>\n";
   }
 
@@ -72 +72 @@
        << "\"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"
+       << " xml:lang=\"en\" lang=\"en\">\n"
        << "<head>\n"
        << "<title> " << title << " - svndigest</title>\n"
-       << "</head>\n"
        << "<link rel=\"stylesheet\" "
        << "href=\"";
@@ -81 +80 @@
       os << "../";
     os << "svndigest.css\" type=\"text/css\" />\n"
+       << "</head>\n"
        << "<body>\n"
        << "<div id=\"menu\">"

trunk/test/trac.cc

@@ -53 +53 @@
              conf.trac_root()+"ticket/123#comment:1", my_out);
   ok &= test("diff:trunk@12:123", conf.trac_root()+
-             "changeset?new=123&new_path=trunk&old=12&old_path=trunk", 
+             "changeset?new=123&new_path=trunk&"+
+             "old=12&old_path=trunk", 
              my_out);
   ok &= test("diff:tags/1.0", conf.trac_root()+
-             "changeset?new_path=tags/1.0&old_path=tags/1.0", 
+             "changeset?new_path=tags/1.0&old_path=tags/1.0", 
              my_out);
   ok &= test("diff:tags/1.0//tags/1.0.1", conf.trac_root()+
-             "changeset?new_path=tags/1.0.1&old_path=tags/1.0", 
+             "changeset?new_path=tags/1.0.1&old_path=tags/1.0", 
              my_out);
   ok &= test("diff:tags/1.0@123//trunk@236", conf.trac_root()+
-             "changeset?new=236&new_path=trunk&old=123&old_path=tags/1.0", 
+             "changeset?new=236&new_path=trunk&"+
+             "old=123&old_path=tags/1.0", 
              my_out);
-  ok &= test("r123:236", conf.trac_root()+"log/?rev=236&stop_rev=123", my_out);
-  ok &= test("[123:236]",conf.trac_root()+"log/?rev=236&stop_rev=123", my_out);
+  ok &= test("r123:236", conf.trac_root()+"log/?rev=236&stop_rev=123", 
+             my_out);
+  ok &= test("[123:236]",conf.trac_root()+"log/?rev=236&stop_rev=123", 
+             my_out);
   ok &= test("log:trunk@123:236", 
-             conf.trac_root()+"log/trunk?rev=236&stop_rev=123", my_out);
+             conf.trac_root()+"log/trunk?rev=236&stop_rev=123", my_out);
   ok &= test("milestone:1.0", conf.trac_root()+"milestone/1.0", my_out);
   ok &= test("source:trunk", conf.trac_root()+"browser/trunk", my_out);