[gh-115] Merging from testing into staging

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

block.tpl.php

@@ -1,4 +1,58 @@
 <?php
+/**
+ * @file
+ * unl_wdn theme implementation to display a block.
+ *
+ * Available variables:
+ * - $block->subject: Block title.
+ * - $content: Block content.
+ * - $block->module: Module that generated the block.
+ * - $block->delta: An ID for the block, unique within each module.
+ * - $block->region: The block region embedding the current block.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - block: The current template type, i.e., "theming hook".
+ *   - block-[module]: The module generating the block. For example, the user module
+ *     is responsible for handling the default user navigation block. In that case
+ *     the class would be "block-user".
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * Helper variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
+ * - $zebra: Same output as $block_zebra but independent of any block region.
+ * - $block_id: Counter dependent on each block region.
+ * - $id: Same output as $block_id but independent of any block region.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ * - $block_html_id: A valid HTML ID and guaranteed unique.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_block()
+ * @see template_process()
+ */
 
+if ($block->region != 'navlinks') { ?>
+<div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
-echo $content;
+  <?php print render($title_prefix); ?>
+<?php if ($block->subject): ?>
+  <h3<?php print $title_attributes; ?>><?php print $block->subject ?></h3>
+<?php endif;?>
+  <?php print render($title_suffix); ?>
+
+  <div class="content"<?php print $content_attributes; ?>>
+    <?php print $content ?>
+  </div>
+</div>
+<?php } else {
+  print $content;
+} ?>

style.css

@@ -3,17 +3,22 @@
    that need to be made for WDN styles to work with CMS DOM structure.
 */
 body.fixed #maincontent {
-  min-width:940px;
-  overflow:visible !important;
+  min-width: 940px;
+  overflow: visible !important;
 }
 #maincontent ul.wdn_tabs.cms_tabs {
-  position:absolute;
-  right:0;
-  top:-60px;
+  position: absolute;
+  right: 0;
+  top: -60px;
 }
 
 /* Remove border found in system.theme.css
    http://drupal.org/node/93357 */
 tbody {
   border-top: none;
-}
+}
+
+/* Hide the contextual links in the UNL nav */
+#navigation div.contextual-links-wrapper {
+  display: none;
+}