Issue #1167194 and #1171922 by MrDamasajaga: New 2.x branch with all the new functions and configurtion improvements.

6 files changed, 458 insertions, 161 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 0000000..4d0e9a3
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1,4 @@
+
+FB Like Button 7.x-2.x, xxxx-xx-xx
+-----------------------------
+
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..2c095c8
--- /dev/null
+++ b/LICENSE.txt
@@ -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
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..b07bd94
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,31 @@
+Drupal colorbox module:
+------------------------
+Maintainers:
+  Daniël Smidt (http://drupal.org/user/198330)
+  Jeremy Trojan (http://drupal.org/user/334965)
+Requires - Drupal 7
+License - GPL (see LICENSE)
+
+Overview:
+--------
+Rather than having to manually copy/paste the "Like this on Facebook" code for each piece of content you (or your users) create, this module will automatically add that code to the end of each chosen node type. You are able to add a Like button which likes a given URL (static, e.g. your homepage) or/and put a dynamic Like button on your page to like the page you are actually visiting.
+
+Features:
+---------
+
+The Facebook like button module:
+
+* Adds a like button on your site (static)
+* Add more like buttons to your site (dynamic)
+* Control the position of the buttons
+
+Installation:
+------------
+
+Configuration:
+-------------
+Go to "Configuration" -> "FB LIKE BUTTON" to find
+all the configuration options.
+
+Contributions:
+-------------
\ No newline at end of file
diff --git a/fblikebutton.admin.inc b/fblikebutton.admin.inc
index fd1a259..cdaed7e 100644
--- a/fblikebutton.admin.inc
+++ b/fblikebutton.admin.inc
@@ -7,71 +7,91 @@
  */
 
 /**
- * Settings for nodes.
+ * Settings for the dynamic FB button in full node viewmode and teaser viewmode.
  */
-function fblikebutton_admin_settings() {
+function fblikebutton_dynamic_settings() {
   $fblikebutton_node_options = node_type_get_names();
-  $form['fblikebutton_node_types'] = array(
+  $form['fblikebutton_dynamic_description'] = array(
+    '#markup' => '<p>' . t('Configure the dynamic Like button. This Like button will like the URL you\'r visiting. You can set the content types on which the button displays, choose to display it in the content block or it\'s own block and set the appearance.') . '</p>',
+  );
+  $form['fblikebutton_dynamic_visibility'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Visibility settings'),
+    '#collapsible' => FALSE,
+  );  
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_node_types'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Display the Like button on these content types:'),
     '#options' => $fblikebutton_node_options,
     '#default_value' => variable_get('fblikebutton_node_types', array('article')),
     '#description' => t('Each of these content types will have the "like" button automatically added to them.'),
   );
-  $form['fblikebutton_showonteasers'] = array(
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_full_node_display'] = array(
+    '#type' => 'radios',
+    '#title' => t('Where do you want to show the Like button (full node view)?'),
+    '#options' => array(t('Content area'), t('Own block'), t('Links area')),
+    '#default_value' => variable_get('fblikebutton_full_node_display', 0),
+    '#description' => t('If <em>Content area</em> is selected, the button will appear in the same area as the node content. If <em>Own block</em> is selected the Like button gets it\'s own block, which you can position at the ' . l(t('block page'), 'admin/structure/block') . '. When you select <em>Links area</em> the Like button will be visible in the links area, usually at the bottom of the node (When you select this last option you may want to adjust the Appearance settings).'),
+  );
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_teaser_display'] = array(
     '#type' => 'radios',
-    '#title' => t('Display on teasers?'),
-    '#options' => array(t('No'), t('Yes')),
-    '#default_value' => variable_get('fblikebutton_showonteasers', 0),
-    '#description' => t('If <em>Yes</em> is selected, the button will appear even when the node being viewed is a teaser. Otherwise it will only appear when the full node is being viewed.'),
+    '#title' => t('Where do you want to show the Like button on teasers?'),
+    '#options' => array(t('Don\'t show on teasers'), t('Content area'), t('Links area')),
+    '#default_value' => variable_get('fblikebutton_teaser_display', 0),
+    '#description' => t('If you want to show the like button on teasers you can select the display area.'),
   );
-  $form['fblikebutton_iframe_width'] = array(
+  $form['fblikebutton_dynamic_appearance'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Appearance settings'),
+    '#collapsible' => FALSE,
+  );  
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_iframe_width'] = array(
     '#type' => 'textfield',
     '#title' => t('Width of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_iframe_width', '450'),
     '#description' => t('Width of the iframe, in pixels. Default is 450. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_iframe_height'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_iframe_height'] = array(
     '#type' => 'textfield',
     '#title' => t('Height of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_iframe_height', '80'),
     '#description' => t('Height of the iframe, in pixels. Default is 80. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_iframe_css'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_iframe_css'] = array(
     '#type' => 'textfield',
     '#title' => t('Extra css styling needed'),
     '#default_value' => variable_get('fblikebutton_iframe_css', ''),
     '#description' => t('Extra css attributes needed to make the iframe behave for your specific requirements. Will not necessarily overwrite existing styling. To alter the dimensions of the iframe, use the height and width fields found above.<br/>Example: <em>float: right; padding: 5px;</em>'),
   );
-  $form['fblikebutton_layout'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_layout'] = array(
     '#type' => 'select',
     '#title' => t('Layout style'),
     '#options' => array('standard' => t('Standard'), 'box_count' => t('Box Count'), 'button_count' => t('Button Count')),
     '#default_value' => variable_get('fblikebutton_layout', 'standard'),
     '#description' => t('Determines the size and amount of social context next to the button.'),
   );
-  $form['fblikebutton_show_faces'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_show_faces'] = array(
     '#type' => 'select',
     '#title' => t('Show faces in the box?'),
     '#options' => array('show' => t('Show faces'), 'hide' => t('Do not show faces')),
     '#default_value' => variable_get('fblikebutton_show_faces', 'show'),
     '#description' => t('Show profile pictures below the button. Only works if <em>Layout style</em> (found above) is set to <em>Standard</em> (otherwise, value is ignored).'),
   );
-  $form['fblikebutton_action'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_action'] = array(
     '#type' => 'select',
     '#title' => t('Verb to display'),
     '#options' => array('like' => t('Like'), 'recommend' => t('Recommend')),
     '#default_value' => variable_get('fblikebutton_action', 'like'),
     '#description' => t('The verbiage to display inside the button itself.'),
   );
-/**  $form['fblikebutton_displaysend'] = array(
+/**  $form['fblikebutton_dynamic_appearance']['fblikebutton_displaysend'] = array(
     '#type' => 'select',
     '#title' => t('Display <em>send</em> option?'),
     '#options' => array('true' => t('Display'), 'false' => t('Do not display')),
     '#default_value' => variable_get('fblikebutton_displaysend', 'false'),
     '#description' => t('Optionally display the <em>Send</em> button next to the <em>Like/Recommend</em> box.<br/><strong>Note: this feature is currently unavailable from Facebook.</strong> Although setting the value to <em>Display</em> will not hurt anything, the output will not be affected either way.'),
   ); */
-  $form['fblikebutton_font'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_font'] = array(
     '#type' => 'select',
     '#title' => t('Font'),
     '#options' => array('arial' => 'Arial',
@@ -83,22 +103,22 @@ function fblikebutton_admin_settings() {
     '#default_value' => variable_get('fblikebutton_font', 'arial'),
     '#description' => t('The font with which to display the text of the button.'),
   );
-  $form['fblikebutton_color_scheme'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_color_scheme'] = array(
     '#type' => 'select',
     '#title' => t('Color scheme'),
     '#options' => array('light' => t('Light'), 'dark' => t('Dark')),
     '#default_value' => variable_get('fblikebutton_color_scheme', 'light'),
     '#description' => t('The color scheme of the box environtment.'),
   );
-  $form['fblikebutton_weight'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_weight'] = array(
     '#type' => 'select',
     '#title' => t('Weight'),
     // Note to self: THIS has GOT to change...
     '#options' => array('-50' => '-50', '-49' => '-49', '-48' => '-48', '-47' => '-47', '-46' => '-46', '-45' => '-45', '-44' => '-44', '-43' => '-43', '-42' => '-42', '-41' => '-41', '-40' => '-40', '-39' => '-39', '-38' => '-38', '-37' => '-37', '-36' => '-36', '-35' => '-35', '-34' => '-34', '-33' => '-33', '-32' => '-32', '-31' => '-31', '-30' => '-30', '-29' => '-29', '-28' => '-28', '-27' => '-27', '-26' => '-26', '-25' => '-25', '-24' => '-24', '-23' => '-23', '-22' => '-22', '-21' => '-21', '-20' => '-20', '-19' => '-19', '-18' => '-18', '-17' => '-17', '-16' => '-16', '-15' => '-15', '-14' => '-14', '-13' => '-13', '-12' => '-12', '-11' => '-11', '-10' => '-10', '-9' => '-9', '-8' => '-8', '-7' => '-7', '-6' => '-6', '-5' => '-5', '-4' => '-4', '-3' => '-3', '-2' => '-2', '-1' => '-1', '0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20', '21' => '21', '22' => '22', '23' => '23', '24' => '24', '25' => '25', '26' => '26', '27' => '27', '28' => '28', '29' => '29', '30' => '30', '31' => '31', '32' => '32', '33' => '33', '34' => '34', '35' => '35', '36' => '36', '37' => '37', '38' => '38', '39' => '39', '40' => '40', '41' => '41', '42' => '42', '43' => '43', '44' => '44', '45' => '45', '46' => '46', '47' => '47', '48' => '48', '49' => '49', '50' => '50'),    
     '#default_value' => variable_get('fblikebutton_weight', '50'),
-    '#description' => t('The weight determines where on a node the like button will appear. The larger the weight, the lower it will appear on the node. For example, if you want the button to appear more toward the top of the node, choose <em>-40</em> as opposed to <em>-39, -38, 0, 1,</em> or <em>50,</em> etc.'),
+    '#description' => t('The weight determines where, at the content block, the like button will appear. The larger the weight, the lower it will appear on the node. For example, if you want the button to appear more toward the top of the node, choose <em>-40</em> as opposed to <em>-39, -38, 0, 1,</em> or <em>50,</em> etc. To position the Like button in its own block, go to the ' . l(t('block page'), 'admin/structure/block') . '.'),
     );
-  $form['fblikebutton_language'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_language'] = array(
     '#type' => 'textfield',
     '#title' => t('Language'),
     '#default_value' => variable_get('fblikebutton_language', 'en_US'),
@@ -108,42 +128,50 @@ function fblikebutton_admin_settings() {
 }
 
 /**
- * Settings for the block.
+ * Settings for the static FB Like button block.
  */
-function fblikebutton_block_settings() {
+function fblikebutton_static_settings() {
   global $base_url;
-  $form['fblikebutton_block_url'] = array(
+  $form['fblikebutton_static_block_description'] = array(
+          '#markup' => '<p>' . t('Set the static URL to like with the button. This Like button will like the given URL, no matter on which page it is displayed. To position this block go the ' . l(t('block page'), 'admin/structure/block') . '.</p>'),
+  );
+  $form['fblikebutton_static_block_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Button settings'),
+    '#collapsible' => FALSE,
+  );
+  $form['fblikebutton_static_block_settings']['fblikebutton_block_url'] = array(
     '#type' => 'textfield',
     '#default_value' => variable_get('fblikebutton_block_url', $base_url),
-    '#description' => t('URL of your homepage to like')
+    '#description' => t('URL of the page to like (could be your homepage or a facebook page e.g.)')
   );
-  $form['fblikebutton_block'] = array(
+  $form['fblikebutton_static_block_appearance'] = array(
     '#type' => 'fieldset',
-    '#title' => 'Block configuration',
-    '#collapsible' => false,
+    '#title' => t('Button appearance'),
+    '#collapsible' => FALSE,
   );
-  $form['fblikebutton_block']['fblikebutton_bl_layout'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_layout'] = array(
     '#type' => 'select',
     '#title' => t('Layout style'),
     '#options' => array('standard' => t('Standard'), 'box_count' => t('Box Count'), 'button_count' => t('Button Count')),
     '#default_value' => variable_get('fblikebutton_bl_layout', 'standard'),
     '#description' => t('Determines the size and amount of social context next to the button'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_show_faces'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_show_faces'] = array(
     '#type' => 'select',
     '#title' => t('Display faces in the box'),
     '#options' => array('show' => t('Show faces'), 'hide' => t('Do not show faces')),
     '#default_value' => variable_get('fblikebutton_bl_show_faces', 'show'),
     '#description' => t('Show profile pictures below the button. Only works with Standard layout'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_action'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_action'] = array(
     '#type' => 'select',
     '#title' => t('Verb to display'),
     '#options' => array('like' => t('Like'), 'recommend' => t('Recommend')),
     '#default_value' => variable_get('fblikebutton_bl_action', 'like'),
     '#description' => t('The verb to display in the button.'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_font'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_font'] = array(
     '#type' => 'select',
     '#title' => t('Font'),
     '#options' => array('arial' => 'Arial',
@@ -155,32 +183,32 @@ function fblikebutton_block_settings() {
     '#default_value' => variable_get('fblikebutton_bl_font', 'arial'),
     '#description' => t('The font to display in the button'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_color_scheme'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_color_scheme'] = array(
     '#type' => 'select',
     '#title' => t('Color scheme'),
     '#options' => array('light' => t('Light'), 'dark' => t('Dark')),
     '#default_value' => variable_get('fblikebutton_bl_color_scheme', 'light'),
     '#description' => t('The color scheme of box environtment'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_iframe_width'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_iframe_width'] = array(
     '#type' => 'textfield',
     '#title' => t('Width of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_bl_iframe_width', '450'),
     '#description' => t('Width of the iframe, in pixels. Default is 450. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_iframe_height'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_iframe_height'] = array(
     '#type' => 'textfield',
     '#title' => t('Height of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_bl_iframe_height', '80'),
     '#description' => t('Height of the iframe, in pixels. Default is 80. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_iframe_css'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_iframe_css'] = array(
     '#type' => 'textfield',
     '#title' => t('Extra css styling needed'),
     '#default_value' => variable_get('fblikebutton_bl_iframe_css', ''),
     '#description' => t('Extra css attributes needed to make the iframe behave for your specific requirements. Will not necessarily overwrite existing styling. To alter the dimensions of the iframe, use the height and width fields found above.<br/>Example: <em>float: right; padding: 5px;</em>'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_language'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_block']['fblikebutton_bl_language'] = array(
     '#type' => 'textfield',
     '#title' => t('Language'),
     '#default_value' => variable_get('fblikebutton_language', 'en_US'),
diff --git a/fblikebutton.install b/fblikebutton.install
index 478edf9..b3e8265 100644
--- a/fblikebutton.install
+++ b/fblikebutton.install
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Install, update, and uninstall functions for the fblikebutton module.
+ */
 // $Id$
 
 /**
@@ -12,6 +16,8 @@ function fblikebutton_install() {
  * Implementation of hook_uninstall().
  */
 function fblikebutton_uninstall() {
+  variable_del('fblikebutton_full_node_display');
+  variable_del('fblikebutton_bl_iframe_css');
   variable_del('fblikebutton_node_types');
   variable_del('fblikebutton_show_faces');
   variable_del('fblikebutton_layout');
@@ -23,7 +29,7 @@ function fblikebutton_uninstall() {
   variable_del('fblikebutton_displaysend');
   variable_del('fblikebutton_font');
   variable_del('fblikebutton_weight');
-  variable_del('fblikebutton_showonteasers');
+  variable_del('fblikebutton_teaser_display');
   variable_del('fblikebutton_xfbml');
   variable_del('fblikebutton_appid');
   variable_del('fblikebutton_bl_layout');
diff --git a/fblikebutton.module b/fblikebutton.module
index 0992cb4..cb191b6 100644
--- a/fblikebutton.module
+++ b/fblikebutton.module
@@ -22,21 +22,21 @@ function fblikebutton_menu() {
     'file' => 'system.admin.inc',
     'file path' => drupal_get_path('module', 'system'),
   );
-  $items['admin/config/fblikebutton/general'] = array(
-    'title' => 'General settings',
-    'description' => 'Configure the settings for the Like button as it appears on individual nodes.',
+  $items['admin/config/fblikebutton/dynamic'] = array(
+    'title' => 'Dynamic Like button settings',
+    'description' => 'Configure the settings for the Like button as it appears on individual nodes (liking that node).',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('fblikebutton_admin_settings'),
+    'page arguments' => array('fblikebutton_dynamic_settings'),
     'access arguments' => array('administer fblikebutton'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'fblikebutton.admin.inc',
     'weight' => 0,
   );
-  $items['admin/config/fblikebutton/block'] = array(
-    'title' => 'Block settings',
-    'description' => 'Configure the settings for the Like button as it appears in the block.',
+  $items['admin/config/fblikebutton/static'] = array(
+    'title' => 'Static Like button settings',
+    'description' => 'Configure the settings for the static Like button as it appears in the block (liking a given url). Use this to like for example your Facebook fanpage.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('fblikebutton_block_settings'),
+    'page arguments' => array('fblikebutton_static_settings'),
     'access arguments' => array('administer fblikebutton block'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'fblikebutton.admin.inc',
@@ -51,7 +51,8 @@ function fblikebutton_menu() {
 function fblikebutton_node_view($node, $view_mode) {
   global $user, $base_url;
   $types = variable_get('fblikebutton_node_types', array());
-  $showonteasers = variable_get('fblikebutton_showonteasers', 0);
+  $fullnodedisplay = variable_get('fblikebutton_full_node_display', 0);
+  $teaserdisplay = variable_get('fblikebutton_teaser_display', 0);
   $full = ($view_mode == 'full') ? TRUE : FALSE;
   $show = ( ! empty($types[$node->type]) && user_access('access fblikebutton'));
   // Thanks to corbacho for supplying the code for the $webpage_to_like variable...
@@ -71,28 +72,25 @@ function fblikebutton_node_view($node, $view_mode) {
     'language' => variable_get('fblikebutton_language', 'en_US'),
   );
   if ($show) {
-    if ($showonteasers == 0) {
-      if ($view_mode == 'teaser') {
-        $node->content['fblikebutton_field'] = NULL;
-      }
-      if ($view_mode == 'full') {
-        $node->content['fblikebutton_field'] = array(
-          '#markup' => _fblikebutton_field($webpage_to_like, $conf),
-          '#weight' => $likebutton_weight,
-        );
-      }
-    }
-    elseif ($showonteasers == 1) {
-      if ($view_mode == 'teaser' || $view_mode == 'full') {
-        $node->content['fblikebutton_field'] = array(
-         '#markup' => _fblikebutton_field($webpage_to_like, $conf),
+      
+  // Content area
+    if (($view_mode == 'teaser' && $teaserdisplay == 1) || ($view_mode == 'full' && $fullnodedisplay == 0)) {
+      $node->content['fblikebutton_field'] = array(
+        '#markup' => _fblikebutton_field($webpage_to_like, $conf),
         '#weight' => $likebutton_weight,
-        );
-      }
+      );
+    }
+  // Link area
+    if (($view_mode == 'teaser' && $teaserdisplay == 2) || ($view_mode == 'full' && $fullnodedisplay == 2)) {
+      $node->content['links']['#links']['fblikebutton_field'] = array(
+        'title' => _fblikebutton_field($webpage_to_like, $conf),
+        'html' => TRUE,
+      );
     }
   }
 }
 
+
 /**
  * Implements of hook_permission().
  */
@@ -117,9 +115,15 @@ function fblikebutton_permission() {
  * Implementation of hook_block_info()
  */
 function fblikebutton_block_info() {
-  $blocks['fblikebutton_block'] = array(
-    'info' => t('FB Like button'),
+  $fullnodedisplay = variable_get('fblikebutton_full_node_display', 0);
+  $blocks['fblikebutton_static_block'] = array(
+    'info' => t('Static FB Like button'),
   );
+  if ($fullnodedisplay == 1) {
+    $blocks['fblikebutton_dynamic_block'] = array(
+      'info' => t('Dynamic FB Like button'),
+    );
+  }
   return $blocks;
 }
 
@@ -129,115 +133,64 @@ function fblikebutton_block_info() {
 function fblikebutton_block_configure($delta = '') {
   global $base_url;
   $form = array();
-  if ($delta == 'fblikebutton_block') {
-    $form['fblikebutton_block_url'] = array(
-      '#title' => t('Homepage URL'),
-      '#type' => 'textfield',
-      '#default_value' => variable_get('fblikebutton_block_url', $base_url),
-      '#description' => t('URL of your homepage to like'),
-    );
-    $form['block'] = array(
+  if ($delta == 'fblikebutton_static_block') {
+    $form['fblikebutton_static_block'] = array(
       '#type' => 'fieldset',
-      '#collapsible' => false,
-      '#collapsed' => false,
-      '#title' => t('Options'),
-      '#description' => '',
-    );
-    $form['block']['fblikebutton_bl_layout'] = array(
-      '#type' => 'select',
-      '#title' => t('Layout style'),
-      '#options' => array('standard' => t('Standard'), 'box_count' => t('Box Count'), 'button_count' => t('Button Count')),
-      '#default_value' => variable_get('fblikebutton_bl_layout', 'standard'),
-      '#description' => t('Determines the size and amount of social context next to the button'),
-    );
-    $form['block']['fblikebutton_bl_show_faces'] = array(
-      '#type' => 'select',
-      '#title' => t('Display faces in the box'),
-      '#options' => array('show' => t('Show faces'), 'hide' => t('Do not show faces')),
-      '#default_value' => variable_get('fblikebutton_bl_show_faces', 'show'),
-      '#description' => t('Show profile pictures below the button. Only work on Standard layout'),
-    );
-    $form['block']['fblikebutton_bl_action'] = array(
-      '#type' => 'select',
-      '#title' => t('Verb to display'),
-      '#options' => array('like' => t('Like'), 'recommend' => t('Recommend')),
-      '#default_value' => variable_get('fblikebutton_bl_action', 'like'),
-      '#description' => t('The verb to display in the button.'),
-    );
-    $form['block']['fblikebutton_bl_font'] = array(
-    '#type' => 'select',
-    '#title' => t('Font'),
-    '#options' => array('arial' => 'Arial',
-                'lucida+grande' => 'Lucida Grande',
-                'segoe+ui' => 'Segoe UI',
-                'tahoma' => 'Tahoma',
-                'trebuchet+ms' => 'Trebuchet MS',
-                'verdana' => 'Verdana'),
-    '#default_value' => variable_get('fblikebutton_bl_font', 'arial'),
-    '#description' => t('The font to display in the button'),
+      '#title' => t('Static FB Like button block'),
+      '#collapsible' => FALSE,
+    );  
+    $form['fblikebutton_static_block']['fblikebutton_static_config'] = array(
+      '#markup' => '<p>' . t('To configure the URL and the appearance of the button go to the ' . l(t('static Like button settings'), 'admin/config/fblikebutton/static') . '. Make sure you set the right permissions on the ' . l(t('permissions page'), 'admin/people/permissions') . '.</p>'),
     );
-    $form['block']['fblikebutton_bl_color_scheme'] = array(
-    '#type' => 'select',
-    '#title' => t('Color scheme'),
-    '#options' => array('light' => t('Light'), 'dark' => t('Dark')),
-    '#default_value' => variable_get('fblikebutton_bl_color_scheme', 'light'),
-    '#description' => t('The color scheme of box environtment'),
+  }
+  if ($delta == 'fblikebutton_dynamic_block') {
+    $form['fblikebutton_dynamic_block'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Dynamic FB Like button block'),
+      '#collapsible' => FALSE,
+    );  
+    $form['fblikebutton_dynamic_block']['fblikebutton_dynamic_config'] = array(
+      '#markup' => '<p>' . t('To configure the visibility and the appearance of the button go to the ' . l(t('dynamic Like button settings'), 'admin/config/fblikebutton/dynamic') . '. You can enhance the visibility settings by using the settings on this page. Make sure you set the right permissions on the ' . l(t('permissions page'), 'admin/people/permissions') . '.</p>'),
     );
-  $form['block']['fblikebutton_bl_iframe_width'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Width of the iframe (px)'),
-    '#default_value' => variable_get('fblikebutton_bl_iframe_width', '450'),
-    '#description' => t('Width of the iframe, in pixels. Default is 450. <em>Note: lower values may crop the output.</em>'),
-  );
-  $form['block']['fblikebutton_bl_iframe_height'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Height of the iframe (px)'),
-    '#default_value' => variable_get('fblikebutton_bl_iframe_height', '80'),
-    '#description' => t('Height of the iframe, in pixels. Default is 80. <em>Note: lower values may crop the output.</em>'),
-  );
-  $form['block']['fblikebutton_bl_iframe_css'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Extra css styling needed'),
-    '#default_value' => variable_get('fblikebutton_bl_iframe_css', ''),
-    '#description' => t('Extra css attributes needed to make the iframe behave for your specific requirements. Will not necessarily overwrite existing styling. To alter the dimensions of the iframe, use the height and width fields found above.<br/>Example: <em>float: right; padding: 5px;</em>'),
-  );
-  $form['block']['fblikebutton_bl_language'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Language'),
-    '#default_value' => variable_get('fblikebutton_language', 'en_US'),
-    '#description' => t('Specific language to use. Default is English. Examples:<br/>French (France): <em>fr_FR</em><br/>French (Canada): <em>fr_CA</em>'),
-  );
   }
   return $form;
 }
 
 /**
- * Implementation of hook_block_save()
- */
-function fblikebutton_block_save($delta = '', $edit = array()) {
-  if ($delta == 'fblikebutton_block') {
-    variable_set('fblikebutton_bl_layout', $edit['fblikebutton_bl_layout']);
-    variable_set('fblikebutton_bl_layout', $edit['fblikebutton_bl_layout']);
-    variable_set('fblikebutton_bl_show_faces', $edit['fblikebutton_bl_show_faces']);
-    variable_set('fblikebutton_bl_action', $edit['fblikebutton_bl_action']);
-    variable_set('fblikebutton_bl_font', $edit['fblikebutton_bl_font']);
-    variable_set('fblikebutton_bl_color_scheme', $edit['fblikebutton_bl_color_scheme']);
-    variable_set('fblikebutton_bl_iframe_width', $edit['fblikebutton_bl_iframe_width']);
-    variable_set('fblikebutton_bl_iframe_height', $edit['fblikebutton_bl_iframe_height']);
-    variable_set('fblikebutton_bl_iframe_css', $edit['fblikebutton_bl_iframe_css']);
-    variable_set('fblikebutton_bl_language', $edit['fblikebutton_bl_language']);
-  }
-}
-
-/**
  * Implementation of hook_block_view()
  */
 function fblikebutton_block_view($delta = '') {
   global $base_url;
+  $node = node_load(arg(1));
+  $types = variable_get('fblikebutton_node_types', array());
+  if ($node) {
+    $show = ( ! empty($types[$node->type]) && user_access('access fblikebutton'));
+  }
+  else {
+    $show = NULL;
+  }
+  $fullnodedisplay = variable_get('fblikebutton_full_node_display', 0);
   $block = array();
   switch ($delta) {
-    case 'fblikebutton_block':
-    default:
+    case 'fblikebutton_dynamic_block':
+      if ($show && $fullnodedisplay == 1) {
+        $webpage_to_like = url("node/$node->nid", array('absolute' => TRUE));
+        $conf = array(
+          'layout' => variable_get('fblikebutton_layout', 'standard'),
+          'action' => variable_get('fblikebutton_action', 'like'),
+          'color_scheme' => variable_get('fblikebutton_color_scheme', 'light'),
+          'show_faces' => variable_get('fblikebutton_show_faces', 'true'),
+          'font' => variable_get('fblikebutton_font', 'arial'),
+          'height' => variable_get('fblikebutton_iframe_height', '80'),
+          'width' => variable_get('fblikebutton_iframe_width', '450'),
+          'send' => variable_get('fblikebutton_send', 'true'),
+          'other_css' => variable_get('fblikebutton_iframe_css', ''),
+          'language' => variable_get('fblikebutton_bl_language', 'en_US'),
+        );
+        $block['content'] = _fblikebutton_field($webpage_to_like, $conf);
+      }
+      break;
+    case 'fblikebutton_static_block':
       $addr = variable_get('fblikebutton_block_url', $base_url);
       $conf = array(
         'layout' => variable_get('fblikebutton_bl_layout', "standard"),
@@ -251,6 +204,7 @@ function fblikebutton_block_view($delta = '') {
         'language' => variable_get('fblikebutton_bl_language', 'en_US'),
       );
       $block['content'] = _fblikebutton_field($addr, $conf);
+      break;
   }
   return $block;
 }
@@ -271,4 +225,4 @@ function _fblikebutton_field($webpage_to_like, $conf) {
   $src = htmlentities($params);
   $output = '<iframe src="https://www.facebook.com/plugins/like.php?' . $src . '" scrolling="no" frameborder="0" style="border: none; overflow: hidden; width: ' . $width . 'px; height: ' . $height . 'px;' . $other_css . '" allowTransparency="true"></iframe>';
   return $output;
-}
+}
\ No newline at end of file