Changeset 417645

Timestamp:

07/31/2011 07:02:22 PM (15 years ago)

Author:

freedimensional

Message:

Major update - thousands more colour options via transparent images and CSS3 rounded corners. Integration with the new Subscription Options Add-on Pack.

Location:

subscription-options/trunk

Files:

• GNU General Public License.txt (modified) (1 diff)
• readme.txt (modified) (1 diff)
• screenshot-1.png (modified) (previous)
• screenshot-2.png (modified) (previous)
• screenshot-3.png (modified) (previous)
• suboptions.php (modified) (1 diff)

subscription-options/trunk/GNU General Public License.txt

@@ -1 +1 @@
                     GNU GENERAL PUBLIC LICENSE
+
                        Version 3, 29 June 2007
 
+
+
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
  Everyone is permitted to copy and distribute verbatim copies
+
  of this license document, but changing it is not allowed.
 
+
+
                             Preamble
 
+
+
   The GNU General Public License is a free, copyleft license for
+
 software and other kinds of works.
 
+
+
   The licenses for most software and other practical works are designed
+
 to take away your freedom to share and change the works.  By contrast,
+
 the GNU General Public License is intended to guarantee your freedom to
+
 share and change all versions of a program--to make sure it remains free
+
 software for all its users.  We, the Free Software Foundation, use the
+
 GNU General Public License for most of our software; it applies also to
+
 any other work released this way by its authors.  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
+
 them 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 prevent others from denying you
+
 these rights or asking you to surrender the rights.  Therefore, you have
+
 certain responsibilities if you distribute copies of the software, or if
+
 you modify it: responsibilities to respect the freedom of others.
 
+
+
   For example, if you distribute copies of such a program, whether
+
 gratis or for a fee, you must pass on to the recipients the same
+
 freedoms that you received.  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.
 
+
+
   Developers that use the GNU GPL protect your rights with two steps:
+
 (1) assert copyright on the software, and (2) offer you this License
+
 giving you legal permission to copy, distribute and/or modify it.
 
+
+
   For the developers' and authors' protection, the GPL clearly explains
+
 that there is no warranty for this free software.  For both users' and
+
 authors' sake, the GPL requires that modified versions be marked as
+
 changed, so that their problems will not be attributed erroneously to
+
 authors of previous versions.
 
+
+
   Some devices are designed to deny users access to install or run
+
 modified versions of the software inside them, although the manufacturer
+
 can do so.  This is fundamentally incompatible with the aim of
+
 protecting users' freedom to change the software.  The systematic
+
 pattern of such abuse occurs in the area of products for individuals to
+
 use, which is precisely where it is most unacceptable.  Therefore, we
+
 have designed this version of the GPL to prohibit the practice for those
+
 products.  If such problems arise substantially in other domains, we
+
 stand ready to extend this provision to those domains in future versions
+
 of the GPL, as needed to protect the freedom of users.
 
+
+
   Finally, every program is threatened constantly by software patents.
+
 States should not allow patents to restrict development and use of
+
 software on general-purpose computers, but in those that do, we wish to
+
 avoid the special danger that patents applied to a free program could
+
 make it effectively proprietary.  To prevent this, the GPL assures that
+
 patents cannot be used to render the program non-free.
 
+
+
   The precise terms and conditions for copying, distribution and
+
 modification follow.
 
+
+
                        TERMS AND CONDITIONS
 
+
+
   0. Definitions.
 
+
+
   "This License" refers to version 3 of the GNU General Public License.
 
+
+
   "Copyright" also means copyright-like laws that apply to other kinds of
+
 works, such as semiconductor masks.
 
+
+
   "The Program" refers to any copyrightable work licensed under this
+
 License.  Each licensee is addressed as "you".  "Licensees" and
+
 "recipients" may be individuals or organizations.
 
+
+
   To "modify" a work means to copy from or adapt all or part of the work
+
 in a fashion requiring copyright permission, other than the making of an
+
 exact copy.  The resulting work is called a "modified version" of the
+
 earlier work or a work "based on" the earlier work.
 
+
+
   A "covered work" means either the unmodified Program or a work based
+
 on the Program.
 
+
+
   To "propagate" a work means to do anything with it that, without
+
 permission, would make you directly or secondarily liable for
+
 infringement under applicable copyright law, except executing it on a
+
 computer or modifying a private copy.  Propagation includes copying,
+
 distribution (with or without modification), making available to the
+
 public, and in some countries other activities as well.
 
+
+
   To "convey" a work means any kind of propagation that enables other
+
 parties to make or receive copies.  Mere interaction with a user through
+
 a computer network, with no transfer of a copy, is not conveying.
 
+
+
   An interactive user interface displays "Appropriate Legal Notices"
+
 to the extent that it includes a convenient and prominently visible
+
 feature that (1) displays an appropriate copyright notice, and (2)
+
 tells the user that there is no warranty for the work (except to the
+
 extent that warranties are provided), that licensees may convey the
+
 work under this License, and how to view a copy of this License.  If
+
 the interface presents a list of user commands or options, such as a
+
 menu, a prominent item in the list meets this criterion.
 
+
+
   1. Source Code.
 
+
+
   The "source code" for a work means the preferred form of the work
+
 for making modifications to it.  "Object code" means any non-source
+
 form of a work.
 
+
+
   A "Standard Interface" means an interface that either is an official
+
 standard defined by a recognized standards body, or, in the case of
+
 interfaces specified for a particular programming language, one that
+
 is widely used among developers working in that language.
 
+
+
   The "System Libraries" of an executable work include anything, other
+
 than the work as a whole, that (a) is included in the normal form of
+
 packaging a Major Component, but which is not part of that Major
+
 Component, and (b) serves only to enable use of the work with that
+
 Major Component, or to implement a Standard Interface for which an
+
 implementation is available to the public in source code form.  A
+
 "Major Component", in this context, means a major essential component
+
 (kernel, window system, and so on) of the specific operating system
+
 (if any) on which the executable work runs, or a compiler used to
+
 produce the work, or an object code interpreter used to run it.
 
+
+
   The "Corresponding Source" for a work in object code form means all
+
 the source code needed to generate, install, and (for an executable
+
 work) run the object code and to modify the work, including scripts to
+
 control those activities.  However, it does not include the work's
+
 System Libraries, or general-purpose tools or generally available free
+
 programs which are used unmodified in performing those activities but
+
 which are not part of the work.  For example, Corresponding Source
+
 includes interface definition files associated with source files for
+
 the work, and the source code for shared libraries and dynamically
+
 linked subprograms that the work is specifically designed to require,
+
 such as by intimate data communication or control flow between those
+
 subprograms and other parts of the work.
 
+
+
   The Corresponding Source need not include anything that users
+
 can regenerate automatically from other parts of the Corresponding
+
 Source.
 
+
+
   The Corresponding Source for a work in source code form is that
+
 same work.
 
+
+
   2. Basic Permissions.
 
+
+
   All rights granted under this License are granted for the term of
+
 copyright on the Program, and are irrevocable provided the stated
+
 conditions are met.  This License explicitly affirms your unlimited
+
 permission to run the unmodified Program.  The output from running a
+
 covered work is covered by this License only if the output, given its
+
 content, constitutes a covered work.  This License acknowledges your
+
 rights of fair use or other equivalent, as provided by copyright law.
 
+
+
   You may make, run and propagate covered works that you do not
+
 convey, without conditions so long as your license otherwise remains
+
 in force.  You may convey covered works to others for the sole purpose
+
 of having them make modifications exclusively for you, or provide you
+
 with facilities for running those works, provided that you comply with
+
 the terms of this License in conveying all material for which you do
+
 not control copyright.  Those thus making or running the covered works
+
 for you must do so exclusively on your behalf, under your direction
+
 and control, on terms that prohibit them from making any copies of
+
 your copyrighted material outside their relationship with you.
 
+
+
   Conveying under any other circumstances is permitted solely under
+
 the conditions stated below.  Sublicensing is not allowed; section 10
+
 makes it unnecessary.
 
+
+
   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
+
+
   No covered work shall be deemed part of an effective technological
+
 measure under any applicable law fulfilling obligations under article
+
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
+
 similar laws prohibiting or restricting circumvention of such
+
 measures.
 
+
+
   When you convey a covered work, you waive any legal power to forbid
+
 circumvention of technological measures to the extent such circumvention
+
 is effected by exercising rights under this License with respect to
+
 the covered work, and you disclaim any intention to limit operation or
+
 modification of the work as a means of enforcing, against the work's
+
 users, your or third parties' legal rights to forbid circumvention of
+
 technological measures.
 
+
+
   4. Conveying Verbatim Copies.
 
+
+
   You may convey 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;
+
 keep intact all notices stating that this License and any
+
 non-permissive terms added in accord with section 7 apply to the code;
+
 keep intact all notices of the absence of any warranty; and give all
+
 recipients a copy of this License along with the Program.
 
+
+
   You may charge any price or no price for each copy that you convey,
+
 and you may offer support or warranty protection for a fee.
 
+
+
   5. Conveying Modified Source Versions.
 
+
+
   You may convey a work based on the Program, or the modifications to
+
 produce it from the Program, in the form of source code under the
+
 terms of section 4, provided that you also meet all of these conditions:
 
+
+
     a) The work must carry prominent notices stating that you modified
+
     it, and giving a relevant date.
 
+
+
     b) The work must carry prominent notices stating that it is
+
     released under this License and any conditions added under section
+
     7.  This requirement modifies the requirement in section 4 to
+
     "keep intact all notices".
 
+
+
     c) You must license the entire work, as a whole, under this
+
     License to anyone who comes into possession of a copy.  This
+
     License will therefore apply, along with any applicable section 7
+
     additional terms, to the whole of the work, and all its parts,
+
     regardless of how they are packaged.  This License gives no
+
     permission to license the work in any other way, but it does not
+
     invalidate such permission if you have separately received it.
 
+
+
     d) If the work has interactive user interfaces, each must display
+
     Appropriate Legal Notices; however, if the Program has interactive
+
     interfaces that do not display Appropriate Legal Notices, your
+
     work need not make them do so.
 
+
+
   A compilation of a covered work with other separate and independent
+
 works, which are not by their nature extensions of the covered work,
+
 and which are not combined with it such as to form a larger program,
+
 in or on a volume of a storage or distribution medium, is called an
+
 "aggregate" if the compilation and its resulting copyright are not
+
 used to limit the access or legal rights of the compilation's users
+
 beyond what the individual works permit.  Inclusion of a covered work
+
 in an aggregate does not cause this License to apply to the other
+
 parts of the aggregate.
 
+
+
   6. Conveying Non-Source Forms.
 
+
+
   You may convey a covered work in object code form under the terms
+
 of sections 4 and 5, provided that you also convey the
+
 machine-readable Corresponding Source under the terms of this License,
+
 in one of these ways:
 
+
+
     a) Convey the object code in, or embodied in, a physical product
+
     (including a physical distribution medium), accompanied by the
+
     Corresponding Source fixed on a durable physical medium
+
     customarily used for software interchange.
 
+
+
     b) Convey the object code in, or embodied in, a physical product
+
     (including a physical distribution medium), accompanied by a
+
     written offer, valid for at least three years and valid for as
+
     long as you offer spare parts or customer support for that product
+
     model, to give anyone who possesses the object code either (1) a
+
     copy of the Corresponding Source for all the software in the
+
     product that is covered by this License, on a durable physical
+
     medium customarily used for software interchange, for a price no
+
     more than your reasonable cost of physically performing this
+
     conveying of source, or (2) access to copy the
+
     Corresponding Source from a network server at no charge.
 
+
+
     c) Convey individual copies of the object code with a copy of the
+
     written offer to provide the Corresponding Source.  This
+
     alternative is allowed only occasionally and noncommercially, and
+
     only if you received the object code with such an offer, in accord
+
     with subsection 6b.
 
+
+
     d) Convey the object code by offering access from a designated
+
     place (gratis or for a charge), and offer equivalent access to the
+
     Corresponding Source in the same way through the same place at no
+
     further charge.  You need not require recipients to copy the
+
     Corresponding Source along with the object code.  If the place to
+
     copy the object code is a network server, the Corresponding Source
+
     may be on a different server (operated by you or a third party)
+
     that supports equivalent copying facilities, provided you maintain
+
     clear directions next to the object code saying where to find the
+
     Corresponding Source.  Regardless of what server hosts the
+
     Corresponding Source, you remain obligated to ensure that it is
+
     available for as long as needed to satisfy these requirements.
 
+
+
     e) Convey the object code using peer-to-peer transmission, provided
+
     you inform other peers where the object code and Corresponding
+
     Source of the work are being offered to the general public at no
+
     charge under subsection 6d.
 
+
+
   A separable portion of the object code, whose source code is excluded
+
 from the Corresponding Source as a System Library, need not be
+
 included in conveying the object code work.
 
+
+
   A "User Product" is either (1) a "consumer product", which means any
+
 tangible personal property which is normally used for personal, family,
+
 or household purposes, or (2) anything designed or sold for incorporation
+
 into a dwelling.  In determining whether a product is a consumer product,
+
 doubtful cases shall be resolved in favor of coverage.  For a particular
+
 product received by a particular user, "normally used" refers to a
+
 typical or common use of that class of product, regardless of the status
+
 of the particular user or of the way in which the particular user
+
 actually uses, or expects or is expected to use, the product.  A product
+
 is a consumer product regardless of whether the product has substantial
+
 commercial, industrial or non-consumer uses, unless such uses represent
+
 the only significant mode of use of the product.
 
+
+
   "Installation Information" for a User Product means any methods,
+
 procedures, authorization keys, or other information required to install
+
 and execute modified versions of a covered work in that User Product from
+
 a modified version of its Corresponding Source.  The information must
+
 suffice to ensure that the continued functioning of the modified object
+
 code is in no case prevented or interfered with solely because
+
 modification has been made.
 
+
+
   If you convey an object code work under this section in, or with, or
+
 specifically for use in, a User Product, and the conveying occurs as
+
 part of a transaction in which the right of possession and use of the
+
 User Product is transferred to the recipient in perpetuity or for a
+
 fixed term (regardless of how the transaction is characterized), the
+
 Corresponding Source conveyed under this section must be accompanied
+
 by the Installation Information.  But this requirement does not apply
+
 if neither you nor any third party retains the ability to install
+
 modified object code on the User Product (for example, the work has
+
 been installed in ROM).
 
+
+
   The requirement to provide Installation Information does not include a
+
 requirement to continue to provide support service, warranty, or updates
+
 for a work that has been modified or installed by the recipient, or for
+
 the User Product in which it has been modified or installed.  Access to a
+
 network may be denied when the modification itself materially and
