diff options
| -rw-r--r-- | includes/common.inc | 6 | ||||
| -rw-r--r-- | misc/drupal.css | 51 | ||||
| -rw-r--r-- | modules/book.module | 86 | ||||
| -rw-r--r-- | modules/book/book.module | 86 | ||||
| -rw-r--r-- | modules/forum.module | 18 | ||||
| -rw-r--r-- | modules/forum/forum.module | 18 | ||||
| -rw-r--r-- | modules/locale.module | 2 | ||||
| -rw-r--r-- | modules/locale/locale.module | 2 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.css | 22 |
9 files changed, 174 insertions, 117 deletions
diff --git a/includes/common.inc b/includes/common.inc index 80ab6ee4c..234309459 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -202,8 +202,8 @@ function variable_del($name) { unset($conf[$name]); } -function drupal_specialchars($input) { - return htmlspecialchars($input, ENT_NOQUOTES, "utf-8"); +function drupal_specialchars($input, $quotes = ENT_NOQUOTES) { + return htmlspecialchars($input, $quotes, "utf-8"); } function table_cell($cell, $header = 0) { @@ -489,7 +489,7 @@ function check_url($uri) { } function check_form($text) { - return htmlspecialchars($text); + return drupal_specialchars($text, 0); } function check_query($text) { diff --git a/misc/drupal.css b/misc/drupal.css index 96065b78c..9c176684b 100644 --- a/misc/drupal.css +++ b/misc/drupal.css @@ -1,11 +1,6 @@ form { margin: 0; padding: 0;} -th { - text-align: left; - padding-right: 1em; - border-bottom: 1px solid #ccc; -} - +th { text-align: left; padding-right: 1em; border-bottom: 1px solid #ccc; } #tracker table { border-collapse: collapse; } #tracker td { vertical-align: top; padding: 1em; } @@ -16,14 +11,26 @@ th { #pager { text-align: center; } #pager div { padding: 0.5em; } -.queue-user-numeral { color: red; } +.book { margin-bottom: 2em; } +.book hr { clear: both; border: 0; height: 1px; background-color: #888; color: #888; } +.book .title { font-weight: bold; font-size: 1.3em; } +.book .last-updated { font-size: 0.8em; margin-top: 0.25em; } +.book .body { margin: 1em 0 3em 0; } +.book .links { clear: both; border-top: 1px solid #888; padding-top: 0.5em; } + +.book .nav { margin: 1em 0; clear: both; } +.book .nav .prev { float: left; width: 45%; padding-bottom: 0.5em; } +.book .nav .next { float: right; text-align: right; width: 45%; padding-bottom: 0.5em; } +.book .nav .up { text-align: center; } +.book .nav .titles { clear: both; } .calendar .row-week td a { display: block; } .calendar .row-week td a:hover { background-color: #888; color: #fff; } .calendar a { text-decoration: none; } .calendar a:hover { text-decoration: none; } .calendar table { border-collapse: collapse; width: 100%; } -.calendar td { text-align: center; border: 1px solid #000; padding: 1px; margin: 0; font-size: 0.8em; } +.calendar td { text-align: center; border: 1px solid #000; + padding: 1px; margin: 0; font-size: 0.8em; } .container-inline div { display: inline; } @@ -48,23 +55,17 @@ th { .poll .vote-form .choices { text-align: left; margin: 0 auto; display: table; } -.node-form .form-text { display: block; width: 95%; } -.node-form textarea { display: block; width: 95%; } - -.node-form .standard { - clear: both; -} -.node-form .admin .form-item .title { - margin-top: 0; -} -.node-form .admin .authored .form-item { - margin-bottom: 1.1em; -} -.node-form .admin .authored .form-text { width: auto; } - -.node-form .admin .authored, .node-form .admin .options, .node-form .admin .extra { - float: left; margin-right: 2em; margin-bottom: 1em; -} +.queue-user-numeral { color: red; } + +.node-form .form-text { display: block; width: 95%; } +.node-form textarea { display: block; width: 95%; } +.node-form .standard { clear: both; } +.node-form .admin .form-item .title { margin-top: 0; } +.node-form .admin .authored .form-item { margin-bottom: 1.1em; } +.node-form .admin .authored .form-text { width: auto; } +.node-form .admin .authored, +.node-form .admin .options, +.node-form .admin .extra { float: left; margin-right: 2em; margin-bottom: 1em; } .marker { color: #f00; } .error { color: #f00; } diff --git a/modules/book.module b/modules/book.module index e2e81fae6..2f4c0ec6a 100644 --- a/modules/book.module +++ b/modules/book.module @@ -410,40 +410,55 @@ function book_view($node, $main = 0) { $next = book_next($node); } - $output .= "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\" width=\"100%\">"; - - if ($node->title) { - // build the tree from bottom to top to have the book index in $level for navigation later - $path = array_reverse(book_location($node)); - $i = count($path); - foreach ($path as $level) { - $indent = str_repeat("-", --$i); - $location = "$indent ". l($level->title, "node/view/$level->nid") ."<br />". $location; - } - - $output .= " <tr><td colspan=\"3\">$location</td></tr>"; - $output .= " <tr><td colspan=\"3\"><hr /></td></tr>"; - $output .= " <tr><td colspan=\"3\"><b><big>$node->title</big></b>". ($node->body ? "<br /><small><i>". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->created))) ."</i></small> " : "") ."</td></tr>"; + // build the tree from bottom to top to have the book index in $level for navigation later + $path = book_location($node); + foreach ($path as $level) { + $trail[] = l($level->title, "node/view/$level->nid"); } - if ($node->body) { - $output .= " <tr><td colspan=\"3\"><br />$node->body</td></tr>"; + $output .= "<div class=\"book\">"; + if ($trail) { + $output .= "<div class=\"location\">". implode($trail, " » ") ."</div><hr />"; } + $output .= "<div class=\"title\">$node->title</div>"; + $output .= "<div class=\"last-updated\">". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->changed))) ."</div>"; + + $output .= "<div class=\"body\">$node->body</div>"; if ($node->moderate) { - $output .= " <tr><td colspan=\"3\"><hr /><b>". t("Log") .":</b><br />$node->log</td></tr>"; + $output .= "<div class=\"log\"><div class=\"title\">". t("Log") .":</div>$node->log</div>"; } if ($node->nid) { - $output .= " <tr><td colspan=\"3\"><br />". book_tree($node->nid) ."</td></tr>"; + $output .= "<div class=\"tree\">". book_tree($node->nid) ."</div>"; + if ($prev) { + $links .= "<div class=\"prev\">"; + $links .= l(t("previous"), "node/view/$prev->nid", array("title" => t("View the previous page in this book."))); + $links .= "</div>"; + $titles .= "<div class=\"prev\">$prev->title</div>"; + } + if ($next) { + $links .= "<div class=\"next\">"; + $links .= l(t("next"), "node/view/$next->nid", array("title" => t("View the next page in this book."))); + $links .= "</div>"; + $titles .= "<div class=\"next\">$next->title</div>"; + } + if ($node->parent) { + $links .= "<div class=\"up\">"; + $links .= l(t("up"), "node/view/$node->parent", array("title" => t("View this page's parent section."))); + if ($node->parent != $level->nid) { + $links .= " | "; + $links .= l(t("index"), "node/view/$level->nid", array("title" => t("View this book's table of contents."))); + } + $links .= "</div>"; + } + $output .= "<div class=\"nav\">"; + $output .= "<div class=\"links\">$links</div>"; + $output .= "<div class=\"titles\">$titles</div>"; + $output .= "</div>"; } - - $output .= " <tr><td colspan=\"3\"><hr /></td></tr>"; - $output .= " <tr><td align=\"left\" width=\"33%\">". ($prev ? l(t("previous"), "node/view/$prev->nid", array("title" => t("View the previous page in this book."))) : " ") ."</td><td align=\"center\" width=\"34%\">". ($node->parent ? l(t("up"), "node/view/$node->parent", array("title" => t("View this page's parent section."))) : " ") ."</td><td align=\"right\" width=\"33%\">". ($next ? l(t("next"), "node/view/$next->nid", array("title" => t("View the next page in this book."))) : " ") ."</td></tr>"; - $output .= " <tr><td align=\"left\" width=\"33%\">". ($prev ? "<small>$prev->title</small>" : " ") ."</td><td align=\"center\" width=\"34%\">". ($node->parent && $node->parent != $level->nid ? l(t("index"), "node/view/$level->nid", array("title" => t("View this book's table of contents."))) : " ") ."</td><td align=\"right\" width=\"33%\">". ($next ? "<small>$next->title</small>" : " ") ."</td></tr>"; - $output .= " <tr><td colspan=\"3\"><hr /></td></tr>"; - $output .= " <tr><td colspan=\"3\" align=\"right\"><div style=\"margin: 10 10 10 10;\">". theme("links", link_node($node, $main)) ."</div></td></tr>"; - $output .= "</table>"; + $output .= "<div class=\"links\">". theme("links", link_node($node, $main)) ."</div>"; + $output .= "</div>"; theme("box", t("Handbook"), $output); } @@ -541,12 +556,15 @@ function book_render() { if ($node) { // output the content: - $output .= "<dt>". l($node->title, "node/view/$node->nid") ."</dt><dd>". book_body($node) ."<br /><br /></dd>"; + $output .= "<div class=\"book\">"; + $output .= "<div class=\"title\">". l($node->title, "node/view/$node->nid") ."</div>"; + $output .= "<div class=\"body\">". book_body($node) ."</div>"; + $output .= "</div>"; } } theme("header"); - theme("box", t("Handbook"), "<dl>$output</dl>"); + theme("box", t("Handbook"), "$output"); theme("footer"); } @@ -570,6 +588,7 @@ function book_page() { } function book_print($id = "", $depth = 1) { + global $base_url; $result = db_query("SELECT n.nid FROM node n INNER JOIN book b ON n.nid = b.nid WHERE n.status = 1 AND n.nid = %d AND (n.moderate = 0 OR n.revisions IS NOT NULL) ORDER BY b.weight, n.title", $id); while ($page = db_fetch_object($result)) { @@ -583,17 +602,22 @@ function book_print($id = "", $depth = 1) { if ($node) { // output the content: - $output .= "<h$depth>$node->title</h$depth>"; + $output .= "<h1 id=\"$node->nid\" name=\"$node->nid\" class=\"book-h$depth\">$node->title</h1>"; if ($node->body) { - $output .= "<ul>". book_body($node) ."</ul>"; + $output .= book_body($node); } } } $output .= book_print_recurse($id, $depth); - return $output; + $html = "<html><head><title>$node->title</title>"; + $html .= "<base href=\"$base_url/\" />"; + $html .= "<style type=\"text/css\">\n@import url(misc/print.css);\n</style>"; + $html .= "</head><body>". $output ."</body></html>"; + + return $html; } function book_print_recurse($parent = "", $depth = 1) { @@ -610,7 +634,7 @@ function book_print_recurse($parent = "", $depth = 1) { if ($node) { // output the content: - $output .= "<h$depth>$node->title</h$depth>"; + $output .= "<h1 id=\"$node->nid\" name=\"$node->nid\" class=\"book-h$depth\">$node->title</h1>"; if ($node->body) { $output .= "<ul>". book_body($node) ."</ul>"; diff --git a/modules/book/book.module b/modules/book/book.module index e2e81fae6..2f4c0ec6a 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -410,40 +410,55 @@ function book_view($node, $main = 0) { $next = book_next($node); } - $output .= "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\" width=\"100%\">"; - - if ($node->title) { - // build the tree from bottom to top to have the book index in $level for navigation later - $path = array_reverse(book_location($node)); - $i = count($path); - foreach ($path as $level) { - $indent = str_repeat("-", --$i); - $location = "$indent ". l($level->title, "node/view/$level->nid") ."<br />". $location; - } - - $output .= " <tr><td colspan=\"3\">$location</td></tr>"; - $output .= " <tr><td colspan=\"3\"><hr /></td></tr>"; - $output .= " <tr><td colspan=\"3\"><b><big>$node->title</big></b>". ($node->body ? "<br /><small><i>". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->created))) ."</i></small> " : "") ."</td></tr>"; + // build the tree from bottom to top to have the book index in $level for navigation later + $path = book_location($node); + foreach ($path as $level) { + $trail[] = l($level->title, "node/view/$level->nid"); } - if ($node->body) { - $output .= " <tr><td colspan=\"3\"><br />$node->body</td></tr>"; + $output .= "<div class=\"book\">"; + if ($trail) { + $output .= "<div class=\"location\">". implode($trail, " » ") ."</div><hr />"; } + $output .= "<div class=\"title\">$node->title</div>"; + $output .= "<div class=\"last-updated\">". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->changed))) ."</div>"; + + $output .= "<div class=\"body\">$node->body</div>"; if ($node->moderate) { - $output .= " <tr><td colspan=\"3\"><hr /><b>". t("Log") .":</b><br />$node->log</td></tr>"; + $output .= "<div class=\"log\"><div class=\"title\">". t("Log") .":</div>$node->log</div>"; } if ($node->nid) { - $output .= " <tr><td colspan=\"3\"><br />". book_tree($node->nid) ."</td></tr>"; + $output .= "<div class=\"tree\">". book_tree($node->nid) ."</div>"; + if ($prev) { + $links .= "<div class=\"prev\">"; + $links .= l(t("previous"), "node/view/$prev->nid", array("title" => t("View the previous page in this book."))); + $links .= "</div>"; + $titles .= "<div class=\"prev\">$prev->title</div>"; + } + if ($next) { + $links .= "<div class=\"next\">"; + $links .= l(t("next"), "node/view/$next->nid", array("title" => t("View the next page in this book."))); + $links .= "</div>"; + $titles .= "<div class=\"next\">$next->title</div>"; + } + if ($node->parent) { + $links .= "<div class=\"up\">"; + $links .= l(t("up"), "node/view/$node->parent", array("title" => t("View this page's parent section."))); + if ($node->parent != $level->nid) { + $links .= " | "; + $links .= l(t("index"), "node/view/$level->nid", array("title" => t("View this book's table of contents."))); + } + $links .= "</div>"; + } + $output .= "<div class=\"nav\">"; + $output .= "<div class=\"links\">$links</div>"; + $output .= "<div class=\"titles\">$titles</div>"; + $output .= "</div>"; } - - $output .= " <tr><td colspan=\"3\"><hr /></td></tr>"; - $output .= " <tr><td align=\"left\" width=\"33%\">". ($prev ? l(t("previous"), "node/view/$prev->nid", array("title" => t("View the previous page in this book."))) : " ") ."</td><td align=\"center\" width=\"34%\">". ($node->parent ? l(t("up"), "node/view/$node->parent", array("title" => t("View this page's parent section."))) : " ") ."</td><td align=\"right\" width=\"33%\">". ($next ? l(t("next"), "node/view/$next->nid", array("title" => t("View the next page in this book."))) : " ") ."</td></tr>"; - $output .= " <tr><td align=\"left\" width=\"33%\">". ($prev ? "<small>$prev->title</small>" : " ") ."</td><td align=\"center\" width=\"34%\">". ($node->parent && $node->parent != $level->nid ? l(t("index"), "node/view/$level->nid", array("title" => t("View this book's table of contents."))) : " ") ."</td><td align=\"right\" width=\"33%\">". ($next ? "<small>$next->title</small>" : " ") ."</td></tr>"; - $output .= " <tr><td colspan=\"3\"><hr /></td></tr>"; - $output .= " <tr><td colspan=\"3\" align=\"right\"><div style=\"margin: 10 10 10 10;\">". theme("links", link_node($node, $main)) ."</div></td></tr>"; - $output .= "</table>"; + $output .= "<div class=\"links\">". theme("links", link_node($node, $main)) ."</div>"; + $output .= "</div>"; theme("box", t("Handbook"), $output); } @@ -541,12 +556,15 @@ function book_render() { if ($node) { // output the content: - $output .= "<dt>". l($node->title, "node/view/$node->nid") ."</dt><dd>". book_body($node) ."<br /><br /></dd>"; + $output .= "<div class=\"book\">"; + $output .= "<div class=\"title\">". l($node->title, "node/view/$node->nid") ."</div>"; + $output .= "<div class=\"body\">". book_body($node) ."</div>"; + $output .= "</div>"; } } theme("header"); - theme("box", t("Handbook"), "<dl>$output</dl>"); + theme("box", t("Handbook"), "$output"); theme("footer"); } @@ -570,6 +588,7 @@ function book_page() { } function book_print($id = "", $depth = 1) { + global $base_url; $result = db_query("SELECT n.nid FROM node n INNER JOIN book b ON n.nid = b.nid WHERE n.status = 1 AND n.nid = %d AND (n.moderate = 0 OR n.revisions IS NOT NULL) ORDER BY b.weight, n.title", $id); while ($page = db_fetch_object($result)) { @@ -583,17 +602,22 @@ function book_print($id = "", $depth = 1) { if ($node) { // output the content: - $output .= "<h$depth>$node->title</h$depth>"; + $output .= "<h1 id=\"$node->nid\" name=\"$node->nid\" class=\"book-h$depth\">$node->title</h1>"; if ($node->body) { - $output .= "<ul>". book_body($node) ."</ul>"; + $output .= book_body($node); } } } $output .= book_print_recurse($id, $depth); - return $output; + $html = "<html><head><title>$node->title</title>"; + $html .= "<base href=\"$base_url/\" />"; + $html .= "<style type=\"text/css\">\n@import url(misc/print.css);\n</style>"; + $html .= "</head><body>". $output ."</body></html>"; + + return $html; } function book_print_recurse($parent = "", $depth = 1) { @@ -610,7 +634,7 @@ function book_print_recurse($parent = "", $depth = 1) { if ($node) { // output the content: - $output .= "<h$depth>$node->title</h$depth>"; + $output .= "<h1 id=\"$node->nid\" name=\"$node->nid\" class=\"book-h$depth\">$node->title</h1>"; if ($node->body) { $output .= "<ul>". book_body($node) ."</ul>"; diff --git a/modules/forum.module b/modules/forum.module index 23232b85d..268746f30 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -484,7 +484,7 @@ function forum_page() { $topics = forum_get_topics($tid, $sortby, $forum_per_page); } - theme("forum_render", $forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset); + theme("forum_theme_display", $forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset); } else { theme("header"); @@ -500,27 +500,27 @@ function forum_page() { } /* -** Render functions. +** Theme functions */ -function forum_render($forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset) { +function forum_theme_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset) { // forum list, topics list, topic browser and "add new topic" link - $output .= theme("forum_forum_list", $forums, $parents, $tid); + $output .= theme("forum_theme_list", $forums, $parents, $tid); if ($tid && !in_array($tid, variable_get("forum_containers", array()))) { - $output .= theme("forum_topic_list", $tid, $topics, $sortby, $forum_per_page, $offset); + $output .= theme("forum_theme_topic_list", $tid, $topics, $sortby, $forum_per_page, $offset); } theme("header"); theme("box", t("Discussion forum"), $output); if ($tid && !in_array($tid, variable_get("forum_containers", array()))) { - theme("box", t("Control panel"), theme("forum_topic_browser", $sortby, $forum_per_page, $offset)); + theme("box", t("Control panel"), theme("forum_theme_topic_browser", $sortby, $forum_per_page, $offset)); } theme("footer"); } -function forum_forum_list($forums, $parents, $tid) { +function forum_theme_list($forums, $parents, $tid) { global $user; if ($parents) { foreach($parents as $p) { @@ -572,7 +572,7 @@ function forum_forum_list($forums, $parents, $tid) { return $output; } -function forum_topic_browser() { +function forum_theme_topic_browser() { global $tid, $sortby, $forum_per_page, $offset; if (empty($sortby)) { @@ -601,7 +601,7 @@ function forum_topic_browser() { return form(form_item(t("Topic viewing options"), $output, t("Select your preferred way to display the topics and click 'Update settings'."))); } -function forum_topic_list($tid, $topics, $sortby, $forum_per_page, $offset) { +function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset) { global $id, $status, $user, $pager_total; if ($topics) { diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 23232b85d..268746f30 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -484,7 +484,7 @@ function forum_page() { $topics = forum_get_topics($tid, $sortby, $forum_per_page); } - theme("forum_render", $forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset); + theme("forum_theme_display", $forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset); } else { theme("header"); @@ -500,27 +500,27 @@ function forum_page() { } /* -** Render functions. +** Theme functions */ -function forum_render($forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset) { +function forum_theme_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset) { // forum list, topics list, topic browser and "add new topic" link - $output .= theme("forum_forum_list", $forums, $parents, $tid); + $output .= theme("forum_theme_list", $forums, $parents, $tid); if ($tid && !in_array($tid, variable_get("forum_containers", array()))) { - $output .= theme("forum_topic_list", $tid, $topics, $sortby, $forum_per_page, $offset); + $output .= theme("forum_theme_topic_list", $tid, $topics, $sortby, $forum_per_page, $offset); } theme("header"); theme("box", t("Discussion forum"), $output); if ($tid && !in_array($tid, variable_get("forum_containers", array()))) { - theme("box", t("Control panel"), theme("forum_topic_browser", $sortby, $forum_per_page, $offset)); + theme("box", t("Control panel"), theme("forum_theme_topic_browser", $sortby, $forum_per_page, $offset)); } theme("footer"); } -function forum_forum_list($forums, $parents, $tid) { +function forum_theme_list($forums, $parents, $tid) { global $user; if ($parents) { foreach($parents as $p) { @@ -572,7 +572,7 @@ function forum_forum_list($forums, $parents, $tid) { return $output; } -function forum_topic_browser() { +function forum_theme_topic_browser() { global $tid, $sortby, $forum_per_page, $offset; if (empty($sortby)) { @@ -601,7 +601,7 @@ function forum_topic_browser() { return form(form_item(t("Topic viewing options"), $output, t("Select your preferred way to display the topics and click 'Update settings'."))); } -function forum_topic_list($tid, $topics, $sortby, $forum_per_page, $offset) { +function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset) { global $id, $status, $user, $pager_total; if ($topics) { diff --git a/modules/locale.module b/modules/locale.module index 99f374d36..5a60c6162 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -103,7 +103,7 @@ function locale_edit($lid) { $result = db_query("SELECT * FROM locales WHERE lid = '$lid'"); if ($translation = db_fetch_object($result)) { - $form .= form_item(t("Original text"), wordwrap(htmlspecialchars($translation->string))); + $form .= form_item(t("Original text"), wordwrap(drupal_specialchars($translation->string, 0))); foreach ($languages as $code=>$language) { $form .= (strlen($translation->string) > 30) ? form_textarea($language, $code, $translation->$code, 50, 10) : form_textfield($language, $code, $translation->$code, 50, 128); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 99f374d36..5a60c6162 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -103,7 +103,7 @@ function locale_edit($lid) { $result = db_query("SELECT * FROM locales WHERE lid = '$lid'"); if ($translation = db_fetch_object($result)) { - $form .= form_item(t("Original text"), wordwrap(htmlspecialchars($translation->string))); + $form .= form_item(t("Original text"), wordwrap(drupal_specialchars($translation->string, 0))); foreach ($languages as $code=>$language) { $form .= (strlen($translation->string) > 30) ? form_textarea($language, $code, $translation->$code, 50, 10) : form_textfield($language, $code, $translation->$code, 50, 128); diff --git a/themes/xtemplate/xtemplate.css b/themes/xtemplate/xtemplate.css index da7d1f247..0a5ae31c7 100644 --- a/themes/xtemplate/xtemplate.css +++ b/themes/xtemplate/xtemplate.css @@ -27,13 +27,15 @@ a { font-weight: normal; } a:link { - color: #378CE0; + color: #069; + text-decoration: underline; } a:visited { - color: #036; + color: #000; + text-decoration: underline; } a:hover { - text-decoration: underline; + color: #39C; } p { margin: 0 0 1em 0; @@ -97,7 +99,7 @@ img { #main { padding: 1em; } -#message, #main .node .content { +#message, #main .node .content, .comment .content { line-height: 1.4; } #sidebar { @@ -113,9 +115,12 @@ img { table { font-size: 1em; } -.node, .block, .box { +.block, .box { padding: 0 0 1.5em 0; } +.node { + padding: 0 0 2.5em 0; +} .comment { border: 1px solid #ccc; padding: 1.5em 1.5em 1.5em 1.5em; @@ -149,7 +154,7 @@ table { padding-top: 0.5em; } .node .links, .comment .links { - padding-top: 1em; + padding-top: 0.5em; color: #999; } .node .links a, .comment .links a { @@ -214,6 +219,9 @@ table { pre { background-color: #eee; padding: 0.75em 1.5em; - font-size: 11px; + font-size: 12px; border: 1px solid #ddd; } +.content li { + padding-bottom: 0.25em; +} |