From 311a3625f4b111d446f3224130537147f897c251 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 22 Jan 2013 09:28:45 -0500
Subject: [PATCH] blog: more work

---
 view/theme/blog/common_tabs.tpl           |   5 +
 view/theme/blog/default.php               |   9 +-
 view/theme/blog/icons/attachment.png      | Bin 0 -> 322 bytes
 view/theme/blog/icons/globe.png           | Bin 0 -> 319 bytes
 view/theme/blog/icons/headphones.png      | Bin 0 -> 292 bytes
 view/theme/blog/icons/image.png           | Bin 0 -> 209 bytes
 view/theme/blog/icons/link.png            | Bin 0 -> 341 bytes
 view/theme/blog/icons/location.png        | Bin 0 -> 302 bytes
 view/theme/blog/icons/lock2.png           | Bin 0 -> 212 bytes
 view/theme/blog/icons/unlocked.png        | Bin 0 -> 201 bytes
 view/theme/blog/icons/youtube2.png        | Bin 0 -> 230 bytes
 view/theme/blog/images/messages.png       | Bin 777 -> 0 bytes
 view/theme/blog/images/messages2.png      | Bin 488 -> 0 bytes
 view/theme/blog/images/notifications.png  | Bin 926 -> 0 bytes
 view/theme/blog/images/notifications3.png | Bin 714 -> 0 bytes
 view/theme/blog/images/notify.png         | Bin 1001 -> 0 bytes
 view/theme/blog/images/notify2.png        | Bin 596 -> 0 bytes
 view/theme/blog/images/notify3.png        | Bin 534 -> 0 bytes
 view/theme/blog/images/rotator.gif        | Bin 0 -> 826 bytes
 view/theme/blog/jot-end.tpl               |   0
 view/theme/blog/jot-header.tpl            | 336 ++++++++++++++++++++++
 view/theme/blog/jot.tpl                   |  61 ++++
 view/theme/blog/jot_geotag.tpl            |   8 +
 view/theme/blog/nav.tpl                   |  17 +-
 view/theme/blog/profile_vcard.tpl         |  13 +-
 view/theme/blog/style.css                 | 132 ++++++++-
 26 files changed, 555 insertions(+), 26 deletions(-)
 create mode 100644 view/theme/blog/common_tabs.tpl
 create mode 100644 view/theme/blog/icons/attachment.png
 create mode 100644 view/theme/blog/icons/globe.png
 create mode 100644 view/theme/blog/icons/headphones.png
 create mode 100644 view/theme/blog/icons/image.png
 create mode 100644 view/theme/blog/icons/link.png
 create mode 100644 view/theme/blog/icons/location.png
 create mode 100644 view/theme/blog/icons/lock2.png
 create mode 100644 view/theme/blog/icons/unlocked.png
 create mode 100644 view/theme/blog/icons/youtube2.png
 delete mode 100755 view/theme/blog/images/messages.png
 delete mode 100755 view/theme/blog/images/messages2.png
 delete mode 100755 view/theme/blog/images/notifications.png
 delete mode 100755 view/theme/blog/images/notifications3.png
 delete mode 100755 view/theme/blog/images/notify.png
 delete mode 100755 view/theme/blog/images/notify2.png
 delete mode 100755 view/theme/blog/images/notify3.png
 create mode 100644 view/theme/blog/images/rotator.gif
 create mode 100644 view/theme/blog/jot-end.tpl
 create mode 100644 view/theme/blog/jot-header.tpl
 create mode 100644 view/theme/blog/jot.tpl
 create mode 100644 view/theme/blog/jot_geotag.tpl
diff --git a/view/theme/blog/common_tabs.tpl b/view/theme/blog/common_tabs.tpl
new file mode 100644
index 0000000..a389c45
--- /dev/null
+++ b/view/theme/blog/common_tabs.tpl
@@ -0,0 +1,5 @@
+<ul class="tabs">
+	{{ for $tabs as $tab }}
+		<li id="$tab.id"><a href="$tab.url" class="$tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
+	{{ endfor }}
+</ul>
diff --git a/view/theme/blog/default.php b/view/theme/blog/default.php
index 4ce8e0a..59ca193 100755
--- a/view/theme/blog/default.php
+++ b/view/theme/blog/default.php
@@ -5,7 +5,10 @@
   <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