+
 adversely affects the operation of the network or violates the rules and
+
 protocols for communication across the network.
 
+
+
   Corresponding Source conveyed, and Installation Information provided,
+
 in accord with this section must be in a format that is publicly
+
 documented (and with an implementation available to the public in
+
 source code form), and must require no special password or key for
+
 unpacking, reading or copying.
 
+
+
   7. Additional Terms.
 
+
+
   "Additional permissions" are terms that supplement the terms of this
+
 License by making exceptions from one or more of its conditions.
+
 Additional permissions that are applicable to the entire Program shall
+
 be treated as though they were included in this License, to the extent
+
 that they are valid under applicable law.  If additional permissions
+
 apply only to part of the Program, that part may be used separately
+
 under those permissions, but the entire Program remains governed by
+
 this License without regard to the additional permissions.
 
+
+
   When you convey a copy of a covered work, you may at your option
+
 remove any additional permissions from that copy, or from any part of
+
 it.  (Additional permissions may be written to require their own
+
 removal in certain cases when you modify the work.)  You may place
+
 additional permissions on material, added by you to a covered work,
+
 for which you have or can give appropriate copyright permission.
 
+
+
   Notwithstanding any other provision of this License, for material you
+
 add to a covered work, you may (if authorized by the copyright holders of
+
 that material) supplement the terms of this License with terms:
 
+
+
     a) Disclaiming warranty or limiting liability differently from the
+
     terms of sections 15 and 16 of this License; or
 
+
+
     b) Requiring preservation of specified reasonable legal notices or
+
     author attributions in that material or in the Appropriate Legal
+
     Notices displayed by works containing it; or
 
+
+
     c) Prohibiting misrepresentation of the origin of that material, or
+
     requiring that modified versions of such material be marked in
+
     reasonable ways as different from the original version; or
 
+
+
     d) Limiting the use for publicity purposes of names of licensors or
+
     authors of the material; or
 
+
+
     e) Declining to grant rights under trademark law for use of some
+
     trade names, trademarks, or service marks; or
 
+
+
     f) Requiring indemnification of licensors and authors of that
+
     material by anyone who conveys the material (or modified versions of
+
     it) with contractual assumptions of liability to the recipient, for
+
     any liability that these contractual assumptions directly impose on
+
     those licensors and authors.
 
+
+
   All other non-permissive additional terms are considered "further
+
 restrictions" within the meaning of section 10.  If the Program as you
+
 received it, or any part of it, contains a notice stating that it is
+
 governed by this License along with a term that is a further
+
 restriction, you may remove that term.  If a license document contains
+
 a further restriction but permits relicensing or conveying under this
+
 License, you may add to a covered work material governed by the terms
+
 of that license document, provided that the further restriction does
+
 not survive such relicensing or conveying.
 
+
+
   If you add terms to a covered work in accord with this section, you
+
 must place, in the relevant source files, a statement of the
+
 additional terms that apply to those files, or a notice indicating
+
 where to find the applicable terms.
 
+
+
   Additional terms, permissive or non-permissive, may be stated in the
+
 form of a separately written license, or stated as exceptions;
+
 the above requirements apply either way.
 
+
+
   8. Termination.
 
+
+
   You may not propagate or modify a covered work except as expressly
+
 provided under this License.  Any attempt otherwise to propagate or
+
 modify it is void, and will automatically terminate your rights under
+
 this License (including any patent licenses granted under the third
+
 paragraph of section 11).
 
+
+
   However, if you cease all violation of this License, then your
+
 license from a particular copyright holder is reinstated (a)
+
 provisionally, unless and until the copyright holder explicitly and
+
 finally terminates your license, and (b) permanently, if the copyright
+
 holder fails to notify you of the violation by some reasonable means
+
 prior to 60 days after the cessation.
 
+
+
   Moreover, your license from a particular copyright holder is
+
 reinstated permanently if the copyright holder notifies you of the
+
 violation by some reasonable means, this is the first time you have
+
 received notice of violation of this License (for any work) from that
+
 copyright holder, and you cure the violation prior to 30 days after
+
 your receipt of the notice.
 
+
+
   Termination of your rights under this section does not terminate the
+
 licenses of parties who have received copies or rights from you under
+
 this License.  If your rights have been terminated and not permanently
+
 reinstated, you do not qualify to receive new licenses for the same
+
 material under section 10.
 
+
+
   9. Acceptance Not Required for Having Copies.
 
+
+
   You are not required to accept this License in order to receive or
+
 run a copy of the Program.  Ancillary propagation of a covered work
+
 occurring solely as a consequence of using peer-to-peer transmission
+
 to receive a copy likewise does not require acceptance.  However,
+
 nothing other than this License grants you permission to propagate or
+
 modify any covered work.  These actions infringe copyright if you do
+
 not accept this License.  Therefore, by modifying or propagating a
+
 covered work, you indicate your acceptance of this License to do so.
 
+
+
   10. Automatic Licensing of Downstream Recipients.
 
+
+
   Each time you convey a covered work, the recipient automatically
+
 receives a license from the original licensors, to run, modify and
+
 propagate that work, subject to this License.  You are not responsible
+
 for enforcing compliance by third parties with this License.
 
+
+
   An "entity transaction" is a transaction transferring control of an
+
 organization, or substantially all assets of one, or subdividing an
+
 organization, or merging organizations.  If propagation of a covered
+
 work results from an entity transaction, each party to that
+
 transaction who receives a copy of the work also receives whatever
+
 licenses to the work the party's predecessor in interest had or could
+
 give under the previous paragraph, plus a right to possession of the
+
 Corresponding Source of the work from the predecessor in interest, if
+
 the predecessor has it or can get it with reasonable efforts.
 
+
+
   You may not impose any further restrictions on the exercise of the
+
 rights granted or affirmed under this License.  For example, you may
+
 not impose a license fee, royalty, or other charge for exercise of
+
 rights granted under this License, and you may not initiate litigation
+
 (including a cross-claim or counterclaim in a lawsuit) alleging that
+
 any patent claim is infringed by making, using, selling, offering for
+
 sale, or importing the Program or any portion of it.
 
+
+
   11. Patents.
 
+
+
   A "contributor" is a copyright holder who authorizes use under this
+
 License of the Program or a work on which the Program is based.  The
+
 work thus licensed is called the contributor's "contributor version".
 
+
+
   A contributor's "essential patent claims" are all patent claims
+
 owned or controlled by the contributor, whether already acquired or
+
 hereafter acquired, that would be infringed by some manner, permitted
+
 by this License, of making, using, or selling its contributor version,
+
 but do not include claims that would be infringed only as a
+
 consequence of further modification of the contributor version.  For
+
 purposes of this definition, "control" includes the right to grant
+
 patent sublicenses in a manner consistent with the requirements of
+
 this License.
 
+
+
   Each contributor grants you a non-exclusive, worldwide, royalty-free
+
 patent license under the contributor's essential patent claims, to
+
 make, use, sell, offer for sale, import and otherwise run, modify and
+
 propagate the contents of its contributor version.
 
+
+
   In the following three paragraphs, a "patent license" is any express
+
 agreement or commitment, however denominated, not to enforce a patent
+
 (such as an express permission to practice a patent or covenant not to
+
 sue for patent infringement).  To "grant" such a patent license to a
+
 party means to make such an agreement or commitment not to enforce a
+
 patent against the party.
 
+
+
   If you convey a covered work, knowingly relying on a patent license,
