Commit 5d36c704 authored by Kjartan's avatar Kjartan

- improved module descriptions.

- removed admin options for queue and comment module if the modules are not
  loaded.
- nodes are now auto promoted when queue module isn't enabled.
- moderation result block is now visible by the node author.
parent 37ee9eed
......@@ -12,7 +12,7 @@ function import_help() {
}
function import_system($field){
$system["description"] = t("Used to import syndicated content (ie. news feeds)");
$system["description"] = t("Used to aggregate syndicated content (RSS and RDF).");
return $system[$field];
}
......
......@@ -12,7 +12,7 @@ function import_help() {
}
function import_system($field){
$system["description"] = t("Used to import syndicated content (ie. news feeds)");
$system["description"] = t("Used to aggregate syndicated content (RSS and RDF).");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function archive_system($field){
$system["description"] = t("Displays calendar navigation to old content.");
$system["description"] = t("Displays a calendar to navigation old content.");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function archive_system($field){
$system["description"] = t("Displays calendar navigation to old content.");
$system["description"] = t("Displays a calendar to navigation old content.");
return $system[$field];
}
......
......@@ -39,7 +39,7 @@ function block_help() {
}
function block_system($field){
$system["description"] = t("Displays content in small boxes, generally along the side of the page.");
$system["description"] = t("Controls the boxes that are displayed around the main content.");
return $system[$field];
}
......
......@@ -39,7 +39,7 @@ function block_help() {
}
function block_system($field){
$system["description"] = t("Displays content in small boxes, generally along the side of the page.");
$system["description"] = t("Controls the boxes that are displayed around the main content.");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function blog_system($field){
$system["description"] = t("Enables keeping an online journal.");
$system["description"] = t("Enables users to keep a blog or online journal.");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function blog_system($field){
$system["description"] = t("Enables keeping an online journal.");
$system["description"] = t("Enables users to keep a blog or online journal.");
return $system[$field];
}
......
......@@ -365,7 +365,7 @@ function bloggerapi_perm() {
}
function bloggerapi_system($field){
$system["description"] = t("Allows users post to Drupal via alternate methods or different tools.");
$system["description"] = t("Enables users to post using tools or applications that support the Blogger API.");
return $system[$field];
}
......
......@@ -14,7 +14,7 @@ function comment_help() {
}
function comment_system($field){
$system["description"] = t("Enables user commenting.");
$system["description"] = t("Enables user to comment on content (nodes).");
return $system[$field];
}
......
......@@ -14,7 +14,7 @@ function comment_help() {
}
function comment_system($field){
$system["description"] = t("Enables user commenting.");
$system["description"] = t("Enables user to comment on content (nodes).");
return $system[$field];
}
......
<?php
function drupal_system($field){
$system["description"] = t("You'll need this :-)");
$system["description"] = t("Lets users log in using a Drupal ID and can notify drupal.org about your site.");
return $system[$field];
}
......
<?php
function drupal_system($field){
$system["description"] = t("You'll need this :-)");
$system["description"] = t("Lets users log in using a Drupal ID and can notify drupal.org about your site.");
return $system[$field];
}
......
......@@ -12,7 +12,7 @@ function import_help() {
}
function import_system($field){
$system["description"] = t("Used to import syndicated content (ie. news feeds)");
$system["description"] = t("Used to aggregate syndicated content (RSS and RDF).");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function jabber_system($field){
$system["description"] = t("Enables login with Jabber ID and Password");
$system["description"] = t("Enables login with Jabber ID and password.");
return $system[$field];
}
......
......@@ -36,7 +36,7 @@ function locale_help() {
}
function locale_system($field){
$system["description"] = t("Enables the translation of drupal messages to languages other than English.");
$system["description"] = t("Enables the translation of the user interface to languages other than English.");
return $system[$field];
}
......
......@@ -36,7 +36,7 @@ function locale_help() {
}
function locale_system($field){
$system["description"] = t("Enables the translation of drupal messages to languages other than English.");
$system["description"] = t("Enables the translation of the user interface to languages other than English.");
return $system[$field];
}
......
......@@ -15,7 +15,7 @@ function node_help() {
}
function node_system($field){
$system["description"] = t("You'll need this too.");
$system["description"] = t("The core that allows content to be submitted to the site.");
return $system[$field];
}
......@@ -494,7 +494,7 @@ function node_admin_nodes() {
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>title</th><th>type</th><th>author</th><th>status</th><th colspan=\"2\">operations</th></tr>\n";
while ($node = db_fetch_object($result)) {
$output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>$node->type</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
$output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>". module_invoke($node->type, "node", "name") ."</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
}
$output .= "</table>";
......@@ -878,10 +878,16 @@ function node_form($edit, $error = NULL) {
$output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]);
$output .= "<br />";
$output .= form_select(t("Set public/published"), "status", $edit->status, array("Disabled", "Enabled"));
$output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
// TODO: move this to the queue.module
if (module_exist("queue")) {
$output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
}
$output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled"));
$output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled"));
$output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
// TODO: move this to the comment.module
if (module_exist("comment")) {
$output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
}
$output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled"));
}
......@@ -906,7 +912,7 @@ function node_add($type) {
if ($type && node_access("create", $type)) {
// Initialize settings
$output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "moderate" => 1, "comment" => 2));
$output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "promote" => !module_exist("queue"), "moderate" => module_exist("queue"), "comment" => module_exist("queue") ? 2 : 0));
}
else {
......
......@@ -15,7 +15,7 @@ function node_help() {
}
function node_system($field){
$system["description"] = t("You'll need this too.");
$system["description"] = t("The core that allows content to be submitted to the site.");
return $system[$field];
}
......@@ -494,7 +494,7 @@ function node_admin_nodes() {
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
$output .= " <tr><th>title</th><th>type</th><th>author</th><th>status</th><th colspan=\"2\">operations</th></tr>\n";
while ($node = db_fetch_object($result)) {
$output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>$node->type</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
$output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>". module_invoke($node->type, "node", "name") ."</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
}
$output .= "</table>";
......@@ -878,10 +878,16 @@ function node_form($edit, $error = NULL) {
$output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]);
$output .= "<br />";
$output .= form_select(t("Set public/published"), "status", $edit->status, array("Disabled", "Enabled"));
$output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
// TODO: move this to the queue.module
if (module_exist("queue")) {
$output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
}
$output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled"));
$output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled"));
$output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
// TODO: move this to the comment.module
if (module_exist("comment")) {
$output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
}
$output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled"));
}
......@@ -906,7 +912,7 @@ function node_add($type) {
if ($type && node_access("create", $type)) {
// Initialize settings
$output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "moderate" => 1, "comment" => 2));
$output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "promote" => !module_exist("queue"), "moderate" => module_exist("queue"), "comment" => module_exist("queue") ? 2 : 0));
}
else {
......
......@@ -8,7 +8,7 @@ function page_help() {
}
function page_system($field){
$system["description"] = t("Enables the creation of persistent site pages that can be added to the navigation system.");
$system["description"] = t("Enables the creation of a static pages that can be added to the navigation system.");
return $system[$field];
}
......
......@@ -8,7 +8,7 @@ function page_help() {
}
function page_system($field){
$system["description"] = t("Enables the creation of persistent site pages that can be added to the navigation system.");
$system["description"] = t("Enables the creation of a static pages that can be added to the navigation system.");
return $system[$field];
}
......
......@@ -253,7 +253,7 @@ function poll_save($op, $node) {
}
function poll_system($field){
$system["description"] = t("Enables submission of multiple choice questions for voting.");
$system["description"] = t("Allows users to submit multiple choice questions for voting.");
return $system[$field];
}
......
......@@ -253,7 +253,7 @@ function poll_save($op, $node) {
}
function poll_system($field){
$system["description"] = t("Enables submission of multiple choice questions for voting.");
$system["description"] = t("Allows users to submit multiple choice questions for voting.");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function queue_system($field){
$system["description"] = t("Enables new content submissions to be rated before being displayed");
$system["description"] = t("Enables content to be moderated by the community.");
return $system[$field];
}
......@@ -184,7 +184,7 @@ function queue_block() {
if ($user->uid) {
$node = node_load(array("nid" => $id));
}
if (substr_count($node->users, "$user->uid=") && $node->moderate == 1) {
if (($user->uid == $node->uid && substr_count($node->users, "$user->uid=")) && $node->moderate == 1) {
foreach (explode(",", $node->users) as $vote) {
if ($vote) {
$data = explode("=", $vote);
......
......@@ -15,7 +15,7 @@ function search_help() {
}
function search_system($field){
$system["description"] = t("Enables site wide keyword searching");
$system["description"] = t("Enables site wide keyword searching.");
return $system[$field];
}
......
......@@ -15,7 +15,7 @@ function search_help() {
}
function search_system($field){
$system["description"] = t("Enables site wide keyword searching");
$system["description"] = t("Enables site wide keyword searching.");
return $system[$field];
}
......
......@@ -15,7 +15,7 @@ function statistics_help() {
}
function statistics_system($field){
$system["description"] = t("Gathers and displays site metrics.");
$system["description"] = t("Gathers and displays referers.");
return $system[$field];
}
......
......@@ -15,7 +15,7 @@ function statistics_help() {
}
function statistics_system($field){
$system["description"] = t("Gathers and displays site metrics.");
$system["description"] = t("Gathers and displays referers.");
return $system[$field];
}
......
......@@ -8,7 +8,7 @@ function story_help() {
}
function story_system($field){
$system["description"] = t("Enables users to submit stories. These stories are not part of their blogs.");
$system["description"] = t("Enables users to submit stories, articles or similar content.");
return $system[$field];
}
......
......@@ -8,7 +8,7 @@ function story_help() {
}
function story_system($field){
$system["description"] = t("Enables users to submit stories. These stories are not part of their blogs.");
$system["description"] = t("Enables users to submit stories, articles or similar content.");
return $system[$field];
}
......
......@@ -9,7 +9,7 @@ function system_help() {
}
function system_system($field){
$system["description"] = t("You'll need this.");
$system["description"] = t("Configuration system that lets site admins modify the workings of the site.");
return $system[$field];
}
......
......@@ -9,7 +9,7 @@ function system_help() {
}
function system_system($field){
$system["description"] = t("You'll need this.");
$system["description"] = t("Configuration system that lets site admins modify the workings of the site.");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function taxonomy_system($field){
$system["description"] = t("Enables the organization of content into categories and subcategories.");
$system["description"] = t("Enables the organization of content into categories.");
return $system[$field];
}
......
......@@ -2,7 +2,7 @@
// $Id$
function taxonomy_system($field){
$system["description"] = t("Enables the organization of content into categories and subcategories.");
$system["description"] = t("Enables the organization of content into categories.");
return $system[$field];
}
......
......@@ -7,7 +7,7 @@ function tracker_help() {
}
function tracker_system($field){
$system["description"] = t("Enables tracking of recent and new comments for site readers.");
$system["description"] = t("Enables tracking of recent and new comments for users.");
return $system[$field];
}
......
......@@ -7,7 +7,7 @@ function tracker_help() {
}
function tracker_system($field){
$system["description"] = t("Enables tracking of recent and new comments for site readers.");
$system["description"] = t("Enables tracking of recent and new comments for users.");
return $system[$field];
}
......
......@@ -5,7 +5,7 @@
session_start();
function user_system($field){
$system["description"] = t("Enables a user registration system.");
$system["description"] = t("Enables the user registration and login system.");
return $system[$field];
}
......
......@@ -5,7 +5,7 @@
session_start();
function user_system($field){
$system["description"] = t("Enables a user registration system.");
$system["description"] = t("Enables the user registration and login system.");
return $system[$field];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment