From 93eda9d9c1deb50cfa36392dbcbc4dc56883160f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 22 Jul 2011 17:37:51 +0200
Subject: Initial work on new UI

---
 images/icons/gear_22.png                           | Bin 0 -> 886 bytes
 images/icons/notify_off_22.png                     | Bin 0 -> 884 bytes
 images/icons/notify_on_22.png                      | Bin 0 -> 561 bytes
 include/template_processor.php                     |   3 +
 view/nav.tpl                                       |  70 ++++-
 view/theme/quattro/LIBERATION-FONTS-COPYING        | 339 +++++++++++++++++++++
 view/theme/quattro/LiberationSans-Bold.ttf         | Bin 0 -> 136664 bytes
 view/theme/quattro/LiberationSans-Italic.ttf       | Bin 0 -> 161532 bytes
 view/theme/quattro/LiberationSans-Regular.ttf      | Bin 0 -> 139036 bytes
 .../quattro/liberation-fonts-ttf-1.07.0.tar.gz     | Bin 0 -> 1326750 bytes
 view/theme/quattro/style.css                       | 168 ++++++++++
 view/theme/quattro/style.less                      | 193 ++++++++++++
 12 files changed, 761 insertions(+), 12 deletions(-)
 create mode 100644 images/icons/gear_22.png
 create mode 100644 images/icons/notify_off_22.png
 create mode 100644 images/icons/notify_on_22.png
 create mode 100644 view/theme/quattro/LIBERATION-FONTS-COPYING
 create mode 100644 view/theme/quattro/LiberationSans-Bold.ttf
 create mode 100644 view/theme/quattro/LiberationSans-Italic.ttf
 create mode 100644 view/theme/quattro/LiberationSans-Regular.ttf
 create mode 100644 view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz
 create mode 100644 view/theme/quattro/style.css
 create mode 100644 view/theme/quattro/style.less

diff --git a/images/icons/gear_22.png b/images/icons/gear_22.png
new file mode 100644
index 000000000..e363de00d
Binary files /dev/null and b/images/icons/gear_22.png differ
diff --git a/images/icons/notify_off_22.png b/images/icons/notify_off_22.png
new file mode 100644
index 000000000..0520af327
Binary files /dev/null and b/images/icons/notify_off_22.png differ
diff --git a/images/icons/notify_on_22.png b/images/icons/notify_on_22.png
new file mode 100644
index 000000000..a8b305245
Binary files /dev/null and b/images/icons/notify_on_22.png differ
diff --git a/include/template_processor.php b/include/template_processor.php
index 83f680f02..f1d2eae4e 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -166,6 +166,9 @@
 			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
 			if ($s==Null) $this->_preg_error();
 			
+			// remove comments block
+			$s = preg_replace('/{#[^#]*#}/', "" , $s);
+			
 			// replace strings recursively (limit to 10 loops)
 			$os = ""; $count=0;
 			while($os!=$s && $count<10){
diff --git a/view/nav.tpl b/view/nav.tpl
index 09a25ac83..3a458b193 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -1,7 +1,63 @@
-$langselector
+{# $langselector #}
 
 <div id="site-location">$sitelocation</div>
 
+
+<div id="nav">
+	<div id="nav-user-menu-wrapper">
+		<div class="left nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/profile/4.jpg"></a>
+			<ul id="nav-user-menu" class="menu-popup">
+				<li><a href="profile">Profile</a></li>
+				<li><a href="photos">Photos</a></li>
+				{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+				{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+			</ul>
+		</div>
+		
+		{{ if $nav.community }}
+			<div id="nav-community-link" class="left nav-menu">
+				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+			</div>
+		{{ endif }}
+		
+		{{ if $nav.network }}
+			<div id="nav-network-link" class="left nav-menu">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+				<span id="net-update" class="nav-notify">12</span>
+			</div>
+		{{ endif }}
+		{{ if $nav.network }}
+			<div id="nav-home-link" class="left nav-menu selected">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+				<span id="home-update" class="nav-notify">2</span>
+			</div>
+		{{ endif }}
+		
+		{{ if $nav.notifications }}
+			<div class="left nav-menu-icon"><a href="#" rel="#nav-notifications-menu" title=""><span class="icon s22 notify_off"></span></a>
+				<ul id="nav-notifications-menu" class="menu-popup">
+				</ul>
+			</div>		
+		{{ endif }}
+		
+		
+		
+		<div class="right nav-menu-icon"><a href="#" rel="#nav-site-menu"><img src="http://localhost/~fabio/friendika/images/icons/gear_22.png"></a>
+			<ul id="nav-site-menu" class="menu-popup" ">
+				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+			</ul>		
+		</div>
+	</div>
+
+</div>
+
+
+{#
+
 {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
 {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
 
@@ -18,17 +74,6 @@ $langselector
 
 {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
 
-{{ if $nav.network }}
-<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-<span id="net-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.home }}
-<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-<span id="home-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.community }}
-<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-{{ endif }}
 {{ if $nav.notifications }}
 <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
 <span id="notify-update" class="nav-ajax-left"></span>
@@ -47,3 +92,4 @@ $langselector
 </span>
 <span id="nav-end"></span>
 <span id="banner">$banner</span>
+#}
diff --git a/view/theme/quattro/LIBERATION-FONTS-COPYING b/view/theme/quattro/LIBERATION-FONTS-COPYING
new file mode 100644
index 000000000..d511905c1
--- /dev/null
+++ b/view/theme/quattro/LIBERATION-FONTS-COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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
+
+	    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
+convey 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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This 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.
diff --git a/view/theme/quattro/LiberationSans-Bold.ttf b/view/theme/quattro/LiberationSans-Bold.ttf
new file mode 100644
index 000000000..169fac34d
Binary files /dev/null and b/view/theme/quattro/LiberationSans-Bold.ttf differ
diff --git a/view/theme/quattro/LiberationSans-Italic.ttf b/view/theme/quattro/LiberationSans-Italic.ttf
new file mode 100644
index 000000000..8b9dc760a
Binary files /dev/null and b/view/theme/quattro/LiberationSans-Italic.ttf differ
diff --git a/view/theme/quattro/LiberationSans-Regular.ttf b/view/theme/quattro/LiberationSans-Regular.ttf
new file mode 100644
index 000000000..ceeaa2740
Binary files /dev/null and b/view/theme/quattro/LiberationSans-Regular.ttf differ
diff --git a/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz b/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz
new file mode 100644
index 000000000..0c86f7347
Binary files /dev/null and b/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz differ
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
new file mode 100644
index 000000000..055f8e9b6
--- /dev/null
+++ b/view/theme/quattro/style.css
@@ -0,0 +1,168 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ **/
+/* fonts */
+@font-face {
+  font-family: "LiberationSans";
+  src: local("Liberation Sans"), url(LiberationSans-Regular.ttf) format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: "LiberationSans";
+  src: local("Liberation Sans"), url(LiberationSans-Bold.ttf) format("truetype");
+  font-weight: bold;
+  font-style: normal;
+}
+@font-face {
+  font-family: "LiberationSans";
+  src: local("Liberation Sans"), url(LiberationSans-Italic.ttf) format("truetype");
+  font-weight: normal;
+  font-style: italic;
+}
+/* global */
+body {
+  font-family: LiberationSans, helvetica, arial, freesans, clean, sans-serif;
+  font-size: 12px;
+  background-color: #FFFFFF;
+  color: #2d2d2d;
+  margin: 0px;
+}
+a, a:visited, a:link {
+  color: #005c94;
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+/* nav */
+nav {
+  width: 100%;
+  height: 50px;
+  background-color: #0e232e;
+  color: #FFFFFF;
+}
+nav a,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #FFFFFF;
+  text-decoration: none;
+}
+nav #site-location {
+  font-size: 8px;
+  float: left;
+  background-color: #364e59;
+  padding: 1px 5px;
+  margin-left: 20px;
+  -moz-border-radius: 0 0 5px 5px;
+  -webkit-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+}
+nav #nav {
+  clear: both;
+  padding: 0px 20px;
+  height: auto;
+  padding-top: 6px;
+}
+nav #nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 10px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav #nav .nav-menu-icon.selected {
+  background-color: #364e59;
+}
+nav #nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav #nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 14px;
+  border-bottom: 3px solid #0e232e;
+}
+nav #nav .nav-menu.selected {
+  border-bottom: 3px solid #9eabb0;
+}
+nav #nav .nav-menu .nav-notify {
+  position: absolute;
+  background-color: #19aeff;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  top: 0px;
+  right: -10px;
+  min-width: 15px;
+  text-align: right;
+}
+ul.menu-popup {
+  position: absolute;
+  /*display: none;*/
+
+  width: auto;
+  background: #FFFFFF;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+}
+ul.menu-popup a:hover {
+  background-color: #bdcdd4;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+.left .menu-popup {
+  left: 0px;
+}
+.right .menu-popup {
+  right: 0px;
+}
+/* icons */
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  background-position: center center;
+  display: block;
+}
+.icon.s22 {
+  width: 22px;
+  height: 22px;
+}
+.icon.s22.notify_off {
+  background-image: url("../../../images/icons/notify_off_22.png");
+}
+.icon.s22.notify_on {
+  background-image: url("../../../images/icons/notify_on_22.png");
+}
+/* aside */
+aside {
+  display: none;
+}
+/* section */
+section {
+  display: none;
+}
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
new file mode 100644
index 000000000..e267834a6
--- /dev/null
+++ b/view/theme/quattro/style.less
@@ -0,0 +1,193 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ **/
+// Less file http://lesscss.org/
+// compile with lessc
+// $ lessc style.less > style.css
+
+// "Echo" palette from Inkscape
+@Blue1:rgb(25,174,255);
+@Blue2:rgb(0,132,200);
+@Blue3:rgb(0,92,148);
+@Red1:rgb(255,65,65);
+@Red2:rgb(220,0,0);
+@Red3:rgb(181,0,0);
+@Orange1:rgb(255,255,62);
+@Orange2:rgb(255,153,0);
+@Orange3:rgb(255,102,0);
+@Brown1:rgb(255,192,34);
+@Brown2:rgb(184,129,0);
+@Brown3:rgb(128,77,0);
+@Green1:rgb(204,255,66);
+@Green2:rgb(154,222,0);
+@Green3:rgb(0,145,0);
+@Purple1:rgb(241,202,255);
+@Purple2:rgb(215,108,255);
+@Purple3:rgb(186,0,255);
+@Metalic1:rgb(189,205,212);
+@Metalic2:rgb(158,171,176);
+@Metalic3:rgb(54,78,89);
+@Metalic4:rgb(14,35,46);
+@Grey1:rgb(255,255,255);
+@Grey2:rgb(204,204,204);
+@Grey3:rgb(153,153,153);
+@Grey4:rgb(102,102,102);
+@Grey5:rgb(45,45,45);
+
+
+ 
+/* fonts */
+@font-face {  
+  font-family: "LiberationSans";  
+  src: local("Liberation Sans"), url( LiberationSans-Regular.ttf ) format("truetype");
+  font-weight: normal; font-style: normal;
+}
+@font-face {  
+  font-family: "LiberationSans";  
+  src: local("Liberation Sans"), url( LiberationSans-Bold.ttf ) format("truetype");
+  font-weight: bold; font-style: normal;
+}
+@font-face {  
+  font-family: "LiberationSans";  
+  src: local("Liberation Sans"), url( LiberationSans-Italic.ttf ) format("truetype");
+  font-weight: normal; font-style: italic;
+}
+ 
+/* global */
+body {
+	font-family: LiberationSans,helvetica,arial,freesans,clean,sans-serif;
+	font-size: 12px;
+	background-color: #FFFFFF;
+	color: @Grey5;
+	margin: 0px;
+}
+
+.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){
+	-moz-border-radius: @arguments;
+	-webkit-border-radius: @arguments;
+	border-radius: @arguments;
+}
+
+.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); }
+.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); }
+
+a, a:visited, a:link { color: @Blue3; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+.left { float: left; }
+.right { float: right; }
+
+/* nav */
+nav { 
+	width: 100%; height: 50px; 
+	background-color: @Metalic4;
+	color: #FFFFFF;
+	a, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; }
+
+	#site-location {
+		font-size:8px;
+		float:left;
+		background-color: @Metalic3;
+		padding: 1px 5px;
+		margin-left: 20px;
+		.roundbottom()
+	}
+
+	#nav {
+		clear: both;
+		padding: 0px 20px;
+		height: auto;
+		padding-top: 6px;
+	
+		.nav-menu-icon {
+			position: relative;
+			height: 22px;
+			padding: 5px;
+			margin: 0px 10px;
+			.roundtop();
+			
+			&.selected {
+				background-color: @Metalic3;
+			}
+			
+			img { width: 22px; height: 22px; }
+		}
+
+		.nav-menu {
+			position: relative;
+			height: 16px;
+			padding: 5px;
+			margin: 3px 15px 0px;
+			font-size: 14px;
+			border-bottom: 3px solid @Metalic4;
+			&.selected {
+				border-bottom: 3px solid @Metalic2;
+			}
+			
+			.nav-notify {
+				position: absolute;
+				background-color: @Blue1;
+				.rounded();
+				font-size: 10px;
+				padding: 1px 3px;
+				top: 0px;
+				right: -10px;
+				min-width: 15px;
+			    text-align: right;
+			}
+			
+		}
+		
+	}
+}
+
+ul.menu-popup {
+	position: absolute;
+	/*display: none;*/
+	width: auto;
+	background: #FFFFFF;
+	color: @Grey5;
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
+	border: 3px solid @Metalic3;
+	a { display: block; color: @Grey5; padding: 5px 10px;}
+	a:hover { background-color: @Metalic1; }
+	z-index: 100000;
+	
+	.menu-sep  {
+		border-top: 1px solid @Metalic2;
+	}
+}
+.left .menu-popup{ left: 0px; }
+.right .menu-popup{ right: 0px; }
+
+/* icons */
+
+
+.icons(@size: 22) {
+	&.notify_off { background-image: url("../../../images/icons/notify_off_@{size}.png"); }
+	&.notify_on  { background-image: url("../../../images/icons/notify_on_@{size}.png"); }
+}
+
+
+.icon {
+	background-color: transparent ;
+	background-repeat: no-repeat;
+	background-position: center center;
+	display: block;
+
+	&.s22 {
+		width:22px; height: 22px;
+		.icons(22);
+	}
+	
+}
+
+
+
+/* aside */
+aside { display: none; }
+
+/* section */
+section { display: none;}
-- 
cgit v1.2.3


From e6444adafdd3c50913ca44d8701996e058e064b9 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 25 Jul 2011 16:52:30 +0200
Subject: change nav selected css class

---
 boot.php              | 7 ++++++-
 include/nav.php       | 2 +-
 mod/community.php     | 2 +-
 mod/contacts.php      | 2 +-
 mod/directory.php     | 2 +-
 mod/message.php       | 2 +-
 mod/network.php       | 2 +-
 mod/notifications.php | 2 +-
 mod/profile.php       | 2 +-
 mod/profiles.php      | 2 +-
 mod/settings.php      | 2 +-
 11 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/boot.php b/boot.php
index d36512295..f4b43e4c9 100644
--- a/boot.php
+++ b/boot.php
@@ -2946,6 +2946,11 @@ function get_plugin_info($plugin){
 	return $info;
 }}
 
+if(! function_exists('set_nav_selected')){
+function set_nav_selected($id){
+	return '<script>	$(document).ready(function() { $("#'.$id.'").addClass("selected"); });</script>';
+}}
+
 if(! function_exists('return_bytes')) {
 function return_bytes ($size_str) {
     switch (substr ($size_str, -1))
@@ -2968,4 +2973,4 @@ function generate_guid() {
 			$found = false;
 	} while ($found == true );
 	return $guid;
-}
\ No newline at end of file
+}
diff --git a/include/nav.php b/include/nav.php
index 895c321e6..caed9453a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -41,7 +41,7 @@ function nav(&$a) {
 		$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
 	}
 	else {
-		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''), t('Sign in'));
+		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in'));
 	}
 
 
diff --git a/mod/community.php b/mod/community.php
index cf43598b5..f8bd88d86 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -25,7 +25,7 @@ function community_content(&$a, $update = 0) {
 
 	$o .= '<h3>' . t('Community') . '</h3>';
 	if(! $update) {
-		$o .= '<script>	$(document).ready(function() { $(\'#nav-community-link\').addClass(\'nav-selected\'); });</script>';
+		$o .= set_nav_selected('nav-community-link');
 		$o .= '<div id="live-community"></div>' . "\r\n";
 		$o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
diff --git a/mod/contacts.php b/mod/contacts.php
index 2fc01a0d8..1fa07688c 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -112,7 +112,7 @@ function contacts_content(&$a) {
 
 	$sort_type = 0;
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+	$o .= set_nav_selected('nav-contacts-link');
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
diff --git a/mod/directory.php b/mod/directory.php
index 0c60f04bf..03b6ab4d1 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -22,7 +22,7 @@ function directory_content(&$a) {
 	}
 
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
+	$o .= set_nav_selected('nav-directory-link');
 	if(x($_SESSION,'theme'))
 		unset($_SESSION['theme']);
 
diff --git a/mod/message.php b/mod/message.php
index ad598eb7d..ff3db06e2 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -110,7 +110,7 @@ function message_post(&$a) {
 function message_content(&$a) {
 
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-messages-link\').addClass(\'nav-selected\'); });</script>';
+	$o .= set_nav_selected('nav-messages-link');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/mod/network.php b/mod/network.php
index 7bdd3f3f1..8d377fa0e 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -98,7 +98,7 @@ function network_content(&$a, $update = 0) {
 			}
 		}
 
-		$o .= '<script>	$(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
+		$o .= set_nav_selected('nav-network-link');
 
 		$_SESSION['return_url'] = $a->cmd;
 
diff --git a/mod/notifications.php b/mod/notifications.php
index c6f073058..6f9ece184 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -64,7 +64,7 @@ function notifications_content(&$a) {
 	}
 
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-notify-link\').addClass(\'nav-selected\'); });</script>';
+	$o .= set_nav_selected("nav-notifications-link");
 
 	if(($a->argc > 1) && ($a->argv[1] == 'all'))
 		$sql_extra = '';
diff --git a/mod/profile.php b/mod/profile.php
index f4b6bfaf1..7e47c91bb 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -70,7 +70,7 @@ function profile_content(&$a, $update = 0) {
 	}
 	else {
 		if($a->profile['profile_uid'] == local_user())		
-			$o .= '<script>	$(document).ready(function() { $(\'#nav-home-link\').addClass(\'nav-selected\'); });</script>';
+			$o .= set_nav_selected('nav-home-link');
 	}
 
 	$contact = null;
diff --git a/mod/profiles.php b/mod/profiles.php
index 160ca13bc..7041249e2 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -220,7 +220,7 @@ function profiles_post(&$a) {
 function profiles_content(&$a) {
 
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
+	$o .= set_nav_selected('nav-profiles-link');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/mod/settings.php b/mod/settings.php
index 1b4098de8..0223b1b9c 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -299,7 +299,7 @@ if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-settings-link\').addClass(\'nav-selected\'); });</script>';
+	$o .=  set_nav_selected('nav-settings-link');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL );
-- 
cgit v1.2.3


From 5fb2b522f47a362debae7ee0c3bcb3b23f36bac6 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 25 Jul 2011 16:53:27 +0200
Subject: move <header> and <nav> tag into nav.tpl. add notification popup
 items template

---
 view/default.php |  3 +--
 view/nav.tpl     | 53 +++++++++++++++++++++++++++++------------------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/view/default.php b/view/default.php
index 0d4a69054..ab1cb0f09 100644
--- a/view/default.php
+++ b/view/default.php
@@ -6,8 +6,7 @@
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
-	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-	<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
 	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
diff --git a/view/nav.tpl b/view/nav.tpl
index 3a458b193..454d7ebd0 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -1,59 +1,64 @@
-{# $langselector #}
-
-<div id="site-location">$sitelocation</div>
-
-
-<div id="nav">
-	<div id="nav-user-menu-wrapper">
-		<div class="left nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/profile/4.jpg"></a>
+<header>
+	{# $langselector #}
+
+	<div id="site-location">$sitelocation</div>
+</header>
+<nav>
+	<ul>
+		<li id="nav-user-link" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/52728a08b979618a787e43664bfbae98-6.jpg" alt="User"></a>
 			<ul id="nav-user-menu" class="menu-popup">
 				<li><a href="profile">Profile</a></li>
 				<li><a href="photos">Photos</a></li>
 				{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
 				{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
 			</ul>
-		</div>
+		</li>
 		
 		{{ if $nav.community }}
-			<div id="nav-community-link" class="left nav-menu">
+			<li id="nav-community-link" class="nav-menu">
 				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</div>
+			</li>
 		{{ endif }}
 		
 		{{ if $nav.network }}
-			<div id="nav-network-link" class="left nav-menu">
+			<li id="nav-network-link" class="nav-menu">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-				<span id="net-update" class="nav-notify">12</span>
-			</div>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
 		{{ endif }}
 		{{ if $nav.network }}
-			<div id="nav-home-link" class="left nav-menu selected">
+			<li id="nav-home-link" class="nav-menu">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify">2</span>
-			</div>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
 		{{ endif }}
 		
 		{{ if $nav.notifications }}
-			<div class="left nav-menu-icon"><a href="#" rel="#nav-notifications-menu" title=""><span class="icon s22 notify_off"></span></a>
+			<li  id="nav-notifications-link" class="nav-menu-icon"><a href="#" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
 				</ul>
-			</div>		
+			</li>		
 		{{ endif }}
+		<ul id="nav-notifications-template" style="display:none;" rel="template">
+			<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+		</ul>
+
 		
 		
 		
-		<div class="right nav-menu-icon"><a href="#" rel="#nav-site-menu"><img src="http://localhost/~fabio/friendika/images/icons/gear_22.png"></a>
-			<ul id="nav-site-menu" class="menu-popup" ">
+		<li id="nav-site-link" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
 				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
 				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
 			</ul>		
-		</div>
-	</div>
+		</li>
+	</ul>
 
-</div>
+</nav>
 
 
 {#
-- 
cgit v1.2.3


From 99ab06bad3eb8b4c20e70c255d9d4b168c137dde Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 25 Jul 2011 16:54:39 +0200
Subject: js to open close popup nav menu and to populate notification menu via
 ping. Update mod/ping to return details about messages and intros

---
 include/main.js | 53 ++++++++++++++++++++++++++++++++++-------------------
 mod/ping.php    | 45 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/include/main.js b/include/main.js
index d17d923e4..dc39a7281 100644
--- a/include/main.js
+++ b/include/main.js
@@ -34,6 +34,9 @@
 
 		msie = $.browser.msie ;
 		
+		/* setup navbar menus */
+		
+		
 		
 		/* setup onoff widgets */
 		$(".onoff input").each(function(){
@@ -55,34 +58,46 @@
 		
 		/* setup field_richtext */
 		setupFieldRichtext();
-		
-		/* load tinyMCE if needed and setup field_richtext */
-		/*if(typeof tinyMCE == "undefined") {
-			window.tinyMCEPreInit = {
-				suffix:"",
-				base: baseurl+"/library/tinymce/jscripts/tiny_mce/",
-				query:"",
-			};
-			$.getScript(baseurl	+"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", setupFieldRichtext);
-		} else {
-		}*/
+
+		/* popup menus */
+		$('a[rel^=#]').click(function(e){
+			e.stopPropagation();
+			menu = $( $(this).attr('rel') );
+			$(this).parent().toggleClass("selected");
+			menu.toggle();
+			return false;
+		});
 		
 		
+
+		/* notifications template */
+		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
 		
 		/* nav update event  */
 		$('nav').bind('nav-update', function(e,data){;
 			var net = $(data).find('net').text();
-			if(net == 0) { net = ''; $('#net-update').hide() } else { $('#net-update').show() }
+			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
 			$('#net-update').html(net);
+
 			var home = $(data).find('home').text();
-			if(home == 0) { home = '';  $('#home-update').hide() } else { $('#home-update').show() }
+			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
 			$('#home-update').html(home);
-			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $('#mail-update').hide() } else { $('#mail-update').show() }
-			$('#mail-update').html(mail);
-			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = ''; $('#notify-update').hide() } else { $('#notify-update').show() }
-			$('#notify-update').html(intro);
+
+			var eNotif = $(data).find('notif')
+			notif = eNotif.attr('count');
+			if (notif>0){
+				nnm = $("#nav-notifications-menu");
+				nnm.html("");
+				eNotif.children("note").each(function(){
+					e = $(this);
+					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
+					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
+					nnm.append(html);
+				});
+			}
+			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
+			$('#notify-update').html(notif);
+			
 		});
 		
 		
diff --git a/mod/ping.php b/mod/ping.php
index 7c31f00c9..e7f366095 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once("include/datetime.php");
 
 
 function ping_init(&$a) {
@@ -7,6 +7,7 @@ function ping_init(&$a) {
 	if(! local_user())
 		xml_status(0);
 
+	
 	$r = q("SELECT COUNT(*) AS `total` FROM `item` 
 		WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ",
 		intval(local_user())
@@ -19,23 +20,51 @@ function ping_init(&$a) {
 	);
 	$home = $r[0]['total'];
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `intro` 
-		WHERE `uid` = %d  AND `blocked` = 0 AND `ignore` = 0 ",
+	$intros = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+		`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
+		FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+		WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 ",
 		intval(local_user())
 	);
-	$intro = $r[0]['total'];
+	$intro = $intros[0]['total'];
 
 	$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-	$r = q("SELECT COUNT(*) AS `total` FROM `mail`
+	$mails = q("SELECT *,  COUNT(*) AS `total` FROM `mail`
 		WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
 		intval(local_user()),
 		dbesc($myurl)
 	);
-
-	$mail = $r[0]['total'];
+	$mail = $mails[0]['total'];
+	
+	
 	
 	header("Content-type: text/xml");
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
+	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+		<result>
+			<intro>$intro</intro>
+			<mail>$mail</mail>
+			<net>$network</net>
+			<home>$home</home>
+			<notif count=\"".($mail+$intro)."\">";
+	if ($intro>0){
+		foreach ($intros as $i) { 
+			echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>', 
+				$a->get_baseurl().'/notification/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
+			);
+		};
+	}
+	if ($mail>0){
+		foreach ($mails as $i) { 
+			var_dump($i);
+			echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>',
+				$a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message")
+			);
+		};
+	}
+
+	echo "  </notif>
+		</result>
+	";
 
 	killme();
 }
-- 
cgit v1.2.3


From ba4ea589d00d8d79291191156a64e903b36509aa Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 25 Jul 2011 16:55:43 +0200
Subject: update style

---
 view/theme/quattro/style.css  | 166 ++++++++++++++++++++++---------------
 view/theme/quattro/style.less | 187 +++++++++++++++++++++++++-----------------
 2 files changed, 213 insertions(+), 140 deletions(-)

diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 055f8e9b6..ec5231290 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -2,27 +2,9 @@
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  **/
 /* fonts */
-@font-face {
-  font-family: "LiberationSans";
-  src: local("Liberation Sans"), url(LiberationSans-Regular.ttf) format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-@font-face {
-  font-family: "LiberationSans";
-  src: local("Liberation Sans"), url(LiberationSans-Bold.ttf) format("truetype");
-  font-weight: bold;
-  font-style: normal;
-}
-@font-face {
-  font-family: "LiberationSans";
-  src: local("Liberation Sans"), url(LiberationSans-Italic.ttf) format("truetype");
-  font-weight: normal;
-  font-style: italic;
-}
 /* global */
 body {
-  font-family: LiberationSans, helvetica, arial, freesans, clean, sans-serif;
+  font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 12px;
   background-color: #FFFFFF;
   color: #2d2d2d;
@@ -41,37 +23,81 @@ a:hover {
 .right {
   float: right;
 }
+/* icons */
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  background-position: center center;
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+}
+.icon.s22 {
+  width: 22px;
+  height: 22px;
+  padding: 1px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/notify_off_22.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/gear_22.png");
+}
+/* header */
+header {
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 100%;
+  height: 12px;
+  color: #FFFFFF;
+}
+header #site-location {
+  /*font-size:8px;
+		float:left;
+		background-color: @Metalic3;
+		padding: 1px 5px;
+		margin-left: 20px;
+		.roundbottom()*/
+
+  display: none;
+}
 /* nav */
 nav {
   width: 100%;
-  height: 50px;
+  height: 32px;
+  position: fixed;
+  left: 0px;
+  top: 0px;
   background-color: #0e232e;
   color: #FFFFFF;
 }
 nav a,
+nav a:active,
 nav a:visited,
 nav a:link,
 nav a:hover {
   color: #FFFFFF;
   text-decoration: none;
+  outline: none;
 }
-nav #site-location {
-  font-size: 8px;
-  float: left;
-  background-color: #364e59;
-  padding: 1px 5px;
-  margin-left: 20px;
-  -moz-border-radius: 0 0 5px 5px;
-  -webkit-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px;
-}
-nav #nav {
-  clear: both;
+nav ul {
+  margin: 0px;
   padding: 0px 20px;
-  height: auto;
-  padding-top: 6px;
 }
-nav #nav .nav-menu-icon {
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+nav .nav-menu-icon {
   position: relative;
   height: 22px;
   padding: 5px;
@@ -80,14 +106,17 @@ nav #nav .nav-menu-icon {
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
 }
-nav #nav .nav-menu-icon.selected {
+nav .nav-menu-icon.selected {
   background-color: #364e59;
 }
-nav #nav .nav-menu-icon img {
+nav .nav-menu-icon img {
   width: 22px;
   height: 22px;
 }
-nav #nav .nav-menu {
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
   position: relative;
   height: 16px;
   padding: 5px;
@@ -95,10 +124,11 @@ nav #nav .nav-menu {
   font-size: 14px;
   border-bottom: 3px solid #0e232e;
 }
-nav #nav .nav-menu.selected {
+nav .nav-menu.selected {
   border-bottom: 3px solid #9eabb0;
 }
-nav #nav .nav-menu .nav-notify {
+nav .nav-notify {
+  display: none;
   position: absolute;
   background-color: #19aeff;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -111,10 +141,22 @@ nav #nav .nav-menu .nav-notify {
   min-width: 15px;
   text-align: right;
 }
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-site-link {
+  float: right;
+}
+nav #nav-site-link .menu-popup {
+  right: 0px;
+  left: auto;
+}
+nav #nav-notifications-link.selected .icon.s22.notify {
+  background-image: url("../../../images/icons/notify_on_22.png");
+}
 ul.menu-popup {
   position: absolute;
-  /*display: none;*/
-
+  display: none;
   width: auto;
   background: #FFFFFF;
   color: #2d2d2d;
@@ -135,34 +177,26 @@ ul.menu-popup a:hover {
 ul.menu-popup .menu-sep {
   border-top: 1px solid #9eabb0;
 }
-.left .menu-popup {
-  left: 0px;
-}
-.right .menu-popup {
-  right: 0px;
-}
-/* icons */
-.icon {
-  background-color: transparent ;
-  background-repeat: no-repeat;
-  background-position: center center;
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
   display: block;
 }
-.icon.s22 {
-  width: 22px;
-  height: 22px;
+#nav-notifications-menu {
+  width: 400px;
 }
-.icon.s22.notify_off {
-  background-image: url("../../../images/icons/notify_off_22.png");
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
 }
-.icon.s22.notify_on {
-  background-image: url("../../../images/icons/notify_on_22.png");
+#nav-notifications-menu .contactname {
+  font-weight: bold;
 }
-/* aside */
-aside {
-  display: none;
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
 }
+/* aside */
 /* section */
-section {
-  display: none;
-}
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
index e267834a6..53f833cfd 100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/style.less
@@ -37,25 +37,27 @@
 
  
 /* fonts */
-@font-face {  
-  font-family: "LiberationSans";  
-  src: local("Liberation Sans"), url( LiberationSans-Regular.ttf ) format("truetype");
-  font-weight: normal; font-style: normal;
-}
-@font-face {  
-  font-family: "LiberationSans";  
-  src: local("Liberation Sans"), url( LiberationSans-Bold.ttf ) format("truetype");
-  font-weight: bold; font-style: normal;
-}
-@font-face {  
-  font-family: "LiberationSans";  
-  src: local("Liberation Sans"), url( LiberationSans-Italic.ttf ) format("truetype");
-  font-weight: normal; font-style: italic;
-}
- 
+// @font-face {  
+//   font-family: "LiberationSans";  
+//   src: local("Liberation Sans"),url( LiberationSans-Regular.ttf ) format("truetype");
+//   font-weight: bold; font-style: italic;
+// }
+// 
+// @font-face {  
+//   font-family: "LiberationSans";  
+//   src: local("Liberation Sans"),url( LiberationSans-Bold.ttf ) format("truetype");
+//   font-weight: bold; font-style: normal;
+// }
+// @font-face {  
+//   font-family: "LiberationSans";  
+//   src:  local("Liberation Sans"),url( LiberationSans-Italic.ttf ) format("truetype");
+//   font-weight: normal; font-style: italic;
+// }
+
+
 /* global */
 body {
-	font-family: LiberationSans,helvetica,arial,freesans,clean,sans-serif;
+	font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
 	font-size: 12px;
 	background-color: #FFFFFF;
 	color: @Grey5;
@@ -77,28 +79,70 @@ a:hover {text-decoration: underline; }
 .left { float: left; }
 .right { float: right; }
 
-/* nav */
-nav { 
-	width: 100%; height: 50px; 
-	background-color: @Metalic4;
-	color: #FFFFFF;
-	a, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; }
+/* icons */
+
+
+.icons(@size: 22) {
+	&.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); }
+	&.gear 	 { background-image: url("../../../images/icons/gear_@{size}.png"); }
+}
+
+
+.icon {
+	background-color: transparent ;
+	background-repeat: no-repeat;
+	background-position: center center;
+	display: block;
+	overflow: hidden;
+	text-indent: -9999px;
+
+	&.s22 {
+		width:22px; height: 22px;
+		padding: 1px;
+		.icons(22);
+	}
+	
+}
+
 
+
+/* header */
+header {
+	position: fixed; left: 0px; top: 0px;
+	margin: 0px; padding: 0px;
+	width: 100%; height: 12px; 
+	color: #FFFFFF;
 	#site-location {
-		font-size:8px;
+		/*font-size:8px;
 		float:left;
 		background-color: @Metalic3;
 		padding: 1px 5px;
 		margin-left: 20px;
-		.roundbottom()
+		.roundbottom()*/
+		display: none;
 	}
+}
+/* nav */
+nav { 
+	width: 100%; height: 32px;
+	position: fixed; left: 0px; top: 0px;
+	background-color: @Metalic4;
+	color: #FFFFFF;
+
+		a, a:active, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; outline: none;  }
+
+		ul {
+			margin: 0px;
+			padding: 0px 20px;
+			li { 
+				list-style: none; 
+				margin: 0px; padding: 0px;
+				float: left;
+				.menu-popup{ left: 0px; right: auto; }
+			}
+			
+		}
 
-	#nav {
-		clear: both;
-		padding: 0px 20px;
-		height: auto;
-		padding-top: 6px;
-	
 		.nav-menu-icon {
 			position: relative;
 			height: 22px;
@@ -110,7 +154,8 @@ nav {
 				background-color: @Metalic3;
 			}
 			
-			img { width: 22px; height: 22px; }
+				img { width: 22px; height: 22px; }
+				.nav-notify { top: 3px; }
 		}
 
 		.nav-menu {
@@ -124,26 +169,37 @@ nav {
 				border-bottom: 3px solid @Metalic2;
 			}
 			
-			.nav-notify {
-				position: absolute;
-				background-color: @Blue1;
-				.rounded();
-				font-size: 10px;
-				padding: 1px 3px;
-				top: 0px;
-				right: -10px;
-				min-width: 15px;
-			    text-align: right;
-			}
+		}
+
+		.nav-notify {
+			display: none;
+			position: absolute;
+			background-color: @Blue1;
+			.rounded();
+			font-size: 10px;
+			padding: 1px 3px;
+			top: 0px;
+			right: -10px;
+			min-width: 15px;
+			text-align: right;
 			
+				&.show{ display: block; }
 		}
 		
-	}
+		
+		
+		#nav-site-link { 
+			float: right;
+			.menu-popup{ right: 0px; left: auto; }
+		}
+	
+		#nav-notifications-link.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") }
+		
 }
 
 ul.menu-popup {
 	position: absolute;
-	/*display: none;*/
+	display: none;
 	width: auto;
 	background: #FFFFFF;
 	color: @Grey5;
@@ -151,43 +207,26 @@ ul.menu-popup {
 	padding: 0px;
 	list-style: none;
 	border: 3px solid @Metalic3;
-	a { display: block; color: @Grey5; padding: 5px 10px;}
-	a:hover { background-color: @Metalic1; }
 	z-index: 100000;
-	
-	.menu-sep  {
-		border-top: 1px solid @Metalic2;
-	}
+		
+		a { display: block; color: @Grey5; padding: 5px 10px;}
+		a:hover { background-color: @Metalic1; }
+		.menu-sep  { border-top: 1px solid @Metalic2; }
+		li { float: none;  overflow: auto; height: auto; display: block; }
 }
-.left .menu-popup{ left: 0px; }
-.right .menu-popup{ right: 0px; }
-
-/* icons */
 
-
-.icons(@size: 22) {
-	&.notify_off { background-image: url("../../../images/icons/notify_off_@{size}.png"); }
-	&.notify_on  { background-image: url("../../../images/icons/notify_on_@{size}.png"); }
+#nav-notifications-menu {
+	width: 400px;
+	img { float: left; margin-right: 5px; }
+	.contactname { font-weight: bold; }
+	.notif-when { font-size: 10px; color: @Metalic2; display: block; }
 }
 
 
-.icon {
-	background-color: transparent ;
-	background-repeat: no-repeat;
-	background-position: center center;
-	display: block;
-
-	&.s22 {
-		width:22px; height: 22px;
-		.icons(22);
-	}
-	
-}
-
 
 
 /* aside */
-aside { display: none; }
+// aside { display: none; }
 
 /* section */
-section { display: none;}
+// section { display: none;}
-- 
cgit v1.2.3


From 23d6339a4152759d8dcf68afc6e7dea652336d8c Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 25 Jul 2011 17:12:42 +0200
Subject: change to some nav ids, notice in empty notifications popup

---
 include/main.js               |  7 ++++++-
 view/nav.tpl                  |  7 ++++---
 view/theme/quattro/style.css  | 11 ++++++++---
 view/theme/quattro/style.less | 10 ++++++++--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/include/main.js b/include/main.js
index dc39a7281..3574e6eb8 100644
--- a/include/main.js
+++ b/include/main.js
@@ -61,8 +61,9 @@
 
 		/* popup menus */
 		$('a[rel^=#]').click(function(e){
-			e.stopPropagation();
 			menu = $( $(this).attr('rel') );
+			e.stopPropagation();
+			if (menu.attr('popup')=="false") return false;
 			$(this).parent().toggleClass("selected");
 			menu.toggle();
 			return false;
@@ -72,6 +73,7 @@
 
 		/* notifications template */
 		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+		var notifications_empty = unescape($("#nav-notifications-menu").html());
 		
 		/* nav update event  */
 		$('nav').bind('nav-update', function(e,data){;
@@ -88,12 +90,15 @@
 			if (notif>0){
 				nnm = $("#nav-notifications-menu");
 				nnm.html("");
+				nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
 					e = $(this);
 					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
 					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
 					nnm.append(html);
 				});
+			} else {
+				$("#nav-notifications-menu").html(notifications_empty);
 			}
 			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
 			$('#notify-update').html(notif);
diff --git a/view/nav.tpl b/view/nav.tpl
index 454d7ebd0..5a8a904a6 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -5,7 +5,7 @@
 </header>
 <nav>
 	<ul>
-		<li id="nav-user-link" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/52728a08b979618a787e43664bfbae98-6.jpg" alt="User"></a>
+		<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/52728a08b979618a787e43664bfbae98-6.jpg" alt="User"></a>
 			<ul id="nav-user-menu" class="menu-popup">
 				<li><a href="profile">Profile</a></li>
 				<li><a href="photos">Photos</a></li>
@@ -34,9 +34,10 @@
 		{{ endif }}
 		
 		{{ if $nav.notifications }}
-			<li  id="nav-notifications-link" class="nav-menu-icon"><a href="#" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
+					<li class="empty">Nothing new here</li>
 				</ul>
 			</li>		
 		{{ endif }}
@@ -47,7 +48,7 @@
 		
 		
 		
-		<li id="nav-site-link" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index ec5231290..9ded41721 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -144,14 +144,14 @@ nav .nav-notify {
 nav .nav-notify.show {
   display: block;
 }
-nav #nav-site-link {
+nav #nav-site-linkmenu {
   float: right;
 }
-nav #nav-site-link .menu-popup {
+nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
 }
-nav #nav-notifications-link.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
   background-image: url("../../../images/icons/notify_on_22.png");
 }
 ul.menu-popup {
@@ -183,6 +183,11 @@ ul.menu-popup li {
   height: auto;
   display: block;
 }
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
 #nav-notifications-menu {
   width: 400px;
 }
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
index 53f833cfd..a2c1a1eae 100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/style.less
@@ -188,12 +188,12 @@ nav {
 		
 		
 		
-		#nav-site-link { 
+		#nav-site-linkmenu { 
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
 		}
 	
-		#nav-notifications-link.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") }
+		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") }
 		
 }
 
@@ -213,6 +213,12 @@ ul.menu-popup {
 		a:hover { background-color: @Metalic1; }
 		.menu-sep  { border-top: 1px solid @Metalic2; }
 		li { float: none;  overflow: auto; height: auto; display: block; }
+		
+		.empty {
+			padding: 5px;
+			text-align: center;
+			color: @Metalic2;
+		}
 }
 
 #nav-notifications-menu {
-- 
cgit v1.2.3


From d12e2cbfe913529fbca0cc75c4f157ae42db616d Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 29 Jul 2011 16:23:47 +0200
Subject: Fix nav template and add missing strings

---
 include/nav.php | 20 ++++++++++++++++++++
 view/nav.tpl    | 23 ++++++++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index caed9453a..bb1a5b2d8 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -37,8 +37,26 @@ function nav(&$a) {
 	 * Display login or logout
 	 */
 
+	$nav['usermenu']=array();
+	$userinfo = null;
+
 	if(local_user()) {
 		$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
+		
+		// user menu
+		$nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
+		$nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+		$nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events'));
+		$nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+		
+		// user info
+		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+		$userinfo = array(
+			'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+			'name' => $a->user['username'],
+		);
+		
 	}
 	else {
 		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in'));
@@ -137,6 +155,8 @@ function nav(&$a) {
 		'$sitelocation' => $sitelocation,
 		'$nav' => $nav,
 		'$banner' =>  $banner,
+		'$emptynotifications' => t('Nothing new here'),
+		'$userinfo' => $userinfo,
 	));
 
 	call_hooks('page_header', $a->page['nav']);
diff --git a/view/nav.tpl b/view/nav.tpl
index 5a8a904a6..f83ddf7f1 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -2,17 +2,22 @@
 	{# $langselector #}
 
 	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
 </header>
 <nav>
 	<ul>
-		<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/52728a08b979618a787e43664bfbae98-6.jpg" alt="User"></a>
-			<ul id="nav-user-menu" class="menu-popup">
-				<li><a href="profile">Profile</a></li>
-				<li><a href="photos">Photos</a></li>
-				{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-				{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-			</ul>
-		</li>
+		{{ if $userinfo }}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{ for $nav.usermenu as $usermenu }}
+						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+					{{ endfor }}
+					
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+				</ul>
+			</li>
+		{{ endif }}
 		
 		{{ if $nav.community }}
 			<li id="nav-community-link" class="nav-menu">
@@ -37,7 +42,7 @@
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
-					<li class="empty">Nothing new here</li>
+					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
 		{{ endif }}
-- 
cgit v1.2.3


From d88ed393f8fc04eb111d8061889e446f340a1c40 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 29 Jul 2011 16:24:09 +0200
Subject: notify pending registrations

---
 mod/ping.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index e7f366095..973ecb03f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -36,6 +36,16 @@ function ping_init(&$a) {
 	);
 	$mail = $mails[0]['total'];
 	
+	if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
+		$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
+		$register = $regs[0]['total'];
+	} else {
+		$register = "0";
+	}
+
+
+	$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
+
 	
 	
 	header("Content-type: text/xml");
@@ -44,23 +54,32 @@ function ping_init(&$a) {
 			<intro>$intro</intro>
 			<mail>$mail</mail>
 			<net>$network</net>
-			<home>$home</home>
-			<notif count=\"".($mail+$intro)."\">";
+			<home>$home</home>";
+	if ($register!=0) echo "<register>$register</register>";
+	
+	echo '	<notif count="'.($mail+$intro+$register).'">';
 	if ($intro>0){
 		foreach ($intros as $i) { 
-			echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>', 
+			echo sprintf ( $notsxml, 
 				$a->get_baseurl().'/notification/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
 			);
 		};
 	}
 	if ($mail>0){
 		foreach ($mails as $i) { 
-			var_dump($i);
-			echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>',
+			echo sprintf ( $notsxml,
 				$a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message")
 			);
 		};
 	}
+	if ($register>0){
+		foreach ($regs as $i) { 
+			echo sprintf ( $notsxml,
+				$a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration")
+			);
+		};
+	}
+
 
 	echo "  </notif>
 		</result>
-- 
cgit v1.2.3


From 97eea6ecd60ef9cafaec8e91a902c7d3b88758da Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 29 Jul 2011 16:24:18 +0200
Subject: style update

---
 view/theme/quattro/style.css  | 61 ++++++++++++++++++++++++++++++++++++-------
 view/theme/quattro/style.less | 56 +++++++++++++++++++++++++++++----------
 2 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 9ded41721..9b4005037 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -1,14 +1,14 @@
 /**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  **/
-/* fonts */
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 12px;
-  background-color: #FFFFFF;
+  background-color: #ffffff;
   color: #2d2d2d;
   margin: 0px;
+  display: table-row;
 }
 a, a:visited, a:link {
   color: #005c94;
@@ -46,13 +46,15 @@ a:hover {
 /* header */
 header {
   position: fixed;
-  left: 0px;
+  left: 43%;
+  right: 43%;
   top: 0px;
   margin: 0px;
   padding: 0px;
-  width: 100%;
-  height: 12px;
-  color: #FFFFFF;
+  /*width: 100%; height: 12px; */
+
+  z-index: 110;
+  color: #ffffff;
 }
 header #site-location {
   /*font-size:8px;
@@ -64,6 +66,27 @@ header #site-location {
 
   display: none;
 }
+header #banner {
+  text-align: center;
+  width: 100%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+header #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+header #banner #logo-text {
+  font-size: 22px;
+}
 /* nav */
 nav {
   width: 100%;
@@ -71,15 +94,20 @@ nav {
   position: fixed;
   left: 0px;
   top: 0px;
+  padding: 0px;
   background-color: #0e232e;
-  color: #FFFFFF;
+  color: #ffffff;
+  z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 nav a,
 nav a:active,
 nav a:visited,
 nav a:link,
 nav a:hover {
-  color: #FFFFFF;
+  color: #ffffff;
   text-decoration: none;
   outline: none;
 }
@@ -157,14 +185,17 @@ nav #nav-notifications-linkmenu.selected .icon.s22.notify {
 ul.menu-popup {
   position: absolute;
   display: none;
-  width: auto;
-  background: #FFFFFF;
+  width: 10em;
+  background: #ffffff;
   color: #2d2d2d;
   margin: 0px;
   padding: 0px;
   list-style: none;
   border: 3px solid #364e59;
   z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 ul.menu-popup a {
   display: block;
@@ -204,4 +235,14 @@ ul.menu-popup .empty {
   display: block;
 }
 /* aside */
+aside {
+  display: table-cell;
+  width: 200px;
+  padding: 50px 10px 0px 20px;
+}
 /* section */
+section {
+  display: table-cell;
+  width: 800px;
+  padding: 50px 20px 0px 10px;
+}
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
index a2c1a1eae..1444ffdc1 100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/style.less
@@ -34,9 +34,7 @@
 @Grey4:rgb(102,102,102);
 @Grey5:rgb(45,45,45);
 
-
- 
-/* fonts */
+///* fonts */
 // @font-face {  
 //   font-family: "LiberationSans";  
 //   src: local("Liberation Sans"),url( LiberationSans-Regular.ttf ) format("truetype");
@@ -59,9 +57,16 @@
 body {
 	font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
 	font-size: 12px;
-	background-color: #FFFFFF;
+	background-color: @Grey1;
 	color: @Grey5;
 	margin: 0px;
+	display:table-row;
+}
+
+.shadow(@x: 0px, @y: 5px){
+   -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+   -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+   box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
 }
 
 .rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){
@@ -108,10 +113,11 @@ a:hover {text-decoration: underline; }
 
 /* header */
 header {
-	position: fixed; left: 0px; top: 0px;
+	position: fixed; left: 43%; right: 43%; top: 0px;
 	margin: 0px; padding: 0px;
-	width: 100%; height: 12px; 
-	color: #FFFFFF;
+	/*width: 100%; height: 12px; */
+	z-index: 110;
+	color: @Grey1;
 	#site-location {
 		/*font-size:8px;
 		float:left;
@@ -121,15 +127,27 @@ header {
 		.roundbottom()*/
 		display: none;
 	}
+	
+	#banner {
+		
+	    text-align: center;
+		width: 100%;
+		a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; }
+		#logo-img { height: 22px; margin-top:5px;}
+		#logo-text { font-size: 22px }
+	}
 }
 /* nav */
 nav { 
 	width: 100%; height: 32px;
 	position: fixed; left: 0px; top: 0px;
+	padding: 0px;
 	background-color: @Metalic4;
-	color: #FFFFFF;
+	color: @Grey1;
+	z-index: 100;
+	.shadow(0px, 0px);
 
-		a, a:active, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; outline: none;  }
+		a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none;  }
 
 		ul {
 			margin: 0px;
@@ -200,15 +218,17 @@ nav {
 ul.menu-popup {
 	position: absolute;
 	display: none;
-	width: auto;
-	background: #FFFFFF;
+	width: 10em;
+	background: @Grey1;
 	color: @Grey5;
 	margin: 0px;
 	padding: 0px;
 	list-style: none;
 	border: 3px solid @Metalic3;
 	z-index: 100000;
-		
+	
+	.shadow();
+	
 		a { display: block; color: @Grey5; padding: 5px 10px;}
 		a:hover { background-color: @Metalic1; }
 		.menu-sep  { border-top: 1px solid @Metalic2; }
@@ -232,7 +252,15 @@ ul.menu-popup {
 
 
 /* aside */
-// aside { display: none; }
+aside { 
+	display: table-cell;
+	width: 200px;
+	padding:50px 10px 0px 20px;
+}
 
 /* section */
-// section { display: none;}
+section { 
+	display: table-cell;
+	width: 800px;
+	padding:50px 20px 0px 10px;
+}
-- 
cgit v1.2.3


From 6c423feed2d8bc5bd36d2a1cbac073915e523749 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 29 Jul 2011 16:32:01 +0200
Subject: add missing link to navbar

---
 view/nav.tpl                  | 31 +++++++++++++++++++++++++++----
 view/theme/quattro/style.css  |  8 ++++++++
 view/theme/quattro/style.less |  5 ++++-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/view/nav.tpl b/view/nav.tpl
index f83ddf7f1..0444ea75c 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -46,9 +46,12 @@
 				</ul>
 			</li>		
 		{{ endif }}
-		<ul id="nav-notifications-template" style="display:none;" rel="template">
-			<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-		</ul>
+
+
+
+		
+	
+
 
 		
 		
@@ -62,10 +65,30 @@
 				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
 			</ul>		
 		</li>
+		
+		
+		<li id="nav-help-link" class="nav-menu">
+			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		</li>
+
+		<li id="nav-search-link" class="nav-menu">
+			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+		</li>
+		<li id="nav-directory-link" class="nav-menu">
+			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+		</li>
+		
+		{{ if $nav.apps }}
+			<li id="nav-apps-link" class="nav-menu">
+				<a class=" $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>
+			</li>
+		{{ endif }}
 	</ul>
 
 </nav>
-
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
 
 {#
 
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 9b4005037..ea0ed8eac 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -172,9 +172,17 @@ nav .nav-notify {
 nav .nav-notify.show {
   display: block;
 }
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
 nav #nav-site-linkmenu {
   float: right;
 }
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
 nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
index 1444ffdc1..5f3958f9d 100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/style.less
@@ -205,7 +205,10 @@ nav {
 		}
 		
 		
-		
+		#nav-help-link,
+		#nav-search-link,
+		#nav-directory-link,
+		#nav-apps-link,
 		#nav-site-linkmenu { 
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
-- 
cgit v1.2.3


From 07b6c868b3a66efc2737dfc6459b4114fea59ba0 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Aug 2011 18:36:24 +0200
Subject: remove javascript to set selectect nav item. enanche img template
 prefetch ignoring

---
 boot.php                       |  2 ++
 include/nav.php                | 20 ++++++++++++++++++++
 include/template_processor.php | 13 ++++++++-----
 index.php                      |  5 ++---
 mod/community.php              |  2 +-
 mod/contacts.php               |  2 +-
 mod/directory.php              |  2 +-
 mod/help.php                   |  3 ++-
 mod/message.php                |  2 +-
 mod/network.php                |  2 +-
 mod/notifications.php          |  2 +-
 mod/profile.php                |  5 +++--
 mod/profiles.php               |  2 +-
 mod/search.php                 |  2 ++
 mod/settings.php               |  2 +-
 view/nav.tpl                   | 19 ++++++++++---------
 16 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/boot.php b/boot.php
index 39bb6a9da..399e100d0 100644
--- a/boot.php
+++ b/boot.php
@@ -5,6 +5,7 @@ require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
 require_once("include/pgettext.php");
+require_once('include/nav.php');
 
 
 define ( 'FRIENDIKA_VERSION',      '2.2.1074' );
@@ -1156,3 +1157,4 @@ function load_contact_links($uid) {
 	$a->contacts = $ret;
 	return;		
 }}
+
diff --git a/include/nav.php b/include/nav.php
index bb1a5b2d8..f9e72bda7 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -157,8 +157,28 @@ function nav(&$a) {
 		'$banner' =>  $banner,
 		'$emptynotifications' => t('Nothing new here'),
 		'$userinfo' => $userinfo,
+		'$sel' => 	$a->nav_sel,
 	));
 
 	call_hooks('page_header', $a->page['nav']);
+}
 
+/*
+ * Set a menu item in navbar as selected
+ * 
+ */
+function nav_set_selected($item){
+	$a = get_app();
+    $a->nav_sel = array(
+		'community' 	=> null,
+		'network' 		=> null,
+		'home'			=> null,
+		'profiles'		=> null,
+		'notifications'	=> null,
+		'messages'		=> null,
+		'directyory'	=> null,
+		'settings'		=> null,
+		'contacts'		=> null,
+	);
+	$a->nav_sel[$item] = 'selected';
 }
diff --git a/include/template_processor.php b/include/template_processor.php
index f1d2eae4e..11769bbd0 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -11,15 +11,18 @@
 		
 		private function _preg_error(){
 			switch(preg_last_error()){
-			    case PREG_INTERNAL_ERROR: die('PREG_INTERNAL_ERROR'); break;
-			    case PREG_BACKTRACK_LIMIT_ERROR: die('PREG_BACKTRACK_LIMIT_ERROR'); break;
-			    case PREG_RECURSION_LIMIT_ERROR: die('PREG_RECURSION_LIMIT_ERROR'); break;
-			    case PREG_BAD_UTF8_ERROR: die('PREG_BAD_UTF8_ERROR'); break;
-			    case PREG_BAD_UTF8_OFFSET_ERROR: die('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+			    case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
+			    case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
+			    case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
+			    case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
+			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
 			    default:
 					//die("Unknown preg error.");
 					return;
 			}
+			echo "<hr><pre>";
+			debug_print_backtrace();
+			die();
 		}
 		
 		private function _build_replace($r, $prefix){
diff --git a/index.php b/index.php
index 80e8ca3b0..51c87cae6 100644
--- a/index.php
+++ b/index.php
@@ -195,8 +195,8 @@ if(strlen($a->module)) {
 
 	if(! $a->module_loaded) {
 
-		// Stupid browser tried to pre-fetch our ACL img template. Don't log the event or return anything - just quietly exit.
-		if((x($_SERVER,'QUERY_STRING')) && strpos($_SERVER['QUERY_STRING'],'{0}') !== false) {
+		// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
+		if((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
 			killme();
 		}
 
@@ -306,7 +306,6 @@ $a->page['content'] .=  '<div id="pause"></div>';
  */
 
 if($a->module != 'install') {
-	require_once('nav.php');
 	nav($a);
 }
 
diff --git a/mod/community.php b/mod/community.php
index f8bd88d86..cb255029f 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -25,7 +25,7 @@ function community_content(&$a, $update = 0) {
 
 	$o .= '<h3>' . t('Community') . '</h3>';
 	if(! $update) {
-		$o .= set_nav_selected('nav-community-link');
+		nav_set_selected('community');
 		$o .= '<div id="live-community"></div>' . "\r\n";
 		$o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
diff --git a/mod/contacts.php b/mod/contacts.php
index f8b9a743f..eb1de25ad 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -124,7 +124,7 @@ function contacts_content(&$a) {
 
 	$sort_type = 0;
 	$o = '';
-	$o .= set_nav_selected('nav-contacts-link');
+	nav_set_selected('contacts');
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
diff --git a/mod/directory.php b/mod/directory.php
index 03b6ab4d1..93abcd5de 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -22,7 +22,7 @@ function directory_content(&$a) {
 	}
 
 	$o = '';
-	$o .= set_nav_selected('nav-directory-link');
+	nav_set_selected('directory');
 	if(x($_SESSION,'theme'))
 		unset($_SESSION['theme']);
 
diff --git a/mod/help.php b/mod/help.php
index 495b4ccc2..59e062f6d 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -17,6 +17,7 @@ function load_doc_file($s) {
 
 
 function help_content(&$a) {
+	nav_set_selected('help');
 
 	global $lang;
 
@@ -41,4 +42,4 @@ function help_content(&$a) {
 	
 	return Markdown($text);
 
-}
\ No newline at end of file
+}
diff --git a/mod/message.php b/mod/message.php
index ff3db06e2..9e8999592 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -110,7 +110,7 @@ function message_post(&$a) {
 function message_content(&$a) {
 
 	$o = '';
-	$o .= set_nav_selected('nav-messages-link');
+	nav_set_selected('messages');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/mod/network.php b/mod/network.php
index 7cac7b858..cf4c994f0 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -98,7 +98,7 @@ function network_content(&$a, $update = 0) {
 			}
 		}
 
-		$o .= set_nav_selected('nav-network-link');
+		nav_set_selected('network');
 
 		$_SESSION['return_url'] = $a->cmd;
 
diff --git a/mod/notifications.php b/mod/notifications.php
index 920d0d82d..0c35d4cd1 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -64,7 +64,7 @@ function notifications_content(&$a) {
 	}
 
 	$o = '';
-	$o .= set_nav_selected("nav-notifications-link");
+	nav_set_selected("notifications");
 
 	if(($a->argc > 1) && ($a->argv[1] == 'all'))
 		$sql_extra = '';
diff --git a/mod/profile.php b/mod/profile.php
index b309ea647..5a66892da 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -69,8 +69,9 @@ function profile_content(&$a, $update = 0) {
 		$a->profile['profile_uid'] = $update;
 	}
 	else {
-		if($a->profile['profile_uid'] == local_user())		
-			$o .= set_nav_selected('nav-home-link');
+		if($a->profile['profile_uid'] == local_user()) {
+			nav_set_selected('home');
+		}
 	}
 
 	$contact = null;
diff --git a/mod/profiles.php b/mod/profiles.php
index 9b0a2970b..5cc9fa38c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -220,7 +220,7 @@ function profiles_post(&$a) {
 function profiles_content(&$a) {
 
 	$o = '';
-	$o .= set_nav_selected('nav-profiles-link');
+	nav_set_selected('profiles');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/mod/search.php b/mod/search.php
index 88ff9bbb7..f7ce75905 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -13,6 +13,8 @@ function search_content(&$a) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
+	
+	nav_set_selected('search');
 
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
diff --git a/mod/settings.php b/mod/settings.php
index 0223b1b9c..44ebdd77b 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -299,7 +299,7 @@ if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
 	$o = '';
-	$o .=  set_nav_selected('nav-settings-link');
+	nav_set_selected('settings');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL );
diff --git a/view/nav.tpl b/view/nav.tpl
index 0444ea75c..434c9f844 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -15,24 +15,25 @@
 					
 					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
 					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}					
 				</ul>
 			</li>
 		{{ endif }}
 		
 		{{ if $nav.community }}
-			<li id="nav-community-link" class="nav-menu">
+			<li id="nav-community-link" class="nav-menu $sel.community">
 				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
 			</li>
 		{{ endif }}
 		
 		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu">
+			<li id="nav-network-link" class="nav-menu $sel.network">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
 				<span id="net-update" class="nav-notify"></span>
 			</li>
 		{{ endif }}
-		{{ if $nav.network }}
-			<li id="nav-home-link" class="nav-menu">
+		{{ if $nav.home }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
 				<span id="home-update" class="nav-notify"></span>
 			</li>
@@ -67,19 +68,19 @@
 		</li>
 		
 		
-		<li id="nav-help-link" class="nav-menu">
+		<li id="nav-help-link" class="nav-menu $sel.help">
 			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
 		</li>
 
-		<li id="nav-search-link" class="nav-menu">
+		<li id="nav-search-link" class="nav-menu $sel.search">
 			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
 		</li>
-		<li id="nav-directory-link" class="nav-menu">
+		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
 		
 		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu">
+			<li id="nav-apps-link" class="nav-menu $sel.apps">
 				<a class=" $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>
 			</li>
 		{{ endif }}
@@ -122,7 +123,7 @@
 {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
 {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
 
-{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+
 </span>
 <span id="nav-end"></span>
 <span id="banner">$banner</span>
-- 
cgit v1.2.3


From afdc639f17f0f5e12f291b512ccc12b3df6b2acf Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Aug 2011 21:59:06 +0200
Subject: fix friend request query in ping

---
 mod/ping.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index 973ecb03f..40ce5be0b 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -20,13 +20,25 @@ function ping_init(&$a) {
 	);
 	$home = $r[0]['total'];
 
-	$intros = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+	$intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
 		`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
 		FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-		WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 ",
+		WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
 		intval(local_user())
 	);
-	$intro = $intros[0]['total'];
+	$intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+		`contact`.`name`, `contact`.`url`, `contact`.`photo` 
+		FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
+		WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
+		intval(local_user())
+	);
+	
+	$intro = $intros1[0]['total'] + $intros2[0]['total'];
+	if ($intros1[0]['total']==0) $intros1=Array();
+	if ($intros2[0]['total']==0) $intros2=Array();
+	$intros = $intros1+$intros2;
+
+
 
 	$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
 	$mails = q("SELECT *,  COUNT(*) AS `total` FROM `mail`
@@ -61,7 +73,7 @@ function ping_init(&$a) {
 	if ($intro>0){
 		foreach ($intros as $i) { 
 			echo sprintf ( $notsxml, 
-				$a->get_baseurl().'/notification/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
+				$a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
 			);
 		};
 	}
-- 
cgit v1.2.3


From d5567eb2976f903f7219f6b18a07ab79bca74dbd Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 22 Aug 2011 14:06:55 +0200
Subject: compatiblity for old themes

---
 view/theme/clean/nav.tpl        | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/darkness/nav.tpl     | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/darkzero/nav.tpl     | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/duepuntozero/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/easterbunny/nav.tpl  | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/goldenrod/nav.tpl    | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/greenzero/nav.tpl    | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/loozah/nav.tpl       | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/purplezero/nav.tpl   | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/shady/nav.tpl        | 51 +++++++++++++++++++++++++++++++++++++++++
 view/theme/three-d/nav.tpl      | 51 +++++++++++++++++++++++++++++++++++++++++
 11 files changed, 561 insertions(+)
 create mode 100644 view/theme/clean/nav.tpl
 create mode 100644 view/theme/darkness/nav.tpl
 create mode 100644 view/theme/darkzero/nav.tpl
 create mode 100644 view/theme/duepuntozero/nav.tpl
 create mode 100644 view/theme/easterbunny/nav.tpl
 create mode 100644 view/theme/goldenrod/nav.tpl
 create mode 100644 view/theme/greenzero/nav.tpl
 create mode 100644 view/theme/loozah/nav.tpl
 create mode 100644 view/theme/purplezero/nav.tpl
 create mode 100644 view/theme/shady/nav.tpl
 create mode 100644 view/theme/three-d/nav.tpl

diff --git a/view/theme/clean/nav.tpl b/view/theme/clean/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/clean/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/darkness/nav.tpl b/view/theme/darkness/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/darkness/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/darkzero/nav.tpl b/view/theme/darkzero/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/darkzero/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/duepuntozero/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/easterbunny/nav.tpl b/view/theme/easterbunny/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/easterbunny/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/goldenrod/nav.tpl b/view/theme/goldenrod/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/goldenrod/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/greenzero/nav.tpl b/view/theme/greenzero/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/greenzero/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/loozah/nav.tpl b/view/theme/loozah/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/loozah/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/purplezero/nav.tpl b/view/theme/purplezero/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/purplezero/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/shady/nav.tpl b/view/theme/shady/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/shady/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
diff --git a/view/theme/three-d/nav.tpl b/view/theme/three-d/nav.tpl
new file mode 100644
index 000000000..2cd29a7c2
--- /dev/null
+++ b/view/theme/three-d/nav.tpl
@@ -0,0 +1,51 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.notifications }}
+	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+	<span id="notify-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
-- 
cgit v1.2.3


From 89c5733ca566f6f6e5568b4a4f22e20d60d7442d Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 23 Aug 2011 13:52:20 +0200
Subject: add more notification messages

---
 mod/ping.php | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 86 insertions(+), 20 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index 40ce5be0b..f9d7cd8a7 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -8,17 +8,63 @@ function ping_init(&$a) {
 		xml_status(0);
 
 	
-	$r = q("SELECT COUNT(*) AS `total` FROM `item` 
-		WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ",
+	$comments = array();
+	$likes = array();
+	$dislikes = array();
+	$friends = array();
+	
+	$r = q("SELECT `item`.`parent`, `item`.`verb`, `item`.`author-name`, 
+			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, 
+			`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
+			FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
+			WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+			 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0",
 		intval(local_user())
 	);
-	$network = $r[0]['total'];
+	
+	$network = count($r);
+	foreach ($r as $it) {
+		switch($it['verb']){
+			case 'http://activitystrea.ms/schema/1.0/like':
+				$likes[] = $it;
+				break;
+			case 'http://activitystrea.ms/schema/1.0/dislike':
+				$dislikes[] = $it;
+				break;
+			case 'http://activitystrea.ms/schema/1.0/make-friend':
+				$friends[] = $it;
+				break;
+			default:
+				$comments[] = $it;
+		}
+	}
 
-	$r = q("SELECT COUNT(*) AS `total` FROM `item` 
-		WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 1 ",
+
+	$r = q("SELECT `item`.`parent`, `item`.`verb`, `item`.`author-name`, 
+			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, 
+			`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
+			FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
+			WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+			 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1",
 		intval(local_user())
-	);
-	$home = $r[0]['total'];
+	);	
+	$home = count($r);
+	foreach ($r as $it) {
+		switch($it['verb']){
+			case 'http://activitystrea.ms/schema/1.0/like':
+				$likes[] = $it;
+				break;
+			case 'http://activitystrea.ms/schema/1.0/dislike':
+				$dislikes[] = $it;
+				break;
+			case 'http://activitystrea.ms/schema/1.0/make-friend':
+				$friends[] = $it;
+				break;
+			default:
+				$comments[] = $it;
+		}
+	}
+
 
 	$intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
 		`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
@@ -56,9 +102,12 @@ function ping_init(&$a) {
 	}
 
 
-	$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
-
-	
+	function xmlize($href, $name, $url, $photo, $date, $message){
+		$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
+		return sprintf ( $notsxml,
+				$href, $name, $url, $photo, $date, $message
+			);
+	}
 	
 	header("Content-type: text/xml");
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
@@ -69,26 +118,43 @@ function ping_init(&$a) {
 			<home>$home</home>";
 	if ($register!=0) echo "<register>$register</register>";
 	
-	echo '	<notif count="'.($mail+$intro+$register).'">';
+	$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends);
+	
+	echo '	<notif count="'.$tot.'">';
 	if ($intro>0){
 		foreach ($intros as $i) { 
-			echo sprintf ( $notsxml, 
-				$a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
-			);
+			echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
 		};
 	}
 	if ($mail>0){
 		foreach ($mails as $i) { 
-			echo sprintf ( $notsxml,
-				$a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message")
-			);
+			echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message") );
 		};
 	}
 	if ($register>0){
 		foreach ($regs as $i) { 
-			echo sprintf ( $notsxml,
-				$a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration")
-			);
+			echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), t("{0} requested registration") );
+		};
+	}
+
+	if (count($comments)){
+		foreach ($comments as $i) {
+			echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} commented %s's post"), $i['pname'] ) );
+		};
+	}
+	if (count($likes)){
+		foreach ($likes as $i) {
+			echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} like %s's post"), $i['pname'] ) );
+		};
+	}
+	if (count($dislikes)){
+		foreach ($dislikes as $i) {
+			echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} dislike %s's post"), $i['pname'] ) );
+		};
+	}
+	if (count($friends)){
+		foreach ($friends as $i) {
+			echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['pname'] ) );
 		};
 	}
 
-- 
cgit v1.2.3


From 97806544bcd7ee3831ffc515062afe0812828b76 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 23 Aug 2011 14:02:04 +0200
Subject: don't add notification details on new posts

---
 mod/ping.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index f9d7cd8a7..8a3d284af 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -13,7 +13,7 @@ function ping_init(&$a) {
 	$dislikes = array();
 	$friends = array();
 	
-	$r = q("SELECT `item`.`parent`, `item`.`verb`, `item`.`author-name`, 
+	$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
 			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, 
 			`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
 			FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
@@ -35,12 +35,12 @@ function ping_init(&$a) {
 				$friends[] = $it;
 				break;
 			default:
-				$comments[] = $it;
+				if ($it['parent']!=$it['id']) $comments[] = $it;
 		}
 	}
 
 
-	$r = q("SELECT `item`.`parent`, `item`.`verb`, `item`.`author-name`, 
+	$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
 			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, 
 			`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
 			FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
@@ -61,7 +61,7 @@ function ping_init(&$a) {
 				$friends[] = $it;
 				break;
 			default:
-				$comments[] = $it;
+				if ($it['parent']!=$it['id']) $comments[] = $it;
 		}
 	}
 
-- 
cgit v1.2.3


From 71d44d78ec5b16a53b82f4e631b86cd8247a9b0f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 16:17:32 +0200
Subject: Installed apps as array instead of string

---
 addon/calc/calc.php       |  2 +-
 addon/convert/convert.php |  2 +-
 addon/sniper/sniper.php   |  2 +-
 addon/tictac/tictac.php   |  2 +-
 boot.php                  |  2 +-
 mod/apps.php              | 19 +++++++++++--------
 view/apps.tpl             |  7 +++++++
 7 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 view/apps.tpl

diff --git a/addon/calc/calc.php b/addon/calc/calc.php
index 8c079dc7a..47fb22d33 100644
--- a/addon/calc/calc.php
+++ b/addon/calc/calc.php
@@ -17,7 +17,7 @@ function calc_uninstall() {
 }
 
 function calc_app_menu($a,&$b) {
-	$b['app_menu'] .= '<div class="app-title"><a href="calc">Calculator</a></div>'; 
+	$b['app_menu'][] = Array('url'=>'calc', 'name'=>'Calculator'); 
 }
 
 
diff --git a/addon/convert/convert.php b/addon/convert/convert.php
index 7a4c90a53..aaa56a43e 100644
--- a/addon/convert/convert.php
+++ b/addon/convert/convert.php
@@ -15,7 +15,7 @@ function convert_uninstall() {
 }
 
 function convert_app_menu($a,&$b) {
-	$b['app_menu'] .= '<div class="app-title"><a href="convert">Units Conversion</a></div>'; 
+	$b['app_menu'][] = Array('url'=>'convert', 'name'=>'Units Conversion'); 
 }
 
 
diff --git a/addon/sniper/sniper.php b/addon/sniper/sniper.php
index d431a2466..c7d29cfdf 100644
--- a/addon/sniper/sniper.php
+++ b/addon/sniper/sniper.php
@@ -22,7 +22,7 @@ function sniper_uninstall() {
 }
 
 function sniper_app_menu($a,&$b) {
-    $b['app_menu'] .= '<div class="app-title"><a href="sniper">Hot Shot Sniper</a></div>';
+	$b['app_menu'][] = Array('url'=>'sniper', 'name'=>'Hot Shot Sniper'); 
 }
 
 
diff --git a/addon/tictac/tictac.php b/addon/tictac/tictac.php
index d6cec08a0..cc2701f8b 100644
--- a/addon/tictac/tictac.php
+++ b/addon/tictac/tictac.php
@@ -17,7 +17,7 @@ function tictac_uninstall() {
 }
 
 function tictac_app_menu($a,&$b) {
-	$b['app_menu'] .= '<div class="app-title"><a href="tictac">' . t('Three Dimensional Tic-Tac-Toe') . '</a></div>'; 
+	$b['app_menu'][] = Array('url'=>'tictac', 'name'=>'Three Dimensional Tic-Tac-Toe'); 
 }
 
 
diff --git a/boot.php b/boot.php
index 4baa37309..42a0f7207 100644
--- a/boot.php
+++ b/boot.php
@@ -246,7 +246,7 @@ class App {
 	public  $timezone;
 	public  $interactive = true;
 	public  $plugins;
-	public  $apps;
+	public  $apps = Array();
 	public  $identities;
 
 	private $scheme;
diff --git a/mod/apps.php b/mod/apps.php
index 7a0a3f59e..8049b45fb 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -1,15 +1,18 @@
 <?php
 
-
 function apps_content(&$a) {
+	$title = t('Applications');
 
-	$o .= '<h3>' . t('Applications') . '</h3>';
-
-	if($a->apps)
-		$o .= $a->apps;
-	else
+	if(count($a->apps)==0)
 		notice( t('No installed applications.') . EOL);
 
-	return $o;
 
-}
\ No newline at end of file
+	$tpl = get_markup_template("apps.tpl");
+	return replace_macros($tpl, array(
+		'$title' => $title,
+		'$apps' => $a->apps,
+	));
+
+	
+
+}
diff --git a/view/apps.tpl b/view/apps.tpl
new file mode 100644
index 000000000..61ea9ee5f
--- /dev/null
+++ b/view/apps.tpl
@@ -0,0 +1,7 @@
+<h3>$title</h3>
+
+<ul>
+	{{ for $apps as $ap }}
+	<li><a href="$ap.url">$ap.name</a></li>
+	{{ endfor }}
+</ul>
-- 
cgit v1.2.3


From 5ce6f893a64984eae9685db305b8d29ae3ced509 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 16:18:03 +0200
Subject: Apps popup menu in navbar

---
 include/nav.php | 3 ++-
 view/nav.tpl    | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index f9e72bda7..b290a8da2 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -81,7 +81,7 @@ function nav(&$a) {
 	if(! get_config('system','hide_help'))
 		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
 
-	if($a->apps)
+	if(count($a->apps)>0)
 		$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
 	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
@@ -158,6 +158,7 @@ function nav(&$a) {
 		'$emptynotifications' => t('Nothing new here'),
 		'$userinfo' => $userinfo,
 		'$sel' => 	$a->nav_sel,
+		'$apps' => $a->apps,
 	));
 
 	call_hooks('page_header', $a->page['nav']);
diff --git a/view/nav.tpl b/view/nav.tpl
index 434c9f844..cf1c2a227 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -81,7 +81,12 @@
 		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>
+				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{ for $apps as $ap }}
+					<li><a href="$ap.url">$ap.name</a></li>
+					{{ endfor }}
+				</ul>
 			</li>
 		{{ endif }}
 	</ul>
-- 
cgit v1.2.3


From b38d6d97c3746203241c5ef50a8dd9f0bb0a0de0 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 16:18:37 +0200
Subject: Avoid a small error in admin

---
 mod/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/admin.php b/mod/admin.php
index 7799e64ab..bbf786acb 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -540,7 +540,7 @@ function admin_page_plugins(&$a){
 		} 
 		
 		$admin_form="";
-		if (in_array($plugin, $a->plugins_admin)){
+		if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){
 			@require_once("addon/$plugin/$plugin.php");
 			$func = $plugin.'_plugin_admin';
 			$func($a, $admin_form);
-- 
cgit v1.2.3


From 62295af1f2c3434fbf40aff6d29fd08859259ddf Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 16:19:17 +0200
Subject: quattro: cleanup and split of less files

---
 view/theme/quattro/LIBERATION-FONTS-COPYING        | 339 ---------------------
 view/theme/quattro/LiberationSans-Bold.ttf         | Bin 136664 -> 0 bytes
 view/theme/quattro/LiberationSans-Italic.ttf       | Bin 161532 -> 0 bytes
 view/theme/quattro/LiberationSans-Regular.ttf      | Bin 139036 -> 0 bytes
 view/theme/quattro/colors.less                     |  50 +++
 view/theme/quattro/experimental                    |   0
 .../quattro/liberation-fonts-ttf-1.07.0.tar.gz     | Bin 1326750 -> 0 bytes
 view/theme/quattro/quattro.less                    | 212 +++++++++++++
 view/theme/quattro/style.css                       |  17 +-
 view/theme/quattro/style.less                      | 260 +---------------
 10 files changed, 273 insertions(+), 605 deletions(-)
 delete mode 100644 view/theme/quattro/LIBERATION-FONTS-COPYING
 delete mode 100644 view/theme/quattro/LiberationSans-Bold.ttf
 delete mode 100644 view/theme/quattro/LiberationSans-Italic.ttf
 delete mode 100644 view/theme/quattro/LiberationSans-Regular.ttf
 create mode 100644 view/theme/quattro/colors.less
 create mode 100644 view/theme/quattro/experimental
 delete mode 100644 view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz
 create mode 100644 view/theme/quattro/quattro.less

diff --git a/view/theme/quattro/LIBERATION-FONTS-COPYING b/view/theme/quattro/LIBERATION-FONTS-COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/view/theme/quattro/LIBERATION-FONTS-COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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
-
-	    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
-convey 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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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.
diff --git a/view/theme/quattro/LiberationSans-Bold.ttf b/view/theme/quattro/LiberationSans-Bold.ttf
deleted file mode 100644
index 169fac34d..000000000
Binary files a/view/theme/quattro/LiberationSans-Bold.ttf and /dev/null differ
diff --git a/view/theme/quattro/LiberationSans-Italic.ttf b/view/theme/quattro/LiberationSans-Italic.ttf
deleted file mode 100644
index 8b9dc760a..000000000
Binary files a/view/theme/quattro/LiberationSans-Italic.ttf and /dev/null differ
diff --git a/view/theme/quattro/LiberationSans-Regular.ttf b/view/theme/quattro/LiberationSans-Regular.ttf
deleted file mode 100644
index ceeaa2740..000000000
Binary files a/view/theme/quattro/LiberationSans-Regular.ttf and /dev/null differ
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
new file mode 100644
index 000000000..75a53a68a
--- /dev/null
+++ b/view/theme/quattro/colors.less
@@ -0,0 +1,50 @@
+// Quattro Theme LESS file
+
+// "Echo" palette from Inkscape
+@Blue1:rgb(25,174,255);
+@Blue2:rgb(0,132,200);
+@Blue3:rgb(0,92,148);
+@Red1:rgb(255,65,65);
+@Red2:rgb(220,0,0);
+@Red3:rgb(181,0,0);
+@Orange1:rgb(255,255,62);
+@Orange2:rgb(255,153,0);
+@Orange3:rgb(255,102,0);
+@Brown1:rgb(255,192,34);
+@Brown2:rgb(184,129,0);
+@Brown3:rgb(128,77,0);
+@Green1:rgb(204,255,66);
+@Green2:rgb(154,222,0);
+@Green3:rgb(0,145,0);
+@Purple1:rgb(241,202,255);
+@Purple2:rgb(215,108,255);
+@Purple3:rgb(186,0,255);
+@Metalic1:rgb(189,205,212);
+@Metalic2:rgb(158,171,176);
+@Metalic3:rgb(54,78,89);
+@Metalic4:rgb(14,35,46);
+@Grey1:rgb(255,255,255);
+@Grey2:rgb(204,204,204);
+@Grey3:rgb(153,153,153);
+@Grey4:rgb(102,102,102);
+@Grey5:rgb(45,45,45);
+
+
+// Theme colors
+@BodyBackground: @Grey1;
+@BodyColor:	@Grey5;
+
+@Link: @Blue3;
+@LinkHover: @Blue3;
+@LinkVisited: @Blue3;
+
+@Banner: @Grey1;
+
+@NavbarBackground:@Metalic4;
+@NavbarSelectedBg:@Metalic3;
+@NavbarSelectedBorder: @Metalic2;
+@NavbarNotifBg: @Blue1;
+@Menu: @Grey5;
+@MenuBg: @Grey1;
+@MenuBorder: @Metalic3;
+
diff --git a/view/theme/quattro/experimental b/view/theme/quattro/experimental
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz b/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz
deleted file mode 100644
index 0c86f7347..000000000
Binary files a/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz and /dev/null differ
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
new file mode 100644
index 000000000..4c4a002f3
--- /dev/null
+++ b/view/theme/quattro/quattro.less
@@ -0,0 +1,212 @@
+// Quattro Theme LESS file
+
+/* global */
+body {
+	font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
+	font-size: 12px;
+	background-color: @BodyBackground;
+	color: @BodyColor;
+	margin: 0px;
+	display:table-row;
+}
+
+.shadow(@x: 0px, @y: 5px){
+   -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+   -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+   box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+}
+
+.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){
+	-moz-border-radius: @arguments;
+	-webkit-border-radius: @arguments;
+	border-radius: @arguments;
+}
+
+.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); }
+.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); }
+
+a, a:link { color: @Link; text-decoration: none; }
+a:visited { color: @LinkVisited; text-decoration: none; }
+a:hover {color: @LinkHover; text-decoration: underline; }
+
+.left { float: left; }
+.right { float: right; }
+
+/* icons */
+
+
+.icons(@size: 22) {
+	&.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); }
+	&.gear 	 { background-image: url("../../../images/icons/gear_@{size}.png"); }
+}
+
+
+.icon {
+	background-color: transparent ;
+	background-repeat: no-repeat;
+	background-position: center center;
+	display: block;
+	overflow: hidden;
+	text-indent: -9999px;
+
+	&.s22 {
+		width:22px; height: 22px;
+		padding: 1px;
+		.icons(22);
+	}
+	
+}
+
+
+
+/* header */
+header {
+	position: fixed; left: 43%; right: 43%; top: 0px;
+	margin: 0px; padding: 0px;
+	/*width: 100%; height: 12px; */
+	z-index: 110;
+	color: @Grey1;
+	#site-location {
+		display: none;
+	}
+	
+	#banner {
+		
+	    text-align: center;
+		width: 100%;
+		a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; }
+		#logo-img { height: 22px; margin-top:5px;}
+		#logo-text { font-size: 22px }
+	}
+}
+/* nav */
+nav { 
+	width: 100%; height: 32px;
+	position: fixed; left: 0px; top: 0px;
+	padding: 0px;
+	background-color: @NavbarBackground;
+	color: @Grey1;
+	z-index: 100;
+	.shadow(0px, 0px);
+
+		a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none;  }
+
+		ul {
+			margin: 0px;
+			padding: 0px 20px;
+			li { 
+				list-style: none; 
+				margin: 0px; padding: 0px;
+				float: left;
+				.menu-popup{ left: 0px; right: auto; }
+			}
+			
+		}
+
+		.nav-menu-icon {
+			position: relative;
+			height: 22px;
+			padding: 5px;
+			margin: 0px 10px;
+			.roundtop();
+			
+			&.selected {
+				background-color: @NavbarSelectedBg;
+			}
+			
+				img { width: 22px; height: 22px; }
+				.nav-notify { top: 3px; }
+		}
+
+		.nav-menu {
+			position: relative;
+			height: 16px;
+			padding: 5px;
+			margin: 3px 15px 0px;
+			font-size: 14px;
+			border-bottom: 3px solid @NavbarBackground;
+			&.selected {
+				border-bottom: 3px solid @NavbarSelectedBorder;
+			}
+			
+		}
+
+		.nav-notify {
+			display: none;
+			position: absolute;
+			background-color: @NavbarNotifBg;
+			.rounded();
+			font-size: 10px;
+			padding: 1px 3px;
+			top: 0px;
+			right: -10px;
+			min-width: 15px;
+			text-align: right;
+			
+				&.show{ display: block; }
+		}
+		
+		
+		#nav-help-link,
+		#nav-search-link,
+		#nav-directory-link,
+		#nav-apps-link,
+		#nav-site-linkmenu { 
+			float: right;
+			.menu-popup{ right: 0px; left: auto; }
+		}
+	
+		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") }
+		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
+}
+
+
+ul.menu-popup {
+	position: absolute;
+	display: none;
+	width: 10em;
+	background: @MenuBg;
+	color: @Menu;
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
+	border: 3px solid @MenuBorder;
+	z-index: 100000;
+	
+	.shadow();
+	
+		a { display: block; color: @Grey5; padding: 5px 10px;}
+		a:hover { background-color: @Metalic1; }
+		.menu-sep  { border-top: 1px solid @Metalic2; }
+		li { float: none;  overflow: auto; height: auto; display: block; }
+		
+		.empty {
+			padding: 5px;
+			text-align: center;
+			color: @Metalic2;
+		}
+}
+
+#nav-notifications-menu {
+	width: 400px;
+	img { float: left; margin-right: 5px; }
+	.contactname { font-weight: bold; }
+	.notif-when { font-size: 10px; color: @Metalic2; display: block; }
+}
+
+
+
+
+/* aside */
+aside { 
+	display: table-cell;
+	width: 200px;
+	padding:50px 10px 0px 20px;
+}
+
+/* section */
+section { 
+	display: table-cell;
+	width: 800px;
+	padding:50px 20px 0px 10px;
+}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index ea0ed8eac..e2c06125b 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -10,11 +10,16 @@ body {
   margin: 0px;
   display: table-row;
 }
-a, a:visited, a:link {
+a, a:link {
+  color: #005c94;
+  text-decoration: none;
+}
+a:visited {
   color: #005c94;
   text-decoration: none;
 }
 a:hover {
+  color: #005c94;
   text-decoration: underline;
 }
 .left {
@@ -57,13 +62,6 @@ header {
   color: #ffffff;
 }
 header #site-location {
-  /*font-size:8px;
-		float:left;
-		background-color: @Metalic3;
-		padding: 1px 5px;
-		margin-left: 20px;
-		.roundbottom()*/
-
   display: none;
 }
 header #banner {
@@ -190,6 +188,9 @@ nav #nav-site-linkmenu .menu-popup {
 nav #nav-notifications-linkmenu.selected .icon.s22.notify {
   background-image: url("../../../images/icons/notify_on_22.png");
 }
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
 ul.menu-popup {
   position: absolute;
   display: none;
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
index 5f3958f9d..d1c677b22 100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/style.less
@@ -5,265 +5,9 @@
 // compile with lessc
 // $ lessc style.less > style.css
 
-// "Echo" palette from Inkscape
-@Blue1:rgb(25,174,255);
-@Blue2:rgb(0,132,200);
-@Blue3:rgb(0,92,148);
-@Red1:rgb(255,65,65);
-@Red2:rgb(220,0,0);
-@Red3:rgb(181,0,0);
-@Orange1:rgb(255,255,62);
-@Orange2:rgb(255,153,0);
-@Orange3:rgb(255,102,0);
-@Brown1:rgb(255,192,34);
-@Brown2:rgb(184,129,0);
-@Brown3:rgb(128,77,0);
-@Green1:rgb(204,255,66);
-@Green2:rgb(154,222,0);
-@Green3:rgb(0,145,0);
-@Purple1:rgb(241,202,255);
-@Purple2:rgb(215,108,255);
-@Purple3:rgb(186,0,255);
-@Metalic1:rgb(189,205,212);
-@Metalic2:rgb(158,171,176);
-@Metalic3:rgb(54,78,89);
-@Metalic4:rgb(14,35,46);
-@Grey1:rgb(255,255,255);
-@Grey2:rgb(204,204,204);
-@Grey3:rgb(153,153,153);
-@Grey4:rgb(102,102,102);
-@Grey5:rgb(45,45,45);
+@import "colors";
+@import "quattro";
 
-///* fonts */
-// @font-face {  
-//   font-family: "LiberationSans";  
-//   src: local("Liberation Sans"),url( LiberationSans-Regular.ttf ) format("truetype");
-//   font-weight: bold; font-style: italic;
-// }
-// 
-// @font-face {  
-//   font-family: "LiberationSans";  
-//   src: local("Liberation Sans"),url( LiberationSans-Bold.ttf ) format("truetype");
-//   font-weight: bold; font-style: normal;
-// }
-// @font-face {  
-//   font-family: "LiberationSans";  
-//   src:  local("Liberation Sans"),url( LiberationSans-Italic.ttf ) format("truetype");
-//   font-weight: normal; font-style: italic;
-// }
 
 
-/* global */
-body {
-	font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
-	font-size: 12px;
-	background-color: @Grey1;
-	color: @Grey5;
-	margin: 0px;
-	display:table-row;
-}
 
-.shadow(@x: 0px, @y: 5px){
-   -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
-   -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
-   box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
-}
-
-.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){
-	-moz-border-radius: @arguments;
-	-webkit-border-radius: @arguments;
-	border-radius: @arguments;
-}
-
-.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); }
-.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); }
-
-a, a:visited, a:link { color: @Blue3; text-decoration: none; }
-a:hover {text-decoration: underline; }
-
-.left { float: left; }
-.right { float: right; }
-
-/* icons */
-
-
-.icons(@size: 22) {
-	&.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); }
-	&.gear 	 { background-image: url("../../../images/icons/gear_@{size}.png"); }
-}
-
-
-.icon {
-	background-color: transparent ;
-	background-repeat: no-repeat;
-	background-position: center center;
-	display: block;
-	overflow: hidden;
-	text-indent: -9999px;
-
-	&.s22 {
-		width:22px; height: 22px;
-		padding: 1px;
-		.icons(22);
-	}
-	
-}
-
-
-
-/* header */
-header {
-	position: fixed; left: 43%; right: 43%; top: 0px;
-	margin: 0px; padding: 0px;
-	/*width: 100%; height: 12px; */
-	z-index: 110;
-	color: @Grey1;
-	#site-location {
-		/*font-size:8px;
-		float:left;
-		background-color: @Metalic3;
-		padding: 1px 5px;
-		margin-left: 20px;
-		.roundbottom()*/
-		display: none;
-	}
-	
-	#banner {
-		
-	    text-align: center;
-		width: 100%;
-		a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; }
-		#logo-img { height: 22px; margin-top:5px;}
-		#logo-text { font-size: 22px }
-	}
-}
-/* nav */
-nav { 
-	width: 100%; height: 32px;
-	position: fixed; left: 0px; top: 0px;
-	padding: 0px;
-	background-color: @Metalic4;
-	color: @Grey1;
-	z-index: 100;
-	.shadow(0px, 0px);
-
-		a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none;  }
-
-		ul {
-			margin: 0px;
-			padding: 0px 20px;
-			li { 
-				list-style: none; 
-				margin: 0px; padding: 0px;
-				float: left;
-				.menu-popup{ left: 0px; right: auto; }
-			}
-			
-		}
-
-		.nav-menu-icon {
-			position: relative;
-			height: 22px;
-			padding: 5px;
-			margin: 0px 10px;
-			.roundtop();
-			
-			&.selected {
-				background-color: @Metalic3;
-			}
-			
-				img { width: 22px; height: 22px; }
-				.nav-notify { top: 3px; }
-		}
-
-		.nav-menu {
-			position: relative;
-			height: 16px;
-			padding: 5px;
-			margin: 3px 15px 0px;
-			font-size: 14px;
-			border-bottom: 3px solid @Metalic4;
-			&.selected {
-				border-bottom: 3px solid @Metalic2;
-			}
-			
-		}
-
-		.nav-notify {
-			display: none;
-			position: absolute;
-			background-color: @Blue1;
-			.rounded();
-			font-size: 10px;
-			padding: 1px 3px;
-			top: 0px;
-			right: -10px;
-			min-width: 15px;
-			text-align: right;
-			
-				&.show{ display: block; }
-		}
-		
-		
-		#nav-help-link,
-		#nav-search-link,
-		#nav-directory-link,
-		#nav-apps-link,
-		#nav-site-linkmenu { 
-			float: right;
-			.menu-popup{ right: 0px; left: auto; }
-		}
-	
-		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") }
-		
-}
-
-ul.menu-popup {
-	position: absolute;
-	display: none;
-	width: 10em;
-	background: @Grey1;
-	color: @Grey5;
-	margin: 0px;
-	padding: 0px;
-	list-style: none;
-	border: 3px solid @Metalic3;
-	z-index: 100000;
-	
-	.shadow();
-	
-		a { display: block; color: @Grey5; padding: 5px 10px;}
-		a:hover { background-color: @Metalic1; }
-		.menu-sep  { border-top: 1px solid @Metalic2; }
-		li { float: none;  overflow: auto; height: auto; display: block; }
-		
-		.empty {
-			padding: 5px;
-			text-align: center;
-			color: @Metalic2;
-		}
-}
-
-#nav-notifications-menu {
-	width: 400px;
-	img { float: left; margin-right: 5px; }
-	.contactname { font-weight: bold; }
-	.notif-when { font-size: 10px; color: @Metalic2; display: block; }
-}
-
-
-
-
-/* aside */
-aside { 
-	display: table-cell;
-	width: 200px;
-	padding:50px 10px 0px 20px;
-}
-
-/* section */
-section { 
-	display: table-cell;
-	width: 800px;
-	padding:50px 20px 0px 10px;
-}
-- 
cgit v1.2.3


From 54f0685a038d87706ec4ecc15edc55ee171b6079 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 17:30:48 +0200
Subject: quattro: more colors

---
 view/theme/quattro/colors.less  | 10 ++++++++++
 view/theme/quattro/quattro.less | 19 ++++++++++---------
 view/theme/quattro/style.css    |  9 +++++----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 75a53a68a..d79dbca68 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -44,7 +44,17 @@
 @NavbarSelectedBg:@Metalic3;
 @NavbarSelectedBorder: @Metalic2;
 @NavbarNotifBg: @Blue1;
+
 @Menu: @Grey5;
 @MenuBg: @Grey1;
 @MenuBorder: @Metalic3;
+@MenuItem: @Grey5;
+@MenuItemHoverBg: @Metalic1;
+@MenuItemSeparator: @Metalic2;
+@MenuEmpty: @Metalic2;
+@MenuItemDetail: @Metalic2;
+
+@AsideBorder: @Metalic1;
+
+
 
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 4c4a002f3..f83cce3ce 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -6,8 +6,8 @@ body {
 	font-size: 12px;
 	background-color: @BodyBackground;
 	color: @BodyColor;
-	margin: 0px;
-	display:table-row;
+	margin: 50px 0px 0px 0px;
+	display:table;
 }
 
 .shadow(@x: 0px, @y: 5px){
@@ -175,15 +175,15 @@ ul.menu-popup {
 	
 	.shadow();
 	
-		a { display: block; color: @Grey5; padding: 5px 10px;}
-		a:hover { background-color: @Metalic1; }
-		.menu-sep  { border-top: 1px solid @Metalic2; }
+		a { display: block; color: @MenuItem; padding: 5px 10px;}
+		a:hover { background-color: @MenuItemHoverBg; }
+		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
 		li { float: none;  overflow: auto; height: auto; display: block; }
 		
 		.empty {
 			padding: 5px;
 			text-align: center;
-			color: @Metalic2;
+			color: @MenuEmpty;
 		}
 }
 
@@ -191,7 +191,7 @@ ul.menu-popup {
 	width: 400px;
 	img { float: left; margin-right: 5px; }
 	.contactname { font-weight: bold; }
-	.notif-when { font-size: 10px; color: @Metalic2; display: block; }
+	.notif-when { font-size: 10px; color: @MenuItemDetail; display: block; }
 }
 
 
@@ -201,12 +201,13 @@ ul.menu-popup {
 aside { 
 	display: table-cell;
 	width: 200px;
-	padding:50px 10px 0px 20px;
+	padding:0px 10px 0px 20px;
+	border-right: 1px solid @AsideBorder;
 }
 
 /* section */
 section { 
 	display: table-cell;
 	width: 800px;
-	padding:50px 20px 0px 10px;
+	padding:0px 20px 0px 10px;
 }
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index e2c06125b..e0d22a007 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -7,8 +7,8 @@ body {
   font-size: 12px;
   background-color: #ffffff;
   color: #2d2d2d;
-  margin: 0px;
-  display: table-row;
+  margin: 50px 0px 0px 0px;
+  display: table;
 }
 a, a:link {
   color: #005c94;
@@ -247,11 +247,12 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   width: 200px;
-  padding: 50px 10px 0px 20px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #bdcdd4;
 }
 /* section */
 section {
   display: table-cell;
   width: 800px;
-  padding: 50px 20px 0px 10px;
+  padding: 0px 20px 0px 10px;
 }
-- 
cgit v1.2.3


From 8b615133d528eb074a23746afef6201f474a4e3f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 31 Aug 2011 17:31:44 +0200
Subject: remove html from profile vcard code

---
 boot.php                | 122 ++++++++++++------------------------------------
 include/text.php        |  36 ++++++++------
 view/contact_block.tpl  |   9 ++++
 view/diaspora_vcard.tpl |  44 +++++++++++++++++
 view/profile_vcard.tpl  |  40 ++++++++++------
 5 files changed, 131 insertions(+), 120 deletions(-)
 create mode 100644 view/contact_block.tpl
 create mode 100644 view/diaspora_vcard.tpl

diff --git a/boot.php b/boot.php
index 42a0f7207..edad6e70f 100644
--- a/boot.php
+++ b/boot.php
@@ -808,8 +808,8 @@ function profile_load(&$a, $nickname, $profile = 0) {
 
 	$a->page['aside'] .= profile_sidebar($a->profile, $block);
 
-	if(! $block)
-		$a->page['aside'] .= contact_block();
+	/*if(! $block)
+		$a->page['aside'] .= contact_block();*/
 
 	return;
 }}
@@ -837,132 +837,68 @@ function profile_sidebar($profile, $block = 0) {
 	$a = get_app();
 
 	$o = '';
-	$location = '';
+	$location = false;
 	$address = false;
+	$pdesc = true;
 
 	if((! is_array($profile)) && (! count($profile)))
 		return $o;
 
 	call_hooks('profile_sidebar_enter', $profile);
 
-	$fullname = '<div class="fn">' . $profile['name'] . '</div>';
-
-	$pdesc = '<div class="title">' . $profile['pdesc'] . '</div>';
-
-	$tabs = '';
-
-	$photo = '<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
-
+	
 	// don't show connect link to yourself
-	$connect = (($profile['uid'] != local_user()) ? '<li><a id="dfrn-request-link" href="dfrn_request/' . $profile['nickname'] . '">' . t('Connect') . '</a></li>' : '');
+	$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
 	// don't show connect link to authenticated visitors either
 
 	if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
-		$connect = ''; 
+		$connect = False; 
 
+	
 	if((x($profile,'address') == 1) 
 		|| (x($profile,'locality') == 1) 
 		|| (x($profile,'region') == 1) 
 		|| (x($profile,'postal-code') == 1) 
 		|| (x($profile,'country-name') == 1))
-		$address = true;
-
-	if($address) {
-		$location .= '<div class="location"><span class="location-label">' . t('Location:') . '</span> <div class="adr">';
-		$location .= ((x($profile,'address') == 1) ? '<div class="street-address">' . $profile['address'] . '</div>' : '');
-		$location .= (((x($profile,'locality') == 1) || (x($profile,'region') == 1) || (x($profile,'postal-code') == 1)) 
-			? '<span class="city-state-zip"><span class="locality">' . $profile['locality'] . '</span>' 
-			. ((x($profile['locality']) == 1) ? t(', ') : '') 
-			. '<span class="region">' . $profile['region'] . '</span>'
-			. ' <span class="postal-code">' . $profile['postal-code'] . '</span></span>' : '');
-		$location .= ((x($profile,'country-name') == 1) ? ' <span class="country-name">' . $profile['country-name'] . '</span>' : '');  
-		$location .= '</div></div><div class="profile-clear"></div>';
+		$location = t('Location:');
 
-	}
-
-
-	$gender = ((x($profile,'gender') == 1) ? '<div class="mf"><span class="gender-label">' . t('Gender:') . '</span> <span class="x-gender">' . $profile['gender'] . '</span></div><div class="profile-clear"></div>' : '');
+	$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
 
-	$pubkey = ((x($profile,'pubkey') == 1) ? '<div class="key" style="display:none;">' . $profile['pubkey'] . '</div>' : '');
 
-	$marital = ((x($profile,'marital') == 1) ? '<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> ' . t('Status:') . ' </span><span class="marital-text">' . $profile['marital'] . '</span></div><div class="profile-clear"></div>' : '');
+	$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
 
-	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div><div class="profile-clear"></div>' : '');
+	$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
 
 	if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-		$location = $pdesc = $connect = $gender = $marital = $homepage = '';
+		$location = $pdesc = $connect = $gender = $marital = $homepage = False;
 	}
 
-	$podloc = $a->get_baseurl();
-	$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' );
-	$nickname = $profile['nickname'];
-	$photo300 = $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg';
-	$photo100 = $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg';
-	$photo50  = $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg';
-
-	$diaspora_vcard = <<< EOT
-
-<div style="display:none;">
-<dl class='entity_nickname'>
-<dt>Nickname</dt>
-<dd>
-<a class="nickname url uid" href="$podloc/" rel="me">$nickname</a>
-</dd>
-</dl>
-<dl class='entity_fn'>
-<dt>Full name</dt>
-<dd>
-<span class='fn'>$fullname</span>
-</dd>
-</dl>
-<dl class="entity_url">
-<dt>URL</dt>
-<dd>
-<a class="url" href="$podloc/" id="pod_location" rel="me">$podloc/</a>
-</dd>
-</dl>
-<dl class="entity_photo">
-<dt>Photo</dt>
-<dd>
-<img class="photo avatar" height="300px" width="300px" src="$photo300">
-</dd>
-</dl>
-<dl class="entity_photo_medium">
-<dt>Photo</dt>
-<dd> 
-<img class="photo avatar" height="100px" width="100px" src="$photo100">
-</dd>
-</dl>
-<dl class="entity_photo_small">
-<dt>Photo</dt>
-<dd>
-<img class="photo avatar" height="50px" width="50px" src="$photo50">
-</dd>
-</dl>
-<dl class="entity_searchable">
-<dt>Searchable</dt>
-<dd>
-<span class="searchable">$searchable</span>
-</dd>
-</dl>
-</div>
-EOT;
+	$diaspora = array(
+		'podloc' => $a->get_baseurl(),
+		'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
+		'nickname ' => $profile['nickname'],
+		'photo300 ' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+		'photo100 ' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+		'photo50  ' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+	);
+
+	if (!$block){
+		$contact_block = contact_block();
+	}
 
 	$tpl = get_markup_template('profile_vcard.tpl');
 
 	$o .= replace_macros($tpl, array(
-		'$fullname' => $fullname,
-		'$pdesc'    => $pdesc,
-		'$tabs'     => $tabs,
-		'$photo'    => $photo,
+		'$profile' => $profile,
 		'$connect'  => $connect,		
 		'$location' => $location,
 		'$gender'   => $gender,
-		'$pubkey'   => $pubkey,
+		'$pdesc'	=> $pdesc,
 		'$marital'  => $marital,
 		'$homepage' => $homepage,
-		'$diaspora' => $diaspora_vcard
+		'$diaspora' => $diaspora,
+		'$contact_block' => $contact_block,
 	));
 
 
diff --git a/include/text.php b/include/text.php
index 66447069e..075caee00 100644
--- a/include/text.php
+++ b/include/text.php
@@ -539,22 +539,30 @@ function contact_block() {
 		$total = intval($r[0]['total']);
 	}
 	if(! $total) {
-		$o .= '<h4 class="contact-h4">' . t('No contacts') . '</h4>';
-		return $o;
-	}
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d",
-			intval($a->profile['uid']),
-			intval($shown)
-	);
-	if(count($r)) {
-		$o .= '<h4 class="contact-h4">' .  sprintf( tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
-		foreach($r as $rr) {
-			$o .= micropro($rr,true,'mpfriend');
-		}
-		$o .= '</div><div id="contact-block-end"></div>';
-		$o .=  '<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/' . $a->profile['nickname'] . '">' . t('View Contacts') . '</a></div>';
+		$contacts = t('No contacts');
+		$micropro = Null;
 		
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d",
+				intval($a->profile['uid']),
+				intval($shown)
+		);
+		if(count($r)) {
+			$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
+			$micropro = Array();
+			foreach($r as $rr) {
+				$micropro[] = micropro($rr,true,'mpfriend');
+			}
+		}
 	}
+	
+	$tpl = get_markup_template('contact_block.tpl');
+	$o = replace_macros($tpl, array(
+		'$contacts' => $contacts,
+		'$nickname' => $a->profile['nickname'],
+		'$viewcontacts' => t('View Contacts'),
+		'$micropro' => $micropro,
+	));
 
 	$arr = array('contacts' => $r, 'output' => $o);
 
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
new file mode 100644
index 000000000..00b97a6d8
--- /dev/null
+++ b/view/contact_block.tpl
@@ -0,0 +1,9 @@
+<h4 class="contact-h4">$contacts</h4>
+{{ if $micropro }}
+	<div id="contact-block">
+		{{ for $micropro as $m }}
+			$m
+		{{ endfor }}
+	</div>
+	<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/$nickname">$viewcontacts</a></div>
+{{ endif }}
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
new file mode 100644
index 000000000..aa2c9eded
--- /dev/null
+++ b/view/diaspora_vcard.tpl
@@ -0,0 +1,44 @@
+<div style="display:none;">
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<a class="nickname url uid" href="$podloc/" rel="me">$diaspora.nickname</a>
+		</dd>
+	</dl>
+	<dl class='entity_fn'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn'>$diaspora.fullname</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="300px" width="300px" src="$diaspora.photo300">
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo avatar" height="100px" width="100px" src="$diaspora.photo100">
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="50px" width="50px" src="$diaspora.photo50">
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">$diaspora.searchable</span>
+		</dd>
+	</dl>
+</div>
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 34f265ee6..01238ed5a 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,29 +1,43 @@
 <div class="vcard">
 
-	$fullname
-	$pdesc
-	$tabs
-
-	$photo
+	<div class="fn">$profile.name</div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
 
 	<div id="profile-extra-links">
 		<ul>
-			$connect
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile['nickname']">$connect</a></li>
+			{{ endif }}
 		</ul>
 	</div>
 
-	$location
+	{{ if $location }}
+		<div class="location"><span class="location-label">$location</span> 
+		<div class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</div>
+	
+	{{ endif }}
 
-	$gender
+	{{ if $gender }}<div class="mf"><span class="gender-label">$gender</span> <span class="x-gender">$profile.gender</span></div>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
 
-	$pubkey
+	{{ if $marital }}<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span>$marital</span><span class="marital-text">$profile.marital</span></div>{{ endif }}
 
-$diaspora
+	{{ if $homepage }}<div class="homepage"><span class="homepage-label">$homepage</span><span class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></span></div>{{ endif }}
 
-</div>
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 
-$marital
+</div>
 
-$homepage
+$contact_block
 
 
-- 
cgit v1.2.3


From 058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 1 Sep 2011 12:37:30 +0200
Subject: Fix profile vcard and style

---
 boot.php                        |   1 +
 images/connect-bg.png           | Bin 0 -> 689 bytes
 view/profile_vcard.tpl          |  31 ++++++++++++++-------------
 view/theme/quattro/colors.less  |   3 +++
 view/theme/quattro/quattro.less |  30 ++++++++++++++++++++++++++
 view/theme/quattro/style.css    |  46 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 96 insertions(+), 15 deletions(-)
 create mode 100644 images/connect-bg.png

diff --git a/boot.php b/boot.php
index edad6e70f..73cfe6e06 100644
--- a/boot.php
+++ b/boot.php
@@ -878,6 +878,7 @@ function profile_sidebar($profile, $block = 0) {
 		'podloc' => $a->get_baseurl(),
 		'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
 		'nickname ' => $profile['nickname'],
+		'fullname' => $profile['name'],
 		'photo300 ' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
 		'photo100 ' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
 		'photo50  ' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
diff --git a/images/connect-bg.png b/images/connect-bg.png
new file mode 100644
index 000000000..0611c73e5
Binary files /dev/null and b/images/connect-bg.png differ
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 01238ed5a..88111b0f1 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -4,17 +4,11 @@
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
 
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile['nickname']">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
+
 
 	{{ if $location }}
-		<div class="location"><span class="location-label">$location</span> 
-		<div class="adr">
+		<dl class="location"><dt class="location-label">$location</dt> 
+		<dd class="adr">
 			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
@@ -22,20 +16,27 @@
 				<span class="postal-code">$profile.postal-code</span>
 			</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</div>
-	
+		</dd>
+		</dl>
 	{{ endif }}
 
-	{{ if $gender }}<div class="mf"><span class="gender-label">$gender</span> <span class="x-gender">$profile.gender</span></div>{{ endif }}
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
 	
 	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
 
-	{{ if $marital }}<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span>$marital</span><span class="marital-text">$profile.marital</span></div>{{ endif }}
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
 
-	{{ if $homepage }}<div class="homepage"><span class="homepage-label">$homepage</span><span class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></span></div>{{ endif }}
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
 </div>
 
 $contact_block
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index d79dbca68..6015c61ee 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -55,6 +55,9 @@
 @MenuItemDetail: @Metalic2;
 
 @AsideBorder: @Metalic1;
+@AsideConnect: @Grey1;
+@AsideConnectBg: @Blue3;
+@AsideConnectHoverBg: @Blue1;
 
 
 
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index f83cce3ce..d21c3c182 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -203,8 +203,38 @@ aside {
 	width: 200px;
 	padding:0px 10px 0px 20px;
 	border-right: 1px solid @AsideBorder;
+
+	.vcard {
+		.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
+		.title { margin-bottom: 5px; }
+		dl { height: auto; overflow: auto; }
+		dt {float: left; margin-left: 0px; width: 35%; }
+		dd {float: left; margin-left: 4px; width: 60%;}
+	
+	}
+
+	#profile-extra-links {
+		ul { padding: 0px; margin: 0px; }
+		li { padding: 0px; margin: 0px; list-style: none; }
+	}
+
+	#dfrn-request-link {
+		display: block;
+		.rounded();
+		color: @AsideConnect;
+		background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+		font-weight: bold;
+		text-transform:uppercase;
+		padding: 4px 2px 2px 35px;
+		
+		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+	}
+
 }
 
+
+
+
 /* section */
 section { 
 	display: table-cell;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index e0d22a007..28e6f5fa1 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -250,6 +250,52 @@ aside {
   padding: 0px 10px 0px 20px;
   border-right: 1px solid #bdcdd4;
 }
+aside .vcard .fn {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  width: 35%;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 4px;
+  width: 60%;
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #19aeff;
+}
 /* section */
 section {
   display: table-cell;
-- 
cgit v1.2.3


From c308ac49afa43131cb09558c9c1ebdb581167a46 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:13:42 +0200
Subject: More icons

---
 images/icons/10/add.png        | Bin 0 -> 2946 bytes
 images/icons/10/delete.png     | Bin 0 -> 3018 bytes
 images/icons/10/edit.png       | Bin 0 -> 3011 bytes
 images/icons/10/feed.png       | Bin 0 -> 535 bytes
 images/icons/10/gear.png       | Bin 0 -> 3043 bytes
 images/icons/10/group.png      | Bin 0 -> 543 bytes
 images/icons/10/notify_off.png | Bin 0 -> 478 bytes
 images/icons/10/notify_on.png  | Bin 0 -> 369 bytes
 images/icons/10/star.png       | Bin 0 -> 3229 bytes
 images/icons/10/user.png       | Bin 0 -> 534 bytes
 images/icons/16/add.png        | Bin 0 -> 3068 bytes
 images/icons/16/delete.png     | Bin 0 -> 3142 bytes
 images/icons/16/edit.png       | Bin 0 -> 3129 bytes
 images/icons/16/feed.png       | Bin 0 -> 828 bytes
 images/icons/16/gear.png       | Bin 0 -> 3199 bytes
 images/icons/16/group.png      | Bin 0 -> 852 bytes
 images/icons/16/notify_off.png | Bin 0 -> 835 bytes
 images/icons/16/notify_on.png  | Bin 0 -> 542 bytes
 images/icons/16/star.png       | Bin 0 -> 3498 bytes
 images/icons/16/user.png       | Bin 0 -> 794 bytes
 images/icons/22/add.png        | Bin 0 -> 3210 bytes
 images/icons/22/delete.png     | Bin 0 -> 3294 bytes
 images/icons/22/edit.png       | Bin 0 -> 3247 bytes
 images/icons/22/feed.png       | Bin 0 -> 1136 bytes
 images/icons/22/gear.png       | Bin 0 -> 3384 bytes
 images/icons/22/group.png      | Bin 0 -> 1146 bytes
 images/icons/22/notify_off.png | Bin 0 -> 1093 bytes
 images/icons/22/notify_on.png  | Bin 0 -> 721 bytes
 images/icons/22/star.png       | Bin 0 -> 3780 bytes
 images/icons/22/user.png       | Bin 0 -> 1084 bytes
 images/icons/48/add.png        | Bin 0 -> 3944 bytes
 images/icons/48/delete.png     | Bin 0 -> 3997 bytes
 images/icons/48/edit.png       | Bin 0 -> 3948 bytes
 images/icons/48/feed.png       | Bin 0 -> 2692 bytes
 images/icons/48/gear.png       | Bin 0 -> 4225 bytes
 images/icons/48/group.png      | Bin 0 -> 2392 bytes
 images/icons/48/notify_off.png | Bin 0 -> 2147 bytes
 images/icons/48/notify_on.png  | Bin 0 -> 1506 bytes
 images/icons/48/star.png       | Bin 0 -> 4776 bytes
 images/icons/48/user.png       | Bin 0 -> 2269 bytes
 images/icons/add.png           | Bin 0 -> 8685 bytes
 images/icons/delete.png        | Bin 0 -> 7905 bytes
 images/icons/edit.png          | Bin 0 -> 8297 bytes
 images/icons/feed.png          | Bin 0 -> 9007 bytes
 images/icons/gear.png          | Bin 0 -> 10744 bytes
 images/icons/gear_22.png       | Bin 886 -> 0 bytes
 images/icons/group.png         | Bin 0 -> 7268 bytes
 images/icons/make.sh           |  14 ++++++++++++++
 images/icons/notify_off.png    | Bin 0 -> 4340 bytes
 images/icons/notify_off_22.png | Bin 884 -> 0 bytes
 images/icons/notify_on.png     | Bin 0 -> 3671 bytes
 images/icons/notify_on_22.png  | Bin 561 -> 0 bytes
 images/icons/star.png          | Bin 0 -> 9307 bytes
 images/icons/user.png          | Bin 0 -> 6921 bytes
 54 files changed, 14 insertions(+)
 create mode 100644 images/icons/10/add.png
 create mode 100644 images/icons/10/delete.png
 create mode 100644 images/icons/10/edit.png
 create mode 100644 images/icons/10/feed.png
 create mode 100644 images/icons/10/gear.png
 create mode 100644 images/icons/10/group.png
 create mode 100644 images/icons/10/notify_off.png
 create mode 100644 images/icons/10/notify_on.png
 create mode 100644 images/icons/10/star.png
 create mode 100644 images/icons/10/user.png
 create mode 100644 images/icons/16/add.png
 create mode 100644 images/icons/16/delete.png
 create mode 100644 images/icons/16/edit.png
 create mode 100644 images/icons/16/feed.png
 create mode 100644 images/icons/16/gear.png
 create mode 100644 images/icons/16/group.png
 create mode 100644 images/icons/16/notify_off.png
 create mode 100644 images/icons/16/notify_on.png
 create mode 100644 images/icons/16/star.png
 create mode 100644 images/icons/16/user.png
 create mode 100644 images/icons/22/add.png
 create mode 100644 images/icons/22/delete.png
 create mode 100644 images/icons/22/edit.png
 create mode 100644 images/icons/22/feed.png
 create mode 100644 images/icons/22/gear.png
 create mode 100644 images/icons/22/group.png
 create mode 100644 images/icons/22/notify_off.png
 create mode 100644 images/icons/22/notify_on.png
 create mode 100644 images/icons/22/star.png
 create mode 100644 images/icons/22/user.png
 create mode 100644 images/icons/48/add.png
 create mode 100644 images/icons/48/delete.png
 create mode 100644 images/icons/48/edit.png
 create mode 100644 images/icons/48/feed.png
 create mode 100644 images/icons/48/gear.png
 create mode 100644 images/icons/48/group.png
 create mode 100644 images/icons/48/notify_off.png
 create mode 100644 images/icons/48/notify_on.png
 create mode 100644 images/icons/48/star.png
 create mode 100644 images/icons/48/user.png
 create mode 100644 images/icons/add.png
 create mode 100644 images/icons/delete.png
 create mode 100644 images/icons/edit.png
 create mode 100644 images/icons/feed.png
 create mode 100644 images/icons/gear.png
 delete mode 100644 images/icons/gear_22.png
 create mode 100644 images/icons/group.png
 create mode 100644 images/icons/make.sh
 create mode 100644 images/icons/notify_off.png
 delete mode 100644 images/icons/notify_off_22.png
 create mode 100644 images/icons/notify_on.png
 delete mode 100644 images/icons/notify_on_22.png
 create mode 100644 images/icons/star.png
 create mode 100644 images/icons/user.png

diff --git a/images/icons/10/add.png b/images/icons/10/add.png
new file mode 100644
index 000000000..f036ac73e
Binary files /dev/null and b/images/icons/10/add.png differ
diff --git a/images/icons/10/delete.png b/images/icons/10/delete.png
new file mode 100644
index 000000000..f6bf31da4
Binary files /dev/null and b/images/icons/10/delete.png differ
diff --git a/images/icons/10/edit.png b/images/icons/10/edit.png
new file mode 100644
index 000000000..a6af619e2
Binary files /dev/null and b/images/icons/10/edit.png differ
diff --git a/images/icons/10/feed.png b/images/icons/10/feed.png
new file mode 100644
index 000000000..0e7d02c9b
Binary files /dev/null and b/images/icons/10/feed.png differ
diff --git a/images/icons/10/gear.png b/images/icons/10/gear.png
new file mode 100644
index 000000000..df6f87af5
Binary files /dev/null and b/images/icons/10/gear.png differ
diff --git a/images/icons/10/group.png b/images/icons/10/group.png
new file mode 100644
index 000000000..23172a027
Binary files /dev/null and b/images/icons/10/group.png differ
diff --git a/images/icons/10/notify_off.png b/images/icons/10/notify_off.png
new file mode 100644
index 000000000..c499de01b
Binary files /dev/null and b/images/icons/10/notify_off.png differ
diff --git a/images/icons/10/notify_on.png b/images/icons/10/notify_on.png
new file mode 100644
index 000000000..5204e097c
Binary files /dev/null and b/images/icons/10/notify_on.png differ
diff --git a/images/icons/10/star.png b/images/icons/10/star.png
new file mode 100644
index 000000000..185761177
Binary files /dev/null and b/images/icons/10/star.png differ
diff --git a/images/icons/10/user.png b/images/icons/10/user.png
new file mode 100644
index 000000000..419661be6
Binary files /dev/null and b/images/icons/10/user.png differ
diff --git a/images/icons/16/add.png b/images/icons/16/add.png
new file mode 100644
index 000000000..7ca375325
Binary files /dev/null and b/images/icons/16/add.png differ
diff --git a/images/icons/16/delete.png b/images/icons/16/delete.png
new file mode 100644
index 000000000..ada2535fc
Binary files /dev/null and b/images/icons/16/delete.png differ
diff --git a/images/icons/16/edit.png b/images/icons/16/edit.png
new file mode 100644
index 000000000..747f5e4e7
Binary files /dev/null and b/images/icons/16/edit.png differ
diff --git a/images/icons/16/feed.png b/images/icons/16/feed.png
new file mode 100644
index 000000000..9ac7c6677
Binary files /dev/null and b/images/icons/16/feed.png differ
diff --git a/images/icons/16/gear.png b/images/icons/16/gear.png
new file mode 100644
index 000000000..5af85390f
Binary files /dev/null and b/images/icons/16/gear.png differ
diff --git a/images/icons/16/group.png b/images/icons/16/group.png
new file mode 100644
index 000000000..bab4bcd18
Binary files /dev/null and b/images/icons/16/group.png differ
diff --git a/images/icons/16/notify_off.png b/images/icons/16/notify_off.png
new file mode 100644
index 000000000..f11aa4bde
Binary files /dev/null and b/images/icons/16/notify_off.png differ
diff --git a/images/icons/16/notify_on.png b/images/icons/16/notify_on.png
new file mode 100644
index 000000000..6e91fd995
Binary files /dev/null and b/images/icons/16/notify_on.png differ
diff --git a/images/icons/16/star.png b/images/icons/16/star.png
new file mode 100644
index 000000000..3130be6f0
Binary files /dev/null and b/images/icons/16/star.png differ
diff --git a/images/icons/16/user.png b/images/icons/16/user.png
new file mode 100644
index 000000000..df83bc27d
Binary files /dev/null and b/images/icons/16/user.png differ
diff --git a/images/icons/22/add.png b/images/icons/22/add.png
new file mode 100644
index 000000000..ee83da024
Binary files /dev/null and b/images/icons/22/add.png differ
diff --git a/images/icons/22/delete.png b/images/icons/22/delete.png
new file mode 100644
index 000000000..15713471b
Binary files /dev/null and b/images/icons/22/delete.png differ
diff --git a/images/icons/22/edit.png b/images/icons/22/edit.png
new file mode 100644
index 000000000..6e6bb4f73
Binary files /dev/null and b/images/icons/22/edit.png differ
diff --git a/images/icons/22/feed.png b/images/icons/22/feed.png
new file mode 100644
index 000000000..15094ce89
Binary files /dev/null and b/images/icons/22/feed.png differ
diff --git a/images/icons/22/gear.png b/images/icons/22/gear.png
new file mode 100644
index 000000000..16bcf77dd
Binary files /dev/null and b/images/icons/22/gear.png differ
diff --git a/images/icons/22/group.png b/images/icons/22/group.png
new file mode 100644
index 000000000..0505432ca
Binary files /dev/null and b/images/icons/22/group.png differ
diff --git a/images/icons/22/notify_off.png b/images/icons/22/notify_off.png
new file mode 100644
index 000000000..f2200bb60
Binary files /dev/null and b/images/icons/22/notify_off.png differ
diff --git a/images/icons/22/notify_on.png b/images/icons/22/notify_on.png
new file mode 100644
index 000000000..6b3d7fd08
Binary files /dev/null and b/images/icons/22/notify_on.png differ
diff --git a/images/icons/22/star.png b/images/icons/22/star.png
new file mode 100644
index 000000000..b8829cbfd
Binary files /dev/null and b/images/icons/22/star.png differ
diff --git a/images/icons/22/user.png b/images/icons/22/user.png
new file mode 100644
index 000000000..fad2bee97
Binary files /dev/null and b/images/icons/22/user.png differ
diff --git a/images/icons/48/add.png b/images/icons/48/add.png
new file mode 100644
index 000000000..61a0b0982
Binary files /dev/null and b/images/icons/48/add.png differ
diff --git a/images/icons/48/delete.png b/images/icons/48/delete.png
new file mode 100644
index 000000000..1be4c9a21
Binary files /dev/null and b/images/icons/48/delete.png differ
diff --git a/images/icons/48/edit.png b/images/icons/48/edit.png
new file mode 100644
index 000000000..d09214ec9
Binary files /dev/null and b/images/icons/48/edit.png differ
diff --git a/images/icons/48/feed.png b/images/icons/48/feed.png
new file mode 100644
index 000000000..9730b4738
Binary files /dev/null and b/images/icons/48/feed.png differ
diff --git a/images/icons/48/gear.png b/images/icons/48/gear.png
new file mode 100644
index 000000000..16434390d
Binary files /dev/null and b/images/icons/48/gear.png differ
diff --git a/images/icons/48/group.png b/images/icons/48/group.png
new file mode 100644
index 000000000..e624bbfb2
Binary files /dev/null and b/images/icons/48/group.png differ
diff --git a/images/icons/48/notify_off.png b/images/icons/48/notify_off.png
new file mode 100644
index 000000000..0a8854cfe
Binary files /dev/null and b/images/icons/48/notify_off.png differ
diff --git a/images/icons/48/notify_on.png b/images/icons/48/notify_on.png
new file mode 100644
index 000000000..8440018a6
Binary files /dev/null and b/images/icons/48/notify_on.png differ
diff --git a/images/icons/48/star.png b/images/icons/48/star.png
new file mode 100644
index 000000000..4b2816d15
Binary files /dev/null and b/images/icons/48/star.png differ
diff --git a/images/icons/48/user.png b/images/icons/48/user.png
new file mode 100644
index 000000000..f73c591e6
Binary files /dev/null and b/images/icons/48/user.png differ
diff --git a/images/icons/add.png b/images/icons/add.png
new file mode 100644
index 000000000..78497fbc9
Binary files /dev/null and b/images/icons/add.png differ
diff --git a/images/icons/delete.png b/images/icons/delete.png
new file mode 100644
index 000000000..f0cae5154
Binary files /dev/null and b/images/icons/delete.png differ
diff --git a/images/icons/edit.png b/images/icons/edit.png
new file mode 100644
index 000000000..aeaf835fe
Binary files /dev/null and b/images/icons/edit.png differ
diff --git a/images/icons/feed.png b/images/icons/feed.png
new file mode 100644
index 000000000..6894257e9
Binary files /dev/null and b/images/icons/feed.png differ
diff --git a/images/icons/gear.png b/images/icons/gear.png
new file mode 100644
index 000000000..02847ef9d
Binary files /dev/null and b/images/icons/gear.png differ
diff --git a/images/icons/gear_22.png b/images/icons/gear_22.png
deleted file mode 100644
index e363de00d..000000000
Binary files a/images/icons/gear_22.png and /dev/null differ
diff --git a/images/icons/group.png b/images/icons/group.png
new file mode 100644
index 000000000..de0dc7901
Binary files /dev/null and b/images/icons/group.png differ
diff --git a/images/icons/make.sh b/images/icons/make.sh
new file mode 100644
index 000000000..348117411
--- /dev/null
+++ b/images/icons/make.sh
@@ -0,0 +1,14 @@
+sizes="10 16 22 48"
+
+for s in $sizes
+do
+ echo "=[ ${s}x${s} ]===="
+ [ -d $s ] || mkdir $s
+ for f in *.png
+ do
+    convert $f -resize ${s}x${s} $s/$f
+    echo -n "#"
+ done
+ echo
+done
+echo "Ok."
diff --git a/images/icons/notify_off.png b/images/icons/notify_off.png
new file mode 100644
index 000000000..e6eac16b8
Binary files /dev/null and b/images/icons/notify_off.png differ
diff --git a/images/icons/notify_off_22.png b/images/icons/notify_off_22.png
deleted file mode 100644
index 0520af327..000000000
Binary files a/images/icons/notify_off_22.png and /dev/null differ
diff --git a/images/icons/notify_on.png b/images/icons/notify_on.png
new file mode 100644
index 000000000..b9e07d24e
Binary files /dev/null and b/images/icons/notify_on.png differ
diff --git a/images/icons/notify_on_22.png b/images/icons/notify_on_22.png
deleted file mode 100644
index a8b305245..000000000
Binary files a/images/icons/notify_on_22.png and /dev/null differ
diff --git a/images/icons/star.png b/images/icons/star.png
new file mode 100644
index 000000000..4a2236c9b
Binary files /dev/null and b/images/icons/star.png differ
diff --git a/images/icons/user.png b/images/icons/user.png
new file mode 100644
index 000000000..f1132b1ae
Binary files /dev/null and b/images/icons/user.png differ
-- 
cgit v1.2.3


From ab5bda526e9fffcfeecd384332372531c18c49dc Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:14:43 +0200
Subject: move icons style in new file

---
 view/theme/quattro/icons.less   |  37 ++++++++++++++
 view/theme/quattro/quattro.less |  47 +++++++++---------
 view/theme/quattro/style.css    | 104 +++++++++++++++++++++++++++++++++-------
 view/theme/quattro/style.less   |   1 +
 4 files changed, 146 insertions(+), 43 deletions(-)
 create mode 100644 view/theme/quattro/icons.less

diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
new file mode 100644
index 000000000..8f7111aff
--- /dev/null
+++ b/view/theme/quattro/icons.less
@@ -0,0 +1,37 @@
+/* icons */
+
+.icons(@size: 22) {
+	&.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); }
+	&.gear 	 { background-image: url("../../../images/icons/@{size}/gear.png"); }
+	
+	&.add 	 	{ background-image: url("../../../images/icons/@{size}/add.png"); }
+	&.delete 	{ background-image: url("../../../images/icons/@{size}/delete.png"); }
+	&.edit 	 	{ background-image: url("../../../images/icons/@{size}/edit.png"); }
+	&.start	 	{ background-image: url("../../../images/icons/@{size}/star.png"); }
+}
+
+
+.icon {
+	background-color: transparent ;
+	background-repeat: no-repeat;
+	background-position: center center;
+	display: block;
+	overflow: hidden;
+	text-indent: -9999px;
+	padding: 1px;
+
+	&.text {
+		text-indent: 0px;
+	}
+
+	&.s16 {
+		width:22px; height: 22px;
+		.icons(16);
+	}
+	&.s22 {
+		width:22px; height: 22px;
+		.icons(22);
+	}
+	
+	
+}
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index d21c3c182..c7cbe7ebb 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -32,33 +32,13 @@ a:hover {color: @LinkHover; text-decoration: underline; }
 .left { float: left; }
 .right { float: right; }
 
-/* icons */
-
-
-.icons(@size: 22) {
-	&.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); }
-	&.gear 	 { background-image: url("../../../images/icons/gear_@{size}.png"); }
-}
-
-
-.icon {
-	background-color: transparent ;
-	background-repeat: no-repeat;
-	background-position: center center;
-	display: block;
-	overflow: hidden;
-	text-indent: -9999px;
-
-	&.s22 {
-		width:22px; height: 22px;
-		padding: 1px;
-		.icons(22);
-	}
-	
+.tool {
+	height: auto; overflow: auto;
+	.label { float: left;}
+	.icon { float: right; }
 }
 
 
-
 /* header */
 header {
 	position: fixed; left: 43%; right: 43%; top: 0px;
@@ -156,7 +136,7 @@ nav {
 			.menu-popup{ right: 0px; left: auto; }
 		}
 	
-		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") }
+		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 
@@ -232,6 +212,20 @@ aside {
 
 }
 
+#contact-block {
+	overflow: auto;	height: auto;
+	.contact-block-h4 { float: left; margin: 5px 0px; }
+	.allcontact-link { float: right; margin: 5px 0px; }
+	.contact-block-content {
+		clear: both;
+		overflow: auto;	height: auto;
+	}
+	.contact-block-link {
+		float: left;
+		margin: 0px 2px 2px 0px;
+	}
+}
+
 
 
 
@@ -241,3 +235,6 @@ section {
 	width: 800px;
 	padding:0px 20px 0px 10px;
 }
+
+
+
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 28e6f5fa1..2b950c3ef 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -1,6 +1,63 @@
 /**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  **/
+/* icons */
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  background-position: center center;
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s16 {
+  width: 22px;
+  height: 22px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}
+.icon.s16.start {
+  background-image: url("../../../images/icons/16/star.png");
+}
+.icon.s22 {
+  width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.start {
+  background-image: url("../../../images/icons/22/star.png");
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -28,25 +85,15 @@ a:hover {
 .right {
   float: right;
 }
-/* icons */
-.icon {
-  background-color: transparent ;
-  background-repeat: no-repeat;
-  background-position: center center;
-  display: block;
-  overflow: hidden;
-  text-indent: -9999px;
-}
-.icon.s22 {
-  width: 22px;
-  height: 22px;
-  padding: 1px;
+.tool {
+  height: auto;
+  overflow: auto;
 }
-.icon.s22.notify {
-  background-image: url("../../../images/icons/notify_off_22.png");
+.tool .label {
+  float: left;
 }
-.icon.s22.gear {
-  background-image: url("../../../images/icons/gear_22.png");
+.tool .icon {
+  float: right;
 }
 /* header */
 header {
@@ -186,7 +233,7 @@ nav #nav-site-linkmenu .menu-popup {
   left: auto;
 }
 nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/notify_on_22.png");
+  background-image: url("../../../images/icons/22/notify_on.png");
 }
 nav #nav-apps-link.selected {
   background-color: #364e59;
@@ -296,6 +343,27 @@ aside #dfrn-request-link:hover {
   text-decoration: none;
   background-color: #19aeff;
 }
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
 /* section */
 section {
   display: table-cell;
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less
index d1c677b22..c3dbae777 100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/style.less
@@ -6,6 +6,7 @@
 // $ lessc style.less > style.css
 
 @import "colors";
+@import "icons";
 @import "quattro";
 
 
-- 
cgit v1.2.3


From 20ca4512000e80386fe6f9b3fd85864bc0e91627 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:15:30 +0200
Subject: move js to js folder

---
 include/acl.js                  | 240 --------------
 include/ajaxupload.js           | 695 ----------------------------------------
 include/country.js              | 438 -------------------------
 include/jquery.htmlstream.js    | 157 ---------
 include/jquery.js               | 154 ---------
 include/main.js                 | 426 ------------------------
 js/acl.js                       | 240 ++++++++++++++
 js/ajaxupload.js                | 695 ++++++++++++++++++++++++++++++++++++++++
 js/country.js                   | 438 +++++++++++++++++++++++++
 js/jquery.htmlstream.js         | 157 +++++++++
 js/jquery.js                    | 154 +++++++++
 js/main.js                      | 426 ++++++++++++++++++++++++
 view/admin_remoteupdate.tpl     |   2 +-
 view/head.tpl                   |   8 +-
 view/jot-header.tpl             |   2 +-
 view/msg-header.tpl             |   2 +-
 view/theme/dispy/jot-header.tpl |   2 +-
 17 files changed, 2119 insertions(+), 2117 deletions(-)
 delete mode 100644 include/acl.js
 delete mode 100644 include/ajaxupload.js
 delete mode 100644 include/country.js
 delete mode 100644 include/jquery.htmlstream.js
 delete mode 100644 include/jquery.js
 delete mode 100644 include/main.js
 create mode 100644 js/acl.js
 create mode 100644 js/ajaxupload.js
 create mode 100644 js/country.js
 create mode 100644 js/jquery.htmlstream.js
 create mode 100644 js/jquery.js
 create mode 100644 js/main.js

diff --git a/include/acl.js b/include/acl.js
deleted file mode 100644
index 82b631ee9..000000000
--- a/include/acl.js
+++ /dev/null
@@ -1,240 +0,0 @@
-function ACL(backend_url, preset){
-	that = this;
-	
-	that.url = backend_url;
-	
-	that.kp_timer = null;
-	
-	if (preset==undefined) preset = [];
-	that.allow_cid = (preset[0] || []);
-	that.allow_gid = (preset[1] || []);
-	that.deny_cid  = (preset[2] || []);
-	that.deny_gid  = (preset[3] || []);
-	that.group_uids = [];
-	that.nw = 4; //items per row. should be calulated from #acl-list.width
-	
-	that.list_content = $("#acl-list-content");
-	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
-	that.showall = $("#acl-showall");
-
-	if (preset.length==0) that.showall.addClass("selected");
-	
-	/*events*/
-	that.showall.click(that.on_showall);
-	$(".acl-button-show").live('click', that.on_button_show);
-	$(".acl-button-hide").live('click', that.on_button_hide);
-	$("#acl-search").keypress(that.on_search);
-	$("#acl-wrapper").parents("form").submit(that.on_submit);
-	
-	/* startup! */
-	that.get(0,100);
-}
-
-ACL.prototype.on_submit = function(){
-	aclfileds = $("#acl-fields").html("");
-	$(that.allow_gid).each(function(i,v){
-		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
-	});
-	$(that.allow_cid).each(function(i,v){
-		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
-	});
-	$(that.deny_gid).each(function(i,v){
-		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
-	});
-	$(that.deny_cid).each(function(i,v){
-		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
-	});	
-}
-
-ACL.prototype.search = function(){
-	var srcstr = $("#acl-search").val();
-	that.list_content.html("");
-	that.get(0,100, srcstr);
-}
-
-ACL.prototype.on_search = function(event){
-	if (that.kp_timer) clearTimeout(that.kp_timer);
-	that.kp_timer = setTimeout( that.search, 1000);
-}
-
-ACL.prototype.on_showall = function(event){
-	event.stopPropagation();
-	if (that.showall.hasClass("selected")){
-		return false;
-	}
-	that.showall.addClass("selected");
-	
-	that.allow_cid = [];
-	that.allow_gid = [];
-	that.deny_cid  = [];
-	that.deny_gid  = [];
-	
-	that.updateview();
-	
-	return false;
-}
-
-ACL.prototype.on_button_show = function(event){
-	event.stopPropagation();
-
-	/*that.showall.removeClass("selected");
-	$(this).siblings(".acl-button-hide").removeClass("selected");
-	$(this).toggleClass("selected");*/
-
-	that.set_allow($(this).parent().attr('id'));
-
-	return false;
-}
-ACL.prototype.on_button_hide = function(event){
-	event.stopPropagation();
-
-	/*that.showall.removeClass("selected");
-	$(this).siblings(".acl-button-show").removeClass("selected");
-	$(this).toggleClass("selected");*/
-
-	that.set_deny($(this).parent().attr('id'));
-
-	return false;
-}
-
-ACL.prototype.set_allow = function(itemid){
-	type = itemid[0];
-	id 	 = parseInt(itemid.substr(1));
-	switch(type){
-		case "g":
-			if (that.allow_gid.indexOf(id)<0){
-				that.allow_gid.push(id)
-			}else {
-				that.allow_gid.remove(id);
-			}
-			if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
-			break;
-		case "c":
-			if (that.allow_cid.indexOf(id)<0){
-				that.allow_cid.push(id)
-			} else {
-				that.allow_cid.remove(id);
-			}
-			if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);			
-			break;
-	}
-	that.updateview();
-}
-
-ACL.prototype.set_deny = function(itemid){
-	type = itemid[0];
-	id 	 = parseInt(itemid.substr(1));
-	switch(type){
-		case "g":
-			if (that.deny_gid.indexOf(id)<0){
-				that.deny_gid.push(id)
-			} else {
-				that.deny_gid.remove(id);
-			}
-			if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
-			break;
-		case "c":
-			if (that.deny_cid.indexOf(id)<0){
-				that.deny_cid.push(id)
-			} else {
-				that.deny_cid.remove(id);
-			}
-			if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
-			break;
-	}
-	that.updateview();
-}
-
-ACL.prototype.updateview = function(){
-	if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
-		that.deny_gid.length==0 && that.deny_cid.length==0){
-			that.showall.addClass("selected");
-			/* jot acl */
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);			
-				if(editor != false) {
-					$('#profile-jot-desc').html(ispublic);
-				}
-			
-	} else {
-			that.showall.removeClass("selected");
-			/* jot acl */
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');			
-				$('#profile-jot-desc').html('&nbsp;');
-	}
-	
-	$("#acl-list-content .acl-list-item").each(function(){
-		itemid = $(this).attr('id');
-		type = itemid[0];
-		id 	 = parseInt(itemid.substr(1));
-		
-		btshow = $(this).children(".acl-button-show").removeClass("selected");
-		bthide = $(this).children(".acl-button-hide").removeClass("selected");	
-		
-		switch(type){
-			case "g":
-				var uclass = "";
-				if (that.allow_gid.indexOf(id)>=0){
-					btshow.addClass("selected");
-					bthide.removeClass("selected");
-					uclass="groupshow";
-				}
-				if (that.deny_gid.indexOf(id)>=0){
-					btshow.removeClass("selected");
-					bthide.addClass("selected");
-					uclass="grouphide";
-				}
-				
-				$(that.group_uids[id]).each(function(i,v){
-					$("#c"+v).removeClass("groupshow grouphide").addClass(uclass);
-				});
-				
-				break;
-			case "c":
-				if (that.allow_cid.indexOf(id)>=0){
-					btshow.addClass("selected");
-					bthide.removeClass("selected");
-				}
-				if (that.deny_cid.indexOf(id)>=0){
-					btshow.removeClass("selected");
-					bthide.addClass("selected");
-				}			
-		}
-		
-	});
-	
-}
-
-
-ACL.prototype.get = function(start,count, search){
-	var postdata = {
-		start:start,
-		count:count,
-		search:search,
-	}
-	
-	$.ajax({
-		type:'POST',
-		url: that.url,
-		data: postdata,
-		dataType: 'json',
-		success:that.populate
-	});
-}
-
-ACL.prototype.populate = function(data){
-	var height = Math.ceil(data.tot / that.nw) * 42;
-	that.list_content.height(height);
-	$(data.items).each(function(){
-		html = "<div class='acl-list-item {4} {5}' id='{2}{3}'>"+that.item_tpl+"</div>";
-		html = html.format( this.photo, this.name, this.type, this.id, '', this.network );
-		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
-		//console.log(html);
-		that.list_content.append(html);
-	});
-	that.updateview();
-}
-
diff --git a/include/ajaxupload.js b/include/ajaxupload.js
deleted file mode 100644
index 67c4a56fb..000000000
--- a/include/ajaxupload.js
+++ /dev/null
@@ -1,695 +0,0 @@
-/**
- * AJAX Upload ( http://valums.com/ajax-upload/ ) 
- * Copyright (c) Andris Valums
- * Licensed under the MIT license ( http://valums.com/mit-license/ )
- * Thanks to Gary Haran, David Mark, Corey Burns and others for contributions. 
- */
-
-(function () {
-    /* global window */
-    /* jslint browser: true, devel: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true */
-    
-    /**
-     * Wrapper for FireBug's console.log
-     */
-    function log(){
-        if (typeof(console) != 'undefined' && typeof(console.log) == 'function'){            
-            Array.prototype.unshift.call(arguments, '[Ajax Upload]');
-            console.log( Array.prototype.join.call(arguments, ' '));
-        }
-    } 
-
-    /**
-     * Attaches event to a dom element.
-     * @param {Element} el
-     * @param type event name
-     * @param fn callback This refers to the passed element
-     */
-    function addEvent(el, type, fn){
-        if (el.addEventListener) {
-            el.addEventListener(type, fn, false);
-        } else if (el.attachEvent) {
-            el.attachEvent('on' + type, function(){
-                fn.call(el);
-	        });
-	    } else {
-            throw new Error('not supported or DOM not loaded');
-        }
-    }   
-    
-    /**
-     * Attaches resize event to a window, limiting
-     * number of event fired. Fires only when encounteres
-     * delay of 100 after series of events.
-     * 
-     * Some browsers fire event multiple times when resizing
-     * http://www.quirksmode.org/dom/events/resize.html
-     * 
-     * @param fn callback This refers to the passed element
-     */
-    function addResizeEvent(fn){
-        var timeout;
-               
-	    addEvent(window, 'resize', function(){
-            if (timeout){
-                clearTimeout(timeout);
-            }
-            timeout = setTimeout(fn, 100);                        
-        });
-    }    
-    
-    // Needs more testing, will be rewriten for next version        
-    // getOffset function copied from jQuery lib (http://jquery.com/)
-    if (document.documentElement.getBoundingClientRect){
-        // Get Offset using getBoundingClientRect
-        // http://ejohn.org/blog/getboundingclientrect-is-awesome/
-        var getOffset = function(el){
-            var box = el.getBoundingClientRect();
-            var doc = el.ownerDocument;
-            var body = doc.body;
-            var docElem = doc.documentElement; // for ie 
-            var clientTop = docElem.clientTop || body.clientTop || 0;
-            var clientLeft = docElem.clientLeft || body.clientLeft || 0;
-             
-            // In Internet Explorer 7 getBoundingClientRect property is treated as physical,
-            // while others are logical. Make all logical, like in IE8.	
-            var zoom = 1;            
-            if (body.getBoundingClientRect) {
-                var bound = body.getBoundingClientRect();
-                zoom = (bound.right - bound.left) / body.clientWidth;
-            }
-            
-            if (zoom > 1) {
-                clientTop = 0;
-                clientLeft = 0;
-            }
-            
-            var top = box.top / zoom + (window.pageYOffset || docElem && docElem.scrollTop / zoom || body.scrollTop / zoom) - clientTop, left = box.left / zoom + (window.pageXOffset || docElem && docElem.scrollLeft / zoom || body.scrollLeft / zoom) - clientLeft;
-            
-            return {
-                top: top,
-                left: left
-            };
-        };        
-    } else {
-        // Get offset adding all offsets 
-        var getOffset = function(el){
-            var top = 0, left = 0;
-            do {
-                top += el.offsetTop || 0;
-                left += el.offsetLeft || 0;
-                el = el.offsetParent;
-            } while (el);
-            
-            return {
-                left: left,
-                top: top
-            };
-        };
-    }
-    
-    /**
-     * Returns left, top, right and bottom properties describing the border-box,
-     * in pixels, with the top-left relative to the body
-     * @param {Element} el
-     * @return {Object} Contains left, top, right,bottom
-     */
-    function getBox(el){
-        var left, right, top, bottom;
-        var offset = getOffset(el);
-        left = offset.left;
-        top = offset.top;
-        
-        right = left + el.offsetWidth;
-        bottom = top + el.offsetHeight;
-        
-        return {
-            left: left,
-            right: right,
-            top: top,
-            bottom: bottom
-        };
-    }
-    
-    /**
-     * Helper that takes object literal
-     * and add all properties to element.style
-     * @param {Element} el
-     * @param {Object} styles
-     */
-    function addStyles(el, styles){
-        for (var name in styles) {
-            if (styles.hasOwnProperty(name)) {
-                el.style[name] = styles[name];
-            }
-        }
-    }
-        
-    /**
-     * Function places an absolutely positioned
-     * element on top of the specified element
-     * copying position and dimentions.
-     * @param {Element} from
-     * @param {Element} to
-     */    
-    function copyLayout(from, to){
-	    var box = getBox(from);
-        
-        addStyles(to, {
-	        position: 'absolute',                    
-	        left : box.left + 'px',
-	        top : box.top + 'px',
-	        width : from.offsetWidth + 'px',
-	        height : from.offsetHeight + 'px'
-	    });        
-	to.title = from.title;
-
-    }
-
-    /**
-    * Creates and returns element from html chunk
-    * Uses innerHTML to create an element
-    */
-    var toElement = (function(){
-        var div = document.createElement('div');
-        return function(html){
-            div.innerHTML = html;
-            var el = div.firstChild;
-            return div.removeChild(el);
-        };
-    })();
-            
-    /**
-     * Function generates unique id
-     * @return unique id 
-     */
-    var getUID = (function(){
-        var id = 0;
-        return function(){
-            return 'ValumsAjaxUpload' + id++;
-        };
-    })();        
- 
-    /**
-     * Get file name from path
-     * @param {String} file path to file
-     * @return filename
-     */  
-    function fileFromPath(file){
-        return file.replace(/.*(\/|\\)/, "");
-    }
-    
-    /**
-     * Get file extension lowercase
-     * @param {String} file name
-     * @return file extenstion
-     */    
-    function getExt(file){
-        return (-1 !== file.indexOf('.')) ? file.replace(/.*[.]/, '') : '';
-    }
-
-    function hasClass(el, name){        
-        var re = new RegExp('\\b' + name + '\\b');        
-        return re.test(el.className);
-    }    
-    function addClass(el, name){
-        if ( ! hasClass(el, name)){   
-            el.className += ' ' + name;
-        }
-    }    
-    function removeClass(el, name){
-        var re = new RegExp('\\b' + name + '\\b');                
-        el.className = el.className.replace(re, '');        
-    }
-    
-    function removeNode(el){
-        el.parentNode.removeChild(el);
-    }
-
-    /**
-     * Easy styling and uploading
-     * @constructor
-     * @param button An element you want convert to 
-     * upload button. Tested dimentions up to 500x500px
-     * @param {Object} options See defaults below.
-     */
-    window.AjaxUpload = function(button, options){
-        this._settings = {
-            // Location of the server-side upload script
-            action: 'upload.php',
-            // File upload name
-            name: 'userfile',
-            // Additional data to send
-            data: {},
-            // Submit file as soon as it's selected
-            autoSubmit: true,
-            // The type of data that you're expecting back from the server.
-            // html and xml are detected automatically.
-            // Only useful when you are using json data as a response.
-            // Set to "json" in that case. 
-            responseType: false,
-            // Class applied to button when mouse is hovered
-            hoverClass: 'hover',
-            // Class applied to button when button is focused
-            focusClass: 'focus',
-            // Class applied to button when AU is disabled
-            disabledClass: 'disabled',            
-            // When user selects a file, useful with autoSubmit disabled
-            // You can return false to cancel upload			
-            onChange: function(file, extension){
-            },
-            // Callback to fire before file is uploaded
-            // You can return false to cancel upload
-            onSubmit: function(file, extension){
-            },
-            // Fired when file upload is completed
-            // WARNING! DO NOT USE "FALSE" STRING AS A RESPONSE!
-            onComplete: function(file, response){
-            }
-        };
-                        
-        // Merge the users options with our defaults
-        for (var i in options) {
-            if (options.hasOwnProperty(i)){
-                this._settings[i] = options[i];
-            }
-        }
-                
-        // button isn't necessary a dom element
-        if (button.jquery){
-            // jQuery object was passed
-            button = button[0];
-        } else if (typeof button == "string") {
-            if (/^#.*/.test(button)){
-                // If jQuery user passes #elementId don't break it					
-                button = button.slice(1);                
-            }
-            
-            button = document.getElementById(button);
-        }
-        
-        if ( ! button || button.nodeType !== 1){
-            throw new Error("Please make sure that you're passing a valid element"); 
-        }
-                
-        if ( button.nodeName.toUpperCase() == 'A'){
-            // disable link                       
-            addEvent(button, 'click', function(e){
-                if (e && e.preventDefault){
-                    e.preventDefault();
-                } else if (window.event){
-                    window.event.returnValue = false;
-                }
-            });
-        }
-                    
-        // DOM element
-        this._button = button;        
-        // DOM element                 
-        this._input = null;
-        // If disabled clicking on button won't do anything
-        this._disabled = false;
-        
-        // if the button was disabled before refresh if will remain
-        // disabled in FireFox, let's fix it
-        this.enable();        
-        
-        this._rerouteClicks();
-    };
-    
-    // assigning methods to our class
-    AjaxUpload.prototype = {
-        setData: function(data){
-            this._settings.data = data;
-        },
-        disable: function(){            
-            addClass(this._button, this._settings.disabledClass);
-            this._disabled = true;
-            
-            var nodeName = this._button.nodeName.toUpperCase();            
-            if (nodeName == 'INPUT' || nodeName == 'BUTTON'){
-                this._button.setAttribute('disabled', 'disabled');
-            }            
-            
-            // hide input
-            if (this._input){
-                // We use visibility instead of display to fix problem with Safari 4
-                // The problem is that the value of input doesn't change if it 
-                // has display none when user selects a file           
-                this._input.parentNode.style.visibility = 'hidden';
-            }
-        },
-        enable: function(){
-            removeClass(this._button, this._settings.disabledClass);
-            this._button.removeAttribute('disabled');
-            this._disabled = false;
-            
-        },
-        /**
-         * Creates invisible file input 
-         * that will hover above the button
-         * <div><input type='file' /></div>
-         */
-        _createInput: function(){ 
-            var self = this;
-                        
-            var input = document.createElement("input");
-            input.setAttribute('type', 'file');
-            input.setAttribute('name', this._settings.name);
-
-            addStyles(input, {
-                'position' : 'absolute',
-                // in Opera only 'browse' button
-                // is clickable and it is located at
-                // the right side of the input
-                'right' : 0,
-                'margin' : 0,
-                'padding' : 0,
-                'fontSize' : '480px',
-                // in Firefox if font-family is set to
-                // 'inherit' the input doesn't work
-                'fontFamily' : 'sans-serif',
-                'cursor' : 'pointer'
-            });            
-
-            var div = document.createElement("div");                        
-            addStyles(div, {
-                'display' : 'block',
-                'position' : 'absolute',
-                'overflow' : 'hidden',
-                'margin' : 0,
-                'padding' : 0,                
-                'opacity' : 0,
-                // Make sure browse button is in the right side
-                // in Internet Explorer
-                'direction' : 'ltr',
-                //Max zIndex supported by Opera 9.0-9.2
-                'zIndex': 2147483583,
-				'cursor' : 'pointer'
-
-            });
-            
-            // Make sure that element opacity exists.
-            // Otherwise use IE filter            
-            if ( div.style.opacity !== "0") {
-                if (typeof(div.filters) == 'undefined'){
-                    throw new Error('Opacity not supported by the browser');
-                }
-                div.style.filter = "alpha(opacity=0)";
-            }            
-            
-            addEvent(input, 'change', function(){
-                 
-                if ( ! input || input.value === ''){                
-                    return;                
-                }
-                            
-                // Get filename from input, required                
-                // as some browsers have path instead of it          
-                var file = fileFromPath(input.value);
-                                
-                if (false === self._settings.onChange.call(self, file, getExt(file))){
-                    self._clearInput();                
-                    return;
-                }
-                
-                // Submit form when value is changed
-                if (self._settings.autoSubmit) {
-                    self.submit();
-                }
-            });            
-
-            addEvent(input, 'mouseover', function(){
-                addClass(self._button, self._settings.hoverClass);
-            });
-            
-            addEvent(input, 'mouseout', function(){
-                removeClass(self._button, self._settings.hoverClass);
-                removeClass(self._button, self._settings.focusClass);
-                
-                // We use visibility instead of display to fix problem with Safari 4
-                // The problem is that the value of input doesn't change if it 
-                // has display none when user selects a file           
-                input.parentNode.style.visibility = 'hidden';
-
-            });   
-                        
-            addEvent(input, 'focus', function(){
-                addClass(self._button, self._settings.focusClass);
-            });
-            
-            addEvent(input, 'blur', function(){
-                removeClass(self._button, self._settings.focusClass);
-            });
-            
-	        div.appendChild(input);
-            document.body.appendChild(div);
-              
-            this._input = input;
-        },
-        _clearInput : function(){
-            if (!this._input){
-                return;
-            }            
-                             
-            // this._input.value = ''; Doesn't work in IE6                               
-            removeNode(this._input.parentNode);
-            this._input = null;                                                                   
-            this._createInput();
-            
-            removeClass(this._button, this._settings.hoverClass);
-            removeClass(this._button, this._settings.focusClass);
-        },
-        /**
-         * Function makes sure that when user clicks upload button,
-         * the this._input is clicked instead
-         */
-        _rerouteClicks: function(){
-            var self = this;
-            
-            // IE will later display 'access denied' error
-            // if you use using self._input.click()
-            // other browsers just ignore click()
-
-            addEvent(self._button, 'mouseover', function(){
-                if (self._disabled){
-                    return;
-                }
-                                
-                if ( ! self._input){
-	                self._createInput();
-                }
-                
-                var div = self._input.parentNode;                            
-                copyLayout(self._button, div);
-                div.style.visibility = 'visible';
-                                
-            });
-            
-            
-            // commented because we now hide input on mouseleave
-            /**
-             * When the window is resized the elements 
-             * can be misaligned if button position depends
-             * on window size
-             */
-            //addResizeEvent(function(){
-            //    if (self._input){
-            //        copyLayout(self._button, self._input.parentNode);
-            //    }
-            //});            
-                                         
-        },
-        /**
-         * Creates iframe with unique name
-         * @return {Element} iframe
-         */
-        _createIframe: function(){
-            // We can't use getTime, because it sometimes return
-            // same value in safari :(
-            var id = getUID();            
-             
-            // We can't use following code as the name attribute
-            // won't be properly registered in IE6, and new window
-            // on form submit will open
-            // var iframe = document.createElement('iframe');
-            // iframe.setAttribute('name', id);                        
- 
-            var iframe = toElement('<iframe src="javascript:false;" name="' + id + '" />');
-            // src="javascript:false; was added
-            // because it possibly removes ie6 prompt 
-            // "This page contains both secure and nonsecure items"
-            // Anyway, it doesn't do any harm.            
-            iframe.setAttribute('id', id);
-            
-            iframe.style.display = 'none';
-            document.body.appendChild(iframe);
-            
-            return iframe;
-        },
-        /**
-         * Creates form, that will be submitted to iframe
-         * @param {Element} iframe Where to submit
-         * @return {Element} form
-         */
-        _createForm: function(iframe){
-            var settings = this._settings;
-                        
-            // We can't use the following code in IE6
-            // var form = document.createElement('form');
-            // form.setAttribute('method', 'post');
-            // form.setAttribute('enctype', 'multipart/form-data');
-            // Because in this case file won't be attached to request                    
-            var form = toElement('<form method="post" enctype="multipart/form-data"></form>');
-                        
-            form.setAttribute('action', settings.action);
-            form.setAttribute('target', iframe.name);                                   
-            form.style.display = 'none';
-            document.body.appendChild(form);
-            
-            // Create hidden input element for each data key
-            for (var prop in settings.data) {
-                if (settings.data.hasOwnProperty(prop)){
-                    var el = document.createElement("input");
-                    el.setAttribute('type', 'hidden');
-                    el.setAttribute('name', prop);
-                    el.setAttribute('value', settings.data[prop]);
-                    form.appendChild(el);
-                }
-            }
-            return form;
-        },
-        /**
-         * Gets response from iframe and fires onComplete event when ready
-         * @param iframe
-         * @param file Filename to use in onComplete callback 
-         */
-        _getResponse : function(iframe, file){            
-            // getting response
-            var toDeleteFlag = false, self = this, settings = this._settings;   
-               
-            addEvent(iframe, 'load', function(){                
-                
-                if (// For Safari 
-                    iframe.src == "javascript:'%3Chtml%3E%3C/html%3E';" ||
-                    // For FF, IE
-                    iframe.src == "javascript:'<html></html>';"){                                                                        
-                        // First time around, do not delete.
-                        // We reload to blank page, so that reloading main page
-                        // does not re-submit the post.
-                        
-                        if (toDeleteFlag) {
-                            // Fix busy state in FF3
-                            setTimeout(function(){
-                                removeNode(iframe);
-                            }, 0);
-                        }
-                                                
-                        return;
-                }
-                
-                var doc = iframe.contentDocument ? iframe.contentDocument : window.frames[iframe.id].document;
-                
-                // fixing Opera 9.26,10.00
-                if (doc.readyState && doc.readyState != 'complete') {
-                   // Opera fires load event multiple times
-                   // Even when the DOM is not ready yet
-                   // this fix should not affect other browsers
-                   return;
-                }
-                
-                // fixing Opera 9.64
-                if (doc.body && doc.body.innerHTML == "false") {
-                    // In Opera 9.64 event was fired second time
-                    // when body.innerHTML changed from false 
-                    // to server response approx. after 1 sec
-                    return;
-                }
-                
-                var response;
-                
-                if (doc.XMLDocument) {
-                    // response is a xml document Internet Explorer property
-                    response = doc.XMLDocument;
-                } else if (doc.body){
-                    // response is html document or plain text
-                    response = doc.body.innerHTML;
-                    
-                    if (settings.responseType && settings.responseType.toLowerCase() == 'json') {
-                        // If the document was sent as 'application/javascript' or
-                        // 'text/javascript', then the browser wraps the text in a <pre>
-                        // tag and performs html encoding on the contents.  In this case,
-                        // we need to pull the original text content from the text node's
-                        // nodeValue property to retrieve the unmangled content.
-                        // Note that IE6 only understands text/html
-                        if (doc.body.firstChild && doc.body.firstChild.nodeName.toUpperCase() == 'PRE') {
-                            doc.normalize();
-                            response = doc.body.firstChild.firstChild.nodeValue;
-                        }
-                        
-                        if (response) {
-                            response = eval("(" + response + ")");
-                        } else {
-                            response = {};
-                        }
-                    }
-                } else {
-                    // response is a xml document
-                    response = doc;
-                }
-                
-                settings.onComplete.call(self, file, response);
-                
-                // Reload blank page, so that reloading main page
-                // does not re-submit the post. Also, remember to
-                // delete the frame
-                toDeleteFlag = true;
-                
-                // Fix IE mixed content issue
-                iframe.src = "javascript:'<html></html>';";
-            });            
-        },        
-        /**
-         * Upload file contained in this._input
-         */
-        submit: function(){                        
-            var self = this, settings = this._settings;
-            
-            if ( ! this._input || this._input.value === ''){                
-                return;                
-            }
-                                    
-            var file = fileFromPath(this._input.value);
-            
-            // user returned false to cancel upload
-            if (false === settings.onSubmit.call(this, file, getExt(file))){
-                this._clearInput();                
-                return;
-            }
-            
-            // sending request    
-            var iframe = this._createIframe();
-            var form = this._createForm(iframe);
-            
-            // assuming following structure
-            // div -> input type='file'
-            removeNode(this._input.parentNode);            
-            removeClass(self._button, self._settings.hoverClass);
-            removeClass(self._button, self._settings.focusClass);
-                        
-            form.appendChild(this._input);
-                        
-            form.submit();
-
-            // request set, clean up                
-            removeNode(form); form = null;                          
-            removeNode(this._input); this._input = null;            
-            
-            // Get response from iframe and fire onComplete event when ready
-            this._getResponse(iframe, file);            
-
-            // get ready for next request            
-            this._createInput();
-        }
-    };
-})(); 
diff --git a/include/country.js b/include/country.js
deleted file mode 100644
index 07ab29ba6..000000000
--- a/include/country.js
+++ /dev/null
@@ -1,438 +0,0 @@
-//<!--  Docs at: http://www.microcosmotalk.com/tech/scripts/
-// NOTE:
-// This code is placed into the public domain and may be used in any manner desired.
-// 
-// Jim Carlock obtained the list of country names and state names from an HTML
-// document at Microsoft's website.
-//
-// Thursday, January 13, 2005, 7:00:52 PM
-// 
-var gLngMaxStateLength=0;
-var gLngMaxCountryLength=0;
-var gLngNumberCountries=252;
-var gLngNumberStates=0;
-var gLngSelectedCountry=0;
-var gLngSelectedState=0;
-var gArCountryInfo;
-var gArStateInfo;
-// NOTE:
-// Some editors may exhibit problems viewing 2803 characters...
-var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe";
-var aStates = new Array();
-
-aStates[0]="";
-aStates[1]="|Badakhshan|Badghis|Baghlan|Balkh|Bamian|Farah|Faryab|Ghazni|Ghowr|Helmand|Herat|Jowzjan|Kabol|Kandahar|Kapisa|Konar|Kondoz|Laghman|Lowgar|Nangarhar|Nimruz|Oruzgan|Paktia|Paktika|Parvan|Samangan|Sar-e Pol|Takhar|Vardak|Zabol";
-aStates[2]="|Berat|Bulqize|Delvine|Devoll (Bilisht)|Diber (Peshkopi)|Durres|Elbasan|Fier|Gjirokaster|Gramsh|Has (Krume)|Kavaje|Kolonje (Erseke)|Korce|Kruje|Kucove|Kukes|Kurbin|Lezhe|Librazhd|Lushnje|Malesi e Madhe (Koplik)|Mallakaster (Ballsh)|Mat (Burrel)|Mirdite (Rreshen)|Peqin|Permet|Pogradec|Puke|Sarande|Shkoder|Skrapar (Corovode)|Tepelene|Tirane (Tirana)|Tirane (Tirana)|Tropoje (Bajram Curri)|Vlore";
-aStates[3]="|Adrar|Ain Defla|Ain Temouchent|Alger|Annaba|Batna|Bechar|Bejaia|Biskra|Blida|Bordj Bou Arreridj|Bouira|Boumerdes|Chlef|Constantine|Djelfa|El Bayadh|El Oued|El Tarf|Ghardaia|Guelma|Illizi|Jijel|Khenchela|Laghouat|M'Sila|Mascara|Medea|Mila|Mostaganem|Naama|Oran|Ouargla|Oum el Bouaghi|Relizane|Saida|Setif|Sidi Bel Abbes|Skikda|Souk Ahras|Tamanghasset|Tebessa|Tiaret|Tindouf|Tipaza|Tissemsilt|Tizi Ouzou|Tlemcen";
-aStates[4]="|Eastern|Manu'a|Rose Island|Swains Island|Western";
-aStates[5]="|Andorra la Vella|Bengo|Benguela|Bie|Cabinda|Canillo|Cuando Cubango|Cuanza Norte|Cuanza Sul|Cunene|Encamp|Escaldes-Engordany|Huambo|Huila|La Massana|Luanda|Lunda Norte|Lunda Sul|Malanje|Moxico|Namibe|Ordino|Sant Julia de Loria|Uige|Zaire";
-aStates[6]="|Anguilla";
-aStates[7]="|Antartica";
-aStates[8]="|Barbuda|Redonda|Saint George|Saint John|Saint Mary|Saint Paul|Saint Peter|Saint Philip";
-aStates[9]="|Antartica e Islas del Atlantico Sur|Buenos Aires|Buenos Aires Capital Federal|Catamarca|Chaco|Chubut|Cordoba|Corrientes|Entre Rios|Formosa|Jujuy|La Pampa|La Rioja|Mendoza|Misiones|Neuquen|Rio Negro|Salta|San Juan|San Luis|Santa Cruz|Santa Fe|Santiago del Estero|Tierra del Fuego|Tucuman";
-aStates[10]="|Aragatsotn|Ararat|Armavir|Geghark'unik'|Kotayk'|Lorri|Shirak|Syunik'|Tavush|Vayots' Dzor|Yerevan";
-aStates[11]="|Aruba";
-aStates[12]="|Ashmore and Cartier Island";
-aStates[13]="|Australian Capital Territory|New South Wales|Northern Territory|Queensland|South Australia|Tasmania|Victoria|Western Australia";
-aStates[14]="|Burgenland|Kaernten|Niederoesterreich|Oberoesterreich|Salzburg|Steiermark|Tirol|Vorarlberg|Wien";
-aStates[15]="|Abseron Rayonu|Agcabadi Rayonu|Agdam Rayonu|Agdas Rayonu|Agstafa Rayonu|Agsu Rayonu|Ali Bayramli Sahari|Astara Rayonu|Baki Sahari|Balakan Rayonu|Barda Rayonu|Beylaqan Rayonu|Bilasuvar Rayonu|Cabrayil Rayonu|Calilabad Rayonu|Daskasan Rayonu|Davaci Rayonu|Fuzuli Rayonu|Gadabay Rayonu|Ganca Sahari|Goranboy Rayonu|Goycay Rayonu|Haciqabul Rayonu|Imisli Rayonu|Ismayilli Rayonu|Kalbacar Rayonu|Kurdamir Rayonu|Lacin Rayonu|Lankaran Rayonu|Lankaran Sahari|Lerik Rayonu|Masalli Rayonu|Mingacevir Sahari|Naftalan Sahari|Naxcivan Muxtar Respublikasi|Neftcala Rayonu|Oguz Rayonu|Qabala Rayonu|Qax Rayonu|Qazax Rayonu|Qobustan Rayonu|Quba Rayonu|Qubadli Rayonu|Qusar Rayonu|Saatli Rayonu|Sabirabad Rayonu|Saki Rayonu|Saki Sahari|Salyan Rayonu|Samaxi Rayonu|Samkir Rayonu|Samux Rayonu|Siyazan Rayonu|Sumqayit Sahari|Susa Rayonu|Susa Sahari|Tartar Rayonu|Tovuz Rayonu|Ucar Rayonu|Xacmaz Rayonu|Xankandi Sahari|Xanlar Rayonu|Xizi Rayonu|Xocali Rayonu|Xocavand Rayonu|Yardimli Rayonu|Yevlax Rayonu|Yevlax Sahari|Zangilan Rayonu|Zaqatala Rayonu|Zardab Rayonu";
-aStates[16]="|Acklins and Crooked Islands|Bimini|Cat Island|Exuma|Freeport|Fresh Creek|Governor's Harbour|Green Turtle Cay|Harbour Island|High Rock|Inagua|Kemps Bay|Long Island|Marsh Harbour|Mayaguana|New Providence|Nicholls Town and Berry Islands|Ragged Island|Rock Sound|San Salvador and Rum Cay|Sandy Point";
-aStates[17]="|Al Hadd|Al Manamah|Al Mintaqah al Gharbiyah|Al Mintaqah al Wusta|Al Mintaqah ash Shamaliyah|Al Muharraq|Ar Rifa' wa al Mintaqah al Janubiyah|Jidd Hafs|Juzur Hawar|Madinat 'Isa|Madinat Hamad|Sitrah";
-aStates[18]="|Barisal|Chittagong|Dhaka|Khulna|Rajshahi|Sylhet";
-aStates[19]="|Bridgetown|Christ Church|Saint Andrew|Saint George|Saint James|Saint John|Saint Joseph|Saint Lucy|Saint Michael|Saint Peter|Saint Philip|Saint Thomas";
-aStates[20]="|Brestskaya (Brest)|Homyel'skaya (Homyel')|Horad Minsk|Hrodzyenskaya (Hrodna)|Mahilyowskaya (Mahilyow)|Minskaya|Vitsyebskaya (Vitsyebsk)";
-aStates[21]="|Antwerpen|Brabant Wallon|Brussels Capitol Region|Hainaut|Liege|Limburg|Luxembourg|Namur|Oost-Vlaanderen|Vlaams Brabant|West-Vlaanderen";
-aStates[22]="|Belize|Cayo|Corozal|Orange Walk|Stann Creek|Toledo";
-aStates[23]="|Alibori|Atakora|Atlantique|Borgou|Collines|Couffo|Donga|Littoral|Mono|Oueme|Plateau|Zou";
-aStates[24]="|Devonshire|Hamilton|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick";
-aStates[25]="|Bumthang|Chhukha|Chirang|Daga|Geylegphug|Ha|Lhuntshi|Mongar|Paro|Pemagatsel|Punakha|Samchi|Samdrup Jongkhar|Shemgang|Tashigang|Thimphu|Tongsa|Wangdi Phodrang";
-aStates[26]="|Beni|Chuquisaca|Cochabamba|La Paz|Oruro|Pando|Potosi|Santa Cruz|Tarija";
-aStates[27]="|Federation of Bosnia and Herzegovina|Republika Srpska";
-aStates[28]="|Central|Chobe|Francistown|Gaborone|Ghanzi|Kgalagadi|Kgatleng|Kweneng|Lobatse|Ngamiland|North-East|Selebi-Pikwe|South-East|Southern";
-aStates[29]="|Acre|Alagoas|Amapa|Amazonas|Bahia|Ceara|Distrito Federal|Espirito Santo|Goias|Maranhao|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Para|Paraiba|Parana|Pernambuco|Piaui|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondonia|Roraima|Santa Catarina|Sao Paulo|Sergipe|Tocantins";
-aStates[30]="|Anegada|Jost Van Dyke|Tortola|Virgin Gorda";
-aStates[31]="|Belait|Brunei and Muara|Temburong|Tutong";
-aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Khaskovo|Kurdzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Ruse|Shumen|Silistra|Sliven|Smolyan|Sofiya|Sofiya-Grad|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";
-aStates[33]="|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komandjari|Kompienga|Kossi|Koupelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Naumbiel|Nayala|Oubritenga|Oudalan|Passore|Poni|Samentenga|Sanguie|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondomo|Zoundweogo";
-aStates[34]="|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon";
-aStates[35]="|Bubanza|Bujumbura|Bururi|Cankuzo|Cibitoke|Gitega|Karuzi|Kayanza|Kirundo|Makamba|Muramvya|Muyinga|Mwaro|Ngozi|Rutana|Ruyigi";
-aStates[36]="|Banteay Mean Cheay|Batdambang|Kampong Cham|Kampong Chhnang|Kampong Spoe|Kampong Thum|Kampot|Kandal|Kaoh Kong|Keb|Kracheh|Mondol Kiri|Otdar Mean Cheay|Pailin|Phnum Penh|Pouthisat|Preah Seihanu (Sihanoukville)|Preah Vihear|Prey Veng|Rotanah Kiri|Siem Reab|Stoeng Treng|Svay Rieng|Takev";
-aStates[37]="|Adamaoua|Centre|Est|Extreme-Nord|Littoral|Nord|Nord-Ouest|Ouest|Sud|Sud-Ouest";
-aStates[38]="|Alberta|British Columbia|Manitoba|New Brunswick|Newfoundland|Northwest Territories|Nova Scotia|Nunavut|Ontario|Prince Edward Island|Quebec|Saskatchewan|Yukon Territory";
-aStates[39]="|Boa Vista|Brava|Maio|Mosteiros|Paul|Porto Novo|Praia|Ribeira Grande|Sal|Santa Catarina|Santa Cruz|Sao Domingos|Sao Filipe|Sao Nicolau|Sao Vicente|Tarrafal";
-aStates[40]="|Creek|Eastern|Midland|South Town|Spot Bay|Stake Bay|West End|Western";
-aStates[41]="|Bamingui-Bangoran|Bangui|Basse-Kotto|Gribingui|Haut-Mbomou|Haute-Kotto|Haute-Sangha|Kemo-Gribingui|Lobaye|Mbomou|Nana-Mambere|Ombella-Mpoko|Ouaka|Ouham|Ouham-Pende|Sangha|Vakaga";
-aStates[42]="|Batha|Biltine|Borkou-Ennedi-Tibesti|Chari-Baguirmi|Guera|Kanem|Lac|Logone Occidental|Logone Oriental|Mayo-Kebbi|Moyen-Chari|Ouaddai|Salamat|Tandjile";
-aStates[43]="|Aisen del General Carlos Ibanez del Campo|Antofagasta|Araucania|Atacama|Bio-Bio|Coquimbo|Libertador General Bernardo O'Higgins|Los Lagos|Magallanes y de la Antartica Chilena|Maule|Region Metropolitana (Santiago)|Tarapaca|Valparaiso";
-aStates[44]="|Anhui|Beijing|Chongqing|Fujian|Gansu|Guangdong|Guangxi|Guizhou|Hainan|Hebei|Heilongjiang|Henan|Hubei|Hunan|Jiangsu|Jiangxi|Jilin|Liaoning|Nei Mongol|Ningxia|Qinghai|Shaanxi|Shandong|Shanghai|Shanxi|Sichuan|Tianjin|Xinjiang|Xizang (Tibet)|Yunnan|Zhejiang";
-aStates[45]="|Christmas Island";
-aStates[46]="|Clipperton Island";
-aStates[47]="|Direction Island|Home Island|Horsburgh Island|North Keeling Island|South Island|West Island";
-aStates[48]="|Amazonas|Antioquia|Arauca|Atlantico|Bolivar|Boyaca|Caldas|Caqueta|Casanare|Cauca|Cesar|Choco|Cordoba|Cundinamarca|Distrito Capital de Santa Fe de Bogota|Guainia|Guaviare|Huila|La Guajira|Magdalena|Meta|Narino|Norte de Santander|Putumayo|Quindio|Risaralda|San Andres y Providencia|Santander|Sucre|Tolima|Valle del Cauca|Vaupes|Vichada";
-// <!-- -->
-aStates[49]="|Anjouan (Nzwani)|Domoni|Fomboni|Grande Comore (Njazidja)|Moheli (Mwali)|Moroni|Moutsamoudou";
-aStates[50]="|Bandundu|Bas-Congo|Equateur|Kasai-Occidental|Kasai-Oriental|Katanga|Kinshasa|Maniema|Nord-Kivu|Orientale|Sud-Kivu";
-aStates[51]="|Bouenza|Brazzaville|Cuvette|Kouilou|Lekoumou|Likouala|Niari|Plateaux|Pool|Sangha";
-aStates[52]="|Aitutaki|Atiu|Avarua|Mangaia|Manihiki|Manuae|Mauke|Mitiaro|Nassau Island|Palmerston|Penrhyn|Pukapuka|Rakahanga|Rarotonga|Suwarrow|Takutea";
-aStates[53]="|Alajuela|Cartago|Guanacaste|Heredia|Limon|Puntarenas|San Jose";
-aStates[54]="|Abengourou|Abidjan|Aboisso|Adiake'|Adzope|Agboville|Agnibilekrou|Ale'pe'|Bangolo|Beoumi|Biankouma|Bocanda|Bondoukou|Bongouanou|Bouafle|Bouake|Bouna|Boundiali|Dabakala|Dabon|Daloa|Danane|Daoukro|Dimbokro|Divo|Duekoue|Ferkessedougou|Gagnoa|Grand Bassam|Grand-Lahou|Guiglo|Issia|Jacqueville|Katiola|Korhogo|Lakota|Man|Mankono|Mbahiakro|Odienne|Oume|Sakassou|San-Pedro|Sassandra|Seguela|Sinfra|Soubre|Tabou|Tanda|Tiassale|Tiebissou|Tingrela|Touba|Toulepleu|Toumodi|Vavoua|Yamoussoukro|Zuenoula";
-aStates[55]="|Bjelovarsko-Bilogorska Zupanija|Brodsko-Posavska Zupanija|Dubrovacko-Neretvanska Zupanija|Istarska Zupanija|Karlovacka Zupanija|Koprivnicko-Krizevacka Zupanija|Krapinsko-Zagorska Zupanija|Licko-Senjska Zupanija|Medimurska Zupanija|Osjecko-Baranjska Zupanija|Pozesko-Slavonska Zupanija|Primorsko-Goranska Zupanija|Sibensko-Kninska Zupanija|Sisacko-Moslavacka Zupanija|Splitsko-Dalmatinska Zupanija|Varazdinska Zupanija|Viroviticko-Podravska Zupanija|Vukovarsko-Srijemska Zupanija|Zadarska Zupanija|Zagreb|Zagrebacka Zupanija";
-aStates[56]="|Camaguey|Ciego de Avila|Cienfuegos|Ciudad de La Habana|Granma|Guantanamo|Holguin|Isla de la Juventud|La Habana|Las Tunas|Matanzas|Pinar del Rio|Sancti Spiritus|Santiago de Cuba|Villa Clara";
-aStates[57]="|Famagusta|Kyrenia|Larnaca|Limassol|Nicosia|Paphos";
-aStates[58]="|Brnensky|Budejovicky|Jihlavsky|Karlovarsky|Kralovehradecky|Liberecky|Olomoucky|Ostravsky|Pardubicky|Plzensky|Praha|Stredocesky|Ustecky|Zlinsky";
-aStates[59]="|Arhus|Bornholm|Fredericksberg|Frederiksborg|Fyn|Kobenhavn|Kobenhavns|Nordjylland|Ribe|Ringkobing|Roskilde|Sonderjylland|Storstrom|Vejle|Vestsjalland|Viborg";
-aStates[60]="|'Ali Sabih|Dikhil|Djibouti|Obock|Tadjoura";
-aStates[61]="|Saint Andrew|Saint David|Saint George|Saint John|Saint Joseph|Saint Luke|Saint Mark|Saint Patrick|Saint Paul|Saint Peter";
-aStates[62]="|Azua|Baoruco|Barahona|Dajabon|Distrito Nacional|Duarte|El Seibo|Elias Pina|Espaillat|Hato Mayor|Independencia|La Altagracia|La Romana|La Vega|Maria Trinidad Sanchez|Monsenor Nouel|Monte Cristi|Monte Plata|Pedernales|Peravia|Puerto Plata|Salcedo|Samana|San Cristobal|San Juan|San Pedro de Macoris|Sanchez Ramirez|Santiago|Santiago Rodriguez|Valverde";
-// <!-- -->
-aStates[63]="|Azuay|Bolivar|Canar|Carchi|Chimborazo|Cotopaxi|El Oro|Esmeraldas|Galapagos|Guayas|Imbabura|Loja|Los Rios|Manabi|Morona-Santiago|Napo|Orellana|Pastaza|Pichincha|Sucumbios|Tungurahua|Zamora-Chinchipe";
-aStates[64]="|Ad Daqahliyah|Al Bahr al Ahmar|Al Buhayrah|Al Fayyum|Al Gharbiyah|Al Iskandariyah|Al Isma'iliyah|Al Jizah|Al Minufiyah|Al Minya|Al Qahirah|Al Qalyubiyah|Al Wadi al Jadid|As Suways|Ash Sharqiyah|Aswan|Asyut|Bani Suwayf|Bur Sa'id|Dumyat|Janub Sina'|Kafr ash Shaykh|Matruh|Qina|Shamal Sina'|Suhaj";
-aStates[65]="|Ahuachapan|Cabanas|Chalatenango|Cuscatlan|La Libertad|La Paz|La Union|Morazan|San Miguel|San Salvador|San Vicente|Santa Ana|Sonsonate|Usulutan";
-aStates[66]="|Annobon|Bioko Norte|Bioko Sur|Centro Sur|Kie-Ntem|Litoral|Wele-Nzas";
-aStates[67]="|Akale Guzay|Barka|Denkel|Hamasen|Sahil|Semhar|Senhit|Seraye";
-aStates[68]="|Harjumaa (Tallinn)|Hiiumaa (Kardla)|Ida-Virumaa (Johvi)|Jarvamaa (Paide)|Jogevamaa (Jogeva)|Laane-Virumaa (Rakvere)|Laanemaa (Haapsalu)|Parnumaa (Parnu)|Polvamaa (Polva)|Raplamaa (Rapla)|Saaremaa (Kuessaare)|Tartumaa (Tartu)|Valgamaa (Valga)|Viljandimaa (Viljandi)|Vorumaa (Voru)"
-aStates[69]="|Adis Abeba (Addis Ababa)|Afar|Amara|Dire Dawa|Gambela Hizboch|Hareri Hizb|Oromiya|Sumale|Tigray|YeDebub Biheroch Bihereseboch na Hizboch";
-aStates[70]="|Europa Island";
-aStates[71]="|Falkland Islands (Islas Malvinas)"
-aStates[72]="|Bordoy|Eysturoy|Mykines|Sandoy|Skuvoy|Streymoy|Suduroy|Tvoroyri|Vagar";
-aStates[73]="|Central|Eastern|Northern|Rotuma|Western";
-aStates[74]="|Aland|Etela-Suomen Laani|Ita-Suomen Laani|Lansi-Suomen Laani|Lappi|Oulun Laani";
-aStates[75]="|Alsace|Aquitaine|Auvergne|Basse-Normandie|Bourgogne|Bretagne|Centre|Champagne-Ardenne|Corse|Franche-Comte|Haute-Normandie|Ile-de-France|Languedoc-Roussillon|Limousin|Lorraine|Midi-Pyrenees|Nord-Pas-de-Calais|Pays de la Loire|Picardie|Poitou-Charentes|Provence-Alpes-Cote d'Azur|Rhone-Alpes";
-aStates[76]="|French Guiana";
-aStates[77]="|Archipel des Marquises|Archipel des Tuamotu|Archipel des Tubuai|Iles du Vent|Iles Sous-le-Vent";
-aStates[78]="|Adelie Land|Ile Crozet|Iles Kerguelen|Iles Saint-Paul et Amsterdam";
-aStates[79]="|Estuaire|Haut-Ogooue|Moyen-Ogooue|Ngounie|Nyanga|Ogooue-Ivindo|Ogooue-Lolo|Ogooue-Maritime|Woleu-Ntem";
-aStates[80]="|Banjul|Central River|Lower River|North Bank|Upper River|Western";
-aStates[81]="|Gaza Strip";
-aStates[82]="|Abashis|Abkhazia or Ap'khazet'is Avtonomiuri Respublika (Sokhumi)|Adigenis|Ajaria or Acharis Avtonomiuri Respublika (Bat'umi)|Akhalgoris|Akhalk'alak'is|Akhalts'ikhis|Akhmetis|Ambrolauris|Aspindzis|Baghdat'is|Bolnisis|Borjomis|Ch'khorotsqus|Ch'okhatauris|Chiat'ura|Dedop'listsqaros|Dmanisis|Dushet'is|Gardabanis|Gori|Goris|Gurjaanis|Javis|K'arelis|K'ut'aisi|Kaspis|Kharagaulis|Khashuris|Khobis|Khonis|Lagodekhis|Lanch'khut'is|Lentekhis|Marneulis|Martvilis|Mestiis|Mts'khet'is|Ninotsmindis|Onis|Ozurget'is|P'ot'i|Qazbegis|Qvarlis|Rust'avi|Sach'kheris|Sagarejos|Samtrediis|Senakis|Sighnaghis|T'bilisi|T'elavis|T'erjolis|T'et'ritsqaros|T'ianet'is|Tqibuli|Ts'ageris|Tsalenjikhis|Tsalkis|Tsqaltubo|Vanis|Zestap'onis|Zugdidi|Zugdidis";
-aStates[83]="|Baden-Wuerttemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thueringen";
-aStates[84]="|Ashanti|Brong-Ahafo|Central|Eastern|Greater Accra|Northern|Upper East|Upper West|Volta|Western";
-aStates[85]="|Gibraltar";
-aStates[86]="|Ile du Lys|Ile Glorieuse";
-aStates[87]="|Aitolia kai Akarnania|Akhaia|Argolis|Arkadhia|Arta|Attiki|Ayion Oros (Mt. Athos)|Dhodhekanisos|Drama|Evritania|Evros|Evvoia|Florina|Fokis|Fthiotis|Grevena|Ilia|Imathia|Ioannina|Irakleion|Kardhitsa|Kastoria|Kavala|Kefallinia|Kerkyra|Khalkidhiki|Khania|Khios|Kikladhes|Kilkis|Korinthia|Kozani|Lakonia|Larisa|Lasithi|Lesvos|Levkas|Magnisia|Messinia|Pella|Pieria|Preveza|Rethimni|Rodhopi|Samos|Serrai|Thesprotia|Thessaloniki|Trikala|Voiotia|Xanthi|Zakinthos";
-aStates[88]="|Avannaa (Nordgronland)|Kitaa (Vestgronland)|Tunu (Ostgronland)"
-aStates[89]="|Carriacou and Petit Martinique|Saint Andrew|Saint David|Saint George|Saint John|Saint Mark|Saint Patrick";
-aStates[90]="|Basse-Terre|Grande-Terre|Iles de la Petite Terre|Iles des Saintes|Marie-Galante";
-aStates[91]="|Guam";
-aStates[92]="|Alta Verapaz|Baja Verapaz|Chimaltenango|Chiquimula|El Progreso|Escuintla|Guatemala|Huehuetenango|Izabal|Jalapa|Jutiapa|Peten|Quetzaltenango|Quiche|Retalhuleu|Sacatepequez|San Marcos|Santa Rosa|Solola|Suchitepequez|Totonicapan|Zacapa";
-aStates[93]="|Castel|Forest|St. Andrew|St. Martin|St. Peter Port|St. Pierre du Bois|St. Sampson|St. Saviour|Torteval|Vale";
-aStates[94]="|Beyla|Boffa|Boke|Conakry|Coyah|Dabola|Dalaba|Dinguiraye|Dubreka|Faranah|Forecariah|Fria|Gaoual|Gueckedou|Kankan|Kerouane|Kindia|Kissidougou|Koubia|Koundara|Kouroussa|Labe|Lelouma|Lola|Macenta|Mali|Mamou|Mandiana|Nzerekore|Pita|Siguiri|Telimele|Tougue|Yomou";
-aStates[95]="|Bafata|Biombo|Bissau|Bolama-Bijagos|Cacheu|Gabu|Oio|Quinara|Tombali";
-aStates[96]="|Barima-Waini|Cuyuni-Mazaruni|Demerara-Mahaica|East Berbice-Corentyne|Essequibo Islands-West Demerara|Mahaica-Berbice|Pomeroon-Supenaam|Potaro-Siparuni|Upper Demerara-Berbice|Upper Takutu-Upper Essequibo";
-aStates[97]="|Artibonite|Centre|Grand'Anse|Nord|Nord-Est|Nord-Ouest|Ouest|Sud|Sud-Est";
-aStates[98]="|Heard Island and McDonald Islands";
-aStates[99]="|Holy See (Vatican City)"
-aStates[100]="|Atlantida|Choluteca|Colon|Comayagua|Copan|Cortes|El Paraiso|Francisco Morazan|Gracias a Dios|Intibuca|Islas de la Bahia|La Paz|Lempira|Ocotepeque|Olancho|Santa Barbara|Valle|Yoro";
-aStates[101]="|Hong Kong";
-aStates[102]="|Howland Island";
-aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem|Zala|Zalaegerszeg";
-aStates[104]="|Akranes|Akureyri|Arnessysla|Austur-Bardhastrandarsysla|Austur-Hunavatnssysla|Austur-Skaftafellssysla|Borgarfjardharsysla|Dalasysla|Eyjafjardharsysla|Gullbringusysla|Hafnarfjordhur|Husavik|Isafjordhur|Keflavik|Kjosarsysla|Kopavogur|Myrasysla|Neskaupstadhur|Nordhur-Isafjardharsysla|Nordhur-Mulasys-la|Nordhur-Thingeyjarsysla|Olafsfjordhur|Rangarvallasysla|Reykjavik|Saudharkrokur|Seydhisfjordhur|Siglufjordhur|Skagafjardharsysla|Snaefellsnes-og Hnappadalssysla|Strandasysla|Sudhur-Mulasysla|Sudhur-Thingeyjarsysla|Vesttmannaeyjar|Vestur-Bardhastrandarsysla|Vestur-Hunavatnssysla|Vestur-Isafjardharsysla|Vestur-Skaftafellssysla";
-aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assam|Bihar|Chandigarh|Chhattisgarh|Dadra and Nagar Haveli|Daman and Diu|Delhi|Goa|Gujarat|Haryana|Himachal Pradesh|Jammu and Kashmir|Jharkhand|Karnataka|Kerala|Lakshadweep|Madhya Pradesh|Maharashtra|Manipur|Meghalaya|Mizoram|Nagaland|Orissa|Pondicherry|Punjab|Rajasthan|Sikkim|Tamil Nadu|Tripura|Uttar Pradesh|Uttaranchal|West Bengal";
-aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";
-aStates[107]="|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan";
-aStates[108]="|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit";
-aStates[109]="|Carlow|Cavan|Clare|Cork|Donegal|Dublin|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Waterford|Westmeath|Wexford|Wicklow";
-aStates[110]="|Antrim|Ards|Armagh|Ballymena|Ballymoney|Banbridge|Belfast|Carrickfergus|Castlereagh|Coleraine|Cookstown|Craigavon|Derry|Down|Dungannon|Fermanagh|Larne|Limavady|Lisburn|Magherafelt|Moyle|Newry and Mourne|Newtownabbey|North Down|Omagh|Strabane";
-aStates[111]="|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv";
-aStates[112]="|Abruzzi|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto";
-aStates[113]="|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland";
-aStates[114]="|Jan Mayen";
-aStates[115]="|Aichi|Akita|Aomori|Chiba|Ehime|Fukui|Fukuoka|Fukushima|Gifu|Gumma|Hiroshima|Hokkaido|Hyogo|Ibaraki|Ishikawa|Iwate|Kagawa|Kagoshima|Kanagawa|Kochi|Kumamoto|Kyoto|Mie|Miyagi|Miyazaki|Nagano|Nagasaki|Nara|Niigata|Oita|Okayama|Okinawa|Osaka|Saga|Saitama|Shiga|Shimane|Shizuoka|Tochigi|Tokushima|Tokyo|Tottori|Toyama|Wakayama|Yamagata|Yamaguchi|Yamanashi";
-aStates[116]="|Jarvis Island";
-aStates[117]="|Jersey";
-aStates[118]="|Johnston Atoll";
-aStates[119]="|'Amman|Ajlun|Al 'Aqabah|Al Balqa'|Al Karak|Al Mafraq|At Tafilah|Az Zarqa'|Irbid|Jarash|Ma'an|Madaba";
-aStates[120]="|Juan de Nova Island";
-aStates[121]="|Almaty|Aqmola|Aqtobe|Astana|Atyrau|Batys Qazaqstan|Bayqongyr|Mangghystau|Ongtustik Qazaqstan|Pavlodar|Qaraghandy|Qostanay|Qyzylorda|Shyghys Qazaqstan|Soltustik Qazaqstan|Zhambyl";
-aStates[122]="|Central|Coast|Eastern|Nairobi Area|North Eastern|Nyanza|Rift Valley|Western";
-aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba|Banaba|Beru|Butaritari|Central Gilberts|Gilbert Islands|Kanton|Kiritimati|Kuria|Line Islands|Line Islands|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts|Onotoa|Phoenix Islands|Southern Gilberts|Tabiteuea|Tabuaeran|Tamana|Tarawa|Tarawa|Teraina";
-aStates[124]="|Chagang-do (Chagang Province)|Hamgyong-bukto (North Hamgyong Province)|Hamgyong-namdo (South Hamgyong Province)|Hwanghae-bukto (North Hwanghae Province)|Hwanghae-namdo (South Hwanghae Province)|Kaesong-si (Kaesong City)|Kangwon-do (Kangwon Province)|Namp'o-si (Namp'o City)|P'yongan-bukto (North P'yongan Province)|P'yongan-namdo (South P'yongan Province)|P'yongyang-si (P'yongyang City)|Yanggang-do (Yanggang Province)"
-aStates[125]="|Ch'ungch'ong-bukto|Ch'ungch'ong-namdo|Cheju-do|Cholla-bukto|Cholla-namdo|Inch'on-gwangyoksi|Kangwon-do|Kwangju-gwangyoksi|Kyonggi-do|Kyongsang-bukto|Kyongsang-namdo|Pusan-gwangyoksi|Soul-t'ukpyolsi|Taegu-gwangyoksi|Taejon-gwangyoksi|Ulsan-gwangyoksi";
-aStates[126]="|Al 'Asimah|Al Ahmadi|Al Farwaniyah|Al Jahra'|Hawalli";
-aStates[127]="|Batken Oblasty|Bishkek Shaary|Chuy Oblasty (Bishkek)|Jalal-Abad Oblasty|Naryn Oblasty|Osh Oblasty|Talas Oblasty|Ysyk-Kol Oblasty (Karakol)"
-aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang";
-aStates[129]="|Aizkraukles Rajons|Aluksnes Rajons|Balvu Rajons|Bauskas Rajons|Cesu Rajons|Daugavpils|Daugavpils Rajons|Dobeles Rajons|Gulbenes Rajons|Jekabpils Rajons|Jelgava|Jelgavas Rajons|Jurmala|Kraslavas Rajons|Kuldigas Rajons|Leipaja|Liepajas Rajons|Limbazu Rajons|Ludzas Rajons|Madonas Rajons|Ogres Rajons|Preilu Rajons|Rezekne|Rezeknes Rajons|Riga|Rigas Rajons|Saldus Rajons|Talsu Rajons|Tukuma Rajons|Valkas Rajons|Valmieras Rajons|Ventspils|Ventspils Rajons";
-aStates[130]="|Beyrouth|Ech Chimal|Ej Jnoub|El Bekaa|Jabal Loubnane";
-aStates[131]="|Berea|Butha-Buthe|Leribe|Mafeteng|Maseru|Mohales Hoek|Mokhotlong|Qacha's Nek|Quthing|Thaba-Tseka";
-aStates[132]="|Bomi|Bong|Grand Bassa|Grand Cape Mount|Grand Gedeh|Grand Kru|Lofa|Margibi|Maryland|Montserrado|Nimba|River Cess|Sinoe";
-aStates[133]="|Ajdabiya|Al 'Aziziyah|Al Fatih|Al Jabal al Akhdar|Al Jufrah|Al Khums|Al Kufrah|An Nuqat al Khams|Ash Shati'|Awbari|Az Zawiyah|Banghazi|Darnah|Ghadamis|Gharyan|Misratah|Murzuq|Sabha|Sawfajjin|Surt|Tarabulus|Tarhunah|Tubruq|Yafran|Zlitan";
-aStates[134]="|Balzers|Eschen|Gamprin|Mauren|Planken|Ruggell|Schaan|Schellenberg|Triesen|Triesenberg|Vaduz";
-aStates[135]="|Akmenes Rajonas|Alytaus Rajonas|Alytus|Anyksciu Rajonas|Birstonas|Birzu Rajonas|Druskininkai|Ignalinos Rajonas|Jonavos Rajonas|Joniskio Rajonas|Jurbarko Rajonas|Kaisiadoriu Rajonas|Kaunas|Kauno Rajonas|Kedainiu Rajonas|Kelmes Rajonas|Klaipeda|Klaipedos Rajonas|Kretingos Rajonas|Kupiskio Rajonas|Lazdiju Rajonas|Marijampole|Marijampoles Rajonas|Mazeikiu Rajonas|Moletu Rajonas|Neringa Pakruojo Rajonas|Palanga|Panevezio Rajonas|Panevezys|Pasvalio Rajonas|Plunges Rajonas|Prienu Rajonas|Radviliskio Rajonas|Raseiniu Rajonas|Rokiskio Rajonas|Sakiu Rajonas|Salcininku Rajonas|Siauliai|Siauliu Rajonas|Silales Rajonas|Silutes Rajonas|Sirvintu Rajonas|Skuodo Rajonas|Svencioniu Rajonas|Taurages Rajonas|Telsiu Rajonas|Traku Rajonas|Ukmerges Rajonas|Utenos Rajonas|Varenos Rajonas|Vilkaviskio Rajonas|Vilniaus Rajonas|Vilnius|Zarasu Rajonas";
-aStates[136]="|Diekirch|Grevenmacher|Luxembourg";
-aStates[137]="|Macau";
-aStates[138]="|Aracinovo|Bac|Belcista|Berovo|Bistrica|Bitola|Blatec|Bogdanci|Bogomila|Bogovinje|Bosilovo|Brvenica|Cair (Skopje)|Capari|Caska|Cegrane|Centar (Skopje)|Centar Zupa|Cesinovo|Cucer-Sandevo|Debar|Delcevo|Delogozdi|Demir Hisar|Demir Kapija|Dobrusevo|Dolna Banjica|Dolneni|Dorce Petrov (Skopje)|Drugovo|Dzepciste|Gazi Baba (Skopje)|Gevgelija|Gostivar|Gradsko|Ilinden|Izvor|Jegunovce|Kamenjane|Karbinci|Karpos (Skopje)|Kavadarci|Kicevo|Kisela Voda (Skopje)|Klecevce|Kocani|Konce|Kondovo|Konopiste|Kosel|Kratovo|Kriva Palanka|Krivogastani|Krusevo|Kuklis|Kukurecani|Kumanovo|Labunista|Lipkovo|Lozovo|Lukovo|Makedonska Kamenica|Makedonski Brod|Mavrovi Anovi|Meseista|Miravci|Mogila|Murtino|Negotino|Negotino-Poloska|Novaci|Novo Selo|Oblesevo|Ohrid|Orasac|Orizari|Oslomej|Pehcevo|Petrovec|Plasnia|Podares|Prilep|Probistip|Radovis|Rankovce|Resen|Rosoman|Rostusa|Samokov|Saraj|Sipkovica|Sopiste|Sopotnika|Srbinovo|Star Dojran|Staravina|Staro Nagoricane|Stip|Struga|Strumica|Studenicani|Suto Orizari (Skopje)|Sveti Nikole|Tearce|Tetovo|Topolcani|Valandovo|Vasilevo|Veles|Velesta|Vevcani|Vinica|Vitoliste|Vranestica|Vrapciste|Vratnica|Vrutok|Zajas|Zelenikovo|Zileno|Zitose|Zletovo|Zrnovci";
-aStates[139]="|Antananarivo|Antsiranana|Fianarantsoa|Mahajanga|Toamasina|Toliara";
-aStates[140]="|Balaka|Blantyre|Chikwawa|Chiradzulu|Chitipa|Dedza|Dowa|Karonga|Kasungu|Likoma|Lilongwe|Machinga (Kasupe)|Mangochi|Mchinji|Mulanje|Mwanza|Mzimba|Nkhata Bay|Nkhotakota|Nsanje|Ntcheu|Ntchisi|Phalombe|Rumphi|Salima|Thyolo|Zomba";
-aStates[141]="|Johor|Kedah|Kelantan|Labuan|Melaka|Negeri Sembilan|Pahang|Perak|Perlis|Pulau Pinang|Sabah|Sarawak|Selangor|Terengganu|Wilayah Persekutuan";
-aStates[142]="|Alifu|Baa|Dhaalu|Faafu|Gaafu Alifu|Gaafu Dhaalu|Gnaviyani|Haa Alifu|Haa Dhaalu|Kaafu|Laamu|Lhaviyani|Maale|Meemu|Noonu|Raa|Seenu|Shaviyani|Thaa|Vaavu";
-aStates[143]="|Gao|Kayes|Kidal|Koulikoro|Mopti|Segou|Sikasso|Tombouctou";
-aStates[144]="|Valletta";
-aStates[145]="|Man, Isle of";
-aStates[146]="|Ailinginae|Ailinglaplap|Ailuk|Arno|Aur|Bikar|Bikini|Bokak|Ebon|Enewetak|Erikub|Jabat|Jaluit|Jemo|Kili|Kwajalein|Lae|Lib|Likiep|Majuro|Maloelap|Mejit|Mili|Namorik|Namu|Rongelap|Rongrik|Toke|Ujae|Ujelang|Utirik|Wotho|Wotje";
-aStates[147]="|Martinique";
-aStates[148]="|Adrar|Assaba|Brakna|Dakhlet Nouadhibou|Gorgol|Guidimaka|Hodh Ech Chargui|Hodh El Gharbi|Inchiri|Nouakchott|Tagant|Tiris Zemmour|Trarza";
-aStates[149]="|Agalega Islands|Black River|Cargados Carajos Shoals|Flacq|Grand Port|Moka|Pamplemousses|Plaines Wilhems|Port Louis|Riviere du Rempart|Rodrigues|Savanne";
-aStates[150]="|Mayotte";
-aStates[151]="|Aguascalientes|Baja California|Baja California Sur|Campeche|Chiapas|Chihuahua|Coahuila de Zaragoza|Colima|Distrito Federal|Durango|Guanajuato|Guerrero|Hidalgo|Jalisco|Mexico|Michoacan de Ocampo|Morelos|Nayarit|Nuevo Leon|Oaxaca|Puebla|Queretaro de Arteaga|Quintana Roo|San Luis Potosi|Sinaloa|Sonora|Tabasco|Tamaulipas|Tlaxcala|Veracruz-Llave|Yucatan|Zacatecas";
-aStates[152]="|Chuuk (Truk)|Kosrae|Pohnpei|Yap";
-aStates[153]="|Midway Islands";
-aStates[154]="|Balti|Cahul|Chisinau|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni";
-aStates[155]="|Fontvieille|La Condamine|Monaco-Ville|Monte-Carlo";
-aStates[156]="|Arhangay|Bayan-Olgiy|Bayanhongor|Bulgan|Darhan|Dornod|Dornogovi|Dundgovi|Dzavhan|Erdenet|Govi-Altay|Hentiy|Hovd|Hovsgol|Omnogovi|Ovorhangay|Selenge|Suhbaatar|Tov|Ulaanbaatar|Uvs";
-aStates[157]="|Saint Anthony|Saint Georges|Saint Peter's";
-aStates[158]="|Agadir|Al Hoceima|Azilal|Ben Slimane|Beni Mellal|Boulemane|Casablanca|Chaouen|El Jadida|El Kelaa des Srarhna|Er Rachidia|Essaouira|Fes|Figuig|Guelmim|Ifrane|Kenitra|Khemisset|Khenifra|Khouribga|Laayoune|Larache|Marrakech|Meknes|Nador|Ouarzazate|Oujda|Rabat-Sale|Safi|Settat|Sidi Kacem|Tan-Tan|Tanger|Taounate|Taroudannt|Tata|Taza|Tetouan|Tiznit";
-aStates[159]="|Cabo Delgado|Gaza|Inhambane|Manica|Maputo|Nampula|Niassa|Sofala|Tete|Zambezia";
-aStates[160]="|Caprivi|Erongo|Hardap|Karas|Khomas|Kunene|Ohangwena|Okavango|Omaheke|Omusati|Oshana|Oshikoto|Otjozondjupa";
-aStates[161]="|Aiwo|Anabar|Anetan|Anibare|Baiti|Boe|Buada|Denigomodu|Ewa|Ijuw|Meneng|Nibok|Uaboe|Yaren";
-aStates[162]="|Bagmati|Bheri|Dhawalagiri|Gandaki|Janakpur|Karnali|Kosi|Lumbini|Mahakali|Mechi|Narayani|Rapti|Sagarmatha|Seti";
-aStates[163]="|Drenthe|Flevoland|Friesland|Gelderland|Groningen|Limburg|Noord-Brabant|Noord-Holland|Overijssel|Utrecht|Zeeland|Zuid-Holland";
-aStates[164]="|Netherlands Antilles";
-aStates[165]="|Iles Loyaute|Nord|Sud";
-aStates[166]="|Akaroa|Amuri|Ashburton|Bay of Islands|Bruce|Buller|Chatham Islands|Cheviot|Clifton|Clutha|Cook|Dannevirke|Egmont|Eketahuna|Ellesmere|Eltham|Eyre|Featherston|Franklin|Golden Bay|Great Barrier Island|Grey|Hauraki Plains|Hawera|Hawke's Bay|Heathcote|Hikurangi|Hobson|Hokianga|Horowhenua|Hurunui|Hutt|Inangahua|Inglewood|Kaikoura|Kairanga|Kiwitea|Lake|Mackenzie|Malvern|Manaia|Manawatu|Mangonui|Maniototo|Marlborough|Masterton|Matamata|Mount Herbert|Ohinemuri|Opotiki|Oroua|Otamatea|Otorohanga|Oxford|Pahiatua|Paparua|Patea|Piako|Pohangina|Raglan|Rangiora|Rangitikei|Rodney|Rotorua|Runanga|Saint Kilda|Silverpeaks|Southland|Stewart Island|Stratford|Strathallan|Taranaki|Taumarunui|Taupo|Tauranga|Thames-Coromandel|Tuapeka|Vincent|Waiapu|Waiheke|Waihemo|Waikato|Waikohu|Waimairi|Waimarino|Waimate|Waimate West|Waimea|Waipa|Waipawa|Waipukurau|Wairarapa South|Wairewa|Wairoa|Waitaki|Waitomo|Waitotara|Wallace|Wanganui|Waverley|Westland|Whakatane|Whangarei|Whangaroa|Woodville";
-aStates[167]="|Atlantico Norte|Atlantico Sur|Boaco|Carazo|Chinandega|Chontales|Esteli|Granada|Jinotega|Leon|Madriz|Managua|Masaya|Matagalpa|Nueva Segovia|Rio San Juan|Rivas";
-aStates[168]="|Agadez|Diffa|Dosso|Maradi|Niamey|Tahoua|Tillaberi|Zinder";
-aStates[169]="|Abia|Abuja Federal Capital Territory|Adamawa|Akwa Ibom|Anambra|Bauchi|Bayelsa|Benue|Borno|Cross River|Delta|Ebonyi|Edo|Ekiti|Enugu|Gombe|Imo|Jigawa|Kaduna|Kano|Katsina|Kebbi|Kogi|Kwara|Lagos|Nassarawa|Niger|Ogun|Ondo|Osun|Oyo|Plateau|Rivers|Sokoto|Taraba|Yobe|Zamfara";
-aStates[170]="|Niue";
-aStates[171]="|Norfolk Island";
-aStates[172]="|Northern Islands|Rota|Saipan|Tinian";
-aStates[173]="|Akershus|Aust-Agder|Buskerud|Finnmark|Hedmark|Hordaland|More og Romsdal|Nord-Trondelag|Nordland|Oppland|Oslo|Ostfold|Rogaland|Sogn og Fjordane|Sor-Trondelag|Telemark|Troms|Vest-Agder|Vestfold";
-aStates[174]="|Ad Dakhiliyah|Al Batinah|Al Wusta|Ash Sharqiyah|Az Zahirah|Masqat|Musandam|Zufar";
-aStates[175]="|Balochistan|Federally Administered Tribal Areas|Islamabad Capital Territory|North-West Frontier Province|Punjab|Sindh";
-aStates[176]="|Aimeliik|Airai|Angaur|Hatobohei|Kayangel|Koror|Melekeok|Ngaraard|Ngarchelong|Ngardmau|Ngatpang|Ngchesar|Ngeremlengui|Ngiwal|Palau Island|Peleliu|Sonsoral|Tobi";
-aStates[177]="|Bocas del Toro|Chiriqui|Cocle|Colon|Darien|Herrera|Los Santos|Panama|San Blas|Veraguas";
-aStates[178]="|Bougainville|Central|Chimbu|East New Britain|East Sepik|Eastern Highlands|Enga|Gulf|Madang|Manus|Milne Bay|Morobe|National Capital|New Ireland|Northern|Sandaun|Southern Highlands|West New Britain|Western|Western Highlands";
-aStates[179]="|Alto Paraguay|Alto Parana|Amambay|Asuncion (city)|Boqueron|Caaguazu|Caazapa|Canindeyu|Central|Concepcion|Cordillera|Guaira|Itapua|Misiones|Neembucu|Paraguari|Presidente Hayes|San Pedro";
-aStates[180]="|Amazonas|Ancash|Apurimac|Arequipa|Ayacucho|Cajamarca|Callao|Cusco|Huancavelica|Huanuco|Ica|Junin|La Libertad|Lambayeque|Lima|Loreto|Madre de Dios|Moquegua|Pasco|Piura|Puno|San Martin|Tacna|Tumbes|Ucayali";
-aStates[181]="|Abra|Agusan del Norte|Agusan del Sur|Aklan|Albay|Angeles|Antique|Aurora|Bacolod|Bago|Baguio|Bais|Basilan|Basilan City|Bataan|Batanes|Batangas|Batangas City|Benguet|Bohol|Bukidnon|Bulacan|Butuan|Cabanatuan|Cadiz|Cagayan|Cagayan de Oro|Calbayog|Caloocan|Camarines Norte|Camarines Sur|Camiguin|Canlaon|Capiz|Catanduanes|Cavite|Cavite City|Cebu|Cebu City|Cotabato|Dagupan|Danao|Dapitan|Davao City Davao|Davao del Sur|Davao Oriental|Dipolog|Dumaguete|Eastern Samar|General Santos|Gingoog|Ifugao|Iligan|Ilocos Norte|Ilocos Sur|Iloilo|Iloilo City|Iriga|Isabela|Kalinga-Apayao|La Carlota|La Union|Laguna|Lanao del Norte|Lanao del Sur|Laoag|Lapu-Lapu|Legaspi|Leyte|Lipa|Lucena|Maguindanao|Mandaue|Manila|Marawi|Marinduque|Masbate|Mindoro Occidental|Mindoro Oriental|Misamis Occidental|Misamis Oriental|Mountain|Naga|Negros Occidental|Negros Oriental|North Cotabato|Northern Samar|Nueva Ecija|Nueva Vizcaya|Olongapo|Ormoc|Oroquieta|Ozamis|Pagadian|Palawan|Palayan|Pampanga|Pangasinan|Pasay|Puerto Princesa|Quezon|Quezon City|Quirino|Rizal|Romblon|Roxas|Samar|San Carlos (in Negros Occidental)|San Carlos (in Pangasinan)|San Jose|San Pablo|Silay|Siquijor|Sorsogon|South Cotabato|Southern Leyte|Sultan Kudarat|Sulu|Surigao|Surigao del Norte|Surigao del Sur|Tacloban|Tagaytay|Tagbilaran|Tangub|Tarlac|Tawitawi|Toledo|Trece Martires|Zambales|Zamboanga|Zamboanga del Norte|Zamboanga del Sur";
-aStates[182]="|Pitcaim Islands";
-aStates[183]="|Dolnoslaskie|Kujawsko-Pomorskie|Lodzkie|Lubelskie|Lubuskie|Malopolskie|Mazowieckie|Opolskie|Podkarpackie|Podlaskie|Pomorskie|Slaskie|Swietokrzyskie|Warminsko-Mazurskie|Wielkopolskie|Zachodniopomorskie";
-aStates[184]="|Acores (Azores)|Aveiro|Beja|Braga|Braganca|Castelo Branco|Coimbra|Evora|Faro|Guarda|Leiria|Lisboa|Madeira|Portalegre|Porto|Santarem|Setubal|Viana do Castelo|Vila Real|Viseu";
-aStates[185]="|Adjuntas|Aguada|Aguadilla|Aguas Buenas|Aibonito|Anasco|Arecibo|Arroyo|Barceloneta|Barranquitas|Bayamon|Cabo Rojo|Caguas|Camuy|Canovanas|Carolina|Catano|Cayey|Ceiba|Ciales|Cidra|Coamo|Comerio|Corozal|Culebra|Dorado|Fajardo|Florida|Guanica|Guayama|Guayanilla|Guaynabo|Gurabo|Hatillo|Hormigueros|Humacao|Isabela|Jayuya|Juana Diaz|Juncos|Lajas|Lares|Las Marias|Las Piedras|Loiza|Luquillo|Manati|Maricao|Maunabo|Mayaguez|Moca|Morovis|Naguabo|Naranjito|Orocovis|Patillas|Penuelas|Ponce|Quebradillas|Rincon|Rio Grande|Sabana Grande|Salinas|San German|San Juan|San Lorenzo|San Sebastian|Santa Isabel|Toa Alta|Toa Baja|Trujillo Alto|Utuado|Vega Alta|Vega Baja|Vieques|Villalba|Yabucoa|Yauco";
-aStates[186]="|Ad Dawhah|Al Ghuwayriyah|Al Jumayliyah|Al Khawr|Al Wakrah|Ar Rayyan|Jarayan al Batinah|Madinat ash Shamal|Umm Salal";
-aStates[187]="|Reunion";
-aStates[188]="|Alba|Arad|Arges|Bacau|Bihor|Bistrita-Nasaud|Botosani|Braila|Brasov|Bucuresti|Buzau|Calarasi|Caras-Severin|Cluj|Constanta|Covasna|Dimbovita|Dolj|Galati|Giurgiu|Gorj|Harghita|Hunedoara|Ialomita|Iasi|Maramures|Mehedinti|Mures|Neamt|Olt|Prahova|Salaj|Satu Mare|Sibiu|Suceava|Teleorman|Timis|Tulcea|Vaslui|Vilcea|Vrancea";
-aStates[189]="|Adygeya (Maykop)|Aginskiy Buryatskiy (Aginskoye)|Altay (Gorno-Altaysk)|Altayskiy (Barnaul)|Amurskaya (Blagoveshchensk)|Arkhangel'skaya|Astrakhanskaya|Bashkortostan (Ufa)|Belgorodskaya|Bryanskaya|Buryatiya (Ulan-Ude)|Chechnya (Groznyy)|Chelyabinskaya|Chitinskaya|Chukotskiy (Anadyr')|Chuvashiya (Cheboksary)|Dagestan (Makhachkala)|Evenkiyskiy (Tura)|Ingushetiya (Nazran')|Irkutskaya|Ivanovskaya|Kabardino-Balkariya (Nal'chik)|Kaliningradskaya|Kalmykiya (Elista)|Kaluzhskaya|Kamchatskaya (Petropavlovsk-Kamchatskiy)|Karachayevo-Cherkesiya (Cherkessk)|Kareliya (Petrozavodsk)|Kemerovskaya|Khabarovskiy|Khakasiya (Abakan)|Khanty-Mansiyskiy (Khanty-Mansiysk)|Kirovskaya|Komi (Syktyvkar)|Komi-Permyatskiy (Kudymkar)|Koryakskiy (Palana)|Kostromskaya|Krasnodarskiy|Krasnoyarskiy|Kurganskaya|Kurskaya|Leningradskaya|Lipetskaya|Magadanskaya|Mariy-El (Yoshkar-Ola)|Mordoviya (Saransk)|Moskovskaya|Moskva (Moscow)|Murmanskaya|Nenetskiy (Nar'yan-Mar)|Nizhegorodskaya|Novgorodskaya|Novosibirskaya|Omskaya|Orenburgskaya|Orlovskaya (Orel)|Penzenskaya|Permskaya|Primorskiy (Vladivostok)|Pskovskaya|Rostovskaya|Ryazanskaya|Sakha (Yakutsk)|Sakhalinskaya (Yuzhno-Sakhalinsk)|Samarskaya|Sankt-Peterburg (Saint Petersburg)|Saratovskaya|Severnaya Osetiya-Alaniya [North Ossetia] (Vladikavkaz)|Smolenskaya|Stavropol'skiy|Sverdlovskaya (Yekaterinburg)|Tambovskaya|Tatarstan (Kazan')|Taymyrskiy (Dudinka)|Tomskaya|Tul'skaya|Tverskaya|Tyumenskaya|Tyva (Kyzyl)|Udmurtiya (Izhevsk)|Ul'yanovskaya|Ust'-Ordynskiy Buryatskiy (Ust'-Ordynskiy)|Vladimirskaya|Volgogradskaya|Vologodskaya|Voronezhskaya|Yamalo-Nenetskiy (Salekhard)|Yaroslavskaya|Yevreyskaya";
-aStates[190]="|Butare|Byumba|Cyangugu|Gikongoro|Gisenyi|Gitarama|Kibungo|Kibuye|Kigali Rurale|Kigali-ville|Ruhengeri|Umutara";
-aStates[191]="|Ascension|Saint Helena|Tristan da Cunha";
-aStates[192]="|Christ Church Nichola Town|Saint Anne Sandy Point|Saint George Basseterre|Saint George Gingerland|Saint James Windward|Saint John Capisterre|Saint John Figtree|Saint Mary Cayon|Saint Paul Capisterre|Saint Paul Charlestown|Saint Peter Basseterre|Saint Thomas Lowland|Saint Thomas Middle Island|Trinity Palmetto Point";
-aStates[193]="|Anse-la-Raye|Castries|Choiseul|Dauphin|Dennery|Gros Islet|Laborie|Micoud|Praslin|Soufriere|Vieux Fort";
-aStates[194]="|Miquelon|Saint Pierre";
-aStates[195]="|Charlotte|Grenadines|Saint Andrew|Saint David|Saint George|Saint Patrick";
-aStates[196]="|A'ana|Aiga-i-le-Tai|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|Palauli|Satupa'itea|Tuamasaga|Va'a-o-Fonoti|Vaisigano";
-aStates[197]="|Acquaviva|Borgo Maggiore|Chiesanuova|Domagnano|Faetano|Fiorentino|Monte Giardino|San Marino|Serravalle";
-aStates[198]="|Principe|Sao Tome";
-aStates[199]="|'Asir|Al Bahah|Al Hudud ash Shamaliyah|Al Jawf|Al Madinah|Al Qasim|Ar Riyad|Ash Sharqiyah (Eastern Province)|Ha'il|Jizan|Makkah|Najran|Tabuk";
-aStates[200]="|Aberdeen City|Aberdeenshire|Angus|Argyll and Bute|City of Edinburgh|Clackmannanshire|Dumfries and Galloway|Dundee City|East Ayrshire|East Dunbartonshire|East Lothian|East Renfrewshire|Eilean Siar (Western Isles)|Falkirk|Fife|Glasgow City|Highland|Inverclyde|Midlothian|Moray|North Ayrshire|North Lanarkshire|Orkney Islands|Perth and Kinross|Renfrewshire|Shetland Islands|South Ayrshire|South Lanarkshire|Stirling|The Scottish Borders|West Dunbartonshire|West Lothian";
-aStates[201]="|Dakar|Diourbel|Fatick|Kaolack|Kolda|Louga|Saint-Louis|Tambacounda|Thies|Ziguinchor";
-aStates[202]="|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Louis|Anse Royale|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|Glacis|Grand' Anse (on Mahe)|Grand' Anse (on Praslin)|La Digue|La Riviere Anglaise|Mont Buxton|Mont Fleuri|Plaisance|Pointe La Rue|Port Glaud|Saint Louis|Takamaka";
-aStates[203]="|Eastern|Northern|Southern|Western";
-aStates[204]="|Singapore";
-aStates[205]="|Banskobystricky|Bratislavsky|Kosicky|Nitriansky|Presovsky|Trenciansky|Trnavsky|Zilinsky";
-aStates[206]="|Ajdovscina|Beltinci|Bled|Bohinj|Borovnica|Bovec|Brda|Brezice|Brezovica|Cankova-Tisina|Celje|Cerklje na Gorenjskem|Cerknica|Cerkno|Crensovci|Crna na Koroskem|Crnomelj|Destrnik-Trnovska Vas|Divaca|Dobrepolje|Dobrova-Horjul-Polhov Gradec|Dol pri Ljubljani|Domzale|Dornava|Dravograd|Duplek|Gorenja Vas-Poljane|Gorisnica|Gornja Radgona|Gornji Grad|Gornji Petrovci|Grosuplje|Hodos Salovci|Hrastnik|Hrpelje-Kozina|Idrija|Ig|Ilirska Bistrica|Ivancna Gorica|Izola|Jesenice|Jursinci|Kamnik|Kanal|Kidricevo|Kobarid|Kobilje|Kocevje|Komen|Koper|Kozje|Kranj|Kranjska Gora|Krsko|Kungota|Kuzma|Lasko|Lenart|Lendava|Litija|Ljubljana|Ljubno|Ljutomer|Logatec|Loska Dolina|Loski Potok|Luce|Lukovica|Majsperk|Maribor|Medvode|Menges|Metlika|Mezica|Miren-Kostanjevica|Mislinja|Moravce|Moravske Toplice|Mozirje|Murska Sobota|Muta|Naklo|Nazarje|Nova Gorica|Novo Mesto|Odranci|Ormoz|Osilnica|Pesnica|Piran|Pivka|Podcetrtek|Podvelka-Ribnica|Postojna|Preddvor|Ptuj|Puconci|Race-Fram|Radece|Radenci|Radlje ob Dravi|Radovljica|Ravne-Prevalje|Ribnica|Rogasevci|Rogaska Slatina|Rogatec|Ruse|Semic|Sencur|Sentilj|Sentjernej|Sentjur pri Celju|Sevnica|Sezana|Skocjan|Skofja Loka|Skofljica|Slovenj Gradec|Slovenska Bistrica|Slovenske Konjice|Smarje pri Jelsah|Smartno ob Paki|Sostanj|Starse|Store|Sveti Jurij|Tolmin|Trbovlje|Trebnje|Trzic|Turnisce|Velenje|Velike Lasce|Videm|Vipava|Vitanje|Vodice|Vojnik|Vrhnika|Vuzenica|Zagorje ob Savi|Zalec|Zavrc|Zelezniki|Ziri|Zrece";
-aStates[207]="|Bellona|Central|Choiseul (Lauru)|Guadalcanal|Honiara|Isabel|Makira|Malaita|Rennell|Temotu|Western";
-aStates[208]="|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed";
-aStates[209]="|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Mpumalanga|North-West|Northern Cape|Northern Province|Western Cape";
-aStates[210]="|Bird Island|Bristol Island|Clerke Rocks|Montagu Island|Saunders Island|South Georgia|Southern Thule|Traversay Islands";
-aStates[211]="|Andalucia|Aragon|Asturias|Baleares (Balearic Islands)|Canarias (Canary Islands)|Cantabria|Castilla y Leon|Castilla-La Mancha|Cataluna|Ceuta|Communidad Valencian|Extremadura|Galicia|Islas Chafarinas|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco (Basque Country)|Penon de Alhucemas|Penon de Velez de la Gomera";
-aStates[212]="|Spratly Islands";
-aStates[213]="|Central|Eastern|North Central|North Eastern|North Western|Northern|Sabaragamuwa|Southern|Uva|Western";
-aStates[214]="|A'ali an Nil|Al Bahr al Ahmar|Al Buhayrat|Al Jazirah|Al Khartum|Al Qadarif|Al Wahdah|An Nil al Abyad|An Nil al Azraq|Ash Shamaliyah|Bahr al Jabal|Gharb al Istiwa'iyah|Gharb Bahr al Ghazal|Gharb Darfur|Gharb Kurdufan|Janub Darfur|Janub Kurdufan|Junqali|Kassala|Nahr an Nil|Shamal Bahr al Ghazal|Shamal Darfur|Shamal Kurdufan|Sharq al Istiwa'iyah|Sinnar|Warab";
-aStates[215]="|Brokopondo|Commewijne|Coronie|Marowijne|Nickerie|Para|Paramaribo|Saramacca|Sipaliwini|Wanica";
-aStates[216]="|Barentsoya|Bjornoya|Edgeoya|Hopen|Kvitoya|Nordaustandet|Prins Karls Forland|Spitsbergen";
-aStates[217]="|Hhohho|Lubombo|Manzini|Shiselweni";
-aStates[218]="|Blekinge|Dalarnas|Gavleborgs|Gotlands|Hallands|Jamtlands|Jonkopings|Kalmar|Kronobergs|Norrbottens|Orebro|Ostergotlands|Skane|Sodermanlands|Stockholms|Uppsala|Varmlands|Vasterbottens|Vasternorrlands|Vastmanlands|Vastra Gotalands";
-aStates[219]="|Aargau|Ausser-Rhoden|Basel-Landschaft|Basel-Stadt|Bern|Fribourg|Geneve|Glarus|Graubunden|Inner-Rhoden|Jura|Luzern|Neuchatel|Nidwalden|Obwalden|Sankt Gallen|Schaffhausen|Schwyz|Solothurn|Thurgau|Ticino|Uri|Valais|Vaud|Zug|Zurich";
-aStates[220]="|Al Hasakah|Al Ladhiqiyah|Al Qunaytirah|Ar Raqqah|As Suwayda'|Dar'a|Dayr az Zawr|Dimashq|Halab|Hamah|Hims|Idlib|Rif Dimashq|Tartus";
-aStates[221]="|Chang-hua|Chi-lung|Chia-i|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu|Hsin-chu|Hua-lien|I-lan|Kao-hsiung|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung|T'ai-chung|T'ai-nan|T'ai-nan|T'ai-pei|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin";
-aStates[222]="|Viloyati Khatlon|Viloyati Leninobod|Viloyati Mukhtori Kuhistoni Badakhshon";
-aStates[223]="|Arusha|Dar es Salaam|Dodoma|Iringa|Kagera|Kigoma|Kilimanjaro|Lindi|Mara|Mbeya|Morogoro|Mtwara|Mwanza|Pemba North|Pemba South|Pwani|Rukwa|Ruvuma|Shinyanga|Singida|Tabora|Tanga|Zanzibar Central/South|Zanzibar North|Zanzibar Urban/West";
-aStates[224]="|Amnat Charoen|Ang Thong|Buriram|Chachoengsao|Chai Nat|Chaiyaphum|Chanthaburi|Chiang Mai|Chiang Rai|Chon Buri|Chumphon|Kalasin|Kamphaeng Phet|Kanchanaburi|Khon Kaen|Krabi|Krung Thep Mahanakhon (Bangkok)|Lampang|Lamphun|Loei|Lop Buri|Mae Hong Son|Maha Sarakham|Mukdahan|Nakhon Nayok|Nakhon Pathom|Nakhon Phanom|Nakhon Ratchasima|Nakhon Sawan|Nakhon Si Thammarat|Nan|Narathiwat|Nong Bua Lamphu|Nong Khai|Nonthaburi|Pathum Thani|Pattani|Phangnga|Phatthalung|Phayao|Phetchabun|Phetchaburi|Phichit|Phitsanulok|Phra Nakhon Si Ayutthaya|Phrae|Phuket|Prachin Buri|Prachuap Khiri Khan|Ranong|Ratchaburi|Rayong|Roi Et|Sa Kaeo|Sakon Nakhon|Samut Prakan|Samut Sakhon|Samut Songkhram|Sara Buri|Satun|Sing Buri|Sisaket|Songkhla|Sukhothai|Suphan Buri|Surat Thani|Surin|Tak|Trang|Trat|Ubon Ratchathani|Udon Thani|Uthai Thani|Uttaradit|Yala|Yasothon";
-aStates[225]="|Tobago";
-aStates[226]="|De La Kara|Des Plateaux|Des Savanes|Du Centre|Maritime";
-aStates[227]="|Atafu|Fakaofo|Nukunonu";
-aStates[228]="|Ha'apai|Tongatapu|Vava'u";
-aStates[229]="|Arima|Caroni|Mayaro|Nariva|Port-of-Spain|Saint Andrew|Saint David|Saint George|Saint Patrick|San Fernando|Victoria";
-aStates[230]="|Ariana|Beja|Ben Arous|Bizerte|El Kef|Gabes|Gafsa|Jendouba|Kairouan|Kasserine|Kebili|Mahdia|Medenine|Monastir|Nabeul|Sfax|Sidi Bou Zid|Siliana|Sousse|Tataouine|Tozeur|Tunis|Zaghouan";
-aStates[231]="|Adana|Adiyaman|Afyon|Agri|Aksaray|Amasya|Ankara|Antalya|Ardahan|Artvin|Aydin|Balikesir|Bartin|Batman|Bayburt|Bilecik|Bingol|Bitlis|Bolu|Burdur|Bursa|Canakkale|Cankiri|Corum|Denizli|Diyarbakir|Duzce|Edirne|Elazig|Erzincan|Erzurum|Eskisehir|Gaziantep|Giresun|Gumushane|Hakkari|Hatay|Icel|Igdir|Isparta|Istanbul|Izmir|Kahramanmaras|Karabuk|Karaman|Kars|Kastamonu|Kayseri|Kilis|Kirikkale|Kirklareli|Kirsehir|Kocaeli|Konya|Kutahya|Malatya|Manisa|Mardin|Mugla|Mus|Nevsehir|Nigde|Ordu|Osmaniye|Rize|Sakarya|Samsun|Sanliurfa|Siirt|Sinop|Sirnak|Sivas|Tekirdag|Tokat|Trabzon|Tunceli|Usak|Van|Yalova|Yozgat|Zonguldak";
-aStates[232]="|Ahal Welayaty|Balkan Welayaty|Dashhowuz Welayaty|Lebap Welayaty|Mary Welayaty";
-aStates[233]="|Tuvalu";
-aStates[234]="|Adjumani|Apac|Arua|Bugiri|Bundibugyo|Bushenyi|Busia|Gulu|Hoima|Iganga|Jinja|Kabale|Kabarole|Kalangala|Kampala|Kamuli|Kapchorwa|Kasese|Katakwi|Kibale|Kiboga|Kisoro|Kitgum|Kotido|Kumi|Lira|Luwero|Masaka|Masindi|Mbale|Mbarara|Moroto|Moyo|Mpigi|Mubende|Mukono|Nakasongola|Nebbi|Ntungamo|Pallisa|Rakai|Rukungiri|Sembabule|Soroti|Tororo";
-aStates[235]="|Avtonomna Respublika Krym (Simferopol')|Cherkas'ka (Cherkasy)|Chernihivs'ka (Chernihiv)|Chernivets'ka (Chernivtsi)|Dnipropetrovs'ka (Dnipropetrovs'k)|Donets'ka (Donets'k)|Ivano-Frankivs'ka (Ivano-Frankivs'k)|Kharkivs'ka (Kharkiv)|Khersons'ka (Kherson)|Khmel'nyts'ka (Khmel'nyts'kyy)|Kirovohrads'ka (Kirovohrad)|Kyyiv|Kyyivs'ka (Kiev)|L'vivs'ka (L'viv)|Luhans'ka (Luhans'k)|Mykolayivs'ka (Mykolayiv)|Odes'ka (Odesa)|Poltavs'ka (Poltava)|Rivnens'ka (Rivne)|Sevastopol'|Sums'ka (Sumy)|Ternopil's'ka (Ternopil')|Vinnyts'ka (Vinnytsya)|Volyns'ka (Luts'k)|Zakarpats'ka (Uzhhorod)|Zaporiz'ka (Zaporizhzhya)|Zhytomyrs'ka (Zhytomyr)"
-aStates[236]="|'Ajman|Abu Zaby (Abu Dhabi)|Al Fujayrah|Ash Shariqah (Sharjah)|Dubayy (Dubai)|Ra's al Khaymah|Umm al Qaywayn";
-aStates[237]="|Barking and Dagenham|Barnet|Barnsley|Bath and North East Somerset|Bedfordshire|Bexley|Birmingham|Blackburn with Darwen|Blackpool|Bolton|Bournemouth|Bracknell Forest|Bradford|Brent|Brighton and Hove|Bromley|Buckinghamshire|Bury|Calderdale|Cambridgeshire|Camden|Cheshire|City of Bristol|City of Kingston upon Hull|City of London|Cornwall|Coventry|Croydon|Cumbria|Darlington|Derby|Derbyshire|Devon|Doncaster|Dorset|Dudley|Durham|Ealing|East Riding of Yorkshire|East Sussex|Enfield|Essex|Gateshead|Gloucestershire|Greenwich|Hackney|Halton|Hammersmith and Fulham|Hampshire|Haringey|Harrow|Hartlepool|Havering|Herefordshire|Hertfordshire|Hillingdon|Hounslow|Isle of Wight|Islington|Kensington and Chelsea|Kent|Kingston upon Thames|Kirklees|Knowsley|Lambeth|Lancashire|Leeds|Leicester|Leicestershire|Lewisham|Lincolnshire|Liverpool|Luton|Manchester|Medway|Merton|Middlesbrough|Milton Keynes|Newcastle upon Tyne|Newham|Norfolk|North East Lincolnshire|North Lincolnshire|North Somerset|North Tyneside|North Yorkshire|Northamptonshire|Northumberland|Nottingham|Nottinghamshire|Oldham|Oxfordshire|Peterborough|Plymouth|Poole|Portsmouth|Reading|Redbridge|Redcar and Cleveland|Richmond upon Thames|Rochdale|Rotherham|Rutland|Salford|Sandwell|Sefton|Sheffield|Shropshire|Slough|Solihull|Somerset|South Gloucestershire|South Tyneside|Southampton|Southend-on-Sea|Southwark|St. Helens|Staffordshire|Stockport|Stockton-on-Tees|Stoke-on-Trent|Suffolk|Sunderland|Surrey|Sutton|Swindon|Tameside|Telford and Wrekin|Thurrock|Torbay|Tower Hamlets|Trafford|Wakefield|Walsall|Waltham Forest|Wandsworth|Warrington|Warwickshire|West Berkshire|West Sussex|Westminster|Wigan|Wiltshire|Windsor and Maidenhead|Wirral|Wokingham|Wolverhampton|Worcestershire|York";
-aStates[238]="|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres";
-aStates[239]="|Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|District of Columbia|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New Hampshire|New Jersey|New Mexico|New York|North Carolina|North Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Rhode Island|South Carolina|South Dakota|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West Virginia|Wisconsin|Wyoming";
-aStates[240]="|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati";
-aStates[241]="|Malampa|Penama|Sanma|Shefa|Tafea|Torba";
-aStates[242]="|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia";
-aStates[243]="|An Giang|Ba Ria-Vung Tau|Bac Giang|Bac Kan|Bac Lieu|Bac Ninh|Ben Tre|Binh Dinh|Binh Duong|Binh Phuoc|Binh Thuan|Ca Mau|Can Tho|Cao Bang|Da Nang|Dac Lak|Dong Nai|Dong Thap|Gia Lai|Ha Giang|Ha Nam|Ha Noi|Ha Tay|Ha Tinh|Hai Duong|Hai Phong|Ho Chi Minh|Hoa Binh|Hung Yen|Khanh Hoa|Kien Giang|Kon Tum|Lai Chau|Lam Dong|Lang Son|Lao Cai|Long An|Nam Dinh|Nghe An|Ninh Binh|Ninh Thuan|Phu Tho|Phu Yen|Quang Binh|Quang Nam|Quang Ngai|Quang Ninh|Quang Tri|Soc Trang|Son La|Tay Ninh|Thai Binh|Thai Nguyen|Thanh Hoa|Thua Thien-Hue|Tien Giang|Tra Vinh|Tuyen Quang|Vinh Long|Vinh Phuc|Yen Bai";
-aStates[244]="|Saint Croix|Saint John|Saint Thomas";
-aStates[245]="|Blaenau Gwent|Bridgend|Caerphilly|Cardiff|Carmarthenshire|Ceredigion|Conwy|Denbighshire|Flintshire|Gwynedd|Isle of Anglesey|Merthyr Tydfil|Monmouthshire|Neath Port Talbot|Newport|Pembrokeshire|Powys|Rhondda Cynon Taff|Swansea|The Vale of Glamorgan|Torfaen|Wrexham";
-aStates[246]="|Alo|Sigave|Wallis";
-aStates[247]="|West Bank";
-aStates[248]="|Western Sahara";
-aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahwit|Dhamar|Hadhramawt|Hajjah|Ibb|Lahij|Ma'rib|Sa'dah|San'a'|Ta'izz";
-aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
-aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
-aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-
-/* 
- * gArCountryInfo
- * (0) Country name
- * (1) Name length
- * (2) Number of states
- * (3) Max state length
- */
-gLngNumberCountries = sCountryString.split("|").length;
-//gArCountryInfo = new Array(gLngNumberCountries);
-gArCountryInfo=sCountryString.split("|");
-/* 
- * gArStateInfo[country][statenames][namelengths]
- * (0) Country
- * (1) States (Multi-sized Array)
- *    (0) name
- *    (1) nameLength
- */
-gArStateInfo   = new Array(gLngNumberCountries);
-
-/* 
- * fInitgArStateInfo()
- * purpose: build gArStateInfo array
- * gArStateInfo[Country][States][1]
- *   (0) State name
- *   (1) State name length
- * gArStateInfo[i] is an array of state names
- * gArStateInfo[i][j]=state name, name length
- */
-function fInitgArStateInfo() {
- var i=0, j=0, sStateName="", iNumberOfStates=0;
- var iMaxLength=0, iLength=0;
- var oldNumber=0;
- 
- for (i=0;i<gLngNumberCountries;i++) {
-  // i is selected country
-  iNumberOfStates=aStates[i].split("|").length+1;
-  gLngNumberStates=gLngNumberStates+iNumberOfStates;
-  gArStateInfo[i]=new Array(iNumberOfStates);
-  iMaxLength=0;
-  
-  // Add the additional information
-  for (j=0;j<iNumberOfStates;j++) {
-   if (iLength>iMaxLength) {
-    iMaxLength=iLength;
-    gArStateInfo[i][j][0]=sStateName;
-   }
-  }
-  gArCountryInfo[i][3]=parseInt(iMaxLength);
- }
- Update_Globals();
- return;
-}
-
-/* 
- * Working on this one.
- * Fills in region from the arrays
- * 
- */
-function xFillState() {
- var i=0;
- 
- // reset region
- document.form1.region.options.length=0;
- 
- // get selected country
- gLngSelectedCountry=document.form1.country_name.selectedIndex;
- 
- // get number of states for selected country
- gLngNumberStates=gArCountryInfo[[gLngSelectedCountry][2]];
- 
- // update options in region
- for (i=0;i<gLngNumberStates;i++) {
-  document.form1.region.options[i]=new
-    Option(gArStateInfo[[gLngSelectedCountry][i][0]]);
- }
- gLngSelectedState=
-  document.form1.region.options.selectedIndex;
- 
- return;
-}
-
-/* 
- * FillStates() function works.
- * Fills region from aStates
- */
-function Fill_States(current) {
-	var i=0, iLen=0, iNumStates=0;
- 
-	// reset region
-	document.form1.region.options.length=0;
-	// get selected country
-	gLngSelectedCountry=document.form1.country_name.selectedIndex;
-	iNumStates = aStates[gLngSelectedCountry].split("|").length;
- 
-	// update the text boxes
-
- 	// fill the state combobox with the list of states
-	for (i=0;i<iNumStates;i++) {
-		document.form1.region.options[i]=new 
-			Option(aStates[document.form1.country_name.selectedIndex].split("|")[i]);
-
-		sRegionName=document.form1.region.options[i];
-		if(sRegionName.text == current) {
-			document.form1.region.selectedIndex = i;
-		}
-
-	}
-
-	return;
-}
-
-/*
- * FillCountry()
- * gArCountryInfo matrix holds the following information:
- * (0) Country name
- * (1) Name length
- * (2) Number of states
- * (3) Max state length
- */
-function Fill_Country(current) {
-	var i=0;
-	var sCountryName="";
- 
-	// reset country_name.options
-	document.form1.country_name.options.length=0;
-	// get number of countries from the string
- 
-	// ----------------------------------------------------
-	// gArCountryInfo = new Array(gLngNumberCountries, 4);
-	// ----------------------------------------------------
-	for (i=0;i<gLngNumberCountries;i++) {
-		gArCountryInfo[i]=new Array(4);
-	}
- 
-	for (i=0;i<gLngNumberCountries;i++) {
-		document.form1.country_name.options[i]=new Option(sCountryString.split("|")[i]);
-		sCountryName=document.form1.country_name.options[i];
-		if(sCountryName.text == current) {
-			document.form1.country_name.selectedIndex = i;
-		}
-		gArCountryInfo[i]=
-			[sCountryName, 
-				parseInt(sCountryName.length),
-				aStates,
-			0];
-	}
-
-	fInitgArStateInfo();
-
-	return;
-}
-
-function Update_Globals() {
-	gLngSelectedCountry=parseInt(document.form1.country_name.selectedIndex);
-	gLngSelectedState=parseInt(document.form1.region.selectedIndex);
-	return;
-}
-
-
-//-->
diff --git a/include/jquery.htmlstream.js b/include/jquery.htmlstream.js
deleted file mode 100644
index c62c538f7..000000000
--- a/include/jquery.htmlstream.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/* jQuery ajax stream plugin
-* Version 0.1
-* Copyright (C) 2009 Chris Tarquini
-* Licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License (http://creativecommons.org/licenses/by-sa/3.0/)
-* Permissions beyond the scope of this license may be available by contacting petros000[at]hotmail.com.
-*/
-
-(function($) {
-
-// Save the original AJAX function
-var ajax_old = $.ajax;
-var get_old = $.get;
-var post_old =  $.post;
-var active = true;
-// Add our settings
-$.ajaxSetup({stream: false,pollInterval: 500/*, onDataRecieved: function(){}*/ });
-$.enableAjaxStream = function(enable)
-{
-if(typeof enable == 'undefined') enable = !active;
-if(!enable)
-{
-$.ajax = ajax_old;
-$.get = get_old;
-$.post = post_old;
-active = false;
-}
-else
-{
-$.ajax = ajax_stream;
-$.get = ajax_get_stream;
-$.post = ajax_post_stream;
-active = true;
-}
-
-}
-var ajax_stream = $.ajax = function(options)
-{
-//copied from original ajax function
-        options  = jQuery.extend(true, options, jQuery.extend(true, {}, jQuery.ajaxSettings, options));
-if(options.stream)
-{
-var timer = 0;
-var offset = 0;
-var xmlhttp = null;
-var lastlen = 0;
-var done = false;
-var hook = function(xhr)
-{
-xmlhttp = xhr;
-checkagain();
-}
-var fix = function(){ check('stream'); };// fixes weird bug with random numbers as arg
-var checkagain = function(){if(!done) timer = setTimeout(fix,options.pollInterval);}
-var check = function(status)
-{
-if(typeof status == 'undefined') status = "stream";
-if(xmlhttp.status < 3) return; //only get the latest packet if data has been sent
-var text = xmlhttp.responseText;
-if(status == 'stream') //if we arent streaming then just flush the buffer
-{
-if(text.length <= lastlen) { checkagain(); return;}
-lastlength = text.length;
-if(offset == text.length) { checkagain(); return;}
-}
-var pkt = text.substr(offset);
-offset =  text.length;
-if($.isFunction(options.OnDataRecieved))
-{
-options.OnDataRecieved(pkt, status, xmlhttp.responseText, xmlhttp);
-}
-if(xmlhttp.status != 4)
-checkagain();
-}
-var complete = function(xhr,s)
-{
-clearTimeout(timer);//done..stop polling
-done = true;
-// send final call
-check(s);
-}
-// If the complete callback is set create a new callback that calls the users and outs
-if($.isFunction(options.success))
-{
-var oc = options.success;
-options.success = function(xhr,s){ complete(xhr,s); oc(xhr,s);};
-
-}
-else options.success = complete;
-// Set up our hook on the beforeSend
-if($.isFunction(options.beforeSend))
-{
-var obs = options.beforeSend;
-options.beforeSend = function(xhr){ obs(xhr); hook(xhr);};
-}
-else options.beforeSend = hook;
-
-}
-ajax_old(options);
-}
-
-var ajax_get_stream = $.get = function(url,data,callback,type,stream)
-{
-	if($.isFunction(data))
-	{
-		var orgcb = callback;
-		callback = data;
-		if($.isFunction(orgcb))
-		{
-			stream = orgcb;
-		}
-		data = null;
-	}
-	if($.isFunction(type))
-	{
-		stream = type;
-		type = undefined;
-	}
-	var dostream = $.isFunction(stream);
-	return jQuery.ajax({
-					type: "GET",
-					url: url,
-					data: data,
-					success: callback,
-					dataType: type,
-					stream: dostream,
-					OnDataRecieved: stream
-			});
-
-}
-
-var ajax_post_stream = $.post = function(url,data,callback,type,stream)
-{
-        if($.isFunction(data))
-        {
-				var orgcb = callback;
-                callback = data;
-        }
-		if($.isFunction(type))
-		{
-			stream = type;
-			type = undefined;
-		}
-		var dostream = $.isFunction(stream);
-		return jQuery.ajax({
-				type: "POST",
-				url: url,
-				data: data,
-				success: callback,
-				dataType: type,
-				stream: dostream,
-				OnDataRecieved: stream
-		});
-
-}
-
-})(jQuery);	
-	
diff --git a/include/jquery.js b/include/jquery.js
deleted file mode 100644
index 7c2430802..000000000
--- a/include/jquery.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/include/main.js b/include/main.js
deleted file mode 100644
index 83dcc720c..000000000
--- a/include/main.js
+++ /dev/null
@@ -1,426 +0,0 @@
-
-  function openClose(theID) {
-    if(document.getElementById(theID).style.display == "block") { 
-      document.getElementById(theID).style.display = "none" 
-    }
-    else { 
-      document.getElementById(theID).style.display = "block" 
-    } 
-  }
-
-  function openMenu(theID) {
-      document.getElementById(theID).style.display = "block" 
-  }
-
-  function closeMenu(theID) {
-      document.getElementById(theID).style.display = "none" 
-  }
-
-	
-	var src = null;
-	var prev = null;
-	var livetime = null;
-	var msie = false;
-	var stopped = false;
-	var timer = null;
-	var pr = 0;
-	var liking = 0;
-	var in_progress = false;
-	var langSelect = false;
-	var commentBusy = false;
-
-	$(function() {
-		$.ajaxSetup({cache: false});
-
-		msie = $.browser.msie ;
-		
-		/* setup navbar menus */
-		
-		
-		
-		/* setup onoff widgets */
-		$(".onoff input").each(function(){
-			val = $(this).val();
-			id = $(this).attr("id");
-			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
-			
-		});
-		$(".onoff > a").click(function(event){
-			event.preventDefault();	
-			var input = $(this).siblings("input");
-			var val = 1-input.val();
-			var id = input.attr("id");
-			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
-			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
-			input.val(val);
-			//console.log(id);
-		});
-		
-		/* setup field_richtext */
-		setupFieldRichtext();
-
-		/* popup menus */
-		$('a[rel^=#]').click(function(e){
-			menu = $( $(this).attr('rel') );
-			e.stopPropagation();
-			if (menu.attr('popup')=="false") return false;
-			$(this).parent().toggleClass("selected");
-			menu.toggle();
-			return false;
-		});
-		
-		
-
-		/* notifications template */
-		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
-		var notifications_empty = unescape($("#nav-notifications-menu").html());
-		
-		/* nav update event  */
-		$('nav').bind('nav-update', function(e,data){;
-			var net = $(data).find('net').text();
-			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
-			$('#net-update').html(net);
-
-			var home = $(data).find('home').text();
-			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
-			$('#home-update').html(home);
-
-			var eNotif = $(data).find('notif')
-			notif = eNotif.attr('count');
-			if (notif>0){
-				nnm = $("#nav-notifications-menu");
-				nnm.html("");
-				nnm.attr('popup','true');
-				eNotif.children("note").each(function(){
-					e = $(this);
-					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
-					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
-					nnm.append(html);
-				});
-			} else {
-				$("#nav-notifications-menu").html(notifications_empty);
-			}
-			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-			$('#notify-update').html(notif);
-			
-		});
-		
-		
- 		NavUpdate(); 
-		// Allow folks to stop the ajax page updates with the pause/break key
-		$(document).keypress(function(event) {
-			if(event.keyCode == '19') {
-				event.preventDefault();
-				if(stopped == false) {
-					stopped = true;
-					$('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
-				}
-				else {
-					stopped = false;
-					$('#pause').html('');
-				}
-			}
-			else {
-				// any key to resume
-				if(stopped == true) {
-					stopped = false;
-					$('#pause').html('');
-				}
-			}
-
-		});					
-	});
-
-	function NavUpdate() {
-
-		if($('#live-network').length)   { src = 'network'; liveUpdate(); }
-		if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
-		if($('#live-community').length) { src = 'community'; liveUpdate(); }
-		if($('#live-display').length) { 
-			if(liking) {
-				liking = 0;
-				window.location.href=window.location.href 
-			}
-		}
-		if($('#live-photos').length)  { 
-			if(liking) {
-				liking = 0;
-				window.location.href=window.location.href 
-			}
-		}
-
-		if(! stopped) {
-			$.get("ping",function(data) {
-				$(data).find('result').each(function() {
-					// send nav-update event
-					$('nav').trigger('nav-update', this);
-				});
-			}) ;
-		}
-		timer = setTimeout(NavUpdate,30000);
-	}
-
-	function liveUpdate() {
-		if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
-		if(($('.comment-edit-text-full').length) || (in_progress)) {
-			livetime = setTimeout(liveUpdate, 10000);
-			return;
-		}
-		prev = 'live-' + src;
-
-		in_progress = true;
-		var udargs = ((netargs.length) ? '/' + netargs : '');
-		var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
-
-		$.get(update_url,function(data) {
-			in_progress = false;
-			$('.ccollapse-wrapper',data).each(function() {
-				var ident = $(this).attr('id');
-				var is_hidden = $('#' + ident).is(':hidden');
-				if($('#' + ident).length) {
-					$('#' + ident).replaceWith($(this));
-					if(is_hidden)
-						$('#' + ident).hide();
-				}
-			});
-			$('.wall-item-outside-wrapper',data).each(function() {
-				var ident = $(this).attr('id');
-				if($('#' + ident).length == 0) {
-					$('img',this).each(function() {
-						$(this).attr('src',$(this).attr('dst'));
-					});
-					$('#' + prev).after($(this));
-				}
-				else { 
-
-					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
-					if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
-						$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
-					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
-					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
-					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
-						$(this).attr('src',$(this).attr('dst'));
-					});
-				}
-				prev = ident; 
-			});
-			$('.like-rotator').hide();
-			if(commentBusy) {
-				commentBusy = false;
-				$('body').css('cursor', 'auto');
-			}
-		});
-	}
-
-	function imgbright(node) {
-		$(node).removeClass("drophide").addClass("drop");
-	}
-
-	function imgdull(node) {
-		$(node).removeClass("drop").addClass("drophide");
-	}
-
-	// Since our ajax calls are asynchronous, we will give a few 
-	// seconds for the first ajax call (setting like/dislike), then 
-	// run the updater to pick up any changes and display on the page.
-	// The updater will turn any rotators off when it's done. 
-	// This function will have returned long before any of these
-	// events have completed and therefore there won't be any
-	// visible feedback that anything changed without all this
-	// trickery. This still could cause confusion if the "like" ajax call
-	// is delayed and NavUpdate runs before it completes.
-
-	function dolike(ident,verb) {
-		$('#like-rotator-' + ident.toString()).show();
-		$.get('like/' + ident.toString() + '?verb=' + verb );
-		if(timer) clearTimeout(timer);
-		timer = setTimeout(NavUpdate,3000);
-		liking = 1;
-	}
-
-	function dostar(ident) {
-		$('#like-rotator-' + ident.toString()).show();
-		$.get('starred/' + ident.toString(), function(data) {
-			if(data.match(/1/)) {
-				$('#starred-' + ident.toString()).addClass('starred');
-				$('#starred-' + ident.toString()).removeClass('unstarred');
-			}
-			else {			
-				$('#starred-' + ident.toString()).addClass('unstarred');
-				$('#starred-' + ident.toString()).removeClass('starred');
-			}
-			$('#like-rotator-' + ident.toString()).hide();	
-		});
-	}
-
-	function getPosition(e) {
-		var cursor = {x:0, y:0};
-		if ( e.pageX || e.pageY  ) {
-			cursor.x = e.pageX;
-			cursor.y = e.pageY;
-		}
-		else {
-			if( e.clientX || e.clientY ) {
-				cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
-				cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
-			}
-			else {
-				if( e.x || e.y ) {
-					cursor.x = e.x;
-					cursor.y = e.y;
-				}
-			}
-		}
-		return cursor;
-	}
-
-	var lockvisible = false;
-
-	function lockview(event,id) {
-		event = event || window.event;
-		cursor = getPosition(event);
-		if(lockvisible) {
-			lockviewhide();
-		}
-		else {
-			lockvisible = true;
-			$.get('lockview/' + id, function(data) {
-				$('#panel').html(data);
-				$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
-				$('#panel').show();
-			});
-		}
-	}
-
-	function lockviewhide() {
-		lockvisible = false;
-		$('#panel').hide();
-	}
-
-	function post_comment(id) {
-		commentBusy = true;
-		$('body').css('cursor', 'wait');
-		$.post(  
-             "item",  
-             $("#comment-edit-form-" + id).serialize(),
-			function(data) {
-				if(data.success) {
-					$("#comment-edit-wrapper-" + id).hide();
-					$("#comment-edit-text-" + id).val('');
-    	  			var tarea = document.getElementById("comment-edit-text-" + id);
-					if(tarea)
-						commentClose(tarea,id);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,10);
-				}
-				if(data.reload) {
-					window.location.href=data.reload;
-				}
-			},
-			"json"  
-         );  
-         return false;  
-	}
-
-
-    function bin2hex(s){  
-        // Converts the binary representation of data to hex    
-        //   
-        // version: 812.316  
-        // discuss at: http://phpjs.org/functions/bin2hex  
-        // +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)  
-        // +   bugfixed by: Onno Marsman  
-        // +   bugfixed by: Linuxworld  
-        // *     example 1: bin2hex('Kev');  
-        // *     returns 1: '4b6576'  
-        // *     example 2: bin2hex(String.fromCharCode(0x00));  
-        // *     returns 2: '00'  
-        var v,i, f = 0, a = [];  
-        s += '';  
-        f = s.length;  
-          
-        for (i = 0; i<f; i++) {  
-            a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");  
-        }  
-          
-        return a.join('');  
-    }  
-
-	function groupChangeMember(gid,cid) {
-		$('body .fakelink').css('cursor', 'wait');
-		$.get('group/' + gid + '/' + cid, function(data) {
-				$('#group-update-wrapper').html(data);
-				$('body .fakelink').css('cursor', 'auto');				
-		});
-	}
-
-	function profChangeMember(gid,cid) {
-		$('body .fakelink').css('cursor', 'wait');
-		$.get('profperm/' + gid + '/' + cid, function(data) {
-				$('#prof-update-wrapper').html(data);
-				$('body .fakelink').css('cursor', 'auto');				
-		});
-	}
-
-	function contactgroupChangeMember(gid,cid) {
-		$('body').css('cursor', 'wait');
-		$.get('contactgroup/' + gid + '/' + cid, function(data) {
-				$('body').css('cursor', 'auto');
-		});
-	}
-
-
-function checkboxhighlight(box) {
-  if($(box).is(':checked')) {
-	$(box).addClass('checkeditem');
-  }
-  else {
-	$(box).removeClass('checkeditem');
-  }
-}
-
-function setupFieldRichtext(){
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: "fieldRichtext",
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
-		convert_urls: false,
-		content_css: baseurl+"/view/custom_tinymce.css",
-		theme_advanced_path : false,
-	});
-}
-
-/** 
- * sprintf in javascript 
- *	"{0} and {1}".format('zero','uno'); 
- **/
-String.prototype.format = function() {
-    var formatted = this;
-    for (var i = 0; i < arguments.length; i++) {
-        var regexp = new RegExp('\\{'+i+'\\}', 'gi');
-        formatted = formatted.replace(regexp, arguments[i]);
-    }
-    return formatted;
-};
-// Array Remove
-Array.prototype.remove = function(item) {
-  to=undefined; from=this.indexOf(item);
-  var rest = this.slice((to || from) + 1 || this.length);
-  this.length = from < 0 ? this.length + from : from;
-  return this.push.apply(this, rest);
-};
-
diff --git a/js/acl.js b/js/acl.js
new file mode 100644
index 000000000..82b631ee9
--- /dev/null
+++ b/js/acl.js
@@ -0,0 +1,240 @@
+function ACL(backend_url, preset){
+	that = this;
+	
+	that.url = backend_url;
+	
+	that.kp_timer = null;
+	
+	if (preset==undefined) preset = [];
+	that.allow_cid = (preset[0] || []);
+	that.allow_gid = (preset[1] || []);
+	that.deny_cid  = (preset[2] || []);
+	that.deny_gid  = (preset[3] || []);
+	that.group_uids = [];
+	that.nw = 4; //items per row. should be calulated from #acl-list.width
+	
+	that.list_content = $("#acl-list-content");
+	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
+	that.showall = $("#acl-showall");
+
+	if (preset.length==0) that.showall.addClass("selected");
+	
+	/*events*/
+	that.showall.click(that.on_showall);
+	$(".acl-button-show").live('click', that.on_button_show);
+	$(".acl-button-hide").live('click', that.on_button_hide);
+	$("#acl-search").keypress(that.on_search);
+	$("#acl-wrapper").parents("form").submit(that.on_submit);
+	
+	/* startup! */
+	that.get(0,100);
+}
+
+ACL.prototype.on_submit = function(){
+	aclfileds = $("#acl-fields").html("");
+	$(that.allow_gid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
+	});
+	$(that.allow_cid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
+	});
+	$(that.deny_gid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
+	});
+	$(that.deny_cid).each(function(i,v){
+		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
+	});	
+}
+
+ACL.prototype.search = function(){
+	var srcstr = $("#acl-search").val();
+	that.list_content.html("");
+	that.get(0,100, srcstr);
+}
+
+ACL.prototype.on_search = function(event){
+	if (that.kp_timer) clearTimeout(that.kp_timer);
+	that.kp_timer = setTimeout( that.search, 1000);
+}
+
+ACL.prototype.on_showall = function(event){
+	event.stopPropagation();
+	if (that.showall.hasClass("selected")){
+		return false;
+	}
+	that.showall.addClass("selected");
+	
+	that.allow_cid = [];
+	that.allow_gid = [];
+	that.deny_cid  = [];
+	that.deny_gid  = [];
+	
+	that.updateview();
+	
+	return false;
+}
+
+ACL.prototype.on_button_show = function(event){
+	event.stopPropagation();
+
+	/*that.showall.removeClass("selected");
+	$(this).siblings(".acl-button-hide").removeClass("selected");
+	$(this).toggleClass("selected");*/
+
+	that.set_allow($(this).parent().attr('id'));
+
+	return false;
+}
+ACL.prototype.on_button_hide = function(event){
+	event.stopPropagation();
+
+	/*that.showall.removeClass("selected");
+	$(this).siblings(".acl-button-show").removeClass("selected");
+	$(this).toggleClass("selected");*/
+
+	that.set_deny($(this).parent().attr('id'));
+
+	return false;
+}
+
+ACL.prototype.set_allow = function(itemid){
+	type = itemid[0];
+	id 	 = parseInt(itemid.substr(1));
+	switch(type){
+		case "g":
+			if (that.allow_gid.indexOf(id)<0){
+				that.allow_gid.push(id)
+			}else {
+				that.allow_gid.remove(id);
+			}
+			if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
+			break;
+		case "c":
+			if (that.allow_cid.indexOf(id)<0){
+				that.allow_cid.push(id)
+			} else {
+				that.allow_cid.remove(id);
+			}
+			if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);			
+			break;
+	}
+	that.updateview();
+}
+
+ACL.prototype.set_deny = function(itemid){
+	type = itemid[0];
+	id 	 = parseInt(itemid.substr(1));
+	switch(type){
+		case "g":
+			if (that.deny_gid.indexOf(id)<0){
+				that.deny_gid.push(id)
+			} else {
+				that.deny_gid.remove(id);
+			}
+			if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
+			break;
+		case "c":
+			if (that.deny_cid.indexOf(id)<0){
+				that.deny_cid.push(id)
+			} else {
+				that.deny_cid.remove(id);
+			}
+			if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
+			break;
+	}
+	that.updateview();
+}
+
+ACL.prototype.updateview = function(){
+	if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
+		that.deny_gid.length==0 && that.deny_cid.length==0){
+			that.showall.addClass("selected");
+			/* jot acl */
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);			
+				if(editor != false) {
+					$('#profile-jot-desc').html(ispublic);
+				}
+			
+	} else {
+			that.showall.removeClass("selected");
+			/* jot acl */
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+				$('.profile-jot-net input').attr('disabled', 'disabled');			
+				$('#profile-jot-desc').html('&nbsp;');
+	}
+	
+	$("#acl-list-content .acl-list-item").each(function(){
+		itemid = $(this).attr('id');
+		type = itemid[0];
+		id 	 = parseInt(itemid.substr(1));
+		
+		btshow = $(this).children(".acl-button-show").removeClass("selected");
+		bthide = $(this).children(".acl-button-hide").removeClass("selected");	
+		
+		switch(type){
+			case "g":
+				var uclass = "";
+				if (that.allow_gid.indexOf(id)>=0){
+					btshow.addClass("selected");
+					bthide.removeClass("selected");
+					uclass="groupshow";
+				}
+				if (that.deny_gid.indexOf(id)>=0){
+					btshow.removeClass("selected");
+					bthide.addClass("selected");
+					uclass="grouphide";
+				}
+				
+				$(that.group_uids[id]).each(function(i,v){
+					$("#c"+v).removeClass("groupshow grouphide").addClass(uclass);
+				});
+				
+				break;
+			case "c":
+				if (that.allow_cid.indexOf(id)>=0){
+					btshow.addClass("selected");
+					bthide.removeClass("selected");
+				}
+				if (that.deny_cid.indexOf(id)>=0){
+					btshow.removeClass("selected");
+					bthide.addClass("selected");
+				}			
+		}
+		
+	});
+	
+}
+
+
+ACL.prototype.get = function(start,count, search){
+	var postdata = {
+		start:start,
+		count:count,
+		search:search,
+	}
+	
+	$.ajax({
+		type:'POST',
+		url: that.url,
+		data: postdata,
+		dataType: 'json',
+		success:that.populate
+	});
+}
+
+ACL.prototype.populate = function(data){
+	var height = Math.ceil(data.tot / that.nw) * 42;
+	that.list_content.height(height);
+	$(data.items).each(function(){
+		html = "<div class='acl-list-item {4} {5}' id='{2}{3}'>"+that.item_tpl+"</div>";
+		html = html.format( this.photo, this.name, this.type, this.id, '', this.network );
+		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
+		//console.log(html);
+		that.list_content.append(html);
+	});
+	that.updateview();
+}
+
diff --git a/js/ajaxupload.js b/js/ajaxupload.js
new file mode 100644
index 000000000..67c4a56fb
--- /dev/null
+++ b/js/ajaxupload.js
@@ -0,0 +1,695 @@
+/**
+ * AJAX Upload ( http://valums.com/ajax-upload/ ) 
+ * Copyright (c) Andris Valums
+ * Licensed under the MIT license ( http://valums.com/mit-license/ )
+ * Thanks to Gary Haran, David Mark, Corey Burns and others for contributions. 
+ */
+
+(function () {
+    /* global window */
+    /* jslint browser: true, devel: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true */
+    
+    /**
+     * Wrapper for FireBug's console.log
+     */
+    function log(){
+        if (typeof(console) != 'undefined' && typeof(console.log) == 'function'){            
+            Array.prototype.unshift.call(arguments, '[Ajax Upload]');
+            console.log( Array.prototype.join.call(arguments, ' '));
+        }
+    } 
+
+    /**
+     * Attaches event to a dom element.
+     * @param {Element} el
+     * @param type event name
+     * @param fn callback This refers to the passed element
+     */
+    function addEvent(el, type, fn){
+        if (el.addEventListener) {
+            el.addEventListener(type, fn, false);
+        } else if (el.attachEvent) {
+            el.attachEvent('on' + type, function(){
+                fn.call(el);
+	        });
+	    } else {
+            throw new Error('not supported or DOM not loaded');
+        }
+    }   
+    
+    /**
+     * Attaches resize event to a window, limiting
+     * number of event fired. Fires only when encounteres
+     * delay of 100 after series of events.
+     * 
+     * Some browsers fire event multiple times when resizing
+     * http://www.quirksmode.org/dom/events/resize.html
+     * 
+     * @param fn callback This refers to the passed element
+     */
+    function addResizeEvent(fn){
+        var timeout;
+               
+	    addEvent(window, 'resize', function(){
+            if (timeout){
+                clearTimeout(timeout);
+            }
+            timeout = setTimeout(fn, 100);                        
+        });
+    }    
+    
+    // Needs more testing, will be rewriten for next version        
+    // getOffset function copied from jQuery lib (http://jquery.com/)
+    if (document.documentElement.getBoundingClientRect){
+        // Get Offset using getBoundingClientRect
+        // http://ejohn.org/blog/getboundingclientrect-is-awesome/
+        var getOffset = function(el){
+            var box = el.getBoundingClientRect();
+            var doc = el.ownerDocument;
+            var body = doc.body;
+            var docElem = doc.documentElement; // for ie 
+            var clientTop = docElem.clientTop || body.clientTop || 0;
+            var clientLeft = docElem.clientLeft || body.clientLeft || 0;
+             
+            // In Internet Explorer 7 getBoundingClientRect property is treated as physical,
+            // while others are logical. Make all logical, like in IE8.	
+            var zoom = 1;            
+            if (body.getBoundingClientRect) {
+                var bound = body.getBoundingClientRect();
+                zoom = (bound.right - bound.left) / body.clientWidth;
+            }
+            
+            if (zoom > 1) {
+                clientTop = 0;
+                clientLeft = 0;
+            }
+            
+            var top = box.top / zoom + (window.pageYOffset || docElem && docElem.scrollTop / zoom || body.scrollTop / zoom) - clientTop, left = box.left / zoom + (window.pageXOffset || docElem && docElem.scrollLeft / zoom || body.scrollLeft / zoom) - clientLeft;
+            
+            return {
+                top: top,
+                left: left
+            };
+        };        
+    } else {
+        // Get offset adding all offsets 
+        var getOffset = function(el){
+            var top = 0, left = 0;
+            do {
+                top += el.offsetTop || 0;
+                left += el.offsetLeft || 0;
+                el = el.offsetParent;
+            } while (el);
+            
+            return {
+                left: left,
+                top: top
+            };
+        };
+    }
+    
+    /**
+     * Returns left, top, right and bottom properties describing the border-box,
+     * in pixels, with the top-left relative to the body
+     * @param {Element} el
+     * @return {Object} Contains left, top, right,bottom
+     */
+    function getBox(el){
+        var left, right, top, bottom;
+        var offset = getOffset(el);
+        left = offset.left;
+        top = offset.top;
+        
+        right = left + el.offsetWidth;
+        bottom = top + el.offsetHeight;
+        
+        return {
+            left: left,
+            right: right,
+            top: top,
+            bottom: bottom
+        };
+    }
+    
+    /**
+     * Helper that takes object literal
+     * and add all properties to element.style
+     * @param {Element} el
+     * @param {Object} styles
+     */
+    function addStyles(el, styles){
+        for (var name in styles) {
+            if (styles.hasOwnProperty(name)) {
+                el.style[name] = styles[name];
+            }
+        }
+    }
+        
+    /**
+     * Function places an absolutely positioned
+     * element on top of the specified element
+     * copying position and dimentions.
+     * @param {Element} from
+     * @param {Element} to
+     */    
+    function copyLayout(from, to){
+	    var box = getBox(from);
+        
+        addStyles(to, {
+	        position: 'absolute',                    
+	        left : box.left + 'px',
+	        top : box.top + 'px',
+	        width : from.offsetWidth + 'px',
+	        height : from.offsetHeight + 'px'
+	    });        
+	to.title = from.title;
+
+    }
+
+    /**
+    * Creates and returns element from html chunk
+    * Uses innerHTML to create an element
+    */
+    var toElement = (function(){
+        var div = document.createElement('div');
+        return function(html){
+            div.innerHTML = html;
+            var el = div.firstChild;
+            return div.removeChild(el);
+        };
+    })();
+            
+    /**
+     * Function generates unique id
+     * @return unique id 
+     */
+    var getUID = (function(){
+        var id = 0;
+        return function(){
+            return 'ValumsAjaxUpload' + id++;
+        };
+    })();        
+ 
+    /**
+     * Get file name from path
+     * @param {String} file path to file
+     * @return filename
+     */  
+    function fileFromPath(file){
+        return file.replace(/.*(\/|\\)/, "");
+    }
+    
+    /**
+     * Get file extension lowercase
+     * @param {String} file name
+     * @return file extenstion
+     */    
+    function getExt(file){
+        return (-1 !== file.indexOf('.')) ? file.replace(/.*[.]/, '') : '';
+    }
+
+    function hasClass(el, name){        
+        var re = new RegExp('\\b' + name + '\\b');        
+        return re.test(el.className);
+    }    
+    function addClass(el, name){
+        if ( ! hasClass(el, name)){   
+            el.className += ' ' + name;
+        }
+    }    
+    function removeClass(el, name){
+        var re = new RegExp('\\b' + name + '\\b');                
+        el.className = el.className.replace(re, '');        
+    }
+    
+    function removeNode(el){
+        el.parentNode.removeChild(el);
+    }
+
+    /**
+     * Easy styling and uploading
+     * @constructor
+     * @param button An element you want convert to 
+     * upload button. Tested dimentions up to 500x500px
+     * @param {Object} options See defaults below.
+     */
+    window.AjaxUpload = function(button, options){
+        this._settings = {
+            // Location of the server-side upload script
+            action: 'upload.php',
+            // File upload name
+            name: 'userfile',
+            // Additional data to send
+            data: {},
+            // Submit file as soon as it's selected
+            autoSubmit: true,
+            // The type of data that you're expecting back from the server.
+            // html and xml are detected automatically.
+            // Only useful when you are using json data as a response.
+            // Set to "json" in that case. 
+            responseType: false,
+            // Class applied to button when mouse is hovered
+            hoverClass: 'hover',
+            // Class applied to button when button is focused
+            focusClass: 'focus',
+            // Class applied to button when AU is disabled
+            disabledClass: 'disabled',            
+            // When user selects a file, useful with autoSubmit disabled
+            // You can return false to cancel upload			
+            onChange: function(file, extension){
+            },
+            // Callback to fire before file is uploaded
+            // You can return false to cancel upload
+            onSubmit: function(file, extension){
+            },
+            // Fired when file upload is completed
+            // WARNING! DO NOT USE "FALSE" STRING AS A RESPONSE!
+            onComplete: function(file, response){
+            }
+        };
+                        
+        // Merge the users options with our defaults
+        for (var i in options) {
+            if (options.hasOwnProperty(i)){
+                this._settings[i] = options[i];
+            }
+        }
+                
+        // button isn't necessary a dom element
+        if (button.jquery){
+            // jQuery object was passed
+            button = button[0];
+        } else if (typeof button == "string") {
+            if (/^#.*/.test(button)){
+                // If jQuery user passes #elementId don't break it					
+                button = button.slice(1);                
+            }
+            
+            button = document.getElementById(button);
+        }
+        
+        if ( ! button || button.nodeType !== 1){
+            throw new Error("Please make sure that you're passing a valid element"); 
+        }
+                
+        if ( button.nodeName.toUpperCase() == 'A'){
+            // disable link                       
+            addEvent(button, 'click', function(e){
+                if (e && e.preventDefault){
+                    e.preventDefault();
+                } else if (window.event){
+                    window.event.returnValue = false;
+                }
+            });
+        }
+                    
+        // DOM element
+        this._button = button;        
+        // DOM element                 
+        this._input = null;
+        // If disabled clicking on button won't do anything
+        this._disabled = false;
+        
+        // if the button was disabled before refresh if will remain
+        // disabled in FireFox, let's fix it
+        this.enable();        
+        
+        this._rerouteClicks();
+    };
+    
+    // assigning methods to our class
+    AjaxUpload.prototype = {
+        setData: function(data){
+            this._settings.data = data;
+        },
+        disable: function(){            
+            addClass(this._button, this._settings.disabledClass);
+            this._disabled = true;
+            
+            var nodeName = this._button.nodeName.toUpperCase();            
+            if (nodeName == 'INPUT' || nodeName == 'BUTTON'){
+                this._button.setAttribute('disabled', 'disabled');
+            }            
+            
+            // hide input
+            if (this._input){
+                // We use visibility instead of display to fix problem with Safari 4
+                // The problem is that the value of input doesn't change if it 
+                // has display none when user selects a file           
+                this._input.parentNode.style.visibility = 'hidden';
+            }
+        },
+        enable: function(){
+            removeClass(this._button, this._settings.disabledClass);
+            this._button.removeAttribute('disabled');
+            this._disabled = false;
+            
+        },
+        /**
+         * Creates invisible file input 
+         * that will hover above the button
+         * <div><input type='file' /></div>
+         */
+        _createInput: function(){ 
+            var self = this;
+                        
+            var input = document.createElement("input");
+            input.setAttribute('type', 'file');
+            input.setAttribute('name', this._settings.name);
+
+            addStyles(input, {
+                'position' : 'absolute',
+                // in Opera only 'browse' button
+                // is clickable and it is located at
+                // the right side of the input
+                'right' : 0,
+                'margin' : 0,
+                'padding' : 0,
+                'fontSize' : '480px',
+                // in Firefox if font-family is set to
+                // 'inherit' the input doesn't work
+                'fontFamily' : 'sans-serif',
+                'cursor' : 'pointer'
+            });            
+
+            var div = document.createElement("div");                        
+            addStyles(div, {
+                'display' : 'block',
+                'position' : 'absolute',
+                'overflow' : 'hidden',
+                'margin' : 0,
+                'padding' : 0,                
+                'opacity' : 0,
+                // Make sure browse button is in the right side
+                // in Internet Explorer
+                'direction' : 'ltr',
+                //Max zIndex supported by Opera 9.0-9.2
+                'zIndex': 2147483583,
+				'cursor' : 'pointer'
+
+            });
+            
+            // Make sure that element opacity exists.
+            // Otherwise use IE filter            
+            if ( div.style.opacity !== "0") {
+                if (typeof(div.filters) == 'undefined'){
+                    throw new Error('Opacity not supported by the browser');
+                }
+                div.style.filter = "alpha(opacity=0)";
+            }            
+            
+            addEvent(input, 'change', function(){
+                 
+                if ( ! input || input.value === ''){                
+                    return;                
+                }
+                            
+                // Get filename from input, required                
+                // as some browsers have path instead of it          
+                var file = fileFromPath(input.value);
+                                
+                if (false === self._settings.onChange.call(self, file, getExt(file))){
+                    self._clearInput();                
+                    return;
+                }
+                
+                // Submit form when value is changed
+                if (self._settings.autoSubmit) {
+                    self.submit();
+                }
+            });            
+
+            addEvent(input, 'mouseover', function(){
+                addClass(self._button, self._settings.hoverClass);
+            });
+            
+            addEvent(input, 'mouseout', function(){
+                removeClass(self._button, self._settings.hoverClass);
+                removeClass(self._button, self._settings.focusClass);
+                
+                // We use visibility instead of display to fix problem with Safari 4
+                // The problem is that the value of input doesn't change if it 
+                // has display none when user selects a file           
+                input.parentNode.style.visibility = 'hidden';
+
+            });   
+                        
+            addEvent(input, 'focus', function(){
+                addClass(self._button, self._settings.focusClass);
+            });
+            
+            addEvent(input, 'blur', function(){
+                removeClass(self._button, self._settings.focusClass);
+            });
+            
+	        div.appendChild(input);
+            document.body.appendChild(div);
+              
+            this._input = input;
+        },
+        _clearInput : function(){
+            if (!this._input){
+                return;
+            }            
+                             
+            // this._input.value = ''; Doesn't work in IE6                               
+            removeNode(this._input.parentNode);
+            this._input = null;                                                                   
+            this._createInput();
+            
+            removeClass(this._button, this._settings.hoverClass);
+            removeClass(this._button, this._settings.focusClass);
+        },
+        /**
+         * Function makes sure that when user clicks upload button,
+         * the this._input is clicked instead
+         */
+        _rerouteClicks: function(){
+            var self = this;
+            
+            // IE will later display 'access denied' error
+            // if you use using self._input.click()
+            // other browsers just ignore click()
+
+            addEvent(self._button, 'mouseover', function(){
+                if (self._disabled){
+                    return;
+                }
+                                
+                if ( ! self._input){
+	                self._createInput();
+                }
+                
+                var div = self._input.parentNode;                            
+                copyLayout(self._button, div);
+                div.style.visibility = 'visible';
+                                
+            });
+            
+            
+            // commented because we now hide input on mouseleave
+            /**
+             * When the window is resized the elements 
+             * can be misaligned if button position depends
+             * on window size
+             */
+            //addResizeEvent(function(){
+            //    if (self._input){
+            //        copyLayout(self._button, self._input.parentNode);
+            //    }
+            //});            
+                                         
+        },
+        /**
+         * Creates iframe with unique name
+         * @return {Element} iframe
+         */
+        _createIframe: function(){
+            // We can't use getTime, because it sometimes return
+            // same value in safari :(
+            var id = getUID();            
+             
+            // We can't use following code as the name attribute
+            // won't be properly registered in IE6, and new window
+            // on form submit will open
+            // var iframe = document.createElement('iframe');
+            // iframe.setAttribute('name', id);                        
+ 
+            var iframe = toElement('<iframe src="javascript:false;" name="' + id + '" />');
+            // src="javascript:false; was added
+            // because it possibly removes ie6 prompt 
+            // "This page contains both secure and nonsecure items"
+            // Anyway, it doesn't do any harm.            
+            iframe.setAttribute('id', id);
+            
+            iframe.style.display = 'none';
+            document.body.appendChild(iframe);
+            
+            return iframe;
+        },
+        /**
+         * Creates form, that will be submitted to iframe
+         * @param {Element} iframe Where to submit
+         * @return {Element} form
+         */
+        _createForm: function(iframe){
+            var settings = this._settings;
+                        
+            // We can't use the following code in IE6
+            // var form = document.createElement('form');
+            // form.setAttribute('method', 'post');
+            // form.setAttribute('enctype', 'multipart/form-data');
+            // Because in this case file won't be attached to request                    
+            var form = toElement('<form method="post" enctype="multipart/form-data"></form>');
+                        
+            form.setAttribute('action', settings.action);
+            form.setAttribute('target', iframe.name);                                   
+            form.style.display = 'none';
+            document.body.appendChild(form);
+            
+            // Create hidden input element for each data key
+            for (var prop in settings.data) {
+                if (settings.data.hasOwnProperty(prop)){
+                    var el = document.createElement("input");
+                    el.setAttribute('type', 'hidden');
+                    el.setAttribute('name', prop);
+                    el.setAttribute('value', settings.data[prop]);
+                    form.appendChild(el);
+                }
+            }
+            return form;
+        },
+        /**
+         * Gets response from iframe and fires onComplete event when ready
+         * @param iframe
+         * @param file Filename to use in onComplete callback 
+         */
+        _getResponse : function(iframe, file){            
+            // getting response
+            var toDeleteFlag = false, self = this, settings = this._settings;   
+               
+            addEvent(iframe, 'load', function(){                
+                
+                if (// For Safari 
+                    iframe.src == "javascript:'%3Chtml%3E%3C/html%3E';" ||
+                    // For FF, IE
+                    iframe.src == "javascript:'<html></html>';"){                                                                        
+                        // First time around, do not delete.
+                        // We reload to blank page, so that reloading main page
+                        // does not re-submit the post.
+                        
+                        if (toDeleteFlag) {
+                            // Fix busy state in FF3
+                            setTimeout(function(){
+                                removeNode(iframe);
+                            }, 0);
+                        }
+                                                
+                        return;
+                }
+                
+                var doc = iframe.contentDocument ? iframe.contentDocument : window.frames[iframe.id].document;
+                
+                // fixing Opera 9.26,10.00
+                if (doc.readyState && doc.readyState != 'complete') {
+                   // Opera fires load event multiple times
+                   // Even when the DOM is not ready yet
+                   // this fix should not affect other browsers
+                   return;
+                }
+                
+                // fixing Opera 9.64
+                if (doc.body && doc.body.innerHTML == "false") {
+                    // In Opera 9.64 event was fired second time
+                    // when body.innerHTML changed from false 
+                    // to server response approx. after 1 sec
+                    return;
+                }
+                
+                var response;
+                
+                if (doc.XMLDocument) {
+                    // response is a xml document Internet Explorer property
+                    response = doc.XMLDocument;
+                } else if (doc.body){
+                    // response is html document or plain text
+                    response = doc.body.innerHTML;
+                    
+                    if (settings.responseType && settings.responseType.toLowerCase() == 'json') {
+                        // If the document was sent as 'application/javascript' or
+                        // 'text/javascript', then the browser wraps the text in a <pre>
+                        // tag and performs html encoding on the contents.  In this case,
+                        // we need to pull the original text content from the text node's
+                        // nodeValue property to retrieve the unmangled content.
+                        // Note that IE6 only understands text/html
+                        if (doc.body.firstChild && doc.body.firstChild.nodeName.toUpperCase() == 'PRE') {
+                            doc.normalize();
+                            response = doc.body.firstChild.firstChild.nodeValue;
+                        }
+                        
+                        if (response) {
+                            response = eval("(" + response + ")");
+                        } else {
+                            response = {};
+                        }
+                    }
+                } else {
+                    // response is a xml document
+                    response = doc;
+                }
+                
+                settings.onComplete.call(self, file, response);
+                
+                // Reload blank page, so that reloading main page
+                // does not re-submit the post. Also, remember to
+                // delete the frame
+                toDeleteFlag = true;
+                
+                // Fix IE mixed content issue
+                iframe.src = "javascript:'<html></html>';";
+            });            
+        },        
+        /**
+         * Upload file contained in this._input
+         */
+        submit: function(){                        
+            var self = this, settings = this._settings;
+            
+            if ( ! this._input || this._input.value === ''){                
+                return;                
+            }
+                                    
+            var file = fileFromPath(this._input.value);
+            
+            // user returned false to cancel upload
+            if (false === settings.onSubmit.call(this, file, getExt(file))){
+                this._clearInput();                
+                return;
+            }
+            
+            // sending request    
+            var iframe = this._createIframe();
+            var form = this._createForm(iframe);
+            
+            // assuming following structure
+            // div -> input type='file'
+            removeNode(this._input.parentNode);            
+            removeClass(self._button, self._settings.hoverClass);
+            removeClass(self._button, self._settings.focusClass);
+                        
+            form.appendChild(this._input);
+                        
+            form.submit();
+
+            // request set, clean up                
+            removeNode(form); form = null;                          
+            removeNode(this._input); this._input = null;            
+            
+            // Get response from iframe and fire onComplete event when ready
+            this._getResponse(iframe, file);            
+
+            // get ready for next request            
+            this._createInput();
+        }
+    };
+})(); 
diff --git a/js/country.js b/js/country.js
new file mode 100644
index 000000000..07ab29ba6
--- /dev/null
+++ b/js/country.js
@@ -0,0 +1,438 @@
+//<!--  Docs at: http://www.microcosmotalk.com/tech/scripts/
+// NOTE:
+// This code is placed into the public domain and may be used in any manner desired.
+// 
+// Jim Carlock obtained the list of country names and state names from an HTML
+// document at Microsoft's website.
+//
+// Thursday, January 13, 2005, 7:00:52 PM
+// 
+var gLngMaxStateLength=0;
+var gLngMaxCountryLength=0;
+var gLngNumberCountries=252;
+var gLngNumberStates=0;
+var gLngSelectedCountry=0;
+var gLngSelectedState=0;
+var gArCountryInfo;
+var gArStateInfo;
+// NOTE:
+// Some editors may exhibit problems viewing 2803 characters...
+var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe";
+var aStates = new Array();
+
+aStates[0]="";
+aStates[1]="|Badakhshan|Badghis|Baghlan|Balkh|Bamian|Farah|Faryab|Ghazni|Ghowr|Helmand|Herat|Jowzjan|Kabol|Kandahar|Kapisa|Konar|Kondoz|Laghman|Lowgar|Nangarhar|Nimruz|Oruzgan|Paktia|Paktika|Parvan|Samangan|Sar-e Pol|Takhar|Vardak|Zabol";
+aStates[2]="|Berat|Bulqize|Delvine|Devoll (Bilisht)|Diber (Peshkopi)|Durres|Elbasan|Fier|Gjirokaster|Gramsh|Has (Krume)|Kavaje|Kolonje (Erseke)|Korce|Kruje|Kucove|Kukes|Kurbin|Lezhe|Librazhd|Lushnje|Malesi e Madhe (Koplik)|Mallakaster (Ballsh)|Mat (Burrel)|Mirdite (Rreshen)|Peqin|Permet|Pogradec|Puke|Sarande|Shkoder|Skrapar (Corovode)|Tepelene|Tirane (Tirana)|Tirane (Tirana)|Tropoje (Bajram Curri)|Vlore";
+aStates[3]="|Adrar|Ain Defla|Ain Temouchent|Alger|Annaba|Batna|Bechar|Bejaia|Biskra|Blida|Bordj Bou Arreridj|Bouira|Boumerdes|Chlef|Constantine|Djelfa|El Bayadh|El Oued|El Tarf|Ghardaia|Guelma|Illizi|Jijel|Khenchela|Laghouat|M'Sila|Mascara|Medea|Mila|Mostaganem|Naama|Oran|Ouargla|Oum el Bouaghi|Relizane|Saida|Setif|Sidi Bel Abbes|Skikda|Souk Ahras|Tamanghasset|Tebessa|Tiaret|Tindouf|Tipaza|Tissemsilt|Tizi Ouzou|Tlemcen";
+aStates[4]="|Eastern|Manu'a|Rose Island|Swains Island|Western";
+aStates[5]="|Andorra la Vella|Bengo|Benguela|Bie|Cabinda|Canillo|Cuando Cubango|Cuanza Norte|Cuanza Sul|Cunene|Encamp|Escaldes-Engordany|Huambo|Huila|La Massana|Luanda|Lunda Norte|Lunda Sul|Malanje|Moxico|Namibe|Ordino|Sant Julia de Loria|Uige|Zaire";
+aStates[6]="|Anguilla";
+aStates[7]="|Antartica";
+aStates[8]="|Barbuda|Redonda|Saint George|Saint John|Saint Mary|Saint Paul|Saint Peter|Saint Philip";
+aStates[9]="|Antartica e Islas del Atlantico Sur|Buenos Aires|Buenos Aires Capital Federal|Catamarca|Chaco|Chubut|Cordoba|Corrientes|Entre Rios|Formosa|Jujuy|La Pampa|La Rioja|Mendoza|Misiones|Neuquen|Rio Negro|Salta|San Juan|San Luis|Santa Cruz|Santa Fe|Santiago del Estero|Tierra del Fuego|Tucuman";
+aStates[10]="|Aragatsotn|Ararat|Armavir|Geghark'unik'|Kotayk'|Lorri|Shirak|Syunik'|Tavush|Vayots' Dzor|Yerevan";
+aStates[11]="|Aruba";
+aStates[12]="|Ashmore and Cartier Island";
+aStates[13]="|Australian Capital Territory|New South Wales|Northern Territory|Queensland|South Australia|Tasmania|Victoria|Western Australia";
+aStates[14]="|Burgenland|Kaernten|Niederoesterreich|Oberoesterreich|Salzburg|Steiermark|Tirol|Vorarlberg|Wien";
+aStates[15]="|Abseron Rayonu|Agcabadi Rayonu|Agdam Rayonu|Agdas Rayonu|Agstafa Rayonu|Agsu Rayonu|Ali Bayramli Sahari|Astara Rayonu|Baki Sahari|Balakan Rayonu|Barda Rayonu|Beylaqan Rayonu|Bilasuvar Rayonu|Cabrayil Rayonu|Calilabad Rayonu|Daskasan Rayonu|Davaci Rayonu|Fuzuli Rayonu|Gadabay Rayonu|Ganca Sahari|Goranboy Rayonu|Goycay Rayonu|Haciqabul Rayonu|Imisli Rayonu|Ismayilli Rayonu|Kalbacar Rayonu|Kurdamir Rayonu|Lacin Rayonu|Lankaran Rayonu|Lankaran Sahari|Lerik Rayonu|Masalli Rayonu|Mingacevir Sahari|Naftalan Sahari|Naxcivan Muxtar Respublikasi|Neftcala Rayonu|Oguz Rayonu|Qabala Rayonu|Qax Rayonu|Qazax Rayonu|Qobustan Rayonu|Quba Rayonu|Qubadli Rayonu|Qusar Rayonu|Saatli Rayonu|Sabirabad Rayonu|Saki Rayonu|Saki Sahari|Salyan Rayonu|Samaxi Rayonu|Samkir Rayonu|Samux Rayonu|Siyazan Rayonu|Sumqayit Sahari|Susa Rayonu|Susa Sahari|Tartar Rayonu|Tovuz Rayonu|Ucar Rayonu|Xacmaz Rayonu|Xankandi Sahari|Xanlar Rayonu|Xizi Rayonu|Xocali Rayonu|Xocavand Rayonu|Yardimli Rayonu|Yevlax Rayonu|Yevlax Sahari|Zangilan Rayonu|Zaqatala Rayonu|Zardab Rayonu";
+aStates[16]="|Acklins and Crooked Islands|Bimini|Cat Island|Exuma|Freeport|Fresh Creek|Governor's Harbour|Green Turtle Cay|Harbour Island|High Rock|Inagua|Kemps Bay|Long Island|Marsh Harbour|Mayaguana|New Providence|Nicholls Town and Berry Islands|Ragged Island|Rock Sound|San Salvador and Rum Cay|Sandy Point";
+aStates[17]="|Al Hadd|Al Manamah|Al Mintaqah al Gharbiyah|Al Mintaqah al Wusta|Al Mintaqah ash Shamaliyah|Al Muharraq|Ar Rifa' wa al Mintaqah al Janubiyah|Jidd Hafs|Juzur Hawar|Madinat 'Isa|Madinat Hamad|Sitrah";
+aStates[18]="|Barisal|Chittagong|Dhaka|Khulna|Rajshahi|Sylhet";
+aStates[19]="|Bridgetown|Christ Church|Saint Andrew|Saint George|Saint James|Saint John|Saint Joseph|Saint Lucy|Saint Michael|Saint Peter|Saint Philip|Saint Thomas";
+aStates[20]="|Brestskaya (Brest)|Homyel'skaya (Homyel')|Horad Minsk|Hrodzyenskaya (Hrodna)|Mahilyowskaya (Mahilyow)|Minskaya|Vitsyebskaya (Vitsyebsk)";
+aStates[21]="|Antwerpen|Brabant Wallon|Brussels Capitol Region|Hainaut|Liege|Limburg|Luxembourg|Namur|Oost-Vlaanderen|Vlaams Brabant|West-Vlaanderen";
+aStates[22]="|Belize|Cayo|Corozal|Orange Walk|Stann Creek|Toledo";
+aStates[23]="|Alibori|Atakora|Atlantique|Borgou|Collines|Couffo|Donga|Littoral|Mono|Oueme|Plateau|Zou";
+aStates[24]="|Devonshire|Hamilton|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick";
+aStates[25]="|Bumthang|Chhukha|Chirang|Daga|Geylegphug|Ha|Lhuntshi|Mongar|Paro|Pemagatsel|Punakha|Samchi|Samdrup Jongkhar|Shemgang|Tashigang|Thimphu|Tongsa|Wangdi Phodrang";
+aStates[26]="|Beni|Chuquisaca|Cochabamba|La Paz|Oruro|Pando|Potosi|Santa Cruz|Tarija";
+aStates[27]="|Federation of Bosnia and Herzegovina|Republika Srpska";
+aStates[28]="|Central|Chobe|Francistown|Gaborone|Ghanzi|Kgalagadi|Kgatleng|Kweneng|Lobatse|Ngamiland|North-East|Selebi-Pikwe|South-East|Southern";
+aStates[29]="|Acre|Alagoas|Amapa|Amazonas|Bahia|Ceara|Distrito Federal|Espirito Santo|Goias|Maranhao|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Para|Paraiba|Parana|Pernambuco|Piaui|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondonia|Roraima|Santa Catarina|Sao Paulo|Sergipe|Tocantins";
+aStates[30]="|Anegada|Jost Van Dyke|Tortola|Virgin Gorda";
+aStates[31]="|Belait|Brunei and Muara|Temburong|Tutong";
+aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Khaskovo|Kurdzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Ruse|Shumen|Silistra|Sliven|Smolyan|Sofiya|Sofiya-Grad|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";
+aStates[33]="|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komandjari|Kompienga|Kossi|Koupelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Naumbiel|Nayala|Oubritenga|Oudalan|Passore|Poni|Samentenga|Sanguie|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondomo|Zoundweogo";
+aStates[34]="|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon";
+aStates[35]="|Bubanza|Bujumbura|Bururi|Cankuzo|Cibitoke|Gitega|Karuzi|Kayanza|Kirundo|Makamba|Muramvya|Muyinga|Mwaro|Ngozi|Rutana|Ruyigi";
+aStates[36]="|Banteay Mean Cheay|Batdambang|Kampong Cham|Kampong Chhnang|Kampong Spoe|Kampong Thum|Kampot|Kandal|Kaoh Kong|Keb|Kracheh|Mondol Kiri|Otdar Mean Cheay|Pailin|Phnum Penh|Pouthisat|Preah Seihanu (Sihanoukville)|Preah Vihear|Prey Veng|Rotanah Kiri|Siem Reab|Stoeng Treng|Svay Rieng|Takev";
+aStates[37]="|Adamaoua|Centre|Est|Extreme-Nord|Littoral|Nord|Nord-Ouest|Ouest|Sud|Sud-Ouest";
+aStates[38]="|Alberta|British Columbia|Manitoba|New Brunswick|Newfoundland|Northwest Territories|Nova Scotia|Nunavut|Ontario|Prince Edward Island|Quebec|Saskatchewan|Yukon Territory";
+aStates[39]="|Boa Vista|Brava|Maio|Mosteiros|Paul|Porto Novo|Praia|Ribeira Grande|Sal|Santa Catarina|Santa Cruz|Sao Domingos|Sao Filipe|Sao Nicolau|Sao Vicente|Tarrafal";
+aStates[40]="|Creek|Eastern|Midland|South Town|Spot Bay|Stake Bay|West End|Western";
+aStates[41]="|Bamingui-Bangoran|Bangui|Basse-Kotto|Gribingui|Haut-Mbomou|Haute-Kotto|Haute-Sangha|Kemo-Gribingui|Lobaye|Mbomou|Nana-Mambere|Ombella-Mpoko|Ouaka|Ouham|Ouham-Pende|Sangha|Vakaga";
+aStates[42]="|Batha|Biltine|Borkou-Ennedi-Tibesti|Chari-Baguirmi|Guera|Kanem|Lac|Logone Occidental|Logone Oriental|Mayo-Kebbi|Moyen-Chari|Ouaddai|Salamat|Tandjile";
+aStates[43]="|Aisen del General Carlos Ibanez del Campo|Antofagasta|Araucania|Atacama|Bio-Bio|Coquimbo|Libertador General Bernardo O'Higgins|Los Lagos|Magallanes y de la Antartica Chilena|Maule|Region Metropolitana (Santiago)|Tarapaca|Valparaiso";
+aStates[44]="|Anhui|Beijing|Chongqing|Fujian|Gansu|Guangdong|Guangxi|Guizhou|Hainan|Hebei|Heilongjiang|Henan|Hubei|Hunan|Jiangsu|Jiangxi|Jilin|Liaoning|Nei Mongol|Ningxia|Qinghai|Shaanxi|Shandong|Shanghai|Shanxi|Sichuan|Tianjin|Xinjiang|Xizang (Tibet)|Yunnan|Zhejiang";
+aStates[45]="|Christmas Island";
+aStates[46]="|Clipperton Island";
+aStates[47]="|Direction Island|Home Island|Horsburgh Island|North Keeling Island|South Island|West Island";
+aStates[48]="|Amazonas|Antioquia|Arauca|Atlantico|Bolivar|Boyaca|Caldas|Caqueta|Casanare|Cauca|Cesar|Choco|Cordoba|Cundinamarca|Distrito Capital de Santa Fe de Bogota|Guainia|Guaviare|Huila|La Guajira|Magdalena|Meta|Narino|Norte de Santander|Putumayo|Quindio|Risaralda|San Andres y Providencia|Santander|Sucre|Tolima|Valle del Cauca|Vaupes|Vichada";
+// <!-- -->
+aStates[49]="|Anjouan (Nzwani)|Domoni|Fomboni|Grande Comore (Njazidja)|Moheli (Mwali)|Moroni|Moutsamoudou";
+aStates[50]="|Bandundu|Bas-Congo|Equateur|Kasai-Occidental|Kasai-Oriental|Katanga|Kinshasa|Maniema|Nord-Kivu|Orientale|Sud-Kivu";
+aStates[51]="|Bouenza|Brazzaville|Cuvette|Kouilou|Lekoumou|Likouala|Niari|Plateaux|Pool|Sangha";
+aStates[52]="|Aitutaki|Atiu|Avarua|Mangaia|Manihiki|Manuae|Mauke|Mitiaro|Nassau Island|Palmerston|Penrhyn|Pukapuka|Rakahanga|Rarotonga|Suwarrow|Takutea";
+aStates[53]="|Alajuela|Cartago|Guanacaste|Heredia|Limon|Puntarenas|San Jose";
+aStates[54]="|Abengourou|Abidjan|Aboisso|Adiake'|Adzope|Agboville|Agnibilekrou|Ale'pe'|Bangolo|Beoumi|Biankouma|Bocanda|Bondoukou|Bongouanou|Bouafle|Bouake|Bouna|Boundiali|Dabakala|Dabon|Daloa|Danane|Daoukro|Dimbokro|Divo|Duekoue|Ferkessedougou|Gagnoa|Grand Bassam|Grand-Lahou|Guiglo|Issia|Jacqueville|Katiola|Korhogo|Lakota|Man|Mankono|Mbahiakro|Odienne|Oume|Sakassou|San-Pedro|Sassandra|Seguela|Sinfra|Soubre|Tabou|Tanda|Tiassale|Tiebissou|Tingrela|Touba|Toulepleu|Toumodi|Vavoua|Yamoussoukro|Zuenoula";
+aStates[55]="|Bjelovarsko-Bilogorska Zupanija|Brodsko-Posavska Zupanija|Dubrovacko-Neretvanska Zupanija|Istarska Zupanija|Karlovacka Zupanija|Koprivnicko-Krizevacka Zupanija|Krapinsko-Zagorska Zupanija|Licko-Senjska Zupanija|Medimurska Zupanija|Osjecko-Baranjska Zupanija|Pozesko-Slavonska Zupanija|Primorsko-Goranska Zupanija|Sibensko-Kninska Zupanija|Sisacko-Moslavacka Zupanija|Splitsko-Dalmatinska Zupanija|Varazdinska Zupanija|Viroviticko-Podravska Zupanija|Vukovarsko-Srijemska Zupanija|Zadarska Zupanija|Zagreb|Zagrebacka Zupanija";
+aStates[56]="|Camaguey|Ciego de Avila|Cienfuegos|Ciudad de La Habana|Granma|Guantanamo|Holguin|Isla de la Juventud|La Habana|Las Tunas|Matanzas|Pinar del Rio|Sancti Spiritus|Santiago de Cuba|Villa Clara";
+aStates[57]="|Famagusta|Kyrenia|Larnaca|Limassol|Nicosia|Paphos";
+aStates[58]="|Brnensky|Budejovicky|Jihlavsky|Karlovarsky|Kralovehradecky|Liberecky|Olomoucky|Ostravsky|Pardubicky|Plzensky|Praha|Stredocesky|Ustecky|Zlinsky";
+aStates[59]="|Arhus|Bornholm|Fredericksberg|Frederiksborg|Fyn|Kobenhavn|Kobenhavns|Nordjylland|Ribe|Ringkobing|Roskilde|Sonderjylland|Storstrom|Vejle|Vestsjalland|Viborg";
+aStates[60]="|'Ali Sabih|Dikhil|Djibouti|Obock|Tadjoura";
+aStates[61]="|Saint Andrew|Saint David|Saint George|Saint John|Saint Joseph|Saint Luke|Saint Mark|Saint Patrick|Saint Paul|Saint Peter";
+aStates[62]="|Azua|Baoruco|Barahona|Dajabon|Distrito Nacional|Duarte|El Seibo|Elias Pina|Espaillat|Hato Mayor|Independencia|La Altagracia|La Romana|La Vega|Maria Trinidad Sanchez|Monsenor Nouel|Monte Cristi|Monte Plata|Pedernales|Peravia|Puerto Plata|Salcedo|Samana|San Cristobal|San Juan|San Pedro de Macoris|Sanchez Ramirez|Santiago|Santiago Rodriguez|Valverde";
+// <!-- -->
+aStates[63]="|Azuay|Bolivar|Canar|Carchi|Chimborazo|Cotopaxi|El Oro|Esmeraldas|Galapagos|Guayas|Imbabura|Loja|Los Rios|Manabi|Morona-Santiago|Napo|Orellana|Pastaza|Pichincha|Sucumbios|Tungurahua|Zamora-Chinchipe";
+aStates[64]="|Ad Daqahliyah|Al Bahr al Ahmar|Al Buhayrah|Al Fayyum|Al Gharbiyah|Al Iskandariyah|Al Isma'iliyah|Al Jizah|Al Minufiyah|Al Minya|Al Qahirah|Al Qalyubiyah|Al Wadi al Jadid|As Suways|Ash Sharqiyah|Aswan|Asyut|Bani Suwayf|Bur Sa'id|Dumyat|Janub Sina'|Kafr ash Shaykh|Matruh|Qina|Shamal Sina'|Suhaj";
+aStates[65]="|Ahuachapan|Cabanas|Chalatenango|Cuscatlan|La Libertad|La Paz|La Union|Morazan|San Miguel|San Salvador|San Vicente|Santa Ana|Sonsonate|Usulutan";
+aStates[66]="|Annobon|Bioko Norte|Bioko Sur|Centro Sur|Kie-Ntem|Litoral|Wele-Nzas";
+aStates[67]="|Akale Guzay|Barka|Denkel|Hamasen|Sahil|Semhar|Senhit|Seraye";
+aStates[68]="|Harjumaa (Tallinn)|Hiiumaa (Kardla)|Ida-Virumaa (Johvi)|Jarvamaa (Paide)|Jogevamaa (Jogeva)|Laane-Virumaa (Rakvere)|Laanemaa (Haapsalu)|Parnumaa (Parnu)|Polvamaa (Polva)|Raplamaa (Rapla)|Saaremaa (Kuessaare)|Tartumaa (Tartu)|Valgamaa (Valga)|Viljandimaa (Viljandi)|Vorumaa (Voru)"
+aStates[69]="|Adis Abeba (Addis Ababa)|Afar|Amara|Dire Dawa|Gambela Hizboch|Hareri Hizb|Oromiya|Sumale|Tigray|YeDebub Biheroch Bihereseboch na Hizboch";
+aStates[70]="|Europa Island";
+aStates[71]="|Falkland Islands (Islas Malvinas)"
+aStates[72]="|Bordoy|Eysturoy|Mykines|Sandoy|Skuvoy|Streymoy|Suduroy|Tvoroyri|Vagar";
+aStates[73]="|Central|Eastern|Northern|Rotuma|Western";
+aStates[74]="|Aland|Etela-Suomen Laani|Ita-Suomen Laani|Lansi-Suomen Laani|Lappi|Oulun Laani";
+aStates[75]="|Alsace|Aquitaine|Auvergne|Basse-Normandie|Bourgogne|Bretagne|Centre|Champagne-Ardenne|Corse|Franche-Comte|Haute-Normandie|Ile-de-France|Languedoc-Roussillon|Limousin|Lorraine|Midi-Pyrenees|Nord-Pas-de-Calais|Pays de la Loire|Picardie|Poitou-Charentes|Provence-Alpes-Cote d'Azur|Rhone-Alpes";
+aStates[76]="|French Guiana";
+aStates[77]="|Archipel des Marquises|Archipel des Tuamotu|Archipel des Tubuai|Iles du Vent|Iles Sous-le-Vent";
+aStates[78]="|Adelie Land|Ile Crozet|Iles Kerguelen|Iles Saint-Paul et Amsterdam";
+aStates[79]="|Estuaire|Haut-Ogooue|Moyen-Ogooue|Ngounie|Nyanga|Ogooue-Ivindo|Ogooue-Lolo|Ogooue-Maritime|Woleu-Ntem";
+aStates[80]="|Banjul|Central River|Lower River|North Bank|Upper River|Western";
+aStates[81]="|Gaza Strip";
+aStates[82]="|Abashis|Abkhazia or Ap'khazet'is Avtonomiuri Respublika (Sokhumi)|Adigenis|Ajaria or Acharis Avtonomiuri Respublika (Bat'umi)|Akhalgoris|Akhalk'alak'is|Akhalts'ikhis|Akhmetis|Ambrolauris|Aspindzis|Baghdat'is|Bolnisis|Borjomis|Ch'khorotsqus|Ch'okhatauris|Chiat'ura|Dedop'listsqaros|Dmanisis|Dushet'is|Gardabanis|Gori|Goris|Gurjaanis|Javis|K'arelis|K'ut'aisi|Kaspis|Kharagaulis|Khashuris|Khobis|Khonis|Lagodekhis|Lanch'khut'is|Lentekhis|Marneulis|Martvilis|Mestiis|Mts'khet'is|Ninotsmindis|Onis|Ozurget'is|P'ot'i|Qazbegis|Qvarlis|Rust'avi|Sach'kheris|Sagarejos|Samtrediis|Senakis|Sighnaghis|T'bilisi|T'elavis|T'erjolis|T'et'ritsqaros|T'ianet'is|Tqibuli|Ts'ageris|Tsalenjikhis|Tsalkis|Tsqaltubo|Vanis|Zestap'onis|Zugdidi|Zugdidis";
+aStates[83]="|Baden-Wuerttemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thueringen";
+aStates[84]="|Ashanti|Brong-Ahafo|Central|Eastern|Greater Accra|Northern|Upper East|Upper West|Volta|Western";
+aStates[85]="|Gibraltar";
+aStates[86]="|Ile du Lys|Ile Glorieuse";
+aStates[87]="|Aitolia kai Akarnania|Akhaia|Argolis|Arkadhia|Arta|Attiki|Ayion Oros (Mt. Athos)|Dhodhekanisos|Drama|Evritania|Evros|Evvoia|Florina|Fokis|Fthiotis|Grevena|Ilia|Imathia|Ioannina|Irakleion|Kardhitsa|Kastoria|Kavala|Kefallinia|Kerkyra|Khalkidhiki|Khania|Khios|Kikladhes|Kilkis|Korinthia|Kozani|Lakonia|Larisa|Lasithi|Lesvos|Levkas|Magnisia|Messinia|Pella|Pieria|Preveza|Rethimni|Rodhopi|Samos|Serrai|Thesprotia|Thessaloniki|Trikala|Voiotia|Xanthi|Zakinthos";
+aStates[88]="|Avannaa (Nordgronland)|Kitaa (Vestgronland)|Tunu (Ostgronland)"
+aStates[89]="|Carriacou and Petit Martinique|Saint Andrew|Saint David|Saint George|Saint John|Saint Mark|Saint Patrick";
+aStates[90]="|Basse-Terre|Grande-Terre|Iles de la Petite Terre|Iles des Saintes|Marie-Galante";
+aStates[91]="|Guam";
+aStates[92]="|Alta Verapaz|Baja Verapaz|Chimaltenango|Chiquimula|El Progreso|Escuintla|Guatemala|Huehuetenango|Izabal|Jalapa|Jutiapa|Peten|Quetzaltenango|Quiche|Retalhuleu|Sacatepequez|San Marcos|Santa Rosa|Solola|Suchitepequez|Totonicapan|Zacapa";
+aStates[93]="|Castel|Forest|St. Andrew|St. Martin|St. Peter Port|St. Pierre du Bois|St. Sampson|St. Saviour|Torteval|Vale";
+aStates[94]="|Beyla|Boffa|Boke|Conakry|Coyah|Dabola|Dalaba|Dinguiraye|Dubreka|Faranah|Forecariah|Fria|Gaoual|Gueckedou|Kankan|Kerouane|Kindia|Kissidougou|Koubia|Koundara|Kouroussa|Labe|Lelouma|Lola|Macenta|Mali|Mamou|Mandiana|Nzerekore|Pita|Siguiri|Telimele|Tougue|Yomou";
+aStates[95]="|Bafata|Biombo|Bissau|Bolama-Bijagos|Cacheu|Gabu|Oio|Quinara|Tombali";
+aStates[96]="|Barima-Waini|Cuyuni-Mazaruni|Demerara-Mahaica|East Berbice-Corentyne|Essequibo Islands-West Demerara|Mahaica-Berbice|Pomeroon-Supenaam|Potaro-Siparuni|Upper Demerara-Berbice|Upper Takutu-Upper Essequibo";
+aStates[97]="|Artibonite|Centre|Grand'Anse|Nord|Nord-Est|Nord-Ouest|Ouest|Sud|Sud-Est";
+aStates[98]="|Heard Island and McDonald Islands";
+aStates[99]="|Holy See (Vatican City)"
+aStates[100]="|Atlantida|Choluteca|Colon|Comayagua|Copan|Cortes|El Paraiso|Francisco Morazan|Gracias a Dios|Intibuca|Islas de la Bahia|La Paz|Lempira|Ocotepeque|Olancho|Santa Barbara|Valle|Yoro";
+aStates[101]="|Hong Kong";
+aStates[102]="|Howland Island";
+aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem|Zala|Zalaegerszeg";
+aStates[104]="|Akranes|Akureyri|Arnessysla|Austur-Bardhastrandarsysla|Austur-Hunavatnssysla|Austur-Skaftafellssysla|Borgarfjardharsysla|Dalasysla|Eyjafjardharsysla|Gullbringusysla|Hafnarfjordhur|Husavik|Isafjordhur|Keflavik|Kjosarsysla|Kopavogur|Myrasysla|Neskaupstadhur|Nordhur-Isafjardharsysla|Nordhur-Mulasys-la|Nordhur-Thingeyjarsysla|Olafsfjordhur|Rangarvallasysla|Reykjavik|Saudharkrokur|Seydhisfjordhur|Siglufjordhur|Skagafjardharsysla|Snaefellsnes-og Hnappadalssysla|Strandasysla|Sudhur-Mulasysla|Sudhur-Thingeyjarsysla|Vesttmannaeyjar|Vestur-Bardhastrandarsysla|Vestur-Hunavatnssysla|Vestur-Isafjardharsysla|Vestur-Skaftafellssysla";
+aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assam|Bihar|Chandigarh|Chhattisgarh|Dadra and Nagar Haveli|Daman and Diu|Delhi|Goa|Gujarat|Haryana|Himachal Pradesh|Jammu and Kashmir|Jharkhand|Karnataka|Kerala|Lakshadweep|Madhya Pradesh|Maharashtra|Manipur|Meghalaya|Mizoram|Nagaland|Orissa|Pondicherry|Punjab|Rajasthan|Sikkim|Tamil Nadu|Tripura|Uttar Pradesh|Uttaranchal|West Bengal";
+aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";
+aStates[107]="|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan";
+aStates[108]="|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit";
+aStates[109]="|Carlow|Cavan|Clare|Cork|Donegal|Dublin|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Waterford|Westmeath|Wexford|Wicklow";
+aStates[110]="|Antrim|Ards|Armagh|Ballymena|Ballymoney|Banbridge|Belfast|Carrickfergus|Castlereagh|Coleraine|Cookstown|Craigavon|Derry|Down|Dungannon|Fermanagh|Larne|Limavady|Lisburn|Magherafelt|Moyle|Newry and Mourne|Newtownabbey|North Down|Omagh|Strabane";
+aStates[111]="|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv";
+aStates[112]="|Abruzzi|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto";
+aStates[113]="|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland";
+aStates[114]="|Jan Mayen";
+aStates[115]="|Aichi|Akita|Aomori|Chiba|Ehime|Fukui|Fukuoka|Fukushima|Gifu|Gumma|Hiroshima|Hokkaido|Hyogo|Ibaraki|Ishikawa|Iwate|Kagawa|Kagoshima|Kanagawa|Kochi|Kumamoto|Kyoto|Mie|Miyagi|Miyazaki|Nagano|Nagasaki|Nara|Niigata|Oita|Okayama|Okinawa|Osaka|Saga|Saitama|Shiga|Shimane|Shizuoka|Tochigi|Tokushima|Tokyo|Tottori|Toyama|Wakayama|Yamagata|Yamaguchi|Yamanashi";
+aStates[116]="|Jarvis Island";
+aStates[117]="|Jersey";
+aStates[118]="|Johnston Atoll";
+aStates[119]="|'Amman|Ajlun|Al 'Aqabah|Al Balqa'|Al Karak|Al Mafraq|At Tafilah|Az Zarqa'|Irbid|Jarash|Ma'an|Madaba";
+aStates[120]="|Juan de Nova Island";
+aStates[121]="|Almaty|Aqmola|Aqtobe|Astana|Atyrau|Batys Qazaqstan|Bayqongyr|Mangghystau|Ongtustik Qazaqstan|Pavlodar|Qaraghandy|Qostanay|Qyzylorda|Shyghys Qazaqstan|Soltustik Qazaqstan|Zhambyl";
+aStates[122]="|Central|Coast|Eastern|Nairobi Area|North Eastern|Nyanza|Rift Valley|Western";
+aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba|Banaba|Beru|Butaritari|Central Gilberts|Gilbert Islands|Kanton|Kiritimati|Kuria|Line Islands|Line Islands|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts|Onotoa|Phoenix Islands|Southern Gilberts|Tabiteuea|Tabuaeran|Tamana|Tarawa|Tarawa|Teraina";
+aStates[124]="|Chagang-do (Chagang Province)|Hamgyong-bukto (North Hamgyong Province)|Hamgyong-namdo (South Hamgyong Province)|Hwanghae-bukto (North Hwanghae Province)|Hwanghae-namdo (South Hwanghae Province)|Kaesong-si (Kaesong City)|Kangwon-do (Kangwon Province)|Namp'o-si (Namp'o City)|P'yongan-bukto (North P'yongan Province)|P'yongan-namdo (South P'yongan Province)|P'yongyang-si (P'yongyang City)|Yanggang-do (Yanggang Province)"
+aStates[125]="|Ch'ungch'ong-bukto|Ch'ungch'ong-namdo|Cheju-do|Cholla-bukto|Cholla-namdo|Inch'on-gwangyoksi|Kangwon-do|Kwangju-gwangyoksi|Kyonggi-do|Kyongsang-bukto|Kyongsang-namdo|Pusan-gwangyoksi|Soul-t'ukpyolsi|Taegu-gwangyoksi|Taejon-gwangyoksi|Ulsan-gwangyoksi";
+aStates[126]="|Al 'Asimah|Al Ahmadi|Al Farwaniyah|Al Jahra'|Hawalli";
+aStates[127]="|Batken Oblasty|Bishkek Shaary|Chuy Oblasty (Bishkek)|Jalal-Abad Oblasty|Naryn Oblasty|Osh Oblasty|Talas Oblasty|Ysyk-Kol Oblasty (Karakol)"
+aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang";
+aStates[129]="|Aizkraukles Rajons|Aluksnes Rajons|Balvu Rajons|Bauskas Rajons|Cesu Rajons|Daugavpils|Daugavpils Rajons|Dobeles Rajons|Gulbenes Rajons|Jekabpils Rajons|Jelgava|Jelgavas Rajons|Jurmala|Kraslavas Rajons|Kuldigas Rajons|Leipaja|Liepajas Rajons|Limbazu Rajons|Ludzas Rajons|Madonas Rajons|Ogres Rajons|Preilu Rajons|Rezekne|Rezeknes Rajons|Riga|Rigas Rajons|Saldus Rajons|Talsu Rajons|Tukuma Rajons|Valkas Rajons|Valmieras Rajons|Ventspils|Ventspils Rajons";
+aStates[130]="|Beyrouth|Ech Chimal|Ej Jnoub|El Bekaa|Jabal Loubnane";
+aStates[131]="|Berea|Butha-Buthe|Leribe|Mafeteng|Maseru|Mohales Hoek|Mokhotlong|Qacha's Nek|Quthing|Thaba-Tseka";
+aStates[132]="|Bomi|Bong|Grand Bassa|Grand Cape Mount|Grand Gedeh|Grand Kru|Lofa|Margibi|Maryland|Montserrado|Nimba|River Cess|Sinoe";
+aStates[133]="|Ajdabiya|Al 'Aziziyah|Al Fatih|Al Jabal al Akhdar|Al Jufrah|Al Khums|Al Kufrah|An Nuqat al Khams|Ash Shati'|Awbari|Az Zawiyah|Banghazi|Darnah|Ghadamis|Gharyan|Misratah|Murzuq|Sabha|Sawfajjin|Surt|Tarabulus|Tarhunah|Tubruq|Yafran|Zlitan";
+aStates[134]="|Balzers|Eschen|Gamprin|Mauren|Planken|Ruggell|Schaan|Schellenberg|Triesen|Triesenberg|Vaduz";
+aStates[135]="|Akmenes Rajonas|Alytaus Rajonas|Alytus|Anyksciu Rajonas|Birstonas|Birzu Rajonas|Druskininkai|Ignalinos Rajonas|Jonavos Rajonas|Joniskio Rajonas|Jurbarko Rajonas|Kaisiadoriu Rajonas|Kaunas|Kauno Rajonas|Kedainiu Rajonas|Kelmes Rajonas|Klaipeda|Klaipedos Rajonas|Kretingos Rajonas|Kupiskio Rajonas|Lazdiju Rajonas|Marijampole|Marijampoles Rajonas|Mazeikiu Rajonas|Moletu Rajonas|Neringa Pakruojo Rajonas|Palanga|Panevezio Rajonas|Panevezys|Pasvalio Rajonas|Plunges Rajonas|Prienu Rajonas|Radviliskio Rajonas|Raseiniu Rajonas|Rokiskio Rajonas|Sakiu Rajonas|Salcininku Rajonas|Siauliai|Siauliu Rajonas|Silales Rajonas|Silutes Rajonas|Sirvintu Rajonas|Skuodo Rajonas|Svencioniu Rajonas|Taurages Rajonas|Telsiu Rajonas|Traku Rajonas|Ukmerges Rajonas|Utenos Rajonas|Varenos Rajonas|Vilkaviskio Rajonas|Vilniaus Rajonas|Vilnius|Zarasu Rajonas";
+aStates[136]="|Diekirch|Grevenmacher|Luxembourg";
+aStates[137]="|Macau";
+aStates[138]="|Aracinovo|Bac|Belcista|Berovo|Bistrica|Bitola|Blatec|Bogdanci|Bogomila|Bogovinje|Bosilovo|Brvenica|Cair (Skopje)|Capari|Caska|Cegrane|Centar (Skopje)|Centar Zupa|Cesinovo|Cucer-Sandevo|Debar|Delcevo|Delogozdi|Demir Hisar|Demir Kapija|Dobrusevo|Dolna Banjica|Dolneni|Dorce Petrov (Skopje)|Drugovo|Dzepciste|Gazi Baba (Skopje)|Gevgelija|Gostivar|Gradsko|Ilinden|Izvor|Jegunovce|Kamenjane|Karbinci|Karpos (Skopje)|Kavadarci|Kicevo|Kisela Voda (Skopje)|Klecevce|Kocani|Konce|Kondovo|Konopiste|Kosel|Kratovo|Kriva Palanka|Krivogastani|Krusevo|Kuklis|Kukurecani|Kumanovo|Labunista|Lipkovo|Lozovo|Lukovo|Makedonska Kamenica|Makedonski Brod|Mavrovi Anovi|Meseista|Miravci|Mogila|Murtino|Negotino|Negotino-Poloska|Novaci|Novo Selo|Oblesevo|Ohrid|Orasac|Orizari|Oslomej|Pehcevo|Petrovec|Plasnia|Podares|Prilep|Probistip|Radovis|Rankovce|Resen|Rosoman|Rostusa|Samokov|Saraj|Sipkovica|Sopiste|Sopotnika|Srbinovo|Star Dojran|Staravina|Staro Nagoricane|Stip|Struga|Strumica|Studenicani|Suto Orizari (Skopje)|Sveti Nikole|Tearce|Tetovo|Topolcani|Valandovo|Vasilevo|Veles|Velesta|Vevcani|Vinica|Vitoliste|Vranestica|Vrapciste|Vratnica|Vrutok|Zajas|Zelenikovo|Zileno|Zitose|Zletovo|Zrnovci";
+aStates[139]="|Antananarivo|Antsiranana|Fianarantsoa|Mahajanga|Toamasina|Toliara";
+aStates[140]="|Balaka|Blantyre|Chikwawa|Chiradzulu|Chitipa|Dedza|Dowa|Karonga|Kasungu|Likoma|Lilongwe|Machinga (Kasupe)|Mangochi|Mchinji|Mulanje|Mwanza|Mzimba|Nkhata Bay|Nkhotakota|Nsanje|Ntcheu|Ntchisi|Phalombe|Rumphi|Salima|Thyolo|Zomba";
+aStates[141]="|Johor|Kedah|Kelantan|Labuan|Melaka|Negeri Sembilan|Pahang|Perak|Perlis|Pulau Pinang|Sabah|Sarawak|Selangor|Terengganu|Wilayah Persekutuan";
+aStates[142]="|Alifu|Baa|Dhaalu|Faafu|Gaafu Alifu|Gaafu Dhaalu|Gnaviyani|Haa Alifu|Haa Dhaalu|Kaafu|Laamu|Lhaviyani|Maale|Meemu|Noonu|Raa|Seenu|Shaviyani|Thaa|Vaavu";
+aStates[143]="|Gao|Kayes|Kidal|Koulikoro|Mopti|Segou|Sikasso|Tombouctou";
+aStates[144]="|Valletta";
+aStates[145]="|Man, Isle of";
+aStates[146]="|Ailinginae|Ailinglaplap|Ailuk|Arno|Aur|Bikar|Bikini|Bokak|Ebon|Enewetak|Erikub|Jabat|Jaluit|Jemo|Kili|Kwajalein|Lae|Lib|Likiep|Majuro|Maloelap|Mejit|Mili|Namorik|Namu|Rongelap|Rongrik|Toke|Ujae|Ujelang|Utirik|Wotho|Wotje";
+aStates[147]="|Martinique";
+aStates[148]="|Adrar|Assaba|Brakna|Dakhlet Nouadhibou|Gorgol|Guidimaka|Hodh Ech Chargui|Hodh El Gharbi|Inchiri|Nouakchott|Tagant|Tiris Zemmour|Trarza";
+aStates[149]="|Agalega Islands|Black River|Cargados Carajos Shoals|Flacq|Grand Port|Moka|Pamplemousses|Plaines Wilhems|Port Louis|Riviere du Rempart|Rodrigues|Savanne";
+aStates[150]="|Mayotte";
+aStates[151]="|Aguascalientes|Baja California|Baja California Sur|Campeche|Chiapas|Chihuahua|Coahuila de Zaragoza|Colima|Distrito Federal|Durango|Guanajuato|Guerrero|Hidalgo|Jalisco|Mexico|Michoacan de Ocampo|Morelos|Nayarit|Nuevo Leon|Oaxaca|Puebla|Queretaro de Arteaga|Quintana Roo|San Luis Potosi|Sinaloa|Sonora|Tabasco|Tamaulipas|Tlaxcala|Veracruz-Llave|Yucatan|Zacatecas";
+aStates[152]="|Chuuk (Truk)|Kosrae|Pohnpei|Yap";
+aStates[153]="|Midway Islands";
+aStates[154]="|Balti|Cahul|Chisinau|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni";
+aStates[155]="|Fontvieille|La Condamine|Monaco-Ville|Monte-Carlo";
+aStates[156]="|Arhangay|Bayan-Olgiy|Bayanhongor|Bulgan|Darhan|Dornod|Dornogovi|Dundgovi|Dzavhan|Erdenet|Govi-Altay|Hentiy|Hovd|Hovsgol|Omnogovi|Ovorhangay|Selenge|Suhbaatar|Tov|Ulaanbaatar|Uvs";
+aStates[157]="|Saint Anthony|Saint Georges|Saint Peter's";
+aStates[158]="|Agadir|Al Hoceima|Azilal|Ben Slimane|Beni Mellal|Boulemane|Casablanca|Chaouen|El Jadida|El Kelaa des Srarhna|Er Rachidia|Essaouira|Fes|Figuig|Guelmim|Ifrane|Kenitra|Khemisset|Khenifra|Khouribga|Laayoune|Larache|Marrakech|Meknes|Nador|Ouarzazate|Oujda|Rabat-Sale|Safi|Settat|Sidi Kacem|Tan-Tan|Tanger|Taounate|Taroudannt|Tata|Taza|Tetouan|Tiznit";
+aStates[159]="|Cabo Delgado|Gaza|Inhambane|Manica|Maputo|Nampula|Niassa|Sofala|Tete|Zambezia";
+aStates[160]="|Caprivi|Erongo|Hardap|Karas|Khomas|Kunene|Ohangwena|Okavango|Omaheke|Omusati|Oshana|Oshikoto|Otjozondjupa";
+aStates[161]="|Aiwo|Anabar|Anetan|Anibare|Baiti|Boe|Buada|Denigomodu|Ewa|Ijuw|Meneng|Nibok|Uaboe|Yaren";
+aStates[162]="|Bagmati|Bheri|Dhawalagiri|Gandaki|Janakpur|Karnali|Kosi|Lumbini|Mahakali|Mechi|Narayani|Rapti|Sagarmatha|Seti";
+aStates[163]="|Drenthe|Flevoland|Friesland|Gelderland|Groningen|Limburg|Noord-Brabant|Noord-Holland|Overijssel|Utrecht|Zeeland|Zuid-Holland";
+aStates[164]="|Netherlands Antilles";
+aStates[165]="|Iles Loyaute|Nord|Sud";
+aStates[166]="|Akaroa|Amuri|Ashburton|Bay of Islands|Bruce|Buller|Chatham Islands|Cheviot|Clifton|Clutha|Cook|Dannevirke|Egmont|Eketahuna|Ellesmere|Eltham|Eyre|Featherston|Franklin|Golden Bay|Great Barrier Island|Grey|Hauraki Plains|Hawera|Hawke's Bay|Heathcote|Hikurangi|Hobson|Hokianga|Horowhenua|Hurunui|Hutt|Inangahua|Inglewood|Kaikoura|Kairanga|Kiwitea|Lake|Mackenzie|Malvern|Manaia|Manawatu|Mangonui|Maniototo|Marlborough|Masterton|Matamata|Mount Herbert|Ohinemuri|Opotiki|Oroua|Otamatea|Otorohanga|Oxford|Pahiatua|Paparua|Patea|Piako|Pohangina|Raglan|Rangiora|Rangitikei|Rodney|Rotorua|Runanga|Saint Kilda|Silverpeaks|Southland|Stewart Island|Stratford|Strathallan|Taranaki|Taumarunui|Taupo|Tauranga|Thames-Coromandel|Tuapeka|Vincent|Waiapu|Waiheke|Waihemo|Waikato|Waikohu|Waimairi|Waimarino|Waimate|Waimate West|Waimea|Waipa|Waipawa|Waipukurau|Wairarapa South|Wairewa|Wairoa|Waitaki|Waitomo|Waitotara|Wallace|Wanganui|Waverley|Westland|Whakatane|Whangarei|Whangaroa|Woodville";
+aStates[167]="|Atlantico Norte|Atlantico Sur|Boaco|Carazo|Chinandega|Chontales|Esteli|Granada|Jinotega|Leon|Madriz|Managua|Masaya|Matagalpa|Nueva Segovia|Rio San Juan|Rivas";
+aStates[168]="|Agadez|Diffa|Dosso|Maradi|Niamey|Tahoua|Tillaberi|Zinder";
+aStates[169]="|Abia|Abuja Federal Capital Territory|Adamawa|Akwa Ibom|Anambra|Bauchi|Bayelsa|Benue|Borno|Cross River|Delta|Ebonyi|Edo|Ekiti|Enugu|Gombe|Imo|Jigawa|Kaduna|Kano|Katsina|Kebbi|Kogi|Kwara|Lagos|Nassarawa|Niger|Ogun|Ondo|Osun|Oyo|Plateau|Rivers|Sokoto|Taraba|Yobe|Zamfara";
+aStates[170]="|Niue";
+aStates[171]="|Norfolk Island";
+aStates[172]="|Northern Islands|Rota|Saipan|Tinian";
+aStates[173]="|Akershus|Aust-Agder|Buskerud|Finnmark|Hedmark|Hordaland|More og Romsdal|Nord-Trondelag|Nordland|Oppland|Oslo|Ostfold|Rogaland|Sogn og Fjordane|Sor-Trondelag|Telemark|Troms|Vest-Agder|Vestfold";
+aStates[174]="|Ad Dakhiliyah|Al Batinah|Al Wusta|Ash Sharqiyah|Az Zahirah|Masqat|Musandam|Zufar";
+aStates[175]="|Balochistan|Federally Administered Tribal Areas|Islamabad Capital Territory|North-West Frontier Province|Punjab|Sindh";
+aStates[176]="|Aimeliik|Airai|Angaur|Hatobohei|Kayangel|Koror|Melekeok|Ngaraard|Ngarchelong|Ngardmau|Ngatpang|Ngchesar|Ngeremlengui|Ngiwal|Palau Island|Peleliu|Sonsoral|Tobi";
+aStates[177]="|Bocas del Toro|Chiriqui|Cocle|Colon|Darien|Herrera|Los Santos|Panama|San Blas|Veraguas";
+aStates[178]="|Bougainville|Central|Chimbu|East New Britain|East Sepik|Eastern Highlands|Enga|Gulf|Madang|Manus|Milne Bay|Morobe|National Capital|New Ireland|Northern|Sandaun|Southern Highlands|West New Britain|Western|Western Highlands";
+aStates[179]="|Alto Paraguay|Alto Parana|Amambay|Asuncion (city)|Boqueron|Caaguazu|Caazapa|Canindeyu|Central|Concepcion|Cordillera|Guaira|Itapua|Misiones|Neembucu|Paraguari|Presidente Hayes|San Pedro";
+aStates[180]="|Amazonas|Ancash|Apurimac|Arequipa|Ayacucho|Cajamarca|Callao|Cusco|Huancavelica|Huanuco|Ica|Junin|La Libertad|Lambayeque|Lima|Loreto|Madre de Dios|Moquegua|Pasco|Piura|Puno|San Martin|Tacna|Tumbes|Ucayali";
+aStates[181]="|Abra|Agusan del Norte|Agusan del Sur|Aklan|Albay|Angeles|Antique|Aurora|Bacolod|Bago|Baguio|Bais|Basilan|Basilan City|Bataan|Batanes|Batangas|Batangas City|Benguet|Bohol|Bukidnon|Bulacan|Butuan|Cabanatuan|Cadiz|Cagayan|Cagayan de Oro|Calbayog|Caloocan|Camarines Norte|Camarines Sur|Camiguin|Canlaon|Capiz|Catanduanes|Cavite|Cavite City|Cebu|Cebu City|Cotabato|Dagupan|Danao|Dapitan|Davao City Davao|Davao del Sur|Davao Oriental|Dipolog|Dumaguete|Eastern Samar|General Santos|Gingoog|Ifugao|Iligan|Ilocos Norte|Ilocos Sur|Iloilo|Iloilo City|Iriga|Isabela|Kalinga-Apayao|La Carlota|La Union|Laguna|Lanao del Norte|Lanao del Sur|Laoag|Lapu-Lapu|Legaspi|Leyte|Lipa|Lucena|Maguindanao|Mandaue|Manila|Marawi|Marinduque|Masbate|Mindoro Occidental|Mindoro Oriental|Misamis Occidental|Misamis Oriental|Mountain|Naga|Negros Occidental|Negros Oriental|North Cotabato|Northern Samar|Nueva Ecija|Nueva Vizcaya|Olongapo|Ormoc|Oroquieta|Ozamis|Pagadian|Palawan|Palayan|Pampanga|Pangasinan|Pasay|Puerto Princesa|Quezon|Quezon City|Quirino|Rizal|Romblon|Roxas|Samar|San Carlos (in Negros Occidental)|San Carlos (in Pangasinan)|San Jose|San Pablo|Silay|Siquijor|Sorsogon|South Cotabato|Southern Leyte|Sultan Kudarat|Sulu|Surigao|Surigao del Norte|Surigao del Sur|Tacloban|Tagaytay|Tagbilaran|Tangub|Tarlac|Tawitawi|Toledo|Trece Martires|Zambales|Zamboanga|Zamboanga del Norte|Zamboanga del Sur";
+aStates[182]="|Pitcaim Islands";
+aStates[183]="|Dolnoslaskie|Kujawsko-Pomorskie|Lodzkie|Lubelskie|Lubuskie|Malopolskie|Mazowieckie|Opolskie|Podkarpackie|Podlaskie|Pomorskie|Slaskie|Swietokrzyskie|Warminsko-Mazurskie|Wielkopolskie|Zachodniopomorskie";
+aStates[184]="|Acores (Azores)|Aveiro|Beja|Braga|Braganca|Castelo Branco|Coimbra|Evora|Faro|Guarda|Leiria|Lisboa|Madeira|Portalegre|Porto|Santarem|Setubal|Viana do Castelo|Vila Real|Viseu";
+aStates[185]="|Adjuntas|Aguada|Aguadilla|Aguas Buenas|Aibonito|Anasco|Arecibo|Arroyo|Barceloneta|Barranquitas|Bayamon|Cabo Rojo|Caguas|Camuy|Canovanas|Carolina|Catano|Cayey|Ceiba|Ciales|Cidra|Coamo|Comerio|Corozal|Culebra|Dorado|Fajardo|Florida|Guanica|Guayama|Guayanilla|Guaynabo|Gurabo|Hatillo|Hormigueros|Humacao|Isabela|Jayuya|Juana Diaz|Juncos|Lajas|Lares|Las Marias|Las Piedras|Loiza|Luquillo|Manati|Maricao|Maunabo|Mayaguez|Moca|Morovis|Naguabo|Naranjito|Orocovis|Patillas|Penuelas|Ponce|Quebradillas|Rincon|Rio Grande|Sabana Grande|Salinas|San German|San Juan|San Lorenzo|San Sebastian|Santa Isabel|Toa Alta|Toa Baja|Trujillo Alto|Utuado|Vega Alta|Vega Baja|Vieques|Villalba|Yabucoa|Yauco";
+aStates[186]="|Ad Dawhah|Al Ghuwayriyah|Al Jumayliyah|Al Khawr|Al Wakrah|Ar Rayyan|Jarayan al Batinah|Madinat ash Shamal|Umm Salal";
+aStates[187]="|Reunion";
+aStates[188]="|Alba|Arad|Arges|Bacau|Bihor|Bistrita-Nasaud|Botosani|Braila|Brasov|Bucuresti|Buzau|Calarasi|Caras-Severin|Cluj|Constanta|Covasna|Dimbovita|Dolj|Galati|Giurgiu|Gorj|Harghita|Hunedoara|Ialomita|Iasi|Maramures|Mehedinti|Mures|Neamt|Olt|Prahova|Salaj|Satu Mare|Sibiu|Suceava|Teleorman|Timis|Tulcea|Vaslui|Vilcea|Vrancea";
+aStates[189]="|Adygeya (Maykop)|Aginskiy Buryatskiy (Aginskoye)|Altay (Gorno-Altaysk)|Altayskiy (Barnaul)|Amurskaya (Blagoveshchensk)|Arkhangel'skaya|Astrakhanskaya|Bashkortostan (Ufa)|Belgorodskaya|Bryanskaya|Buryatiya (Ulan-Ude)|Chechnya (Groznyy)|Chelyabinskaya|Chitinskaya|Chukotskiy (Anadyr')|Chuvashiya (Cheboksary)|Dagestan (Makhachkala)|Evenkiyskiy (Tura)|Ingushetiya (Nazran')|Irkutskaya|Ivanovskaya|Kabardino-Balkariya (Nal'chik)|Kaliningradskaya|Kalmykiya (Elista)|Kaluzhskaya|Kamchatskaya (Petropavlovsk-Kamchatskiy)|Karachayevo-Cherkesiya (Cherkessk)|Kareliya (Petrozavodsk)|Kemerovskaya|Khabarovskiy|Khakasiya (Abakan)|Khanty-Mansiyskiy (Khanty-Mansiysk)|Kirovskaya|Komi (Syktyvkar)|Komi-Permyatskiy (Kudymkar)|Koryakskiy (Palana)|Kostromskaya|Krasnodarskiy|Krasnoyarskiy|Kurganskaya|Kurskaya|Leningradskaya|Lipetskaya|Magadanskaya|Mariy-El (Yoshkar-Ola)|Mordoviya (Saransk)|Moskovskaya|Moskva (Moscow)|Murmanskaya|Nenetskiy (Nar'yan-Mar)|Nizhegorodskaya|Novgorodskaya|Novosibirskaya|Omskaya|Orenburgskaya|Orlovskaya (Orel)|Penzenskaya|Permskaya|Primorskiy (Vladivostok)|Pskovskaya|Rostovskaya|Ryazanskaya|Sakha (Yakutsk)|Sakhalinskaya (Yuzhno-Sakhalinsk)|Samarskaya|Sankt-Peterburg (Saint Petersburg)|Saratovskaya|Severnaya Osetiya-Alaniya [North Ossetia] (Vladikavkaz)|Smolenskaya|Stavropol'skiy|Sverdlovskaya (Yekaterinburg)|Tambovskaya|Tatarstan (Kazan')|Taymyrskiy (Dudinka)|Tomskaya|Tul'skaya|Tverskaya|Tyumenskaya|Tyva (Kyzyl)|Udmurtiya (Izhevsk)|Ul'yanovskaya|Ust'-Ordynskiy Buryatskiy (Ust'-Ordynskiy)|Vladimirskaya|Volgogradskaya|Vologodskaya|Voronezhskaya|Yamalo-Nenetskiy (Salekhard)|Yaroslavskaya|Yevreyskaya";
+aStates[190]="|Butare|Byumba|Cyangugu|Gikongoro|Gisenyi|Gitarama|Kibungo|Kibuye|Kigali Rurale|Kigali-ville|Ruhengeri|Umutara";
+aStates[191]="|Ascension|Saint Helena|Tristan da Cunha";
+aStates[192]="|Christ Church Nichola Town|Saint Anne Sandy Point|Saint George Basseterre|Saint George Gingerland|Saint James Windward|Saint John Capisterre|Saint John Figtree|Saint Mary Cayon|Saint Paul Capisterre|Saint Paul Charlestown|Saint Peter Basseterre|Saint Thomas Lowland|Saint Thomas Middle Island|Trinity Palmetto Point";
+aStates[193]="|Anse-la-Raye|Castries|Choiseul|Dauphin|Dennery|Gros Islet|Laborie|Micoud|Praslin|Soufriere|Vieux Fort";
+aStates[194]="|Miquelon|Saint Pierre";
+aStates[195]="|Charlotte|Grenadines|Saint Andrew|Saint David|Saint George|Saint Patrick";
+aStates[196]="|A'ana|Aiga-i-le-Tai|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|Palauli|Satupa'itea|Tuamasaga|Va'a-o-Fonoti|Vaisigano";
+aStates[197]="|Acquaviva|Borgo Maggiore|Chiesanuova|Domagnano|Faetano|Fiorentino|Monte Giardino|San Marino|Serravalle";
+aStates[198]="|Principe|Sao Tome";
+aStates[199]="|'Asir|Al Bahah|Al Hudud ash Shamaliyah|Al Jawf|Al Madinah|Al Qasim|Ar Riyad|Ash Sharqiyah (Eastern Province)|Ha'il|Jizan|Makkah|Najran|Tabuk";
+aStates[200]="|Aberdeen City|Aberdeenshire|Angus|Argyll and Bute|City of Edinburgh|Clackmannanshire|Dumfries and Galloway|Dundee City|East Ayrshire|East Dunbartonshire|East Lothian|East Renfrewshire|Eilean Siar (Western Isles)|Falkirk|Fife|Glasgow City|Highland|Inverclyde|Midlothian|Moray|North Ayrshire|North Lanarkshire|Orkney Islands|Perth and Kinross|Renfrewshire|Shetland Islands|South Ayrshire|South Lanarkshire|Stirling|The Scottish Borders|West Dunbartonshire|West Lothian";
+aStates[201]="|Dakar|Diourbel|Fatick|Kaolack|Kolda|Louga|Saint-Louis|Tambacounda|Thies|Ziguinchor";
+aStates[202]="|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Louis|Anse Royale|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|Glacis|Grand' Anse (on Mahe)|Grand' Anse (on Praslin)|La Digue|La Riviere Anglaise|Mont Buxton|Mont Fleuri|Plaisance|Pointe La Rue|Port Glaud|Saint Louis|Takamaka";
+aStates[203]="|Eastern|Northern|Southern|Western";
+aStates[204]="|Singapore";
+aStates[205]="|Banskobystricky|Bratislavsky|Kosicky|Nitriansky|Presovsky|Trenciansky|Trnavsky|Zilinsky";
+aStates[206]="|Ajdovscina|Beltinci|Bled|Bohinj|Borovnica|Bovec|Brda|Brezice|Brezovica|Cankova-Tisina|Celje|Cerklje na Gorenjskem|Cerknica|Cerkno|Crensovci|Crna na Koroskem|Crnomelj|Destrnik-Trnovska Vas|Divaca|Dobrepolje|Dobrova-Horjul-Polhov Gradec|Dol pri Ljubljani|Domzale|Dornava|Dravograd|Duplek|Gorenja Vas-Poljane|Gorisnica|Gornja Radgona|Gornji Grad|Gornji Petrovci|Grosuplje|Hodos Salovci|Hrastnik|Hrpelje-Kozina|Idrija|Ig|Ilirska Bistrica|Ivancna Gorica|Izola|Jesenice|Jursinci|Kamnik|Kanal|Kidricevo|Kobarid|Kobilje|Kocevje|Komen|Koper|Kozje|Kranj|Kranjska Gora|Krsko|Kungota|Kuzma|Lasko|Lenart|Lendava|Litija|Ljubljana|Ljubno|Ljutomer|Logatec|Loska Dolina|Loski Potok|Luce|Lukovica|Majsperk|Maribor|Medvode|Menges|Metlika|Mezica|Miren-Kostanjevica|Mislinja|Moravce|Moravske Toplice|Mozirje|Murska Sobota|Muta|Naklo|Nazarje|Nova Gorica|Novo Mesto|Odranci|Ormoz|Osilnica|Pesnica|Piran|Pivka|Podcetrtek|Podvelka-Ribnica|Postojna|Preddvor|Ptuj|Puconci|Race-Fram|Radece|Radenci|Radlje ob Dravi|Radovljica|Ravne-Prevalje|Ribnica|Rogasevci|Rogaska Slatina|Rogatec|Ruse|Semic|Sencur|Sentilj|Sentjernej|Sentjur pri Celju|Sevnica|Sezana|Skocjan|Skofja Loka|Skofljica|Slovenj Gradec|Slovenska Bistrica|Slovenske Konjice|Smarje pri Jelsah|Smartno ob Paki|Sostanj|Starse|Store|Sveti Jurij|Tolmin|Trbovlje|Trebnje|Trzic|Turnisce|Velenje|Velike Lasce|Videm|Vipava|Vitanje|Vodice|Vojnik|Vrhnika|Vuzenica|Zagorje ob Savi|Zalec|Zavrc|Zelezniki|Ziri|Zrece";
+aStates[207]="|Bellona|Central|Choiseul (Lauru)|Guadalcanal|Honiara|Isabel|Makira|Malaita|Rennell|Temotu|Western";
+aStates[208]="|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed";
+aStates[209]="|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Mpumalanga|North-West|Northern Cape|Northern Province|Western Cape";
+aStates[210]="|Bird Island|Bristol Island|Clerke Rocks|Montagu Island|Saunders Island|South Georgia|Southern Thule|Traversay Islands";
+aStates[211]="|Andalucia|Aragon|Asturias|Baleares (Balearic Islands)|Canarias (Canary Islands)|Cantabria|Castilla y Leon|Castilla-La Mancha|Cataluna|Ceuta|Communidad Valencian|Extremadura|Galicia|Islas Chafarinas|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco (Basque Country)|Penon de Alhucemas|Penon de Velez de la Gomera";
+aStates[212]="|Spratly Islands";
+aStates[213]="|Central|Eastern|North Central|North Eastern|North Western|Northern|Sabaragamuwa|Southern|Uva|Western";
+aStates[214]="|A'ali an Nil|Al Bahr al Ahmar|Al Buhayrat|Al Jazirah|Al Khartum|Al Qadarif|Al Wahdah|An Nil al Abyad|An Nil al Azraq|Ash Shamaliyah|Bahr al Jabal|Gharb al Istiwa'iyah|Gharb Bahr al Ghazal|Gharb Darfur|Gharb Kurdufan|Janub Darfur|Janub Kurdufan|Junqali|Kassala|Nahr an Nil|Shamal Bahr al Ghazal|Shamal Darfur|Shamal Kurdufan|Sharq al Istiwa'iyah|Sinnar|Warab";
+aStates[215]="|Brokopondo|Commewijne|Coronie|Marowijne|Nickerie|Para|Paramaribo|Saramacca|Sipaliwini|Wanica";
+aStates[216]="|Barentsoya|Bjornoya|Edgeoya|Hopen|Kvitoya|Nordaustandet|Prins Karls Forland|Spitsbergen";
+aStates[217]="|Hhohho|Lubombo|Manzini|Shiselweni";
+aStates[218]="|Blekinge|Dalarnas|Gavleborgs|Gotlands|Hallands|Jamtlands|Jonkopings|Kalmar|Kronobergs|Norrbottens|Orebro|Ostergotlands|Skane|Sodermanlands|Stockholms|Uppsala|Varmlands|Vasterbottens|Vasternorrlands|Vastmanlands|Vastra Gotalands";
+aStates[219]="|Aargau|Ausser-Rhoden|Basel-Landschaft|Basel-Stadt|Bern|Fribourg|Geneve|Glarus|Graubunden|Inner-Rhoden|Jura|Luzern|Neuchatel|Nidwalden|Obwalden|Sankt Gallen|Schaffhausen|Schwyz|Solothurn|Thurgau|Ticino|Uri|Valais|Vaud|Zug|Zurich";
+aStates[220]="|Al Hasakah|Al Ladhiqiyah|Al Qunaytirah|Ar Raqqah|As Suwayda'|Dar'a|Dayr az Zawr|Dimashq|Halab|Hamah|Hims|Idlib|Rif Dimashq|Tartus";
+aStates[221]="|Chang-hua|Chi-lung|Chia-i|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu|Hsin-chu|Hua-lien|I-lan|Kao-hsiung|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung|T'ai-chung|T'ai-nan|T'ai-nan|T'ai-pei|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin";
+aStates[222]="|Viloyati Khatlon|Viloyati Leninobod|Viloyati Mukhtori Kuhistoni Badakhshon";
+aStates[223]="|Arusha|Dar es Salaam|Dodoma|Iringa|Kagera|Kigoma|Kilimanjaro|Lindi|Mara|Mbeya|Morogoro|Mtwara|Mwanza|Pemba North|Pemba South|Pwani|Rukwa|Ruvuma|Shinyanga|Singida|Tabora|Tanga|Zanzibar Central/South|Zanzibar North|Zanzibar Urban/West";
+aStates[224]="|Amnat Charoen|Ang Thong|Buriram|Chachoengsao|Chai Nat|Chaiyaphum|Chanthaburi|Chiang Mai|Chiang Rai|Chon Buri|Chumphon|Kalasin|Kamphaeng Phet|Kanchanaburi|Khon Kaen|Krabi|Krung Thep Mahanakhon (Bangkok)|Lampang|Lamphun|Loei|Lop Buri|Mae Hong Son|Maha Sarakham|Mukdahan|Nakhon Nayok|Nakhon Pathom|Nakhon Phanom|Nakhon Ratchasima|Nakhon Sawan|Nakhon Si Thammarat|Nan|Narathiwat|Nong Bua Lamphu|Nong Khai|Nonthaburi|Pathum Thani|Pattani|Phangnga|Phatthalung|Phayao|Phetchabun|Phetchaburi|Phichit|Phitsanulok|Phra Nakhon Si Ayutthaya|Phrae|Phuket|Prachin Buri|Prachuap Khiri Khan|Ranong|Ratchaburi|Rayong|Roi Et|Sa Kaeo|Sakon Nakhon|Samut Prakan|Samut Sakhon|Samut Songkhram|Sara Buri|Satun|Sing Buri|Sisaket|Songkhla|Sukhothai|Suphan Buri|Surat Thani|Surin|Tak|Trang|Trat|Ubon Ratchathani|Udon Thani|Uthai Thani|Uttaradit|Yala|Yasothon";
+aStates[225]="|Tobago";
+aStates[226]="|De La Kara|Des Plateaux|Des Savanes|Du Centre|Maritime";
+aStates[227]="|Atafu|Fakaofo|Nukunonu";
+aStates[228]="|Ha'apai|Tongatapu|Vava'u";
+aStates[229]="|Arima|Caroni|Mayaro|Nariva|Port-of-Spain|Saint Andrew|Saint David|Saint George|Saint Patrick|San Fernando|Victoria";
+aStates[230]="|Ariana|Beja|Ben Arous|Bizerte|El Kef|Gabes|Gafsa|Jendouba|Kairouan|Kasserine|Kebili|Mahdia|Medenine|Monastir|Nabeul|Sfax|Sidi Bou Zid|Siliana|Sousse|Tataouine|Tozeur|Tunis|Zaghouan";
+aStates[231]="|Adana|Adiyaman|Afyon|Agri|Aksaray|Amasya|Ankara|Antalya|Ardahan|Artvin|Aydin|Balikesir|Bartin|Batman|Bayburt|Bilecik|Bingol|Bitlis|Bolu|Burdur|Bursa|Canakkale|Cankiri|Corum|Denizli|Diyarbakir|Duzce|Edirne|Elazig|Erzincan|Erzurum|Eskisehir|Gaziantep|Giresun|Gumushane|Hakkari|Hatay|Icel|Igdir|Isparta|Istanbul|Izmir|Kahramanmaras|Karabuk|Karaman|Kars|Kastamonu|Kayseri|Kilis|Kirikkale|Kirklareli|Kirsehir|Kocaeli|Konya|Kutahya|Malatya|Manisa|Mardin|Mugla|Mus|Nevsehir|Nigde|Ordu|Osmaniye|Rize|Sakarya|Samsun|Sanliurfa|Siirt|Sinop|Sirnak|Sivas|Tekirdag|Tokat|Trabzon|Tunceli|Usak|Van|Yalova|Yozgat|Zonguldak";
+aStates[232]="|Ahal Welayaty|Balkan Welayaty|Dashhowuz Welayaty|Lebap Welayaty|Mary Welayaty";
+aStates[233]="|Tuvalu";
+aStates[234]="|Adjumani|Apac|Arua|Bugiri|Bundibugyo|Bushenyi|Busia|Gulu|Hoima|Iganga|Jinja|Kabale|Kabarole|Kalangala|Kampala|Kamuli|Kapchorwa|Kasese|Katakwi|Kibale|Kiboga|Kisoro|Kitgum|Kotido|Kumi|Lira|Luwero|Masaka|Masindi|Mbale|Mbarara|Moroto|Moyo|Mpigi|Mubende|Mukono|Nakasongola|Nebbi|Ntungamo|Pallisa|Rakai|Rukungiri|Sembabule|Soroti|Tororo";
+aStates[235]="|Avtonomna Respublika Krym (Simferopol')|Cherkas'ka (Cherkasy)|Chernihivs'ka (Chernihiv)|Chernivets'ka (Chernivtsi)|Dnipropetrovs'ka (Dnipropetrovs'k)|Donets'ka (Donets'k)|Ivano-Frankivs'ka (Ivano-Frankivs'k)|Kharkivs'ka (Kharkiv)|Khersons'ka (Kherson)|Khmel'nyts'ka (Khmel'nyts'kyy)|Kirovohrads'ka (Kirovohrad)|Kyyiv|Kyyivs'ka (Kiev)|L'vivs'ka (L'viv)|Luhans'ka (Luhans'k)|Mykolayivs'ka (Mykolayiv)|Odes'ka (Odesa)|Poltavs'ka (Poltava)|Rivnens'ka (Rivne)|Sevastopol'|Sums'ka (Sumy)|Ternopil's'ka (Ternopil')|Vinnyts'ka (Vinnytsya)|Volyns'ka (Luts'k)|Zakarpats'ka (Uzhhorod)|Zaporiz'ka (Zaporizhzhya)|Zhytomyrs'ka (Zhytomyr)"
+aStates[236]="|'Ajman|Abu Zaby (Abu Dhabi)|Al Fujayrah|Ash Shariqah (Sharjah)|Dubayy (Dubai)|Ra's al Khaymah|Umm al Qaywayn";
+aStates[237]="|Barking and Dagenham|Barnet|Barnsley|Bath and North East Somerset|Bedfordshire|Bexley|Birmingham|Blackburn with Darwen|Blackpool|Bolton|Bournemouth|Bracknell Forest|Bradford|Brent|Brighton and Hove|Bromley|Buckinghamshire|Bury|Calderdale|Cambridgeshire|Camden|Cheshire|City of Bristol|City of Kingston upon Hull|City of London|Cornwall|Coventry|Croydon|Cumbria|Darlington|Derby|Derbyshire|Devon|Doncaster|Dorset|Dudley|Durham|Ealing|East Riding of Yorkshire|East Sussex|Enfield|Essex|Gateshead|Gloucestershire|Greenwich|Hackney|Halton|Hammersmith and Fulham|Hampshire|Haringey|Harrow|Hartlepool|Havering|Herefordshire|Hertfordshire|Hillingdon|Hounslow|Isle of Wight|Islington|Kensington and Chelsea|Kent|Kingston upon Thames|Kirklees|Knowsley|Lambeth|Lancashire|Leeds|Leicester|Leicestershire|Lewisham|Lincolnshire|Liverpool|Luton|Manchester|Medway|Merton|Middlesbrough|Milton Keynes|Newcastle upon Tyne|Newham|Norfolk|North East Lincolnshire|North Lincolnshire|North Somerset|North Tyneside|North Yorkshire|Northamptonshire|Northumberland|Nottingham|Nottinghamshire|Oldham|Oxfordshire|Peterborough|Plymouth|Poole|Portsmouth|Reading|Redbridge|Redcar and Cleveland|Richmond upon Thames|Rochdale|Rotherham|Rutland|Salford|Sandwell|Sefton|Sheffield|Shropshire|Slough|Solihull|Somerset|South Gloucestershire|South Tyneside|Southampton|Southend-on-Sea|Southwark|St. Helens|Staffordshire|Stockport|Stockton-on-Tees|Stoke-on-Trent|Suffolk|Sunderland|Surrey|Sutton|Swindon|Tameside|Telford and Wrekin|Thurrock|Torbay|Tower Hamlets|Trafford|Wakefield|Walsall|Waltham Forest|Wandsworth|Warrington|Warwickshire|West Berkshire|West Sussex|Westminster|Wigan|Wiltshire|Windsor and Maidenhead|Wirral|Wokingham|Wolverhampton|Worcestershire|York";
+aStates[238]="|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres";
+aStates[239]="|Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|District of Columbia|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New Hampshire|New Jersey|New Mexico|New York|North Carolina|North Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Rhode Island|South Carolina|South Dakota|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West Virginia|Wisconsin|Wyoming";
+aStates[240]="|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati";
+aStates[241]="|Malampa|Penama|Sanma|Shefa|Tafea|Torba";
+aStates[242]="|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia";
+aStates[243]="|An Giang|Ba Ria-Vung Tau|Bac Giang|Bac Kan|Bac Lieu|Bac Ninh|Ben Tre|Binh Dinh|Binh Duong|Binh Phuoc|Binh Thuan|Ca Mau|Can Tho|Cao Bang|Da Nang|Dac Lak|Dong Nai|Dong Thap|Gia Lai|Ha Giang|Ha Nam|Ha Noi|Ha Tay|Ha Tinh|Hai Duong|Hai Phong|Ho Chi Minh|Hoa Binh|Hung Yen|Khanh Hoa|Kien Giang|Kon Tum|Lai Chau|Lam Dong|Lang Son|Lao Cai|Long An|Nam Dinh|Nghe An|Ninh Binh|Ninh Thuan|Phu Tho|Phu Yen|Quang Binh|Quang Nam|Quang Ngai|Quang Ninh|Quang Tri|Soc Trang|Son La|Tay Ninh|Thai Binh|Thai Nguyen|Thanh Hoa|Thua Thien-Hue|Tien Giang|Tra Vinh|Tuyen Quang|Vinh Long|Vinh Phuc|Yen Bai";
+aStates[244]="|Saint Croix|Saint John|Saint Thomas";
+aStates[245]="|Blaenau Gwent|Bridgend|Caerphilly|Cardiff|Carmarthenshire|Ceredigion|Conwy|Denbighshire|Flintshire|Gwynedd|Isle of Anglesey|Merthyr Tydfil|Monmouthshire|Neath Port Talbot|Newport|Pembrokeshire|Powys|Rhondda Cynon Taff|Swansea|The Vale of Glamorgan|Torfaen|Wrexham";
+aStates[246]="|Alo|Sigave|Wallis";
+aStates[247]="|West Bank";
+aStates[248]="|Western Sahara";
+aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahwit|Dhamar|Hadhramawt|Hajjah|Ibb|Lahij|Ma'rib|Sa'dah|San'a'|Ta'izz";
+aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
+aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
+aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
+
+/* 
+ * gArCountryInfo
+ * (0) Country name
+ * (1) Name length
+ * (2) Number of states
+ * (3) Max state length
+ */
+gLngNumberCountries = sCountryString.split("|").length;
+//gArCountryInfo = new Array(gLngNumberCountries);
+gArCountryInfo=sCountryString.split("|");
+/* 
+ * gArStateInfo[country][statenames][namelengths]
+ * (0) Country
+ * (1) States (Multi-sized Array)
+ *    (0) name
+ *    (1) nameLength
+ */
+gArStateInfo   = new Array(gLngNumberCountries);
+
+/* 
+ * fInitgArStateInfo()
+ * purpose: build gArStateInfo array
+ * gArStateInfo[Country][States][1]
+ *   (0) State name
+ *   (1) State name length
+ * gArStateInfo[i] is an array of state names
+ * gArStateInfo[i][j]=state name, name length
+ */
+function fInitgArStateInfo() {
+ var i=0, j=0, sStateName="", iNumberOfStates=0;
+ var iMaxLength=0, iLength=0;
+ var oldNumber=0;
+ 
+ for (i=0;i<gLngNumberCountries;i++) {
+  // i is selected country
+  iNumberOfStates=aStates[i].split("|").length+1;
+  gLngNumberStates=gLngNumberStates+iNumberOfStates;
+  gArStateInfo[i]=new Array(iNumberOfStates);
+  iMaxLength=0;
+  
+  // Add the additional information
+  for (j=0;j<iNumberOfStates;j++) {
+   if (iLength>iMaxLength) {
+    iMaxLength=iLength;
+    gArStateInfo[i][j][0]=sStateName;
+   }
+  }
+  gArCountryInfo[i][3]=parseInt(iMaxLength);
+ }
+ Update_Globals();
+ return;
+}
+
+/* 
+ * Working on this one.
+ * Fills in region from the arrays
+ * 
+ */
+function xFillState() {
+ var i=0;
+ 
+ // reset region
+ document.form1.region.options.length=0;
+ 
+ // get selected country
+ gLngSelectedCountry=document.form1.country_name.selectedIndex;
+ 
+ // get number of states for selected country
+ gLngNumberStates=gArCountryInfo[[gLngSelectedCountry][2]];
+ 
+ // update options in region
+ for (i=0;i<gLngNumberStates;i++) {
+  document.form1.region.options[i]=new
+    Option(gArStateInfo[[gLngSelectedCountry][i][0]]);
+ }
+ gLngSelectedState=
+  document.form1.region.options.selectedIndex;
+ 
+ return;
+}
+
+/* 
+ * FillStates() function works.
+ * Fills region from aStates
+ */
+function Fill_States(current) {
+	var i=0, iLen=0, iNumStates=0;
+ 
+	// reset region
+	document.form1.region.options.length=0;
+	// get selected country
+	gLngSelectedCountry=document.form1.country_name.selectedIndex;
+	iNumStates = aStates[gLngSelectedCountry].split("|").length;
+ 
+	// update the text boxes
+
+ 	// fill the state combobox with the list of states
+	for (i=0;i<iNumStates;i++) {
+		document.form1.region.options[i]=new 
+			Option(aStates[document.form1.country_name.selectedIndex].split("|")[i]);
+
+		sRegionName=document.form1.region.options[i];
+		if(sRegionName.text == current) {
+			document.form1.region.selectedIndex = i;
+		}
+
+	}
+
+	return;
+}
+
+/*
+ * FillCountry()
+ * gArCountryInfo matrix holds the following information:
+ * (0) Country name
+ * (1) Name length
+ * (2) Number of states
+ * (3) Max state length
+ */
+function Fill_Country(current) {
+	var i=0;
+	var sCountryName="";
+ 
+	// reset country_name.options
+	document.form1.country_name.options.length=0;
+	// get number of countries from the string
+ 
+	// ----------------------------------------------------
+	// gArCountryInfo = new Array(gLngNumberCountries, 4);
+	// ----------------------------------------------------
+	for (i=0;i<gLngNumberCountries;i++) {
+		gArCountryInfo[i]=new Array(4);
+	}
+ 
+	for (i=0;i<gLngNumberCountries;i++) {
+		document.form1.country_name.options[i]=new Option(sCountryString.split("|")[i]);
+		sCountryName=document.form1.country_name.options[i];
+		if(sCountryName.text == current) {
+			document.form1.country_name.selectedIndex = i;
+		}
+		gArCountryInfo[i]=
+			[sCountryName, 
+				parseInt(sCountryName.length),
+				aStates,
+			0];
+	}
+
+	fInitgArStateInfo();
+
+	return;
+}
+
+function Update_Globals() {
+	gLngSelectedCountry=parseInt(document.form1.country_name.selectedIndex);
+	gLngSelectedState=parseInt(document.form1.region.selectedIndex);
+	return;
+}
+
+
+//-->
diff --git a/js/jquery.htmlstream.js b/js/jquery.htmlstream.js
new file mode 100644
index 000000000..c62c538f7
--- /dev/null
+++ b/js/jquery.htmlstream.js
@@ -0,0 +1,157 @@
+/* jQuery ajax stream plugin
+* Version 0.1
+* Copyright (C) 2009 Chris Tarquini
+* Licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License (http://creativecommons.org/licenses/by-sa/3.0/)
+* Permissions beyond the scope of this license may be available by contacting petros000[at]hotmail.com.
+*/
+
+(function($) {
+
+// Save the original AJAX function
+var ajax_old = $.ajax;
+var get_old = $.get;
+var post_old =  $.post;
+var active = true;
+// Add our settings
+$.ajaxSetup({stream: false,pollInterval: 500/*, onDataRecieved: function(){}*/ });
+$.enableAjaxStream = function(enable)
+{
+if(typeof enable == 'undefined') enable = !active;
+if(!enable)
+{
+$.ajax = ajax_old;
+$.get = get_old;
+$.post = post_old;
+active = false;
+}
+else
+{
+$.ajax = ajax_stream;
+$.get = ajax_get_stream;
+$.post = ajax_post_stream;
+active = true;
+}
+
+}
+var ajax_stream = $.ajax = function(options)
+{
+//copied from original ajax function
+        options  = jQuery.extend(true, options, jQuery.extend(true, {}, jQuery.ajaxSettings, options));
+if(options.stream)
+{
+var timer = 0;
+var offset = 0;
+var xmlhttp = null;
+var lastlen = 0;
+var done = false;
+var hook = function(xhr)
+{
+xmlhttp = xhr;
+checkagain();
+}
+var fix = function(){ check('stream'); };// fixes weird bug with random numbers as arg
+var checkagain = function(){if(!done) timer = setTimeout(fix,options.pollInterval);}
+var check = function(status)
+{
+if(typeof status == 'undefined') status = "stream";
+if(xmlhttp.status < 3) return; //only get the latest packet if data has been sent
+var text = xmlhttp.responseText;
+if(status == 'stream') //if we arent streaming then just flush the buffer
+{
+if(text.length <= lastlen) { checkagain(); return;}
+lastlength = text.length;
+if(offset == text.length) { checkagain(); return;}
+}
+var pkt = text.substr(offset);
+offset =  text.length;
+if($.isFunction(options.OnDataRecieved))
+{
+options.OnDataRecieved(pkt, status, xmlhttp.responseText, xmlhttp);
+}
+if(xmlhttp.status != 4)
+checkagain();
+}
+var complete = function(xhr,s)
+{
+clearTimeout(timer);//done..stop polling
+done = true;
+// send final call
+check(s);
+}
+// If the complete callback is set create a new callback that calls the users and outs
+if($.isFunction(options.success))
+{
+var oc = options.success;
+options.success = function(xhr,s){ complete(xhr,s); oc(xhr,s);};
+
+}
+else options.success = complete;
+// Set up our hook on the beforeSend
+if($.isFunction(options.beforeSend))
+{
+var obs = options.beforeSend;
+options.beforeSend = function(xhr){ obs(xhr); hook(xhr);};
+}
+else options.beforeSend = hook;
+
+}
+ajax_old(options);
+}
+
+var ajax_get_stream = $.get = function(url,data,callback,type,stream)
+{
+	if($.isFunction(data))
+	{
+		var orgcb = callback;
+		callback = data;
+		if($.isFunction(orgcb))
+		{
+			stream = orgcb;
+		}
+		data = null;
+	}
+	if($.isFunction(type))
+	{
+		stream = type;
+		type = undefined;
+	}
+	var dostream = $.isFunction(stream);
+	return jQuery.ajax({
+					type: "GET",
+					url: url,
+					data: data,
+					success: callback,
+					dataType: type,
+					stream: dostream,
+					OnDataRecieved: stream
+			});
+
+}
+
+var ajax_post_stream = $.post = function(url,data,callback,type,stream)
+{
+        if($.isFunction(data))
+        {
+				var orgcb = callback;
+                callback = data;
+        }
+		if($.isFunction(type))
+		{
+			stream = type;
+			type = undefined;
+		}
+		var dostream = $.isFunction(stream);
+		return jQuery.ajax({
+				type: "POST",
+				url: url,
+				data: data,
+				success: callback,
+				dataType: type,
+				stream: dostream,
+				OnDataRecieved: stream
+		});
+
+}
+
+})(jQuery);	
+	
diff --git a/js/jquery.js b/js/jquery.js
new file mode 100644
index 000000000..7c2430802
--- /dev/null
+++ b/js/jquery.js
@@ -0,0 +1,154 @@
+/*!
+ * jQuery JavaScript Library v1.4.2
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Sat Feb 13 22:33:48 2010 -0500
+ */
+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
+e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
+j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
+"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
+true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
+Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
+(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
+a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
+c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
+L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
+"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
+d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
+a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
+!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
+true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
+parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
+s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
+applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
+else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
+a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
+w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
+cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
+i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
+" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
+this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
+e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
+null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
+"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
+a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
+isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
+{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
+if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
+e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
+!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
+toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
+u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
+function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
+if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
+for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
+1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
+relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
+l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
+h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
+g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
+h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
+m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
+"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
+!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
+h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
+q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
+if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
+(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
+gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
+c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
+{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
+a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
+a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
+this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
+u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
+1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
+return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
+""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
+"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
+"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
+1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
+"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
+if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
+this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
+"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
+animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
+j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
+this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
+"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
+c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
+c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
+function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
+this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
+k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
+f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/js/main.js b/js/main.js
new file mode 100644
index 000000000..83dcc720c
--- /dev/null
+++ b/js/main.js
@@ -0,0 +1,426 @@
+
+  function openClose(theID) {
+    if(document.getElementById(theID).style.display == "block") { 
+      document.getElementById(theID).style.display = "none" 
+    }
+    else { 
+      document.getElementById(theID).style.display = "block" 
+    } 
+  }
+
+  function openMenu(theID) {
+      document.getElementById(theID).style.display = "block" 
+  }
+
+  function closeMenu(theID) {
+      document.getElementById(theID).style.display = "none" 
+  }
+
+	
+	var src = null;
+	var prev = null;
+	var livetime = null;
+	var msie = false;
+	var stopped = false;
+	var timer = null;
+	var pr = 0;
+	var liking = 0;
+	var in_progress = false;
+	var langSelect = false;
+	var commentBusy = false;
+
+	$(function() {
+		$.ajaxSetup({cache: false});
+
+		msie = $.browser.msie ;
+		
+		/* setup navbar menus */
+		
+		
+		
+		/* setup onoff widgets */
+		$(".onoff input").each(function(){
+			val = $(this).val();
+			id = $(this).attr("id");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			
+		});
+		$(".onoff > a").click(function(event){
+			event.preventDefault();	
+			var input = $(this).siblings("input");
+			var val = 1-input.val();
+			var id = input.attr("id");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
+			input.val(val);
+			//console.log(id);
+		});
+		
+		/* setup field_richtext */
+		setupFieldRichtext();
+
+		/* popup menus */
+		$('a[rel^=#]').click(function(e){
+			menu = $( $(this).attr('rel') );
+			e.stopPropagation();
+			if (menu.attr('popup')=="false") return false;
+			$(this).parent().toggleClass("selected");
+			menu.toggle();
+			return false;
+		});
+		
+		
+
+		/* notifications template */
+		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+		var notifications_empty = unescape($("#nav-notifications-menu").html());
+		
+		/* nav update event  */
+		$('nav').bind('nav-update', function(e,data){;
+			var net = $(data).find('net').text();
+			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
+			$('#net-update').html(net);
+
+			var home = $(data).find('home').text();
+			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
+			$('#home-update').html(home);
+
+			var eNotif = $(data).find('notif')
+			notif = eNotif.attr('count');
+			if (notif>0){
+				nnm = $("#nav-notifications-menu");
+				nnm.html("");
+				nnm.attr('popup','true');
+				eNotif.children("note").each(function(){
+					e = $(this);
+					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
+					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
+					nnm.append(html);
+				});
+			} else {
+				$("#nav-notifications-menu").html(notifications_empty);
+			}
+			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
+			$('#notify-update').html(notif);
+			
+		});
+		
+		
+ 		NavUpdate(); 
+		// Allow folks to stop the ajax page updates with the pause/break key
+		$(document).keypress(function(event) {
+			if(event.keyCode == '19') {
+				event.preventDefault();
+				if(stopped == false) {
+					stopped = true;
+					$('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
+				}
+				else {
+					stopped = false;
+					$('#pause').html('');
+				}
+			}
+			else {
+				// any key to resume
+				if(stopped == true) {
+					stopped = false;
+					$('#pause').html('');
+				}
+			}
+
+		});					
+	});
+
+	function NavUpdate() {
+
+		if($('#live-network').length)   { src = 'network'; liveUpdate(); }
+		if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
+		if($('#live-community').length) { src = 'community'; liveUpdate(); }
+		if($('#live-display').length) { 
+			if(liking) {
+				liking = 0;
+				window.location.href=window.location.href 
+			}
+		}
+		if($('#live-photos').length)  { 
+			if(liking) {
+				liking = 0;
+				window.location.href=window.location.href 
+			}
+		}
+
+		if(! stopped) {
+			$.get("ping",function(data) {
+				$(data).find('result').each(function() {
+					// send nav-update event
+					$('nav').trigger('nav-update', this);
+				});
+			}) ;
+		}
+		timer = setTimeout(NavUpdate,30000);
+	}
+
+	function liveUpdate() {
+		if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
+		if(($('.comment-edit-text-full').length) || (in_progress)) {
+			livetime = setTimeout(liveUpdate, 10000);
+			return;
+		}
+		prev = 'live-' + src;
+
+		in_progress = true;
+		var udargs = ((netargs.length) ? '/' + netargs : '');
+		var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+
+		$.get(update_url,function(data) {
+			in_progress = false;
+			$('.ccollapse-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				var is_hidden = $('#' + ident).is(':hidden');
+				if($('#' + ident).length) {
+					$('#' + ident).replaceWith($(this));
+					if(is_hidden)
+						$('#' + ident).hide();
+				}
+			});
+			$('.wall-item-outside-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				if($('#' + ident).length == 0) {
+					$('img',this).each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
+					$('#' + prev).after($(this));
+				}
+				else { 
+
+					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
+					if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
+						$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
+					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
+					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
+				}
+				prev = ident; 
+			});
+			$('.like-rotator').hide();
+			if(commentBusy) {
+				commentBusy = false;
+				$('body').css('cursor', 'auto');
+			}
+		});
+	}
+
+	function imgbright(node) {
+		$(node).removeClass("drophide").addClass("drop");
+	}
+
+	function imgdull(node) {
+		$(node).removeClass("drop").addClass("drophide");
+	}
+
+	// Since our ajax calls are asynchronous, we will give a few 
+	// seconds for the first ajax call (setting like/dislike), then 
+	// run the updater to pick up any changes and display on the page.
+	// The updater will turn any rotators off when it's done. 
+	// This function will have returned long before any of these
+	// events have completed and therefore there won't be any
+	// visible feedback that anything changed without all this
+	// trickery. This still could cause confusion if the "like" ajax call
+	// is delayed and NavUpdate runs before it completes.
+
+	function dolike(ident,verb) {
+		$('#like-rotator-' + ident.toString()).show();
+		$.get('like/' + ident.toString() + '?verb=' + verb );
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,3000);
+		liking = 1;
+	}
+
+	function dostar(ident) {
+		$('#like-rotator-' + ident.toString()).show();
+		$.get('starred/' + ident.toString(), function(data) {
+			if(data.match(/1/)) {
+				$('#starred-' + ident.toString()).addClass('starred');
+				$('#starred-' + ident.toString()).removeClass('unstarred');
+			}
+			else {			
+				$('#starred-' + ident.toString()).addClass('unstarred');
+				$('#starred-' + ident.toString()).removeClass('starred');
+			}
+			$('#like-rotator-' + ident.toString()).hide();	
+		});
+	}
+
+	function getPosition(e) {
+		var cursor = {x:0, y:0};
+		if ( e.pageX || e.pageY  ) {
+			cursor.x = e.pageX;
+			cursor.y = e.pageY;
+		}
+		else {
+			if( e.clientX || e.clientY ) {
+				cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
+				cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
+			}
+			else {
+				if( e.x || e.y ) {
+					cursor.x = e.x;
+					cursor.y = e.y;
+				}
+			}
+		}
+		return cursor;
+	}
+
+	var lockvisible = false;
+
+	function lockview(event,id) {
+		event = event || window.event;
+		cursor = getPosition(event);
+		if(lockvisible) {
+			lockviewhide();
+		}
+		else {
+			lockvisible = true;
+			$.get('lockview/' + id, function(data) {
+				$('#panel').html(data);
+				$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+				$('#panel').show();
+			});
+		}
+	}
+
+	function lockviewhide() {
+		lockvisible = false;
+		$('#panel').hide();
+	}
+
+	function post_comment(id) {
+		commentBusy = true;
+		$('body').css('cursor', 'wait');
+		$.post(  
+             "item",  
+             $("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.success) {
+					$("#comment-edit-wrapper-" + id).hide();
+					$("#comment-edit-text-" + id).val('');
+    	  			var tarea = document.getElementById("comment-edit-text-" + id);
+					if(tarea)
+						commentClose(tarea,id);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,10);
+				}
+				if(data.reload) {
+					window.location.href=data.reload;
+				}
+			},
+			"json"  
+         );  
+         return false;  
+	}
+
+
+    function bin2hex(s){  
+        // Converts the binary representation of data to hex    
+        //   
+        // version: 812.316  
+        // discuss at: http://phpjs.org/functions/bin2hex  
+        // +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)  
+        // +   bugfixed by: Onno Marsman  
+        // +   bugfixed by: Linuxworld  
+        // *     example 1: bin2hex('Kev');  
+        // *     returns 1: '4b6576'  
+        // *     example 2: bin2hex(String.fromCharCode(0x00));  
+        // *     returns 2: '00'  
+        var v,i, f = 0, a = [];  
+        s += '';  
+        f = s.length;  
+          
+        for (i = 0; i<f; i++) {  
+            a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");  
+        }  
+          
+        return a.join('');  
+    }  
+
+	function groupChangeMember(gid,cid) {
+		$('body .fakelink').css('cursor', 'wait');
+		$.get('group/' + gid + '/' + cid, function(data) {
+				$('#group-update-wrapper').html(data);
+				$('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
+	function profChangeMember(gid,cid) {
+		$('body .fakelink').css('cursor', 'wait');
+		$.get('profperm/' + gid + '/' + cid, function(data) {
+				$('#prof-update-wrapper').html(data);
+				$('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
+	function contactgroupChangeMember(gid,cid) {
+		$('body').css('cursor', 'wait');
+		$.get('contactgroup/' + gid + '/' + cid, function(data) {
+				$('body').css('cursor', 'auto');
+		});
+	}
+
+
+function checkboxhighlight(box) {
+  if($(box).is(':checked')) {
+	$(box).addClass('checkeditem');
+  }
+  else {
+	$(box).removeClass('checkeditem');
+  }
+}
+
+function setupFieldRichtext(){
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "fieldRichtext",
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: baseurl+"/view/custom_tinymce.css",
+		theme_advanced_path : false,
+	});
+}
+
+/** 
+ * sprintf in javascript 
+ *	"{0} and {1}".format('zero','uno'); 
+ **/
+String.prototype.format = function() {
+    var formatted = this;
+    for (var i = 0; i < arguments.length; i++) {
+        var regexp = new RegExp('\\{'+i+'\\}', 'gi');
+        formatted = formatted.replace(regexp, arguments[i]);
+    }
+    return formatted;
+};
+// Array Remove
+Array.prototype.remove = function(item) {
+  to=undefined; from=this.indexOf(item);
+  var rest = this.slice((to || from) + 1 || this.length);
+  this.length = from < 0 ? this.length + from : from;
+  return this.push.apply(this, rest);
+};
+
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
index 0c15692c2..41ecfaf85 100644
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
@@ -1,4 +1,4 @@
-<script src="include/jquery.htmlstream.js"></script>
+<script src="js/jquery.htmlstream.js"></script>
 <script>
 	/* ajax updater */
 	function updateEnd(data){
diff --git a/view/head.tpl b/view/head.tpl
index 9d73269e1..a18bcdd5e 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -3,6 +3,7 @@
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
 <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
@@ -12,11 +13,12 @@
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
 <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
 <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="$baseurl/include/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
+<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/main.js" ></script>
 <script>
 
 	function confirmDelete() { return confirm("$delitem"); }
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 6195c5bbc..8174026ab 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -80,7 +80,7 @@ function initEditor(cb){
 }
 
 </script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
 	$(document).ready(function() {
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index 67775a45b..a74154c19 100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -53,7 +53,7 @@ tinyMCE.init({
 });
 
 </script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
 	$(document).ready(function() {
 		var uploader = new window.AjaxUpload(
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 155595056..0093bf82a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -90,7 +90,7 @@ function initEditor(cb) {
     }
 } // initEditor
 </script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
     var ispublic = '$ispublic';
 	$(document).ready(function() {
-- 
cgit v1.2.3


From 2c1aca7ffe628ab2a455fc7abf730b6d01d288ea Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:16:08 +0200
Subject: fix aside contact block, add edit profiles icon

---
 boot.php               |  9 +++++++++
 view/contact_block.tpl | 10 ++++++----
 view/profile_vcard.tpl |  6 +++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index d7c00428f..9826b3d8d 100644
--- a/boot.php
+++ b/boot.php
@@ -857,6 +857,14 @@ function profile_sidebar($profile, $block = 0) {
 	if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
 		$connect = False; 
 
+
+	// show edit to yourself
+	if ($profile['uid'] == local_user()) {
+		$profile['edit'] = array($a->get_baseurl(). 'profiles', t('Profiles'),"", t('Manage/edit profiles'));
+	}
+
+
+
 	
 	if((x($profile,'address') == 1) 
 		|| (x($profile,'locality') == 1) 
@@ -890,6 +898,7 @@ function profile_sidebar($profile, $block = 0) {
 		$contact_block = contact_block();
 	}
 
+
 	$tpl = get_markup_template('profile_vcard.tpl');
 
 	$o .= replace_macros($tpl, array(
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
index 00b97a6d8..eb46c6c43 100644
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -1,9 +1,11 @@
-<h4 class="contact-h4">$contacts</h4>
+<div id="contact-block">
+<h4 class="contact-block-h4">$contacts</h4>
 {{ if $micropro }}
-	<div id="contact-block">
+		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<div class='contact-block-content'>
 		{{ for $micropro as $m }}
 			$m
 		{{ endfor }}
-	</div>
-	<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/$nickname">$viewcontacts</a></div>
+		</div>
 {{ endif }}
+</div>
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 88111b0f1..08e2e2e3a 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,6 +1,10 @@
 <div class="vcard">
 
-	<div class="fn">$profile.name</div>
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}<a class="icon s16 edit" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
+	</div>
+	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
 
-- 
cgit v1.2.3


From 9ab9c28b0175ddcfd1997290702a02a9aa896fa3 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:32:07 +0200
Subject: fix profile edit link and d* photo urls

---
 boot.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 9826b3d8d..13e1eff11 100644
--- a/boot.php
+++ b/boot.php
@@ -860,7 +860,7 @@ function profile_sidebar($profile, $block = 0) {
 
 	// show edit to yourself
 	if ($profile['uid'] == local_user()) {
-		$profile['edit'] = array($a->get_baseurl(). 'profiles', t('Profiles'),"", t('Manage/edit profiles'));
+		$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
 	}
 
 
@@ -889,9 +889,9 @@ function profile_sidebar($profile, $block = 0) {
 		'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
 		'nickname ' => $profile['nickname'],
 		'fullname' => $profile['name'],
-		'photo300 ' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-		'photo100 ' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-		'photo50  ' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+		'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+		'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+		'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
 	);
 
 	if (!$block){
-- 
cgit v1.2.3


From 14125ce67bb27b024d082738c8065e1bc7f2d377 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 11:32:40 +0200
Subject: Add tipTip js tooltips

---
 js/main.js                               |  11 ++-
 library/tiptip/README                    |  30 ++++++++
 library/tiptip/jquery.tipTip.minified.js |  21 ++++++
 library/tiptip/tipTip.css                | 113 +++++++++++++++++++++++++++++++
 view/profile_vcard.tpl                   |   2 +-
 5 files changed, 175 insertions(+), 2 deletions(-)
 create mode 100644 library/tiptip/README
 create mode 100644 library/tiptip/jquery.tipTip.minified.js
 create mode 100644 library/tiptip/tipTip.css

diff --git a/js/main.js b/js/main.js
index 83dcc720c..30bf8a3b7 100644
--- a/js/main.js
+++ b/js/main.js
@@ -34,7 +34,16 @@
 
 		msie = $.browser.msie ;
 		
-		/* setup navbar menus */
+		/* setup tooltips */
+		$("a,.tt").each(function(){
+			var e = $(this);
+			var pos="bottom";
+			if (e.hasClass("tttop")) pos="top";
+			if (e.hasClass("ttbottom")) pos="bottom";
+			if (e.hasClass("ttleft")) pos="left";
+			if (e.hasClass("ttright")) pos="right";
+			e.tipTip({defaultPosition: pos});
+		});
 		
 		
 		
diff --git a/library/tiptip/README b/library/tiptip/README
new file mode 100644
index 000000000..a83cfba3e
--- /dev/null
+++ b/library/tiptip/README
@@ -0,0 +1,30 @@
+http://code.drewwilson.com/entry/tiptip-jquery-plugin
+
+License
+This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses.
+
+
+ChangeLog
+Version 1.3 (Mar. 23, 2010)
+
+    Added defaultPoistion option that enables you to set the default orientation TipTip should show up as.
+    Added attribute option that enables you to set the HTML attribute that TipTip should pull it's content from.
+    Added content option. This will be used as the content for the TipTip and will overwrite any content pulled form any HTML attribute.
+    Added activation option enables you to specify the jQuery method TipTip is activated with: hover, focus or click. Now you can use TipTip on forms and for validation!
+    Added keepAlive option that when set to true the TipTip will only fadeout when you hover over the actual TipTip and then hover off of it. Allowing for hyperlinks inside your TipTip content to be accessible.
+
+Version 1.2 (Jan. 13, 2010)
+
+    Added HTML support with Tip Tip. You can now add HTML into the Title attribute (though this is not recommended if you want strictly valid code).
+    Tightened up spacing margins in JS.
+    Updated margins in CSS file.
+
+Version 1.1 (Jan. 03, 2010)
+
+    Swapped dynamically added orientation CSS class names ('_left' & '_right') to make better sense.
+    Added in some tighter spacing for the tooltip in JS.
+
+Version 1.0 (Jan. 02, 2010)
+
+    Initial release.
+ 
diff --git a/library/tiptip/jquery.tipTip.minified.js b/library/tiptip/jquery.tipTip.minified.js
new file mode 100644
index 000000000..cdf3a892b
--- /dev/null
+++ b/library/tiptip/jquery.tipTip.minified.js
@@ -0,0 +1,21 @@
+ /*
+ * TipTip
+ * Copyright 2010 Drew Wilson
+ * www.drewwilson.com
+ * code.drewwilson.com/entry/tiptip-jquery-plugin
+ *
+ * Version 1.3   -   Updated: Mar. 23, 2010
+ *
+ * This Plug-In will create a custom tooltip to replace the default
+ * browser tooltip. It is extremely lightweight and very smart in
+ * that it detects the edges of the browser window and will make sure
+ * the tooltip stays within the current window size. As a result the
+ * tooltip will adjust itself to be displayed above, below, to the left 
+ * or to the right depending on what is necessary to stay within the
+ * browser window. It is completely customizable as well via CSS.
+ *
+ * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+(function($){$.fn.tipTip=function(options){var defaults={activation:"hover",keepAlive:false,maxWidth:"200px",edgeOffset:3,defaultPosition:"bottom",delay:400,fadeIn:200,fadeOut:200,attribute:"title",content:false,enter:function(){},exit:function(){}};var opts=$.extend(defaults,options);if($("#tiptip_holder").length<=0){var tiptip_holder=$('<div id="tiptip_holder" style="max-width:'+opts.maxWidth+';"></div>');var tiptip_content=$('<div id="tiptip_content"></div>');var tiptip_arrow=$('<div id="tiptip_arrow"></div>');$("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('<div id="tiptip_arrow_inner"></div>')))}else{var tiptip_holder=$("#tiptip_holder");var tiptip_content=$("#tiptip_content");var tiptip_arrow=$("#tiptip_arrow")}return this.each(function(){var org_elem=$(this);if(opts.content){var org_title=opts.content}else{var org_title=org_elem.attr(opts.attribute)}if(org_title!=""){if(!opts.content){org_elem.removeAttr(opts.attribute)}var timeout=false;if(opts.activation=="hover"){org_elem.hover(function(){active_tiptip()},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}else if(opts.activation=="focus"){org_elem.focus(function(){active_tiptip()}).blur(function(){deactive_tiptip()})}else if(opts.activation=="click"){org_elem.click(function(){active_tiptip();return false}).hover(function(){},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}function active_tiptip(){opts.enter.call(this);tiptip_content.html(org_title);tiptip_holder.hide().removeAttr("class").css("margin","0");tiptip_arrow.removeAttr("style");var top=parseInt(org_elem.offset()['top']);var left=parseInt(org_elem.offset()['left']);var org_width=parseInt(org_elem.outerWidth());var org_height=parseInt(org_elem.outerHeight());var tip_w=tiptip_holder.outerWidth();var tip_h=tiptip_holder.outerHeight();var w_compare=Math.round((org_width-tip_w)/2);var h_compare=Math.round((org_height-tip_h)/2);var marg_left=Math.round(left+w_compare);var marg_top=Math.round(top+org_height+opts.edgeOffset);var t_class="";var arrow_top="";var arrow_left=Math.round(tip_w-12)/2;if(opts.defaultPosition=="bottom"){t_class="_bottom"}else if(opts.defaultPosition=="top"){t_class="_top"}else if(opts.defaultPosition=="left"){t_class="_left"}else if(opts.defaultPosition=="right"){t_class="_right"}var right_compare=(w_compare+left)<parseInt($(window).scrollLeft());var left_compare=(tip_w+left)>parseInt($(window).width());if((right_compare&&w_compare<0)||(t_class=="_right"&&!left_compare)||(t_class=="_left"&&left<(tip_w+opts.edgeOffset+5))){t_class="_right";arrow_top=Math.round(tip_h-13)/2;arrow_left=-12;marg_left=Math.round(left+org_width+opts.edgeOffset);marg_top=Math.round(top+h_compare)}else if((left_compare&&w_compare<0)||(t_class=="_left"&&!right_compare)){t_class="_left";arrow_top=Math.round(tip_h-13)/2;arrow_left=Math.round(tip_w);marg_left=Math.round(left-(tip_w+opts.edgeOffset+5));marg_top=Math.round(top+h_compare)}var top_compare=(top+org_height+opts.edgeOffset+tip_h+8)>parseInt($(window).height()+$(window).scrollTop());var bottom_compare=((top+org_height)-(opts.edgeOffset+tip_h+8))<0;if(top_compare||(t_class=="_bottom"&&top_compare)||(t_class=="_top"&&!bottom_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_top"}else{t_class=t_class+"_top"}arrow_top=tip_h;marg_top=Math.round(top-(tip_h+5+opts.edgeOffset))}else if(bottom_compare|(t_class=="_top"&&bottom_compare)||(t_class=="_bottom"&&!top_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_bottom"}else{t_class=t_class+"_bottom"}arrow_top=-12;marg_top=Math.round(top+org_height+opts.edgeOffset)}if(t_class=="_right_top"||t_class=="_left_top"){marg_top=marg_top+5}else if(t_class=="_right_bottom"||t_class=="_left_bottom"){marg_top=marg_top-5}if(t_class=="_left_top"||t_class=="_left_bottom"){marg_left=marg_left+5}tiptip_arrow.css({"margin-left":arrow_left+"px","margin-top":arrow_top+"px"});tiptip_holder.css({"margin-left":marg_left+"px","margin-top":marg_top+"px"}).attr("class","tip"+t_class);if(timeout){clearTimeout(timeout)}timeout=setTimeout(function(){tiptip_holder.stop(true,true).fadeIn(opts.fadeIn)},opts.delay)}function deactive_tiptip(){opts.exit.call(this);if(timeout){clearTimeout(timeout)}tiptip_holder.fadeOut(opts.fadeOut)}}})}})(jQuery);
\ No newline at end of file
diff --git a/library/tiptip/tipTip.css b/library/tiptip/tipTip.css
new file mode 100644
index 000000000..4fb95d376
--- /dev/null
+++ b/library/tiptip/tipTip.css
@@ -0,0 +1,113 @@
+/* TipTip CSS - Version 1.2 */
+
+#tiptip_holder {
+	display: none;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 99999;
+}
+
+#tiptip_holder.tip_top {
+	padding-bottom: 5px;
+}
+
+#tiptip_holder.tip_bottom {
+	padding-top: 5px;
+}
+
+#tiptip_holder.tip_right {
+	padding-left: 5px;
+}
+
+#tiptip_holder.tip_left {
+	padding-right: 5px;
+}
+
+#tiptip_content {
+	font-size: 11px;
+	color: #fff;
+	text-shadow: 0 0 2px #000;
+	padding: 4px 8px;
+	border: 1px solid rgba(255,255,255,0.25);
+	background-color: rgb(25,25,25);
+	background-color: rgba(25,25,25,0.92);
+	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000));
+	border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 0 0 3px #555;
+	-webkit-box-shadow: 0 0 3px #555;
+	-moz-box-shadow: 0 0 3px #555;
+}
+
+#tiptip_arrow, #tiptip_arrow_inner {
+	position: absolute;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 6px;
+	height: 0;
+	width: 0;
+}
+
+#tiptip_holder.tip_top #tiptip_arrow {
+	border-top-color: #fff;
+	border-top-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_bottom #tiptip_arrow {
+	border-bottom-color: #fff;
+	border-bottom-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_right #tiptip_arrow {
+	border-right-color: #fff;
+	border-right-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_left #tiptip_arrow {
+	border-left-color: #fff;
+	border-left-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_top #tiptip_arrow_inner {
+	margin-top: -7px;
+	margin-left: -6px;
+	border-top-color: rgb(25,25,25);
+	border-top-color: rgba(25,25,25,0.92);
+}
+
+#tiptip_holder.tip_bottom #tiptip_arrow_inner {
+	margin-top: -5px;
+	margin-left: -6px;
+	border-bottom-color: rgb(25,25,25);
+	border-bottom-color: rgba(25,25,25,0.92);
+}
+
+#tiptip_holder.tip_right #tiptip_arrow_inner {
+	margin-top: -6px;
+	margin-left: -5px;
+	border-right-color: rgb(25,25,25);
+	border-right-color: rgba(25,25,25,0.92);
+}
+
+#tiptip_holder.tip_left #tiptip_arrow_inner {
+	margin-top: -6px;
+	margin-left: -7px;
+	border-left-color: rgb(25,25,25);
+	border-left-color: rgba(25,25,25,0.92);
+}
+
+/* Webkit Hacks  */
+@media screen and (-webkit-min-device-pixel-ratio:0) {	
+	#tiptip_content {
+		padding: 4px 8px 5px 8px;
+		background-color: rgba(45,45,45,0.88);
+	}
+	#tiptip_holder.tip_bottom #tiptip_arrow_inner { 
+		border-bottom-color: rgba(45,45,45,0.88);
+	}
+	#tiptip_holder.tip_top #tiptip_arrow_inner { 
+		border-top-color: rgba(20,20,20,0.92);
+	}
+}
\ No newline at end of file
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 08e2e2e3a..ecdb5280f 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -2,7 +2,7 @@
 
 	<div class="tool">
 		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}<a class="icon s16 edit" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
+		{{ if $profile.edit }}<a class="icon s16 edit ttright" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
 	</div>
 	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-- 
cgit v1.2.3


From abd65e00aba5a2581665a689e01fe9330046f001 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 14:01:21 +0200
Subject: Load infos and notices via ping and show them with js popup

---
 boot.php                                  |   6 +-
 images/icons/10/info.png                  | Bin 0 -> 488 bytes
 images/icons/10/notice.png                | Bin 0 -> 471 bytes
 images/icons/16/info.png                  | Bin 0 -> 854 bytes
 images/icons/16/notice.png                | Bin 0 -> 591 bytes
 images/icons/22/info.png                  | Bin 0 -> 1106 bytes
 images/icons/22/notice.png                | Bin 0 -> 780 bytes
 images/icons/48/info.png                  | Bin 0 -> 2152 bytes
 images/icons/48/notice.png                | Bin 0 -> 1730 bytes
 images/icons/info.png                     | Bin 0 -> 4287 bytes
 images/icons/notice.png                   | Bin 0 -> 3701 bytes
 index.php                                 |  10 +--
 js/main.js                                |  10 +++
 library/jgrowl/README                     |   3 +
 library/jgrowl/jquery.jgrowl.css          | 136 ++++++++++++++++++++++++++++++
 library/jgrowl/jquery.jgrowl_minimized.js |  11 +++
 library/stanlemon-jgrowl-tip.tar.gz       | Bin 0 -> 213973 bytes
 mod/ping.php                              |  22 ++++-
 view/head.tpl                             |   6 +-
 view/theme/quattro/colors.less            |   5 +-
 view/theme/quattro/quattro.less           |  14 ++-
 view/theme/quattro/style.css              |  11 +++
 22 files changed, 222 insertions(+), 12 deletions(-)
 create mode 100644 images/icons/10/info.png
 create mode 100644 images/icons/10/notice.png
 create mode 100644 images/icons/16/info.png
 create mode 100644 images/icons/16/notice.png
 create mode 100644 images/icons/22/info.png
 create mode 100644 images/icons/22/notice.png
 create mode 100644 images/icons/48/info.png
 create mode 100644 images/icons/48/notice.png
 create mode 100644 images/icons/info.png
 create mode 100644 images/icons/notice.png
 create mode 100644 library/jgrowl/README
 create mode 100755 library/jgrowl/jquery.jgrowl.css
 create mode 100644 library/jgrowl/jquery.jgrowl_minimized.js
 create mode 100644 library/stanlemon-jgrowl-tip.tar.gz

diff --git a/boot.php b/boot.php
index 13e1eff11..c13116012 100644
--- a/boot.php
+++ b/boot.php
@@ -721,14 +721,16 @@ function remote_user() {
 if(! function_exists('notice')) {
 function notice($s) {
 	$a = get_app();
+	if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
 	if($a->interactive)
-		$_SESSION['sysmsg'] .= $s;
+		$_SESSION['sysmsg'][] = $s;
 }}
 if(! function_exists('info')) {
 function info($s) {
 	$a = get_app();
+	if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
 	if($a->interactive)
-		$_SESSION['sysmsg_info'] .= $s;
+		$_SESSION['sysmsg_info'][] = $s;
 }}
 
 
diff --git a/images/icons/10/info.png b/images/icons/10/info.png
new file mode 100644
index 000000000..8097733f3
Binary files /dev/null and b/images/icons/10/info.png differ
diff --git a/images/icons/10/notice.png b/images/icons/10/notice.png
new file mode 100644
index 000000000..327d5834e
Binary files /dev/null and b/images/icons/10/notice.png differ
diff --git a/images/icons/16/info.png b/images/icons/16/info.png
new file mode 100644
index 000000000..dcd501f93
Binary files /dev/null and b/images/icons/16/info.png differ
diff --git a/images/icons/16/notice.png b/images/icons/16/notice.png
new file mode 100644
index 000000000..8e551ad05
Binary files /dev/null and b/images/icons/16/notice.png differ
diff --git a/images/icons/22/info.png b/images/icons/22/info.png
new file mode 100644
index 000000000..c3cc715dc
Binary files /dev/null and b/images/icons/22/info.png differ
diff --git a/images/icons/22/notice.png b/images/icons/22/notice.png
new file mode 100644
index 000000000..e45b18c4c
Binary files /dev/null and b/images/icons/22/notice.png differ
diff --git a/images/icons/48/info.png b/images/icons/48/info.png
new file mode 100644
index 000000000..a66ae388b
Binary files /dev/null and b/images/icons/48/info.png differ
diff --git a/images/icons/48/notice.png b/images/icons/48/notice.png
new file mode 100644
index 000000000..a44548527
Binary files /dev/null and b/images/icons/48/notice.png differ
diff --git a/images/icons/info.png b/images/icons/info.png
new file mode 100644
index 000000000..ea2b0ffa4
Binary files /dev/null and b/images/icons/info.png differ
diff --git a/images/icons/notice.png b/images/icons/notice.png
new file mode 100644
index 000000000..b6017c8de
Binary files /dev/null and b/images/icons/notice.png differ
diff --git a/index.php b/index.php
index 51c87cae6..3db8170ef 100644
--- a/index.php
+++ b/index.php
@@ -112,10 +112,10 @@ if(! x($_SESSION,'authenticated'))
 	header('X-Account-Management-Status: none');
 
 if(! x($_SESSION,'sysmsg'))
-	$_SESSION['sysmsg'] = '';
+	$_SESSION['sysmsg'] = array();
 
 if(! x($_SESSION,'sysmsg_info'))
-	$_SESSION['sysmsg_info'] = '';
+	$_SESSION['sysmsg_info'] = array();
 
 /*
  * check_config() is responsible for running update scripts. These automatically 
@@ -262,7 +262,7 @@ if(isset($homebase))
 // now that we've been through the module content, see if the page reported
 // a permission problem and if so, a 403 response would seem to be in order.
 
-if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
+if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }
 
@@ -272,7 +272,7 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
  *
  */
 	
-if(x($_SESSION,'sysmsg')) {
+/*if(x($_SESSION,'sysmsg')) {
 	$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
 		. ((x($a->page,'content')) ? $a->page['content'] : '');
 	$_SESSION['sysmsg']="";
@@ -283,7 +283,7 @@ if(x($_SESSION,'sysmsg_info')) {
 		. ((x($a->page,'content')) ? $a->page['content'] : '');
 	$_SESSION['sysmsg_info']="";
 	unset($_SESSION['sysmsg_info']);
-}
+}*/
 
 
 
diff --git a/js/main.js b/js/main.js
index 30bf8a3b7..328b1f231 100644
--- a/js/main.js
+++ b/js/main.js
@@ -112,6 +112,16 @@
 			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
 			$('#notify-update').html(notif);
 			
+			var eSysmsg = $(data).find('sysmsgs');
+			eSysmsg.children("notice").each(function(){
+				text = $(this).text();
+				$.jGrowl(text, { sticky: true, theme: 'notice' });
+			});
+			eSysmsg.children("info").each(function(){
+				text = $(this).text();
+				$.jGrowl(text, { sticky: false, theme: 'info' });
+			});
+			
 		});
 		
 		
diff --git a/library/jgrowl/README b/library/jgrowl/README
new file mode 100644
index 000000000..3c94f7508
--- /dev/null
+++ b/library/jgrowl/README
@@ -0,0 +1,3 @@
+http://stanlemon.net/projects/jgrowl.html
+
+jGrowl is free and open source, it's distributed under the MIT and GPL licenses
diff --git a/library/jgrowl/jquery.jgrowl.css b/library/jgrowl/jquery.jgrowl.css
new file mode 100755
index 000000000..b4deb978c
--- /dev/null
+++ b/library/jgrowl/jquery.jgrowl.css
@@ -0,0 +1,136 @@
+
+div.jGrowl {
+	z-index: 			9999;
+	color: 				#fff;
+	font-size: 			12px;
+}
+
+/** Special IE6 Style Positioning **/
+div.ie6 {
+	position: 			absolute;
+}
+
+div.ie6.top-right {
+	right: 				auto;
+	bottom: 			auto;
+	left: 				expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
+	top: 				expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
+}
+
+div.ie6.top-left {
+	left: 				expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
+	top: 				expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
+}
+
+div.ie6.bottom-right {
+	left: 				expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
+	top: 				expression( ( 0 - jGrowl.offsetHeight + ( document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
+}
+
+div.ie6.bottom-left {
+	left: 				expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
+	top: 				expression( ( 0 - jGrowl.offsetHeight + ( document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
+}
+
+div.ie6.center {
+	left: 				expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
+	top: 				expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
+	width: 				100%;
+}
+
+/** Normal Style Positions **/
+div.jGrowl {
+	position:			absolute;
+}
+
+body > div.jGrowl {
+	position:			fixed;
+}
+
+div.jGrowl.top-left {
+	left: 				0px;
+	top: 				0px;
+}
+
+div.jGrowl.top-right {
+	right: 				0px;
+	top: 				0px;
+}
+
+div.jGrowl.bottom-left {
+	left: 				0px;
+	bottom:				0px;
+}
+
+div.jGrowl.bottom-right {
+	right: 				0px;
+	bottom: 			0px;
+}
+
+div.jGrowl.center {
+	top: 				0px;
+	width: 				50%;
+	left: 				25%;
+}
+
+/** Cross Browser Styling **/
+div.center div.jGrowl-notification, div.center div.jGrowl-closer {
+	margin-left: 		auto;
+	margin-right: 		auto;
+}
+
+div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer {
+	background-color: 		#000;
+	opacity: 				.85;
+	-ms-filter: 			"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; 
+	filter: 				progid:DXImageTransform.Microsoft.Alpha(Opacity=85); 
+	zoom: 					1;
+	width: 					235px;
+	padding: 				10px;
+	margin-top: 			5px;
+	margin-bottom: 			5px;
+	font-family: 			Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 				1em;
+	text-align: 			left;
+	display: 				none;
+	-moz-border-radius: 	5px;
+	-webkit-border-radius:	5px;
+}
+
+div.jGrowl div.jGrowl-notification {
+	min-height: 			40px;
+}
+
+div.jGrowl div.jGrowl-notification,
+div.jGrowl div.jGrowl-closer {
+	margin: 				10px;
+}
+
+div.jGrowl div.jGrowl-notification div.jGrowl-header {
+	font-weight: 			bold;
+	font-size:				.85em;
+}
+
+div.jGrowl div.jGrowl-notification div.jGrowl-close {
+	z-index:				99;
+	float: 					right;
+	font-weight: 			bold;
+	font-size: 				1em;
+	cursor:					pointer;
+}
+
+div.jGrowl div.jGrowl-closer {
+	padding-top: 			4px;
+	padding-bottom: 		4px;
+	cursor: 				pointer;
+	font-size:				.9em;
+	font-weight: 			bold;
+	text-align: 			center;
+}
+
+/** Hide jGrowl when printing **/
+@media print {
+	div.jGrowl {
+		display: 			none;
+	}
+}
diff --git a/library/jgrowl/jquery.jgrowl_minimized.js b/library/jgrowl/jquery.jgrowl_minimized.js
new file mode 100644
index 000000000..782898098
--- /dev/null
+++ b/library/jgrowl/jquery.jgrowl_minimized.js
@@ -0,0 +1,11 @@
+(function($){$.jGrowl=function(m,o){if($('#jGrowl').size()==0)
+$('<div id="jGrowl"></div>').addClass((o&&o.position)?o.position:$.jGrowl.defaults.position).appendTo('body');$('#jGrowl').jGrowl(m,o);};$.fn.jGrowl=function(m,o){if($.isFunction(this.each)){var args=arguments;return this.each(function(){var self=this;if($(this).data('jGrowl.instance')==undefined){$(this).data('jGrowl.instance',$.extend(new $.fn.jGrowl(),{notifications:[],element:null,interval:null}));$(this).data('jGrowl.instance').startup(this);}
+if($.isFunction($(this).data('jGrowl.instance')[m])){$(this).data('jGrowl.instance')[m].apply($(this).data('jGrowl.instance'),$.makeArray(args).slice(1));}else{$(this).data('jGrowl.instance').create(m,o);}});};};$.extend($.fn.jGrowl.prototype,{defaults:{pool:0,header:'',group:'',sticky:false,position:'top-right',glue:'after',theme:'default',themeState:'highlight',corners:'10px',check:250,life:3000,closeDuration:'normal',openDuration:'normal',easing:'swing',closer:true,closeTemplate:'&times;',closerTemplate:'<div>[ close all ]</div>',log:function(e,m,o){},beforeOpen:function(e,m,o){},afterOpen:function(e,m,o){},open:function(e,m,o){},beforeClose:function(e,m,o){},close:function(e,m,o){},animateOpen:{opacity:'show'},animateClose:{opacity:'hide'}},notifications:[],element:null,interval:null,create:function(message,o){var o=$.extend({},this.defaults,o);if(typeof o.speed!=='undefined'){o.openDuration=o.speed;o.closeDuration=o.speed;}
+this.notifications.push({message:message,options:o});o.log.apply(this.element,[this.element,message,o]);},render:function(notification){var self=this;var message=notification.message;var o=notification.options;var notification=$('<div class="jGrowl-notification '+o.themeState+' ui-corner-all'+
+((o.group!=undefined&&o.group!='')?' '+o.group:'')+'">'+'<div class="jGrowl-close">'+o.closeTemplate+'</div>'+'<div class="jGrowl-header">'+o.header+'</div>'+'<div class="jGrowl-message">'+message+'</div></div>').data("jGrowl",o).addClass(o.theme).children('div.jGrowl-close').bind("click.jGrowl",function(){$(this).parent().trigger('jGrowl.close');}).parent();$(notification).bind("mouseover.jGrowl",function(){$('div.jGrowl-notification',self.element).data("jGrowl.pause",true);}).bind("mouseout.jGrowl",function(){$('div.jGrowl-notification',self.element).data("jGrowl.pause",false);}).bind('jGrowl.beforeOpen',function(){if(o.beforeOpen.apply(notification,[notification,message,o,self.element])!=false){$(this).trigger('jGrowl.open');}}).bind('jGrowl.open',function(){if(o.open.apply(notification,[notification,message,o,self.element])!=false){if(o.glue=='after'){$('div.jGrowl-notification:last',self.element).after(notification);}else{$('div.jGrowl-notification:first',self.element).before(notification);}
+$(this).animate(o.animateOpen,o.openDuration,o.easing,function(){if($.browser.msie&&(parseInt($(this).css('opacity'),10)===1||parseInt($(this).css('opacity'),10)===0))
+this.style.removeAttribute('filter');if($(this).data("jGrowl")!=null)
+$(this).data("jGrowl").created=new Date();$(this).trigger('jGrowl.afterOpen');});}}).bind('jGrowl.afterOpen',function(){o.afterOpen.apply(notification,[notification,message,o,self.element]);}).bind('jGrowl.beforeClose',function(){if(o.beforeClose.apply(notification,[notification,message,o,self.element])!=false)
+$(this).trigger('jGrowl.close');}).bind('jGrowl.close',function(){$(this).data('jGrowl.pause',true);$(this).animate(o.animateClose,o.closeDuration,o.easing,function(){if($.isFunction(o.close)){if(o.close.apply(notification,[notification,message,o,self.element])!==false)
+$(this).remove();}else{$(this).remove();}});}).trigger('jGrowl.beforeOpen');if(o.corners!=''&&$.fn.corner!=undefined)$(notification).corner(o.corners);if($('div.jGrowl-notification:parent',self.element).size()>1&&$('div.jGrowl-closer',self.element).size()==0&&this.defaults.closer!=false){$(this.defaults.closerTemplate).addClass('jGrowl-closer ui-state-highlight ui-corner-all').addClass(this.defaults.theme).appendTo(self.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){$(this).siblings().trigger("jGrowl.beforeClose");if($.isFunction(self.defaults.closer)){self.defaults.closer.apply($(this).parent()[0],[$(this).parent()[0]]);}});};},update:function(){$(this.element).find('div.jGrowl-notification:parent').each(function(){if($(this).data("jGrowl")!=undefined&&$(this).data("jGrowl").created!=undefined&&($(this).data("jGrowl").created.getTime()+parseInt($(this).data("jGrowl").life))<(new Date()).getTime()&&$(this).data("jGrowl").sticky!=true&&($(this).data("jGrowl.pause")==undefined||$(this).data("jGrowl.pause")!=true)){$(this).trigger('jGrowl.beforeClose');}});if(this.notifications.length>0&&(this.defaults.pool==0||$(this.element).find('div.jGrowl-notification:parent').size()<this.defaults.pool))
+this.render(this.notifications.shift());if($(this.element).find('div.jGrowl-notification:parent').size()<2){$(this.element).find('div.jGrowl-closer').animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){$(this).remove();});}},startup:function(e){this.element=$(e).addClass('jGrowl').append('<div class="jGrowl-notification"></div>');this.interval=setInterval(function(){$(e).data('jGrowl.instance').update();},parseInt(this.defaults.check));if($.browser.msie&&parseInt($.browser.version)<7&&!window["XMLHttpRequest"]){$(this.element).addClass('ie6');}},shutdown:function(){$(this.element).removeClass('jGrowl').find('div.jGrowl-notification').remove();clearInterval(this.interval);},close:function(){$(this.element).find('div.jGrowl-notification').each(function(){$(this).trigger('jGrowl.beforeClose');});}});$.jGrowl.defaults=$.fn.jGrowl.prototype.defaults;})(jQuery);
\ No newline at end of file
diff --git a/library/stanlemon-jgrowl-tip.tar.gz b/library/stanlemon-jgrowl-tip.tar.gz
new file mode 100644
index 000000000..07a5fb097
Binary files /dev/null and b/library/stanlemon-jgrowl-tip.tar.gz differ
diff --git a/mod/ping.php b/mod/ping.php
index 8a3d284af..38a32744d 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -159,8 +159,26 @@ function ping_init(&$a) {
 	}
 
 
-	echo "  </notif>
-		</result>
+	echo "  </notif>";
+	
+	echo " <sysmsgs>";
+		if(x($_SESSION,'sysmsg')){
+			foreach ($_SESSION['sysmsg'] as $m){
+				echo "<notice>".($m)."</notice>";
+			}
+			$_SESSION['sysmsg']=array();
+			unset($_SESSION['sysmsg']);
+		}
+		if(x($_SESSION,'sysmsg_info')){
+			foreach ($_SESSION['sysmsg_info'] as $m){
+				echo "<info>".($m)."</info>";
+			}
+			$_SESSION['sysmsg_info']=array();
+			unset($_SESSION['sysmsg_info']);
+		}
+	
+	echo " </sysmsgs>";
+	echo"</result>
 	";
 
 	killme();
diff --git a/view/head.tpl b/view/head.tpl
index a18bcdd5e..b6d78da39 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,9 +1,12 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
 <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
@@ -16,6 +19,7 @@
 <script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
 <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
 <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
 <script type="text/javascript" src="$baseurl/js/acl.js" ></script>
 <script type="text/javascript" src="$baseurl/js/main.js" ></script>
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 6015c61ee..3d3074d60 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -59,5 +59,8 @@
 @AsideConnectBg: @Blue3;
 @AsideConnectHoverBg: @Blue1;
 
+@InfoColor: @Grey1;
+@InfoBackgroundColor: @Metalic3;
 
-
+@NoticeColor: @Grey1;
+@NoticeBackgroundColor: #511919;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c7cbe7ebb..2c4e0464a 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -38,6 +38,19 @@ a:hover {color: @LinkHover; text-decoration: underline; }
 	.icon { float: right; }
 }
 
+/* popup notifications */
+div.jGrowl div.notice {
+	background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center;
+	color: 	@NoticeColor;
+	padding-left: 58px;
+}
+div.jGrowl div.info {
+	background: @InfoBackgroundColor url("../../../images/icons/48/info.png") no-repeat 5px center;
+	color: 	@InfoColor;
+	padding-left: 58px;
+}
+
+
 
 /* header */
 header {
@@ -237,4 +250,3 @@ section {
 }
 
 
-
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 2b950c3ef..0fce02f03 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -95,6 +95,17 @@ a:hover {
 .tool .icon {
   float: right;
 }
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
 /* header */
 header {
   position: fixed;
-- 
cgit v1.2.3


From c7a9b1ae32675ce1035834c3a6a64465adf1b5b1 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 14:03:38 +0200
Subject: add *~ to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 41ec42389..a2d1ffa54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ include/jquery-1.4.2.min.js
 *.version*
 favicon.*
 home.html
+*~
-- 
cgit v1.2.3


From 08e54234e30c10e3130b7d71caba9fd43e3593e3 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 5 Sep 2011 16:55:40 +0200
Subject: profiles popup menu in sidebar

---
 boot.php                        | 29 ++++++++++++++++++++++++++++-
 view/profile_vcard.tpl          | 15 ++++++++++++++-
 view/theme/quattro/quattro.less |  6 +++---
 view/theme/quattro/style.css    |  9 ++++++++-
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index c13116012..10195c2ba 100644
--- a/boot.php
+++ b/boot.php
@@ -860,9 +860,36 @@ function profile_sidebar($profile, $block = 0) {
 		$connect = False; 
 
 
-	// show edit to yourself
+	// show edit profile to yourself
 	if ($profile['uid'] == local_user()) {
 		$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+		
+		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+				local_user());
+		
+		$profile['menu'] = array(
+			'chg_photo' => t('Change profile photo'),
+			'cr_new' => t('Create New Profile'),
+			'entries' => array(),
+		);
+				
+		if(count($r)) {
+
+			foreach($r as $rr) {
+				$profile['menu']['entries'][] = array(
+					'photo' => $rr['thumb'],
+					'id' => $rr['id'],
+					'alt' => t('Profile Image'),
+					'profile_name' => $rr['profile-name'],
+					'visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' 
+						: '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
+				);
+			}
+
+
+		}
+		
+		
 	}
 
 
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index ecdb5280f..cab732cc1 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -2,8 +2,21 @@
 
 	<div class="tool">
 		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}<a class="icon s16 edit ttright" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
+		{{ if $profile.edit }}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li><a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a></li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				
+			</ul>
+			</div>
+		{{ endif }}
 	</div>
+				
 	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 2c4e0464a..01d0b94b9 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -35,7 +35,7 @@ a:hover {color: @LinkHover; text-decoration: underline; }
 .tool {
 	height: auto; overflow: auto;
 	.label { float: left;}
-	.icon { float: right; }
+	.action { float: right; }
 }
 
 /* popup notifications */
@@ -168,11 +168,11 @@ ul.menu-popup {
 	
 	.shadow();
 	
-		a { display: block; color: @MenuItem; padding: 5px 10px;}
+		a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;}
 		a:hover { background-color: @MenuItemHoverBg; }
 		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
 		li { float: none;  overflow: auto; height: auto; display: block; }
-		
+		li img { float: left; width: 16px; height: 16px; padding-right: 5px;}
 		.empty {
 			padding: 5px;
 			text-align: center;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 0fce02f03..6daef77a3 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -92,7 +92,7 @@ a:hover {
 .tool .label {
   float: left;
 }
-.tool .icon {
+.tool .action {
   float: right;
 }
 /* popup notifications */
@@ -268,6 +268,7 @@ ul.menu-popup a {
   display: block;
   color: #2d2d2d;
   padding: 5px 10px;
+  text-decoration: none;
 }
 ul.menu-popup a:hover {
   background-color: #bdcdd4;
@@ -281,6 +282,12 @@ ul.menu-popup li {
   height: auto;
   display: block;
 }
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
 ul.menu-popup .empty {
   padding: 5px;
   text-align: center;
-- 
cgit v1.2.3


From 2f93a4d70dbdc1c8affa05dc7a09638c542e2fa3 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 8 Sep 2011 10:11:57 +0200
Subject: style vcard infos

---
 view/theme/quattro/colors.less  | 1 +
 view/theme/quattro/quattro.less | 3 ++-
 view/theme/quattro/style.css    | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 3d3074d60..b5a203b94 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -58,6 +58,7 @@
 @AsideConnect: @Grey1;
 @AsideConnectBg: @Blue3;
 @AsideConnectHoverBg: @Blue1;
+@VCardLabelColor: @Grey3;
 
 @InfoColor: @Grey1;
 @InfoBackgroundColor: @Metalic3;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 01d0b94b9..54bd11806 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -149,6 +149,7 @@ nav {
 			.menu-popup{ right: 0px; left: auto; }
 		}
 	
+		#nav-notifications-linkmenu.on .icon.s22.notify,
 		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
@@ -201,7 +202,7 @@ aside {
 		.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
 		.title { margin-bottom: 5px; }
 		dl { height: auto; overflow: auto; }
-		dt {float: left; margin-left: 0px; width: 35%; }
+		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
 	
 	}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 6daef77a3..70e0a3b94 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -243,7 +243,7 @@ nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
 }
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_on.png");
 }
 nav #nav-apps-link.selected {
@@ -331,6 +331,8 @@ aside .vcard dt {
   float: left;
   margin-left: 0px;
   width: 35%;
+  text-align: right;
+  color: #999999;
 }
 aside .vcard dd {
   float: left;
-- 
cgit v1.2.3


From dbc5ecfe572b0dc11bab277dcbe24541cdd4e858 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 8 Sep 2011 10:12:20 +0200
Subject: light notifications menu icon on new notifs

---
 js/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/main.js b/js/main.js
index 328b1f231..452cb8451 100644
--- a/js/main.js
+++ b/js/main.js
@@ -97,9 +97,10 @@
 			var eNotif = $(data).find('notif')
 			notif = eNotif.attr('count');
 			if (notif>0){
+				$("#nav-notifications-linkmenu").addClass("on");
 				nnm = $("#nav-notifications-menu");
 				nnm.html("");
-				nnm.attr('popup','true');
+				//nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
 					e = $(this);
 					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
@@ -107,6 +108,7 @@
 					nnm.append(html);
 				});
 			} else {
+				$("#nav-notifications-linkmenu").removeClass("on");
 				$("#nav-notifications-menu").html(notifications_empty);
 			}
 			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-- 
cgit v1.2.3


From 7e806429cca6ac39a9ef1bd1fd400d03e626389b Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 15 Sep 2011 10:38:37 +0200
Subject: quattro

---
 boot.php                        | 6 ++++--
 view/profile_vcard.tpl          | 4 +++-
 view/theme/quattro/quattro.less | 5 ++++-
 view/theme/quattro/style.css    | 5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index 10195c2ba..4798d55d3 100644
--- a/boot.php
+++ b/boot.php
@@ -881,8 +881,10 @@ function profile_sidebar($profile, $block = 0) {
 					'id' => $rr['id'],
 					'alt' => t('Profile Image'),
 					'profile_name' => $rr['profile-name'],
-					'visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' 
-						: '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
+					'isdefault' => $rr['is-default'],
+					'visibile_to_everybody' =>  t('visible to everybody'),
+					'edit_visibility' => t('Edit visibility'),
+					
 				);
 			}
 
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index cab732cc1..d65b65784 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -7,7 +7,9 @@
 			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
 			<ul id="profiles-menu" class="menu-popup">
 				{{ for $profile.menu.entries as $e }}
-				<li><a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a></li>
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
 				{{ endfor }}
 				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
 				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 54bd11806..14d1dfa1c 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -3,7 +3,7 @@
 /* global */
 body {
 	font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
-	font-size: 12px;
+	font-size: 10px;
 	background-color: @BodyBackground;
 	color: @BodyColor;
 	margin: 50px 0px 0px 0px;
@@ -179,6 +179,7 @@ ul.menu-popup {
 			text-align: center;
 			color: @MenuEmpty;
 		}
+		
 }
 
 #nav-notifications-menu {
@@ -224,6 +225,8 @@ aside {
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 
+	#profiles-menu { width: 20em; }
+
 }
 
 #contact-block {
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 70e0a3b94..6ff9c70c7 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -61,7 +61,7 @@
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
-  font-size: 12px;
+  font-size: 10px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px 0px 0px 0px;
@@ -363,6 +363,9 @@ aside #dfrn-request-link:hover {
   text-decoration: none;
   background-color: #19aeff;
 }
+aside #profiles-menu {
+  width: 20em;
+}
 #contact-block {
   overflow: auto;
   height: auto;
-- 
cgit v1.2.3


From 80af4f3fe647e52add7e38cabc356597fae57a22 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 16 Sep 2011 12:50:15 +0200
Subject: new icons

---
 images/icons/10/add.png        | Bin 2946 -> 2946 bytes
 images/icons/10/delete.png     | Bin 3018 -> 3018 bytes
 images/icons/10/edit.png       | Bin 3011 -> 3011 bytes
 images/icons/10/feed.png       | Bin 535 -> 535 bytes
 images/icons/10/gear.png       | Bin 3043 -> 3043 bytes
 images/icons/10/group.png      | Bin 543 -> 543 bytes
 images/icons/10/info.png       | Bin 488 -> 488 bytes
 images/icons/10/lock.png       | Bin 0 -> 3059 bytes
 images/icons/10/menu.png       | Bin 0 -> 3016 bytes
 images/icons/10/notice.png     | Bin 471 -> 471 bytes
 images/icons/10/notify_off.png | Bin 478 -> 478 bytes
 images/icons/10/notify_on.png  | Bin 369 -> 369 bytes
 images/icons/10/star.png       | Bin 3229 -> 3229 bytes
 images/icons/10/user.png       | Bin 534 -> 534 bytes
 images/icons/16/add.png        | Bin 3068 -> 3068 bytes
 images/icons/16/delete.png     | Bin 3142 -> 3142 bytes
 images/icons/16/edit.png       | Bin 3129 -> 3129 bytes
 images/icons/16/feed.png       | Bin 828 -> 828 bytes
 images/icons/16/gear.png       | Bin 3199 -> 3199 bytes
 images/icons/16/group.png      | Bin 852 -> 852 bytes
 images/icons/16/info.png       | Bin 854 -> 854 bytes
 images/icons/16/lock.png       | Bin 0 -> 3195 bytes
 images/icons/16/menu.png       | Bin 0 -> 3268 bytes
 images/icons/16/notice.png     | Bin 591 -> 591 bytes
 images/icons/16/notify_off.png | Bin 835 -> 835 bytes
 images/icons/16/notify_on.png  | Bin 542 -> 542 bytes
 images/icons/16/star.png       | Bin 3498 -> 3498 bytes
 images/icons/16/user.png       | Bin 794 -> 794 bytes
 images/icons/22/add.png        | Bin 3210 -> 3210 bytes
 images/icons/22/delete.png     | Bin 3294 -> 3294 bytes
 images/icons/22/edit.png       | Bin 3247 -> 3247 bytes
 images/icons/22/feed.png       | Bin 1136 -> 1136 bytes
 images/icons/22/gear.png       | Bin 3384 -> 3384 bytes
 images/icons/22/group.png      | Bin 1146 -> 1146 bytes
 images/icons/22/info.png       | Bin 1106 -> 1106 bytes
 images/icons/22/lock.png       | Bin 0 -> 3372 bytes
 images/icons/22/menu.png       | Bin 0 -> 3357 bytes
 images/icons/22/notice.png     | Bin 780 -> 780 bytes
 images/icons/22/notify_off.png | Bin 1093 -> 1093 bytes
 images/icons/22/notify_on.png  | Bin 721 -> 721 bytes
 images/icons/22/star.png       | Bin 3780 -> 3780 bytes
 images/icons/22/user.png       | Bin 1084 -> 1084 bytes
 images/icons/48/add.png        | Bin 3944 -> 3944 bytes
 images/icons/48/delete.png     | Bin 3997 -> 3997 bytes
 images/icons/48/edit.png       | Bin 3948 -> 3948 bytes
 images/icons/48/feed.png       | Bin 2692 -> 2692 bytes
 images/icons/48/gear.png       | Bin 4225 -> 4225 bytes
 images/icons/48/group.png      | Bin 2392 -> 2392 bytes
 images/icons/48/info.png       | Bin 2152 -> 2152 bytes
 images/icons/48/lock.png       | Bin 0 -> 4169 bytes
 images/icons/48/menu.png       | Bin 0 -> 4607 bytes
 images/icons/48/notice.png     | Bin 1730 -> 1730 bytes
 images/icons/48/notify_off.png | Bin 2147 -> 2147 bytes
 images/icons/48/notify_on.png  | Bin 1506 -> 1506 bytes
 images/icons/48/star.png       | Bin 4776 -> 4776 bytes
 images/icons/48/user.png       | Bin 2269 -> 2269 bytes
 images/icons/lock.png          | Bin 0 -> 8213 bytes
 images/icons/menu.png          | Bin 0 -> 14783 bytes
 view/theme/quattro/icons.less  |  16 +++++++++++++++-
 59 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 images/icons/10/lock.png
 create mode 100644 images/icons/10/menu.png
 create mode 100644 images/icons/16/lock.png
 create mode 100644 images/icons/16/menu.png
 create mode 100644 images/icons/22/lock.png
 create mode 100644 images/icons/22/menu.png
 create mode 100644 images/icons/48/lock.png
 create mode 100644 images/icons/48/menu.png
 create mode 100644 images/icons/lock.png
 create mode 100644 images/icons/menu.png

diff --git a/images/icons/10/add.png b/images/icons/10/add.png
index f036ac73e..296e8e500 100644
Binary files a/images/icons/10/add.png and b/images/icons/10/add.png differ
diff --git a/images/icons/10/delete.png b/images/icons/10/delete.png
index f6bf31da4..e4bd85933 100644
Binary files a/images/icons/10/delete.png and b/images/icons/10/delete.png differ
diff --git a/images/icons/10/edit.png b/images/icons/10/edit.png
index a6af619e2..d939342a1 100644
Binary files a/images/icons/10/edit.png and b/images/icons/10/edit.png differ
diff --git a/images/icons/10/feed.png b/images/icons/10/feed.png
index 0e7d02c9b..22aa5fd4b 100644
Binary files a/images/icons/10/feed.png and b/images/icons/10/feed.png differ
diff --git a/images/icons/10/gear.png b/images/icons/10/gear.png
index df6f87af5..b1f2a8f52 100644
Binary files a/images/icons/10/gear.png and b/images/icons/10/gear.png differ
diff --git a/images/icons/10/group.png b/images/icons/10/group.png
index 23172a027..a58d51910 100644
Binary files a/images/icons/10/group.png and b/images/icons/10/group.png differ
diff --git a/images/icons/10/info.png b/images/icons/10/info.png
index 8097733f3..667c127c6 100644
Binary files a/images/icons/10/info.png and b/images/icons/10/info.png differ
diff --git a/images/icons/10/lock.png b/images/icons/10/lock.png
new file mode 100644
index 000000000..ad8079c23
Binary files /dev/null and b/images/icons/10/lock.png differ
diff --git a/images/icons/10/menu.png b/images/icons/10/menu.png
new file mode 100644
index 000000000..7dbb779d0
Binary files /dev/null and b/images/icons/10/menu.png differ
diff --git a/images/icons/10/notice.png b/images/icons/10/notice.png
index 327d5834e..88ea4ac76 100644
Binary files a/images/icons/10/notice.png and b/images/icons/10/notice.png differ
diff --git a/images/icons/10/notify_off.png b/images/icons/10/notify_off.png
index c499de01b..8ba240e1d 100644
Binary files a/images/icons/10/notify_off.png and b/images/icons/10/notify_off.png differ
diff --git a/images/icons/10/notify_on.png b/images/icons/10/notify_on.png
index 5204e097c..d4ef71558 100644
Binary files a/images/icons/10/notify_on.png and b/images/icons/10/notify_on.png differ
diff --git a/images/icons/10/star.png b/images/icons/10/star.png
index 185761177..cd8518a18 100644
Binary files a/images/icons/10/star.png and b/images/icons/10/star.png differ
diff --git a/images/icons/10/user.png b/images/icons/10/user.png
index 419661be6..6c2d161e8 100644
Binary files a/images/icons/10/user.png and b/images/icons/10/user.png differ
diff --git a/images/icons/16/add.png b/images/icons/16/add.png
index 7ca375325..1ff064bb3 100644
Binary files a/images/icons/16/add.png and b/images/icons/16/add.png differ
diff --git a/images/icons/16/delete.png b/images/icons/16/delete.png
index ada2535fc..532346860 100644
Binary files a/images/icons/16/delete.png and b/images/icons/16/delete.png differ
diff --git a/images/icons/16/edit.png b/images/icons/16/edit.png
index 747f5e4e7..bd845a767 100644
Binary files a/images/icons/16/edit.png and b/images/icons/16/edit.png differ
diff --git a/images/icons/16/feed.png b/images/icons/16/feed.png
index 9ac7c6677..082e1bc73 100644
Binary files a/images/icons/16/feed.png and b/images/icons/16/feed.png differ
diff --git a/images/icons/16/gear.png b/images/icons/16/gear.png
index 5af85390f..86cbe1eb8 100644
Binary files a/images/icons/16/gear.png and b/images/icons/16/gear.png differ
diff --git a/images/icons/16/group.png b/images/icons/16/group.png
index bab4bcd18..29ef69672 100644
Binary files a/images/icons/16/group.png and b/images/icons/16/group.png differ
diff --git a/images/icons/16/info.png b/images/icons/16/info.png
index dcd501f93..e8e7b35ba 100644
Binary files a/images/icons/16/info.png and b/images/icons/16/info.png differ
diff --git a/images/icons/16/lock.png b/images/icons/16/lock.png
new file mode 100644
index 000000000..f4432bbe4
Binary files /dev/null and b/images/icons/16/lock.png differ
diff --git a/images/icons/16/menu.png b/images/icons/16/menu.png
new file mode 100644
index 000000000..a6b1cac47
Binary files /dev/null and b/images/icons/16/menu.png differ
diff --git a/images/icons/16/notice.png b/images/icons/16/notice.png
index 8e551ad05..13c5c6b79 100644
Binary files a/images/icons/16/notice.png and b/images/icons/16/notice.png differ
diff --git a/images/icons/16/notify_off.png b/images/icons/16/notify_off.png
index f11aa4bde..3031fc906 100644
Binary files a/images/icons/16/notify_off.png and b/images/icons/16/notify_off.png differ
diff --git a/images/icons/16/notify_on.png b/images/icons/16/notify_on.png
index 6e91fd995..1da6245a6 100644
Binary files a/images/icons/16/notify_on.png and b/images/icons/16/notify_on.png differ
diff --git a/images/icons/16/star.png b/images/icons/16/star.png
index 3130be6f0..ac620c43c 100644
Binary files a/images/icons/16/star.png and b/images/icons/16/star.png differ
diff --git a/images/icons/16/user.png b/images/icons/16/user.png
index df83bc27d..95c42c572 100644
Binary files a/images/icons/16/user.png and b/images/icons/16/user.png differ
diff --git a/images/icons/22/add.png b/images/icons/22/add.png
index ee83da024..2079e725d 100644
Binary files a/images/icons/22/add.png and b/images/icons/22/add.png differ
diff --git a/images/icons/22/delete.png b/images/icons/22/delete.png
index 15713471b..d0f2acf13 100644
Binary files a/images/icons/22/delete.png and b/images/icons/22/delete.png differ
diff --git a/images/icons/22/edit.png b/images/icons/22/edit.png
index 6e6bb4f73..ad251b8ed 100644
Binary files a/images/icons/22/edit.png and b/images/icons/22/edit.png differ
diff --git a/images/icons/22/feed.png b/images/icons/22/feed.png
index 15094ce89..a0b75f11d 100644
Binary files a/images/icons/22/feed.png and b/images/icons/22/feed.png differ
diff --git a/images/icons/22/gear.png b/images/icons/22/gear.png
index 16bcf77dd..9ccf5280b 100644
Binary files a/images/icons/22/gear.png and b/images/icons/22/gear.png differ
diff --git a/images/icons/22/group.png b/images/icons/22/group.png
index 0505432ca..f1360159b 100644
Binary files a/images/icons/22/group.png and b/images/icons/22/group.png differ
diff --git a/images/icons/22/info.png b/images/icons/22/info.png
index c3cc715dc..18d32664d 100644
Binary files a/images/icons/22/info.png and b/images/icons/22/info.png differ
diff --git a/images/icons/22/lock.png b/images/icons/22/lock.png
new file mode 100644
index 000000000..92c8c4905
Binary files /dev/null and b/images/icons/22/lock.png differ
diff --git a/images/icons/22/menu.png b/images/icons/22/menu.png
new file mode 100644
index 000000000..e3461da8b
Binary files /dev/null and b/images/icons/22/menu.png differ
diff --git a/images/icons/22/notice.png b/images/icons/22/notice.png
index e45b18c4c..2b9773892 100644
Binary files a/images/icons/22/notice.png and b/images/icons/22/notice.png differ
diff --git a/images/icons/22/notify_off.png b/images/icons/22/notify_off.png
index f2200bb60..513687bc5 100644
Binary files a/images/icons/22/notify_off.png and b/images/icons/22/notify_off.png differ
diff --git a/images/icons/22/notify_on.png b/images/icons/22/notify_on.png
index 6b3d7fd08..18002e15c 100644
Binary files a/images/icons/22/notify_on.png and b/images/icons/22/notify_on.png differ
diff --git a/images/icons/22/star.png b/images/icons/22/star.png
index b8829cbfd..484e24794 100644
Binary files a/images/icons/22/star.png and b/images/icons/22/star.png differ
diff --git a/images/icons/22/user.png b/images/icons/22/user.png
index fad2bee97..79bb05e4e 100644
Binary files a/images/icons/22/user.png and b/images/icons/22/user.png differ
diff --git a/images/icons/48/add.png b/images/icons/48/add.png
index 61a0b0982..753ac4b68 100644
Binary files a/images/icons/48/add.png and b/images/icons/48/add.png differ
diff --git a/images/icons/48/delete.png b/images/icons/48/delete.png
index 1be4c9a21..2835638a9 100644
Binary files a/images/icons/48/delete.png and b/images/icons/48/delete.png differ
diff --git a/images/icons/48/edit.png b/images/icons/48/edit.png
index d09214ec9..709fbb357 100644
Binary files a/images/icons/48/edit.png and b/images/icons/48/edit.png differ
diff --git a/images/icons/48/feed.png b/images/icons/48/feed.png
index 9730b4738..13d88f707 100644
Binary files a/images/icons/48/feed.png and b/images/icons/48/feed.png differ
diff --git a/images/icons/48/gear.png b/images/icons/48/gear.png
index 16434390d..8bb12e96e 100644
Binary files a/images/icons/48/gear.png and b/images/icons/48/gear.png differ
diff --git a/images/icons/48/group.png b/images/icons/48/group.png
index e624bbfb2..26238ac6a 100644
Binary files a/images/icons/48/group.png and b/images/icons/48/group.png differ
diff --git a/images/icons/48/info.png b/images/icons/48/info.png
index a66ae388b..760eca5c3 100644
Binary files a/images/icons/48/info.png and b/images/icons/48/info.png differ
diff --git a/images/icons/48/lock.png b/images/icons/48/lock.png
new file mode 100644
index 000000000..9943bb17d
Binary files /dev/null and b/images/icons/48/lock.png differ
diff --git a/images/icons/48/menu.png b/images/icons/48/menu.png
new file mode 100644
index 000000000..376e60cab
Binary files /dev/null and b/images/icons/48/menu.png differ
diff --git a/images/icons/48/notice.png b/images/icons/48/notice.png
index a44548527..f6fbc95c6 100644
Binary files a/images/icons/48/notice.png and b/images/icons/48/notice.png differ
diff --git a/images/icons/48/notify_off.png b/images/icons/48/notify_off.png
index 0a8854cfe..7c8cd9788 100644
Binary files a/images/icons/48/notify_off.png and b/images/icons/48/notify_off.png differ
diff --git a/images/icons/48/notify_on.png b/images/icons/48/notify_on.png
index 8440018a6..3275898c5 100644
Binary files a/images/icons/48/notify_on.png and b/images/icons/48/notify_on.png differ
diff --git a/images/icons/48/star.png b/images/icons/48/star.png
index 4b2816d15..f53914efa 100644
Binary files a/images/icons/48/star.png and b/images/icons/48/star.png differ
diff --git a/images/icons/48/user.png b/images/icons/48/user.png
index f73c591e6..c42410cd1 100644
Binary files a/images/icons/48/user.png and b/images/icons/48/user.png differ
diff --git a/images/icons/lock.png b/images/icons/lock.png
new file mode 100644
index 000000000..7e58ead2e
Binary files /dev/null and b/images/icons/lock.png differ
diff --git a/images/icons/menu.png b/images/icons/menu.png
new file mode 100644
index 000000000..56afc8541
Binary files /dev/null and b/images/icons/menu.png differ
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index 8f7111aff..c5dc1937b 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -1,3 +1,4 @@
+// Quattro Theme LESS file
 /* icons */
 
 .icons(@size: 22) {
@@ -7,7 +8,12 @@
 	&.add 	 	{ background-image: url("../../../images/icons/@{size}/add.png"); }
 	&.delete 	{ background-image: url("../../../images/icons/@{size}/delete.png"); }
 	&.edit 	 	{ background-image: url("../../../images/icons/@{size}/edit.png"); }
-	&.start	 	{ background-image: url("../../../images/icons/@{size}/star.png"); }
+	&.star	 	{ background-image: url("../../../images/icons/@{size}/star.png"); }
+	&.menu		{ background-image: url("../../../images/icons/@{size}/menu.png"); }
+	&.link		{ background-image: url("../../../images/icons/@{size}/link.png"); }
+	&.lock		{ background-image: url("../../../images/icons/@{size}/lock.png"); }
+	&.unlock	{ background-image: url("../../../images/icons/@{size}/unlock.png"); }
+	
 }
 
 
@@ -24,6 +30,10 @@
 		text-indent: 0px;
 	}
 
+	&.s10 {
+		width:10px; height: 10px;
+		.icons(10);
+	}
 	&.s16 {
 		width:22px; height: 22px;
 		.icons(16);
@@ -32,6 +42,10 @@
 		width:22px; height: 22px;
 		.icons(22);
 	}
+	&.s48 {
+		width:48px; height: 48px;
+		.icons(22);
+	}
 	
 	
 }
-- 
cgit v1.2.3


From 6b6f45f9f1c0fa5c0142c0bf1d9a93b77694ea4b Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 16 Sep 2011 12:51:14 +0200
Subject: quattro: initial style of conversations

---
 include/conversation.php              |  50 +++++++---
 include/text.php                      |  11 ++-
 js/main.js                            |  20 ++--
 view/conversation.tpl                 |   5 +
 view/theme/duepuntozero/wall_item.tpl |  49 ++++++++++
 view/theme/quattro/colors.less        |   2 +
 view/theme/quattro/quattro.less       |  55 ++++++++++-
 view/theme/quattro/style.css          | 166 +++++++++++++++++++++++++++++++++-
 view/wall_item.tpl                    |  75 +++++++--------
 9 files changed, 367 insertions(+), 66 deletions(-)
 create mode 100644 view/conversation.tpl
 create mode 100644 view/theme/duepuntozero/wall_item.tpl

diff --git a/include/conversation.php b/include/conversation.php
index 6aad2485a..aeb30177f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -268,6 +268,10 @@ function conversation(&$a, $items, $mode, $update) {
 		$blowhard = 0;
 		$blowhard_count = 0;
 
+		// array with html for each thread (parent+comments)
+		$treads = array();
+		$treadsid = -1;
+
 		foreach($items as $item) {
 
 			$comment = '';
@@ -294,7 +298,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
 				$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+				/*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
 						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
@@ -308,10 +312,13 @@ function conversation(&$a, $items, $mode, $update) {
 					if($blowhard_count >= 3)
 						$o .= '</div>';
 					$blowhard_count = 0;
-				}
+				}*/
 
 				$comments_seen = 0;
 				$comments_collapsed = false;
+				
+				$treadsid++;
+				$treads[$treadsid] = "";
 			}
 			else {
 				// prevent private email from leaking into public conversation
@@ -325,7 +332,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 				if(! $comments_collapsed) {
-					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
+					$treads[$treadsid] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
 						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
 						. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
 						. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
@@ -333,15 +340,15 @@ function conversation(&$a, $items, $mode, $update) {
 				}
 			}
 			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-				$o .= '</div>';
+				$treads[$treadsid] .= '</div>';
 			}
 
 			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
 			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-				: '<div class="wall-item-lock"></div>');
+				? t('Private Message')
+				: false);
 
 
 			// Top-level wall post not written by the wall owner (wall-to-wall)
@@ -427,7 +434,20 @@ function conversation(&$a, $items, $mode, $update) {
 
             $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
 
-			$star = (($profile_owner == local_user() && $toplevelpost) ? '<a href="#" id="starred-' . $item['id'] . '" onclick="dostar(' . $item['id'] . '); return false;" class="star-item icon ' . (($item['starred']) ? 'starred' : 'unstarred') . '" title="' . t('toggle star status')  . '"></a>' : '');
+			$star = false;
+
+			if ($profile_owner == local_user() && $toplevelpost) {
+				$isstarred = (($item['starred']) ? "starred" : "hidden");
+
+				$star = array(
+					'do' => t("add star"),
+					'undo' => t("remove star"),
+					'classdo' => (($item['starred']) ? "hidden" : ""),
+					'classundo' => (($item['starred']) ? "" : "hidden"),
+					'starred' =>  t('starred'),
+				);
+			}
+
 
 
 			$photo = $item['photo'];
@@ -508,6 +528,7 @@ function conversation(&$a, $items, $mode, $update) {
 				'$owner_name' => $owner_name,
 				'$plink' => get_plink($item),
 				'$edpost' => $edpost,
+				'$isstarred' => $isstarred,
 				'$star' => $star,
 				'$drop' => $drop,
 				'$vote' => $likebuttons,
@@ -520,7 +541,7 @@ function conversation(&$a, $items, $mode, $update) {
 			$arr = array('item' => $item, 'output' => $tmp_item);
 			call_hooks('display_item', $arr);
 
-			$o .= $arr['output'];
+			$treads[$treadsid] .= $arr['output'];
 
 		}
 	}
@@ -529,10 +550,15 @@ function conversation(&$a, $items, $mode, $update) {
 	// if author collapsing is in force but didn't get closed, close it off now.
 
 	if($blowhard_count >= 3)
-		$o .= '</div>';
-
-	if($dropping)
-		$o .= '<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"><div id="item-delete-selected-icon" class="icon drophide" title="' . t('Delete Selected Items') . '" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div><div id="item-delete-selected-desc" >' .  t('Delete Selected Items') . '</div></div><div id="item-delete-selected-end"></div>';
+		$treads[$treadsid] .= '</div>';
+
+	$page_template = get_markup_template("conversation.tpl");
+	$o .= replace_macros($page_template, array(
+		'$treads' => $treads,
+		'$dropping' => $dropping,
+	));
+	//if($dropping)
+	//	$o .= '<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"><div id="item-delete-selected-icon" class="icon drophide" title="' . t('Delete Selected Items') . '" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div><div id="item-delete-selected-desc" >' .  t('Delete Selected Items') . '</div></div><div id="item-delete-selected-end"></div>';
 
 	return $o;
 } 
diff --git a/include/text.php b/include/text.php
index 1f038c49c..a22faa1a5 100644
--- a/include/text.php
+++ b/include/text.php
@@ -834,9 +834,14 @@ function feed_salmonlinks($nick) {
 if(! function_exists('get_plink')) {
 function get_plink($item) {
 	$a = get_app();	
-	$plink = (((x($item,'plink')) && (! $item['private'])) ? '<div class="wall-item-links-wrapper"><a href="' 
-			. $item['plink'] . '" title="' . t('link to source') . '" target="external-link" class="icon remote-link"></a></div>' : '');
-	return $plink;
+	if (x($item,'plink') && (! $item['private'])){
+		return array(
+			'href' => $item['plink'],
+			'title' => t('link to source'),
+		);
+	} else {
+		return false;
+	}
 }}
 
 if(! function_exists('unamp')) {
diff --git a/js/main.js b/js/main.js
index d5d38062e..f08b669e3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -71,6 +71,7 @@
 		/* popup menus */
 		$('a[rel^=#]').click(function(e){
 			menu = $( $(this).attr('rel') );
+			e.preventDefault();
 			e.stopPropagation();
 			if (menu.attr('popup')=="false") return false;
 			$(this).parent().toggleClass("selected");
@@ -261,17 +262,22 @@
 	}
 
 	function dostar(ident) {
-		$('#like-rotator-' + ident.toString()).show();
-		$.get('starred/' + ident.toString(), function(data) {
+		ident = ident.toString();
+		$('#like-rotator-' + ident).show();
+		$.get('starred/' + ident, function(data) {
 			if(data.match(/1/)) {
-				$('#starred-' + ident.toString()).addClass('starred');
-				$('#starred-' + ident.toString()).removeClass('unstarred');
+				$('#starred-' + ident).addClass('starred');
+				$('#starred-' + ident).removeClass('hidden');
+				$('#star-' + ident).addClass('hidden');
+				$('#unstar-' + ident).removeClass('hidden');
 			}
 			else {			
-				$('#starred-' + ident.toString()).addClass('unstarred');
-				$('#starred-' + ident.toString()).removeClass('starred');
+				$('#starred-' + ident).addClass('hidden');
+				$('#starred-' + ident).removeClass('starred');
+				$('#star-' + ident).removeClass('hidden');
+				$('#unstar-' + ident).addClass('hidden');
 			}
-			$('#like-rotator-' + ident.toString()).hide();	
+			$('#like-rotator-' + ident).hide();	
 		});
 	}
 
diff --git a/view/conversation.tpl b/view/conversation.tpl
new file mode 100644
index 000000000..339302638
--- /dev/null
+++ b/view/conversation.tpl
@@ -0,0 +1,5 @@
+{{ for $treads as $tread }}
+<div class="tread-wrapper">
+	$tread
+</div>
+{{ endfor }}
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
new file mode 100644
index 000000000..5c467a119
--- /dev/null
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -0,0 +1,49 @@
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+		<div class="wall-item-info" id="wall-item-info-$id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
+				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
+				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+				</a>
+				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+					<ul>
+						$item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+				$lock
+				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				
+		</div>	
+		<div class="wall-item-content" id="wall-item-content-$id" >
+			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$id">
+		$vote
+		$plink
+		$edpost
+		$star
+		$drop
+		</div>
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+	<div class="wall-item-comment-wrapper" >
+	$comment
+	</div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+</div>
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index b5a203b94..12b0d08a6 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -65,3 +65,5 @@
 
 @NoticeColor: @Grey1;
 @NoticeBackgroundColor: #511919;
+
+@ThreadBackgroundColor: #f6f7f8;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 14d1dfa1c..e96095c24 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -31,6 +31,8 @@ a:hover {color: @LinkHover; text-decoration: underline; }
 
 .left { float: left; }
 .right { float: right; }
+.hidden { display: none; }
+
 
 .tool {
 	height: auto; overflow: auto;
@@ -253,4 +255,55 @@ section {
 	padding:0px 20px 0px 10px;
 }
 
-
+/* wall item */
+.tread-wrapper { 
+	background-color: @ThreadBackgroundColor; 
+	position: relative;
+	padding: 10px;
+	margin-bottom: 20px;
+}
+.wall-item-decor { position: absolute; left: 790px; top: -10px;  width: 16px;}
+.wall-item-container {
+	display: table;
+	width: 780px;
+	margin-bottom: 10px;
+	
+	.wall-item-item,
+	.wall-item-bottom { display: table-row; }
+	.wall-item-info {
+		display: table-cell;
+		vertical-align: top;
+		text-align: left;
+		width: 60px;
+		
+		.wall-item-photo-wrapper { position: relative; }
+		.wall-item-photo { width: 48px; height: 48px; }		
+		
+		.wall-item-photo-menu-button {
+			display: none;
+			position: absolute;
+			left: -4px;
+			top: 28px;
+		}
+		.wall-item-photo-menu { display: none; }
+		
+	} 
+	.wall-item-content {
+		display: table-cell;
+		font-size: 12px;
+		max-width: 720px;
+		word-wrap: break-word;
+	}
+	.wall-item-content img { max-width: 710px; }
+	.wall-item-links,
+	.wall-item-actions { display: table-cell; }
+	
+	.wall-item-ago { padding-right: 40px; }
+}
+.wall-item-container.comment {
+	.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}	
+	.wall-item-photo-menu-button {
+		top: 13px !important;
+		left: 10px !important;
+	}
+}
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 6ff9c70c7..a6ea35869 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -14,6 +14,40 @@
 .icon.text {
   text-indent: 0px;
 }
+.icon.s10 {
+  width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/icons/10/star.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
 .icon.s16 {
   width: 22px;
   height: 22px;
@@ -33,9 +67,21 @@
 .icon.s16.edit {
   background-image: url("../../../images/icons/16/edit.png");
 }
-.icon.s16.start {
+.icon.s16.star {
   background-image: url("../../../images/icons/16/star.png");
 }
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
 .icon.s22 {
   width: 22px;
   height: 22px;
@@ -55,9 +101,55 @@
 .icon.s22.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
-.icon.s22.start {
+.icon.s22.star {
   background-image: url("../../../images/icons/22/star.png");
 }
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/icons/22/star.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -85,6 +177,9 @@ a:hover {
 .right {
   float: right;
 }
+.hidden {
+  display: none;
+}
 .tool {
   height: auto;
   overflow: auto;
@@ -393,3 +488,70 @@ section {
   width: 800px;
   padding: 0px 20px 0px 10px;
 }
+/* wall item */
+.tread-wrapper {
+  background-color: #f6f7f8;
+  position: relative;
+  padding: 10px;
+  margin-bottom: 20px;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+.wall-item-container {
+  display: table;
+  width: 780px;
+  margin-bottom: 10px;
+}
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 60px;
+}
+.wall-item-container .wall-item-info .wall-item-photo-wrapper {
+  position: relative;
+}
+.wall-item-container .wall-item-info .wall-item-photo {
+  width: 48px;
+  height: 48px;
+}
+.wall-item-container .wall-item-info .wall-item-photo-menu-button {
+  display: none;
+  position: absolute;
+  left: -4px;
+  top: 28px;
+}
+.wall-item-container .wall-item-info .wall-item-photo-menu {
+  display: none;
+}
+.wall-item-container .wall-item-content {
+  display: table-cell;
+  font-size: 12px;
+  max-width: 720px;
+  word-wrap: break-word;
+}
+.wall-item-container .wall-item-content img {
+  max-width: 710px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  padding-right: 40px;
+}
+.wall-item-container.comment .wall-item-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+}
+.wall-item-container.comment .wall-item-photo-menu-button {
+  top: 13px !important;
+  left: 10px !important;
+}
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 3db3b1507..39cb33f0f 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,50 +1,43 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
+	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
+</div>
+{{ endif }}
+<div class="wall-item-container $indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="wall-item-photo-wrapper"
+				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
+				onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
 				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
+					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
 				</a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-					<ul>
-						$item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				$lock
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+				<a href="#" rel="#wall-item-photo-menu-$id" class="fakelink wall-item-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$id">
+				$item_photo_menu
+				</ul>
 				
-		</div>	
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+			</div>
+			<div class="wall-item-location">$location</div>	
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-		$vote
-		$plink
-		$edpost
-		$star
-		$drop
+		<div class="wall-item-content">
+			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+			$body
 		</div>
 	</div>
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+			{{ if $plink }}<a class="icon s16 link" title="$plink.title" href="$plink.href">$plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> <span class="wall-item-ago">$ago</span>
+			
+			{{ if $star }}
+			<a href="#" id="star-$id" onclick="dostar($id); return false;"  class="$star.classdo"  title="$star.do">$star.do</a>
+			<a href="#" id="unstar-$id" onclick="dostar($id); return false;"  class="$star.classundo"  title="$star.undo">$star.undo</a>
+			{{ endif }}
+		</div>
 	</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
 </div>
 
-- 
cgit v1.2.3


From 991656a3ef396d9a6bd43ddb752627c2880b17ba Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 19 Sep 2011 11:52:32 +0200
Subject: Show "404.tpl" instead of using 'notice()' in case of 404

---
 index.php    | 5 ++++-
 mod/help.php | 6 ++++--
 view/404.tpl | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 view/404.tpl

diff --git a/index.php b/index.php
index 3db8170ef..d3b687c55 100644
--- a/index.php
+++ b/index.php
@@ -207,7 +207,10 @@ if(strlen($a->module)) {
 
 		logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
-		notice( t('Page not found.' ) . EOL);
+		$tpl = get_markup_template("404.tpl");
+		$a->page['content'] = replace_macros($tpl, array(
+			'$message' =>  t('Page not found.' )
+		));
 	}
 }
 
diff --git a/mod/help.php b/mod/help.php
index 59e062f6d..af05bd47c 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -36,8 +36,10 @@ function help_content(&$a) {
 	
 	if(! strlen($text)) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
-		notice( t('Page not found.' ) . EOL);
-		return;
+		$tpl = get_markup_template("404.tpl");
+		return replace_macros($tpl, array(
+			'$message' =>  t('Page not found.' )
+		));
 	}
 	
 	return Markdown($text);
diff --git a/view/404.tpl b/view/404.tpl
new file mode 100644
index 000000000..bf4d4e949
--- /dev/null
+++ b/view/404.tpl
@@ -0,0 +1 @@
+<h1>$message</h1>
-- 
cgit v1.2.3


From 968e7bb3b15cd4205e857c4245c5d328d17d6a66 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 26 Sep 2011 11:48:02 +0200
Subject: Fixes for testbubble

---
 include/conversation.php                |  3 +-
 js/main.js                              |  4 +-
 view/theme/testbubble/nav.tpl           | 95 +++++++++++++++++----------------
 view/theme/testbubble/profile_vcard.tpl | 45 ++++++++++++++++
 view/theme/testbubble/wall_item.tpl     |  9 +++-
 5 files changed, 104 insertions(+), 52 deletions(-)
 create mode 100644 view/theme/testbubble/profile_vcard.tpl

diff --git a/include/conversation.php b/include/conversation.php
index 10d9bad2c..acbbc9bd5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -437,11 +437,12 @@ function conversation(&$a, $items, $mode, $update) {
 			$star = false;
 
 			if ($profile_owner == local_user() && $toplevelpost) {
-				$isstarred = (($item['starred']) ? "starred" : "hidden");
+				$isstarred = (($item['starred']) ? "starred" : "unstarred");
 
 				$star = array(
 					'do' => t("add star"),
 					'undo' => t("remove star"),
+					'toggle' => t("toggle star status"),
 					'classdo' => (($item['starred']) ? "hidden" : ""),
 					'classundo' => (($item['starred']) ? "" : "hidden"),
 					'starred' =>  t('starred'),
diff --git a/js/main.js b/js/main.js
index f08b669e3..896cbeb56 100644
--- a/js/main.js
+++ b/js/main.js
@@ -267,12 +267,12 @@
 		$.get('starred/' + ident, function(data) {
 			if(data.match(/1/)) {
 				$('#starred-' + ident).addClass('starred');
-				$('#starred-' + ident).removeClass('hidden');
+				$('#starred-' + ident).removeClass('unstarred');
 				$('#star-' + ident).addClass('hidden');
 				$('#unstar-' + ident).removeClass('hidden');
 			}
 			else {			
-				$('#starred-' + ident).addClass('hidden');
+				$('#starred-' + ident).addClass('unstarred');
 				$('#starred-' + ident).removeClass('starred');
 				$('#star-' + ident).removeClass('hidden');
 				$('#unstar-' + ident).addClass('hidden');
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index f20683366..359d01bc1 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -1,54 +1,55 @@
-$langselector
-
-<span id="banner">$banner</span>
-
-<div id="notifications">
-	{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-	{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-	{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
-	{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-</div>
-
-<div id="user-menu" >
-	<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-    
-    <ul id="user-menu-popup" 
-         onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-         onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-		{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
-	    
-	    {{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-	
-	    {{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-	
-            {{ if $nav.community }}
-            <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-            {{ endif }}
-
-		<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
-		<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
-		
-	    {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-	    {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-	    {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-	
-	    {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-	    {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-	    
-	    {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-	
-		{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
+<nav>
+	$langselector
+
+	<span id="banner">$banner</span>
+
+	<div id="notifications">
+		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
+		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
+		{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
+		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+	</div>
+
+	<div id="user-menu" >
+		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
 		
-		<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
+		<ul id="user-menu-popup" 
+			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
 
-	    {{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
-		{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-    </ul>
-</div>
+			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
+			
+			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
+		
+			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
+		
+				{{ if $nav.community }}
+				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+				{{ endif }}
+
+			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
+			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+			
+			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
+			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
+			{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
+		
+			{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
+			{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
+			
+			{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
+		
+			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
+			
+			<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
 
+			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
+			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
+		</ul>
+	</div>
 
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
 
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
 
+</nav>
 
diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
new file mode 100644
index 000000000..0ee6919bc
--- /dev/null
+++ b/view/theme/testbubble/profile_vcard.tpl
@@ -0,0 +1,45 @@
+<div class="vcard">
+	<div class="fn label">$profile.name</div>
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index b8af3685f..47f062aff 100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -27,9 +27,14 @@
 
 		<div class="wall-item-tools" id="wall-item-tools-$id">
 			$vote
-			$plink
+			{{ if $plink }}
+				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
+			{{ endif }}
 			$edpost
-			$star
+			 
+			{{ if $star }}
+			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+			{{ endif }}
 			$drop
 		</div>
 		
-- 
cgit v1.2.3


From ec4061e6feb5be540136cf79ea4cbd048ae4d047 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 26 Sep 2011 11:50:48 +0200
Subject: quattro: fix star

---
 view/theme/quattro/quattro.less | 2 ++
 view/theme/quattro/style.css    | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index e96095c24..95dd61adb 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -263,6 +263,8 @@ section {
 	margin-bottom: 20px;
 }
 .wall-item-decor { position: absolute; left: 790px; top: -10px;  width: 16px;}
+.unstarred { display: none; }
+
 .wall-item-container {
 	display: table;
 	width: 780px;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index a6ea35869..ad50ee327 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -501,6 +501,9 @@ section {
   top: -10px;
   width: 16px;
 }
+.unstarred {
+  display: none;
+}
 .wall-item-container {
   display: table;
   width: 780px;
-- 
cgit v1.2.3


From ae024edbf9d9210126902b241bf9b7d2dbece1ec Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 26 Sep 2011 12:14:48 +0200
Subject: fix "friend of" message in ping.php

---
 mod/ping.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index 38a32744d..d11af2e0e 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -14,7 +14,7 @@ function ping_init(&$a) {
 	$friends = array();
 	
 	$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
-			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, 
+			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
 			`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
 			FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
 			WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
@@ -25,13 +25,16 @@ function ping_init(&$a) {
 	$network = count($r);
 	foreach ($r as $it) {
 		switch($it['verb']){
-			case 'http://activitystrea.ms/schema/1.0/like':
+			case ACTIVITY_LIKE:
 				$likes[] = $it;
 				break;
-			case 'http://activitystrea.ms/schema/1.0/dislike':
+			case ACTIVITY_DISLIKE:
 				$dislikes[] = $it;
 				break;
-			case 'http://activitystrea.ms/schema/1.0/make-friend':
+			case ACTIVITY_FRIEND:
+				$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+				$obj = parse_xml_string($xmlhead.$it['object']);
+				$it['fname'] = $obj->title;			
 				$friends[] = $it;
 				break;
 			default:
@@ -41,7 +44,7 @@ function ping_init(&$a) {
 
 
 	$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
-			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, 
+			`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
 			`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
 			FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
 			WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
@@ -51,13 +54,16 @@ function ping_init(&$a) {
 	$home = count($r);
 	foreach ($r as $it) {
 		switch($it['verb']){
-			case 'http://activitystrea.ms/schema/1.0/like':
+			case ACTIVITY_LIKE:
 				$likes[] = $it;
 				break;
-			case 'http://activitystrea.ms/schema/1.0/dislike':
+			case ACTIVITY_DISLIKE:
 				$dislikes[] = $it;
 				break;
-			case 'http://activitystrea.ms/schema/1.0/make-friend':
+			case ACTIVITY_FRIEND:
+				$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+				$obj = parse_xml_string($xmlhead.$it['object']);
+				$it['fname'] = $obj->title;
 				$friends[] = $it;
 				break;
 			default:
@@ -154,7 +160,7 @@ function ping_init(&$a) {
 	}
 	if (count($friends)){
 		foreach ($friends as $i) {
-			echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['pname'] ) );
+			echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} is now friend with %s"), $i['fname'] ) );
 		};
 	}
 
-- 
cgit v1.2.3


From 8d93eefea87bd36904fcb1daabc239361dd95a27 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 26 Sep 2011 12:18:39 +0200
Subject: remove global $lang var in templates. can't work as intended

---
 include/template_processor.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/include/template_processor.php b/include/template_processor.php
index d04da8c61..63d75eaa4 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -160,25 +160,8 @@
 			return $s;
 		}
 
-		private function _get_lang(){
-			if ($this->lang!=null) return $this->lang;
-			
-			$a = get_app();
-			$this->lang=array();
-			if(is_array($a->strings) && count($a->strings)) {
-				foreach ($a->strings as $k=>$v){
-					$k =  preg_replace("/[^a-z0-9-]/", "", str_replace(" ","-", strtolower($k)));
-					$this->lang[$k] = $v;
-				}
-			}
-			return $this->lang;
-		}
-
-		
+	
 		public function replace($s, $r) {
-			if (!x($r,'$lang')){
-				$r['$lang'] = &$this->_get_lang();
-			}
 			$this->r = $r;
 			$this->search = array();
 			$this->replace = array();
-- 
cgit v1.2.3