changeset 0:56772e0a00ae

Import of dev version (2009-01-19)
author Franck Deroche <franck@defr.org>
date Wed, 21 Jan 2009 11:19:01 +0100
parents
children ece8e4be4d6f e1318a313b1d
files CHANGELOG.txt LICENSE.txt README.txt popups_reference.info popups_reference.js popups_reference.module
diffstat 6 files changed, 508 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CHANGELOG.txt	Wed Jan 21 11:19:01 2009 +0100
@@ -0,0 +1,14 @@
+Drupal-6-1-0-RC1
+New Features
+ * http://drupal.org/node/310019 - Checkbox to toggle the "Add New:" links per field. Funded by Agaric Design.
+ * http://drupal.org/node/308589 - Select the newly created node (requres Popups API 1.2RC1 or newer). Funded by Agaric Design
+ * Added support for radio buttons widget.
+Other 
+ * Better comments and function documentation.
+ 
+Drupal-6--1-0-BETA2
+ * http://drupal.org/node/322600 - test if user has permission to do any adds before showing "Add new" text.
+ * http://drupal.org/node/325720 (jhodgdon ) - fix for content types with '_'s in them.
+
+Drupal-6--1-0-BETA1
+* Working w/Popups Api RC2
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE.txt	Wed Jan 21 11:19:01 2009 +0100
@@ -0,0 +1,274 @@
+GNU GENERAL PUBLIC LICENSE
+
+              Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+                  Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software and to any other
+program whose authors commit to using it. (Some other Free Software
+Foundation software is covered by the GNU Library General Public License
+instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service if
+you wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems
+introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+           GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+               MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is to say, a work
+containing the Program or a portion of it, either verbatim or with
+modifications and/or translated into another language. (Hereinafter, translation
+is included without limitation in the term "modification".) Each licensee is
+addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made
+by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print such
+an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be
+reasonably considered independent and separate works in themselves, then
+this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part
+of a whole which is a work based on the Program, the distribution of the
+whole must be on the terms of this License, whose permissions for other
+licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to
+control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the scope
+of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above
+on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object
+code or executable form with such an offer, in accord with Subsection b
+above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the
+Program (or any work based on the Program), you indicate your acceptance
+of this License to do so, and all its terms and conditions for copying,
+distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that
+version or of any later version published by the Free Software Foundation. If
+the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+               NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.
+
+          END OF TERMS AND CONDITIONS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.txt	Wed Jan 21 11:19:01 2009 +0100
@@ -0,0 +1,6 @@
+In-place popup to add a new node to Node Reference widget.
+Initial inspiration: Add and Reference by tema (http://drupal.org/project/add_n_reference)
+
+TODO 
+ * Fix losing highlighted selections on node add with multi-select box.
+ 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/popups_reference.info	Wed Jan 21 11:19:01 2009 +0100
@@ -0,0 +1,14 @@
+; $Id: popups_reference.info,v 1.1.2.1 2008/12/23 22:38:21 starbow Exp $
+name = Popups: Add & Reference
+description = In-place popup to add a new node to Node Reference widget. 
+package = User interface
+core = 6.x
+dependencies[] = popups 
+dependencies[] = content
+
+; Information added by drupal.org packaging script on 2009-01-19
+version = "6.x-1.x-dev"
+core = "6.x"
+project = "popups_reference"
+datestamp = "1232323985"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/popups_reference.js	Wed Jan 21 11:19:01 2009 +0100
@@ -0,0 +1,49 @@
+// $Id: popups_reference.js,v 1.1.2.1 2009/01/18 22:40:33 starbow Exp $
+
+/**
+ * Popups: Add and Reference behavior
+ * 
+ * Adds the behavior of selecting the newly created node.
+ */
+
+/**
+ * Parse the cookies to find a value.
+ *
+ * @param name of cookie value.
+ */ 
+function popups_reference_get_cookie_value(name) {
+  name += '=';
+  var cookies = document.cookie.split(';');
+  for (var i=0; i < cookies.length; i++) {
+    var cookie = jQuery.trim(cookies[i]);
+    if (cookie.indexOf(name) === 0) {
+      return cookie.substring(name.length, cookie.length);
+    }
+  }
+}
+
+/**
+ * Attach the behavior.
+ */
+Drupal.behaviors.popups_reference = function(context) {
+  $('.popups-reference', context).not('.popups-reference-processed').each(function() {
+    $(this).addClass('popups-reference-processed'); // Don't re-add to processed links.
+    $(this).click(function() {
+      var rel = $(this).attr('rel'); // Rel attribute of the clicked link is the wrapper id.
+      var $wrapper = $('#' + rel);
+      // Unbind namespaced event, so bindings don't pile up every click.
+      $(document).unbind('popups_form_success.popups_reference');
+      
+      // Bind to the popups API custom form_success event.
+      $(document).bind('popups_form_success.popups_reference', function() {
+        // Info about the new node was placed in a cookie when it was created.
+        var nid = popups_reference_get_cookie_value('PopupRefNid');
+        var title = popups_reference_get_cookie_value('PopupRefTitle');
+        $wrapper.find('select').val(nid); // Select
+        $wrapper.find('input.form-autocomplete').val(title); // Autocomplete
+        $wrapper.find(':radio[value=' + nid + ']').select(); // Radio buttons
+      });
+    });
+  });
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/popups_reference.module	Wed Jan 21 11:19:01 2009 +0100
@@ -0,0 +1,151 @@
+<?php
+// $Id: popups_reference.module,v 1.1.2.6 2009/01/18 22:40:33 starbow Exp $
+
+/**
+ * @file
+ * Modify the Node Reference widget to use a popup to add a new node.
+ */ 
+
+
+/**
+ * Implementation of hook_form_alter().
+ * 
+ * Modifies the nodereference setting form and the basic node form. 
+ */
+function popups_reference_form_alter(&$form, $form_state, $form_id) {
+  if ($form_id == 'content_field_edit_form') {
+    // Add a checkbox to the nodereference settings page.
+    $field_name = $form['#field']['field_name'];
+    $form['field']['show_add_link'] = array(
+    '#type' => 'checkbox',
+      '#default_value' => variable_get('popups_reference_show_add_link_'. $field_name, TRUE),
+      '#title' => t('Show the "Add New: Node Type" Popup links'),
+      '#description' => t("Activate Popups:Add and Reference behavior for this reference.")
+    );
+    $form['#submit'][] = '_popups_reference_manage_fields_submit';
+  }
+  elseif (isset($form['type'])) {
+    // Add the "Add New: Node Type" links.
+    $node = $form['#node'];
+    if ($form['type']['#value'] .'_node_form' == $form_id) {  
+      $fields = content_fields();
+      foreach ($form as $key => $item) {
+        if (is_array($item)) {
+          $type = $item['#type'];
+          if ($type == 'fieldset') { // Loop through all the subitems.
+            foreach ($form[$key] as $subkey => $subitem) {
+              popups_reference_alter_item($form[$key], $subkey, $subitem, $fields);
+            }
+          }
+          else {
+            popups_reference_alter_item($form, $key, $item, $fields);
+          }
+        }
+        
+      }
+    }
+  }
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ * Add cookies with node info when a new node is created.
+ * These cookies will be found by the popups_reference behavior and used
+ *   to select the newly created node in the reference widget.
+ */ 
+function popups_reference_nodeapi($node, $op) {
+  if ($op == 'insert') {
+      $five = time()+300; // 5 minutes in the future.
+      setcookie("PopupRefNid", $node->nid, $five, '/'); 
+      setcookie("PopupRefTitle", $node->title, $five, '/');
+  }
+}
+
+/**
+ * Submit added to the the nodereference settings form.
+ * Set a variable for each nodereference field.
+ */
+function _popups_reference_manage_fields_submit($form, &$form_state) {
+  $field_name = $form['#field']['field_name'];
+  variable_set('popups_reference_show_add_link_'. $field_name, $form_state['values']['show_add_link']);
+}
+
+/**
+ * Run on every element in the basic node form.
+ * Wrap the enabled nodereference fields, and add the popup links.
+ *
+ * @param $form - the form (or fieldgroup).
+ * @param $key - form element name.
+ * @param $item - the form element array.
+ * @param $fields - all fields info.
+ */
+function popups_reference_alter_item(&$form, $key, $item, $fields) {  
+  $field_name = strstr($key, 'field_'); // Check if $key starts with 'field_';
+  if (isset($fields[$field_name]) && 
+      $fields[$field_name]['type'] == 'nodereference' &&
+      variable_get('popups_reference_show_add_link_'. $field_name, TRUE)) {
+    $type = $form['type']['#value'];
+    $field = content_fields($field_name, $form['type']['#value']);
+
+    $wrapper_id = 'popups-reference-' . _popups_reference_counter();
+    $links = _popups_reference_links($field, $type, $wrapper_id, $field['widget']['type']);
+    if ($links) {
+      // Put the nodereference widget and links in an wrapper.
+      // Makes it easy to find for Ahah targeting, and popups_reference behavior selecting.
+      $form[$key]['#prefix'] = '<div id="'. $wrapper_id .'">';
+      $form[$key]['#suffix'] = '<div>Add New: ' . implode(', ', $links) .'</div></div>';
+    }
+  }
+}
+
+/**
+ * Generates 'Add new...' link
+ * for each allowed content type
+ *
+ * @param $field
+ * @param $src_type - the type of base node.
+ * @param $wrapper_id - id for the wrapper around the node reference.
+ * @param $type - the type of the node being referenced.
+ * @return Array of html links.
+ */
+function _popups_reference_links($field, $src_type, $wrapper_id, $type) {
+  if ($type == 'nodereference_select' || $type == 'nodereference_buttons') { 
+    // Target the wrapper for replacing.
+    popups_add_popups(array('a.'.$wrapper_id=>array('targetSelectors'=>array('#'.$wrapper_id))));
+  }
+  else if ($type == 'nodereference_autocomplete') { 
+    // Don't replace the autocomplete when done.
+    popups_add_popups(array('a.'.$wrapper_id=>array('noUpdate'=>TRUE)));
+  }
+  else { // Unsupported type.
+    return;
+  }
+  $options = array(
+    'attributes' => array(
+      'class' => $wrapper_id . ' popups-reference', 
+      'rel' => $wrapper_id,
+  ),
+    'query' => array('destination' => 'node/add/' . str_replace('_', '-', $src_type)),  
+  );
+  $links = array();
+  $all_types = node_get_types();
+  foreach ($field['referenceable_types'] as $add_type => $value) {
+    if (!empty($value) && user_access("create $add_type content")) {
+      drupal_add_js(drupal_get_path('module', 'popups_reference') .'/popups_reference.js');
+      $path = 'node/add/' . str_replace('_', '-', $add_type);
+      $links[] = l("Add $add_type", $path, $options);
+    }
+  }
+  return $links;
+}
+
+/**
+ * A counter for generating unique element id's.
+ *
+ * @return int: next integer.
+ */
+function _popups_reference_counter() {
+  static $count = 0;
+  return $count++;
+}
+