[gh-48] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@890 20a16fea-79d4-4915-8869-1ea9d5ebf173

html.tpl.php

@@ -1,8 +1,7 @@
 <?php
 /**
  * @file
- * Default theme implementation to display the basic html structure of a single
- * Drupal page.
+ * unl_wdn theme implementation to display the basic html structure of a single Drupal page.
  *
  * Variables:
  * - $css: An array of CSS files for the current page.
@@ -44,7 +43,6 @@
           . $head . PHP_EOL
           . $styles . PHP_EOL
           . $scripts . PHP_EOL
-          . '<link href="' . url('<front>', array('absolute' => TRUE)) . '" rel="home" />' . PHP_EOL
           . '<link rel="logout" href="user/logout" />' . PHP_EOL
           . '<link rel="login" href="' . url('user', array('query' => drupal_get_destination())) . '" />' . PHP_EOL
           . theme_get_setting('head_html') . PHP_EOL

menu-block-wrapper.tpl.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file
+ * unl_wdn theme implementation to wrap menu blocks.
+ *
+ * Available variables:
+ * - $content: The renderable array containing the menu.
+ * - $classes: A string containing the CSS classes for the DIV tag. Includes:
+ *   menu-block-DELTA, menu-name-NAME, parent-mlid-MLID, and menu-level-LEVEL.
+ * - $classes_array: An array containing each of the CSS classes.
+ *
+ * The following variables are provided for contextual information.
+ * - $delta: (string) The menu_block's block delta.
+ * - $config: An array of the block's configuration settings. Includes
+ *   menu_name, parent_mlid, title_link, admin_title, level, follow, depth,
+ *   expanded, and sort.
+ *
+ * @see template_preprocess_menu_block_wrapper()
+ */
+?>
+<?php print render($content); ?>