summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--database/database.mysql1
-rw-r--r--modules/page.module17
-rw-r--r--modules/page/page.module17
-rw-r--r--update.php7
4 files changed, 25 insertions, 17 deletions
diff --git a/database/database.mysql b/database/database.mysql
index bcfb4b0f0..bf205ca08 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -300,6 +300,7 @@ CREATE TABLE page (
nid int(10) unsigned NOT NULL default '0',
link varchar(128) NOT NULL default '',
format tinyint(2) NOT NULL default '0',
+ description varchar(128) NOT NULL default '',
PRIMARY KEY (nid),
KEY nid (nid)
) TYPE=MyISAM;
diff --git a/modules/page.module b/modules/page.module
index 41e8e55c0..6761fe505 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -32,7 +32,7 @@ function page_save($op, $node) {
}
if ($op == "create") {
- return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link");
+ return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link", "description");
}
if ($op == "decline") {
@@ -40,16 +40,16 @@ function page_save($op, $node) {
}
if ($op == "update") {
- return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link");
+ return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link", "description");
}
}
function page_insert($node) {
- db_query("INSERT INTO page (nid, format, link) VALUES ('$node->nid', '$node->format', '$node->link')");
+ db_query("INSERT INTO page (nid, format, link, description) VALUES ('$node->nid', '$node->format', '$node->link', '$node->description')");
}
function page_update($node) {
- db_query("UPDATE page SET format = '$node->format', link = '$node->link' WHERE nid = '$node->nid'");
+ db_query("UPDATE page SET format = '$node->format', link = '$node->link', description = '$node->description' WHERE nid = '$node->nid'");
}
function page_delete(&$node) {
@@ -57,16 +57,16 @@ function page_delete(&$node) {
}
function page_load($node) {
- $page = db_fetch_object(db_query("SELECT format, link FROM page WHERE nid = '$node->nid'"));
+ $page = db_fetch_object(db_query("SELECT format, link, description FROM page WHERE nid = '$node->nid'"));
return $page;
}
function page_link($type) {
if ($type == "page" && user_access("access content")) {
- $result = db_query("SELECT n.nid, n.title, p.link FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' ORDER BY p.link");
+ $result = db_query("SELECT n.nid, n.title, p.link, p.description FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' AND p.description != '' ORDER BY p.link");
while ($page = db_fetch_object($result)) {
- $links[] = l($page->link, array("id" => $page->nid), "node", "", array("title" => $page->title));
+ $links[] = l($page->link, array("id" => $page->nid), "node", "", array("title" => $page->description));
}
}
@@ -150,7 +150,8 @@ function page_form(&$node, &$help, &$error) {
}
$output .= form_textarea(t("Body"), "body", $node->body, 60, 20);
- $output .= form_textfield(t("Navigation link header"), "link", $node->link, 60, 64, t("To make the page show up on the navigation links enter the name of the link, otherwise leave blank."));
+ $output .= form_textfield(t("Link name"), "link", $node->link, 60, 64, t("To make the page show up in the navigation links, enter the name of the link, otherwise leave blank."));
+ $output .= form_textfield(t("Link description"), "description", $node->description, 60, 64, t("The description displayed when hovering over the page's link."));
$output .= form_select(t("Type"), "format", $node->format, array(0 => "HTML / text", 1 => "PHP"));
return $output;
diff --git a/modules/page/page.module b/modules/page/page.module
index 41e8e55c0..6761fe505 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -32,7 +32,7 @@ function page_save($op, $node) {
}
if ($op == "create") {
- return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link");
+ return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link", "description");
}
if ($op == "decline") {
@@ -40,16 +40,16 @@ function page_save($op, $node) {
}
if ($op == "update") {
- return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link");
+ return array("body" => filter($node->body), "teaser" => filter($node->teaser), "format", "link", "description");
}
}
function page_insert($node) {
- db_query("INSERT INTO page (nid, format, link) VALUES ('$node->nid', '$node->format', '$node->link')");
+ db_query("INSERT INTO page (nid, format, link, description) VALUES ('$node->nid', '$node->format', '$node->link', '$node->description')");
}
function page_update($node) {
- db_query("UPDATE page SET format = '$node->format', link = '$node->link' WHERE nid = '$node->nid'");
+ db_query("UPDATE page SET format = '$node->format', link = '$node->link', description = '$node->description' WHERE nid = '$node->nid'");
}
function page_delete(&$node) {
@@ -57,16 +57,16 @@ function page_delete(&$node) {
}
function page_load($node) {
- $page = db_fetch_object(db_query("SELECT format, link FROM page WHERE nid = '$node->nid'"));
+ $page = db_fetch_object(db_query("SELECT format, link, description FROM page WHERE nid = '$node->nid'"));
return $page;
}
function page_link($type) {
if ($type == "page" && user_access("access content")) {
- $result = db_query("SELECT n.nid, n.title, p.link FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' ORDER BY p.link");
+ $result = db_query("SELECT n.nid, n.title, p.link, p.description FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' AND p.description != '' ORDER BY p.link");
while ($page = db_fetch_object($result)) {
- $links[] = l($page->link, array("id" => $page->nid), "node", "", array("title" => $page->title));
+ $links[] = l($page->link, array("id" => $page->nid), "node", "", array("title" => $page->description));
}
}
@@ -150,7 +150,8 @@ function page_form(&$node, &$help, &$error) {
}
$output .= form_textarea(t("Body"), "body", $node->body, 60, 20);
- $output .= form_textfield(t("Navigation link header"), "link", $node->link, 60, 64, t("To make the page show up on the navigation links enter the name of the link, otherwise leave blank."));
+ $output .= form_textfield(t("Link name"), "link", $node->link, 60, 64, t("To make the page show up in the navigation links, enter the name of the link, otherwise leave blank."));
+ $output .= form_textfield(t("Link description"), "description", $node->description, 60, 64, t("The description displayed when hovering over the page's link."));
$output .= form_select(t("Type"), "format", $node->format, array(0 => "HTML / text", 1 => "PHP"));
return $output;
diff --git a/update.php b/update.php
index 164bc206a..760f09b4f 100644
--- a/update.php
+++ b/update.php
@@ -56,7 +56,8 @@ $mysql_updates = array(
"2002-10-13" => "update_41",
"2002-10-17" => "update_42",
"2002-10-26" => "update_43",
- "2002-11-08" => "update_44"
+ "2002-11-08" => "update_44",
+ "2002-11-20" => "update_45"
);
// Update functions
@@ -630,6 +631,10 @@ function update_44() {
update_sql("UPDATE system SET filename = CONCAT('modules/', filename) WHERE type = 'module'");
}
+function update_45() {
+ update_sql("ALTER TABLE page ADD description varchar(128) NOT NULL default ''");
+}
+
function update_upgrade3() {
update_sql("INSERT INTO system VALUES ('archive.module','archive','module','',1)");
update_sql("INSERT INTO system VALUES ('block.module','block','module','',1)");
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 13:33:58 +0000