Upgraded to the new Views 3.0-beta1 and (required with that) CTools a…

…lpha-4. Editing a view before the CTools upgrade will permanently break it, but export to code from the previous -dev version of views to the new beta works. Lightly tested and approved.
scor · Mar 26, 2011 · 7a6a817 · 7a6a817
1 parent cd1f1e4
commit 7a6a817
Show file tree

Hide file tree

Showing 796 changed files with 18,103 additions and 59,612 deletions.
diff --git a/drupal/sites/all/modules/ctools/API.txt b/drupal/sites/all/modules/ctools/API.txt
@@ -1,4 +1,4 @@
-API.txt: $Id: API.txt,v 1.16 2010/10/11 22:18:22 sdboyer Exp $
+API.txt: $Id$
 
 This file contains a log of changes to the API.
 API Version 2.0

diff --git a/drupal/sites/all/modules/ctools/CHANGELOG.txt b/drupal/sites/all/modules/ctools/CHANGELOG.txt
@@ -1,5 +1,12 @@
 Current API VERSION: 2.0. See API.txt for more information.
 
+ctools 7.x-1.x-dev
+==================
+#1008120: "New custom content" shows empty form if custom content panes module is not enabled.
+#999302 by troky: Fix jump menu. Apparently this wasn't actually committed the last time it was committed.
+#1065976 by tekante and David_Rothstein: Reset plugin static cache during module enable to prevent stale data from harming export ui.
+#1016510 by EclipseGC: Make the taxonomy system page functional.
+
 ctools 7.x-1.x-alpha2 (05-Jan-2011)
 ===================================
 

diff --git a/drupal/sites/all/modules/ctools/bulk_export/bulk_export.css b/drupal/sites/all/modules/ctools/bulk_export/bulk_export.css
@@ -1,4 +1,3 @@
-/* $Id: bulk_export.css,v 1.1 2009/07/12 11:32:30 sdboyer Exp $ */
 
 div.export-container {
   width: 48%;
@@ -13,6 +12,13 @@ div.export-container table {
 div.export-container table input,
 div.export-container table th,
 div.export-container table td {
-  padding: 0 0 0 .5em;
+  padding: 0 0 2px .5em;
   margin: 0;
-}
+  border-right: none;
+  border-left: none;
+  vertical-align: center;
+}
+
+div.export-container .select-all {
+  width: 1.5em;
+}
diff --git a/drupal/sites/all/modules/ctools/bulk_export/bulk_export.info b/drupal/sites/all/modules/ctools/bulk_export/bulk_export.info
@@ -1,13 +1,12 @@
-; $Id: bulk_export.info,v 1.4 2011/01/01 00:01:46 merlinofchaos Exp $
 name = Bulk Export
 description = Performs bulk exporting of data objects known about by Chaos tools.
 core = 7.x
 dependencies[] = ctools
 package = Chaos tool suite
 
-; Information added by drupal.org packaging script on 2011-01-06
-version = "7.x-1.0-alpha2"
+; Information added by drupal.org packaging script on 2011-03-26
+version = "7.x-1.0-alpha4"
 core = "7.x"
 project = "ctools"
-datestamp = "1294276864"
+datestamp = "1301099792"
 
diff --git a/drupal/sites/all/modules/ctools/bulk_export/bulk_export.module b/drupal/sites/all/modules/ctools/bulk_export/bulk_export.module
@@ -1,5 +1,4 @@
 <?php
-// $Id: bulk_export.module,v 1.6 2010/10/11 22:18:24 sdboyer Exp $
 
 /**
  * @file
@@ -66,64 +65,69 @@ function bulk_export_export() {
       drupal_set_title(t('Bulk export results'));
       $output = '';
       $module_code = '';
-      $api_code = '';
+      $api_code = array();
       $dependencies = array();
       foreach ($form_state['code'] as $module => $api_info) {
         if ($module == 'general') {
           $module_code .= $api_info;
         }
         else {
           foreach ($api_info as $api => $info) {
-            $api_code .= "  if (\$module == '$module' && \$api == '$api') {\n";
-            $api_code .= "    return array('version' => $info[version]);\n";
-            $api_code .= "  }\n";
+            $api_hook = ctools_plugin_api_get_hook($module, $api);
+            if (empty($api_code[$api_hook])) {
+              $api_code[$api_hook] = '';
+            }
+            $api_code[$api_hook] .= "  if (\$module == '$module' && \$api == '$api') {\n";
+            $api_code[$api_hook] .= "    return array('version' => $info[version]);\n";
+            $api_code[$api_hook] .= "  }\n";
             $dependencies[$module] = TRUE;
 
             $file = $form_state['module'] . '.' . $api . '.inc';
-            $code = "<?php\n";
-            $code .= "// \$Id" . ": $\n\n";
+            $code = "<?php\n\n";
             $code .= "/**\n";
             $code .= " * @file\n";
             $code .= " * Bulk export of $api objects generated by Bulk export module.\n";
             $code .= " */\n\n";
             $code .= $info['code'];
-            $output .= drupal_render(drupal_get_form('ctools_export_form', $code, t('Place this in @file', array('@file' => $file))));
+            $export_form = drupal_get_form('ctools_export_form', $code, t('Place this in @file', array('@file' => $file)));
+            $output .= drupal_render($export_form);
           }
         }
       }
 
       // Add hook_ctools_plugin_api at the top of the module code, if there is any.
       if ($api_code) {
-        $api =  "/**\n";
-        $api .= " * Implements hook_ctools_plugin_api().\n";
-        $api .= " */\n";
-        $api .= "function $form_state[module]_ctools_plugin_api(\$module, \$api) {\n";
-        $api .= $api_code;
-        $api .= "}\n";
-        $module_code = $api . $module_code;
+        foreach ($api_code as $api_hook => $text) {
+          $api =  "\n/**\n";
+          $api .= " * Implements hook_$api_hook().\n";
+          $api .= " */\n";
+          $api .= "function $form_state[module]_$api_hook(\$module, \$api) {\n";
+          $api .= $text;
+          $api .= "}\n";
+          $module_code = $api . $module_code;
+        }
       }
 
       if ($module_code) {
-        $module =  "<?php\n";
-        $module .= "// \$Id" . ": $\n\n";
+        $module =  "<?php\n\n";
         $module .= "/**\n";
         $module .= " * @file\n";
         $module .= " * Bulk export of objects generated by Bulk export module.\n";
-        $module .= " */\n\n";
+        $module .= " */\n";
         $module .= $module_code;
-        $output = drupal_render(drupal_get_form('ctools_export_form', $module, t('Place this in @file', array('@file' => $form_state['module'] . '.module')))) . $output;
+        $export_form = drupal_get_form('ctools_export_form', $module, t('Place this in @file', array('@file' => $form_state['module'] . '.module')));
+        $output = drupal_render($export_form) . $output;
       }
 
