[gh-66] Merging from testing into staging

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

sites/all/modules/token/jquery.treeTable.css

+/* $Id: jquery.treeTable.css,v 1.2 2010/07/10 13:57:47 davereid Exp $ */
+
+/* jQuery TreeTable Core 2.0 stylesheet
+ *
+ * This file contains styles that are used to display the tree table. Each tree
+ * table is assigned the +treeTable+ class.
+ * ========================================================================= */
+
+/* jquery.treeTable.collapsible
+ * ------------------------------------------------------------------------- */
+.treeTable tr td .expander {
+  background-position: left center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  padding: 0;
+  zoom: 1; /* IE7 Hack */
+}
+
+.treeTable tr.collapsed td .expander {
+  background-image: url(arrow-right.png);
+}
+
+.treeTable tr.expanded td .expander {
+  background-image: url(arrow-down.png);
+}
+
+/* jquery.treeTable.sortable
+ * ------------------------------------------------------------------------- */
+.treeTable tr.selected, .treeTable tr.accept {
+  background-color: #3875d7;
+  color: #fff;
+}
+
+.treeTable tr.collapsed.selected td .expander, .treeTable tr.collapsed.accept td .expander {
+  background-image: url(../images/toggle-expand-light.png);
+}
+
+.treeTable tr.expanded.selected td .expander, .treeTable tr.expanded.accept td .expander {
+  background-image: url(../images/toggle-collapse-light.png);
+}
+
+.treeTable .ui-draggable-dragging {
+  color: #000;
+  z-index: 1;
+}

sites/all/modules/token/tests/token_test.info

+name = Token Test
+description = Testing module for token functionality.
+package = Testing
+core = 7.x
+files[] = token_test.module
+hidden = TRUE
+
+; Information added by drupal.org packaging script on 2011-01-12
+version = "7.x-1.0-beta1"
+core = "7.x"
+project = "token"
+datestamp = "1294805790"
+

sites/all/modules/token/tests/token_test.module

+<?php
+
+/**
+ * Implements hook_exit().
+ */
+function token_test_exit() {
+  if ($debug = variable_get('token_page_tokens', array())) {
+    $debug += array('tokens' => array(), 'data' => array(), 'options' => array());
+    foreach (array_keys($debug['tokens']) as $token) {
+      $debug['values'][$token] = token_replace($token, $debug['data'], $debug['options']);
+    }
+    variable_set('token_page_tokens', $debug);
+  }
+}