Explorar o código

updated nodeformcols module to 7.x-1.0 (2014-jan-15)

Bachir Soussi Chiadmi %!s(int64=9) %!d(string=hai) anos
pai
achega
9afc105c7e

+ 8 - 3
sites/all/modules/contrib/admin/nodeformcols/CHANGELOG

@@ -1,7 +1,12 @@
 // $Id$
 
-Node form columns 7.x-1.x, xxxx-xx-xx
+Node form columns 7.x-1.0, 2014-01-15
 ------------------------------
-#801804 by yhahn, voxpelli: Port to drupal 7
+Issue #801804 by yhahn, voxpelli: Port to drupal 7
 by voxpelli: No longer positions form fields that the access is denied to
-#664840 by swentel, voxpelli: Fixed PHP notices
+Issue #664840 by swentel, voxpelli: Fixed PHP notices
+Issue #1024830 by barraponto: hidden fields weren't actually hiding
+Issue #1159746 by kevee: set form_state['input'] to prevent errors with some widgets
+Issue #1287452 by barraponto: Text fields and text areas on the right sidebar should be resized.
+Issue #1393090 by ptrl,kevee: Fix captcha for node form columns
+Issue #1305212 by Nor4a,gabrielu: Fixed bug in the nodeformcols_node_type_delete function

+ 0 - 16
sites/all/modules/contrib/admin/nodeformcols/modules_assign_region_0.patch

@@ -1,16 +0,0 @@
-diff --git a/nodeformcols.module b/nodeformcols.module
-index b27f9b5..53ec8f0 100644
---- a/nodeformcols.module
-+++ b/nodeformcols.module
-@@ -137,8 +137,9 @@ function template_preprocess_node_form(&$aVars) {
-       continue;
-     }
- 
--    if (isset($placements[$key])) {
--      $p = $placements[$key];
-+    if (isset($placements[$key]) || isset($field['#placement'])) {
-+      $p = isset($placements[$key]) ? $placements[$key] : $field['#placement'];
-+      unset($field['#placement']);
- 
-       if (isset($p['weight'])) {
-         $field['#weight'] = $p['weight'];

+ 3 - 3
sites/all/modules/contrib/admin/nodeformcols/nfcbiblio.info

@@ -5,9 +5,9 @@ dependencies[] = biblio
 core = 7.x
 package = Node form columns
 
-; Information added by drupal.org packaging script on 2012-06-13
-version = "7.x-1.x-dev"
+; Information added by Drupal.org packaging script on 2014-01-15
+version = "7.x-1.0"
 core = "7.x"
 project = "nodeformcols"
-datestamp = "1339547249"
+datestamp = "1389798806"
 

+ 3 - 3
sites/all/modules/contrib/admin/nodeformcols/nfccaptcha.info

@@ -5,9 +5,9 @@ dependencies[] = captcha
 core = 7.x
 package = Node form columns
 
-; Information added by drupal.org packaging script on 2012-06-13
-version = "7.x-1.x-dev"
+; Information added by Drupal.org packaging script on 2014-01-15
+version = "7.x-1.0"
 core = "7.x"
 project = "nodeformcols"
-datestamp = "1339547249"
+datestamp = "1389798806"
 

+ 4 - 4
sites/all/modules/contrib/admin/nodeformcols/nfccaptcha.module

@@ -14,14 +14,14 @@
  * @return void
  */
 function nodeformcols_nodeformcols_base_form_alter(&$form, $variant) {
-  $using_captcha = db_query("SELECT COUNT(module)
-    FROM {captcha_points} WHERE form_id = :form_id", array(':form_id' => array(
+  $using_captcha = db_query("SELECT COUNT(captcha_type)
+    FROM {captcha_points} WHERE form_id = :form_id", array(
       ':form_id' => $form['#node']->type . '_node_form',
-    )))->fetchField();
+    ))->fetchField();
   if ($using_captcha) {
     $form['captcha'] = array(
       '#title' => t('CAPTCHA'),
-      '#weight' => $form['buttons']['#weight'] - 1,
+      '#weight' => $form['actions']['#weight'] - 1,
     );
   }
 }

+ 0 - 13
sites/all/modules/contrib/admin/nodeformcols/node_type_delete_1305212.patch