+
 and the Corresponding Source of the work is not available for anyone
+
 to copy, free of charge and under the terms of this License, through a
+
 publicly available network server or other readily accessible means,
+
 then you must either (1) cause the Corresponding Source to be so
+
 available, or (2) arrange to deprive yourself of the benefit of the
+
 patent license for this particular work, or (3) arrange, in a manner
+
 consistent with the requirements of this License, to extend the patent
+
 license to downstream recipients.  "Knowingly relying" means you have
+
 actual knowledge that, but for the patent license, your conveying the
+
 covered work in a country, or your recipient's use of the covered work
+
 in a country, would infringe one or more identifiable patents in that
+
 country that you have reason to believe are valid.
 
+
+
   If, pursuant to or in connection with a single transaction or
+
 arrangement, you convey, or propagate by procuring conveyance of, a
+
 covered work, and grant a patent license to some of the parties
+
 receiving the covered work authorizing them to use, propagate, modify
+
 or convey a specific copy of the covered work, then the patent license
+
 you grant is automatically extended to all recipients of the covered
+
 work and works based on it.
 
+
+
   A patent license is "discriminatory" if it does not include within
+
 the scope of its coverage, prohibits the exercise of, or is
+
 conditioned on the non-exercise of one or more of the rights that are
+
 specifically granted under this License.  You may not convey a covered
+
 work if you are a party to an arrangement with a third party that is
+
 in the business of distributing software, under which you make payment
+
 to the third party based on the extent of your activity of conveying
+
 the work, and under which the third party grants, to any of the
+
 parties who would receive the covered work from you, a discriminatory
+
 patent license (a) in connection with copies of the covered work
+
 conveyed by you (or copies made from those copies), or (b) primarily
+
 for and in connection with specific products or compilations that
+
 contain the covered work, unless you entered into that arrangement,
+
 or that patent license was granted, prior to 28 March 2007.
 
+
+
   Nothing in this License shall be construed as excluding or limiting
+
 any implied license or other defenses to infringement that may
+
 otherwise be available to you under applicable patent law.
 
+
+
   12. No Surrender of Others' Freedom.
 
+
+
   If 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 convey a
+
 covered work so as to satisfy simultaneously your obligations under this
+
 License and any other pertinent obligations, then as a consequence you may
+
 not convey it at all.  For example, if you agree to terms that obligate you
+
 to collect a royalty for further conveying from those to whom you convey
+
 the Program, the only way you could satisfy both those terms and this
+
 License would be to refrain entirely from conveying the Program.
 
+
+
   13. Use with the GNU Affero General Public License.
 
+
+
   Notwithstanding any other provision of this License, you have
+
 permission to link or combine any covered work with a work licensed
+
 under version 3 of the GNU Affero General Public License into a single
+
 combined work, and to convey the resulting work.  The terms of this
+
 License will continue to apply to the part which is the covered work,
+
 but the special requirements of the GNU Affero General Public License,
+
 section 13, concerning interaction through a network will apply to the
+
 combination as such.
 
+
+
   14. Revised Versions of this License.
 
+
+
   The Free Software Foundation may publish revised and/or new versions of
+
 the GNU 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 that a certain numbered version of the GNU General
+
 Public License "or any later version" applies to it, you have the
+
 option of following the terms and conditions either of that numbered
+
 version or of any later version published by the Free Software
+
 Foundation.  If the Program does not specify a version number of the
+
 GNU General Public License, you may choose any version ever published
+
 by the Free Software Foundation.
 
+
+
   If the Program specifies that a proxy can decide which future
+
 versions of the GNU General Public License can be used, that proxy's
+
 public statement of acceptance of a version permanently authorizes you
+
 to choose that version for the Program.
 
+
+
   Later license versions may give you additional or different
+
 permissions.  However, no additional obligations are imposed on any
+
 author or copyright holder as a result of your choosing to follow a
+
 later version.
 
+
+
   15. Disclaimer of Warranty.
 
+
+
   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.
 
+
+
   16. Limitation of Liability.
 
+
+
   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+
 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.
 
+
+
   17. Interpretation of Sections 15 and 16.
 
+
+
   If the disclaimer of warranty and limitation of liability provided
+
 above cannot be given local legal effect according to their terms,
+
 reviewing courts shall apply local law that most closely approximates
+
 an absolute waiver of all civil liability in connection with the
+
 Program, unless a warranty or assumption of liability accompanies a
+
 copy of the Program in return for a fee.
 
+
+
                      END OF TERMS AND CONDITIONS
 
+
+
             How to Apply These Terms to Your New Programs
 
+
+
   If you develop a new program, and you want it to be of the greatest
+
 possible use to the public, the best way to achieve this is to make it
+
 free software which everyone can redistribute and change under these terms.
 
+
+
   To do so, attach the following notices to the program.  It is safest
+
 to attach them to the start of each source file to most effectively
+
 state the exclusion of warranty; and each file should have at least
+
 the "copyright" line and a pointer to where the full notice is found.
 
+
+
     <one line to give the program's name and a brief idea of what it does.>
+
     Copyright (C) <year>  <name of author>
 
+
+
     This program is free software: you can redistribute it and/or modify
+
     it under the terms of the GNU General Public License as published by
+
     the Free Software Foundation, either version 3 of the License, or
+
     (at your option) any later version.
 
+
+
     This program is distributed in the hope that it will be useful,
+
     but WITHOUT ANY WARRANTY; without even the implied warranty of
+
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+
     GNU General Public License for more details.
 
+
+
     You should have received a copy of the GNU General Public License
+
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+
 Also add information on how to contact you by electronic and paper mail.
 
+
+
   If the program does terminal interaction, make it output a short
+
 notice like this when it starts in an interactive mode:
 
+
+
     Subscription Options  Copyright (C) 2009  Tom Saunter AKA freedimensional 
+
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+
     This is free software, and you are welcome to redistribute it
+
     under certain conditions; type `show c' for details.
 
+
+
 The hypothetical commands `show w' and `show c' should show the appropriate
+
 parts of the General Public License.  Of course, your program's commands
+
 might be different; for a GUI interface, you would use an "about box".
 
+
+
   You should also get your employer (if you work as a programmer) or school,
+
 if any, to sign a "copyright disclaimer" for the program, if necessary.
+
 For more information on this, and how to apply and follow the GNU GPL, see
+
 <http://www.gnu.org/licenses/>.
 
+
+
   The GNU General Public License does not permit incorporating your program
+
 into proprietary programs.  If your program is a subroutine library, you
+
 may consider it more useful to permit linking proprietary applications with
+
 the library.  If this is what you want to do, use the GNU Lesser General
+
 Public License instead of this License.  But first, please read
+
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.

subscription-options/trunk/readme.txt

@@ -1 +1 @@
 === Subscription Options ===
+
 Contributors: Tom Saunter
+
 Donate link: http://bit.ly/donate_to_me
+
 Tags: subscription, subscribe, option, options, color, colour, colors, colours, feedburner, rss, feed, mail, email, service, twitter, stream, follow, facebook, page, delivery, icon, icons, widget, sidebar, settings
+
 Requires at least: 2.8
-Tested up to: 3.0
-Stable tag: 0.7.4
+
+Tested up to: 3.2
+
+Stable tag: 0.8
+
+
 
 Adds subscription option icons for your RSS Feed; your FeedBurner Email Service; your Twitter Stream and your Facebook page. Totally user-defined.
 
+
+
 == Description ==
