<?php print $head

From c70b19a91bfedbae40304cbfed7b5875c5aae342 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 2 Aug 2007 20:08:53 +0000 Subject: - Patch #163723 by Eaton and Frando: fix default page.tpl markup (and removed some whitespace). --- modules/node/node.module | 8 +- modules/poll/poll-results-block.tpl.php | 2 +- modules/poll/poll.module | 8 +- modules/system/page.tpl.php | 228 ++++++++++++++++++++++++-------- 4 files changed, 183 insertions(+), 63 deletions(-) (limited to 'modules') diff --git a/modules/node/node.module b/modules/node/node.module index 2dd3735b5..4a6b45265 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -691,9 +691,9 @@ function node_save(&$node) { // Split off revisions data to another structure $revisions_table_values = array('nid' => &$node->nid, - 'title' => $node->title, 'body' => $node->body, + 'title' => $node->title, 'body' => isset($node->body) ? $node->body : '', 'teaser' => $node->teaser, 'timestamp' => $node->changed, - 'uid' => $user->uid, 'format' => $node->format); + 'uid' => $user->uid, 'format' => isset($node->format) ? $node->format : FILTER_FORMAT_DEFAULT); $revisions_table_types = array('nid' => '%d', 'title' => "'%s'", 'body' => "'%s'", 'teaser' => "'%s'", 'timestamp' => '%d', @@ -1166,7 +1166,7 @@ function node_link($type, $node = NULL, $teaser = FALSE) { $links = array(); if ($type == 'node') { - if ($teaser == 1 && $node->teaser && $node->readmore) { + if ($teaser == 1 && $node->teaser && !empty($node->readmore)) { $links['node_read_more'] = array( 'title' => t('Read more'), 'href' => "node/$node->nid", @@ -1966,7 +1966,7 @@ function node_feed($nids = array(), $channel = array()) { break; case 'teaser': $item_text = $item->teaser; - if ($item->readmore) { + if (!empty($item->readmore)) { $item_text .= '

'. l(t('read more'), 'node/'. $item->nid, array('absolute' => TRUE)) .'

'; } break; diff --git a/modules/poll/poll-results-block.tpl.php b/modules/poll/poll-results-block.tpl.php index d648e58d1..0d2d62d3f 100644 --- a/modules/poll/poll-results-block.tpl.php +++ b/modules/poll/poll-results-block.tpl.php @@ -11,7 +11,7 @@ * - $links: Links in the poll. * - $nid: The nid of the poll * - $cancel_form: A form to cancel the user's vote, if allowed. - * - $raw_links: The raw array of links. Should be run through theme('links') + * - $raw_links: The raw array of links. Should be run through theme('links') * if used. * - $vote: The choice number of the current user's vote. * diff --git a/modules/poll/poll.module b/modules/poll/poll.module index e6952e06a..325101bdf 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -427,7 +427,7 @@ function poll_page() { } /** - * Creates a simple teaser that lists all the choices. + * Creates a simple teaser that lists all the choices. * * This is primarily used for RSS. */ @@ -460,9 +460,9 @@ function poll_view_voting(&$form_state, $node, $block) { '#options' => $list, ); } - + $form['vote'] = array( - '#type' => 'submit', + '#type' => 'submit', '#value' => t('Vote'), '#submit' => array('poll_vote'), ); @@ -594,7 +594,7 @@ function poll_cancel_form(&$form_state, $nid) { $form['#nid'] = $nid; $form['submit'] = array( - '#type' => 'submit', + '#type' => 'submit', '#value' => t('Cancel your vote'), '#submit' => array('poll_cancel') ); diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index 5bf9e423b..b70c46c51 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -1,60 +1,180 @@ - - +language contains its textual representation. + * - $head_title: A modified version of the page title, for use in the TITLE tag. + * - $head: Markup for the HEAD section (including meta tags, keyword tags, and + * so on). + * - $styles: Style tags necessary to import all CSS files for the page. + * - $scripts: Script tags necessary to load the JavaScript files and settings + * for the page. + * - $body_classes: A set of CSS classes for the BODY tag. This contains flags + * indicating the current layout (multiple columns, single column), the current + * path, whether the user is logged in, and so on. + * - $is_front: True if the front page is currently being displayed. Used to + * toggle the mission. + * + * Site identity: + * - $logo: The path to the logo image, as defined in theme configuration. + * - $site_name: The name of the site, empty when display has been disabled + * in theme settings. + * - $site_slogan: The slogan of the site, empty when display has been disabled + * in theme settings. + * - $mission: The text of the site mission, empty when display has been disabled + * in theme settings. + * + * Navigation: + * - $search_box: HTML to display the search box, empty if search has been disabled. + * - $primary_links (array): An array containing primary navigation links for the + * site, if they have been configured. + * - $secondary_links (array): An array containing secondary navigation links for + * the site, if they have been configured. + * + * Page content (in order of occurrance in the default page.tpl.php): + * - $sidebar_left: The HTML for the left sidebar. + * + * - $breadcrumb: The breadcrumb trail for the current page. + * - $title: The page title, for use in the actual HTML content. + * - $help: Dynamic help text, mostly for admin pages. + * - $messages: HTML for status and error messages. Should be displayed prominently. + * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view + * and edit tabs when displaying a node). + * + * - $content: The main content of the current Drupal page. + * + * - $sidebar_right: The HTML for the right sidebar. + * + * Footer/closing data: + * - $feed_icons: A string of all feed icons for the current page. + * - $footer_message: The footer message as defined in the admin settings. + * - $closure: Final closing markup from any modules that have altered the page. + * This variable should always be output last, after all other dynamic content. + * + * @see template_preprocess_page() + * @see phptemplate_engine_preprocess() + */ +?> + + - <?php print $head_title ?> - - - - + <?php print $head_title; ?> + + + + + +

+ + +

+ + + + + +

+ +

+ + +

+ +

+ + + + + +

- - - - - - - - - - - - - - - - - - -

- -

- - - - -

- - - -- cgit v1.2.3