Commit 46798d68 authored by Dries's avatar Dries

- Patch #6484 by Goba:

  + A small typo on tracker module, which prevented the help from displaying.
  + For for a HTML tag closing buglet which made Opera completely mess up
    the page.
  + Translation fixes in story.module.
parent 4b14f76b
......@@ -285,7 +285,7 @@ function theme_form_element($title, $value, $description = NULL, $id = NULL) {
}
else {
if ($id) {
$title = "<label for=\"$id\" />";
$title = "<label for=\"$id\"></label>";
// TODO: does this make sense to do?
}
}
......
......@@ -12,7 +12,7 @@ function blog_node_name($node) {
}
function blog_perm() {
return array("maintain personal blog");
return array("edit own blog");
}
function blog_access($op, $node) {
......@@ -23,15 +23,15 @@ function blog_access($op, $node) {
}
if ($op == "create") {
return user_access("maintain personal blog") && $user->uid;
return user_access("edit own blog") && $user->uid;
}
if ($op == "update") {
return user_access("maintain personal blog") && ($user->uid == $node->uid);
return user_access("edit own blog") && ($user->uid == $node->uid);
}
if ($op == "delete") {
return user_access("maintain personal blog") && ($user->uid == $node->uid);
return user_access("edit own blog") && ($user->uid == $node->uid);
}
}
......@@ -40,7 +40,7 @@ function blog_user($type, &$edit, &$user) {
switch ($type) {
case "view_public":
case "view_private":
if (user_access("maintain personal blog", $user)) {
if (user_access("edit own blog", $user)) {
return form_item(t("Blog"), l(t("view recent blog entries"), "blog/$user->uid", array("title" => t("Read %username's latest blog entries.", array("%username" => $user->name)))));
}
}
......@@ -221,7 +221,7 @@ function blog_link($type, $node = 0, $main) {
$links = array();
if ($type == "system") {
if (user_access("maintain personal blog")) {
if (user_access("edit own blog")) {
menu("node/add/blog", t("blog entry"), "node_page", 0);
menu("blog/". $user->uid, t("my blog"), "blog_page", 1);
}
......
......@@ -571,7 +571,7 @@ function theme_forum_list($forums, $parents, $tid) {
* @return output for the topic list.
*/
function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page, $offset) {
global $user, $id, $status, $user, $pager_total, $forum_topic_list_header;
global $user, $id, $status, $pager_total, $forum_topic_list_header;
if ($topics) {
......
......@@ -38,8 +38,8 @@ function story_help($section = "admin/help#story") {
* Declare administrative settings for a module.
*/
function story_settings() {
$output .= form_textarea("Explanation or submission guidelines", "story_help", variable_get("story_help", ""), 70, 5, "This text will be displayed at the top of the story submission form. It is useful for helping or instructing your users.");
$output .= form_select(t("Minimum number of words"), "minimum_story_size", variable_get("minimum_story_size", 0), array(0 => "0 words", 10 => "10 words", 25 => "25 words", 50 => "50 words", 75 => "75 words", 100 => "100 words", 125 => "125 words", 150 => "150 words", 175 => "175 words", 200 => "200 words"), t("The minimum number of words a story must be to be considered valid. This can be useful to rule out submissions that do not meet the site's standards, such as short test posts."));
$output .= form_textarea(t("Explanation or submission guidelines"), "story_help", variable_get("story_help", ""), 70, 5, t("This text will be displayed at the top of the story submission form. It is useful for helping or instructing your users."));
$output .= form_select(t("Minimum number of words"), "minimum_story_size", variable_get("minimum_story_size", 0), drupal_map_assoc(array(0, 10, 25, 50, 75, 100, 125, 150, 175, 200)), t("The minimum number of words a story must be to be considered valid. This can be useful to rule out submissions that do not meet the site's standards, such as short test posts."));
return $output;
}
......
......@@ -3,7 +3,7 @@
function tracker_help($section = 'admin/help#tracker') {
switch ($section) {
case 'admin/help#tracer':
case 'admin/help#tracker':
return t('<p>The tracker module is a handy module for displaying the most recent posts. By following the <i>recent posts</i> link in the user block, a user may quickly review all recent postings.</p>');
case 'admin/system/modules#description':
return t('Enables tracking of recent posts for users.');
......
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