-<body>
+<?php $bodyclass="";
+if (!x($page,'aside') && !x($page,'right_aside')) $bodyclass.=" singular";
+?>
+<body class="<?php echo $bodyclass;?>">
     <div id="page">
         <?php 
             if(x($page,'nav')){
@@ -25,10 +28,12 @@
                     <?php if(x($page,'content')) echo $page['content']; ?>
                 </div>
             </div>
-            <div id="secondary" class="widget-area" role="complementary">
+            <?php if (x($page,'aside') || x($page,'right_aside')) { ?>
+            <div id="secondary" class="widget-area <?php if (in_array($a->module, array('profile','photos'))) echo 'overlap'; ?>" role="complementary">
                 <?php if(x($page,'aside')) echo $page['aside']; ?>
                 <?php if(x($page,'right_aside')) echo $page['right_aside']; ?>
             </div>
+            <?php }?>
         </div>
         <footer id="colophon" role="contentinfo">
             <div id="site-generator">
diff --git a/view/theme/blog/icons/attachment.png b/view/theme/blog/icons/attachment.png
new file mode 100644
index 0000000000000000000000000000000000000000..b944386f83a0d180158ebad30bb45343b58e0972
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003ANkl<ZI8T+6
zff2z#5Ji&?bRas=fv5l#hz@ihDnJFOKy(lt(18+kz<)D$nRPD2&iuLD+5i9U-bs^g
zF;&`17z(wpc59M$;2)GT7tX>}$c2$GM&y@(Coh!Dw-2fy@^1odWQe6eOKF=xNM?_#
zucFd-CJbW&F)}ka3WdX7>rALZfv)5m?(|{>{vqe$KCA%ud=j`{2IR%UvT<(6R)7KZ
zTv<!4n@G=|j2VGR)56oZTd_jt49t?*`^usMC{F~0aBC%pE%bFTaII{$W&-z(AVP1>
zu8pPwUn<EwTN|Y|yt<}r`=h-^pLln!<RMHYJAvVTMEH<$Wgx`Ajkvgd9V2u00%^Ta
U5g=T!O#lD@07*qoM6N<$f;23MR{#J2

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/globe.png b/view/theme/blog/icons/globe.png
new file mode 100644
index 0000000000000000000000000000000000000000..466388472126ea9bee29cc97967249ba1657f27c
GIT binary patch
literal 319
zcmV-F0l@x=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00037Nkl<ZI8UvU
z;Ss?=5QUQp=l~tiK~x|*hzig_I-mnl0VSjZIuIRD0q--rnUnE@#Lc|f?A`9$y?2{9
z>bT+$`I+`+LL&5qn@|czVc(1o35Gg62qO!E2!AdVws$eVav~=n`6R4`m5^J-hb%Fv
z?QLbjSa^{*!PyRI7lOnpH~}s(oKXx5$%`Npc9!sqStz)G0C5VlRDlr73Ok^yjWDqo
zu9ZSS+q8uZ6Pg5}&+Ak|9|DrvuJ|t<e5(PfqZJmNY7KBYy#n_S=U^#+YN9mfAV)ai
zZ4QX#6?{-yO`?;a$H1yHDEtdp-k)`~yI1DdqwGG`1xobY6YfGOxY%KA^aL;+OA+qt
R#7zJI002ovPDHLkV1lxSfN}r;

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/headphones.png b/view/theme/blog/icons/headphones.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ce61ee83544036a8ce62e3c49ce9770c0a76d3c
GIT binary patch
literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002%Nkl<ZI8U9C
z3k||R5Jag1Pyjdp1%Lv;K^*`Js046O2jGB8C<>^9;-JiHc9Z4;^mEDNa<@CPb92$?
z`?~0QB`mC*YtMvJ*d7HJ5Vyj_2oPBat%Xv!H-(x4G|vP?z&j8h>wGl4v@fZ<0EF14
z_|(v?pK+53DPjmP6~&Deei57ZJm(?I5n#H%u?yLIaFHW`<wPKyK5M7uGXj-B>S1VY
zVuV_{K=_?)WUp5c3wuIpZra3fOiv8YLp<1}7ymi%9`>s{m<|*uJOd_n&7<j{CXvBV
q2Tug}&)Yx;drv&EpXd`}&G`U<b3Od+-hx^H0000<MNUMnLSTZ1L3S7b

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/image.png b/view/theme/blog/icons/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..d19ccebad4f83a7cd60f0cfaa073a70e68df90a6
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Gdx`!LoEE0Qx*sqFn#^M{0Pq~
zDF&k+5r#6$P23!k7Z^g~`H%EE@FYDpRbW`*z|bMCV99B@=7CspF{8)hN`)|nBzFZn
z2Gf=d@dF}FUuqeWoE7RCR0}p#F{Zq(H90E2K#x(9t>|uz0^bo)HihT6k~iiu2jnOT
ztZ$cUGUn;<4cTJM(EYlQE0IM>bJoMGm6OCzY?55Y$&eqX!>oC4tvk?-44$rjF6*2U
FngCE{K^6c2

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/link.png b/view/theme/blog/icons/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..db62819d527570cf8d5bbada72d6885ee5f89460
GIT binary patch
literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003TNkl<ZI8Tj{
zjZFeU5JsT_E#W#)DgY`_D^MyBE07YT0<Z(Az@q}S1L%Mb^u2Q?*+3R<lb4<S`M#Z*
z9S-`9Yp%V*Js7v}0=r=ky@F4;g}ove!vRK@3`+4kf<+iSF|S~A&fr+As2rAYQ!}_E
z*2q!@HG?<Kp24(zxk*8!ux5UQWz9f$n`Gm%-VyOPr1=l=q%<(?34FjWY-8=7zpw$n
z(Q`9$|Bwb*v)`1L?ue(*27aCQJ$KIxyN$A8OV)ER^)Hyg8g^cemm~b2G&pWpUT8w7
zLD#S_KQXAf$Lor_hC!EhIn2OKyX%E=<jYlYmS9(H*aH|ldWqAZi43loTW~FBU(QtX
n8x`10%djLfSwvixbrSypwdYDu%5yq?00000NkvXXu0mjfJhYNx

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/location.png b/view/theme/blog/icons/location.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcfbc5ceb2b85d13bddf8b418e8a7f7bc558dac5
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Up-wMLoEE)2IUGKGT^x@!oYQa
z(IUZuf%OcClH_7wKg_7XAk)B9@m}xd)<~;=6Ly#9e*XAtmdW{==tFxMxj4-uzB61u
zQM7ztTmD=HHBZrFI*j>tO!=NRo<*Id>c3rA91#k5BxAv#!{s|Q_JNK`0;ipjL}IOE
z6X&_|k6TOY)ptB<)4Y&5?MqATi`u4rlfAYdh*T-on)+t(za`5O=E=*3Tf8hWdM|G?
z!NAYJ=3%;V^k)u@(Db~@x;hmx9>!G?GqURR?#cCD4?bY!-)b(ooqg4!gKf%7?=~E|
xch13!G1<65#YF6Lf61EuhLcM}uEZJE#!unb6?BhhKL88>22WQ%mvv4FO#r=fap(X5

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/lock2.png b/view/theme/blog/icons/lock2.png
new file mode 100644
index 0000000000000000000000000000000000000000..500f1c06ac29d22f856a5147771bdca5aa330eba
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`vproLLoEE0Qx*sqD7~D|kn)>(
zBU8v5#tCr@M|yv}X^>>NG^gKL@k9e#OxppT9}FP}_>Z(X)G)5P!Qe5UJ!yis2&d!+
z`Be-zy%iK=9u<5}kYc;WFk${z&Le6byc#tI3@5k^o(mf^GuqZ1c$JyNaAxHK4Hq_-
z-3>|1GL6@`7(P}N#VT-^KCs)#Cg8PIg3;N>Y6r&^)>G0F3=F@&$O--y{LKn<CWEJ|
KpUXO@geCwWa7VfT

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/unlocked.png b/view/theme/blog/icons/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..577f3981137b52fef6e245a202b4a3c09825f325
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6FglULoEE0Qx*sq2raB<3h1>L
z&~~_L$8d?eVTa%m^%Mq=Vmm%>2R0J{qX*0Zg7yN^OdnZSII=nXvJq&GS>$n|;eUYd
zi&qaGH6Lb}aQ_SE5jGEA4H*N56Wj*>1-b&)+*{hoXt2C#5tpRETc$4F0+uLkh9j>}
ymNqI}Y54s_szKYVppDV+<pZS)Apvp+7#Jo$l@mPA_s1RRHU>{uKbLh*2~7ZH^FxgQ

literal 0
HcmV?d00001

diff --git a/view/theme/blog/icons/youtube2.png b/view/theme/blog/icons/youtube2.png
new file mode 100644
index 0000000000000000000000000000000000000000..493e3a8ad2ea33db4c0b008a7c7ed6576472d3a2
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ydu{YLoEE0Qx*sq1g)6Qn0A0=
zf#W}iH4aM}`5Rt|F%&AFV3?4`tiZ?ch~Gs@fgxl&V+Vf&4?`x?&7O6VDb7rC%#KwD
z*#595<s>o+?PoaBR}u4V{scw^_J$ZXBbF2iD}_@GGnTn1Fh9{vagb-WV_I9HaGhIx
z;jBVe{TtjO?#av-1gaI-ST8Z_DE9h#Flt!Hckmy2B%k8JByd_d^MG?kk4b>8v0$d*
bG9!lT?FOfN%NZX79nRqC>gTe~DWM4fLHk7{

literal 0
HcmV?d00001

diff --git a/view/theme/blog/images/messages.png b/view/theme/blog/images/messages.png
deleted file mode 100755
index ab7b0f491e5429e9c899c2291a3d279b7033c946..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb+
z5C<hW!+uTx00N0gL_t(I%k9<8Y7{{f1>ke5s;fIQlZ3pEFCe&(5JZDYW<n67pajY2
zN)mA)>PB4ngTy}s6(NYY@dffOZj#ANXR2;hcV8DyOB+;FaOc_HbHApmyJ_HmCZV03
zou_kibISlAB0@y;H&AnTZ*T9J+1=e;4I${++1Vuk^f!2OXMcbHWuE7&Cd;z7gTdfT
z2tlT&r@McOH@l<J=*4(EzS!w>-Wsj-e3B$vqtWPc2m$SO`?v9C=iuPr1vB@vEZfpr
z&l~3)h-i_Be4ghUAq1ppx<o|3#Os-e2s6J7A#7M{?-0?Va}LIPFZ4A%0M0pgE5@jj
zBsu#tyotsbUlm1hOKW|Nh<eNn5fS6Pr$+I7S(YKjc%PY5W6a5K#{weI_qSgZ#k;Di
z?klA(066cQ`!+Y;do<2eiO7nGd<3u@V>CpxP|pFNMnz;>M3w;@A)=L{C{**JH7o!K
zKt)7b02shA0GlFW034sp>wF-h%}M7ofGrWZ1VGi6@!r=cwAPQ6QV*-Dx?Yy$g4X(;
zQfjR%%e1PhqX3|k`lPj9tE%c;S(a;B>usgf&8n(wS(X<jmKf(80YH)@&jH+K<{L4_
z)00BqS_@-LFUI&90Ian=@BQTvLLYzua5_nn!Wgqr6vb4Gu?K(*Gb2sYH$-&RId_+t
zyY<5dV3@f-H8n-Xm=gfty<d0Etxr$^K+N1t(-hX)K7fpw7mbL#S4yqqdH!HL9yd{{
zapzpW-EL#@A@l+0LmhI?bz7|#vMgH>k<3_YPYs8|CwZPP9YWDq)XaQk@;2z7bjW+(
z?Q}ZSYPC+8!C>%cI2`^6#i2#}8y)iAFU`!%l>dJm|2|&;tc{^-%0+XD00000NkvXX
Hu0mjf#Isw$

diff --git a/view/theme/blog/images/messages2.png b/view/theme/blog/images/messages2.png
deleted file mode 100755
index 54b68e7f7032a44dd43d70595a0b424c99ac36f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY#
z6(TJJz1Rc*00C%8L_t(I%k9-YYZXBl#qr<n9W-|NT&V(AOroNZ6p0o=#2ZVs61B5X
zgT$AMpg{<dE}twa>a{r=hQUaT*kxd0=Q-#6cV>8o<!oeh<MH@4Ze%_~cS=^BebZwD
z)8Rug{0nr7je=cViFmz&cc*~9!!7I<EMf<n5&s6>LMLG@mK2xq1@|+*b^`dU@=TL`
z5|&aKR&j_&=yCNA@EZC)nR{WttTf?ue8V%G$EDxE>-SIb-c0sL@0)Juv4;7y;9jHG
z(7kx(lj&={Z&vX$hyN7|c!2#1K0x=QEyTN%>`}Y+%__F>BHNl`1-Effo$o<vEAgx+
zvt945RM5A0jEA_K`Xt&aK2-0U(Mr7E(-jw@cSE~<#1@{WkB8$a0d%;S`rSNrM-7<?
z=CEAwIfwtefp!gC6&^L78oq|Pf+f7lrD)q}2##<kwb3!2uDZ2L1uu_*YJ%rZ;OWBp
earWc*|Kk@9CTg{ZzNH}m0000<MNUMnLSTY?^4g35

diff --git a/view/theme/blog/images/notifications.png b/view/theme/blog/images/notifications.png
deleted file mode 100755
index 347f1519ef4c227164f487a3ac7066c64d891e8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb+
z5E&S?>J5MZ00SOLL_t(I%f*yWXcSi*$3O4QjEU>UWJ4sI78g-Lf)=6RrL@!*p_Zy-
zO0YB`bWHH%L2tcy>0P8AgkEZ<lx$E+=FmtH8j#eRC@oS7Rs~y3DCj0;vzytSnfH2_
zx5E;)5TT_5k9qU^{l1_1@qK^bKYB!K;sweA_5z9T$|tV^@dC9Muz)AND-!_OmfsD`
z0droU3a<byv~-3+1~%PZ0C5Od1VS%Rj*0&h(DDN10AZ>Thky$$O{?P)i1VOt17Dcp
zv%m=>-VAks6Q(9iHTrhSpwteY0-XS5-<2<b5#Ul9r;{xOle+|r7){wQrn1HJ0`(YB
zri;ITX%HizCjlSG18*DX9bg^sKwJYI0F%HVFb_!ImHS#9?*X0x4}k-~yPy|<Tju9i
zfUnH>(s!j!b9w<dYBUcGV^6yk!fZ30b|(tJJ>Qi}z+vD$5T$hRz89!BP41ql%^Pjf
za-n^@Y4eVZSG&AG?Eszvaa&yiJT<vprZ(Ed$iQ`=*9+7Dumt=9d<YEtuB@bUy_yb=
zo5dOijsrgf%SPL4SQ+>SU_Wr!cjcpW5kwJ~^a9mqVojjwyYi72sJ?W;#1L@PcjfQK
zvi*jI4Uk0Pw2GrqA+1qhA&J6St&+Du#6qTLB-*HEwk1&mt&$k@k3w3r0CA%}s#Ve_
zZD%^$Zeuemxj3xf)ha33-MP<ZCkE!mW-3D<*2?3B+Sp8GDB4*66~Nh^KUf~`UmlxT
z*#UZIdAxu5({G=D9EbI9gtY#!yK_g%<Ar*537!7>&kq{a%1z7ZzU$<APF_Fr+Vd=T
z?b#cRYUL+@uAcsPZcM)Zpq2Y%dTAi4SHDl9@JLrr|3^2bcHhdZ08mN1C~fC+rQ+@+
zYOJ*%v$#<kjOwcrz}nU|2s~)BWlgDgUfRxgDv1|6UM%j_-$bYQsmu2#j$NFu9lJPR
zJ9YW~#8$L+`$uqYSa%Xd8`Wa7wjxuHdy1WEHf!yz+_}yA%VJ}F)dFyGy~V9)wge8>
zUX+^a6$_xTJzx6Qz;Rf$o3)o{t=X0@*!-W*-+7oz#B7c)B>(^b07*qoM6N<$f|f3)
A5dZ)H

diff --git a/view/theme/blog/images/notifications3.png b/view/theme/blog/images/notifications3.png
deleted file mode 100755
index 2c9c791c06e495491c81ef52edab531bb706c7cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb+
z5Dy+e5glRx00K%$L_t(I%eB-`sLpv5$MM(wqZH-dqI>VclTfmll(M72h6yEEUYf|+
zO%}75EG-p9Hq%+SR@X*mF*GUaW@aa4x-|)-ERaGsA>nat&U5{GdelQX_3in6zvrCy
z@AI7V{T;rO4Rjtda|o-^j)(_e1If(Q7{Y^yXv1K`zY>>lDKkgE0y^5sE5>KVrS=q#
z;w*l{2Yl=(=m8umVZ%6qUvLJ$Mnt=#xK+>@9LHN6!S2jl)C0N*yDR2x<;)bL)hxwf
zv@snK&#@OL>%3Q4M$2~+dn;$U7>Aps_#Yoj#Zycb{1DD#DK;1MAH2fPIEOzfZVZ<(
z7!hkaidW$g?qVH&#C2S)m!HA!wN6LGeEF_pYvtT6#;Rs12I`v4m%35hiipS9fNfQ~
z7Pe>R#`4{&*rk=*?o^?9-RA4}eFdz@%q4hOH>6{2JS^Xe+Q08&EP&r&S!OQBWBiMs
zus$MQ)bm`eoz<-M*ooVCQn|~DwE+GLYq23B?pG7WaVRrK>g*lfMa2Eg9I1v);7UZ?
ztCFoP)&h76BiLX23%J%*g2ArReW;iVwclTisU~;^|6wvS_eI1V9K^ARn9IzGngv6d
zIS~<aIEI4}aVInPVX_!A-9u;xuHYv2M8va(?+5%{+bt0>+wd*NpV)+55ph+0=N-FI
zGh#7bc717Mjej?W*@o|B_2gnPdJdL>FPtC9%-6LJ^po3EtS)&k8*eBc?-kIUJKX2k
w9k1qn5!`M4f?Ex6tDl6yKEcD^Am;nnC#0a#=tRKkyZ`_I07*qoM6N<$f<TN(M*si-

diff --git a/view/theme/blog/images/notify.png b/view/theme/blog/images/notify.png
deleted file mode 100755
index 355abb1ebb4bb76790a1f4fc056a2bc2f64906b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1001
zcmV<F0~Y*=P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb+
z5DF(^V_`1<00U`BL_t(I%Z*hrOe0qiee-wM273*Mjv`Woq9_H@Rc>gK7TGixA@15p
zr>kk;A|WAj1-2p~QPM<8XwXHnjvz#ZUFCARG&Hm%U1*7b*yh;3e`Zp6*D<h!jI`R(
z|MTa+dGmIMaE~1x9uk1OF=o>9ylDXWWGiCk6A?KB5Y5faY1VnlT5PpiQ@LEOQYw`e
z3xz^CE9UCz>bTSCY*}mD)oS(h!Nl!$dp-=q)k2{#ldh?%5)s|@0m9W)@2K1Depjhf
z_U}#HYPD8MrP7M;`x9vbRTUyK!*N4<N<`$GJMVNl8`Wxc<4)p(gM<0;@$qfX^CoUr
zad~;U8prWl0F=w+UW|>6t==x2#hqVX{{8anr%(3>iFbE*r;5em&-r|QCX3IDi;J%o
z78ZU3fW5uFFCR@j`T*@8RsaM72#Btuqh7E3?Ai0@r+%~9Bmfm6nu(%lh`)c$Ij6(E
zjqIJv6Ix~zs5G0+ZJ(L*K@cojYwuMFGmi}WNo)d{khGOl0pod#*4j5dGf#?0c@Ugo
zBJ%mp&dx8X|6j2H%FI0JGxKy5MK@)Xl9#yb+!GP;Km=8N5?On*Gy+HgfhvJWSf+jF
zI1g1QKxq?(m;;m`DrHsm0YFsBBGPXe0jfGo2?2m(4tx;@E0hAvCK)IL@cJa9jEC(r
zKaO40N6=ReCAaGUyedGCjWM49_$VTe2Py-Qz)oQ)NXaAbcV9$K;y4DhFUO?%JIIYO
zKLK>6BG9D1en$ucRB4U?fA}JD=A1hgk^4%dAPBx!)%U7mMC32$+&A}eV2n97#+>==
zTttMeD6&6LdU0}fTCeZ>Z<dyp-UGnq=H{Q)+N{J1fJR40x0pFH%dcLkDB6G?S!>D0
z7O{<Ctwn4tthHcf9{NCHo2=h@NL7ziwY|K&tOF_=jmCVZ)7ci$iGB}KfdXL|uKK?J
z768R@{G!+Et!7Yg9){t|TCKK!M_sSiUaxd}-4zj@=t~|1KmeGmveS2xbYp#eeem1#
zhNIv8`tHN*?Cgni?u#gjK4oSwGcmI!Z`|@J2!f+xvG{GhUjOmI(X_U<HWk~r((QE@
zuRmUwv!X^uMvlWU+zNuAU9Z<q|JTd|fLg6a0P-R-$;>x~spoko#+WkzQKQkw9H##O
Xc%lo<>sWpu00000NkvXXu0mjfv2@Oi

diff --git a/view/theme/blog/images/notify2.png b/view/theme/blog/images/notify2.png
deleted file mode 100755
index 407e2dbb4e72561922b52a06207c79fe4d1982ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY#
z6)GgPxaz0?00GoVL_t(I%f*$yOB_KI$3MHSXv#y2fP^4ogjZc-X?wQ9K)U<~R|*IB
z2MA(&O$w`^-2<C6RuQp@&2@u6Ql$yxLLf~zMAzmm4&%=56@sss$L@E&``+8{d?zCj
z&bbU&0G5Fb%K@gq6)*v&s#@0V&l05XfF95Xx`}U(fe~=3sy|zaopU?D5ZDYJmjSkn
z_FV#ds(KRg%tfRF-~d<)2p)huDy9t96<}LL@ZMikpggK{0Cb{ma_e9n_yFt$@2a%}
z42<K6*k(EmNaHwD)mv4)0lp?M9bjl&<o5S_Hq$b(sZ8WCW)tW+=d#>n)NfJ=u$ai}
zgwO{T3e#yyQdO)v=e|{W3$_a^7bgBX8HFK%f~0}8;@BvH6P2}8Q3N?H<Crg)ExJL)
z-5K!j3p@KwqbPwT;4Sdq@+NEsTo-02ZKD7<HsfK2QQQ;;9yhd@0iS_$J5YasPYvW_
zV3OM?MlIq$Qq?0>{Q?}e9HJ30&CO3w&81S~xDWEXhR!a{M$0(>@BKd!`3-CXZ)!IE
z5RqRZvIKktwrVhcfn8Po{_KaDZB`DKvP~k}%#3tjRrhQC*n58=B3I_eD>eQb%d%>J
iS5*&R=W2SX%k&X)&6e2o9|xHL0000<MNUMnLSTZO#P{_8

diff --git a/view/theme/blog/images/notify3.png b/view/theme/blog/images/notify3.png
deleted file mode 100755
index 9b852d05b2007ecb7508f9de807f8b5be8a9412c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2
z4k!igj=G!x00EXsL_t(I%e|GMP6I&@hQB?Q6x&dNAp`+UP-prI)w}=+L5!+zau3j?
zzJ^V}kYX?xOcexKQwzmmODai2;A&>W=F+{Zpp4nM+nIlN|DE~Q5HaVR0ct=4XsQpe
z0A7F@un>`aRlbRU?gMS01Ei6)C%^z0iO72;uygJd$beSxI}c*>Lf#nYiO78v*g4k)
zx<EYu_yLl_`hL!jbD%FGeIJk%cIrXHMH4;25pWFjf;m6dfv#fw0xPFk09v#s5qT4l
zDew@9sRNl}k?8HWmD4<ult=txObci`=S-qy)G4bHU?<|Qx~~pUvs$OIlJa)woO|?s
zMQjQ*tQP;OG79Yk*b00~=rBOj1|4N8c3}gb3Ocqe>scD?I9((Dz-sT8QIP|?z#j0a
zep##mUabmB6%_!tDm<(~#nfu>q~wSOxCEZHp+11K67UHyOO%R1Mez?sWGEsxz*R*P
z4S+?WdOA{-iqY{M_+KR_8>@`wrXWJs5xvNOJ54^<@1o6t3ooA=lg<AT`i(wKfAyFy
Y0eUfy&?Q|Mo&W#<07*qoM6N<$f+;4~8UO$Q

diff --git a/view/theme/blog/images/rotator.gif b/view/theme/blog/images/rotator.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3797ec3e4b74d98f392eec92cedc6fab037114aa
GIT binary patch
literal 826
zcmZ?wbhEHb6krfwc+9}?|NsBZn>YXd{rlRrYY!hj{PgM5u3ftt8yihbOc)s%rKP2h
z962(5`t-kl|AvHw02M3#=k{|A33hf2a5d61U}j`sU{L(Y!ph3P&!7Wj0}T~mU|{k4
zaPp_b;t08!lXzw>X}Fu*pt#5;)gj@;SB=}>1sGo`oS5*GO+w4%4<rAHS%v~SUNtig
zPMB0(J0tMq$@a-Q4i7Zd9ym{QR=@pNdXwFeNgSwF@G$TIt<d~%Qj>YEkCv*i>#@z9
z_ns&$GE%uIX!jz7?YLvi^^Ff~@>mYcE6}*}Pzj+M<XV0PcA#!`paTW==KK7fbLhBY
zq5L-)x33yYU6$}G$9XBS9ZXX5G~l)CNfu&6=w$)w<ze6i>Q(-5vV589W-k-x2~vk5
z4m#L!r0dQPS=6Pfy)h?q+tfEZx2Ovu^Z{)H>H@h~xuD1Wb#jkf_x+op<v!Eg6g@hv
zQlqsBvJQ5|H0Dl9SvyGvLmxj-pZ0_a?ytEUjk@2jyPF<(vq0u?XWyFEJ?DNX6`t1e
z3X?tEtTD~y(6oq?ZBvj!ii3fXfdlAUa7ej7<2klZ@C$dhNXTWOk}!jcH6?p;yEdG7
zqb1a=a&qwv{&_6wf>}r*#R3c^h;LPZ;oNLG<yJ%S*PDer2@YKnlWa~kD?}D;5IW>@
z%Io@N-L3PGtYrjx781l7A5MDSU!fi<$u!ZkDdcoI3-e;zzE3^JH+sI)mOa*X<?-PY
zQx7Z&??g#J91OfbS2M6EO<4MK)z(S(a{2FfeTw7?Vh!6+(D9P@#nBo4-&qP>uZsyH
zMGYeZ3p9uo43@ZS`*Pl_diF0tB1^uBNBU5J`-7<CANR<31v92ffWwy&nphcueguUN
vFfEin^EqfYb;+)Ck2Ov$(CkT5)LFF8%~aN1i}%x{$VN-a-JFiVv|tSY`AZ*=

literal 0
HcmV?d00001

diff --git a/view/theme/blog/jot-end.tpl b/view/theme/blog/jot-end.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/view/theme/blog/jot-header.tpl b/view/theme/blog/jot-header.tpl
new file mode 100644
index 0000000..099f9ff
--- /dev/null
+++ b/view/theme/blog/jot-header.tpl
@@ -0,0 +1,336 @@
+
+<script language="javascript" type="text/javascript">
+
+var editor=false;
+var textlen = 0;
+var plaintext = '$editselect';
+
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").fancybox({
+				transitionIn : 'elastic',
+				transitionOut : 'elastic',
+                afterClose : function() {
+                    $.fancybox("#profile-jot-wrapper");
+                }
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}	
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: $editselect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
+			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",
+			gecko_spellcheck : true,
+			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,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			transitionIn : 'elastic',
+			transitionOut : 'elastic',
+            afterClose : function() {
+                $.fancybox("#profile-jot-wrapper");
+            }
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
+<script>
+	var ispublic = '$ispublic';
+
+	$(document).ready(function() {
+	
+        $("a.showjot").fancybox({
+				transitionIn : 'elastic',
+				transitionOut : 'elastic',
+                beforeShow : function() {
+                    enableOnUser();
+                }
+        });
+
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('$delitems')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("$vidurl");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("$audurl");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("$whereareu", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	$geotag
+
+</script>
+
diff --git a/view/theme/blog/jot.tpl b/view/theme/blog/jot.tpl
new file mode 100644
index 0000000..03afe2d
--- /dev/null
+++ b/view/theme/blog/jot.tpl
@@ -0,0 +1,61 @@
+<div style="display: none;">
+    <div id="profile-jot-wrapper" >
+        <div id="profile-jot-banner-wrapper">
+            <div id="profile-jot-desc" >&nbsp;</div>
+            <div id="character-counter" class="grey"></div>
+        </div>
+        <div id="profile-jot-banner-end"></div>
+
+        <form id="profile-jot-form" action="$action" method="post" >
+            <input type="hidden" name="type" value="$ptyp" />
+            <input type="hidden" name="profile_uid" value="$profile_uid" />
+            <input type="hidden" name="return" value="$return_path" />
+            <input type="hidden" name="location" id="jot-location" value="$defloc" />
+            <input type="hidden" name="coord" id="jot-coord" value="" />
+            <input type="hidden" name="post_id" value="$post_id" />
+            <input type="hidden" name="preview" id="jot-preview" value="0" />
+            <input type="hidden" name="post_id_random" value="$rand_num" />
+            <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title"></div>
+            {{ if $placeholdercategory }}
+            <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category"  /></div>
+            {{ endif }}
+            <div id="jot-text-wrap">
+            <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+            <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+            </div>
+
+        <dl class="toolbox">
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></dd>
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></dd>
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><a href="#" id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a></dd>
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><a href="#" id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a></dd>
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><a href="#" id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a></dd>
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"> <a href="#" id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a></dd>
+            <dd  style="display: none;"><a href="#" id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a></dd>
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang</dd>
+        </dl>
+        <dl class="toolbox right">
+            <dd  style="{{if $visitor=none}}display: none;{{endif}}"><img id="profile-rotator" src="$baseurl/view/theme/blog/images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /></dd>
+            <dd><input type="submit" id="profile-jot-submit" name="submit" value="$share" class="button" /></dd>
+            <dd><a href="#" onclick="preview_post(); return false;" id="jot-preview-link" class="button">$preview</a></dd>
+        </dl>
+
+
+        </form>
+
+        <div id="jot-preview-content" style="display:none;"></div>
+
+
+    </div>
+</div>    
+<div style="display: none;">
+    <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+        $acl
+        <hr style="clear:both"/>
+        <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+        <div id="profile-jot-email-end"></div>
+        $jotnets
+    </div>
+</div>
+
+<a href="#profile-jot-wrapper" class="showjot button">$share</a>
\ No newline at end of file
diff --git a/view/theme/blog/jot_geotag.tpl b/view/theme/blog/jot_geotag.tpl
new file mode 100644
index 0000000..b0f71e7
--- /dev/null
+++ b/view/theme/blog/jot_geotag.tpl
@@ -0,0 +1,8 @@
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/blog/nav.tpl b/view/theme/blog/nav.tpl
index 7c89245..7a670e3 100755
--- a/view/theme/blog/nav.tpl
+++ b/view/theme/blog/nav.tpl
@@ -20,8 +20,7 @@
         <div class="menu">
             <ul>
                 {{ if $nav.home }}
-                    <li class="$sel.home"><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-                    <span id="home-update" class="nav-ajax-left"></span>
+                    <li class="$sel.home"><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1 <span id="home-update" class="nav-ajax-left"></span></a></li>
                 {{ endif }}
 
                 {{ if $nav.community }}<li class="$sel.community"><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 }}
@@ -54,6 +53,8 @@
                             
                             {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
 
+                            {{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>{{ endif }}	
+
                             {{ if $nav.manage }}<li><a class="$nav.manage.2 sep" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
                             
                             {{ if $nav.settings }}<li><a class="$nav.settings.2 sep" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
@@ -66,15 +67,13 @@
                 
                     {{ if $nav.network }}
                     <li class="$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>
+                        <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1 <span id="net-update" class="nav-notify"></span></a>
                     </li>
                     {{ endif }}
                 
                 {{ if $nav.notifications }}
                     <li class="$sel.notifications dropmenu">
-                        <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-                        <span id="notify-update" class="nav-ajax-left"></span>
+                        <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1 <span id="notify-update" class="nav-ajax-left"></span></a>
                         <ul id="nav-notifications-menu" class="menu-popup">
                             <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
                             <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
@@ -85,15 +84,13 @@
                 
                 {{ if $nav.introductions }}
                     <li class="$sel.introductions">
-                        <a id="nav-notify-link" class="nav-commlink $nav.introductions.2" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-                        <span id="intro-update" class="nav-ajax-left"></span>
+                        <a id="nav-notify-link" class="nav-commlink $nav.introductions.2" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1 <span id="intro-update" class="nav-ajax-left"></span></a>
                     </li>
                 {{ endif }}
 	
                 {{ if $nav.messages }}
                     <li class="$sel.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>
+                        <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1 <span id="mail-update" class="nav-ajax-left"></span></a>
                     </li>
                 {{ endif }}
             </ul>		
diff --git a/view/theme/blog/profile_vcard.tpl b/view/theme/blog/profile_vcard.tpl
index 45dbd5d..c397f87 100644
--- a/view/theme/blog/profile_vcard.tpl
+++ b/view/theme/blog/profile_vcard.tpl
@@ -1,12 +1,11 @@
 <aside class="vcard">
+	
+	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
+
 
 	<h2 class="fn label">$profile.name</h2>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
 
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
@@ -36,10 +35,10 @@
 	<div id="profile-extra-links">
 		<ul>
 			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname" class="button">$connect</a></li>
 			{{ endif }}
 			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
+				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname" class="button">$wallmessage</a></li>
 			{{ endif }}
 		</ul>
 	</div>
diff --git a/view/theme/blog/style.css b/view/theme/blog/style.css
index e5a1df5..5a7784c 100755
--- a/view/theme/blog/style.css
+++ b/view/theme/blog/style.css
@@ -1,8 +1,27 @@
 @import url('twentyeleven_style.css');
 
+/* varie */
+input.button,
+a.button {
+	border: 0px;
+	background-color: #1982D1; color: #ffffff; 
+	text-align: center; text-decoration: none; padding: 0.5em 1em;
+	-webkit-border-radius: 2px 2px 2px 2px;
+    -moz-border-radius: 2px 2px 2px 2px;
+	border-radius: 2px 2px 2px 2px;
+}
+input.button:hover,
+a.button:hover {
+	 background-color: #5fabe5;
+}
+
+
+/* header */
 input#search {
     background: url("images/search.png") no-repeat scroll 5px 6px transparent;
-    border-radius: 2px 2px 2px 2px;
+    -webkit-border-radius: 2px 2px 2px 2px;
+    -moz-border-radius: 2px 2px 2px 2px;
+	border-radius: 2px 2px 2px 2px;
     font-size: 14px;
     height: 22px;
     line-height: 1.2em;
@@ -48,7 +67,7 @@ input#searchsubmit {
 	position: absolute;
     right: 7.6%;
     text-align: right;
-    top: 13.5em;
+    top: 8.5em;
 }
 
 /* user bar */
@@ -103,7 +122,7 @@ input#searchsubmit {
     z-index: 99999;
 }
 #tools ul ul .sep {
-	border-top: 1px dotted #DDDDDD;
+	border-top: 1px solid #DDDDDD;
 }
 #tools ul ul ul {
     left: 100%;
@@ -165,6 +184,22 @@ input#searchsubmit {
 .dropmenu { background: url(images/dropdown.png) center right no-repeat; margin-right: 1em;  }
 #main .dropmenu { background: url(images/dropdown_dark.png) center right no-repeat; padding-right: 15px; }
 
+/* notifications */
+.nav-ajax-left  { 
+	background-color: #1982D1; 
+	padding: 2px 4px;
+	-webkit-border-radius: 2px 2px 2px 2px;
+    -moz-border-radius: 2px 2px 2px 2px;
+	border-radius: 2px 2px 2px 2px;
+	color: #ffffff;
+	display: none;
+}
+.nav-ajax-left.show { display: inline; }
+#tools  li.notify-unseen a { background-color: #FFFDDA; }
+#tools  ul#nav-notifications-menu li a { font-size: 0.9em; }
+#tools  ul#nav-notifications-menu li a img { float: left; padding-bottom: 20px;}
+#tools  ul#nav-notifications-menu li a span.notif-when { display: block; font-style: italic; padding-left: 20px;}
+
 /* popup menu (author link) */
 #main .dropmenu:hover { background-color: #f9f9f9; }
 #main .dropmenu:hover > ul.menu-popup { display: block; }
@@ -213,13 +248,36 @@ ul.menu-popup a:hover {
 	color: #373737;	
 }
 
+/* fancybox */
+.fancybox-overlay { z-index: 11000;}
+
 
 /* main layout */
-#main { clear: both; padding: 1.625em 0 0; }
+#branding { z-index: 9997; }
+#main { clear: both; padding: 1.625em 0 0; position: relative; }
 
-#main #primary { float: left; margin: 0 -26.4% 0 0; width: 100%; }
-#main #secondary { float: right; margin-right: 7.6%; width: 18.8%; }
-#main #content { margin: 0 34% 0 7.6%; width: 58.4%; }
+#primary { float: left; margin: 0 -26.4% 0 0; width: 100%; }
+#secondary { float: right; margin-right: 7.6%; width: 18.8%;  position: relative;}
+#secondary.overlap { top: -200px; }
+#content { margin: 0 34% 0 7.6%; width: 58.4%; }
+
+/* Singular */
+.singular #primary {
+	margin: 0;
+}
+.singular #content,
+.left-sidebar.singular #content {
+	margin: 0 7.6%;
+	position: relative;
+	width: auto;
+}
+.singular .entry-header,
+.singular .entry-content,
+.singular footer.entry-meta,
+.singular #comments-title {
+	margin: 0 auto;
+	width: 68.9%;
+}
 
 
 #colophon { clear: both; }
@@ -241,4 +299,64 @@ ul.menu-popup a:hover {
 .widget-area {font-size: 12px;}
 
 /* aside */
+#profile-photo-wrapper { 
+	border: 1px solid #999999; padding: 10px; background-color: #ffffff;  z-index: 9998; position: relative;
+	-webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 3px 3px;
+	-moz-box-shadow: rgba(0, 0, 0, 0.2) 0 3px 3px;
+    box-shadow: rgba(0, 0, 0, 0.2) 0 3px 3px;
+}
+#profile-photo-wrapper img { width: 100%; }
 h2.fn { font-weight: bold; font-size: 1.2em;}
+
+#profile-extra-links ul { margin: 0px; list-style: none;}
+#profile-extra-links ul li { margin: 0px; padding: 0.5em 0px;}
+#profile-extra-links ul li  a { display: block; }
+
+
+/* contact block */
+.contact-block-h4 { float: left; }
+.allcontact-link { float: right; }
+.contact-block-div {
+	border: 1px solid #CCCCCC;
+	float: left;
+	height: 48px;
+	margin: 0px 5px 5px 0px;
+	padding: 3px;
+	width: 48px;
+}
+
+
+/* tabs */
+ul.tabs { display: block; list-style: none; margin: 0px; height: auto; overflow: auto;}
+ul.tabs li { display: block; float: left; padding-right: 0.2em; }
+ul.tabs li a { display: block; text-align: center; text-decoration: none; padding: 0px 0.5em; }
+ul.tabs li a:hover { background-color: #EEEEEE; }
+ul.tabs li a.active { background-color: #1982D1; color: #ffffff; }
+
+/* jot */
+/* non mi piace, ma vab� */
+.showjot {
+	position: relative;
+	top: -1.5em;
+	left: 550px;
+}
+.toolbox { margin: 0px; text-align: left; }
+.toolbox.left { text-align: left;}
+.toolbox.right { text-align: right;}
+.toolbox.center { text-align: center;}
+.toolbox dd { display: inline; }
+
+/* jot icons */
+.icon { display: inline-block; margin: 0px; padding: 0px; width: 16px; height: 16px; }
+.icon.camera	{ background: url(icons/image.png) transparent center center no-repeat; }
+.icon.attach 	{ background: url(icons/attachment.png) transparent center center no-repeat; }
+.icon.link		{ background: url(icons/link.png) transparent center center no-repeat; }
+.icon.video		{ background: url(icons/youtube2.png) transparent center center no-repeat; }
+.icon.audio		{ background: url(icons/headphones.png) transparent center center no-repeat; }
+.icon.globe		{ background: url(icons/location.png) transparent center center no-repeat; }
+.icon.noglobe	{ background: url(icons/globe.png) transparent center center no-repeat; }
+.icon.lock		{ background: url(icons/lock2.png) transparent center center no-repeat; }
+.icon.unlock	{ background: url(icons/unlocked.png) transparent center center no-repeat; }
+
+
+
