From d397bbe93587f015cd8db0dbf16ef6d1c1aef78b Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 10 Jun 2001 15:01:20 +0000 Subject: This a rather large commit that needs a lot of fine-tuning. If you update, you'll break your site as you need switching from structure to index.module: so this can be considered an intermediate commit. If you upgrade, and you are welcome to, just create a collection called "section" (for now) and assign your nodes some attributes in the described format. Feedback and bugreports are welcomed. Questions will be answered. CHANGES: - comment system: + when replying to a node (rather then to a comment), that node is displayed above the reply form. + when replying to a comment (rather then to a node), that comment is displayd above the reply form. - removed structure.inc, removed structure.module. - node.inc: + added 2 new node functions called 'node_attribute_edit()' and 'node_attribute_save()' used to 'hook in' any indexing system including your home-brewed stuff if you'd want to. Currently, index.module is the facto default index system. See story.module for usage. - book.module, story.module, poll.module, page.module, forum.module: + added preview functionality to administration section (via node module). + removed all references to structure.inc (category, topic). - moderate.module: + removed all references to structure.inc (category, topic). - book.module, story.module, page.module, forum.module: + increased the sizes of some textareas. - submit.php: + removed all references to structure.inc (category, topic). - marvin.theme: + removed dead code: function story() was depricated. - unconed.theme: + removed hardcoded references to drop.org. - marvin.theme, unconed.theme, jeroen.theme, yaroon.theme, example.theme: + removed all references to structure.inc (category, topic). TODO: - file.module, trip_link.module: + update preview functionality: see story.module for example. + remove references to 'cid' and 'tid', use 'attribute' instead: see story.module for example. - extend and build upon index.module as well as making it configurable --- themes/example/example.theme | 4 ++-- themes/goofy/goofy.theme | 9 ++------- themes/jeroen/jeroen.theme | 6 +++--- themes/marvin/marvin.theme | 27 ++------------------------- themes/unconed/unconed.theme | 4 +--- themes/yaroon/yaroon.theme | 4 ++-- 6 files changed, 12 insertions(+), 42 deletions(-) (limited to 'themes') diff --git a/themes/example/example.theme b/themes/example/example.theme index ad8a92cff..caa3c9518 100644 --- a/themes/example/example.theme +++ b/themes/example/example.theme @@ -10,7 +10,7 @@ *********************************************************************/ class Theme extends BaseTheme { - // General colorset that can be used for this theme + // General colorset that can be used for this theme var $foreground = "#000000"; var $background = "#FFFFFF"; @@ -69,7 +69,7 @@ cid) ." / ". topic_name($node->tid); + echo node_index($node->attribute); ?> diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme index c51d438a7..56c28dd78 100644 --- a/themes/goofy/goofy.theme +++ b/themes/goofy/goofy.theme @@ -12,7 +12,7 @@ *********************************************************************/ class Theme extends BaseTheme { - // General colorset that can be used for this theme + // General colorset that can be used for this theme var $foreground = "#000000"; var $background = "#FFFFFF"; @@ -103,13 +103,12 @@ function c(subject,mod,author,date,body) {document.writeln("title\" -->\n"; $title = check_output($node->title); $subleft = strtr(t("Submitted by %a on %b"), array("%a" => format_username($node->userid), "%b" => format_date($node->timestamp, "large"))); - $subright = category_name($node->cid) ." / ". topic_name($node->tid); + $subright = node_index($node->attribute); $body = check_output($node->body, 1) . ($main || $links ? "
" . $this->links($links, $main, $node) . "
" : ""); print "\n"; } // close node function - function comment($comment, $link = "") { echo "cid\">\n"; @@ -125,7 +124,6 @@ function c(subject,mod,author,date,body) {document.writeln("
diff --git a/themes/jeroen/jeroen.theme b/themes/jeroen/jeroen.theme index 56eea6346..26bb678b5 100644 --- a/themes/jeroen/jeroen.theme +++ b/themes/jeroen/jeroen.theme @@ -10,10 +10,10 @@ *********************************************************************/ class Theme extends BaseTheme { - // General colorset that can be used for this theme + // General colorset that can be used for this theme var $foreground = "#000000"; var $background = "#E7E7E7"; - + /* I am going to use some colors throughout this theme: #000000 : black used for all links and the table in every box you'll see, I use it to create the thin black border around each. @@ -122,7 +122,7 @@ ". category_name($node->cid) ." / ". topic_name($node->tid) .""; + echo " diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index ab76f8fe1..108f4acfc 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -13,7 +13,7 @@ class Theme extends BaseTheme { var $link = "#666699"; - // General colorset that can be used for this theme + // General colorset that can be used for this theme var $foreground = "#000000"; var $background = "#EAEAEA"; @@ -48,29 +48,6 @@ title\" -->\n"; - print "
". node_index($node->attribute) .""; ?>
\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - if ($main || $links) print " \n"; - print "
\"\"   ". check_output($story->title) ."
\"\"
\n"; - print " ". strtr(t("Submitted by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?>". category_name($story->cid) ." / ". topic_name($story->tid) ."\n"; - print "
 
\n"; - if ($story->abstract) print "

". check_output($story->abstract, 1) ."

\n"; - if (!$main && $story->body) print "

". check_output($story->body, 1) ."

\n"; - print "
 
". $this->links($links, $main, $node) ."
\n"; - print "

\n\n"; - } - function node($node, $main = 0, $links = 0) { print "\n\n"; print "\n"; @@ -78,7 +55,7 @@ print " \n"; print " \n"; print " \n"; print " \n"; print " \n"; diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index 54c938dd5..cd20fe3ab 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -42,8 +42,6 @@ <?php echo variable_get(site_name, "drupal"); ?> - -
\"\"
\n"; - print " ". strtr(t("Submitted by %a on %b"), array("%a" => format_username($node->userid), "%b" => format_date($node->timestamp, "large"))); ?>". category_name($node->cid) ." / ". topic_name($node->tid) ."\n"; + print " ". strtr(t("Submitted by %a on %b"), array("%a" => format_username($node->userid), "%b" => format_date($node->timestamp, "large"))); ?>". node_index($node->attribute) ."\n"; print "