@@ -1,13 +0,0 @@
-diff --git a/sites/all/modules/contrib/nodeformcols/nodeformcols.module b/sites/all/modules/contrib/nodeformcols/nodeformcols.module
-index f538452..793edcf 100755
---- a/sites/all/modules/contrib/nodeformcols/nodeformcols.module
-+++ b/sites/all/modules/contrib/nodeformcols/nodeformcols.module
-@@ -175,7 +175,7 @@ function template_preprocess_node_form(&$aVars) {
-  */
- function nodeformcols_node_type_delete($info) {
-   $result = db_select('variable')
--    ->condition('name', 'nodeformscols_field_placements_' . $info->old_type . '%', 'LIKE')
-+    ->condition('name', 'nodeformscols_field_placements_' . $info->type . '%', 'LIKE')
-     ->fields('variable', array('name'))
-     ->execute();
-   foreach ($result as $row) {

+ 3 - 3
sites/all/modules/contrib/admin/nodeformcols/nodeformcols.info

@@ -3,9 +3,9 @@ description = Separates the node forms into two columns and a footer.
 core = 7.x
 package = Node form columns
 
-; Information added by drupal.org packaging script on 2012-06-13
-version = "7.x-1.x-dev"
+; Information added by Drupal.org packaging script on 2014-01-15
+version = "7.x-1.0"
 core = "7.x"
 project = "nodeformcols"
-datestamp = "1339547249"
+datestamp = "1389798806"
 

+ 2 - 1
sites/all/modules/contrib/admin/nodeformcols/nodeformcols.module

@@ -139,6 +139,7 @@ function template_preprocess_node_form(&$aVars) {
 
     if (isset($placements[$key])) {
       $p = $placements[$key];
+
       if (isset($p['weight'])) {
         $field['#weight'] = $p['weight'];
       }
@@ -174,7 +175,7 @@ function template_preprocess_node_form(&$aVars) {
  */
 function nodeformcols_node_type_delete($info) {
   $result = db_select('variable')
-    ->condition('name', 'nodeformscols_field_placements_' . $info->old_type . '%', 'LIKE')
+    ->condition('name', 'nodeformscols_field_placements_' . $info->type . '%', 'LIKE')
     ->fields('variable', array('name'))
     ->execute();
   foreach ($result as $row) {

+ 0 - 210
sites/all/modules/contrib/admin/nodeformcols/nodeformcols.module.orig

@@ -1,210 +0,0 @@
-<?php
-define('NODEFORMCOLS_DEFAULT_REGION', 'main');
-
-/**
- * Implementation of hook_theme().
- */
-function nodeformcols_theme($aExisting) {
-  return array(
-    // This needs to run after node.module's hook_theme(), which we ensure
-    // by setting this module's weight to 1 during install.
-    'node_form' => array(
-      'render element' => 'form',
-      'template' => 'node-form',
-    ),
-    'nodeformcols_configuration' => array(
-      'render element' => 'element',
-      'template' => 'nodeformcols-configuration',
-    ),
-  );
-}
-
-/**
- * Implementation of hook_menu().
- */
-function nodeformcols_menu() {
-  $items = array();
-
-  if (!defined('MAINTENANCE_MODE')) {
-    $items['admin/structure/types/manage/%node_type/form'] = array(
-      'title' => 'Manage form',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('nodeformcols_configuration_form', 4, 6),
-      'access arguments' => array('administer content types'),
-      'file' => 'nodeformcols.admin.inc',
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 3,
-    );
-  }
-
-  return $items;
-}
-
-/**
- * Implementation of hook_ctools_plugin_directory().
- */
-function nodeformcols_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools') {
-    return 'plugins/' . $plugin;
-  }
-}
-
-function nodeformcols_form_regions() {
-  return array(
-    'main' => t('Main column'),
-    'right' => t('Right'),
-    'footer' => t('Footer'),
-  );
-}
-
-/**
- * Gets default placements for standard fields
- *
- * @return array
- */
-function _nodeformscols_default_field_placements() {
-  return array(
-    'title' => array('region' => 'main'),
-    'additional_settings' => array('region' => 'main'),
-    'actions' => array('region' => NODEFORMCOLS_DEFAULT_REGION, 'weight' => 100),
-  );
-}
-
-function nodeformscols_field_placements($content_type, $variant) {
-  $default = _nodeformscols_default_field_placements();
-  if ($variant != 'default') {
-    $default = variable_get('nodeformscols_field_placements_' .
-      $content_type . '_default', $default);
-  }
-
-  $placements = variable_get('nodeformscols_field_placements_' . $content_type .
-    '_' . $variant, $default);
-
-  return $placements;
-}
-
-/**
- * Implementation of hook_form_alter().
- */
-function nodeformcols_form_alter(&$form, $form_state, $form_id) {
-  if (isset($form['#node_edit_form']) && $form['#node_edit_form']) {
-    drupal_alter('nodeformcols_pre_form', $form);
-    $variant = isset($form['#nodeformcols_variant']) ? $form['#nodeformcols_variant'] : 'default';
-    $placements = nodeformscols_field_placements($form['#node']->type, $variant);
-    foreach ($placements as $key => $p) {
-      if (isset($p['hidden']) && $p['hidden']) {
-        $form[$key]['#access'] = FALSE;
-      }
-    }
-    drupal_alter('nodeformcols_post_form', $form);
-  }
-}
-
-/**
- * Preprocess function to run ahead of other modules.
- */
-function template_preprocess_node_form(&$aVars) {
-  drupal_add_css(drupal_get_path('module', 'nodeformcols') . '/css/nodeformcols.css');
-
-  $default_region = variable_get('nodeformcols_default_region', NODEFORMCOLS_DEFAULT_REGION);
-  $form = &$aVars['form'];
-  $class = array('node-form', 'clearfix');
-
-  $regions = array();
-  $has_elements = array();
-  $weight = 0;
-  foreach (nodeformcols_form_regions() as $name => $title) {
-    $regions[$name] = array(
-      '#prefix' => '<div class="form-region-' . $name . '">',
-      '#suffix' => '</div>',
-      '#weight' => $weight,
-    );
-    $weight++;
-  }
-
-  drupal_alter('nodeformcols_pre_placement', $form);
-  $variant = isset($form['#nodeformcols_variant']) ? $form['#nodeformcols_variant'] : 'default';
-  $placements = nodeformscols_field_placements($form['#node']->type, $variant);
-
-  // Track if new fields should be adjusted above the buttons.
-  // TODO: This should be generalized to a way to tell nodeformcols where to place new fields (above below field X).
-  $adjust_to_buttons = isset($placements['buttons']['region']) && ($placements['buttons']['region'] == $default_region);
-
-  foreach (element_children($form) as $key) {
-    $field = $form[$key];
-    if (isset($field['#type']) && in_array($field['#type'], array('value', 'hidden', 'token')) ||
-        (isset($field['#access']) && $field['#access'] == FALSE)) {
-      continue;
-    }
-
-<<<<<<< HEAD
-    if (isset($placements[$key])) {
-      $p = $placements[$key];
-
-=======
-		if (isset($placements[$key])) {
-			$p = $placements[$key];
-			
->>>>>>> parent of 02b3130... extra field via form_alter patch
-      if (isset($p['weight'])) {
-        $field['#weight'] = $p['weight'];
-      }
-      if (isset($p['collapsed']) && isset($field['#collapsible']) && $field['#collapsible']) {
-        $field['#collapsed'] = $p['collapsed'];
-      }
-      $regions[$p['region']][$key] = $field;
-      $has_elements[$p['region']] = TRUE;
-      unset($form[$key]);
-    }
-    else { // Set the default placement for unknown fields
-      $regions[$default_region][$key] = $field;
-      if ($adjust_to_buttons && $regions[$default_region][$key]['#weight'] >= $placements['buttons']['weight']) {
-        $regions[$default_region][$key]['#weight'] = $placements['buttons']['weight'] - .1;
-      }
-      $has_elements[$default_region] = TRUE;
-      unset($form[$key]);
-    }
-  }
-
-  foreach ($has_elements as $name => $has) {
-    if ($has) {
-      $class[] = 'node-form-has-region-' . $name;
-      $form['nodeformcols_region_' . $name] = $regions[$name];
-    }
-  }
-
-  $aVars['class'] = join($class, ' ');
-}
-
-/**
- * Implementation of hook_node_type_delete().
- */
-function nodeformcols_node_type_delete($info) {
-  $result = db_select('variable')
-    ->condition('name', 'nodeformscols_field_placements_' . $info->old_type . '%', 'LIKE')
-    ->fields('variable', array('name'))
-    ->execute();
-  foreach ($result as $row) {
-    variable_del($row->name);
-  }
-}
-
-/**
- * Implementation of hook_node_type_update().
- */
-function nodeformcols_node_type_update($info) {
-  if (!empty($info->old_type) && $info->old_type != $info->type) {
-    $base = 'nodeformscols_field_placements_' . $info->old_type;
-    $new_base = 'nodeformscols_field_placements_' . $info->type;
-    $result = db_select('variable')
-      ->condition('name', $base . '%', 'LIKE')
-      ->fields('variable', array('name'))
-      ->execute();
-    foreach ($result as $row) {
-      $value = variable_get($row->name, NULL);
-      $new_name = str_replace($base, $new_base, $row->name);
-      variable_set($new_name, $value);
-      variable_del($row->name);
-    }
-  }
-}