+
 The most common ways for people to subscribe to a blog and its content are through RSS, Email and Twitter. Facebook pages are increasing in usage too. This plugin places related subscription icons in a widget area and lets users enter their own feed or page URLs and select the colour of their icons. Its really simple but theres lots of power under the hood.
 
+
+
 = Features: =
+
 * Offers an attractive range of subscription options for your readers using familiar-looking icons.
+
 * Intuitive interface for editing options, including your feed or page URLs, widget title and icon sizes.
-* Independent handling across multiple widget instances, using WordPress 2.8's new widget_class coolness.
-* NEW in Version 0.6 - the ability to select between 12 colours.
-* NEW in Version 0.7 - now XHTML valid
+
+* Independent handling across multiple widget instances, using WordPress 2.8's widget_class coolness.
+
+* NEW in Version 0.8 – the ability to select any colour, via HEX code or [HTML Color Name](http://www.w3schools.com/html/html_colornames.asp).
+
+* NEW in Version 0.8 – integration with the brand new [Subscription Options Add-on Pack](http://digitalcortex.net/plugins/subscription-options/addon-pack).
+
+
 
 == Installation ==
+
 1. Download the plugin by hitting that big red button to the right.
+
 2. Extract the files and place the entire 'subscription-options' folder into your wp_content/plugins directory.
+
 3. Go to your 'Installed Plugins' panel and activate 'Subscription Options'.
+
 4. You are now ready to use the widget.
 
+
+
 = Setup: =
+
 * Go to your 'Appearance > Widgets' panel and select the widget area you wish for the plugin to appear in.
+
 * Enter the following details:
+
 1. Widget Title
-2. RSS Feed URL & Colour ID
-3. Email Service URL & Colour ID
-4. Twitter Stream URL & Colour ID
-5. Facebook Page URL & Colour ID
+
+2. RSS Feed URL & Colour
+
+3. Email Service URL & Colour
+
+4. Twitter Stream URL & Colour
+
+5. Facebook Page URL & Colour
+
 6. Size of Feed Icons
 
-* Hit 'Save' then test the result. Change the icons' size and colour if necessary.
+
 * Please note that you don't need to use all the icons - just don't enter a URL if you don't want an icon to show up.
 
+* Please also note that you can use any HTML colour code, be it HEX code or [HTML Color Name](http://www.w3schools.com/html/html_colornames.asp).
+
+* Hit ‘Done’ then ‘Save Changes’. Test the appearance and perhaps change the size of the icons as necessary.
+
+* If you would like additional icons for LinkedIn, Flickr, Google+ or Podcasting, consider installing the [Subscription Options Add-on Pack](http://digitalcortex.net/plugins/subscription-options/addon-pack) and a new set of subscription options will automatically appear in the widget options panel.
+
 == Screenshots ==
+
 1.  This is how the plugin could look on your blog.
+
 2.  This is the widget options panel.
+
 3.  These are some example configurations.
 
+
+
 == Changelog ==
+
 * 0.1.0 was the first iteration of what I promise will be a participatory experience
+
 * 0.1.5 - added css classes for users to hook into and edit through their css sheets
+
 * 0.2 - added user-defined header size and target of users' clicks
+
 * 0.3 - updated icons to scale up to higher sizes without dithering
+
 * 0.4 - switched to WP 2.8's widget_class functionality to really crank it up
+
 * 0.5 - inclusion of a new subscription icon for Facebook, by popular demand
+
 * 0.6 - implemented an icon colour changer with twelve options
+
 * 0.7 - upgraded to pass XHTML 1.0 Transitional validation
+
+* 0.8 - full colour options & additional subscription icons based on user feedback
+
 = Future Versions: =
-* 0.8 - more subscription icons based on user feedback
+
+* 0.9 – farbtastic or other java-based colour picker integration
+
+
 
 == Upgrade Notice ==
 
-= 0.6 =
-This new version will give you 12 colour options for each of your icons!
+
+
+= 0.8 =
+
+This new version give you thousands of new colour options, using transparent icons and CSS3 rounded corners. As such, the widget looks best in modern CSS3-compatible web browsers, so please upgrade only if you are entirely comfortable with this.
+
+
 
 == Frequently Asked Questions ==
+
 = Where do I put the widget? =
+
 You can place the widget wherever you like as long as it is within a pre-defined widget area. I haven't worked out how to let people place the widget wherever they like. Let me know if you can help on my [contact page](http://digitalcortex.net/contact) though.
 
+
+
 = Can I style the widget in my own way? =
-Yes of course, it's WordPress! You can use your stylesheet.css to override your theme's default widget settings by using the following CSS classes:
 
-* the RSS feed icon > img.rss_icon
-* the email service icon > img.mail_icon
-* the twitter icon > img.twitter_icon
-* the facebook icon > img.facebook_icon
+Yes of course, it’s WordPress! You can use your stylesheet.css or this widget’s internal stylesheet to override your theme’s default widget settings by using the following CSS classes:
+
+* img.suboptions-icon – all icons (useful for setting alignment or spacing)
+
+* img.rss-icon – the RSS feed icon
+
+* img.email-icon – the email service icon
+
+* img.twitter-icon – the Twitter icon
+
+* img.facebook-icon – the Facebook icon
+
+
 
 Please note that the icons' sizes will still need to be set from within the widget admin panel. CSS doesn't let you override that.
 
+
+
+= Why don't my icons have nice rounded corners any more? =
+
+The latest version of this plugin gives you thousands of new colour options, using transparent icons and CSS3 rounded corners. As such, the widget looks best in modern CSS3-compatible web browsers such as Firefox, Google Chrome or IE9. If you are not entirely comfortable with this, you can always roll back to an [older version](http://wordpress.org/extend/plugins/subscription-options/download).
+
+
+
+= How do I find my Feedburner Email Service URL? =
+
+The clickstream from within Feedburner looks like this: Publicize > Email Subscriptions > Activate. Then right click and copy the text that says 'Preview Subscription Link
+' That's your Feedburner Email Service URL... BOOM!
+
+
+
 = Where can I find more help and support? =
+
 Just email me from the contact page on [my blog](http://digitalcortex.net/contact) or leave a comment [right here](http://digitalcortex.net/plugins/subscription-options). I'll be happy to help where possible.
 
+
+
 = I'm a fan of this plugin. What are my options? =
+
 [Digital Cortex](http://digitalcortex.net) ([rss](http://feeds.feedburner.com/digitalcortex)) is actively seeking new fans & followers on [Facebook](http://facebook.com/digitalcortex) and [Twitter](http://twitter.com/freedimensional) if you fancy it?
 
+
+
 = How can I support the development of this plugin? =
-Thank you so much for asking. Here is a link to where you can contribute to the development fund: [Donate](http://bit.ly/donate_to_me)
+
+Thank you so much for asking. There are a couple of options. You can purchase the [Subscription Options Add-on Pack](http://digitalcortex.net/plugins/subscription-options/addon-pack) for $1.50, or you can [donate here](http://bit.ly/donate_to_me) without upgrading.

subscription-options/trunk/suboptions.php

@@ -1 +1 @@
 <?php
+
+
+
 /**
+
  * Plugin Name: Subscription Options
+
  * Plugin URI: http://digitalcortex.net/plugins/subscription-options
- * Description: Adds subscription option icons for your RSS Feed; your FeedBurner Email Service; your Twitter Stream and even your Facebook page. 12 colour options. Totally user-defined.
- * Version: 0.7.4
+
+ * Description: Adds subscription option icons for your RSS Feed; your FeedBurner Email Service; your Twitter Stream and even your Facebook page. Thousands of colour options. Totally user-defined. Also available: <a title="Upgrade for only $1.50" target="_blank" href="http://digitalcortex.net/plugins/subscription-options/addon-pack">The Subscription Options Add-on Pack</a>!
+
+ * Version: 0.8
+
  * Author: Tom Saunter
+
  * Author URI: http://digitalcortex.net
+
  *
+
  * This program is free software: you can redistribute it and/or modify
+
  * it under the terms of the GNU General Public License as published by
+
  * the Free Software Foundation, either version 3 of the License, or
+
  * (at your option) any later version.
+
  * 
+
  * This program is distributed in the hope that it will be useful,
+
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+
  * GNU General Public License for more details.
+
  * 
+
  * You should have received a copy of the GNU General Public License
+
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
  */
 
+ 
+
 /**
- * Add function to widgets_init that will load the widget.
+
+ * Add functions that will load the widget.
+
  */
+
 add_action( 'widgets_init', 'suboptions_load_widgets' );
 
+
+
 /**
+
  * Register the widget.
+
  * 'suboptions_widget' is the widget class used below.
+
  */
+
 function suboptions_load_widgets() {
+
     register_widget( 'suboptions_widget' );
+
 }
 
+
+
 /**
+
  * Extends the widget class.
+
  * This class handles everything that needs to be handled with the widget:
+
  * the settings, form, display, and update. Nice!
+
  */
+
 class suboptions_widget extends WP_Widget {
 
+
+
     /**
+
      * Widget setup.
+
      */
+
     function suboptions_widget() {
+
         /* Widget settings. */
+
         $widget_ops = array( 'classname' => 'suboptions', 'description' => __('Add subscription options for your readers with related feed icons', 'suboptions') );
 
+
+
         /* Widget control settings. */
-        $control_ops = array( 'width' => 260, 'height' => 350, 'id_base' => 'suboptions-widget' );
+
+        $control_ops = array( 'width' => 300, 'height' => 350, 'id_base' => 'suboptions-widget' );
+
+
 
         /* Create the widget. */
+
         $this->WP_Widget( 'suboptions-widget', __('Subscription Options', 'suboptions'), $widget_ops, $control_ops );
+
     }
 
+    
+
     /**
+
      * Display the widget on the screen.
+
      */
+
     function widget( $args, $instance ) {
+
         extract( $args );
 
-        /* Variables from the widget settings. */
+
+
+        /* Variables for the standard widget. */
+
         $title = apply_filters('widget_title', $instance['title'] );
+
+        $size = $instance['size'];
+
         $rss_url = $instance['rss_url'];
-        $mail_url = $instance['mail_url'];
+
+        $rss_col = $instance['rss_col'];
+
+        $email_url = $instance['email_url'];
+
+        $email_col = $instance['email_col'];
+
         $twitter_url = $instance['twitter_url'];
+
+        $twitter_col = $instance['twitter_col'];
+
         $facebook_url = $instance['facebook_url'];
-        $size = $instance['size'];
-        $rss_col = $instance['rss_col'];
-        $mail_col = $instance['mail_col'];
-        $twitter_col = $instance['twitter_col'];
+
         $facebook_col = $instance['facebook_col'];
 
+
+
+        /* Variables for the add-on pack. */
+
+        $linkedin_url = $instance['linkedin_url'];
+
+        $linkedin_col = $instance['linkedin_col'];
+
+        $flickr_url = $instance['flickr_url'];
+
+        $flickr_col = $instance['flickr_col'];
+
+        $google_url = $instance['google_url'];
+
+        $google_col = $instance['google_col'];
+
+        $podcast_url = $instance['podcast_url'];
+
+        $podcast_col = $instance['podcast_col'];
+
+
+
         /* Before widget (defined by themes). */
+
         echo $before_widget;
 
+
+
         /* Display the widget title if one was input (before and after defined by themes). */
+
         if ( $title )
+
             echo $before_title . $title . $after_title;
 
+
+
         /* If an RSS Feed URL was entered, display the RSS icon. */         
+
         if ( $rss_url )
-            echo '<a target="_blank" title="Subscribe via RSS" href="'.$rss_url.'"><img class="rss_icon" alt="Subscribe via RSS" style="border: 0px none; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/feed_icon_'.$rss_col.'.png"/> </a>';
+
+            echo '<a target="_blank" title="Subscribe via RSS" href="'.$rss_url.'"><img class="suboptions-icon rounded-corners rss-icon" alt="Subscribe via RSS" style="background: '.$rss_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/rss_transparent.png"/> </a>';
+
                 
+
         /* If a FeedBurner Email Service URL was entered, display the email icon. */            
-        if ( $mail_url )
-            echo '<a target="_blank" title="Subscribe via Email" href="'.$mail_url.'"><img alt="Subscribe via Email" class="mail_icon" style="border: 0px none; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/mail_icon_'.$mail_col.'.png"/> </a>';
+
+        if ( $email_url )
+
+            echo '<a target="_blank" title="Subscribe via Email" href="'.$email_url.'"><img class="suboptions-icon rounded-corners email-icon" alt="Subscribe via Email" style="background: '.$email_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/email_transparent.png"/> </a>';
+
             
+
         /* If a Twitter Stream URL was entered, display the Twitter icon. */            
+
         if ( $twitter_url )
-            echo '<a target="_blank" title="Subscribe via Twitter" href="'.$twitter_url.'"><img alt="Subscribe via Twitter" class="twitter_icon" style="border: 0px none; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/twitter_icon_'.$twitter_col.'.png"/> </a>';
+
+            echo '<a target="_blank" title="Subscribe via Twitter" href="'.$twitter_url.'"><img class="suboptions-icon rounded-corners twitter-icon" alt="Subscribe via Twitter" style="background: '.$twitter_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/twitter_transparent.png"/> </a>';
+
+            
 
         /* If a Facebook Page URL was entered, display the Facebook icon. */            
+
         if ( $facebook_url )
-            echo '<a target="_blank" title="Subscribe via Facebook" href="'.$facebook_url.'"><img alt="Subscribe via Facebook" class="facebook_icon" style="border: 0px none; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/facebook_icon_'.$facebook_col.'.png"/> </a>';
+
+            echo '<a target="_blank" title="Subscribe via Facebook" href="'.$facebook_url.'"><img class="suboptions-icon rounded-corners facebook-icon" alt="Subscribe via Facebook" style="background: '.$facebook_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options/images/facebook_transparent.png"/> </a>';
+
+        
+
+        /* If a LinkedIn Profile URL was entered, display the LinkedIn icon. */         
+
+        if ( $linkedin_url )
+
+            echo '<a target="_blank" title="Subscribe via LinkedIn" href="'.$linkedin_url.'"><img class="suboptions-icon rounded-corners linkedin_icon" alt="Subscribe via LinkedIn" style="background: '.$linkedin_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options-addon/linkedin_transparent.png"/> </a>';
+
+
+
+        /* If a Flickr Page URL was entered, display the Flickr icon. */            
+
+        if ( $flickr_url )
+
+            echo '<a target="_blank" title="Subscribe via Flickr" href="'.$flickr_url.'"><img class="suboptions-icon rounded-corners flickr_icon" alt="Subscribe via Flickr" style="background: '.$flickr_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options-addon/flickr_transparent.png"/> </a>';
+
+
+
+        /* If a Google+ URL was entered, display the Google+ icon. */           
+
+        if ( $google_url )
+
+            echo '<a target="_blank" title="Subscribe via Google+" href="'.$google_url.'"><img class="suboptions-icon rounded-corners google_icon" alt="Subscribe via Google+" style="background: '.$google_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options-addon/google_transparent.png"/> </a>';
+
+
+
+        /* If a Podcasting Service URL was entered, display the Podcast icon. */            
+
+        if ( $podcast_url )
+
+            echo '<a target="_blank" title="Subscribe via Podcast" href="'.$podcast_url.'"><img class="suboptions-icon rounded-corners podcast_icon" alt="Subscribe via Podcast" style="background: '.$podcast_col.'; width: '.$size.'px; height: '.$size.'px; " src="'.get_bloginfo('wpurl').'/'.PLUGINDIR.'/subscription-options-addon/podcast_transparent.png"/> </a>';
+
+        
 
         /* After widget (defined by themes). */
+
         echo $after_widget;
+
     }
 
+
+
     /**
+
      * Update the widget settings.
+
      */
+
     function update( $new_instance, $old_instance ) {
+
         $instance = $old_instance;
 
-        /* Strip HTML tags for the following: */
+
+
+        /* Strip HTML tags for the standard widget: */
+
         $instance['title'] = strip_tags( $new_instance['title'] );
+
+        $instance['size'] = strip_tags( $new_instance['size'] );
+
         $instance['rss_url'] = strip_tags( $new_instance['rss_url'] );
-        $instance['mail_url'] = strip_tags( $new_instance['mail_url'] );
+
+        $instance['rss_col'] = strip_tags( $new_instance['rss_col'] );
+
+        $instance['email_url'] = strip_tags( $new_instance['email_url'] );
+
+        $instance['email_col'] = strip_tags( $new_instance['email_col'] );
+
         $instance['twitter_url'] = strip_tags( $new_instance['twitter_url'] );
+
+        $instance['twitter_col'] = strip_tags( $new_instance['twitter_col'] );
+
         $instance['facebook_url'] = strip_tags( $new_instance['facebook_url'] );
-        $instance['size'] = strip_tags( $new_instance['size'] );
-        $instance['rss_col'] = strip_tags( $new_instance['rss_col'] );
-        $instance['mail_col'] = strip_tags( $new_instance['mail_col'] );
-        $instance['twitter_col'] = strip_tags( $new_instance['twitter_col'] );
+
         $instance['facebook_col'] = strip_tags( $new_instance['facebook_col'] );
 
+        
+
+        /* Strip HTML tags for the add-on pack: */
+
+        $instance['linkedin_url'] = strip_tags( $new_instance['linkedin_url'] );
+
+        $instance['linkedin_col'] = strip_tags( $new_instance['linkedin_col'] );
+
+        $instance['flickr_url'] = strip_tags( $new_instance['flickr_url'] );
+
+        $instance['flickr_col'] = strip_tags( $new_instance['flickr_col'] );
+
+        $instance['google_url'] = strip_tags( $new_instance['google_url'] );
+
+        $instance['google_col'] = strip_tags( $new_instance['google_col'] );
+
+        $instance['podcast_url'] = strip_tags( $new_instance['podcast_url'] );
+
+        $instance['podcast_col'] = strip_tags( $new_instance['podcast_col'] );
+
+
+
         return $instance;
+
     }
 
+
+
     /**
+
      * Displays the widget settings controls on the widget panel.
+
      * Makes use of the get_field_id() and get_field_name() function
+
      * when creating your form elements. This handles the confusing stuff.
+
      */
+
     function form( $instance ) {
 
-        /* Set up some default widget settings. */
         $defaults = array(
+
+        
+
+            /* Set up some default standard widget settings. */
+
             'title' => 'Subscription Options:',
+
+            'size' => '70',
+
             'rss_url' => '',
-            'mail_url' => '',
+
+            'rss_col' => '#FF9831',
+
+            'email_url' => '',
+
+            'email_col' => '#7AFD32',
+
             'twitter_url' => '',
+
+            'twitter_col' => '#309AFE',
+
             'facebook_url' => '',
-            'size' => '70',
-            'rss_col' => '9',
-            'mail_col' => '1',
-            'twitter_col' => '4',
-            'facebook_col' => '7',
+
+            'facebook_col' => '#FF005D',
+
+            
+
+            /* Set up some default add-on pack settings. */
+
+            'linkedin_url' => '',
+
+            'linkedin_col' => '#2680AA',
+
+            'flickr_url' => '',
+
+            'flickr_col' => '#FF0084',
+
+            'google_url' => '',
+
+            'google_col' => '#555555',
+
+            'podcast_url' => '',
+
+            'podcast_col' => '#B474E6',
+
+
+
           );
+
         $instance = wp_parse_args( (array) $instance, $defaults ); ?>
 
+
+
         <!-- Widget Title: Text Input -->
-        <p>
-            <label for="<?php echo $this->get_field_id( 'title' ); ?>">Title:</label>
-            <input id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo $instance['title']; ?>" style="width:218px;" />
-        </p>
-
-        <!-- RSS Feed URL & Colour ID: Text Input -->
-        <p>
-            <label for="<?php echo $this->get_field_id( 'rss_url' ); ?>"><?php _e('RSS Feed URL & Colour:', 'suboptions'); ?></label>
-            <input id="<?php echo $this->get_field_id( 'rss_url' ); ?>" name="<?php echo $this->get_field_name( 'rss_url' ); ?>" value="<?php echo $instance['rss_url']; ?>" style="width:218px;" /><input id="<?php echo $this->get_field_id( 'rss_col' ); ?>" name="<?php echo $this->get_field_name( 'rss_col' ); ?>" value="<?php echo $instance['rss_col']; ?>" style="width:23px;" />
-        </p>
-
-        <!-- FeedBurner Email Service URL & Colour ID: Text Input -->
-        <p>
-            <label for="<?php echo $this->get_field_id( 'mail_url' ); ?>"><?php _e('FeedBurner Email Service URL & Colour:', 'suboptions'); ?></label>
-            <input id="<?php echo $this->get_field_id( 'mail_url' ); ?>" name="<?php echo $this->get_field_name( 'mail_url' ); ?>" value="<?php echo $instance['mail_url']; ?>" style="width:218px;" /><input id="<?php echo $this->get_field_id( 'mail_col' ); ?>" name="<?php echo $this->get_field_name( 'mail_col' ); ?>" value="<?php echo $instance['mail_col']; ?>" style="width:23px;" />
-            </p>
-        
-        <!-- Twitter Stream URL & Colour ID: Text Input -->
-        <p>
-            <label for="<?php echo $this->get_field_id( 'twitter_url' ); ?>"><?php _e('Twitter Stream URL & Colour:', 'suboptions'); ?></label>
-            <input id="<?php echo $this->get_field_id( 'twitter_url' ); ?>" name="<?php echo $this->get_field_name( 'twitter_url' ); ?>" value="<?php echo $instance['twitter_url']; ?>" style="width:218px;" /><input id="<?php echo $this->get_field_id( 'twitter_col' ); ?>" name="<?php echo $this->get_field_name( 'twitter_col' ); ?>" value="<?php echo $instance['twitter_col']; ?>" style="width:23px;" />
-            </p>
-        
-        <!-- Facebook Page URL & Colour ID: Text Input -->
-        <p>
-            <label for="<?php echo $this->get_field_id( 'facebook_url' ); ?>"><?php _e('Facebook Page URL & Colour:', 'suboptions'); ?></label>
-            <input id="<?php echo $this->get_field_id( 'facebook_url' ); ?>" name="<?php echo $this->get_field_name( 'facebook_url' ); ?>" value="<?php echo $instance['facebook_url']; ?>" style="width:218px;" /><input id="<?php echo $this->get_field_id( 'facebook_col' ); ?>" name="<?php echo $this->get_field_name( 'facebook_col' ); ?>" value="<?php echo $instance['facebook_col']; ?>" style="width:23px;" />   
-            </p>
-        
-        <!-- Colour Reference: Image -->
-        <p>
-            <label><?php _e('IDs:', 'suboptions'); ?></label>
-            <img style="margin: 0pt 0pt -6px 5px;" alt="if you can't see colours go to http://digitalcortex.net/plugins" src="../wp-content/plugins/subscription-options/images/colour-options.png"/>
-        </p>
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'title' ); ?>">Title:</label>
+
+            <input class="suboptions-title" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo $instance['title']; ?>" />
+
+        </p>
+
+
+
+        <!-- RSS Feed URL & Colour: Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'rss_url' ); ?>"><?php _e('RSS Feed URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'rss_url' ); ?>" name="<?php echo $this->get_field_name( 'rss_url' ); ?>" value="<?php echo $instance['rss_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'rss_col' ); ?>" name="<?php echo $this->get_field_name( 'rss_col' ); ?>" value="<?php echo $instance['rss_col']; ?>" />
+
+        </p>
+
+
+
+        <!-- FeedBurner Email Service URL & Colour Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'email_url' ); ?>"><?php _e('FeedBurner Email Service URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'email_url' ); ?>" name="<?php echo $this->get_field_name( 'email_url' ); ?>" value="<?php echo $instance['email_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'email_col' ); ?>" name="<?php echo $this->get_field_name( 'email_col' ); ?>" value="<?php echo $instance['email_col']; ?>" />
+
+        </p>
+
+        
+
+        <!-- Twitter Stream URL & Colour: Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'twitter_url' ); ?>"><?php _e('Twitter Stream URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'twitter_url' ); ?>" name="<?php echo $this->get_field_name( 'twitter_url' ); ?>" value="<?php echo $instance['twitter_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'twitter_col' ); ?>" name="<?php echo $this->get_field_name( 'twitter_col' ); ?>" value="<?php echo $instance['twitter_col']; ?>" />
+
+        </p>
+
+        
+
+        <!-- Facebook Page URL & Colour: Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'facebook_url' ); ?>"><?php _e('Facebook Page URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'facebook_url' ); ?>" name="<?php echo $this->get_field_name( 'facebook_url' ); ?>" value="<?php echo $instance['facebook_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'facebook_col' ); ?>" name="<?php echo $this->get_field_name( 'facebook_col' ); ?>" value="<?php echo $instance['facebook_col']; ?>" />   
+
+        </p>
+
+        
+
+        <!-- Decides to render Add-on Pack settings, if Add-on Pack is installed -->
+
+        <?php
+
+        if (function_exists('suboptions_addon')) {
+
+        echo '<div id="suboptions-addon" class="suboptions-installed">';
+
+        } else {
+
+        echo '<p>Need more icons? Install the <a title="Install the Subscription Options Add-on Pack for $1.50" target="_blank" href="http://digitalcortex.net/plugins/subscription-options/addon-pack">Add-on Pack</a>!</p>';
+
+        echo '<div id="suboptions-addon" class="suboptions-not-installed">';
+
+        }
+
+        ?>
+
+        
+
+        <!-- Add-on Pack: LinkedIn Profile URL & Colour: Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'linkedin_url' ); ?>"><?php _e('LinkedIn Profile URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'linkedin_url' ); ?>" name="<?php echo $this->get_field_name( 'linkedin_url' ); ?>" value="<?php echo $instance['linkedin_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'linkedin_col' ); ?>" name="<?php echo $this->get_field_name( 'linkedin_col' ); ?>" value="<?php echo $instance['linkedin_col']; ?>" />
+
+        </p>
+
+
+
+        <!-- Add-on Pack: Flickr Page URL & Colour Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'flickr_url' ); ?>"><?php _e('Flickr Page URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'flickr_url' ); ?>" name="<?php echo $this->get_field_name( 'flickr_url' ); ?>" value="<?php echo $instance['flickr_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'flickr_col' ); ?>" name="<?php echo $this->get_field_name( 'flickr_col' ); ?>" value="<?php echo $instance['flickr_col']; ?>" />
+
+        </p>
+
+
+
+        <!-- Add-on Pack: Google+ URL & Colour: Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'google_url' ); ?>"><?php _e('Google Plus URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'google_url' ); ?>" name="<?php echo $this->get_field_name( 'google_url' ); ?>" value="<?php echo $instance['google_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'google_col' ); ?>" name="<?php echo $this->get_field_name( 'google_col' ); ?>" value="<?php echo $instance['google_col']; ?>" />
+
+        </p>
+
+
+
+        <!-- Add-on Pack: Podcasting Service URL & Colour: Text Input -->
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'podcast_url' ); ?>"><?php _e('Podcasting Service URL & Colour:', 'suboptions'); ?></label>
+
+            <input class="suboptions-url" id="<?php echo $this->get_field_id( 'podcast_url' ); ?>" name="<?php echo $this->get_field_name( 'podcast_url' ); ?>" value="<?php echo $instance['podcast_url']; ?>" /><input class="suboptions-colour" id="<?php echo $this->get_field_id( 'podcast_col' ); ?>" name="<?php echo $this->get_field_name( 'podcast_col' ); ?>" value="<?php echo $instance['podcast_col']; ?>" />
+
+        </p>
+
+        </div>
+
+        
 
         <!-- Icon Size: Text Input -->
-        <p>
-            <label for="<?php echo $this->get_field_id( 'size' ); ?>"><?php _e('Icon Size:', 'suboptions'); ?></label><input id="<?php echo $this->get_field_id( 'size' ); ?>" name="<?php echo $this->get_field_name( 'size' ); ?>" value="<?php echo $instance['size']; ?>" style="width:30px; " /><?php _e(' pixels', 'suboptions'); ?>  
-        </p>
+
+        <p class="suboptions-item">
+
+            <label class="suboptions-label" for="<?php echo $this->get_field_id( 'size' ); ?>"><?php _e('Icon Size:', 'suboptions'); ?></label><input class="suboptions-size" id="<?php echo $this->get_field_id( 'size' ); ?>" name="<?php echo $this->get_field_name( 'size' ); ?>" value="<?php echo $instance['size']; ?>" style="width:30px; " /><?php _e(' pixels', 'suboptions'); ?> 
+
+        </p>
+
+        
 
     <?php
+
+    
+
     }
+
 }
 
+
+
+/*
+
+* Add a bit of style.
+
+*/
+
+function suboptions_style() {
+
+    $siteurl = get_option('wpurl');
+
+    $url = $siteurl . '/wp-content/plugins/' . basename(dirname(__FILE__)) . '/suboptions.css';
+
+    echo "<link rel='stylesheet' type='text/css' href='$url' />\n";
+
+}
+
+add_action( 'wp_head', 'suboptions_style' );
+
+add_action( 'admin_head', 'suboptions_style' );
+
+
+
 ?>