-      $info  = "; \$Id" . ": $\n"; // The break in the string prevents CVS from subbing the ID.
-      $info .= strtr("name = @module export module\n", array('@module' => $form_state['module']));
+      $info = strtr("name = @module export module\n", array('@module' => $form_state['module']));
       $info .= strtr("description = Export objects from CTools\n", array('@module' => $form_state['values']['name']));
       foreach ($dependencies as $module => $junk) {
         $info .= "dependencies[] = $module\n";
       }
       $info .= "package = Chaos tool suite\n";
       $info .= "core = 7.x\n";
-      $info .= "files[] = " . check_plain($form_state['module'] . '.info') . "\n";
-      $output = drupal_render(drupal_get_form('ctools_export_form', $info, t('Place this in @file', array('@file' => $form_state['module'] . '.info')))) . $output;
+      $export_form = drupal_get_form('ctools_export_form', $info, t('Place this in @file', array('@file' => $form_state['module'] . '.info')));
+      $output = drupal_render($export_form) . $output;
 
     }
 

diff --git a/drupal/sites/all/modules/ctools/bulk_export/translations/bulk_export.hu.po b/drupal/sites/all/modules/ctools/bulk_export/translations/bulk_export.hu.po
diff --git a/drupal/sites/all/modules/ctools/bulk_export/translations/bulk_export.pot b/drupal/sites/all/modules/ctools/bulk_export/translations/bulk_export.pot
diff --git a/drupal/sites/all/modules/ctools/css/button.css b/drupal/sites/all/modules/ctools/css/button.css
@@ -0,0 +1,28 @@
+/* $Id$ */
+
+.ctools-button {
+  border-style: solid;
+  border-width: 1px;
+  display: inline-block;
+  line-height: 1;
+}
+
+.ctools-button:hover {
+  cursor: pointer;
+}
+
+.ctools-button .ctools-content {
+  padding-bottom: 2px;
+  padding-top: 2px;
+}
+
+.ctools-button .ctools-content * {
+  list-style-image: none;
+  list-style-type: none;
+}
+
+.ctools-button li {
+  line-height: 1.3333;
+  padding-left: 12px;
+  padding-right: 12px;
+}
diff --git a/drupal/sites/all/modules/ctools/css/collapsible-div.css b/drupal/sites/all/modules/ctools/css/collapsible-div.css
@@ -1,4 +1,3 @@
-/* $Id: collapsible-div.css,v 1.2 2008/11/27 17:29:34 merlinofchaos Exp $ */
 
 .ctools-collapsible-container .ctools-toggle {
   float: left;

diff --git a/drupal/sites/all/modules/ctools/css/context.css b/drupal/sites/all/modules/ctools/css/context.css
@@ -1,4 +1,3 @@
-/* $Id: context.css,v 1.2 2008/12/05 00:15:36 merlinofchaos Exp $ */
 .ctools-context-holder .ctools-context-title {
   float: left;
   width: 49%;

diff --git a/drupal/sites/all/modules/ctools/css/ctools.css b/drupal/sites/all/modules/ctools/css/ctools.css
@@ -1,4 +1,3 @@
-/* $Id: ctools.css,v 1.5 2010/09/07 09:02:50 sdboyer Exp $ */
 .ctools-locked {
   color: red;
   border: 1px solid red;

diff --git a/drupal/sites/all/modules/ctools/css/dropbutton.css b/drupal/sites/all/modules/ctools/css/dropbutton.css
@@ -0,0 +1,51 @@
+/* $Id$ */
+
+.ctools-dropbutton {
+  left: auto; /* LTR */
+  padding-right: 18px;
+  position: absolute;
+  top: auto;
+}
+
+.ctools-dropbutton.open {
+  z-index: 200;
+}
+
+.ctools-dropbutton .ctools-content li,
+.ctools-dropbutton .ctools-content a {
+  display: block;
+}
+
+.ctools-dropbutton .ctools-link {
+  bottom: 0;
+  display: block;
+  height: auto;
+  position: absolute;
+  right: 0;
+  text-indent: -9999px; /* LTR */
+  top: 0;
+  width: 17px;
+}
+
+/**
+ * This creates the dropbutton arrow and inherits the link color
+ */
+.ctools-twisty {
+  border-bottom-color: transparent;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-style: solid;
+  border-width: 4px 4px 0;
+  line-height: 0;
+  right: 6px;
+  position: absolute;
+  top: 0.75em;
+}
+
+.ctools-dropbutton.open .ctools-twisty {
+  border-bottom: 4px solid;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-top-color: transparent;
+  top: 0.5em;
+}
diff --git a/drupal/sites/all/modules/ctools/css/dropdown.css b/drupal/sites/all/modules/ctools/css/dropdown.css
@@ -1,4 +1,3 @@
-/* $Id: dropdown.css,v 1.6 2010/10/11 22:18:23 sdboyer Exp $ */
 html.js div.ctools-dropdown div.ctools-dropdown-container {
   z-index: 1001;
   display: none;

diff --git a/drupal/sites/all/modules/ctools/css/export-ui-list.css b/drupal/sites/all/modules/ctools/css/export-ui-list.css
@@ -1,4 +1,3 @@
-/* $Id: export-ui-list.css,v 1.3 2011/01/05 23:16:59 merlinofchaos Exp $ */
 body form#ctools-export-ui-list-form {
   margin: 0 0 20px 0;
 }

diff --git a/drupal/sites/all/modules/ctools/css/modal.css b/drupal/sites/all/modules/ctools/css/modal.css
@@ -1,4 +1,3 @@
-/* $Id: modal.css,v 1.9 2011/01/01 00:31:27 merlinofchaos Exp $ */
 div.ctools-modal-content {
   background: #fff;
   color: #000;

diff --git a/drupal/sites/all/modules/ctools/css/stylizer.css b/drupal/sites/all/modules/ctools/css/stylizer.css
@@ -1,4 +1,3 @@
-/* $Id: stylizer.css,v 1.2 2010/10/11 22:18:23 sdboyer Exp $ */
 
 /* Farbtastic placement */
 .color-form {

diff --git a/drupal/sites/all/modules/ctools/css/wizard.css b/drupal/sites/all/modules/ctools/css/wizard.css
@@ -1,4 +1,3 @@
-/* $Id: wizard.css,v 1.1 2008/12/06 02:13:48 merlinofchaos Exp $ */
 
 .wizard-trail {
   font-size: 120%;

diff --git a/drupal/sites/all/modules/ctools/ctools.api.php b/drupal/sites/all/modules/ctools/ctools.api.php
@@ -1,5 +1,4 @@
 <?php
-// $Id: ctools.api.php,v 1.2 2010/10/11 22:18:22 sdboyer Exp $
 
 /**
  * @file