I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2005-01-12 cervantes

Browse Source 
* Syndie CSS tweaks to removed some redundant declarations, improve font
      scaling and layout robustness. Improved cross browser compatibility
      (in other words "kicked IE"). Tightened the look of the blog template
      a little.
This commit is contained in:
cervantes
2006-01-12 09:59:55 +00:00
committed by zzz
parent 4f51ad492b
commit a638301b5c
5 changed files with 258 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java
View File

@ -561,9 +561,9 @@ public abstract class BaseServlet extends HttpServlet {
out.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
out.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
out.write("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">\n<head>\n<title>" + getTitle() + "</title>\n");
out.write("<meta http-equiv=\"cache-control\" content=\"no-cache\" />");
out.write("<meta http-equiv=\"pragma\" content=\"no-cache\" />");
out.write("<style>");
out.write("<meta http-equiv=\"cache-control\" content=\"no-cache\" />\n");
out.write("<meta http-equiv=\"pragma\" content=\"no-cache\" />\n");
out.write("<style>\n");
out.write(STYLE_HTML);
Reader css = null;
try {
@ -581,7 +581,7 @@ public abstract class BaseServlet extends HttpServlet {
}
String content = FileUtil.readTextFile("./docs/syndie_standard.css", -1, true);
if (content != null) out.write(content);
out.write("</style>");
out.write("</style>\n");
out.write(BEGIN_HTML);
}
@ -1106,120 +1106,123 @@ public abstract class BaseServlet extends HttpServlet {
"<span style=\"display: none\"><a href=\"#bodySubject\">Jump to the beginning of the first post rendered, if any</a>\n" +
"<a href=\"#threads\">Jump to the thread navigation</a>\n</span>\n" +
"<table border=\"0\" width=\"100%\" class=\"overallTable\">\n";
private static final String STYLE_HTML = ".overallTable {\n" +
" border-spacing: 0px;\n" +
" border-width: 0px;\n" +
" border: 0px;\n" +
" margin: 0px;\n" +
" padding: 0px;\n" +
private static final String STYLE_HTML = "* {\n" +
" margin: 0;\n" +
" padding: 0;\n" +
"}\n" +
"* {\n" +
" margin: 0px;\n" +
" padding: 0px;\n" +
"body {\n" +
" font-family: Arial, Helvetica, sans-serif;\n" +
" font-size: 100%;\n" +
" background-color : #EEEEEE;\n" +
" color: #000000;\n" +
"}\n" +
"select {\n" +
" min-width: 1.5em;\n" +
"}\n" +
".overallTable {\n" +
" border-spacing: 0px;\n" +
" border-collapse:collapse;\n" +
" float:left;\n" +
"}\n" +
".topNav {\n" +
" background-color: #BBBBBB;\n" +
" background-color: #BBBBBB;\n" +
"}\n" +
".topNav_user {\n" +
" text-align: left;\n" +
" float: left;\n" +
" display: inline;\n" +
" text-align: left;\n" +
" float: left;\n" +
" display: inline;\n" +
"}\n" +
".topNav_admin {\n" +
" text-align: right;\n" +
" float: right;\n" +
" margin: 0 5px 0 0;\n" +
" display: inline;\n" +
" text-align: right;\n" +
" float: right;\n" +
" margin: 0 5px 0 0;\n" +
" display: inline;\n" +
"}\n" +
".controlBar {\n" +
" background-color: #BBBBBB;\n" +
" background-color: #BBBBBB;\n" +
"}\n" +
".controlBarRight {\n" +
" text-align: right;\n" +
" text-align: right;\n" +
"}\n" +
".threadEven {\n" +
" background-color: #FFFFFF;\n" +
" white-space: nowrap;\n" +
" background-color: #FFFFFF;\n" +
" white-space: nowrap;\n" +
"}\n" +
".threadOdd {\n" +
" background-color: #EEEEEE;\n" +
" white-space: nowrap;\n" +
" background-color: #EEEEEE;\n" +
" white-space: nowrap;\n" +
"}\n" +
".threadLeft {\n" +
" text-align: left;\n" +
" align: left;\n" +
" text-align: left;\n" +
" align: left;\n" +
"}\n" +
".threadNav {\n" +
" background-color: #BBBBBB;\n" +
" background-color: #BBBBBB;\n" +
"}\n" +
".threadNavRight {\n" +
" text-align: right;\n" +
" float: right;\n" +
" background-color: #BBBBBB;\n" +
" text-align: right;\n" +
" float: right;\n" +
" background-color: #BBBBBB;\n" +
"}\n" +
".rightOffset {\n" +
" float: right;\n" +
" margin: 0 5px 0 0;\n" +
" display: inline;\n" +
"}\n" +
" float: right;\n" +
" margin: 0 5px 0 0;\n" +
" display: inline;\n" +
"}\n" +
".threadInfoLeft {\n" +
" float: left;\n" +
" margin: 5px 0px 0 0;\n" +
" display: inline;\n" +
"}\n" +
" float: left;\n" +
" margin: 5px 0px 0 0;\n" +
" display: inline;\n" +
"}\n" +
".threadInfoRight {\n" +
" float: right;\n" +
" margin: 0 5px 0 0;\n" +
" display: inline;\n" +
"}\n" +
" float: right;\n" +
" margin: 0 5px 0 0;\n" +
" display: inline;\n" +
"}\n" +
".postMeta {\n" +
" background-color: #BBBBFF;\n" +
" background-color: #BBBBFF;\n" +
"}\n" +
".postMetaSubject {\n" +
" text-align: left;\n" +
" text-align: left;\n" +
"}\n" +
".postMetaLink {\n" +
" text-align: right;\n" +
" text-align: right;\n" +
"}\n" +
".postDetails {\n" +
" background-color: #DDDDFF;\n" +
" background-color: #DDDDFF;\n" +
"}\n" +
".postReply {\n" +
" background-color: #BBBBFF;\n" +
" background-color: #BBBBFF;\n" +
"}\n" +
".postReplyText {\n" +
" background-color: #BBBBFF;\n" +
" background-color: #BBBBFF;\n" +
"}\n" +
".postReplyOptions {\n" +
" background-color: #BBBBFF;\n" +
" background-color: #BBBBFF;\n" +
"}\n" +
".syndieBlogTopNav {\n" +
" width: 100%;\n" +
" height: 20px;\n" +
" background-color: #BBBBBB;\n" +
" font-size: 100%;\n" +
" float:left;\n" +
" width: 100%;\n" +
" background-color: #BBBBBB;\n" +
"}\n" +
".syndieBlogTopNavUser {\n" +
" text-align: left;\n" +
" float: left;\n" +
" display: inline;\n" +
" text-align: left;\n" +
" float: left;\n" +
"}\n" +
".syndieBlogTopNavAdmin {\n" +
" text-align: left;\n" +
" float: right;\n" +
" display: inline;\n" +
" text-align: left;\n" +
" float: right;\n" +
"}\n" +
".syndieBlogFavorites {\n" +
" float: left;\n" +
" margin: 5px 0px 0 0;\n" +
" display: inline;\n" +
" float: left;\n" +
" margin: 5px 0px 0 0;\n" +
" display: inline;\n" +
"}\n" +
".syndieBlogList {\n" +
" float: right;\n" +
" margin: 5px 0px 0 0;\n" +
" display: inline;\n" +
" float: right;\n" +
" margin: 5px 0px 0 0;\n" +
" display: inline;\n" +
"}\n";
private static final String END_HTML = "</table>\n" +
"</body>\n";

209
apps/syndie/java/src/net/i2p/syndie/web/ViewBlogServlet.java
View File

@ -619,194 +619,163 @@ public class ViewBlogServlet extends BaseServlet {
return true;
}
private static final String CSS =
"body {\n" +
" margin: 0px;\n" +
" padding: 0px;\n" +
" font-family: Arial, Helvetica, sans-serif;\n" +
private static final String CSS = "* {\n" +
" margin: 0px;\n" +
" padding: 0px;\n" +
"}\n" +
"* {\n" +
" margin: 0px;\n" +
" padding: 0px;\n" +
"body {\n" +
" font-family: Arial, Helvetica, sans-serif;\n" +
" font-size: 100%;\n" +
" background-color : #EEEEEE;\n" +
"}\n" +
"a {\n" +
" text-decoration: none;\n" +
"}\n" +
"a:hover {\n" +
" color: red;\n" +
"}\n" +
"select {\n" +
" min-width: 1.5em;\n" +
" min-width: 1.5em;\n" +
"}\n" +
".syndieBlog {\n" +
" font-size: 100%;\n" +
" margin: 0px;\n" +
" border: 0px;\n" +
" padding: 0px;\n" +
" border-width: 0px;\n" +
" border-spacing: 0px;\n" +
"}\n" +
".syndieBlogTopNav {\n" +
" width: 100%;\n" +
" height: 20px;\n" +
" background-color: #BBBBBB;\n" +
" float:left;\n" +
" width: 100%;\n" +
" background-color: #BBBBBB;\n" +
"}\n" +
".syndieBlogTopNavUser {\n" +
" text-align: left;\n" +
" float: left;\n" +
" display: inline;\n" +
" text-align: left;\n" +
" float: left;\n" +
" margin: 2px;\n" +
"}\n" +
".syndieBlogTopNavAdmin {\n" +
" text-align: left;\n" +
" float: right;\n" +
" display: inline;\n" +
" text-align: left;\n" +
" float: right;\n" +
" margin: 2px;\n" +
"}\n" +
".syndieBlogHeader {\n" +
" width: 100%;\n" +
" height: 50px;\n" +
" font-size: 120%;\n" +
" background-color: black;\n" +
" color: white;\n" +
" width: 100%;\n" +
" font-size: 1.2em;\n" +
" background-color: black;\n" +
" color: white;\n" +
" float:left;\n" +
"}\n" +
".syndieBlogHeader a {\n" +
" color: white;\n" +
" padding: 4px;\n" +
"}\n" +
".syndieBlogLogo {\n" +
" float: left;\n" +
" display: inline;\n" +
" float: left;\n" +
" display: inline;\n" +
"}\n" +
".syndieBlogLinks {\n" +
" width: 200px;\n" +
" width: 20%;\n" +
" float: left;\n" +
"}\n" +
".syndieBlogLinkGroup {\n" +
" text-align: left;\n" +
" font-size: 80%;\n" +
" background-color: #DDD;\n" +
" border: solid;\n" +
//" border-width: 5px 5px 0px 5px;\n" +
//" border-color: #FFFFFF;\n" +
" border-width: 1px 1px 1px 1px;\n" +
" border-color: #000;\n" +
" margin-top: 5px;\n" +
" margin-right: 5px;\n" +
" font-size: 0.8em;\n" +
" background-color: #DDD;\n" +
" border: 1px solid black;\n" +
" margin: 5px;\n" +
" padding: 2px;\n" +
"}\n" +
".syndieBlogLinkGroup ul {\n" +
" list-style: none;\n" +
" margin-left: 0;\n" +
" margin-top: 0;\n" +
" margin-bottom: 0;\n" +
" padding-left: 0;\n" +
" list-style: none;\n" +
"}\n" +
".syndieBlogLinkGroup li {\n" +
" margin: 0;\n" +
"}\n" +
//".syndieBlogLinkGroup li a {\n" +
//" display: block;\n" +
//" width: 100%;\n" +
//"}\n" +
".syndieBlogLinkGroupName {\n" +
" font-size: 80%;\n" +
" font-weight: bold;\n" +
" font-weight: bold;\n" +
" width: 100%;\n" +
" border-bottom: 1px dashed black;\n" +
" display: block;\n" +
"}\n" +
".syndieBlogPostInfoGroup {\n" +
" text-align: left;\n" +
" font-size: 80%;\n" +
" background-color: #FFEA9F;\n" +
" border: solid;\n" +
" border-width: 1px 1px 1px 1px;\n" +
" border-color: #000;\n" +
" margin-top: 5px;\n" +
" margin-right: 5px;\n" +
" font-size: 0.8em;\n" +
" background-color: #FFEA9F;\n" +
" border: 1px solid black;\n" +
" margin: 5px;\n" +
" padding: 2px;\n" +
"}\n" +
".syndieBlogPostInfoGroup ol {\n" +
" list-style: none;\n" +
" margin-left: 0;\n" +
" margin-top: 0;\n" +
" margin-bottom: 0;\n" +
" padding-left: 0;\n" +
" list-style: none;\n" +
"}\n" +
".syndieBlogPostInfoGroup li {\n" +
" margin: 0;\n" +
"}\n" +
".syndieBlogPostInfoGroup li a {\n" +
" display: block;\n" +
" display: block;\n" +
"}\n" +
".syndieBlogPostInfoGroupName {\n" +
" font-size: 80%;\n" +
" font-weight: bold;\n" +
" font-weight: bold;\n" +
" width: 100%;\n" +
" border-bottom: 1px dashed black;\n" +
" display: block;\n" +
"}\n" +
".syndieBlogMeta {\n" +
" text-align: left;\n" +
" font-size: 80%;\n" +
" background-color: #DDD;\n" +
" border: solid;\n" +
" border-width: 1px 1px 1px 1px;\n" +
" border-color: #000;\n" +
" width: 90%;\n" +
" margin-top: 5px;\n" +
" margin-right: 5px;\n" +
" text-align: left;\n" +
" font-size: 0.8em;\n" +
" background-color: #DDD;\n" +
" border: 1px solid black;\n" +
" margin: 5px;\n" +
" padding: 2px;\n" +
"}\n" +
".syndieBlogBody {\n" +
" position: absolute;\n" +
" top: 70px;\n" +
" left: 200px;\n" +
" float: left;\n" +
" width: 80%;\n" +
" float: left;\n" +
"}\n" +
".syndieBlogPost {\n" +
" border: solid;\n" +
" border-width: 1px 1px 1px 1px;\n" +
" border-color: #000;\n" +
" margin-top: 5px;\n" +
" width: 99%;\n" +
" border: 1px solid black;\n" +
" margin-top: 5px;\n" +
" margin-right: 5px;\n" +
"}\n" +
".syndieBlogPostHeader {\n" +
" background-color: #BBB;\n" +
" background-color: #BBB;\n" +
" padding: 2px;\n" +
"}\n" +
".syndieBlogPostSubject {\n" +
" text-align: left;\n" +
" font-weight: bold;\n" +
"}\n" +
".syndieBlogPostFrom {\n" +
" text-align: right;\n" +
" text-align: right;\n" +
"}\n" +
".syndieBlogPostSummary {\n" +
" background-color: #FFFFFF;\n" +
" background-color: #FFFFFF;\n" +
" padding: 2px;\n" +
"}\n" +
".syndieBlogPostDetails {\n" +
" background-color: #DDD;\n" +
" background-color: #DDD;\n" +
" padding: 2px;\n" +
"}\n" +
".syndieBlogNav {\n" +
" text-align: center;\n" +
" text-align: center;\n" +
"}\n" +
".syndieBlogComments {\n" +
" border: none;\n" +
" margin-top: 5px;\n" +
" margin-left: 0px;\n" +
" float: left;\n" +
" border: none;\n" +
" margin-top: 5px;\n" +
" margin-left: 0px;\n" +
" float: left;\n" +
"}\n" +
".syndieBlogComments ul {\n" +
" list-style: none;\n" +
" margin-left: 10px;\n" +
" padding-left: 0;\n" +
" list-style: none;\n" +
" margin-left: 10px;\n" +
"}\n" +
".syndieBlogCommentInfoGroup {\n" +
" text-align: left;\n" +
" font-size: 80%;\n" +
//" background-color: #FFEA9F;\n" +
//" border: solid;\n" +
//" border-width: 1px 1px 1px 1px;\n" +
//" border-color: #000;\n" +
//" margin-top: 5px;\n" +
" margin-right: 5px;\n" +
" font-size: 0.8em;\n" +
" margin-right: 5px;\n" +
"}\n" +
".syndieBlogCommentInfoGroup ol {\n" +
" list-style: none;\n" +
" margin-left: 0;\n" +
" margin-top: 0;\n" +
" margin-bottom: 0;\n" +
" padding-left: 0;\n" +
" list-style: none;\n" +
"}\n" +
".syndieBlogCommentInfoGroup li {\n" +
" margin: 0;\n" +
"}\n" +
".syndieBlogCommentInfoGroup li a {\n" +
" display: block;\n" +
" display: block;\n" +
"}\n" +
".syndieBlogCommentInfoGroupName {\n" +
" font-size: 80%;\n" +
" font-weight: bold;\n" +
" font-size: 0.8em;\n" +
" font-weight: bold;\n" +
"}\n";
protected String getTitle() { return "unused"; }
protected void renderServletDetails(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index,
int threadOffset, BlogURI visibleEntry, Archive archive) throws IOException {

231
apps/syndie/jsp/syndie.css
View File

@ -1,143 +1,88 @@
body {
margin : 0px;
padding : 0px;
font-family: Arial, Helvetica, sans-serif;
background-color : #EEEEEE;
color: #000000;
}
.b_topnavUser {
text-align: right;
background-color: #CCCCDD;
border-spacing: 0px;
margin: 0px;
padding: 0px;
border-width: 0px;
border: 0px;
}
.b_topnavHome {
background-color: #CCCCDD;
color: #000000;
width: 50px;
text-align: left;
}
.b_topnav {
background-color: #CCCCDD;
border-spacing: 0px;
margin: 0px;
padding: 0px;
border-width: 0px;
border: 0px;
}
.b_content {
border: 0px;
border-spacing: 0px;
margin: 0px;
}
.s_summary_overall {
border: 0px;
border-spacing: 0px;
margin: 0px;
}
.s_detail_overall {
border: 0px;
border-spacing: 0px;
margin: 0px;
}
.s_detail_subject {
font-size: 80%;
text-align: left;
background-color: #BBBBFF;
border-spacing: 0px;
margin: 0px;
padding: 0px;
border-width: 0px;
border: 0px;
border-style: none;
}
.s_detail_quote {
margin-left: 1em;
border-width: 1px;
border-color: #DBDBDB;
border-style: solid;
background-color: #E0E0E0;
}
.s_detail_italic {
font-style: italic;
}
.s_detail_bold {
font-style: normal;
font-weight: bold;
}
.s_detail_underline {
font-style: normal;
text-decoration: underline;
}
.s_detail_meta {
font-size: 80%;
text-align: right;
background-color: #BBBBFF;
border-spacing: 0px;
margin: 0px;
padding: 0px;
border-width: 0px;
border: 0px;
border-style: none;
}
.s_summary_subject {
font-size: 80%;
text-align: left;
background-color: #BBBBFF;
border-spacing: 0px;
margin: 0px;
padding: 0px;
border-width: 0px;
border: 0px;
border-style: none;
}
.s_summary_meta {
font-size: 80%;
text-align: right;
background-color: #BBBBFF;
border-spacing: 0px;
margin: 0px;
padding: 0px;
border-width: 0px;
border: 0px;
border-style: none;
}
.s_summary_quote {
margin-left: 1em;
border-width: 1px;
border-color: #DBDBDB;
border-style: solid;
background-color: #E0E0E0;
}
.s_summary_italic {
font-style: italic;
}
.s_summary_bold {
font-style: normal;
font-weight: bold;
}
.s_summary_underline {
font-style: normal;
text-decoration: underline;
}
.s_summary_summDetail {
font-size: 80%;
}
.s_detail_summDetail {
}
.s_detail_summDetailBlog {
}
.s_detail_summDetailBlogLink {
}
td.s_detail_summDetail {
background-color: #DDDDFF;
}
td.s_summary_summ {
font-size: 80%;
background-color: #DDDDFF;
}
.b_topnavUser {
text-align: right;
background-color: #CCCCDD;
}
.b_topnavHome {
background-color: #CCCCDD;
color: #000000;
width: 50px;
text-align: left;
}
.b_topnav {
background-color: #CCCCDD;
}
.b_content {
}
.s_summary_overall {
}
.s_detail_overall {
}
.s_detail_subject {
font-size: 0.8em;
text-align: left;
background-color: #BBBBFF;
}
.s_detail_quote {
margin-left: 1em;
border: 1px solid #DBDBDB;
background-color: #E0E0E0;
}
.s_detail_italic {
font-style: italic;
}
.s_detail_bold {
font-style: normal;
font-weight: bold;
}
.s_detail_underline {
font-style: normal;
text-decoration: underline;
}
.s_detail_meta {
font-size: 0.8em;
text-align: right;
background-color: #BBBBFF;
}
.s_summary_subject {
font-size: 0.8em;
text-align: left;
background-color: #BBBBFF;
}
.s_summary_meta {
font-size: 0.8em;
text-align: right;
background-color: #BBBBFF;
}
.s_summary_quote {
margin-left: 1em;
border-width: 1px solid #DBDBDB;
background-color: #E0E0E0;
}
.s_summary_italic {
font-style: italic;
}
.s_summary_bold {
font-style: normal;
font-weight: bold;
}
.s_summary_underline {
font-style: normal;
text-decoration: underline;
}
.s_summary_summDetail {
font-size: 0.8em;
}
.s_detail_summDetail {
}
.s_detail_summDetailBlog {
}
.s_detail_summDetailBlogLink {
}
td.s_detail_summDetail {
background-color: #DDDDFF;
}
td.s_summary_summ {
font-size: 0.8em;
background-color: #DDDDFF;
}

8
history.txt
View File

@ -1,4 +1,10 @@
$Id: history.txt,v 1.383 2006/01/11 15:32:36 jrandom Exp $
$Id: history.txt,v 1.384 2006/01/11 18:19:38 jrandom Exp $
2005-01-12 cervantes
* Syndie CSS tweaks to removed some redundant declarations, improve font
scaling and layout robustness. Improved cross browser compatibility
(in other words "kicked IE"). Tightened the look of the blog template
a little.
2005-01-11 Complication
* CSS comment fixes

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.328 $ $Date: 2006/01/10 01:59:08 $";
public final static String ID = "$Revision: 1.329 $ $Date: 2006/01/11 15:32:36 $";
public final static String VERSION = "0.6.1.8";
public final static long BUILD = 12;
public final static long BUILD = 13;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);