From b1cdc5a93273f7536cb1a3c9870214f6d0aaaed0 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 27 Feb 2012 09:08:48 -0500 Subject: [PATCH 01/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master: From e2798cee16ccc246e2c7d1932b7091828a776b35 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 2 Mar 2012 15:57:32 +0100 Subject: [PATCH 02/78] adjust --- .gitmodules | 0 view/theme/diabook | 1 - view/theme/diabook/contact_template.tpl | 25 + view/theme/diabook/experimental | 0 view/theme/diabook/icons/contacts.png | Bin 0 -> 559 bytes view/theme/diabook/icons/contacts2.png | Bin 0 -> 545 bytes view/theme/diabook/icons/dislike.png | Bin 0 -> 290 bytes view/theme/diabook/icons/drop.png | Bin 0 -> 292 bytes view/theme/diabook/icons/head.jpg | Bin 0 -> 383 bytes view/theme/diabook/icons/like.png | Bin 0 -> 329 bytes view/theme/diabook/icons/messages.png | Bin 0 -> 488 bytes view/theme/diabook/icons/notifications.png | Bin 0 -> 758 bytes view/theme/diabook/icons/notify.png | Bin 0 -> 534 bytes view/theme/diabook/icons/pencil.png | Bin 0 -> 286 bytes view/theme/diabook/icons/recycle.png | Bin 0 -> 296 bytes view/theme/diabook/icons/remote.png | Bin 0 -> 427 bytes view/theme/diabook/icons/selected.png | Bin 0 -> 211 bytes view/theme/diabook/icons/star.png | Bin 0 -> 358 bytes view/theme/diabook/icons/tagged.png | Bin 0 -> 353 bytes view/theme/diabook/icons/unstarred.png | Bin 0 -> 339 bytes view/theme/diabook/nav.tpl | 162 ++ view/theme/diabook/readme.txt | 1 + view/theme/diabook/style.css | 2052 ++++++++++++++++++++ view/theme/diabook/wall_item.tpl | 92 + 24 files changed, 2332 insertions(+), 1 deletion(-) create mode 100644 .gitmodules delete mode 160000 view/theme/diabook create mode 100755 view/theme/diabook/contact_template.tpl create mode 100755 view/theme/diabook/experimental create mode 100644 view/theme/diabook/icons/contacts.png create mode 100755 view/theme/diabook/icons/contacts2.png create mode 100755 view/theme/diabook/icons/dislike.png create mode 100755 view/theme/diabook/icons/drop.png create mode 100644 view/theme/diabook/icons/head.jpg create mode 100755 view/theme/diabook/icons/like.png create mode 100755 view/theme/diabook/icons/messages.png create mode 100755 view/theme/diabook/icons/notifications.png create mode 100755 view/theme/diabook/icons/notify.png create mode 100755 view/theme/diabook/icons/pencil.png create mode 100755 view/theme/diabook/icons/recycle.png create mode 100755 view/theme/diabook/icons/remote.png create mode 100755 view/theme/diabook/icons/selected.png create mode 100755 view/theme/diabook/icons/star.png create mode 100755 view/theme/diabook/icons/tagged.png create mode 100755 view/theme/diabook/icons/unstarred.png create mode 100644 view/theme/diabook/nav.tpl create mode 100644 view/theme/diabook/readme.txt create mode 100644 view/theme/diabook/style.css create mode 100644 view/theme/diabook/wall_item.tpl diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..e69de29bb diff --git a/view/theme/diabook b/view/theme/diabook deleted file mode 160000 index e29c43c4e..000000000 --- a/view/theme/diabook +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e29c43c4e78e42f448cbd84dc51a3a346bdab01f diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl new file mode 100755 index 000000000..48930b48a --- /dev/null +++ b/view/theme/diabook/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental new file mode 100755 index 000000000..e69de29bb diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..8a3e69ec1f55d283e7e352b723e0b3ca66877b0e GIT binary patch literal 559 zcmV+~0?_@5P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyYz z5i&XXrG9?^00FN_L_t(I%k7oFYZPG^gr6sO3GoMrh<2tG45Sk*L<#_V3+9y;4d!IF)!;i_uH{ zQIcco?9_}K1psMPH(A?pHR!yyIFRJ$c8Y%i8~rGNhfTg`)W!6&0fy@8PIbEn-0!J6 zkz`JNpJd)~$!Q{41?~=~WH^|x&{=h^c{;xH&9pw%b)8{P=~4AslIz{Pn=X%%JXVhY z7n7{0CmYuScYv35U4PsXMJeT``T#iGDBP6Lk&`6f)T>Dbz(#v{RaIMDSV}poK1#CG zYsDlaNqgXxx&}N=vZ($5ZYNo<>-x8)l<(?%w_ZD;Q;4tXvxX2gz`G>ph7BpZCGEM| x2YhHqTaMGfmzjV0G&afy6Y6nj@5k}~@dq9uzLjY7>6icj002ovPDHLkV1h8h?m++m literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png new file mode 100755 index 0000000000000000000000000000000000000000..f90b10f9202aeb51272286da1e165d6ec60dbf30 GIT binary patch literal 545 zcmV++0^a?JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z4i!5^2k(gh00E&%L_t(I%k9+9i_K9O$MM(q&X2Ct6hLJG%q)yUz>C5%ysUao1OBhZ$00q@ArM4^E{t( z_^+&{mW+svxP@Ig^%B=oN7M2uk;y9W$?J|fmu!6~H{ zuPQ%2z+OBo23zj3#YtSP`nXuVmYXQNJ!sgU{s3ox9?gfNUw5#C%{Y=hyrTfl<1yZ^ zuu(+J;ySiteXg)6w)z8~@e${+4UdWzuCQbi5j*qhGuYGDx26)qTRg=(EMP01U?HXS zqBp!HobH1TIv_oZ9mE;T;dRc}{+00000NkvXXu0mjfc^>k& literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png new file mode 100755 index 0000000000000000000000000000000000000000..fb0f8b33d176abac0c35cd3d227df5fc6e2818f8 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf!og)5?dSerO3Jy%=fkHWkWgav_FTzl zCZ{w%*$cBjUzrtJYskF3=WO7crAztJmn&_ID4&<`v0&APggLc|Ul-i@W%|$6<7$xI gpP936z5l~#d9(b^leJqH0$t1C>FVdQ&MBb@05&mlSO5S3 literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png new file mode 100755 index 0000000000000000000000000000000000000000..2abb82ef26df121c17e2535a3ea6f3ad22c43058 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf$RV|bg>}*`f!Zsmem&K*<*IsAOO-D%HGfX8nR}Sti*CQIue)V(xxVXa*VYfmk1_BZ ziugC{&1^}P*oJ#Qa+32u8&|Rg{!q7BV|wD!{R8F~-tRqYxn`r7-P+pD#ZM3JxVY$& h;VK!uhUW6gf(J_~d&gQu&X%Q~loCIDW)Ze#!e literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/head.jpg b/view/theme/diabook/icons/head.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6210b76befb3c2085194217e94e6b6b19d8a5a46 GIT binary patch literal 383 zcmex=LJ%Z3brsRu&*& z29a#6tZW>-931TI90J@toV>yUBEmufLP8?qvXUZVGGanPQp!>?a`K9biXxIK>M9Cq zvI>d{AVU~g+1NPPIrup^_!UHjL={K|{|_(-axl~|urf0$F)#@-G7B>PKf)jhc0V%% z5@2RyWaj`%DF^_4#>m9Zh>#OvViaUy6%7muopcGPLIUV_koOUQiIJIs1tcSgF2f)w z%*gcr76T76BhYqcK?ZwT%fkrCN0aq{`U e%N;)te=@#)^7-|oFLP{6q$G}S_`JRT|4jhcT}_Yx literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png new file mode 100755 index 0000000000000000000000000000000000000000..0006c3e2a5bcbde9aace6c14ed1baadfe9bcd9ef GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfVNNTs_P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z4i_zha{r=hQUaT*kxd0=Q-#6cV>8oYZe%_~cS=^BebZwD z)8Rug{0nr7je=cViFmz&cc*~9!!7ILdRh(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$oPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z4j36F$M;zPWPPw;+|na^Pn^EiqX zyn{RVHX=5*NPGgX;aPl!-S`^Qm~3$ZUCc(rpE!aGbw099+eRvO0Y?fmTO22v%={e> z@H+m$#Uee9FENCditGpcjkoayzNx%1Tt?esU&;Fw2QYY|4!V+E_JU6?t{=u8OPvQzrW#&ReEcaD2+E?8u zmLp;fYt_3`coHYi&91DsHKz+T!t`R)uytP~1AYEZd2U}nYw$51 oWs!QXcM1M4~U6?a^Jvj6}907*qoM6N<$f(J}m4FCWD literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png new file mode 100755 index 0000000000000000000000000000000000000000..9b852d05b2007ecb7508f9de807f8b5be8a9412c GIT binary patch literal 534 zcmV+x0_pvUP)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) zxscD?I9((Dz-sT8QIP|?z#j0a zep##mUabmB6%_!tDm<(~#nfu>q~wSOxCEZHp+11K67UHyOO%R1Mez?sWGEsxz*R*P z4S+?WdOA{-iqY{M_+KR_8>@`wrXWJs5xvNOJ54^<@1o6t3ooA=lgQL70(Y)*K0-AbW|YuPgf!pYN1Sc(B b^PFApu}?b3gT?oNE@kj^^>bP0l+XkKQ{8GD literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png new file mode 100755 index 0000000000000000000000000000000000000000..c3b8d2bf478559ecbd0197e30bd14e4d2bd3f3de GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfIZ5~UH6c~Ur}li(e@%F>v5N+Ebn0bI485Iwo(zyS3*|wa;K-R}V4#Co;h-_xB+uA?8mj z7RYy8o3ZfQ+va;GJ=>mTHXmyLpcXdqUsI}H)*am(r2{f+U%c+iSQ6=Rn)%cWw!LM0 lp1tHvX%zY<@oWALrhD}+^;iFOtOmN7!PC{xWt~$(698uka#R2S literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png new file mode 100755 index 0000000000000000000000000000000000000000..a560cc55e4b4499dffeeea1103812e9b768d9d26 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^{6H+g!3HExhN-duDaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4wHjbpG2T3+MX_sAsXj< zFMDgZ28ysfIKK7=`?-z)5n=ZyLY|tbkIWvYb1*aSKX~SX!%UAhpOl0pe;Ab|6`lwc zSz4;SzVfYK#a1iwpk)cMbeIpS&gD54?$9_$1LMO*#r5=Pfki( zncD;F7fENIlnDz?l1+0yC+ud>b3NiupWdA$;ZV(=9Fr?Lj;=TSSYxz@cguo(E~}0^ zHtd$*nyFfud!zIJ-!EIT&LrBr(w14Qe`cf5cT2$^k!2pQH@?nX7B4-?n=9|aJXL+x zAJaD8Eor+Ee@>)#hewWue5A*_-9OFcpBK)oWH|bw^#60#r%A6`PwagW+LN#8on$cK TtKvCeNHTc3`njxgN@xNAD&?z` literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png new file mode 100755 index 0000000000000000000000000000000000000000..2a30ae2523c419a056bee6495cf5efafb5ecc379 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CJ!3HGRcAO0XQjEnx?oJHr&dIz4i6wcvyD?NMQuIzW1WCU0gx|qB9fkMHaE{-7*my;6| z_`Vn$7{sI}Bur2U`&h5B&#&vz{{TB?AZRvaWOU>BwF9bCD)d9XyuH?#zsX+ v-%plyM-3+QFXLFB6f^5rC+DFWr!K}vzcn7EsO`%H8qeVA>gTe~DWM4fZG=5- literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png new file mode 100755 index 0000000000000000000000000000000000000000..ca20724143fd2ee28c363a47dc02268bea610c9a GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfIJY5_^EKXm& zyw}UwQGoTq`6c2iEJsX|66HOUr@Cc#e|f~+A-1pWnxaxi>x~RKg(USSoLfY>4<@Mo z&_9;elDaeQpcnhJxt7-H=ii;t`+xG9;jt7hzbOJ@hVAJ*g^j@_r$S!6Xb-xWvGA8{ zrST-Yq`DI)-b=LHKX-Ds=Of`Xt}C}Id>&2J|K!F{o$*MI>+7Ukg=dj6ZTkZpmBsiC zoOr)iczdWv^!?!4yCf|^SLl0T_vr)GjsA~CZ(Hy+{@lYCY;n4;RybTz?Z!EO{$-td x>zX&T6z5Fcy5U6F;-&jHWv!6^`&a%O=T1!@W%boeDnK7Ic)I$ztaD0e0ssKQL70(Y)*K0-AbW|YuPgfNxxTj%@kb?;3Bz tCj4Df-g&w7|HM@QL70(Y)*K0-AbW|YuPgf4Gw1GBr>9H)vk|L%_-$kB*9X6L9QwJZjeW(lBkxQeE9n_sG`8FH z%T(!V`efd!!jFB91)}?mf*;*eny>b`P@p|y(UDJ6E@n@ZUbuEc_+e)gt&dHiHEt@O zWw$whZ#iypf4OFq;vPqHmkrInI*A>NFZ68UtxaZ~esi^Q%;U00+Ok*D*A_A7ip*Sj ffb-g)$Lz;;Gk9-M*~&W?=sgBcS3j3^P6 + {# $langselector #} + +
$sitelocation
+ + + + + +{# + +{{ if $nav.logout }}$nav.logout.1 {{ endif }} +{{ if $nav.login }} {{ endif }} + + + +{{ if $nav.register }}$nav.register.1{{ endif }} + +$nav.help.1 + +{{ if $nav.apps }}$nav.apps.1{{ endif }} + +$nav.search.1 +$nav.directory.1 + +{{ if $nav.admin }}$nav.admin.1{{ endif }} + +{{ if $nav.notifications }} +$nav.notifications.1 + +{{ endif }} +{{ if $nav.messages }} +$nav.messages.1 + +{{ endif }} + +{{ if $nav.manage }}$nav.manage.1{{ endif }} + +{{ if $nav.settings }}$nav.settings.1{{ endif }} +{{ if $nav.profiles }}$nav.profiles.1{{ endif }} + + + + + +#} diff --git a/view/theme/diabook/readme.txt b/view/theme/diabook/readme.txt new file mode 100644 index 000000000..aaaa72b28 --- /dev/null +++ b/view/theme/diabook/readme.txt @@ -0,0 +1 @@ +hallo welt diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css new file mode 100644 index 000000000..383fba24d --- /dev/null +++ b/view/theme/diabook/style.css @@ -0,0 +1,2052 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../../../view/theme/diabook/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook/icons/messages.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} +.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} +.icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} + +.article { background-position: -50px 0px;} +.audio { background-position: -70px 0px;} +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +.edit { background-position: -150px 0px;} +.camera { background-position: -170px 0px;} +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +.link { background-position: -230px 0px;} + +.globe { background-position: -50px -20px;} +.noglobe { background-position: -70px -20px;} +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +.lock { background-position: -70px -40px;} + +.video { background-position: -110px -40px;} +.youtube { background-position: -130px -40px;} + +.attach { background-position: -190px -40px;} +.language { background-position: -210px -40px;} + + +.on { background-position: -50px -60px;} +.off { background-position: -70px -60px;} +.prev { background-position: -90px -60px;} +.next { background-position: -110px -60px;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + background-image: url('icons.png'); +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-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.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.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.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.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-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.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.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/icons/48/star.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 684px; + border-bottom: 1px solid #BDCDD4; + border-top: 1px solid #BDCDD4; + + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px 0px 0px 0px; + display: table; +} +h4 { + font-size: 1.1em; +} + +a { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + 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); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* 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; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 20%; + height: 32px; + background: #000; + 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); +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + 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: 25px; + margin-top: 5px; +} +header #banner #logo-text { + font-size: 22px; + +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 20%; + top: 0px; + padding: 0px; + background: #000; + 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; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} + +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 12px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon.selected { + background-color: #364e59; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #ff0000; + /* 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; + font-weight: 900; + padding: 1px 3px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; +} +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, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + font-weight: bold; + } +nav #nav-directory-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + } +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; +} +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 { + background-color: #364e59; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + 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; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #bdcdd4; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + 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; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + 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); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 180px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +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%; + text-align: right; + color: #999999; +} +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: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 173px; +} +aside #side-follow-url { + width: 173px; + } +aside #side-peoplefind-url { + width: 173px; + } +#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; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +.widget .tool.selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding: 0px 0px 0px 10px; +} +.tabs { + background-image: url("../../../view/theme/diabook/icons/head.jpg"); + background-position: 0 -20px; + background-repeat: repeat-x; + border-bottom: 1px solid #BABDB6; + height: 27px; + padding: 0; + } +.tab.button { + margin-right: 15px; + margin-left: 15px; + } +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 775px; +} +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} +.unstarred { + display: none; +} +.wall-item-container { + display: table; + width: 780px; +} +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container:hover .wall-item-bottom { +/* opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + font-size: 13px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.4; +} + +.wall-item-container .wall-item-content img { + max-width: 700px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-actions-social a { + float: left; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 80px; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 700px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 1px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1.2em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} +#jot-preview-content .tread-wrapper { + background-color: #fce94f; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + background: url("../../../images/tag_b.png") repeat-x center left; + color: #ffffff; + padding-left: 3px; + font-size: 10px; +} +.tag a { + padding-right: 8px; + background: url("../../../images/tag.png") no-repeat center right; + color: #ffffff; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -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); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 785px; + margin: 0px 2em 20px 0px; +} +#jot .profile-jot-text { + height: 1.2em; + width: 99%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 783px; + background-color: #0e232e; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 700px; + font-weight: bold; + border: 1px solid #ffffff; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +/** buttons **/ +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 7px; +} +ul.tabs li .active { + border-bottom: 1px solid #3465A4; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ +.lframe { + float: left; + margin: 0px 10px 10px 0px; +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} + +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; +} + +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: left; + margin-top: 10px; + margin-right: 30px; +} +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { + border: 1px solid #CCCCCC; +} +.vevent .event-description, .vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-start { + margin-left: 10px; + margin-right: 10px; +} + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url('../../../images/calendar.png'); + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.today { + font-weight: bold; + color: #FF0000; +} + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} + +#photo-photo { + float: left; +} + +#photo-photo-end { + clear: both; +} + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: -2px; + top: -20px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} + +.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +} +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl new file mode 100644 index 000000000..1f1a878b4 --- /dev/null +++ b/view/theme/diabook/wall_item.tpl @@ -0,0 +1,92 @@ +{{ if $item.indent }}{{ else }} +
+ $item.star.starred + {{ if $item.lock }}$item.lock{{ endif }} + +
+{{ endif }} +
+
+
+
+ + $item.name + + menu + + +
+
+
+ $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
+ + {{ if $item.title }}

$item.title

{{ endif }} + $item.body +
+
+
+
+
+
+ {{ for $item.tags as $item.tag }} + $item.tag + {{ endfor }} +
+
+
+
+ {{ if $item.plink }}$item.plink.title{{ endif }} +
+
+
$item.location 
+
+ + {{ if $item.star }} + $item.star.do + $item.star.undo + $item.star.tagger + {{ endif }} + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} +
+ +
+ + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
From c26787ab948d719fd59c8dc856ddfd67d101198b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 2 Mar 2012 15:57:32 +0100 Subject: [PATCH 03/78] adjust2 --- .gitmodules | 0 view/theme/diabook | 1 - view/theme/diabook/contact_template.tpl | 25 + view/theme/diabook/experimental | 0 view/theme/diabook/icons/contacts.png | Bin 0 -> 559 bytes view/theme/diabook/icons/contacts2.png | Bin 0 -> 545 bytes view/theme/diabook/icons/dislike.png | Bin 0 -> 290 bytes view/theme/diabook/icons/drop.png | Bin 0 -> 292 bytes view/theme/diabook/icons/head.jpg | Bin 0 -> 383 bytes view/theme/diabook/icons/like.png | Bin 0 -> 329 bytes view/theme/diabook/icons/messages.png | Bin 0 -> 488 bytes view/theme/diabook/icons/notifications.png | Bin 0 -> 758 bytes view/theme/diabook/icons/notify.png | Bin 0 -> 534 bytes view/theme/diabook/icons/pencil.png | Bin 0 -> 286 bytes view/theme/diabook/icons/recycle.png | Bin 0 -> 296 bytes view/theme/diabook/icons/remote.png | Bin 0 -> 427 bytes view/theme/diabook/icons/selected.png | Bin 0 -> 211 bytes view/theme/diabook/icons/star.png | Bin 0 -> 358 bytes view/theme/diabook/icons/tagged.png | Bin 0 -> 353 bytes view/theme/diabook/icons/unstarred.png | Bin 0 -> 339 bytes view/theme/diabook/nav.tpl | 162 ++ view/theme/diabook/style.css | 2052 ++++++++++++++++++++ view/theme/diabook/wall_item.tpl | 92 + 23 files changed, 2331 insertions(+), 1 deletion(-) create mode 100644 .gitmodules delete mode 160000 view/theme/diabook create mode 100755 view/theme/diabook/contact_template.tpl create mode 100755 view/theme/diabook/experimental create mode 100644 view/theme/diabook/icons/contacts.png create mode 100755 view/theme/diabook/icons/contacts2.png create mode 100755 view/theme/diabook/icons/dislike.png create mode 100755 view/theme/diabook/icons/drop.png create mode 100644 view/theme/diabook/icons/head.jpg create mode 100755 view/theme/diabook/icons/like.png create mode 100755 view/theme/diabook/icons/messages.png create mode 100755 view/theme/diabook/icons/notifications.png create mode 100755 view/theme/diabook/icons/notify.png create mode 100755 view/theme/diabook/icons/pencil.png create mode 100755 view/theme/diabook/icons/recycle.png create mode 100755 view/theme/diabook/icons/remote.png create mode 100755 view/theme/diabook/icons/selected.png create mode 100755 view/theme/diabook/icons/star.png create mode 100755 view/theme/diabook/icons/tagged.png create mode 100755 view/theme/diabook/icons/unstarred.png create mode 100644 view/theme/diabook/nav.tpl create mode 100644 view/theme/diabook/style.css create mode 100644 view/theme/diabook/wall_item.tpl diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..e69de29bb diff --git a/view/theme/diabook b/view/theme/diabook deleted file mode 160000 index e29c43c4e..000000000 --- a/view/theme/diabook +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e29c43c4e78e42f448cbd84dc51a3a346bdab01f diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl new file mode 100755 index 000000000..48930b48a --- /dev/null +++ b/view/theme/diabook/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental new file mode 100755 index 000000000..e69de29bb diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..8a3e69ec1f55d283e7e352b723e0b3ca66877b0e GIT binary patch literal 559 zcmV+~0?_@5P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyYz z5i&XXrG9?^00FN_L_t(I%k7oFYZPG^gr6sO3GoMrh<2tG45Sk*L<#_V3+9y;4d!IF)!;i_uH{ zQIcco?9_}K1psMPH(A?pHR!yyIFRJ$c8Y%i8~rGNhfTg`)W!6&0fy@8PIbEn-0!J6 zkz`JNpJd)~$!Q{41?~=~WH^|x&{=h^c{;xH&9pw%b)8{P=~4AslIz{Pn=X%%JXVhY z7n7{0CmYuScYv35U4PsXMJeT``T#iGDBP6Lk&`6f)T>Dbz(#v{RaIMDSV}poK1#CG zYsDlaNqgXxx&}N=vZ($5ZYNo<>-x8)l<(?%w_ZD;Q;4tXvxX2gz`G>ph7BpZCGEM| x2YhHqTaMGfmzjV0G&afy6Y6nj@5k}~@dq9uzLjY7>6icj002ovPDHLkV1h8h?m++m literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png new file mode 100755 index 0000000000000000000000000000000000000000..f90b10f9202aeb51272286da1e165d6ec60dbf30 GIT binary patch literal 545 zcmV++0^a?JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z4i!5^2k(gh00E&%L_t(I%k9+9i_K9O$MM(q&X2Ct6hLJG%q)yUz>C5%ysUao1OBhZ$00q@ArM4^E{t( z_^+&{mW+svxP@Ig^%B=oN7M2uk;y9W$?J|fmu!6~H{ zuPQ%2z+OBo23zj3#YtSP`nXuVmYXQNJ!sgU{s3ox9?gfNUw5#C%{Y=hyrTfl<1yZ^ zuu(+J;ySiteXg)6w)z8~@e${+4UdWzuCQbi5j*qhGuYGDx26)qTRg=(EMP01U?HXS zqBp!HobH1TIv_oZ9mE;T;dRc}{+00000NkvXXu0mjfc^>k& literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png new file mode 100755 index 0000000000000000000000000000000000000000..fb0f8b33d176abac0c35cd3d227df5fc6e2818f8 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf!og)5?dSerO3Jy%=fkHWkWgav_FTzl zCZ{w%*$cBjUzrtJYskF3=WO7crAztJmn&_ID4&<`v0&APggLc|Ul-i@W%|$6<7$xI gpP936z5l~#d9(b^leJqH0$t1C>FVdQ&MBb@05&mlSO5S3 literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png new file mode 100755 index 0000000000000000000000000000000000000000..2abb82ef26df121c17e2535a3ea6f3ad22c43058 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf$RV|bg>}*`f!Zsmem&K*<*IsAOO-D%HGfX8nR}Sti*CQIue)V(xxVXa*VYfmk1_BZ ziugC{&1^}P*oJ#Qa+32u8&|Rg{!q7BV|wD!{R8F~-tRqYxn`r7-P+pD#ZM3JxVY$& h;VK!uhUW6gf(J_~d&gQu&X%Q~loCIDW)Ze#!e literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/head.jpg b/view/theme/diabook/icons/head.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6210b76befb3c2085194217e94e6b6b19d8a5a46 GIT binary patch literal 383 zcmex=LJ%Z3brsRu&*& z29a#6tZW>-931TI90J@toV>yUBEmufLP8?qvXUZVGGanPQp!>?a`K9biXxIK>M9Cq zvI>d{AVU~g+1NPPIrup^_!UHjL={K|{|_(-axl~|urf0$F)#@-G7B>PKf)jhc0V%% z5@2RyWaj`%DF^_4#>m9Zh>#OvViaUy6%7muopcGPLIUV_koOUQiIJIs1tcSgF2f)w z%*gcr76T76BhYqcK?ZwT%fkrCN0aq{`U e%N;)te=@#)^7-|oFLP{6q$G}S_`JRT|4jhcT}_Yx literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png new file mode 100755 index 0000000000000000000000000000000000000000..0006c3e2a5bcbde9aace6c14ed1baadfe9bcd9ef GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfVNNTs_P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z4i_zha{r=hQUaT*kxd0=Q-#6cV>8oYZe%_~cS=^BebZwD z)8Rug{0nr7je=cViFmz&cc*~9!!7ILdRh(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$oPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z4j36F$M;zPWPPw;+|na^Pn^EiqX zyn{RVHX=5*NPGgX;aPl!-S`^Qm~3$ZUCc(rpE!aGbw099+eRvO0Y?fmTO22v%={e> z@H+m$#Uee9FENCditGpcjkoayzNx%1Tt?esU&;Fw2QYY|4!V+E_JU6?t{=u8OPvQzrW#&ReEcaD2+E?8u zmLp;fYt_3`coHYi&91DsHKz+T!t`R)uytP~1AYEZd2U}nYw$51 oWs!QXcM1M4~U6?a^Jvj6}907*qoM6N<$f(J}m4FCWD literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png new file mode 100755 index 0000000000000000000000000000000000000000..9b852d05b2007ecb7508f9de807f8b5be8a9412c GIT binary patch literal 534 zcmV+x0_pvUP)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) zxscD?I9((Dz-sT8QIP|?z#j0a zep##mUabmB6%_!tDm<(~#nfu>q~wSOxCEZHp+11K67UHyOO%R1Mez?sWGEsxz*R*P z4S+?WdOA{-iqY{M_+KR_8>@`wrXWJs5xvNOJ54^<@1o6t3ooA=lgQL70(Y)*K0-AbW|YuPgf!pYN1Sc(B b^PFApu}?b3gT?oNE@kj^^>bP0l+XkKQ{8GD literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png new file mode 100755 index 0000000000000000000000000000000000000000..c3b8d2bf478559ecbd0197e30bd14e4d2bd3f3de GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfIZ5~UH6c~Ur}li(e@%F>v5N+Ebn0bI485Iwo(zyS3*|wa;K-R}V4#Co;h-_xB+uA?8mj z7RYy8o3ZfQ+va;GJ=>mTHXmyLpcXdqUsI}H)*am(r2{f+U%c+iSQ6=Rn)%cWw!LM0 lp1tHvX%zY<@oWALrhD}+^;iFOtOmN7!PC{xWt~$(698uka#R2S literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png new file mode 100755 index 0000000000000000000000000000000000000000..a560cc55e4b4499dffeeea1103812e9b768d9d26 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^{6H+g!3HExhN-duDaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4wHjbpG2T3+MX_sAsXj< zFMDgZ28ysfIKK7=`?-z)5n=ZyLY|tbkIWvYb1*aSKX~SX!%UAhpOl0pe;Ab|6`lwc zSz4;SzVfYK#a1iwpk)cMbeIpS&gD54?$9_$1LMO*#r5=Pfki( zncD;F7fENIlnDz?l1+0yC+ud>b3NiupWdA$;ZV(=9Fr?Lj;=TSSYxz@cguo(E~}0^ zHtd$*nyFfud!zIJ-!EIT&LrBr(w14Qe`cf5cT2$^k!2pQH@?nX7B4-?n=9|aJXL+x zAJaD8Eor+Ee@>)#hewWue5A*_-9OFcpBK)oWH|bw^#60#r%A6`PwagW+LN#8on$cK TtKvCeNHTc3`njxgN@xNAD&?z` literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png new file mode 100755 index 0000000000000000000000000000000000000000..2a30ae2523c419a056bee6495cf5efafb5ecc379 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CJ!3HGRcAO0XQjEnx?oJHr&dIz4i6wcvyD?NMQuIzW1WCU0gx|qB9fkMHaE{-7*my;6| z_`Vn$7{sI}Bur2U`&h5B&#&vz{{TB?AZRvaWOU>BwF9bCD)d9XyuH?#zsX+ v-%plyM-3+QFXLFB6f^5rC+DFWr!K}vzcn7EsO`%H8qeVA>gTe~DWM4fZG=5- literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png new file mode 100755 index 0000000000000000000000000000000000000000..ca20724143fd2ee28c363a47dc02268bea610c9a GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfIJY5_^EKXm& zyw}UwQGoTq`6c2iEJsX|66HOUr@Cc#e|f~+A-1pWnxaxi>x~RKg(USSoLfY>4<@Mo z&_9;elDaeQpcnhJxt7-H=ii;t`+xG9;jt7hzbOJ@hVAJ*g^j@_r$S!6Xb-xWvGA8{ zrST-Yq`DI)-b=LHKX-Ds=Of`Xt}C}Id>&2J|K!F{o$*MI>+7Ukg=dj6ZTkZpmBsiC zoOr)iczdWv^!?!4yCf|^SLl0T_vr)GjsA~CZ(Hy+{@lYCY;n4;RybTz?Z!EO{$-td x>zX&T6z5Fcy5U6F;-&jHWv!6^`&a%O=T1!@W%boeDnK7Ic)I$ztaD0e0ssKQL70(Y)*K0-AbW|YuPgfNxxTj%@kb?;3Bz tCj4Df-g&w7|HM@QL70(Y)*K0-AbW|YuPgf4Gw1GBr>9H)vk|L%_-$kB*9X6L9QwJZjeW(lBkxQeE9n_sG`8FH z%T(!V`efd!!jFB91)}?mf*;*eny>b`P@p|y(UDJ6E@n@ZUbuEc_+e)gt&dHiHEt@O zWw$whZ#iypf4OFq;vPqHmkrInI*A>NFZ68UtxaZ~esi^Q%;U00+Ok*D*A_A7ip*Sj ffb-g)$Lz;;Gk9-M*~&W?=sgBcS3j3^P6 + {# $langselector #} + +
$sitelocation
+ + + + + +{# + +{{ if $nav.logout }}$nav.logout.1 {{ endif }} +{{ if $nav.login }} {{ endif }} + + + +{{ if $nav.register }}$nav.register.1{{ endif }} + +$nav.help.1 + +{{ if $nav.apps }}$nav.apps.1{{ endif }} + +$nav.search.1 +$nav.directory.1 + +{{ if $nav.admin }}$nav.admin.1{{ endif }} + +{{ if $nav.notifications }} +$nav.notifications.1 + +{{ endif }} +{{ if $nav.messages }} +$nav.messages.1 + +{{ endif }} + +{{ if $nav.manage }}$nav.manage.1{{ endif }} + +{{ if $nav.settings }}$nav.settings.1{{ endif }} +{{ if $nav.profiles }}$nav.profiles.1{{ endif }} + + + + + +#} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css new file mode 100644 index 000000000..383fba24d --- /dev/null +++ b/view/theme/diabook/style.css @@ -0,0 +1,2052 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../../../view/theme/diabook/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook/icons/messages.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} +.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} +.icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} + +.article { background-position: -50px 0px;} +.audio { background-position: -70px 0px;} +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +.edit { background-position: -150px 0px;} +.camera { background-position: -170px 0px;} +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +.link { background-position: -230px 0px;} + +.globe { background-position: -50px -20px;} +.noglobe { background-position: -70px -20px;} +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +.lock { background-position: -70px -40px;} + +.video { background-position: -110px -40px;} +.youtube { background-position: -130px -40px;} + +.attach { background-position: -190px -40px;} +.language { background-position: -210px -40px;} + + +.on { background-position: -50px -60px;} +.off { background-position: -70px -60px;} +.prev { background-position: -90px -60px;} +.next { background-position: -110px -60px;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + background-image: url('icons.png'); +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-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.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.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.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.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-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.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.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/icons/48/star.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 684px; + border-bottom: 1px solid #BDCDD4; + border-top: 1px solid #BDCDD4; + + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px 0px 0px 0px; + display: table; +} +h4 { + font-size: 1.1em; +} + +a { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + 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); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* 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; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 20%; + height: 32px; + background: #000; + 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); +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + 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: 25px; + margin-top: 5px; +} +header #banner #logo-text { + font-size: 22px; + +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 20%; + top: 0px; + padding: 0px; + background: #000; + 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; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} + +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 12px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon.selected { + background-color: #364e59; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #ff0000; + /* 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; + font-weight: 900; + padding: 1px 3px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; +} +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, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + font-weight: bold; + } +nav #nav-directory-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + } +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; +} +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 { + background-color: #364e59; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + 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; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #bdcdd4; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + 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; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + 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); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 180px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +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%; + text-align: right; + color: #999999; +} +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: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 173px; +} +aside #side-follow-url { + width: 173px; + } +aside #side-peoplefind-url { + width: 173px; + } +#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; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +.widget .tool.selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding: 0px 0px 0px 10px; +} +.tabs { + background-image: url("../../../view/theme/diabook/icons/head.jpg"); + background-position: 0 -20px; + background-repeat: repeat-x; + border-bottom: 1px solid #BABDB6; + height: 27px; + padding: 0; + } +.tab.button { + margin-right: 15px; + margin-left: 15px; + } +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 775px; +} +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} +.unstarred { + display: none; +} +.wall-item-container { + display: table; + width: 780px; +} +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container:hover .wall-item-bottom { +/* opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + font-size: 13px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.4; +} + +.wall-item-container .wall-item-content img { + max-width: 700px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-actions-social a { + float: left; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 80px; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 700px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 1px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1.2em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} +#jot-preview-content .tread-wrapper { + background-color: #fce94f; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + background: url("../../../images/tag_b.png") repeat-x center left; + color: #ffffff; + padding-left: 3px; + font-size: 10px; +} +.tag a { + padding-right: 8px; + background: url("../../../images/tag.png") no-repeat center right; + color: #ffffff; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -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); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 785px; + margin: 0px 2em 20px 0px; +} +#jot .profile-jot-text { + height: 1.2em; + width: 99%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 783px; + background-color: #0e232e; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 700px; + font-weight: bold; + border: 1px solid #ffffff; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +/** buttons **/ +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 7px; +} +ul.tabs li .active { + border-bottom: 1px solid #3465A4; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ +.lframe { + float: left; + margin: 0px 10px 10px 0px; +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} + +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; +} + +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: left; + margin-top: 10px; + margin-right: 30px; +} +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { + border: 1px solid #CCCCCC; +} +.vevent .event-description, .vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-start { + margin-left: 10px; + margin-right: 10px; +} + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url('../../../images/calendar.png'); + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.today { + font-weight: bold; + color: #FF0000; +} + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} + +#photo-photo { + float: left; +} + +#photo-photo-end { + clear: both; +} + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: -2px; + top: -20px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} + +.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +} +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl new file mode 100644 index 000000000..1f1a878b4 --- /dev/null +++ b/view/theme/diabook/wall_item.tpl @@ -0,0 +1,92 @@ +{{ if $item.indent }}{{ else }} +
+ $item.star.starred + {{ if $item.lock }}$item.lock{{ endif }} + +
+{{ endif }} +
+
+
+
+ + $item.name + + menu + + +
+
+
+ $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
+ + {{ if $item.title }}

$item.title

{{ endif }} + $item.body +
+
+
+
+
+
+ {{ for $item.tags as $item.tag }} + $item.tag + {{ endfor }} +
+
+
+
+ {{ if $item.plink }}$item.plink.title{{ endif }} +
+
+
$item.location 
+
+ + {{ if $item.star }} + $item.star.do + $item.star.undo + $item.star.tagger + {{ endif }} + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} +
+ +
+ + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
From d72520f5f1d142d00598c17d041c8f144a1ea872 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 2 Mar 2012 17:45:21 +0100 Subject: [PATCH 04/78] adjust3 --- view/theme/diabook/readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/diabook/readme.txt b/view/theme/diabook/readme.txt index aaaa72b28..bd5a897a5 100644 --- a/view/theme/diabook/readme.txt +++ b/view/theme/diabook/readme.txt @@ -1 +1,2 @@ hallo welt +und so weiter test From ac1d758f6e77be68db1aec249fee39d0d46fc9cc Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 2 Mar 2012 17:47:45 +0100 Subject: [PATCH 05/78] github finally working --- view/theme/diabook/readme.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/view/theme/diabook/readme.txt b/view/theme/diabook/readme.txt index bd5a897a5..e69de29bb 100644 --- a/view/theme/diabook/readme.txt +++ b/view/theme/diabook/readme.txt @@ -1,2 +0,0 @@ -hallo welt -und so weiter test From 9c698b1a60024a83982534ecf16409d03ff1e813 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 12:00:16 -0500 Subject: [PATCH 06/78] fix for comment-wwedit-wrapper CSS class in tpl had a stray $ Signed-off-by: Simon L'nu --- images/icons/lock.png.tmp | Bin 8213 -> 0 bytes view/comment_item.tpl | 2 +- view/theme/duepuntozero/comment_item.tpl | 2 +- view/theme/loozah/comment_item.tpl | 2 +- view/theme/testbubble/comment_item.tpl | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100755 images/icons/lock.png.tmp diff --git a/images/icons/lock.png.tmp b/images/icons/lock.png.tmp deleted file mode 100755 index 7e58ead2eb90f10dce17673c15b2eaaaf702e62f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8213 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 diff --git a/view/comment_item.tpl b/view/comment_item.tpl index c992593f8..cde4ca3ca 100755 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl index b29735227..3503c3843 100755 --- a/view/theme/duepuntozero/comment_item.tpl +++ b/view/theme/duepuntozero/comment_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/loozah/comment_item.tpl index b29735227..3503c3843 100755 --- a/view/theme/loozah/comment_item.tpl +++ b/view/theme/loozah/comment_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index bc75eb1a6..4754a1eb7 100755 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -1,4 +1,4 @@ -
+
From 64a85b2507c4d699300c62a6cc2e6bd050ee001d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 2 Mar 2012 18:01:21 +0100 Subject: [PATCH 07/78] deleted readme.txt from folder diabook --- view/theme/diabook/readme.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 view/theme/diabook/readme.txt diff --git a/view/theme/diabook/readme.txt b/view/theme/diabook/readme.txt deleted file mode 100644 index e69de29bb..000000000 From 02f8e95b1a4b44f140b2e871097673185158d8a5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 12:28:28 -0500 Subject: [PATCH 08/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: deleted readme.txt from folder diabook github finally working adjust3 adjust2 adjust * master: From 81de5f780284f27964c8ec5147768450aa203f72 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 13:59:28 -0500 Subject: [PATCH 09/78] apply changes to templates to testbubble Signed-off-by: Simon L'nu --- view/theme/duepuntozero/wallwall_item.tpl | 4 +- view/theme/testbubble/comment_item.tpl | 5 +- view/theme/testbubble/conversation.tpl | 14 +++- view/theme/testbubble/search_item.tpl | 55 ++++++++------ view/theme/testbubble/wall_item.tpl | 92 +++++++++++------------ view/theme/testbubble/wallwall_item.tpl | 88 +++++++++++----------- 6 files changed, 135 insertions(+), 123 deletions(-) diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 211906c93..5cb2dbc3b 100755 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -28,8 +28,8 @@
$item.name $item.to $item.owner_name $item.vwall
-
$item.ago
-
+
$item.ago
+
$item.title
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index 4754a1eb7..6d9230dbf 100755 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -11,6 +11,7 @@ $mytitle
+ {{ if $qcomment }} {{ for $qcomment as $qc }} $qc @@ -18,14 +19,12 @@ {{ endfor }} {{ endif }} - -
- +
diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl index 33cedfb1e..43bb1dd47 100755 --- a/view/theme/testbubble/conversation.tpl +++ b/view/theme/testbubble/conversation.tpl @@ -1,6 +1,18 @@ {{ for $threads as $thread }}
- $thread.html + {{ for $thread.items as $item }} + {{if $item.comment_firstcollapsed}} +
+ $thread.num_comments $thread.hide_text +
+ {{endif}} + + {{ inc $item.template }}{{ endinc }} + + + {{ endfor }}
{{ endfor }} diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl index 27a08e4eb..a0a4ef393 100755 --- a/view/theme/testbubble/search_item.tpl +++ b/view/theme/testbubble/search_item.tpl @@ -1,48 +1,53 @@ -
-
-
-
- - $name - menu -
+
+
+
+
+ + $item.name + menu +
    - $item_photo_menu + $item.item_photo_menu
-
{{ if $location }}$location {{ endif }}
+
{{ if $item.location }}$item.location {{ endif }}
- {{ if $lock }}
$lock
+ {{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }}
-
-
- {{ if $drop.dropping }}{{ endif }} +
+
+ {{ if $item.drop.dropping }}{{ endif }}
- {{ if $drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }}
-
-
$title
+
+
$item.title
-
$body
+
$item.body
- $name -
$ago
+ $item.name +
$item.ago
-
- {{ if $conv }}$conv.title{{ endif }} +
+ + +
+ {{ if $item.conv }} + $item.conv.title + {{ endif }}
-
+
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 2b0e6740a..190e06a8a 100755 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -1,82 +1,78 @@ - -
-
-
-
- - $name +
+
+
+
+ + $item.name - menu -
+ menu +
    - $item_photo_menu + $item.item_photo_menu
-
{{ if $location }}$location {{ endif }}
+
{{ if $item.location }}$item.location {{ endif }}
- {{ if $lock }}
$lock
+ {{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }}
-
-
$title
+
+
$item.title
-
$body -
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
+
$item.body +
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
- -
- {{ if $vote }} - -
+
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index cd4def7fc..eb7c3ddba 100755 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -1,81 +1,81 @@ -
-
-
-
- - $owner_name +
+
+
+
+ + $item.owner_name
-
$wall
-
- - $name - menu -
+
$item.wall
+
+ + $item.name + menu +
    - $item_photo_menu + $item.item_photo_menu
-
{{ if $location }}$location {{ endif }}
+
{{ if $item.location }}$item.location {{ endif }}
- {{ if $lock }}
$lock
+ {{ if $item.lock }}
$item.lock
{{ else }}
{{ endif }}
-
-
$title
+
+
$item.title
-
$body +
$item.body
- {{ for $tags as $tag }} + {{ for $item.tags as $tag }} $tag {{ endfor }}
-
- {{ if $vote }} - -
+
From 685686b3e81e53264b4946f54904e8f5323da2ea Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Sat, 3 Mar 2012 00:00:38 +0100 Subject: [PATCH 10/78] template proc: fix variables regexp --- include/template_processor.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/template_processor.php b/include/template_processor.php index 111fc5849..8671587fc 100755 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -160,7 +160,16 @@ private function var_replace($s){ $m = array(); - if (preg_match_all('/\$\[{0,1}([a-zA-Z0-9-_]+\.*)+\]{0,1}/', $s,$m)){ + /** regexp: + * \$ literal $ + * (\[)? optional open square bracket + * ([a-zA-Z0-9-_]+\.?)+ var name, followed by optional + * dot, repeated at least 1 time + * (?(1)\]) if there was opened square bracket + * (subgrup 1), match close bracket + */ + if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)){ + foreach($m[0] as $var){ $varn = str_replace(array("[","]"), array("",""), $var); $val = $this->_get_var($varn, true); From 333942898782f3e197a660eb841ccbd296a83475 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Sat, 3 Mar 2012 00:12:45 +0100 Subject: [PATCH 11/78] fix @mention autocomplete in comments --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index a5d1214cb..c20455ad1 100755 --- a/js/main.js +++ b/js/main.js @@ -292,7 +292,7 @@ $('body').css('cursor', 'auto'); } /* autocomplete @nicknames */ - $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); }); } From d3f83c93753791708b873df46b00d749f27ae7df Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 00:41:02 +0100 Subject: [PATCH 12/78] fixed broken tags and notifications in theme --- view/theme/diabook/nav.tpl | 34 +++++++++++++++++++------------- view/theme/diabook/style.css | 4 ++++ view/theme/diabook/wall_item.tpl | 4 ++-- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 80240f4ae..17df8e652 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -1,5 +1,5 @@
- {# $langselector #} + {# $langselector version 0.01#}
$sitelocation
@@ -18,7 +18,7 @@ {{ endif }} - + {{ if $nav.contacts }} + {{ endif }} - - + {{ if $nav.messages }} + {{ endif }} - - {{ if $nav.notifications }}
  • $emptynotifications
    • - {{ endif }} - - + {{ endif }} - + {{ if $nav.directory }} + {{ endif }} {{ if $nav.apps }} {{ endif }} + {{ if $nav.login }} +
  • + {{ endif }} - -
    • + + + + + {# diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 383fba24d..a58e79483 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -673,6 +673,10 @@ nav #nav-apps-link.selected { padding: 5px 10px; */ } +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + ul.menu-popup { position: absolute; display: none; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 1f1a878b4..c1205b01b 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -38,8 +38,8 @@
    - {{ for $item.tags as $item.tag }} - $item.tag + {{ for $item.tags as $tag }} + $tag {{ endfor }}
    From 705b4a00ce7d127d80da87f96aca3210476978c0 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 19:05:41 -0500 Subject: [PATCH 13/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fix @mention autocomplete in comments template proc: fix variables regexp * master: From 7ef861907e32cd3d01877c0fdf8e2544f4f659b1 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 2 Mar 2012 19:09:17 -0500 Subject: [PATCH 14/78] minor formatting issues Signed-off-by: Simon L'nu --- view/jot.tpl | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/view/jot.tpl b/view/jot.tpl index 2c1ce5ae1..2f89d4372 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -1,9 +1,9 @@
    -
     
    - +
     
    +
    - + @@ -11,9 +11,9 @@ - - - + + +
    -
    +
    - {{ if $content }}{{ endif }} - - - - From a66648356f9acfb0ba351c679337a616f0900096 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 2 Mar 2012 16:24:26 -0800 Subject: [PATCH 15/78] add diabook to default themes --- boot.php | 2 +- htconfig.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 19728b6ba..b464d2525 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1268' ); +define ( 'FRIENDICA_VERSION', '2.3.1269' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); diff --git a/htconfig.php b/htconfig.php index 01f56f2c4..423d5d369 100755 --- a/htconfig.php +++ b/htconfig.php @@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true; // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr'; +$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook'; // default system theme From 8f72d95b0e3e7a0da1702cf95cc40d0df1aef96d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 01:52:53 +0100 Subject: [PATCH 16/78] fix in wall_item.tpl new icon link.png --- view/theme/diabook/icons/link.png | Bin 0 -> 365 bytes view/theme/diabook/style.css | 5 +++-- view/theme/diabook/wall_item.tpl | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) create mode 100755 view/theme/diabook/icons/link.png diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png new file mode 100755 index 0000000000000000000000000000000000000000..0ef666a6730574ad7ead6cac69daec98de9c90ef GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfkqyxdVmXdb&77QWcaB!-eq+h|e(Spvo@wXz9B<=>V-#B%~QQIzOz243VKekIAkiHdh z-Z#qfvCFk$ls~#NWHW^4^aOeWrHWGXm&w22WQ%mvv4F FO#l|ylH>pY literal 0 HcmV?d00001 diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index a58e79483..1f148fe3a 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -102,6 +102,7 @@ .icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} .icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} +.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} .article { background-position: -50px 0px;} .audio { background-position: -70px 0px;} @@ -112,7 +113,7 @@ .camera { background-position: -170px 0px;} /*.dislike { background-position: -190px 0px;}*/ /*.like { background-position: -210px 0px;}*/ -.link { background-position: -230px 0px;} +/*.link { background-position: -230px 0px;}*/ .globe { background-position: -50px -20px;} .noglobe { background-position: -70px -20px;} @@ -160,7 +161,7 @@ display: block; width: 20px; height: 20px; - background-image: url('icons.png'); + /*background-image: url('icons.png');*/ } .icon { diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index c1205b01b..728e863e6 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -36,6 +36,7 @@
    + {{ if $item.plink }}$item.plink.title{{ endif }}
    {{ for $item.tags as $tag }} @@ -45,17 +46,11 @@
    - {{ if $item.plink }}$item.plink.title{{ endif }} +
    $item.location 
    - - {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - {{ endif }} {{ if $item.vote }} @@ -64,7 +59,14 @@ {{ if $item.vote.share }} - {{ endif }} + {{ endif }} + + {{ if $item.star }} + $item.star.do + $item.star.undo + $item.star.tagger + {{ endif }} +
    From d138d07c05900df4b67df99437ef628f4af6564d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 04:27:06 +0100 Subject: [PATCH 17/78] fixes in wall_item.tpl and style.css in theme diabook --- view/theme/diabook/icons/lock.png | Bin 0 -> 313 bytes view/theme/diabook/style.css | 17 +++++++++-------- view/theme/diabook/wall_item.tpl | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100755 view/theme/diabook/icons/lock.png diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png new file mode 100755 index 0000000000000000000000000000000000000000..e00c5b2a23503a5d4794ffd4d97bbd1ce75848c3 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgft z8S))6;Bk%T>S&BsDC90%cR)}wvZ`6hu;i_5RRiBttt2t`qQxp(rv8{T^@#nyZNi6T z#2>I$IP_G0ov)d|-xHXSv-sX@R@N&A1b;B_FJLUI+Q(G>H2cA{RS6e@e*3iU{nT6< zmZsmpysYQIl08pY%oO)D8rv=Z=d84Qud-QynM(Omv8Dz8r!LT1Vc$4;UEW#-htjAV)G~mcVDNPHb6Mw<&;$V1 C%W+!( literal 0 HcmV?d00001 diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 1f148fe3a..c98a8fa91 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -103,6 +103,7 @@ .icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} .icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");} .article { background-position: -50px 0px;} .audio { background-position: -70px 0px;} @@ -127,7 +128,7 @@ .share { background-position: -230px -20px;} .tools { background-position: -50px -40px;} -.lock { background-position: -70px -40px;} +/*.lock { background-position: -70px -40px;}*/ .video { background-position: -110px -40px;} .youtube { background-position: -130px -40px;} @@ -614,7 +615,7 @@ nav .nav-notify { border-radius: 5px 5px 5px 5px; font-size: 10px; font-weight: 900; - padding: 1px 3px; + padding: 1px 4px; top: 0px; right: -6px; min-width: 10px; @@ -1167,15 +1168,15 @@ section { padding-bottom: 2px; } .tag { - background: url("../../../images/tag_b.png") repeat-x center left; - color: #ffffff; + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #3465A4; padding-left: 3px; - font-size: 10px; + font-size: 12px; } .tag a { - padding-right: 8px; - background: url("../../../images/tag.png") no-repeat center right; - color: #ffffff; + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #3465A4; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 728e863e6..10d395316 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -5,6 +5,9 @@
    {{ endif }} + + +
    From 89f667ff76728d8e2fbfef0e40ee1ef8ccc53c18 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 04:45:34 +0100 Subject: [PATCH 18/78] fix star/unstar --- view/theme/diabook/icons/star.png | Bin 358 -> 339 bytes view/theme/diabook/icons/unstarred.png | Bin 339 -> 358 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png index ca20724143fd2ee28c363a47dc02268bea610c9a..32eff5a506c913598d177900dd5752777337e622 100755 GIT binary patch delta 250 zcmVkCi8I+ zhiIb2@|4kQksG0{uvf!FG%E3eReVMy^BuNB_k_nd-=`^BA-q91M6iQREMbVF(2TMT zePace*{dU5<96aJ9n@#7aszD?nW?}D*8JlK#=8JZuq3q&od5s;07*qoM6N<$g0{$Z AiU0rr delta 270 zcmV+p0rCFR0_FmcVSg1B8Gsbx`~Uy|=1D|BR5;7k)4fVVK@bJt&!iV51jICAVIN6j zl}2le^x_MM7QTkoAtH!{*k~RgVkhJYv=s}%U?uo3#%6?Nxn99a2bP^VJ7>@C%r5`Q z)-lFp3Qm*|7BPos3~_-|bjnof=!a6#XrcNYc{7qeVt&ZT?|&GC-_FUqN#YY`3e?+p zOyZR<@BMz@C%r5`Q z)-lFp3Qm*|7BPos3~_-|bjnof=!a6#XrcNYc{7qeVt&ZT?|&GC-_FUqN#YY`3e?+p zOyZR<@BMzkCi8I+ zhiIb2@|4kQksG0{uvf!FG%E3eReVMy^BuNB_k_nd-=`^BA-q91M6iQREMbVF(2TMT zePace*{dU5<96aJ9n@#7aszD?nW?}D*8JlK#=8JZuq3q&od5s;07*qoM6N<$g0{$Z AiU0rr From 83c25b4386f567835896af0455a6adce06718147 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 06:00:46 +0100 Subject: [PATCH 19/78] small fix in style.css --- view/theme/diabook/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c98a8fa91..c1eb3be5a 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -348,7 +348,9 @@ body { font-size: 13px; background-color: #ffffff; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin-left: : auto; + margin-right: auto; + margin-top: 50px; display: table; } h4 { @@ -1269,6 +1271,8 @@ section { color: #999999; border: 1px solid #DDD; padding: 0.3em; + margin-top: 30px; + margin-bottom: 10px; } #jot #jot-tools { margin: 0px; From 9d885c4801e74205dc958aaf4a17f44c4d9134d6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 3 Mar 2012 12:17:32 +0100 Subject: [PATCH 20/78] german strings as of 28th Feb from transilex --- view/de/messages.po | 144 ++++++++++++++++++++++---------------------- view/de/strings.php | 140 +++++++++++++++++++++--------------------- 2 files changed, 142 insertions(+), 142 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 5573ddca0..33adc8c76 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "POT-Creation-Date: 2012-02-24 22:44-0800\n" -"PO-Revision-Date: 2012-02-26 15:58+0000\n" -"Last-Translator: marmor \n" +"PO-Revision-Date: 2012-02-28 20:51+0000\n" +"Last-Translator: greeneyedred \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,13 +78,13 @@ msgstr "Kontakt-Einstellungen reparieren" msgid "" "WARNING: This is highly advanced and if you enter incorrect" " information your communications with this contact may stop working." -msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." +msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." #: ../../mod/crepair.php:138 msgid "" "Please use your browser 'Back' button now if you are " "uncertain what to do on this page." -msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was auf dieser Seite gemacht wird." +msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was du tun willst." #: ../../mod/crepair.php:144 msgid "Return to contact editor" @@ -303,7 +303,7 @@ msgstr "%s heißt %s herzlich willkommen" #: ../../mod/api.php:76 ../../mod/api.php:102 msgid "Authorize application connection" -msgstr "Verbindung der Applikation authorisieren" +msgstr "Verbindung der Applikation autorisieren" #: ../../mod/api.php:77 msgid "Return to your app and insert this Securty Code:" @@ -317,7 +317,7 @@ msgstr "Bitte melde dich an um fortzufahren." msgid "" "Do you want to authorize this application to access your posts and contacts," " and/or create new posts for you?" -msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte sowie die Erstellung neuer Beiträge in deinem Namen gestatten?" +msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:676 #: ../../mod/settings.php:681 ../../mod/settings.php:687 @@ -576,7 +576,7 @@ msgstr "Keine Ergebnisse." #: ../../mod/friendica.php:43 msgid "This is Friendica, version" -msgstr "Dies ist Friendica version" +msgstr "Dies ist Friendica, Version" #: ../../mod/friendica.php:44 msgid "running at web location" @@ -740,7 +740,7 @@ msgstr "Du hast dich hier bereits vorgestellt." #: ../../mod/dfrn_request.php:343 #, php-format msgid "Apparently you are already friends with %s." -msgstr "Es scheint so, als ob du bereits ein Freund von %s bist." +msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." #: ../../mod/dfrn_request.php:364 msgid "Invalid profile URL." @@ -766,7 +766,7 @@ msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." msgid "" "Incorrect identity currently logged in. Please login to " "this profile." -msgstr "Incorrect identity currently logged in. Please login to this profile." +msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an." #: ../../mod/dfrn_request.php:539 #, php-format @@ -784,7 +784,7 @@ msgstr "Bestätigen" #: ../../mod/dfrn_request.php:582 ../../include/items.php:2504 msgid "[Name Withheld]" -msgstr "[Name Zurückgehalten]" +msgstr "[Name unterdrückt]" #: ../../mod/dfrn_request.php:666 #, php-format @@ -811,7 +811,7 @@ msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jo #: ../../mod/dfrn_request.php:674 msgid "Please answer the following:" -msgstr "Bitte beantworte folgende Fragen:" +msgstr "Bitte beantworte Folgendes:" #: ../../mod/dfrn_request.php:675 #, php-format @@ -820,7 +820,7 @@ msgstr "Kennt %s dich?" #: ../../mod/dfrn_request.php:678 msgid "Add a personal note:" -msgstr "Eine persönliche Notiz anfügen:" +msgstr "Eine persönliche Notiz beifügen:" #: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76 msgid "Friendica" @@ -909,7 +909,7 @@ msgstr "Noch einmal testen" msgid "" "In order to install Friendica we need to know how to connect to your " "database." -msgstr "Um Friendica installieren zu können müssen wir wissen wie wir zu deiner Datenbank Kontakt aufnehmen können." +msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können." #: ../../mod/install.php:232 msgid "" @@ -947,7 +947,7 @@ msgstr "E-Mail-Adresse des Administrators" msgid "" "Your account email address must match this in order to use the web admin " "panel." -msgstr "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst." +msgstr "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst." #: ../../mod/install.php:245 ../../mod/install.php:283 msgid "Please select a default timezone for your website" @@ -971,7 +971,7 @@ msgstr "Kompletter Pfad zum PHP-Executable" #: ../../mod/install.php:331 msgid "Command line PHP" -msgstr "Kommadozeilen-PHP" +msgstr "Kommandozeilen-PHP" #: ../../mod/install.php:340 msgid "" @@ -1105,7 +1105,7 @@ msgstr "Zeitumrechnung" msgid "" "Friendika provides this service for sharing events with other networks and " "friends in unknown timezones." -msgstr "Friendica bietet diese Funktion an, um das teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann." +msgstr "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann." #: ../../mod/localtime.php:30 #, php-format @@ -1602,7 +1602,7 @@ msgstr "Administrator" msgid "" "Request could not be verified. (You may have previously submitted it.) " "Password reset failed." -msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." +msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." #: ../../mod/lostpass.php:82 ../../boot.php:723 msgid "Password Reset" @@ -1628,7 +1628,7 @@ msgstr "hier klicken, um dich anzumelden" msgid "" "Your password may be changed from the Settings page after " "successful login." -msgstr "Du kannst das Passwort in den Einstellungen ändern sobald du dich erfolgreich angemeldet hast." +msgstr "Du kannst das Passwort in den Einstellungen ändern, sobald du dich erfolgreich angemeldet hast." #: ../../mod/lostpass.php:118 msgid "Forgot your Password?" @@ -1764,7 +1764,7 @@ msgstr "Kein Name" #: ../../mod/settings.php:516 msgid "Remove authorization" -msgstr "Authorisierung entziehen" +msgstr "Autorisierung entziehen" #: ../../mod/settings.php:528 msgid "No Plugin settings configured" @@ -2044,31 +2044,31 @@ msgstr "Benachrichtigungs-E-Mail senden wenn:" #: ../../mod/settings.php:828 msgid "You receive an introduction" -msgstr "Du eine Kontaktanfrage erhältst" +msgstr "- du eine Kontaktanfrage erhältst" #: ../../mod/settings.php:829 msgid "Your introductions are confirmed" -msgstr "Eine deiner Kontaktanfragen akzeptiert wurde" +msgstr "- eine deiner Kontaktanfragen akzeptiert wurde" #: ../../mod/settings.php:830 msgid "Someone writes on your profile wall" -msgstr "Jemand schreibt etwas auf deine Pinnwand" +msgstr "- jemand etwas auf deine Pinnwand schreibt" #: ../../mod/settings.php:831 msgid "Someone writes a followup comment" -msgstr "Jemand verfasst auch einen Kommentar" +msgstr "- jemand auch einen Kommentar verfasst" #: ../../mod/settings.php:832 msgid "You receive a private message" -msgstr "Du erhältst eine private Nachricht" +msgstr "- du eine private Nachricht erhältst" #: ../../mod/settings.php:833 msgid "You receive a friend suggestion" -msgstr "Du eine Empfehlung erhältst" +msgstr "- du eine Empfehlung erhältst" #: ../../mod/settings.php:834 msgid "You are tagged in a post" -msgstr "Du wurdest in einem Beitrag erwähnt" +msgstr "- du in einem Beitrag erwähnt wurdest" #: ../../mod/settings.php:837 msgid "Advanced Page Settings" @@ -2082,7 +2082,7 @@ msgstr "Verwalte Identitäten und/oder Seiten" msgid "" "Toggle between different identities or community/group pages which share " "your account details or which you have been granted \"manage\" permissions" -msgstr "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen Seiten die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast." +msgstr "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast." #: ../../mod/manage.php:95 msgid "Select an identity to manage: " @@ -2182,14 +2182,14 @@ msgid "" "enjoyable. Click any item to visit the relevant page. A link to this page " "will be visible from your home page for two weeks after your initial " "registration and then will quietly disappear." -msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt sichtbar über Deine Pinnwand für zwei Wochen nach dem Registrierungsdatum und wird dann verschwinden." +msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden." #: ../../mod/newmember.php:16 msgid "" "On your Settings page - change your initial password. Also make a " "note of your Identity Address. This looks just like an email address - and " "will be useful in making friends on the free social web." -msgstr "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations Adresse. Diese sieht aus wie eine E-Mail Adresse und wird benötig um Freunschaften mit anderen im Friendica Netzwerk zu schliessen." +msgstr "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen." #: ../../mod/newmember.php:18 msgid "" @@ -2197,14 +2197,14 @@ msgid "" " directory listing is like having an unlisted phone number. In general, you " "should probably publish your listing - unless all of your friends and " "potential friends know exactly how to find you." -msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst ist das wie wenn niemand deine Telefonnummer kennt. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen wie man dich findet." +msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können." #: ../../mod/newmember.php:20 msgid "" "Upload a profile photo if you have not done so already. Studies have shown " "that people with real photos of themselves are ten times more likely to make" " friends than people who do not." -msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest als wenn du dies nicht tust." +msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust." #: ../../mod/newmember.php:23 msgid "" @@ -2216,7 +2216,7 @@ msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Faceboo msgid "" "If this is your own personal server, installing the Facebook addon " "may ease your transition to the free social web." -msgstr "Wenn dies dein privater Server ist könnte die Installation des Facebook Connectors deinen Umzug ins freie Soziale Netz angenehmer gestalten." +msgstr "Wenn dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten." #: ../../mod/newmember.php:30 msgid "" @@ -2251,7 +2251,7 @@ msgid "" "The Directory page lets you find other people in this network or other " "federated sites. Look for a Connect or Follow link on " "their profile page. Provide your own Identity Address if requested." -msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verteilten Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an falls du danach gefragt wirst." +msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst." #: ../../mod/newmember.php:40 msgid "" @@ -2835,7 +2835,7 @@ msgstr "Geschlossen" #: ../../mod/admin.php:304 msgid "Requires approval" -msgstr "Bedarf Zustimmung" +msgstr "Bedarf der Zustimmung" #: ../../mod/admin.php:305 msgid "Open" @@ -2889,7 +2889,7 @@ msgstr "Accounts gelten nach x Tagen als unbenutzt" msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." -msgstr "Verschwende keine System-Ressourcen fürs Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." +msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." #: ../../mod/admin.php:330 msgid "Allowed friend domains" @@ -2925,7 +2925,7 @@ msgstr "Gravatar Unterstützung" #: ../../mod/admin.php:339 msgid "Fullname check" -msgstr "Name auf Vollständigkeit überprüfen" +msgstr "Namen auf Vollständigkeit überprüfen" #: ../../mod/admin.php:340 msgid "UTF-8 Regular expressions" @@ -3095,11 +3095,11 @@ msgstr "Protokolldatei" msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." -msgstr "Webserver muss Schreibrechte besitzen. Relativ zum Friendica-Installationsverzeichnis." +msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." #: ../../mod/admin.php:856 msgid "Log level" -msgstr "Protokollevel" +msgstr "Protokoll-Level" #: ../../mod/admin.php:897 msgid "Close" @@ -3123,7 +3123,7 @@ msgstr "FTP Passwort" #: ../../mod/profile.php:15 ../../boot.php:845 msgid "Requested profile is not available." -msgstr "Profil nicht vorhanden." +msgstr "Das angefragte Profil ist nicht vorhanden." #: ../../mod/profile.php:111 ../../mod/display.php:67 msgid "Access to this profile has been restricted." @@ -3212,7 +3212,7 @@ msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." -msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." +msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." #: ../../mod/follow.php:79 msgid "" @@ -3475,7 +3475,7 @@ msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt" #: ../../mod/delegate.php:95 msgid "No potential page delegates located." -msgstr "Keine potentiellen Bevollmächtigte für die Seite gefunden." +msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden." #: ../../mod/delegate.php:121 msgid "Delegate Page Management" @@ -3486,7 +3486,7 @@ msgid "" "Delegates are able to manage all aspects of this account/page except for " "basic account settings. Please do not delegate your personal account to " "anybody that you do not trust completely." -msgstr "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib Niemandem eine Bevollmächtigung für deinen privaten Account dem du nicht absolut vertraust." +msgstr "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust." #: ../../mod/delegate.php:124 msgid "Existing Page Managers" @@ -3595,7 +3595,7 @@ msgstr "Um diese Einladung anzunehmen besuche bitte:" #: ../../mod/invite.php:104 msgid "You will need to supply this invitation code: $invite_code" -msgstr "Du benötigst den folgenden Einladungs Code: $invite_code" +msgstr "Du benötigst den folgenden Einladungscode: $invite_code" #: ../../mod/invite.php:104 msgid "" @@ -3604,7 +3604,7 @@ msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseit #: ../../mod/dfrn_confirm.php:238 msgid "Response from remote site was not understood." -msgstr "Antwort der entfernten Gegenstelle unverständlich." +msgstr "Antwort der Gegenstelle unverständlich." #: ../../mod/dfrn_confirm.php:247 msgid "Unexpected response from remote site: " @@ -3617,7 +3617,7 @@ msgstr "Bestätigung erfolgreich abgeschlossen." #: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271 #: ../../mod/dfrn_confirm.php:278 msgid "Remote site reported: " -msgstr "Entfernte Seite meldet: " +msgstr "Gegenstelle meldet: " #: ../../mod/dfrn_confirm.php:269 msgid "Temporary failure. Please wait and try again." @@ -3663,7 +3663,7 @@ msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." -msgstr "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal." +msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." #: ../../mod/dfrn_confirm.php:630 msgid "Unable to set your contact credentials on our system." @@ -3720,7 +3720,7 @@ msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website i msgid "" "Facebook conversations consist of your profile wall and your friend" " stream." -msgstr "Facebook-Konversationen sind alles, was auf deiner Pinnwand erscheint, und die Beiträge deiner Freunde (Stream)." +msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream." #: ../../addon/facebook/facebook.php:391 msgid "On this website, your Facebook friend stream is only visible to you." @@ -3752,7 +3752,7 @@ msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen ni #: ../../addon/facebook/facebook.php:408 msgid "Comma separated applications to ignore" -msgstr "Komma separierte Liste von Anwendungen die ignoriert werden sollen" +msgstr "Komma separiert Anwendungen, die ignoriert werden sollen" #: ../../addon/facebook/facebook.php:476 #: ../../include/contact_selectors.php:81 @@ -3858,7 +3858,7 @@ msgstr "Wörter, die gefiltert werden sollen (durch Kommas getrennt)" #: ../../addon/nsfw/nsfw.php:58 msgid "Use /expression/ to provide regular expressions" -msgstr "Verwende /expression/ um Reguläre Ausdrücke zu verwenden" +msgstr "Verwende /expression/ um reguläre Ausdrücke zu verwenden" #: ../../addon/nsfw/nsfw.php:74 msgid "NSFW Settings saved." @@ -3907,7 +3907,7 @@ msgid "" " storage (like ownCloud). See RemoteStorage" " WebFinger" -msgstr "Ermöglicht es deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger" +msgstr "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger" #: ../../addon/uhremotestorage/uhremotestorage.php:85 msgid "Template URL (with {category})" @@ -3957,7 +3957,7 @@ msgstr "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer msgid "" "The handicap game disables the center position on the middle level because " "the player claiming this square often has an unfair advantage." -msgstr "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt." +msgstr "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt, da der Spieler, der diese Ebene besitzt, oft einen unfairen Vorteil genießt." #: ../../addon/tictac/tictac.php:182 msgid "You go first..." @@ -4046,7 +4046,7 @@ msgstr "Datei hochladen" #: ../../addon/js_upload/js_upload.php:44 msgid "Drop files here to upload" -msgstr "Ziehe die Dateien hierher die du hochladen willst" +msgstr "Ziehe Dateien hierher, um sie hochzuladen" #: ../../addon/js_upload/js_upload.php:46 msgid "Failed" @@ -4166,7 +4166,7 @@ msgstr "Schnell-Kommentar Einstellungen" #: ../../addon/qcomment/qcomment.php:56 msgid "Enter quick comments, one per line" -msgstr "Gibt ein Schnell-Kommentar pro Zeile ein" +msgstr "Gib einen Schnell-Kommentar pro Zeile ein" #: ../../addon/qcomment/qcomment.php:74 msgid "Quick Comment settings saved." @@ -4188,7 +4188,7 @@ msgstr "Standard Zoom" #: ../../addon/openstreetmap/openstreetmap.php:72 msgid "The default zoom level. (1:world, 18:highest)" -msgstr "Standard Zoo,level (1: Welt; 18: höchstes)" +msgstr "Standard Zoomlevel (1: Welt; 18: höchstes)" #: ../../addon/editplain/editplain.php:46 msgid "Editplain settings updated." @@ -4245,7 +4245,7 @@ msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " "available. If you are useing one of them, please use these credentials. If " "not feel free to connect to any other StatusNet instance (see below)." -msgstr "Für einige StatusNet Server sind OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende doch bitte diese Schlüssel. Falls nicht kannst du weiter unten deine eigenen OAuth Schlüssel eintragen." +msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)." #: ../../addon/statusnet/statusnet.php:275 msgid "Provide your own OAuth Credentials" @@ -4309,7 +4309,7 @@ msgid "" "If enabled all your public postings can be posted to the " "associated StatusNet account. You can choose to do so by default (here) or " "for every posting separately in the posting options when writing the entry." -msgstr "Wenn aktiviert können all deine öffentlichen Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." +msgstr "Wenn aktiviert, so können all deine öffentlichen Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." #: ../../addon/statusnet/statusnet.php:331 msgid "" @@ -4317,7 +4317,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to StatusNet will lead the visitor to a blank page " "informing the visitor that the access to your profile has been restricted." -msgstr "Hinweis: Aufgrund deiner Privatsphären Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link der eventuell an an deinen StatusNet Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde." +msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." #: ../../addon/statusnet/statusnet.php:334 msgid "Allow posting to StatusNet" @@ -4409,7 +4409,7 @@ msgstr "Aktiviere \"Mehr zeigen\"" #: ../../addon/showmore/showmore.php:44 msgid "Cutting posts after how much characters" -msgstr "Begrenze Beiträge nach der Anzahl der Buchstaben" +msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben" #: ../../addon/showmore/showmore.php:64 msgid "Show More Settings saved." @@ -4441,7 +4441,7 @@ msgstr "Piwik Basis URL" msgid "" "Absolute path to your Piwik installation. (without protocol (http/s), with " "trailing slash)" -msgstr "Absoluter Pfad zu deiner Piwik Installation (ohen Protokoll (http/s) und mit abschließendem Schrägstrich)" +msgstr "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)" #: ../../addon/piwik/piwik.php:91 msgid "Site ID" @@ -4453,7 +4453,7 @@ msgstr "Link zum Setzen des Opt-Out Cookies anzeigen?" #: ../../addon/piwik/piwik.php:93 msgid "Asynchronous tracking" -msgstr "Asynchroned Tracken" +msgstr "Asynchrones Tracken" #: ../../addon/twitter/twitter.php:73 msgid "Post to Twitter" @@ -4480,7 +4480,7 @@ msgid "" "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" " be posted to Twitter." -msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten kopieren musst. Nicht vergessen, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht." +msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht." #: ../../addon/twitter/twitter.php:168 msgid "Log in with Twitter" @@ -4495,7 +4495,7 @@ msgid "" "If enabled all your public postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for" " every posting separately in the posting options when writing the entry." -msgstr "Wenn aktiviert können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." +msgstr "Wenn aktiviert, so können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." #: ../../addon/twitter/twitter.php:187 msgid "" @@ -4503,7 +4503,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to Twitter will lead the visitor to a blank page informing " "the visitor that the access to your profile has been restricted." -msgstr "Hinweis: Aufgrund deiner Privatsphären Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link der eventuell an an deinen Twitter Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde." +msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." #: ../../addon/twitter/twitter.php:190 msgid "Allow posting to Twitter" @@ -4648,7 +4648,7 @@ msgstr "Seriös, hat mein Vertrauen" #: ../../include/contact_selectors.php:56 msgid "Frequently" -msgstr "Häufig" +msgstr "immer wieder" #: ../../include/contact_selectors.php:57 msgid "Hourly" @@ -4656,7 +4656,7 @@ msgstr "Stündlich" #: ../../include/contact_selectors.php:58 msgid "Twice daily" -msgstr "Zweimal Täglich" +msgstr "Zweimal täglich" #: ../../include/contact_selectors.php:59 msgid "Daily" @@ -4856,7 +4856,7 @@ msgstr "Partner" #: ../../include/profile_selectors.php:33 msgid "Cohabiting" -msgstr "kohabitierend" +msgstr "zusammenlebend" #: ../../include/profile_selectors.php:33 msgid "Happy" @@ -5068,7 +5068,7 @@ msgid "" "A deleted group with this name was revived. Existing item permissions " "may apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." -msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest erstelle bitte eine andere Gruppe mit einem anderen Namen." +msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen." #: ../../include/group.php:168 msgid "Everybody" @@ -5184,7 +5184,7 @@ msgstr "Alle Benachrichtigungen anzeigen" #: ../../include/nav.php:120 msgid "Mark all system notifications seen" -msgstr "Markiere alle System Benachrichtigungen als gelesen" +msgstr "Markiere alle System-Benachrichtigungen als gelesen" #: ../../include/nav.php:124 msgid "Private mail" @@ -5356,7 +5356,7 @@ msgstr "Von: " #: ../../include/bbcode.php:202 msgid "$1 wrote:" -msgstr "$1 geschrieben:" +msgstr "$1 hat geschrieben:" #: ../../include/bbcode.php:216 ../../include/bbcode.php:282 msgid "Image/photo" @@ -5648,7 +5648,7 @@ msgstr "mag ich nicht" #: ../../include/conversation.php:522 msgid "Share this" -msgstr "Teilen" +msgstr "Teile dieses" #: ../../include/conversation.php:522 msgid "share" @@ -5676,7 +5676,7 @@ msgstr "Tag hinzufügen" #: ../../include/conversation.php:650 msgid "to" -msgstr "to" +msgstr "zu" #: ../../include/conversation.php:651 msgid "Wall-to-Wall" @@ -5731,7 +5731,7 @@ msgstr "%s mögen das nicht." #: ../../include/conversation.php:867 msgid "Visible to everybody" -msgstr "Für Jedermann sichtbar" +msgstr "Für jedermann sichtbar" #: ../../include/conversation.php:869 msgid "Please enter a video link/URL:" diff --git a/view/de/strings.php b/view/de/strings.php index 284c87f2f..a093b7068 100755 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -11,8 +11,8 @@ $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren. $a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Contact not found."] = "Kontakt nicht gefunden."; $a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren"; -$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; -$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was auf dieser Seite gemacht wird."; +$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; +$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was du tun willst."; $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; $a->strings["Name"] = "Name"; $a->strings["Account Nickname"] = "Account-Spitzname"; @@ -57,10 +57,10 @@ $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen"; $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: "; $a->strings["Remove"] = "Entfernen"; $a->strings["%s welcomes %s"] = "%s heißt %s herzlich willkommen"; -$a->strings["Authorize application connection"] = "Verbindung der Applikation authorisieren"; +$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; $a->strings["Please login to continue."] = "Bitte melde dich an um fortzufahren."; -$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte sowie die Erstellung neuer Beiträge in deinem Namen gestatten?"; +$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"; $a->strings["Yes"] = "Ja"; $a->strings["No"] = "Nein"; $a->strings["Photo Albums"] = "Fotoalben"; @@ -115,7 +115,7 @@ $a->strings["Recent Photos"] = "Neueste Fotos"; $a->strings["Not available."] = "Nicht verfügbar."; $a->strings["Community"] = "Gemeinschaft"; $a->strings["No results."] = "Keine Ergebnisse."; -$a->strings["This is Friendica, version"] = "Dies ist Friendica version"; +$a->strings["This is Friendica, version"] = "Dies ist Friendica, Version"; $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist"; $a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Bitte besuche Friendica.com um mehr über das Friendica Projekt zu erfahren."; $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; @@ -156,24 +156,24 @@ $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde s $a->strings["Invalid locator"] = "Ungültiger Locator"; $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden."; $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt."; -$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits ein Freund von %s bist."; +$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist."; $a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; $a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."; -$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Incorrect identity currently logged in. Please login to this profile."; +$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an."; $a->strings["Welcome home %s."] = "Willkommen zurück %s."; $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s."; $a->strings["Confirm"] = "Bestätigen"; -$a->strings["[Name Withheld]"] = "[Name Zurückgehalten]"; +$a->strings["[Name Withheld]"] = "[Name unterdrückt]"; $a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein."; $a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"; $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage"; $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; -$a->strings["Please answer the following:"] = "Bitte beantworte folgende Fragen:"; +$a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:"; $a->strings["Does %s know you?"] = "Kennt %s dich?"; -$a->strings["Add a personal note:"] = "Eine persönliche Notiz anfügen:"; +$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; $a->strings["Friendica"] = "Friendica"; $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; $a->strings["Diaspora"] = "Diaspora"; @@ -193,7 +193,7 @@ $a->strings["You may need to import the file \"database.sql\" manually using php $a->strings["Database import failed."] = "Import der Datenbank schlug fehl."; $a->strings["System check"] = "Systemtest"; $a->strings["Check again"] = "Noch einmal testen"; -$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können müssen wir wissen wie wir zu deiner Datenbank Kontakt aufnehmen können."; +$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können."; $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest."; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst."; $a->strings["Database Server Name"] = "Datenbank-Server"; @@ -201,13 +201,13 @@ $a->strings["Database Login Name"] = "Datenbank-Nutzer"; $a->strings["Database Login Password"] = "Datenbank-Passwort"; $a->strings["Database Name"] = "Datenbank-Name"; $a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators"; -$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst."; +$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst."; $a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone deiner Webseite"; $a->strings["Site settings"] = "Server-Einstellungen"; $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."; $a->strings["PHP executable path"] = "Pfad zu PHP"; $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Executable"; -$a->strings["Command line PHP"] = "Kommadozeilen-PHP"; +$a->strings["Command line PHP"] = "Kommandozeilen-PHP"; $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."; $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt."; $a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\""; @@ -235,7 +235,7 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Zeitumrechnung"; -$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."; +$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."; $a->strings["UTC time: %s"] = "UTC Zeit: %s"; $a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s"; $a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s"; @@ -351,13 +351,13 @@ $a->strings["No valid account found."] = "Kein gültiger Account gefunden."; $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail."; $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"; $a->strings["Administrator"] = "Administrator"; -$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."; +$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."; $a->strings["Password Reset"] = "Passwort zurücksetzen"; $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt."; $a->strings["Your new password is"] = "Dein neues Passwort lautet"; $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann"; $a->strings["click here to login"] = "hier klicken, um dich anzumelden"; -$a->strings["Your password may be changed from the Settings page after successful login."] = "Du kannst das Passwort in den Einstellungen ändern sobald du dich erfolgreich angemeldet hast."; +$a->strings["Your password may be changed from the Settings page after successful login."] = "Du kannst das Passwort in den Einstellungen ändern, sobald du dich erfolgreich angemeldet hast."; $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."; $a->strings["Nickname or Email: "] = "Spitzname oder Email:"; @@ -389,7 +389,7 @@ $a->strings["You can't edit this application."] = "Du kannst dieses Programm nic $a->strings["Connected Apps"] = "Verbundene Programme"; $a->strings["Client key starts with"] = "Anwender Schlüssel beginnt mit"; $a->strings["No name"] = "Kein Name"; -$a->strings["Remove authorization"] = "Authorisierung entziehen"; +$a->strings["Remove authorization"] = "Autorisierung entziehen"; $a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert"; $a->strings["Plugin Settings"] = "Plugin-Einstellungen"; $a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s"; @@ -458,16 +458,16 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; -$a->strings["You receive an introduction"] = "Du eine Kontaktanfrage erhältst"; -$a->strings["Your introductions are confirmed"] = "Eine deiner Kontaktanfragen akzeptiert wurde"; -$a->strings["Someone writes on your profile wall"] = "Jemand schreibt etwas auf deine Pinnwand"; -$a->strings["Someone writes a followup comment"] = "Jemand verfasst auch einen Kommentar"; -$a->strings["You receive a private message"] = "Du erhältst eine private Nachricht"; -$a->strings["You receive a friend suggestion"] = "Du eine Empfehlung erhältst"; -$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag erwähnt"; +$a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst"; +$a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde"; +$a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine Pinnwand schreibt"; +$a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst"; +$a->strings["You receive a private message"] = "- du eine private Nachricht erhältst"; +$a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst"; +$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest"; $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen"; $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; -$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen Seiten die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."; +$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."; $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: "; $a->strings["Search Results For:"] = "Suchergebnisse für:"; $a->strings["Remove term"] = "Begriff entfernen"; @@ -493,17 +493,17 @@ $a->strings["Personal Notes"] = "Persönliche Notizen"; $a->strings["Save"] = "Speichern"; $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; -$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt sichtbar über Deine Pinnwand für zwei Wochen nach dem Registrierungsdatum und wird dann verschwinden."; -$a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations Adresse. Diese sieht aus wie eine E-Mail Adresse und wird benötig um Freunschaften mit anderen im Friendica Netzwerk zu schliessen."; -$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst ist das wie wenn niemand deine Telefonnummer kennt. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen wie man dich findet."; -$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest als wenn du dies nicht tust."; +$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; +$a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."; +$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."; +$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."; $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst."; -$a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Wenn dies dein privater Server ist könnte die Installation des Facebook Connectors deinen Umzug ins freie Soziale Netz angenehmer gestalten."; +$a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Wenn dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten."; $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst."; $a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere dein Standard Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils."; $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen."; $a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten Neuen Kontakt hinzufügen ein."; -$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verteilten Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an falls du danach gefragt wirst."; +$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst."; $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."; $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."; $a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Unsere Hilfe Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."; @@ -634,7 +634,7 @@ $a->strings["Version"] = "Version"; $a->strings["Active plugins"] = "Aktive Plugins"; $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert."; $a->strings["Closed"] = "Geschlossen"; -$a->strings["Requires approval"] = "Bedarf Zustimmung"; +$a->strings["Requires approval"] = "Bedarf der Zustimmung"; $a->strings["Open"] = "Offen"; $a->strings["File upload"] = "Datei hochladen"; $a->strings["Policies"] = "Regeln"; @@ -647,7 +647,7 @@ $a->strings["Maximum image size"] = "Maximale Größe von Bildern"; $a->strings["Register policy"] = "Registrierungsmethode"; $a->strings["Register text"] = "Registrierungstext"; $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt"; -$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen fürs Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."; $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; $a->strings["Allowed email domains"] = "Erlaubte Domains für Emails"; $a->strings["Block public"] = "Öffentlichen Zugriff blockieren"; @@ -656,7 +656,7 @@ $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten V $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"; $a->strings["OpenID support"] = "OpenID Unterstützung"; $a->strings["Gravatar support"] = "Gravatar Unterstützung"; -$a->strings["Fullname check"] = "Name auf Vollständigkeit überprüfen"; +$a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen"; $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke"; $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen"; $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren"; @@ -700,14 +700,14 @@ $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert."; $a->strings["Clear"] = "löschen"; $a->strings["Debugging"] = "Protokoll führen"; $a->strings["Log file"] = "Protokolldatei"; -$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Relativ zum Friendica-Installationsverzeichnis."; -$a->strings["Log level"] = "Protokollevel"; +$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."; +$a->strings["Log level"] = "Protokoll-Level"; $a->strings["Close"] = "Schließen"; $a->strings["FTP Host"] = "FTP Host"; $a->strings["FTP Path"] = "FTP Pfad"; $a->strings["FTP User"] = "FTP Nutzername"; $a->strings["FTP Password"] = "FTP Passwort"; -$a->strings["Requested profile is not available."] = "Profil nicht vorhanden."; +$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; $a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt."; $a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; $a->strings["{0} wants to be your friend"] = "{0} möchte mit dir in Kontakt treten"; @@ -727,7 +727,7 @@ $a->strings["No compatible communication protocols or feeds were discovered."] = $a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; $a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; $a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können."; $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; $a->strings["following"] = "folgen"; @@ -791,9 +791,9 @@ $a->strings["Profile Image"] = "Profilbild"; $a->strings["visible to everybody"] = "sichtbar für jeden"; $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt"; -$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigte für die Seite gefunden."; +$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; -$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib Niemandem eine Bevollmächtigung für deinen privaten Account dem du nicht absolut vertraust."; +$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust."; $a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager"; $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; @@ -821,12 +821,12 @@ $a->strings["Send invitations"] = "Einladungen senden"; $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:"; $a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei"; $a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:"; -$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungs Code: \$invite_code"; +$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code"; $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"; -$a->strings["Response from remote site was not understood."] = "Antwort der entfernten Gegenstelle unverständlich."; +$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; $a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen."; -$a->strings["Remote site reported: "] = "Entfernte Seite meldet: "; +$a->strings["Remote site reported: "] = "Gegenstelle meldet: "; $a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."; $a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurück gezogen."; $a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern."; @@ -836,7 +836,7 @@ $a->strings["Our site encryption key is apparently messed up."] = "Der Verschlü $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."; $a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."; $a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."; -$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal."; +$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."; $a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."; $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden"; $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert"; @@ -849,13 +849,13 @@ $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen"; $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"; $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook"; $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"; -$a->strings["Facebook conversations consist of your profile wall and your friend stream."] = "Facebook-Konversationen sind alles, was auf deiner Pinnwand erscheint, und die Beiträge deiner Freunde (Stream)."; +$a->strings["Facebook conversations consist of your profile wall and your friend stream."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream."; $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."; $a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."; $a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"; $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren"; $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."; -$a->strings["Comma separated applications to ignore"] = "Komma separierte Liste von Anwendungen die ignoriert werden sollen"; +$a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen"; $a->strings["Facebook"] = "Facebook"; $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"; $a->strings["Post to Facebook"] = "Bei Facebook veröffentlichen"; @@ -885,7 +885,7 @@ $a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert"; $a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen"; $a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren"; $a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)"; -$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um Reguläre Ausdrücke zu verwenden"; +$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden"; $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; $a->strings["Login"] = "Anmeldung"; @@ -895,7 +895,7 @@ $a->strings["Most active users"] = "Aktivste Nutzer"; $a->strings["Last photos"] = "Letzte Fotos"; $a->strings["Last likes"] = "Zuletzt gemocht"; $a->strings["event"] = "Veranstaltung"; -$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Ermöglicht es deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger"; +$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger"; $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})"; $a->strings["OAuth end-point"] = "OAuth end-point"; $a->strings["Api"] = "Api"; @@ -906,7 +906,7 @@ $a->strings["New game"] = "Neues Spiel"; $a->strings["New game with handicap"] = "Neues Handicap Spiel"; $a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur dass man es auf mehreren Ebenen gleichzeitig spielt."; $a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen."; -$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt."; +$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt, da der Spieler, der diese Ebene besitzt, oft einen unfairen Vorteil genießt."; $a->strings["You go first..."] = "Du fängst an..."; $a->strings["I'm going first this time..."] = "Diesmal fange ich an..."; $a->strings["You won!"] = "Du gewinnst!"; @@ -928,7 +928,7 @@ $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert $a->strings["Geonames Settings"] = "Geonames Einstellungen"; $a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren"; $a->strings["Upload a file"] = "Datei hochladen"; -$a->strings["Drop files here to upload"] = "Ziehe die Dateien hierher die du hochladen willst"; +$a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen"; $a->strings["Failed"] = "Fehlgeschlagen"; $a->strings["No files were uploaded."] = "Keine Dateien hochgeladen."; $a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer"; @@ -956,12 +956,12 @@ $a->strings[":-)"] = ":-)"; $a->strings[":-("] = ":-("; $a->strings["lol"] = "lol"; $a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen"; -$a->strings["Enter quick comments, one per line"] = "Gibt ein Schnell-Kommentar pro Zeile ein"; +$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein"; $a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert"; $a->strings["Tile Server URL"] = "Tile Server URL"; $a->strings["A list of public tile servers"] = "Eine Liste öffentlicher Tile Server"; $a->strings["Default zoom"] = "Standard Zoom"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoo,level (1: Welt; 18: höchstes)"; +$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)"; $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert"; $a->strings["Editplain Settings"] = "Editplain Einstellungen"; $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren"; @@ -974,7 +974,7 @@ $a->strings["We could not contact the StatusNet API with the Path you entered."] $a->strings["StatusNet settings updated."] = "StatusNet Einstellungen aktualisiert."; $a->strings["StatusNet Posting Settings"] = "StatusNet-Beitragseinstellungen"; $a->strings["Globally Available StatusNet OAuthKeys"] = "Verfügbare OAuth Schlüssel für StatusNet"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende doch bitte diese Schlüssel. Falls nicht kannst du weiter unten deine eigenen OAuth Schlüssel eintragen."; +$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."; $a->strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen"; $a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
    Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."; $a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; @@ -987,8 +987,8 @@ $a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen"; $a->strings["Current StatusNet API is"] = "Derzeitige StatusNet-API-URL lautet"; $a->strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen"; $a->strings["Currently connected to: "] = "Momentan verbunden mit: "; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert können all deine öffentlichen Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link der eventuell an an deinen StatusNet Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde."; +$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, so können all deine öffentlichen Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; @@ -1011,25 +1011,25 @@ $a->strings["WordPress API URL"] = "WordPress-API-URL"; $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen"; $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\""; -$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach der Anzahl der Buchstaben"; +$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"; $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert."; $a->strings["Show More"] = "\"Mehr zeigen\""; $a->strings["This website is tracked using the Piwik analytics tool."] = "Diese Website benutzt Piwik, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; $a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du ein Cookie setzen. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)."; $a->strings["Piwik Base URL"] = "Piwik Basis URL"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohen Protokoll (http/s) und mit abschließendem Schrägstrich)"; +$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"; $a->strings["Site ID"] = "Seiten ID"; $a->strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out Cookies anzeigen?"; -$a->strings["Asynchronous tracking"] = "Asynchroned Tracken"; +$a->strings["Asynchronous tracking"] = "Asynchrones Tracken"; $a->strings["Post to Twitter"] = "Bei Twitter veröffentlichen"; $a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert."; $a->strings["Twitter Posting Settings"] = "Twitter-Beitragseinstellungen"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten kopieren musst. Nicht vergessen, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; +$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; $a->strings["Log in with Twitter"] = "bei Twitter anmelden"; $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link der eventuell an an deinen Twitter Account weitergeleitete angehangen wird um auf den original Artikel zu verweisen den Betrachter auf eine leere Seite führen, auf der er darüber informiert wird, dass der Zugriff eingeschränkt wurde."; +$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, so können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; $a->strings["Consumer key"] = "Consumer Key"; @@ -1065,9 +1065,9 @@ $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdars $a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; $a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos"; $a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen"; -$a->strings["Frequently"] = "Häufig"; +$a->strings["Frequently"] = "immer wieder"; $a->strings["Hourly"] = "Stündlich"; -$a->strings["Twice daily"] = "Zweimal Täglich"; +$a->strings["Twice daily"] = "Zweimal täglich"; $a->strings["Daily"] = "Täglich"; $a->strings["Weekly"] = "Wöchentlich"; $a->strings["Monthly"] = "Monatlich"; @@ -1117,7 +1117,7 @@ $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Verlobt"; $a->strings["Married"] = "Verheiratet"; $a->strings["Partners"] = "Partner"; -$a->strings["Cohabiting"] = "kohabitierend"; +$a->strings["Cohabiting"] = "zusammenlebend"; $a->strings["Happy"] = "Glücklich"; $a->strings["Not Looking"] = "Nicht auf der Suche"; $a->strings["Swinger"] = "Swinger"; @@ -1171,7 +1171,7 @@ $a->strings["Attachments:"] = "Anhänge:"; $a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"; $a->strings["Embedded content"] = "Eingebetteter Inhalt"; $a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; -$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest erstelle bitte eine andere Gruppe mit einem anderen Namen."; +$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."; $a->strings["Everybody"] = "Alle Kontakte"; $a->strings["edit"] = "bearbeiten"; $a->strings["Groups"] = "Gruppen"; @@ -1200,7 +1200,7 @@ $a->strings["People directory"] = "Nutzerverzeichnis"; $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte"; $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; -$a->strings["Mark all system notifications seen"] = "Markiere alle System Benachrichtigungen als gelesen"; +$a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen"; $a->strings["Private mail"] = "Private Email"; $a->strings["Manage"] = "Verwalten"; $a->strings["Manage other pages"] = "Andere Seiten verwalten"; @@ -1245,7 +1245,7 @@ $a->strings["second"] = "Sekunde"; $a->strings["seconds"] = "Sekunden"; $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her"; $a->strings["From: "] = "Von: "; -$a->strings["$1 wrote:"] = "$1 geschrieben:"; +$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Image/photo"] = "Bild/Foto"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln."; $a->strings["[no subject]"] = "[kein Betreff]"; @@ -1312,14 +1312,14 @@ $a->strings["%d comment"] = array( $a->strings["show more"] = "mehr anzeigen"; $a->strings["like"] = "mag ich"; $a->strings["dislike"] = "mag ich nicht"; -$a->strings["Share this"] = "Teilen"; +$a->strings["Share this"] = "Teile dieses"; $a->strings["share"] = "Teilen"; $a->strings["add star"] = "markieren"; $a->strings["remove star"] = "Markierung entfernen"; $a->strings["toggle star status"] = "Markierung umschalten"; $a->strings["starred"] = "markiert"; $a->strings["add tag"] = "Tag hinzufügen"; -$a->strings["to"] = "to"; +$a->strings["to"] = "zu"; $a->strings["Wall-to-Wall"] = "Wall-to-Wall"; $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; @@ -1331,7 +1331,7 @@ $a->strings["and"] = "und"; $a->strings[", and %d other people"] = " und %d andere"; $a->strings["%s like this."] = "%s mögen das."; $a->strings["%s don't like this."] = "%s mögen das nicht."; -$a->strings["Visible to everybody"] = "Für Jedermann sichtbar"; +$a->strings["Visible to everybody"] = "Für jedermann sichtbar"; $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:"; $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:"; $a->strings["Tag term:"] = "Tag:"; From 60adef24634f3df6c9f0161128e10cb778e5316e Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 13:27:39 +0100 Subject: [PATCH 21/78] fix text-editor in theme --- view/theme/diabook/icons/attach.png | Bin 0 -> 862 bytes view/theme/diabook/icons/audio.png | Bin 0 -> 655 bytes view/theme/diabook/icons/camera.png | Bin 0 -> 568 bytes view/theme/diabook/icons/globe.png | Bin 0 -> 680 bytes view/theme/diabook/icons/unglobe.png | Bin 0 -> 659 bytes view/theme/diabook/icons/unlock.png | Bin 0 -> 314 bytes view/theme/diabook/icons/video.png | Bin 0 -> 373 bytes view/theme/diabook/icons/weblink.png | Bin 0 -> 305 bytes view/theme/diabook/jot.tpl | 83 +++++++++++++++++ view/theme/diabook/style.css | 128 +++++++++++++++++++++++++-- 10 files changed, 204 insertions(+), 7 deletions(-) create mode 100755 view/theme/diabook/icons/attach.png create mode 100755 view/theme/diabook/icons/audio.png create mode 100755 view/theme/diabook/icons/camera.png create mode 100755 view/theme/diabook/icons/globe.png create mode 100755 view/theme/diabook/icons/unglobe.png create mode 100755 view/theme/diabook/icons/unlock.png create mode 100755 view/theme/diabook/icons/video.png create mode 100755 view/theme/diabook/icons/weblink.png create mode 100755 view/theme/diabook/jot.tpl diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png new file mode 100755 index 0000000000000000000000000000000000000000..4412d94a5ffab35a4ddba456a416ac3b79444085 GIT binary patch literal 862 zcmV-k1EKthP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY# z3mrHo2AHV;00Q1gL_t(Y$JN%&ib`{x39O)Ij!Sc!f-U*w-)AT~=&)Z=(8@+TvkoC$1st7d!Sz`1xXvT1ydC9&zp z>&0dyH6BV$f5&Gt4fXC~xTkYHrPe@vVeV@K|dcGOBxRru=(NB$ub6)=B`)DUEjrl zzpVWwB_F0k;nqS=`@$+PFM1O>dkcdhf?CUOacvuH6MilEUsKNda9_M{y7A16%S7SR z!JKa`U|-{gHrUF%T}_MM*rk!qE?|8DpKL`o7~tlq8pGOdUHJ%3MsfWtM6eLA;kQ=J z1_Cx!C~kPBOCAs4(ZUwp*5b7Ibc?(%#v29f0B-v`ub&9u54d6moh7AHyOH;FiR|{- z`0}9u{(-x@oDYJg!gWW2l2) z(yiOeyVmgOs?b4*4fy8Y`1n01`@g^b1V082AR4fp2LJ#707*qoM6N<$f_jLM)Bpeg literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png new file mode 100755 index 0000000000000000000000000000000000000000..075e04734d041a2d49c748910da5429e507d5f1c GIT binary patch literal 655 zcmV;A0&x9_P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY# z3o8R35#aa$00Iw5L_t(Y$IaHeYgADX2Jqiz&1z61h>Zp;jSxglz{2p6BDVZxJ`r)wc8L$zM9BAIQsSNnX@?Qd0I*8ZSw$Z)3!Ul%$2v2b?YOY;A zyunr6Koxs&v0c(E<9h7=J)UC%wKjk|F^_Rvj*@v&MSc#e?0mg%ZqmN8Tsc*6DE^m&x(We)jo)L~hdcPvqHfJB)WP&aJdQK9vsJ!pq*KK zi(1P9sEQwWi~CW(H*pf*@em6|+2R>41)*MxmEMX*a3Xd-fDd>VP2n+4h5tgt=t!<$ zE+N`an2KEwM%x;Xh5Sr1dM7FbuY$8!X#ltqbA@QET)<|3P|O9Kj{D1Zqt$5o%aOfZ%NXuqslcmkDQw4j0i160 p7Hy=T?&Z~1Yx6p2q;E;oe*l%fv9OV7MP2{^002ovPDHLkV1o857#9El literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png new file mode 100755 index 0000000000000000000000000000000000000000..8769cc82f4aa697856e93adc4482ac452ad074c5 GIT binary patch literal 568 zcmV-80>}M{P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY# z3m7awtGJN>00Fp3L_t(Y$L-d!YZOrs2Jqh{Dsn_HUS%N&fVk4xou}n}nkOb@u2!?PbI2?p-W~ca!VW&*W+a z>?Lp3!#X~MuScwU)4f>;ZbYwpcp0&y@G@e(z-+Yf&1HrDwp)|Gn#7A)2%d@OZ|v6O`#AUu+j?P}{1a9Jdmo$l9=?ftky{Du)Q4t-S6E1h zpN3Z(SqRK%TEXhV4)7dHH5FQl+#qKj=giVH{tmD4E4i0X@F16?6N@iQAZo$^pT-CC zIE@=|v^y;y>YR`HxcE=JsAl7{INIeu@`KRmp8O}Bx%~lZZY?QY_RBl~0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY# z3o9YYaiJUl00JmUL_t(Y$JN$fXis4n2k_5qBSYrj{LLuZoe@#Ekiyzhl4Qk7bD_2? zu0@o@jh1r7g$s8IwQwc3YDI43Pnw}EW|@T=`?+~mZ@)G>=T|@Rt;2)T3kf|U&C=(u^8{dVFCN{hBZ$} zE6{-D$yf_!m&;*o#4@rpEmdjxsw%`Y@V>rf}P?L3$s>sRe5W(04 zHe;B9-SIvgN?ng;>_HFuCJ|6YT!VNC?Gd6vhU*s|#X_z4mXY@vUD2h$65Nc5)bJ-p zFcfvyhm*lsh~5|Vz5xXzO zgG3k|ahjA=hod3oarEL9=Ho0j#&~zw&BNOeQOP(Eiw)v5HsF4|_uv@n6S16{stHt1 z;c$N>e>iHc6+1$COVJpiUxx+Jg`T3nl-)JpRw9}&@jMtp=}G2BlDUJWhVyXbBrW8} z=!~Y_j5`x_m2;&!JYUo??qXMw%_>~M`^2_8`fM(&30o)GWBD{`%nhEtmDg~91lKOw*xBWL~y002%1A!C( O00005HqI$ literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png new file mode 100755 index 0000000000000000000000000000000000000000..ddcdfa23ca995378a141ed5db286edeb7538f28d GIT binary patch literal 659 zcmV;E0&M+>P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY# z3oIrZRHAqQ00I+9L_t(Y$Gz4~h)rP_2k_r@XBcF{jAq7XsA(*GG|deOMOnGiXM4MEc(WyMhws1Q6OVSgVr~j^H3B zF_E)&6%L>^0V`n~uka*iZ!_j&qzS*G`i^BzUd>XlnV`i$PVtoDc^_k9!zNtEyKs^> zrmMVH8=r6!y;ziJsW|A3kic?1oa@9{ybVXQrF05ka1rYZwmoIst?>@0@ES}1h4}43_?a3x zy*%Wukd?4C1YtUd2HE>Pgr*`9wqjqTwUmi+3_mggP_e1?uWlq1 tr=?o2$_jW-+~d=N9PSDZkK#@G;V-b3x-tFUZ`l9<002ovPDHLkV1iIG9cTam literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png new file mode 100755 index 0000000000000000000000000000000000000000..3d65430879dfc24d28653c24f83c99240c410cb0 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfWfFK%merPZ!4!i_=>t z*>W9n5NO@s+tjgLV9lPUz2P4^rezi}vvzOET&t_Y%KWPDY>!G}`DbQ3iD`4Ue}2Ym zec>3J1+&})w~DjtJrnq@%srHM<=48<6paSf4~%^WIA^@9WtW+v-%xwvVDRoc%6$1& zr<9*1a9cc(6|B(IH*C}vPGCAcul(BG55-BIGcVj>OcA`qQXAi_vv3}>w(Z>r#)csA zQL70(Y)*K0-AbW|YuPgfb+z!*;kxXXC8mTt!K~|9;xy`f93m}sd;<( z|L0s9uWeL4K98mUYtqny! zizG`f{a#r!3T~3d=mY`i6v&hgkAm#3V(bfa2;B5pkQ6-2)1bzJ>nzCH^r&&c)dIDv zWYq8fpqB#{bZo8YHc@W8juq#yZj2`ntw7y9mPAfOEJ}j4d +
    +
     
    +
    +
    +
    + +
    + + + + + + + + + + + + +
    + +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    + +
    +
    + +
    + + +
    + $bang +
    + + + + +
    + + +
    + $jotplugins +
    + +
    + +
    + + + +
    +
    + $acl +
    +
    $emailcc
    +
    + $jotnets +
    +
    + + +
    + +
    +
    +
    + {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c1eb3be5a..c497beffd 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -104,20 +104,46 @@ .icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} .icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} .icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");} + +.camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + + + .article { background-position: -50px 0px;} -.audio { background-position: -70px 0px;} +/*.audio { background-position: -70px 0px;}*/ .block { background-position: -90px 0px;} /*.drop { background-position: -110px 0px;}*/ /*.drophide { background-position: -130px 0px;}*/ .edit { background-position: -150px 0px;} -.camera { background-position: -170px 0px;} +/*.camera { background-position: -170px 0px;}*/ /*.dislike { background-position: -190px 0px;}*/ /*.like { background-position: -210px 0px;}*/ /*.link { background-position: -230px 0px;}*/ -.globe { background-position: -50px -20px;} -.noglobe { background-position: -70px -20px;} +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ .no { background-position: -90px -20px;} .pause { background-position: -110px -20px;} .play { background-position: -130px -20px;} @@ -130,10 +156,10 @@ .tools { background-position: -50px -40px;} /*.lock { background-position: -70px -40px;}*/ -.video { background-position: -110px -40px;} +/*.video { background-position: -110px -40px;}*/ .youtube { background-position: -130px -40px;} -.attach { background-position: -190px -40px;} +/*.attach { background-position: -190px -40px;}*/ .language { background-position: -210px -40px;} @@ -1280,9 +1306,10 @@ section { height: 40px; overflow: none; width: 783px; - background-color: #0e232e; + background-color: #fff; border-bottom: 2px solid #9eabb0; } + #jot #jot-tools li { list-style: none; float: left; @@ -1379,7 +1406,94 @@ section { line-height: 20px; padding-right: 20px; } +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 685px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 675px; +} + +#profile-jot-submit { + float: left; +} +#profile-upload-wrapper { + float: left; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; +} +#profile-rotator { + float: left; + margin-left: 30px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; +} +#jot-preview-link { + float: left; + margin-left: 10px; + margin-top: 0px !important; +} + /** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; +} +.button.creation2 { + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; +} /*input[type="submit"] { border: 0px; background-color: @ButtonBackgroundColor; From b3ba2eb4d08102adfa7f69115d298e6b2e3e0563 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 15:01:25 +0100 Subject: [PATCH 22/78] fix editor --- view/theme/diabook/jot.tpl | 8 ++++---- view/theme/diabook/style.css | 40 +++++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index bb0f4b6d0..e83d0f86c 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -44,13 +44,13 @@
    + + + +
    $bang
    - - - -
    diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c497beffd..df586c770 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1290,7 +1290,7 @@ section { width: 785px; margin: 0px 2em 20px 0px; } -#jot .profile-jot-text { +#profile-jot-form #profile-jot-text { height: 1.2em; width: 99%; font-size: 10px; @@ -1378,7 +1378,7 @@ section { #jot #jot-tools li.loading img { margin-top: 10px; } -#jot #jot-title { +#profile-jot-form #jot-title { border: 0px; margin: 0px; height: 20px; @@ -1386,12 +1386,16 @@ section { font-weight: bold; border: 1px solid #ffffff; } -#jot #jot-title:-webkit-input-placeholder { +#profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; } -#jot #jot-title:-moz-placeholder { +#profile-jot-form #jot-title:-moz-placeholder { font-weight: normal; } +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 785px; + height: 100px; + } #jot #jot-title:hover { border: 1px solid #999999; } @@ -1424,59 +1428,75 @@ section { } #profile-jot-wrapper{ margin: 0 2em 20px 0; - width: 685px; + width: 785px; } #profile-jot-submit-wrapper { margin-bottom: 50px; - width: 675px; + width: 785px; } #profile-jot-submit { - float: left; + float: right; + margin-top: 2px; + } #profile-upload-wrapper { float: left; + margin-top: 2px; + margin-left: 10px; } #profile-attach-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-rotator { float: left; margin-left: 30px; + margin-top: 2px; } #profile-link-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-youtube-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-video-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-audio-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-location-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-jot-perms { float: left; margin-left: 45px; + margin-top: 2px; } #jot-preview-link { - float: left; + float: right; margin-left: 10px; - margin-top: 0px !important; + margin-top: 2px; } - +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } /** buttons **/ .button.creation1 { background-color: #fff; From 83e9f57459ddc0f7602f3c72d937d7a48e76b6b5 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 16:49:48 +0100 Subject: [PATCH 23/78] fixed admin fixed editor --- view/theme/diabook/icons/attach.png | Bin 862 -> 1069 bytes view/theme/diabook/icons/audio.png | Bin 655 -> 762 bytes view/theme/diabook/icons/camera.png | Bin 568 -> 685 bytes view/theme/diabook/icons/globe.png | Bin 680 -> 875 bytes view/theme/diabook/icons/toogle_off.png | Bin 0 -> 391 bytes view/theme/diabook/icons/toogle_on.png | Bin 0 -> 429 bytes view/theme/diabook/icons/unglobe.png | Bin 659 -> 798 bytes view/theme/diabook/icons/unlock.png | Bin 314 -> 362 bytes view/theme/diabook/icons/video.png | Bin 373 -> 472 bytes view/theme/diabook/icons/weblink.png | Bin 305 -> 505 bytes view/theme/diabook/style.css | 4 ++-- 11 files changed, 2 insertions(+), 2 deletions(-) create mode 100755 view/theme/diabook/icons/toogle_off.png create mode 100755 view/theme/diabook/icons/toogle_on.png diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png index 4412d94a5ffab35a4ddba456a416ac3b79444085..1958041cfa9def91dc1bb73f947d823d67413afd 100755 GIT binary patch delta 986 zcmV<0110?42CWE?VSf)D8uf2+kpKV#tw}^dR7l6w)@g{x*bXQ%LeCVP&hdNS2YA=8~F5&_b95B?VcTW)B&Km6=keWrb2CQkWr)l!}-X zGm^Hvc_#i0t8F#eMi0GjU7WU%_0o&S#2Wm8)e-wg)^mQre&gW+jfj(>4kAX9K>+TX_5h}c|8>7B)M zIhwI1BAU@J*Y2s?59~BNRte*B+>NaX8=w950Y*l|_EO5Rcmg-&o<(`VUU&;9Vr9dA zntBcfrRlxgxD}HVwhtd;ctq^VJk7<(+!J^Jzo*B2u^Ug-wShI_1zeJ*cW_UJu?qVX zgCk;hDSxFSUdkr#h*xoc=5Iy<_hMy43~Z>t`edbDl%_Yc8h2(c$7LATVo1X3u@Hk3 zwg8h7FbkvetZ#9B+oD;B3-b5tn4BtqdZqt9!q9}(;Wb==&N&$-=A~v=U>h(ZBDQH& z_)^Lo3`rpl%#4UHp;oJH$2REO>Tb!Ql!$S${h*g*x5v$re zr+=X`ggfL-+k^GW>KoIJc+bM9if7X!V&(oWUXP~yeG<-Y2iBPVH?AG=o}S{}nzN}9 zvEo4b+<+C>fkxbw6}UdVJptELM0#1mcUGEOuAdMQA0E^1-bqA3R7l6w*3FBSWfTVRpH?s#(xjz*%=BT2 znK@PzNi;$q3wMza1?`I3wCW#-iU=x5P%5J@i;A%_EifA`QZtxMwh3F95D6}V$VD?_ zb!DU#CN3j!ouoZX4=7H#*!qdHgtxBpIu=kSMOOnbHt@<6r9XKz#9UPl0 z*bqJ{m+izdTz`mHTOd2|W66M|w$Yh&tw|#^2D?&=3-D5rzl&RNJ+?)*KQ+B~u7IoY zeo-F9)oF;$MZO~u!*!`+CnZ>b`{x39O)Ij!Sc!f-U*w-)AT~=&)Z=(8@+TvkoC$1s zt7d!Sz`1xXvT1ydC9&zp>&0dyH6BV$f5&Gt4fXC~xPPaBJzHA*Ksr#;_I57qBs0t6 z%nOm7z+G*yfq313?M}`5OJt|;RUCk`(j-$k-xjBrVoRa8(Kgsc__Ba~oIyVy8%r7w z7O?r@)5$Uhm*%cl%3a^ZfxoQ%B_$uGL*dp!Py50uFfV!&IeQC(A%a@VZ*grKY!iMh z`Cn7c`hRd=yl=Yk%#6!K;nTsKZ!KV72u?Mc_~zgE_&q24zrX$jKL!pU8nB%Q00000NkvXX It^-0~g4Do)O#lD@ diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png index 075e04734d041a2d49c748910da5429e507d5f1c..8d779a4097b0b1c75cdac9c0f768cd797187545b 100755 GIT binary patch delta 677 zcmV;W0$Tl#1^NY$VSf)DH?XiRZo1up8sjnswWKj5}xp&;!QETOBm3u(nJN)eT(*rFRZ zK@4dFNt!0(<_tW>Oy*4{3-4y$oO|y1-g|z0&uOT+QcC-934ib6*$~g;Dn8CR|5e9M zqbAsXe1$RW#O&-H6)SiGR!Z21oIaQ+f zPsSo{&3*v)U|+?(jSiXKl8;yP2UALW>H@avX#|6~)qjD$s^2%_+}=tjnyU-=Fn$k2 zv%Q1|9mpGg$ER_@sg^9~yjqvMuLan_DEgcD1gG&*xElVB%U!_}9LEdzGi>Mu@FYg@ zUX;m)K?IX=nF0KS`#}oRI27mabpl+sd0KSNq@g^QcJTq^MT>av}U=CHFUirKO(7dQRFl+pyw#fUiG zHnp{X{}!1!opb(WvoTD#xWO=0o!Z7jcLAFQTpq6Bjm8FN{qQY7{u00000 LNkvXXu0mjfX1i8c delta 569 zcmV-90>=IN1&;-gVSfuN10NCK_y7O`4@pEpR7l6o*1Ky|Q4j|3-)7BfP$P(q1}u#b zL`}fL_y7^@ECjI@|Ac^c0UHbJG=d_QHbO+L#6nU8ArVm_prT-xA`hZ$mSnv)BOEUK zxcfjHIPBdyGxMFt%zTI9GJ*$KLl$E#bR+sKN3n=iY$t%*p?_Npo4&|l%p@Qge#c04 zGhy4aoX2_&tkL&+*tV1%1ps$rID$ecnJXpw;jrx)un~|PXx_G|4EV?LUjkM-h}YJ( z(Y?IF28QqmPjN14u3bL7!ByNq6?<{9UD7P$dhGr^o?`;FHh?=Zk8xa%l6g|(ScdR1 zGVV4ea|PaNOn-(?7BO}exx*^z$&qh$aEDvTHPx}%OO|F$>MSc#e?0mg%ZqmN8Tsc*6DE^m&x(We)jo)L~hdcPvqHfJ zB)WP&aJdQK9vsJ!pq*KKi(1P9sEQwWi~CW(H*pf*@qZ8tMcLvRE(M`pikA?h9GI}n2yOJ|_nFQO!ujsWK@m)*i zUxZIjY%&@ElET{R7l6|mcMHhQ4q&Jd$*_r#UIybAt+*m zB|!tx!l<>7Mi?zbusmYnKcIyON6JL75DwCaVxa>T+F00}3Mm8+!9!6Z7es^@F^6El zg7xVB-2ZBPD@ipY83BCrEkacf6_1CEdg(a*qp z7hn-+0S{F5QDS1(fnx!p7|X-H0V>5T%kBXqIUADyD8g<$dx67gKO1@5S7wWD>)z!j^|qAQkB zV5T$ZH1eIi2Fj{h7m)#AtNE8zwJIXBKovOA!FDk4%+)w*TV z3|5thv;&yOzy)9@a09psth#`212=)6z(e3%9$8F=Eq_)01MGJ5wBYuh1a=vw6(Wlf z^w|t_Ss!%%)qV(WvHLIJLznegJ5G;Xm*Aj?jH&7u`*PHPuXfddNmXr%$e3lDYiWew z5HKMkbya;XBFn%*TbonWmm;zqm@w?Rs&uVke^{U0Rn>PLjh_LRfwC1=?ilofy@1~T z6u1w3w@~L2a0wWX=%>V*f83GB4tVchEC5r$LSTT$e4;{o7l5e(Fm2Of lX#;=OmP})M^S`z4_7`exrR*Z0KUV+%002ovPDHLkV1keo4zd6M delta 481 zcmV<70UrLX1-Jx|VSfu4EI_NckpKVzxJg7oR7l6|*0F08Q4j|3-z6$?L@-`uAqav( zFxndxv_6BYY@uxNt-wxYtN4r}L$Co384(pZ}^gIa2`Xv!P`n~r=?V7rZ-`C@DR3-Nq!vR?X)*dWt*g= zmF?prF5+$#JXO=rCZc_O#VCHC#T8si4pxQzf%mwc3d$_aVf0|FW?Lp3!#X~MuScwU)4f>;ZbYwpcp0&y@G@e(z-+Yf&1HrDwp)|Gn#7A)2%d@OZ|v6O`#AUu+j?P}{1a9Jdmo$l z9=?ftky{Du)Q4t-S6E1hpN3Z(SqRK%TEXhV4)7dHHCh!~irgS)9_P%`H2w~+@hiEP zPw*g@qZ5lSOdx8)0iVVP^EizgakM)vAL^Ws`MCH`yr^d5vpCx2Kk|dn=$`y1ow@x1 XYHlqlUG~d700000NkvXXu0mjf+}P>O diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png index daec0c256b02d670daa6c77b53691dc2a9cfc3b5..bf27a8f3f6f50fc23c2c3a97a12036e219a3b5bb 100755 GIT binary patch delta 791 zcmV+y1L*vy1?vWoVSf)EBKAO<%m4ra>q$gGR7l6o)mw;_RTKyC-;7$4WhtnI5e15| zyFl3m0|^q!GA-CI_7YJLJq%JvRG3r-^=uK*g9Z^5#EOWtqPL!cLNTaqSPxlEnQ4PM zshDFgYv6Fu@f_hq8$P~|b=m)K-TsUJ_zd;yP-~rqSFk=J#((o={#eWY^;OR%s*yefeQ65%CTzs|E7 z=M4(*;*R=_=6eAa4+?NTZpATd#i5k1thHXy^WfK77vd_M!o+E8CbC)X#0LC<8}J71 z!4ABHpE2VM){6{usb3~Ypw5K1#ZFzXYu`(a^4&$FL|6}+9Ya(J@M2ru0wEZw1#Z$O4#e4B4KF+ir$F~u2 zG<|MKwmFGw@p!)BPi(;pllG@2?^^33Y|i?~+;7G65r6S__iRSQsaosWEX$%)?ZSqL z*w%gjv~EFb?O-Y8LmbTJn1`jfy_B-Mwf1X=ty=3_c%p+4He&=kT5G+HMMm-}9>AxV znHL^7jrju1$@-6AV?_KC5vTf^!-zQ11@Kcu{7`G1TWj4^Yh9Z1ZD}_Ldn4lTRP8!# zDrG5UIe#9*QM_MDIfU17KbDtLCa@iAk{DVkCO4brkRbe@Eo4R#w3B6 zxtJ%TzV4iASV~!&`)-mkKEcZo@m_0fytTHclz;MN^5^9p+y6)@<-69}?>z(7TCc!E zS&!e62cM3JU0pLf)>_+MN;!^8laFU(S8MH?ep0$38|M22S{D(cQ;g7ScsNtM0N3}G z(o)KUxfwa!UcM7#|CAVrtZsbpzp)F>ag&O<0c~)<~Haq86 zKk=>8Ip=+!@B5thdA`r{9{vN&!ZpgW0-;6@je_%U5{q$K@a*S5l}^3gLnz;5u!qd>lYryLaq3g zk@p#0(WSr=+<%OT)bJ-pFcfvyhm*lsh~5|Vz5xXzOgG3k|ahjA=hod3oarEL9=6~ZXHpX~&*v-S+5K+lE5Q`1s zG&bOVy!YT3>Jzb?nyLv@PT_EWB!4(+t`$2%c}vk4p<>&kwInVFx1>Ebs2%Rp1uJzX3_EKcv8 zV$FBRfyX6YV}gcK#=->)7cE%)gzpK%#03xiwmkGw4EH#>yhB5Xbyj4`T859F8&Whk z+HU@KD?1~iNqnE20aMxmhi$?Wm@Er^K3NcPKxju*)G6`(&R1BsvBfa67EBY{WcfdA z#`2_-MG4G4jr&TpqTfxl)4j|p+xX$=LB#@tj~^GaEm7MnAi*p-VMS%*KI5NGlQXsY zcKejv-0J1zFx^q9^#9BxvqMuJ?eJc5!0CI7;)=a$JDCG=6r)o(uN%!P{W(ME??%rv zf4;TuWYTW%Ywl0EQF79Ib|P2Et1C|1c52qD^V-~Zn!$BryOr6$1o=AIH(~SQv`;^L i{`Kp2*56z2F#Iu_`0CHqsSkjm#Ng@b=d#Wzp$P!u*P8nP literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png new file mode 100755 index 0000000000000000000000000000000000000000..81e8f912058259792f81f615ba8c5ce0da7eb948 GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwInVFwmW{sj=JJm?bT2=SX@gxu;{#A!(MJMVgCT4bG>< zMaWflNs;Y{BvE&4w>vl8Ea`0BlAYNnXu`iwJ?I~pB@?$0b`h}^WfGRgf$ z$Bd-qkr_T4#gEQ&@e18>Q2pKG{nB#^Gkgk#w0jr%u|}Qzp=7zj=Fzw2$?eBP(jUsW zeS9dOZ*eSlW$C)b?XwS_ER0g!(R)|&Z}^SaL*A_ViMBf#1Nu$wf1Dxk`A6KtJt32- zdghDEdhz;;T5o<4ut&9Kw literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png index ddcdfa23ca995378a141ed5db286edeb7538f28d..aa9b0e189550523c072082fa246c4102d38bd98a 100755 GIT binary patch delta 713 zcmV;)0yh1V1)c_wVSf)G5Pwq8F#rGpo=HSOR7l6Y*3GMxRTKvB-+Rt6O-WF%_>q}? zAofC^XhG5kA`#APRf8r$e}D~|G;t;gK?DUsgN9xdS|9~As359Alc1n_D~i&DxKSaQ z88^GP$v*IMy64<;E*;n8{n~p!`&nx}&%3);5E1cIUDtOsO@H(0q;oq~7W?pMMC_P4 zU_|W1jo5>|SAyX_?7;Q7=Sl$X$4%(s)`(a$HNc2ihug5ayt=M1o*Kh@v9K%7jQJ5`uf;=H z-vX=f7e2$sBY)kb;Vrz1uc}s!w%{TWeuz0X8eQWnL_#OD6j$G=kYYY!1kq1bloNDcTIW! vc4odY=^3(Vnjh=BezTOL*EG$~?eG5r&i=O1uy*$700000NkvXXu0mjfc9CT9 delta 573 zcmV-D0>b^C29pJlVSfuOCL2_ucmMzb6G=otR7l6Y)=h{_VHgMS-*smgWWtPQ#%HK$ zEPOQ07$IsxnvG~mDT;+ylZ~AX8!0Omc9N_ttu1_%@eyUCgh>&lCK_WtY@S%~G(Lpv6E= z@s#3uA7f&}CVyPVyKs^>rmMVH8=r6!y;ziJsW|A3kic?1oa@9{ybVXQrF05ka1rYZwmoIs zt?>@0@ES}1h4}43_?a3xy*%Wukd?4C1YtUd2HE>PgnyDqq_vcZatuE*0#LER zyeQ|*lFq$}x|Cvkk9)m^k5R>`pP@_(tE)47PEz$7A8;;2ybCArFcFH%IGjjY&0S2ZsTV{pG)<$ELe$a;ovLoV0X^?Zd{ENPvQ}F)B`w(7kG~=Q9!lW z1w4z4oHncn@Mvs2UGT4NBowEmTCd6qcu(Bp(}EoC3J#CrP5R+4u$H}0_p;gVSf)GEhjphAOHXW>PbXFR5;6}k}+<=KoCXW8cQgOm69ek6$gkS z5EW7mFinKQy(lSZMoQxwAcewbh&TcTLWv+Y%~%>4Y{2==?CziWvwwC24kFSA7QibI z98~~cz)V%YeNAx1F|Y%=)Z-UORP|UM#Ewj@_zzeDE1+Zh5r6P*d5*S}`5Ujj{y;tyv zmT7VW1&g$4tt~7C1L}^=j3i-q^8-E@mYuir<_$a0#s)Y89*{!Be~3BMxsm$|L4r3pn5%5n6aDFEN2D6JP?%o_E&W z@N;5Gnb6z;WD(K?eP4qtp`HUPJ>6IVfKnHy95RmtR<}~F3aqva89^H2Zma`~OM>IC b-#8dwpgcsW=s;D~00000NkvXXu0mjft#Dm^ diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png index c9a905e3230a85810873b15be2b99739a479feee..a03d1d818248663e92120309b6922d04718466c2 100755 GIT binary patch delta 384 zcmV-`0e}AW0@wqPVSf)EH=CV)CjbBeSV=@dR7l6|*0E|8Q4q%Q-!4lM(?v*QAt-_v z;yd^TDGsQOhy?W!Z0xKA#U@3t5&KM$CrC<*R6&FgNWj8Ih+Vi^WYe65^>TA1+1*08 z(;N<*Gyk1$zS&)7@xMorQrg1`u64{c!gfSFo_46jJ28I^ysuGQ z5!T#Yya2R-M|fJb delta 285 zcmV+&0pkAH1N8!sVSfuM2$9$bF#rGn^+`lQR7l6|);~%^K@i9B&wE%%j$mhH=OMgA z%5>JALhvTRLwEuk{~$<6z*vf{y%Ui0>cD~u)M;ASrGOO%<0e|cOXSj<#jRFsGj@P(9 zZwgrA7?+qOuu00000NkvXXu0mjfNb7>T diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png index 45c471e6ceceb98ada568b5c6b84fb31b93b297e..216e78344e71fb1e6406c13aa6df18aa196b62ee 100755 GIT binary patch delta 479 zcmV<50U-Xd0{H`wB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru+yes-A1dL1BfkIu0eMM8K~y-)rIgW8gFq05ztDhm zU^3kw-O zyrP4PJx)Ql?ti{8$=3 zO_TwfA;2y!0Pj`x{j5+9m|BrKE6$l*%f>f+8v2yD=1pDD(2sc_wY3DYxhYJ{JO8y( zRiCY~2XF^$?0INQ8H4)9ZB=y_OiblsnjnEfRlj4<(O6`dyx7Dv5k;?4^6S9##)E?* zdf;x#(^cR1h{#(on!ftw5@6V;ACWc+*PpYZvX%Q07*qoM6N<$g2{w`9{>OV diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index df586c770..d9d88690f 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -163,8 +163,8 @@ .language { background-position: -210px -40px;} -.on { background-position: -50px -60px;} -.off { background-position: -70px -60px;} +.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} /*.tagged { background-position: -130px -60px;}*/ From d4ac1f2a9cc8d744c6e47eb358ac1f1cfa4ce458 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 19:07:55 +0100 Subject: [PATCH 24/78] fixed star/unstar --- images/star.png | Bin 0 -> 388 bytes images/star_dummy.png | Bin 0 -> 183 bytes view/theme/diabook/icons/isstar.png | Bin 0 -> 1277 bytes view/theme/diabook/icons/star.png | Bin 339 -> 388 bytes view/theme/diabook/icons/star_dummy.png | Bin 0 -> 183 bytes view/theme/diabook/style.css | 4 +++- view/theme/diabook/wall_item.tpl | 23 ++++++++++++++--------- 7 files changed, 17 insertions(+), 10 deletions(-) create mode 100755 images/star.png create mode 100644 images/star_dummy.png create mode 100644 view/theme/diabook/icons/isstar.png create mode 100644 view/theme/diabook/icons/star_dummy.png diff --git a/images/star.png b/images/star.png new file mode 100755 index 0000000000000000000000000000000000000000..0b00cb189385f94442edd122a4760d39fe4d3492 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfpYw-lKg8QKn)a)|SMAe2X!cQ{E7UpqPls-b z=vVEW2TF@#+bquJYvs&){`CAUrpbOcY9k-Bo-_PMyGJJLXHDDiB5BXt zU(Y_s%xbqdDj2s&u{-xmI8#Q$-4*-#mVdaGZ++kRPNJgVcA+0q+kKV%SSF^uW>7r8 ep?&G9f4u8Y$47>}RQdu8A_h-aKbLh*2~7ZroS(J; literal 0 HcmV?d00001 diff --git a/images/star_dummy.png b/images/star_dummy.png new file mode 100644 index 0000000000000000000000000000000000000000..ce11f30d4d07697d1896751eba48ee74a2bfa26c GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfcM)7k|;=waJ-D3lg=gQ%$Yg+vc4Y97}JA}lJvo1Em;5m zf9v}%3%CZ1?4P-^eqhe>Yw@{i)c02&On!SVPX2gfw0>yrlIt4$!k%(r{M&h_HS&X8 z^OPI^e(5(?>uavYC>QW0zh_O4+_;ckgg<-Tz4e1LR$do^{?E%fFSJ`saRr(FNhIfB zI+oFf(eu}ZpcwISzp}U+t_j5FfaENY4#KM}SwC`M#+okT_?RlpbsIT4@$`K9jH8i(SF zOL1C46+$)5aHcxw&fomZPzC@T+1q)GR|r0|QE|D+wRsF8(2GPH5%eHI%o0KZXdusT z5jZDiO(GkHvN0)bQfUmA#By<5cg^_cEY?;Jz>J`cE0{NcrCM)mLTM}z00;qs%K#97 z2RSEXDMSbWU_;R6#asr11W;T+TEDAt_Tp{=!03U_?fJ5M)>siDWPH)&2$O?MPBZ~w ze834}OOcR@NC?D`5>YXs3~Fg+a}Xb$tGcHx0Bm|7e<(7h*XDUE3@550z&RjuK$fAU zK!9AUH7EdXVolt!wKWIv@xXvK&wFCXU5bX|J4$v|m)V}Ln9auXMFfNiArpzVKzJdL z0kXcB#+1oKCWJ;I*AUg9(x#dN$+q(s+?Kf;28D^F{)3<1EAhrT_U-)i(knJ-C%hsQ zlto)4oDVocK_q5PDr<3jLIb1)gAe+;?#k_gxelv%-gfC&IwXcdy} zP&z2U2N1)h?#C+*+GNB4&M3A5d&_WDabKv=+93cl8CleG`0oXa^S8?Lg zuE-X9S3?G12spJ`!w~R00Dl@_ET9aqA;17I1({#@cR`BOjuk7jRV;jP+SU)97nTn_pYQd@M_1} z(=`AX{(AJSr1srAxf`B*#Ou6+7&;7wy`Z(XPpN=@TM6EDsI5!M$z6TP`J*ou9_l+V z*=E|h+DV|ceq`^vYi;?qt+|C87t${Y#+0TcaE*bT@yUH-+3+u4HR_}9cRkuahRdM+ z;o80vpJazCgTHPvVfR`k@fY~N@i+N3`y`qr1DyZ>03~!qSaf7zbY(hYa%Ew3WdJfT zF)%GKGA%JMR539+H8MIhG%YYTIxsLlXF%Bi001R)MObuXVRU6WZEs|0W_bWIFfchS nFflDKHdHY=IxsOhFfc7JHaajcyd|2t00000NkvXXu0mjf_UJUE literal 0 HcmV?d00001 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png index 32eff5a506c913598d177900dd5752777337e622..0b00cb189385f94442edd122a4760d39fe4d3492 100755 GIT binary patch delta 302 zcmV+}0nz@`0)zvQUw;Dw5h50{znT01009I^L_t(I%cau4E(K8#2Jqi`~+(tv;5qJRc47`PkLX>(@Y7{iLQ6M4iuI8+qob0X}CYkKaoNs2od^0py zp6AfTj(^w*E~9~?Sp>ev;IDsQ#w$Ls-2@tI8E}9ZOrqZe>VIImW>AK;@GY^5d3+|g z5)MP~miQNjD1yHy?`N74<7@;3A@3hB(b{Dr}zT<pxHG45-0c?w@o5W1d(Rz03pw?ho!3i4X?{zSyt&H^Z)<=07*qoM6N<$f|zxU Awg3PC delta 252 zcmVq1<+%Zbc$`j$}+8> zg`~B#vb6RaEVQ+-khJ-UGzwxVMEnFTe5nKrg@-5!81bcE`nbaRyoLv;=EUwa<039H(K9}>`ZXfeXOj(jadq*IL2wnmGE?H-BA+Jn zaS(@SqQvr)(QA<#p{=l2!$UMG@q$%+MkMncwnO)X$2i}oDOw@CK{rIOgH0@9h@;Sq zvJHJ>1((^YBV6Nl;wv50XRUGrZ4{ZQzzNp;;|IpO086kWwGEvB0000QL70(Y)*K0-AbW|YuPgf - $item.star.starred + $item.star.starred {{ if $item.lock }}$item.lock{{ endif }}
    @@ -38,9 +38,7 @@
    -
    - {{ if $item.plink }}$item.plink.title{{ endif }} -
    +
    {{ for $item.tags as $tag }} $tag @@ -54,7 +52,8 @@
    $item.location 
    - + + {{ if $item.vote }} @@ -62,13 +61,19 @@ {{ if $item.vote.share }} - {{ endif }} + {{ endif }} {{ if $item.star }} - $item.star.do - $item.star.undo + + $item.star.do + + $item.star.undo $item.star.tagger - {{ endif }} + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + +
    From 42b9887693afd65b7dbbb88bb331eb316ede89ef Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 21:45:59 +0100 Subject: [PATCH 25/78] fixed apps css --- view/theme/diabook/nav.tpl | 2 +- view/theme/diabook/style.css | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 17df8e652..34a37ad2e 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -87,7 +87,7 @@
  • $ap
    • {{ endfor }} - + {{ endif }} {{ if $nav.home }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ecd995d5f..d175a74b3 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -675,6 +675,13 @@ nav #nav-directory-link{ margin-left: 0px; margin-right: 0px; font-weight: bold; + margin: 3px 15px; + } +nav #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 15px; } nav #nav-help-link .menu-popup, nav #nav-search-link .menu-popup, From a19d8d9e9f2e4a033c3db458bcbf5bd810992913 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sat, 3 Mar 2012 16:52:33 -0400 Subject: [PATCH 26/78] Added docblox default configuration file. Now docblox can be run without arguments on friendica root dir. The documentation will be generated on ./data/output --- docblox.dist.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 docblox.dist.xml diff --git a/docblox.dist.xml b/docblox.dist.xml new file mode 100644 index 000000000..a2ea8e2cb --- /dev/null +++ b/docblox.dist.xml @@ -0,0 +1,13 @@ + + + + data/output + + + data/output + + + . + + + From 173fb983c5fa2514c3cdc15ac56a030c49f81ca7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 23:12:03 +0100 Subject: [PATCH 27/78] navbar fix --- view/theme/diabook/icons/contacts2.png | Bin 545 -> 549 bytes view/theme/diabook/icons/lock.png | Bin 313 -> 366 bytes view/theme/diabook/icons/messages2.png | Bin 0 -> 488 bytes view/theme/diabook/icons/notify2.png | Bin 0 -> 596 bytes view/theme/diabook/style.css | 24 ++++++++++++++++++------ 5 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 view/theme/diabook/icons/messages2.png create mode 100644 view/theme/diabook/icons/notify2.png diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png index f90b10f9202aeb51272286da1e165d6ec60dbf30..7817279f42911c573f62f3c1868176bd5706b151 100755 GIT binary patch delta 464 zcmV;>0Wbcc1f>L!Uw;Dw6)QU-tJWL<00E^*L_t(I%k9+7i%ww}$MMgZw?=9T<7G-- z@>0%X_!G>^>@2P#l)pf%6lH-JV}UG`|3K1hDH}zRvaylJ+JcQz780XlbE|tE_cQZk zr(AXFI#=g>ueaZQ^WU;HwO~YS#5L^7p%=K6Qu;A0c&q{)!G8@L#Y7J8$2VLlzMIBz zOyX%u=~c-YsU#c4u?+3U=p=6A9M0l;L>yWT+~iKW>^IrpTzoT^tDV6#4&qEi zjIRW)&A)#aC;Q$z9Kf1kz})~JW-CQZ;pa-=4qq$r&w0KR#r#W~#DGL%dxkqllQtWo*a#TwznR`W>I}9;dMlsTkohNj4F&GiRT}p1!#? z6(3&XG2UPiTk!~sDW&Hy+P3Ze+}frg4#@8WGg%qq_(_NsdokO#?M$!Nd)7omH=wFv ztiuIdEn;7AXJoZ2bck!W|1eGA{8-lK-`W!1RTzzb&VB);nqaEwQFEjK0000LJG%q)yUz>C5%ysUa zo1OBhZ$00q@ArM4^E{t(_^+&{mW+svxP@Ig^%B=oNsA|NdE=>U(c-0Bc48w*z9>S1Do&zlMQZe5>TY7P|)weSbb8)>gqOr53L$KR&=-JS+xV?y|*6T&?=JSiP2;D7-yr*q{CYXMY~e zhofJ2u!PMxl0Cem0M6qv-mkDxM9ktkwqt#+uqn3s1E28`=dcZriWaW0WD^lP^XfC$ z)7Q7A62n_O#XBruE1qB>rSzgVyd|9OgAO_%J&PU08AZ(Db#`?srzZLPxlE`w!C;E{$h@{;ihrp~7hVbNUSuyJjXt9`l+20000I6|sI z4eoIn5s!6Es)`4A!?tdGU>Fgf%a1`7oR;D*+~5wI<$Z$l5`UlK>^FkrGU`i2T(ml0 z<(yBkSMq+a(bAbP?-+kx;!PL9T1dsfgjWpljD2jix<6r5jNXliruJY_C69V!C`}g2 z=3Nq+7ID+Xw$UT)7CYrks}jI0BHl6UGqF#?q}(U#N@!a9v9g45&iMi3btEit_}3!+ cdlSC_LWDV_CJ!6B@Bjb+07*qoM6N<$g52eUng9R* delta 224 zcmV<603ZME0=WW^VSfV=4?P_t5&!@Ixk*GpR5;7Ek}(d#FbqXs3W$MQAaM(JuD}r) zS$cyaF?8)6dVmgWy+bP#2Mq8G&AkloRsvy|A!132_ aT#PT4WJHv4VkT$+0000P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY# z6(TJJz1Rc*00C%8L_t(I%k9-YYZXBl#qra{r=hQUaT*kxd0=Q-#6cV>8oLMLG@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$oPx#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`^-2n)NfJ=u$ai} zgwO{T3e#yyQdO)v=e|{W3$_a^7bgBX8HFK%f~0}8;@BvH6P2}8Q3N?H{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 Date: Sat, 3 Mar 2012 23:43:15 +0100 Subject: [PATCH 28/78] fix --- view/theme/diabook/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 0f60ee531..5e471f621 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -749,8 +749,8 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #3465A4; /*bdcdd4;*/ - color: #fff; + background-color: #fff797; /*bdcdd4;*/ + color: #000; } ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; From 25d6ca3b7335c018bfd16c4dd29b177d9df62692 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 4 Mar 2012 00:10:03 +0100 Subject: [PATCH 29/78] tag fix --- view/theme/diabook/wall_item.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index c836d4fbb..20131c7d1 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -38,7 +38,8 @@
    -
    +
    +
    {{ for $item.tags as $tag }} $tag From 64400e8d59cab64cfa57b969df88a4cafe76f168 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 3 Mar 2012 19:19:35 -0500 Subject: [PATCH 30/78] first commit for dispy New Edition Signed-off-by: Simon L'nu --- view/theme/dispy/comment_item.tpl | 35 + view/theme/dispy/contact_template.tpl | 6 +- view/theme/dispy/conversation.tpl | 21 + view/theme/dispy/group_side.tpl | 12 +- view/theme/dispy/head.tpl | 99 + view/theme/dispy/icons.png | Bin 20057 -> 28076 bytes view/theme/dispy/icons.svg | 1940 +++++++++++------ view/theme/dispy/jot-header.tpl | 338 ++- view/theme/dispy/jot.tpl | 106 +- view/theme/dispy/mail_head.tpl | 8 +- view/theme/dispy/nav.tpl | 145 +- view/theme/dispy/profile_vcard.tpl | 59 +- view/theme/dispy/style.css | 2815 ++++++++++++++++++------- view/theme/dispy/theme.php | 74 + view/theme/dispy/wall_item.tpl | 6 +- view/theme/dispy/wallwall_item.tpl | 6 +- 16 files changed, 3921 insertions(+), 1749 deletions(-) create mode 100644 view/theme/dispy/comment_item.tpl mode change 100755 => 100644 view/theme/dispy/contact_template.tpl create mode 100644 view/theme/dispy/conversation.tpl mode change 100755 => 100644 view/theme/dispy/group_side.tpl create mode 100644 view/theme/dispy/head.tpl mode change 100755 => 100644 view/theme/dispy/icons.png mode change 100755 => 100644 view/theme/dispy/icons.svg mode change 100755 => 100644 view/theme/dispy/jot-header.tpl mode change 100755 => 100644 view/theme/dispy/jot.tpl mode change 100755 => 100644 view/theme/dispy/mail_head.tpl mode change 100755 => 100644 view/theme/dispy/nav.tpl mode change 100755 => 100644 view/theme/dispy/profile_vcard.tpl mode change 100755 => 100644 view/theme/dispy/style.css create mode 100644 view/theme/dispy/theme.php mode change 100755 => 100644 view/theme/dispy/wall_item.tpl mode change 100755 => 100644 view/theme/dispy/wallwall_item.tpl diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl new file mode 100644 index 000000000..85176732b --- /dev/null +++ b/view/theme/dispy/comment_item.tpl @@ -0,0 +1,35 @@ +
    +
    + + + + + + + +
    + $mytitle +
    +
    + + + {{ if $qcomment }} +
      + {{ for $qcomment as $qc }} +
    • $qc
      • + {{ endfor }} +
    + {{ endif }} + +
    + + +
    +
    + +
    diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl old mode 100755 new mode 100644 index 48930b48a..2aa9b88fe --- a/view/theme/dispy/contact_template.tpl +++ b/view/theme/dispy/contact_template.tpl @@ -1,9 +1,9 @@
    -
    +
    + onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)"> $contact.name @@ -20,6 +20,8 @@
    $contact.name
    +
    $contact.itemurl
    +
    $contact.network
    diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl new file mode 100644 index 000000000..0b14f1c80 --- /dev/null +++ b/view/theme/dispy/conversation.tpl @@ -0,0 +1,21 @@ +{{ for $threads as $thread }} +
    + {{ for $thread.items as $item }} + {{if $item.comment_firstcollapsed}} +
    + $thread.num_comments $thread.hide_text +
    + {{endif}} + + {{ inc $item.template }}{{ endinc }} + + + {{ endfor }} +
    +{{ endfor }} + +{{ if $dropping }} +$dropping +{{ endif }} diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl old mode 100755 new mode 100644 index a1fc70a22..516d70d5b --- a/view/theme/dispy/group_side.tpl +++ b/view/theme/dispy/group_side.tpl @@ -5,23 +5,25 @@
    diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl new file mode 100644 index 000000000..793af6fd2 --- /dev/null +++ b/view/theme/dispy/head.tpl @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png old mode 100755 new mode 100644 index bd52b62c810e6b9157c74cb35c3bfd578a99c6af..d9d58aa475ec08bfe8c44076240404a0ec5aa86f GIT binary patch literal 28076 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 diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg old mode 100755 new mode 100644 index b435ba665..40899c0a5 --- a/view/theme/dispy/icons.svg +++ b/view/theme/dispy/icons.svg @@ -7,15 +7,16 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="250" height="200" id="svg3403" version="1.1" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48+devel r" sodipodi:docname="icons.svg" - inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png" + inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> image/svg+xml - + @@ -118,11 +119,12 @@ y="852.36218" inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + transform="matrix(1,0,0,1.5151515,0,-439.09566)" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> @@ -202,15 +204,15 @@ inkscape:connector-curvature="0" id="path4005" d="M 504.69787,53.131473 480.30214,28.735746" - style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004" /> + style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004" /> + style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" /> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> - - - - + + @@ -425,16 +422,16 @@ sodipodi:cy="21.754047" sodipodi:cx="559.67499" id="path4008-8" - style="fill:#555753;fill-opacity:1;stroke:none" + style="fill:#1a1a1a;fill-opacity:1;stroke:none" sodipodi:type="arc" /> - - YouTube - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + style="fill:none;stroke:#1a1a1a;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + + + + - - - Lorem Ip + style="font-weight:bold;fill:#1a1a1a;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip + id="g4173"> + transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,5.144234,833.96249)" /> - - + + @@ -930,12 +902,12 @@ inkscape:connector-curvature="0" d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z" id="path4265" - style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline" + style="fill:#666666;fill-opacity:1;stroke:none;display:inline" inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -962,7 +934,7 @@ inkscape:connector-curvature="0" id="path4279" d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z" - style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" /> + + + + + + + + + + + + + - - - - - - - @@ -1104,15 +1085,15 @@ inkscape:connector-curvature="0" id="path4323" d="m -42.239747,1107.2336 0,17.6813" - style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -1133,14 +1114,14 @@ inkscape:connector-curvature="0" id="path4331" d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z" - style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> @@ -1149,7 +1130,7 @@ inkscape:connector-curvature="0" id="path4337" d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z" - style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" /> - - - + + + + + + + + + + + + + + + + + + - - - - - - - + id="g226"> + style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" /> + ? + id="g204"> - - ? - ? + y="979.64215" + id="text3155" + sodipodi:linespacing="100%">? + + + + + + + + + + + + + + + + + + alternate housing ;) + wikuom/wigwam + + + + + + alternate housing ;) + wikuom/wigwam + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ! + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl old mode 100755 new mode 100644 index 8dccf71ed..0a559aae7 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -1,157 +1,137 @@ - - - + +{{ endif }} + +{{ if $content }}{{ endif }} diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl old mode 100755 new mode 100644 index 89615cbd0..d49d7c1af --- a/view/theme/dispy/mail_head.tpl +++ b/view/theme/dispy/mail_head.tpl @@ -1,7 +1,5 @@

    $messages

    - +
    +$tab_content +
    diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl old mode 100755 new mode 100644 index 79852217f..67a263519 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,57 +1,116 @@
    + + diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl old mode 100755 new mode 100644 index b3f5cc50d..0c289d982 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -2,34 +2,53 @@
    $profile.name
    - - - {{ if $pdesc }}
    $profile.pdesc
    {{ endif }} -
    $profile.name
    - - + {{ if $pdesc }} +
    $profile.pdesc
    + {{ endif }} +
    + $profile.name +
    {{ if $location }} -
    $location
    -
    - {{ if $profile.address }}
    $profile.address
    {{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - +
    + $location +
    + {{ if $profile.address }} +
    $profile.address
    {{ endif }} + $profile.zip + $profile.locality{{ if $profile.locality }}, {{ endif }} + $profile.region + $profile.postal-code {{ if $profile.country-name }}$profile.country-name{{ endif }} -
    -
    +
    +
    {{ endif }} - {{ if $gender }}
    $gender
    $profile.gender
    {{ endif }} + {{ if $gender }} +
    + $gender + $profile.gender +
    + {{ endif }} - {{ if $profile.pubkey }}{{ endif }} + {{ if $profile.pubkey }} + + {{ endif }} - {{ if $marital }}
    ♥$marital
    $profile.marital
    {{ endif }} + {{ if $marital }} +
    + + ♥$marital + $profile.marital +
    + {{ endif }} - {{ if $homepage }}
    $homepage
    $profile.homepage
    {{ endif }} + {{ if $homepage }} +
    + $homepage + $profile.homepage +
    {{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css old mode 100755 new mode 100644 index 7f563293a..f0929094c --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1,74 +1,233 @@ +/* + * dispy + * + * modernised, sort of, by simon + * + */ + +/* from html5boilerplate */ + +/* these are to tell browsers they should be displayed a certain way */ +article, aside, details, figcaption, figure, footer, +header, hgroup, nav, section { + display: block; +} +audio, canvas, video, time { + display: inline-block; + *display: inline; + *zoom: 1; +} +audio:not([controls]) { + display: none; +} +[hidden] { + display: none; +} + +/* ============================================================================= + Base + ========================================================================== */ + +/* + * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units + * 2. Force vertical scrollbar in non-IE + * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g + */ + +html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} body { - margin: 0px; - padding: 0px; - font-family: freesans,helvetica,arial,clean,sans-serif; - font-size: 16px; + margin: 0; + font-size: 16px; + line-height: 1.1em; } -img { border: 0 none; } -a { color: #3465a4; text-decoration: none; margin-bottom:1px;} -a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;} +body, button, input, select, textarea { + font-family: sans-serif; + color: #222; + background-color: rgb(254,254,254); + background-color: rgba(254,254,254,255); +} +/* remember to define focus styles! */ +:focus { + outline: 0; +} +/* remember to highlight inserts somehow! */ +ins { + background-color: #ff9; + color: #000; + text-decoration: none; +} +mark { + background-color: #ff9; + color: #000; + font-style: italic; + font-weight: bold; +} +ins { + background: #ff9; + color: #000; + text-decoration: none; +} +mark { + background: #ff0; + color: #000; + font-style: italic; + font-weight: bold; +} +/* Redeclare monospace font family: h5bp.com/j */ +pre, code, kbd, samp { + font-family: monospace, monospace; + _font-family: 'courier new', monospace; + font-size: 1em; } -.required { display: inline; color: #ff0000;} -.fakelink { color: #3465a4; cursor: pointer; } -.fakelink :hover{ color: #729fcf; } +/* Improve readability of pre-formatted text in all browsers */ +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} +q { + quotes: none; +} +q:before, q:after { + content: ""; + content: none; +} +small { + font-size: 85%; +} +/* Position subscript and superscript content without affecting line-height: h5bp.com/k */ +sub, sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0 none; + /*vertical-align: middle;*/ +} +a { + color: #3465a4; + text-decoration: none; + margin-bottom: 1px; +} +a:hover img { + text-decoration: none; +} +blockquote { + background: #eee; + text-indent: 5px; + padding: 5px; + border: 1px #aaa solid; + border-radius: 5px; +} +a:hover { + color: #729fcf; + padding-bottom: 0; + border-bottom: 1px dotted #729fcf; +} +.required { + display: inline; + color: #ff0000; +} +.fakelink, .lockview { + color: #3465a4; + cursor: pointer; +} +.fakelink:hover { + color: #729fcf; +} input[type=submit] { - margin-top: 20px; - height: 22px; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; - border: 0px; + margin-top: 20px; + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0; +} +.smalltext { + font-size: 0.7em; } - -.smalltext { font-size: 0.7em } - #panel { position: absolute; - font-size:0.8em; - -webkit-border-radius: 5px ; + font-size: 0.8em; + -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - border: 1px solid #ffffff; + border: 1px solid #fff; background-color: #2e3436; color: #eeeeec; - padding:1em; + padding: 1em; } - .pager { padding-top: 30px; - display:block; + display: block; clear: both; text-align: center; } +.pager span { + padding: 4px; + margin:4px; +} +.pager_current { + background-color: #729fcf; + color: #fff; +} -.pager span { padding: 4px; margin:4px; } -.pager_current { background-color: #729fcf; color: #ffffff; } +/** + * global + */ +/* .tool .action */ +.action { + float: right; +} /** * login */ -#login-extra-links a { margin-right: 20px; } +#login-extra-links a { + margin-right: 20px; +} /********* * nav *********/ - nav { - height: 50px; + height: 60px; display: block; background-color: #2e3436; color: #eeeeec; position: relative; - padding: 0px 10%; + padding: 20px 20px 10px 95px; + margin-left: auto; + margin-right: auto; +} +nav a { + text-decoration: none; + color: #eeeeec; + border: 0px; +} +nav a:hover { + text-decoration: none; + color: #eeeeec; + border: 0px; } -nav a { text-decoration: none; color: #eeeeec; border:0px;} -nav a:hover { text-decoration: none; color: #eeeeec; border:0px;} - nav #banner { display: block; position: absolute; @@ -79,23 +238,18 @@ nav #banner #logo-text a { font-weight: bold; margin-left: 3px; } - nav #user-menu { display: block; - width: auto; + width: auto; float: right; - margin-top: 22px; - margin-right: 10px; + margin: 3px 68px 0 0; position: relative; - vertical-align: middle; - background-color: #555753; - -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; - background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; + clear: both; } nav #user-menu-label { float: left; @@ -103,63 +257,219 @@ nav #user-menu-label { padding: 3px 20px 9px 5px; height: 10px; } - ul#user-menu-popup { - display: none; - position: absolute; - background-color: #555753; - width: 100%; + display: none; + position: absolute; + background-color: #555753; + width: 100%; padding: 10px 0px; margin: 0px; - top: 20px; - left: 0px; - - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; - - z-index: 10000; + top: 20px; + left: 0; + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; + z-index: 10000; +} +ul#user-menu-popup li { + display: block; +} +ul#user-menu-popup li a { + display: block; + padding: 5px; +} +ul#user-menu-popup li a:hover { + color: #2e3436; + background-color: #eeeeec; +} +ul#user-menu-popup li a.nav-sep { + border-top: 1px solid #eeeeec; +} +#nav-buttons { + clear: both; } - -ul#user-menu-popup li { display: block; } -ul#user-menu-popup li a { display: block; padding: 5px; } -ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; } -ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; } nav .nav-link { - float: right; - display: block; - width: 22px; - height: 22px; - /*border: 1px solid #eeeeec;*/ - overflow: hidden; - margin-top: 22px; - margin-right: 10px; - text-indent: 50px; - background: transparent url('icons.png') 0px 0px no-repeat; + float: right; + display: block; + width: 22px; + height: 22px; + overflow: hidden; + margin: 0px 5px 5px; + text-indent: 50px; + background: transparent url(icons.png) 0 0 no-repeat; +} +#nav-apps-link { + background-position: 0 -66px; +} +#nav-apps-link:hover { + background-position: -22px -66px; +} +#nav-community-link { + background-position: 0 -22px; +} +#nav-community-link:hover { + background-position: -22px -22px; +} +#nav-contacts-link { + background-position: 0 -22px; +} +#nav-contacts-link:hover { + background-position: -22px -22px; +} +#nav-directory-link { + background-position: -44px -154px; +} +#nav-directory-link:hover { + background-position: -66px -154px; +} +#nav-help-link { + background-position: 0 -110px; +} +#nav-help-link:hover { + background-position: -22px -110px; +} +#nav-home-link { + background-position: -44px -132px; +} +#nav-home-link:hover { + background-position: -66px -132px; +} +#nav-login-link { + background-position: 0 -88px; +} +#nav-login-link:hover { + background-position: -22px -88px; +} +#nav-logout-link { + background-position: 0 -88px; +} +#nav-logout-link:hover { + background-position: -22px -88px; +} +#nav-messages-link { + background-position: -44px -88px; +} +#nav-messages-link:hover { + background-position: -66px -88px; +} +#nav-notify-link, #nav-notifications-linkmenu { + background-position: -44px -110px; +} +#nav-notify-link:hover { + background-position: -66px -110px; +} +#nav-network-link { + background-position: 0px -177px; +} +#nav-network-link:hover { + background-position: -22px -177px; +} +#nav-search-link { + background-position: 0 -44px; +} +#nav-search-link:hover { + background-position: -22px -44px; +} +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#profile-attach-wrapper, +#profile-audio, +#profile-link, +#profile-location, +#profile-nolocation, +#profile-title, +#jot-title, +#profile-upload-wrapper, +#profile-video, +#profile-jot-submit, +#wall-image-upload-div, +#wall-file-upload-div, +.icon, .hover, .focus, .pointer { + cursor: pointer; } - -#nav-directory-link { background-position: 0px -22px } -#nav-directory-link:hover { background-position: -22px -22px;} -#nav-search-link { background-position: 0px -44px } -#nav-search-link:hover { background-position: -22px -44px;} -#nav-apps-link { background-position: 0px -66px } -#nav-apps-link:hover { background-position: -22px -66px;} -#nav-login-link { background-position: 0px -88px } -#nav-login-link:hover { background-position: -22px -88px;} -#nav-help-link { background-position: 0px -110px } -#nav-help-link:hover { background-position: -22px -110px;} - - #notifications { - height: 20px; width: 100%; + height: 20px; + width: 100%; position: absolute; - top:-19px; left: 0px; + top: -19px; + left: 0; } -.nav-ajax-update { +/* 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; +} +#nav-notifications-menu { + margin-top: 30px; + width: 255px; + max-height: 400px; + overflow: auto; + font-size: 9pt; +} +#nav-notifications-menu .contactname { + font-weight: bold; + font-size: 0.9em; +} +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .notif-when { + font-size: 0.8em; + display: block; +} +#nav-notifications-menu li { + padding: 7px 0px 7px 10px; + word-wrap: normal; + border-bottom: 1px solid #000; +} +#nav-notifications-menu li:hover { + color: black; +} +#nav-notifications-menu a:hover { + color: black; + text-decoration: underline; +} +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"); +} +.show { + display: block; +} +#nav-floater { + position: fixed; + top: 20px; + right: 1%; + padding: 5px; + background: #2e3436; + border-radius: 5px; + z-index: 100; +} +.floaterflip { + display: block; + position: fixed; + z-index: 110; + top: 53px; + right: 19px; + width: 22px; + height: 22px; + overflow: hidden; + margin: 0px; + background: transparent url(icons.png) -190px -60px no-repeat; +} +.nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; - background: transparent url('notifications.png') 0px 0px no-repeat; - color: #ffffff; + background: transparent url(notifications.png) 0 0 no-repeat; + color: #fff; font-weight: bold; font-size: 0.8em; padding-top: 0.2em; @@ -168,312 +478,666 @@ nav .nav-link { margin-right: -4px; display: none; } -#net-update { background-position: 0px 0px; } -#mail-update { background-position: -30px 0px; } -#notify-update { background-position: -60px 0px; } -#home-update { background-position: -90px 0px; } - +.nav-ajax-update.show, .nav-ajax-left.show { + display: block; +} +#net-update { + background-position: 0px 0px; +} +#mail-update { + background-position: -30px 0; +} +#notify-update { + background-position: -60px 0px; +} +#home-update { + background-position: -90px 0px; +} #lang-select-icon { cursor: pointer; position: absolute; - left: 0px; - top: 0px; -} - -#language-selector { - position: absolute; + left: 0; top: 0; - left: 16px; } - +#language-selector { + position: absolute; + top: 0; + left: 16px; + padding-right: 50px; +} +.menu-popup { + position: absolute; + display: none; + width: 11em; + 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); +} +.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +.menu-popup a:hover { + background-color: #bdcdd4; +} +.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +.notif-item { + font-size: small; +} +.notif-item a { + vertical-align: middle; +} +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} +.notify-seen { + background: #ddd; +} /** sysmsg **/ -#sysmsg_info{ - position:fixed; - bottom: 0px; right:20%; - -moz-box-shadow: 0px 0px 5px #888; - -webkit-box-shadow: 0px 0px 5px #888; - box-shadow: 0px 0px 5px #888; - padding: 10px; - background-color: #fcaf3e; border:2px solid #f8911b; - border-bottom:0px; - padding-bottom: 50px; - z-index: 1000; +#sysmsg_info { + position:fixed; + bottom:0; + -moz-box-shadow:0 0 5px #888; + -webkit-box-shadow:0 0 5px #888; + box-shadow:0 0 5px #888; + padding: 10px; + background-color:#fcaf3e; + border:2px solid #f8911b; + border-bottom:0; + padding-bottom: 50px; + z-index:1000; } -#sysmsg { - position:fixed; - bottom: 0px; right:10%; - -moz-box-shadow: 0px 0px 5px #888; - -webkit-box-shadow: 0px 0px 5px #888; - box-shadow: 0px 0px 5px #888; - padding: 10px; - background-color: #fcaf3e; border:2px solid #f8911b; - border-bottom:0px; - padding-bottom: 50px; - z-index: 1000; +#sysmsg { + position:fixed; + bottom:0; + -moz-box-shadow:0 0 5px #888; + -webkit-box-shadow:0 0 5px #888; + box-shadow:0 0 5px #888; + padding: 10px; + background-color:#fcaf3e; + border:2px solid #f8911b; + border-bottom:0; + padding-bottom: 50px; + z-index:1000; } #sysmsg_info br, #sysmsg br { display:block; margin:2px 0px; - border-top: 1px solid #ccccce; + border-top:1px solid #ccccce; } - /** * aside **/ - aside { position: absolute; - right: 11%; - width: 200px; - font-size: 0.7em; - + right: 8%; + width: 20.5%; + font-size: smaller; +} +.vcard .fn { + font-size: 1.7em; + font-weight: 700; + border-bottom: 1px solid #729fcf; + padding-top: 1px; +} +.vcard #profile-photo-wrapper { + margin: 10px 0px; +} +aside h4 { + font-size: 1.2em; } -.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;} - -.vcard #profile-photo-wrapper { margin: 10px 0px } - -aside h4 { font-size: 1.2em; } - -aside #viewcontacts { text-align: right;} - -#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; } +aside #viewcontacts { + text-align: right; +} +#profile-extra-links ul { + margin-left: 0px; + padding-left: 0px; + list-style: none; +} #dfrn-request-link { - background: #3465A4 url('connect.png') no-repeat 95% center; - border-radius: 5px 5px 5px 5px; - color: #FFFFFF; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; + background:#3465A4 url(connect.png) no-repeat 95% center; + border-radius:5px 5px 5px 5px; + color:#fff; + display:block; + font-size:1.2em; + padding:.2em .5em; } - - #netsearch-box { margin: 30px 0px; } + /** * contacts block */ -.contact-block-div { width: 50px; height: 50px; float: left; } -.contact-block-textdiv { width: 150px; height: 34px; float: left; } -#contact-block-end { clear: both; } +.contact-block-div { + width: 50px; + height: 50px; + float: left; +} +.contact-block-textdiv { + width: 150px; + height: 34px; + float: left; +} +#contact-block-end { + clear: both; +} + /** * jot - **/ -#profile-jot-text_tbl { margin-bottom: 10px; } -#profile-jot-text_ifr { width: 99.9%!important } -#profile-jot-submit-wrapper { float: right;} -#profile-jot-perms { - float: right; - background-color: #555753; - height: 22px; width: 20px; - -webkit-border-radius: 0px 5px 5px 0px; - -moz-border-radius: 0px 5px 5px 0px; - border-radius: 0px 5px 5px 0px; - overflow: hidden; - border: 0px; - margin-left:2px; + **/ +#jot { + /*width: 785px;*/ + margin: 0px 0 20px 0px; + width: 100%; } -#profile-jot-submit { +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 100%; + /*background-color: #0e232e;*/ + /*border-bottom: 2px solid #9eabb0;*/ +} +#jot #jot-tools span { + float: left; + margin: 10px 20px 2px 0px; +} +#jot #jot-tools span a { + display: block; + /*color: #cccccc; */ + /*width: 100%; */ + /*height: 40px; */ + /*text-align: center;*/ + /*line-height: 40px; */ + /*overflow: hidden;*/ +} +/*#jot #jot-tools li:hover {*/ + /*background-color: #364e59;*/ +/*}*/ +#jot #jot-tools .perms { + float: right; + width: 40px; +} +/*#jot #jot-tools .perms a.unlock {*/ +/* width: 30px; */ +/* border-left: 10px solid #cccccc;*/ +/* background-color: #cccccc; */ +/*}*/ +/*#jot #jot-tools .perms a.lock {*/ +/* width: 30px; */ +/* border-left: 10px solid #666666;*/ +/* background-color: #666666; */ +/*}*/ +/*#jot #jot-tools li.submit { */ +/* float: right; */ +/* background-color: #cccccc; */ +/* border-bottom: 2px solid #cccccc; */ +/* border-right: 1px solid #666666; */ +/* border-left: 1px solid #666666; */ +/*} */ +/*#jot #jot-tools li.submit input { */ +/* border: 0px; */ +/* margin: 0px; */ +/* padding: 0px; */ +/* background-color: #cccccc; */ +/* color: #666666; */ +/* width: 80px; */ +/* height: 40px; */ +/* line-height: 40px; */ +/*} */ +/*#jot #jot-tools li.submit input:hover {*/ +/* background-color: #bdcdd4; */ +/* color: #666666; */ +/*} */ +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 100%; + font-weight: bold; + border: 1px solid #ffffff; + border-radius: 5px; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:placeholder { + font-weight: normal; +} +#jot #jot-title:hover, +#jot #jot-title:focus { + border: 1px solid #999999; + border-radius: 5px; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#profile-jot-text_tbl { + margin-bottom: 10px; +} +#profile-jot-text_ifr { + width:99.900002% !important; +} +#profile-attach-wrapper, +#profile-audio, +#profile-link-wrapper, +#profile-location, +#profile-nolocation, +#profile-title-wrapper, +#profile-upload-wrapper, +#profile-video { + float: left; + margin-left: 10px; +} +#character-counter { + float:right; + padding:8px 10px; +} +#profile-rotator-wrapper { + float: right; +} +#profile-jot-tools-end, +#profile-jot-banner-end { + clear: both; +} +#profile-jot-email-wrapper { + margin:10px 10% 0; + border:1px solid #555753; + border-bottom:0; +} +#profile-jot-email-label { + background-color:#555753; + color:#ccccce; + padding:5px; +} +#profile-jot-email { + width:90%; + margin:5px; +} +#profile-jot-networks { + margin: 0 10%; + border: 1px solid #555753; + border-top: 0; + border-bottom: 0; + padding: 5px; +} +#jot-preview-link { + margin: 0 0 0 25px; + border: 0; + text-decoration: none; +} +.icon-text-preview { + margin: 0 0 -18px 0; + display: block; + width: 20px; + height: 20px; + background: url(icons.png) no-repeat -128px -40px; + border: 0; + text-decoration: none; +} +#profile-jot-perms { + /*float: right;*/ + background-color: #555753; + height: 22px; + width: 20px; + -webkit-border-radius: 5px 0px 0px 5px; + -moz-border-radius: 5px 0px 0px 5px; + border-radius: 5px 0px 0px 5px; + overflow: hidden; + border: 0px; + margin: 0 -4px 0 10px; +} +#profile-jot-submit-wrapper { float: right; + width: 30%; + list-style: none; + margin: 10px 0 0 0; + padding: 0; +} +#profile-jot-submit-wrapper li { + display: inline-block; + vertical-align: middle; +} +#profile-jot-submit { height: 22px; background-color: #555753; color: #eeeeec; - -webkit-border-radius: 5px 0px 0px 5px; - -moz-border-radius: 5px 0px 0px 5px; - border-radius: 5px 0px 0px 5px; - border: 0px; - margin-top: 0px; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + border-radius: 0 5px 5px 0; + border: 0; + margin: 0; } -#character-counter { - float: right; padding: 8px 10px; -} -#profile-rotator-wrapper { - float: right; -} - -.jot-tool { - float: left; - margin-right: 5px; -} -#profile-jot-tools-end, -#profile-jot-banner-end { clear: both; } - -#profile-jot-email-wrapper { - margin: 10px 10% 0px 10%; - border: 1px solid #555753; - border-bottom: 0px; -} -#profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;} -#profile-jot-email { margin: 5px; width: 90%; } - -#profile-jot-networks { - margin: 0px 10%; - border: 1px solid #555753; - border-top: 0px; - border-bottom: 0px; - padding: 5px; +#jot-perms-icons { + background-color: #555753; + height: 22px; + width: 20px; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + border-radius: 0 5px 5px 0; + overflow: hidden; + border: 0; + margin: 0 0 0 94.4%; } #profile-jot-acl-wrapper { - margin: 0px 10px; + margin: 0 10px; border: 1px solid #555753; - border-top: 0px; - display:block!important; + border-top: 0; + display: block !important; } #group_allow_wrapper, #group_deny_wrapper, -#acl-permit-outer-wrapper { width: 47%; float: left; } - +#acl-permit-outer-wrapper { + width:47%; + float:left; +} #contact_allow_wrapper, #contact_deny_wrapper, -#acl-deny-outer-wrapper { width: 47%; float: right; } - -#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;} -#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;} -#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;} - +#acl-deny-outer-wrapper { + width:47%; + float:right; +} +#acl-permit-text { + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; +} +#jot-public { + background-color: #555753; + color: #ff0000; + padding: 5px; + float: left; +} +#acl-deny-text { + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; +} #acl-permit-text-end, -#acl-deny-text-end { clear: both; } - - -#jot-title-desc { +#acl-deny-text-end { + clear: both; +} +#jot-title-desc, #profile-jot-desc { color: #cccccc; } - #jot-title-wrapper { margin-bottom: 5px; } - #jot-title { border: 1px solid #cccccc; - width: 530px; + width: 90%; } #jot-title-display { font-weight: bold; } +.jothidden { + display: none; +} +#jot-preview-content { + background-color: #ffffe0; + border: 1px #aaaa00 solid; + border-radius: 3px; + padding: 3px 3px 6px 10px; +} /** * section */ -section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} +section { + margin: 20px 9% 0 9%; + font-size: 0.8em; + padding-right: 250px; +} /** tabs **/ -.tabs {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; } -.tabs li { display: inline;} -.tab { padding: 0px 5px; margin-right: 10px; } -.tab:hover { background-color: #729fcf; color: #eeeeec; border: 0px; } -.tab.active { background-color: #729fcf; color: #eeeeec; border: 0px; } +.tabs { + list-style: none; + margin: 0; + padding: 0; + border-bottom: 1px solid #729fcf; + font-size: 14px; +} +.tabs li { + display: inline; +} +.tab { + padding: 0 5px; +} +.tab:hover { + background-color: #729fcf; + color: #eeeeec; + border: 0px; +} +.tab:active { + background-color: #729fcf; + color: #eeeeec; + border: 0px; +} /** * items */ .wall-item-outside-wrapper { - margin-top: 50px; + margin-top: 15px; +} +.wall-item-outside-wrapper-end { + clear: both; +} +.wall-item-content-wrapper { + position: relative; + border-top: 1px #aaa solid; + padding: 10px; +} +.wall-item-outside-wrapper .wall-item-comment-wrapper { + /*margin-left: 90px;*/ +} +.wall-item-content-wrapper.shiny { + background: #efefcf; + border-right: 3px solid #ffd398; +} +.wall-item-content { + overflow-x: auto; +} +[id^="tread-wrapper"], [class^="tread-wrapper"] { + margin: 5px 0; + border: 1px #aaa solid; + border-radius: 5px; + padding: 10px; +} +.wall-item-photo-menu { + display: none; } -.wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { position: relative; } -.wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { - display:none; - text-indent: -99999px; - background: #555753 url("menu-user-pin.jpg") no-repeat 75px center; - position: absolute; - overflow: hidden; - height: 20px; width: 90px; - top: 85px; left: 0px; - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; - - + display:none; + text-indent:-99999px; + background:#555753 url(menu-user-pin.jpg) no-repeat 75px center; + position:absolute; + overflow:hidden; + height:20px; + width:90px; + top:85px; + left:0; + -webkit-border-radius:0 0 5px 5px; + -moz-border-radius:0 0 5px 5px; + border-radius:0 0 5px 5px; } - -.wall-item-info { float: left; width: 140px; } -.wall-item-photo-wrapper { - width: 80px; height: 80px; - position: relative; - padding: 5px; - background-color: #555753; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; +.wall-item-info { + float: left; + width: 110px; } - - -.wall-item-tools { - float: right; - /*height: 0px; - padding-top: 20px; - overflow:hidden; - background: #ffffff url("icons.png") no-repeat -50px -40px;*/ - filter: alpha(opacity=20); - opacity: 0.2; - -webkit-transition: all 1s ease-in-out; - -moz-transition: all 1s ease-in-out; - -o-transition: all 1s ease-in-out; - -ms-transition: all 1s ease-in-out; - transition: all 1s ease-in-out; +.wall-item-photo-wrapper { + width: 80px; + height: 80px; + position: relative; + padding: 5px; + background-color: #555753; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { + margin: 0 0 10px 0; +} +.wall-item-tools { + float: right; + filter: alpha(opacity=35); + opacity: 0.4; + -webkit-transition: all 1s ease-in-out; + -moz-transition: all 1s ease-in-out; + -o-transition: all 1s ease-in-out; + -ms-transition: all 1s ease-in-out; + transition: all 1s ease-in-out; } .wall-item-tools:hover { - /*height:auto;*/ - filter: alpha(opacity=100); - opacity: 1; - -webkit-transition: all 1s ease-in-out; - -moz-transition: all 1s ease-in-out; - -o-transition: all 1s ease-in-out; - -ms-transition: all 1s ease-in-out; - transition: all 1s ease-in-out; - + filter: alpha(opacity=100); + opacity: 1; + -webkit-transition: all 1s ease-in-out; + -moz-transition: all 1s ease-in-out; + -o-transition: all 1s ease-in-out; + -ms-transition: all 1s ease-in-out; + transition: all 1s ease-in-out; +} +.wall-item-title { + font-size: 1.2em; + font-weight: bold; + margin-bottom: 1em; +} +.wall-item-body { + margin: 10px 10px 10px 0px; + text-align: left; +} +.wall-item-lock-wrapper { + float: right; } - -.wall-item-title { font-size: 1.2em; font-weight: bold;} -.wall-item-body { margin-left: 140px;} -.wall-item-lock-wrapper { float: right; } .wall-item-dislike, -.wall-item-like, -.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;} -.wall-item-ago { display: inline; padding-left: 10px;} -.wall-item-wrapper-end { clear:both; } +.wall-item-like { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 0 0 140px; +} +.wall-item-author, .wall-item-actions-author { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 0 0 140px; +} +.wall-item-ago { + display: inline; + padding-left: 10px; +} +.wall-item-wrapper-end { + clear:both; +} .wall-item-location { - margin-top:5px; - width: 100px; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; + margin-top: 5px; + width: 100px; + overflow:hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.wall-item-location .icon { + float: left; +} +.wall-item-location > a { + margin-left: 25px; + font-size: 0.7em; + display: block; +} +.wall-item-location .smalltext { + margin-left: 25px; + font-size: 0.7em; + display: block; +} +.wall-item-location > br { + display: none; } -.wall-item-location .icon { float: left; } -.wall-item-location > a { margin-left: 25px; font-size: 0.7em; display: block;} -.wall-item-location .smalltext { margin-left: 25px; font-size: 0.7em; display: block;} -.wall-item-location > br { display: none; } - .wallwall .wwto { - left: -10px; + left:-10px; margin: 0; - position: absolute; - top: 65px; + position:absolute; + top:65px; width: 30px; - z-index: 10001; - width: 30px; - height: 30px; - + z-index:10001; + width:30px; + height:30px; +} +.wallwall .wwto img { + width: 30px !important; + height: 30px !important; +} +.wallwall .wall-item-photo-end { + clear: both; } -.wallwall .wwto img { width: 30px!important; height: 30px!important;} -.wallwall .wall-item-photo-end { clear: both; } .wall-item-arrowphoto-wrapper { position: absolute; left: 20px; top: 70px; z-index: 10002; } - .wall-item-photo-menu { min-width: 92px; border: 2px solid #FFFFFF; @@ -487,85 +1151,158 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} -moz-border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px; } -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; } -.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; } +.wall-item-photo-menu ul { + margin:0px; + padding: 0px; + list-style: none; +} +.wall-item-photo-menu li a { + white-space: nowrap; + display: block; + padding: 5px 2px; + color: #eeeeec; +} +.wall-item-photo-menu li a:hover { + color: #555753; + background: #eeeeec; +} +#item-delete-selected { + overflow: auto; + width: 100%; +} + -.icon.drop, -.icon.drophide { float: left; } -#item-delete-selected { overflow: auto; width: 100%} /** * comment */ - - .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; } - -.wall-item-outside-wrapper.comment { margin-left: 80px; } -.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;} -.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; } -.wall-item-outside-wrapper.comment .wall-item-photo-menu-button { - width: 50px; top: 45px; background-position: 35px center; +.ccollapse-wrapper { + font-size: 0.9em; + margin-left: 80px; +} + +.wall-item-outside-wrapper.comment { + margin-left: 80px; +} +.wall-item-outside-wrapper.comment .wall-item-photo { + width: 40px!important; + height: 40px!important; +} +.wall-item-outside-wrapper.comment .wall-item-photo-wrapper { + width: 40px; + height: 40px; +} +.wall-item-outside-wrapper.comment .wall-item-photo-menu-button { + width: 50px; + top: 45px; + background-position: 35px center; +} +.wall-item-outside-wrapper.comment .wall-item-info { + width: 60px; +} +.wall-item-outside-wrapper.comment .wall-item-body { + margin-left: 10px; +} +.wall-item-outside-wrapper.comment .wall-item-actions-author { + margin-left: 60px; } -.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; } -.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;} -.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu { - min-width: 50px; - top: 60px; + min-width: 50px; + top: 60px; +} +.comment-wwedit-wrapper { + /*margin: 30px 0px 0px 80px;*/ +} +.comment-edit-wrapper { + border-top: 1px #aaa solid; } - - -.comment-wwedit-wrapper, -.comment-edit-wrapper { margin: 30px 0px 0px 80px;} .comment-wwedit-wrapper img, -.comment-edit-wrapper img { width: 20px; height: 20px; } -.comment-edit-photo-link { float: left; width: 40px;} -.comment-edit-text-empty { width: 80%; height: 20px; border: 0px; color: #babdb6; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; +.comment-edit-wrapper img { + width: 20px; + height: 20px; } -.comment-edit-text-empty:hover { color: #999999;} -.comment-edit-text-full { width: 80%; height: 6em; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; +.comment-edit-photo-link { + float: left; + width: 40px; } -.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; } -.comment-edit-submit { - height: 22px; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; +.my-comment-photo { + width: 40px; + height: 40px; + padding: 5px; +} +[class^="comment-edit-text"] { + margin: 5px 0 10px 20px; + width: 86.5%; +} +.comment-edit-text-empty { + height: 20px; + border: 2px #babdd6 solid; border-radius: 5px; - border: 0px; + color: #babdb6; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; } +.comment-edit-text-empty:hover { + color: #999999; +} +.comment-edit-text-full { + height: 10em; + border-radius: 5px; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; +} +.comment-edit-submit-wrapper { + width: 90%; + margin-left: 0px; + text-align: right; +} +.comment-edit-submit { + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0; +} + /** * item text style **/ .wall-item-body code { - border-color: #CCCCCC; - border-style: solid; - border-width: 1px 1px 1px 10px; - display: block; - padding-left: 10px; + display:block; + padding-left:10px; + border-color:#ccc; + border-style:solid; + border-width:1px 1px 1px 10px; } + /** * profile **/ - -div[id$="text"] { font-weight: bold; border-bottom: 1px solid #cccccc; } -div[id$="wrapper"] { height: 100%; margin-bottom: 1em; } -div[id$="wrapper"] br { clear: left; } -#advanced-profile-with { margin-left: 200px; } +div[id$="text"] { + font-weight: bold; + border-bottom: 1px solid #ccc; +} +div[id$="wrapper"] { + height: 100%; + margin-bottom: 1em; +} +div[id$="wrapper"] br { + clear: left; +} +#advanced-profile-with { + margin-left: 200px; +} + /** * photos @@ -575,202 +1312,333 @@ div[id$="wrapper"] br { clear: left; } overflow: auto; } #photo-top-links { - margin-bottom:30px; + margin-bottom: 30px; } .photo-album-image-wrapper, -.photo-top-image-wrapper { - float: left; - margin: 0px 10px 10px 0px; - -moz-box-shadow: 0px 0px 5px #888; - -webkit-box-shadow: 0px 0px 5px #888; - box-shadow: 0px 0px 5px #888; - background-color: #eeeeee; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - - padding-bottom: 30px; - position:relative; - +.photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #eee; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 30px; + position: relative; + margin: 0 10px 10px 0; } -#photo-photo { max-width: 100% } -#photo-photo img { max-width: 100% } - +#photo-photo { + max-width: 100%; +} +#photo-photo img { + max-width: 100%; +} .photo-top-image-wrapper a:hover, #photo-photo a:hover, -.photo-album-image-wrapper a:hover { - border-bottom: 0px; +.photo-album-image-wrapper a:hover { + border-bottom: 0; } - -.photo-top-photo, -.photo-album-photo { - -webkit-border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; - } - -.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;} -.caption { position: absolute; bottom: 0px; margin: 0px 5px} - - -#photo-photo{ +.photo-top-photo,.photo-album-photo { + -webkit-border-radius:5px 5px 0 0; + -moz-border-radius:5px 5px 0 0; + border-radius:5px 5px 0 0; +} +.photo-top-album-name { + position: absolute; + bottom: 0; + padding: 0 5px; +} +.caption { + position: absolute; + bottom: 0; + margin: 0 5px; +} +#photo-photo { position: relative; float:left; } -#photo-photo-end { clear: both; } +#photo-photo-end { + clear: both; +} #photo-prev-link, -#photo-next-link{ - position: absolute; - width:30%; - height: 100%; - background-color: rgba(255,255,255,0.5); - opacity: 0; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; - background-position: center center; - background-repeat: no-repeat; - +#photo-next-link { + position:absolute; + width:30%; + height:100%; + background-color:rgba(255,255,255,0.5); + opacity:0; + -webkit-transition:all .2s ease-in-out; + -moz-transition:all .2s ease-in-out; + -o-transition:all .2s ease-in-out; + -ms-transition:all .2s ease-in-out; + transition:all .2s ease-in-out; + background-position:center center; + background-repeat:no-repeat; } -#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); } -#photo-next-link { right:0px; top:0px; background-image: url('next.png');} - -#photo-prev-link a, -#photo-next-link a{ - display: block; width: 100%; height: 100%; - overflow: hidden; - text-indent: -900000px; +#photo-prev-link { + left:0; + top:0; + background-image:url(prev.png); +} +#photo-next-link { + right:0; + top:0; + background-image:url(next.png); } +#photo-prev-link a,#photo-next-link a { + display:block; + width:100%; + height:100%; + overflow:hidden; + text-indent:-900000px; +} #photo-prev-link:hover, -#photo-next-link:hover{ - opacity: 1; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; +#photo-next-link:hover { + opacity:1; + -webkit-transition:all .2s ease-in-out; + -moz-transition:all .2s ease-in-out; + -o-transition:all .2s ease-in-out; + -ms-transition:all .2s ease-in-out; + transition:all .2s ease-in-out; } - #photo-next-link .icon, -#photo-prev-link .icon { display: none } - +#photo-prev-link .icon { + display: none; +} #photos-upload-spacer, #photos-upload-new-wrapper, -#photos-upload-exist-wrapper { margin-bottom: 1em; } +#photos-upload-exist-wrapper { + margin-bottom: 1em; +} #photos-upload-existing-album-text, -#photos-upload-newalbum-div { - background-color: #555753; - color: #eeeeec; - padding: 1px; +#photos-upload-newalbum-div { + background-color:#555753; + color:#eeeeec; + padding:1px; } #photos-upload-album-select, -#photos-upload-newalbum { width: 99% } -#photos-upload-perms-menu { text-align: right; } +#photos-upload-newalbum { + width: 99%; +} +#photos-upload-perms-menu { + text-align: right; +} /** * message */ -.prvmail-text { width: 100%;} -#prvmail-subject { width: 100%;} -#prvmail-submit-wrapper { margin-top: 10px; } +.prvmail-text { + width: 100%; +} +#prvmail-subject { + width: 100%; +} +#prvmail-submit-wrapper { + margin-top: 10px; +} #prvmail-submit { - float: right; - margin-top: 0px; + float:right; + margin-top: 0; } #prvmail-submit-wrapper > div { - margin-right: 5px; - float: left; + margin-right:5px; + float:left; +} +.mail-list-outside-wrapper { + margin-top: 20px; +} +.mail-list-sender { + float: left; +} +.mail-list-detail { + margin-left: 90px; +} +.mail-list-sender-name { + display: inline; +} +.mail-list-date { + display: inline; + font-size: 0.8em; + padding-left: 10px; +} +.mail-list-subject { + font-size: 1.5em; +} +.mail-list-delete-wrapper { + float: right; +} +.mail-list-outside-wrapper-end { + clear: both; +} +.mail-conv-sender { + float: left; + margin: 0px 5px 5px 0px; +} +.mail-conv-sender-photo { + width: 32px; + height: 32px; +} +.mail-conv-sender-name { + float: left; +} +.mail-conv-date { + float: right; +} +.mail-conv-subject { + clear: right; + font-weight: bold; + font-size: 1.2em; +} +.mail-conv-body { + clear: both; +} +.mail-conv-delete-wrapper { + margin-top: 5px; } -.mail-list-outside-wrapper { margin-top: 20px;} -.mail-list-sender { float: left; } -.mail-list-detail { margin-left: 90px; } -.mail-list-sender-name { display: inline; } -.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;} -.mail-list-subject { font-size: 1.5em;} -.mail-list-delete-wrapper { float: right; } -.mail-list-outside-wrapper-end { clear: both;} - -.mail-conv-sender {float: left; margin: 0px 5px 5px 0px } -.mail-conv-sender-photo { width: 32px; height: 32px } -.mail-conv-sender-name { float: left } -.mail-conv-date { float: right } -.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em } -.mail-conv-body { clear: both; } -.mail-conv-delete-wrapper { margin-top: 5px; } /** * contacts */ - .view-contact-wrapper, -.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; width: 120px; height: 120px; position: relative;} -.contact-entry-direction-wrapper {position: absolute; top: 20px;} -.contact-entry-edit-links { position: absolute; top: 60px; } -.contact-entry-photo { - margin-left:20px; +.contact-entry-wrapper { + float: left; + margin-right: 20px; + margin-bottom: 20px; + width: 120px; + /*height: 120px;*/ + position: relative; +} +.contact-direction-wrapper { + position: absolute; + top: 20px; +} +.contact-edit-links { + position: absolute; + top: 60px; +} +.contact-entry-photo-wrapper { + +} +.contact-entry-photo { + margin-left: 20px; +} +.contact-entry-name { + width: 120px; + font-weight: bold; + /*overflow: hidden;*/ } -.contact-entry-name { width: 120px; overflow: hidden; } .contact-entry-photo { position: relative; } - -.contact-entry-edit-links .icon { - border: 1px solid #babdb6; +.contact-entry-edit-links .icon { + border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; - border-radius: 3px; - background-color: #ffffff; + border-radius: 3px; + background-color: #fff; +} +#contact-entry-url, [id^="contact-entry-url"] { + font-size: smaller; + /*overflow: scroll;*/ +} +#contact-entry-network, [id^="contact-entry-network"] { + font-size: smaller; + font-style: italic; +} +#contact-edit-banner-name { + font-size: 1.5em; +} +#contact-edit-photo-wrapper { + position: relative; + float: left; + padding: 20px; +} +#contact-edit-direction-icon { + position:absolute; + top:60px; + left:0; +} +#contact-edit-nav-wrapper { + margin-left: 0px; +} +#contact-edit-links { + margin-top: 23px; +} +#contact-edit-links ul { + list-style-type: none; +} +#contact-drop-links { + margin-left:5px; } - -#contact-edit-banner-name { font-size: 1.5em; } -#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;} -#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;} -#contact-edit-nav-wrapper { margin-left: 210px; } -#contact-edit-links { float: left; margin-top: 23px; } -#contact-drop-links { margin-left: 5px; } #contact-edit-nav-wrapper .icon { border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -#contact-edit-poll-wrapper { margin-left: 50px; } -#contact-edit-last-update-text { margin-bottom: 15px; } -#contact-edit-last-updated { font-weight: bold; } -#contact-edit-poll-text { display: inline; } -#contact-edit-end { clear: both; margin-bottom: 65px;} +#contact-edit-poll-wrapper { + margin-left: 0px; +} +#contact-edit-last-update-text { + margin-bottom: 15px; +} +#contact-edit-last-updated { + font-weight: bold; +} +#contact-edit-poll-text { + display: inline; +} +#contact-edit-info_tbl, #contact-edit-info_parent { + width: 100%; +} +.mceLayout { + width: 100%; +} +#contact-edit-end { + clear: both; + margin-bottom: 65px; +} .contact-photo-menu-button { - position: absolute; - background-image: url("photo-menu.jpg"); - background-position: top left; - background-repeat: no-repeat; - margin: 0px; padding: 0px; - width: 16px; - height: 16px; - top: 64px; left:0px; - overflow: hidden; - text-indent: 40px; - display: none; - + position: absolute; + background-image: url("photo-menu.jpg"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px; padding: 0px; + width: 16px; + height: 16px; + top: 64px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; } .contact-photo-menu { - width: auto; - border: 2px solid #444444; - background: #FFFFFF; - position: absolute; - left: 0px; top: 90px; - display: none; - z-index: 10000; + width: auto; + border: 2px solid #444444; + background: #FFFFFF; + position: absolute; + left: 0px; top: 90px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { + margin:0px; + padding: 0px; + list-style: none; +} +.contact-photo-menu li a { + display: block; + padding: 2px; +} +.contact-photo-menu li a:hover { + color: #fff; + background: #3465A4; + text-decoration: none; } -.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.contact-photo-menu li a { display: block; padding: 2px; } -.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } @@ -779,96 +1647,121 @@ div[id$="wrapper"] br { clear: left; } */ #id_openid_url, .openid { - background: url(login-bg.gif) no-repeat; - background-position: 0 50%; - padding-left: 18px; + background:url(login-bg.gif) no-repeat; + background-position:0 50%; + padding-left:18px; } - + #settings-nickname-desc { - background-color: #DDEFFF; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 5px; + background-color:#DDEFFF; + -webkit-border-radius:5px; + -moz-border-radius:5px; + border-radius:5px; + padding:5px; } #register-form div, -#profile-edit-form div { - clear: both; +#profile-edit-form div { + clear: both; } #register-form label, #profile-edit-form label { - width: 300px; float: left; + width: 300px; + float: left; } #register-form span, -#profile-edit-form span { - color: #555753; - display:block; - margin-bottom: 20px; +#profile-edit-form span { + color:#555753; + display:block; + margin-bottom:20px; } .settings-submit-wrapper, -.profile-edit-submit-wrapper { margin: 30px 0px;} -.profile-listing { float: left; margin: 20px 20px 0px 0px} +.profile-edit-submit-wrapper { + margin: 30px 0px; +} +.profile-edit-side-div { + margin-top: 10px; +} +.profile-edit-side-link { + float: right; + margin: 10px 20px -16px 0; +} +.profile-listing { + float: left; + margin: 20px 20px 0px 0px; +} -#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } +#profile-edit-links ul { + margin: 20px 0; + padding: 0; + list-style: none; +} - -#register-sitename { display: inline; font-weight: bold;} +#register-sitename { + display: inline; + font-weight: bold; +} /** * contacts selector */ -#group-edit-desc { margin: 10px 0xp; } +#group-edit-desc { + margin: 10px 0px; +} #group-members, #prof-members { - height: 200px; - overflow: auto; - border: 1px solid #555753; - -webkit-border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; + height:200px; + overflow:auto; + border:1px solid #555753; + -webkit-border-radius:5px 5px 0 0; + -moz-border-radius:5px 5px 0 0; + border-radius:5px 5px 0 0; } #group-all-contacts, -#prof-all-contacts { - height: 200px; - overflow: auto; - border: 1px solid #555753; - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; +#prof-all-contacts { + height:200px; + overflow:auto; + border:1px solid #555753; + -webkit-border-radius:0 0 5px 5px; + -moz-border-radius:0 0 5px 5px; + border-radius:0 0 5px 5px; } #group-members h3, #group-all-contacts h3, #prof-members h3, -#prof-all-contacts h3{ - color: #eeeeec; - background-color: #555753; - margin: 0px; - padding: 5px; +#prof-all-contacts h3 { + color:#eeeeec; + background-color:#555753; + margin:0; + padding:5px; } #group-separator, -#prof-separator { display: none;} +#prof-separator { + display: none; +} /** * profile */ -#cropimage-wrapper { float:left; } -#crop-image-form { clear:both; } +#cropimage-wrapper { + float:left; +} +#crop-image-form { + clear:both; +} /** * events **/ - .clear { clear: both; } .eventcal { - float: left; - font-size: 20px; + float:left; + font-size:20px; } - .vevent { - border: 1px solid #CCCCCC; + border:1px solid #ccc; } .vevent .event-description, .vevent .event-location { margin-left: 10px; @@ -882,32 +1775,26 @@ div[id$="wrapper"] br { clear: left; } #new-event-link { margin-bottom: 10px; } - .edit-event-link, .plink-event-link { float: left; margin-top: 4px; margin-right: 4px; margin-bottom: 15px; } - .event-description:before { content: url('../../../images/calendar.png'); margin-right: 15px; } - .event-start, .event-end { margin-left: 10px; width: 330px; } - .event-start .dtstart, .event-end .dtend { float: right; } - .event-list-date { margin-bottom: 10px; } - .prevcal, .nextcal { float: left; margin-left: 32px; @@ -917,40 +1804,33 @@ div[id$="wrapper"] br { clear: left; } .event-calendar-end { clear: both; } - - .calendar { - font-family: Courier, monospace; + font-family: monospace; } .today { font-weight: bold; color: #FF0000; } - #event-start-text, #event-finish-text { margin-top: 10px; margin-bottom: 5px; } - -#event-nofinish-checkbox, -#event-nofinish-text, -#event-adjust-checkbox, +#event-nofinish-checkbox, +#event-nofinish-text, +#event-adjust-checkbox, #event-adjust-text, -#event-share-checkbox -{ - float: left; +#event-share-checkbox { + float:left; } #event-datetime-break { margin-bottom: 10px; } - -#event-nofinish-break, +#event-nofinish-break, #event-adjust-break, #event-share-break { clear: both; } - #event-desc-text, #event-location-text { margin-top: 10px; @@ -959,45 +1839,156 @@ div[id$="wrapper"] br { clear: left; } #event-submit { margin-top: 10px; } +.body-tag { + margin: 10px 0; + opacity: 0.5; + filter:alpha(opacity=50); +} +.body-tag:hover { + opacity: 1.0 !important; + filter:alpha(opacity=100) !important; +} +.item-select { + opacity: 0.1; + filter:alpha(opacity=10); + float: right; + margin-right: 10px; + +} +.item-select:hover, .checkeditem { + opacity: 1; + filter:alpha(opacity=100); +} +#item-delete-selected { + margin-top: 30px; +} + +#item-delete-selected-end { + clear: both; +} +#item-delete-selected-icon, #item-delete-selected-desc { + float: left; + margin-right: 5px; +} +#item-delete-selected-desc:hover { + text-decoration: underline; +} + /** * directory */ -.directory-item {float: left; margin: 50px 50px 0px 0px;} +.directory-item { + float: left; + margin: 50px 50px 0px 0px; +} + + +/** + * sidebar + */ +#group-sidebar { + margin-bottom: 10px; +} +.group-selected, .nets-selected { + padding: 3px; + border: 1px solid #CCCCCC; + background: #F8F8F8; + font-weight: bold; +} +.groupsideedit { + margin-right: 10px; +} +#sidebar-group-ul { + padding-left: 0; +} +#sidebar-group-list { + margin: 0 0 5px 0; +} +#sidebar-group-list ul { + list-style-type: none; + list-style-position: inside; +} +#sidebar-group-list li { + margin-top: 10px; +} +#sidebar-group-list .icon { + display: inline-block; + height: 12px; + width: 12px; +} +#sidebar-new-group { + margin: auto; + display: inline-block; + color: #efefef; + text-decoration: none; + text-align: center; +} + +#sidebar-new-group:hover { + /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ + /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ + /*background-color: #b20202;*/ +} + +#sidebar-new-group:active { + position: relative; + top: 1px; +} +.nets-ul { + list-style-type: none; + padding-left: 0px; +} +.nets-ul li { + margin: 10px 0 0; +} + +.nets-link { + margin-left: 0px; +} +.nets-all { + margin-left: 0px; +} +#netsearch-box { + margin-top: 20px; + width: 150px; +} +#netsearch-box #search-submit { + margin: 5px 0px 0px 0px; +} /** * ADMIN */ #pending-update { - float:right; - color: #ffffff; - font-weight: bold; - background-color: #FF0000; - padding: 0em 0.3em; + float:right; + color: #fff; + font-weight: bold; + background-color: #ff0000; + padding: 0 .3em; } .admin.linklist { - border: 0px; padding: 0px; + border: 0; padding: 0; } .admin.link { - list-style-position: inside; + list-style-position: inside; } - #adminpage dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid black; + clear:left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid #000; } #adminpage dt { - width: 200px; - float: left; - font-weight: bold; + width: 200px; + float: left; + font-weight: bold; } #adminpage dd { margin-left: 200px; } #adminpage h3 { - border-bottom: 1px solid #cccccc; + border-bottom:1px solid #ccc; } #adminpage .submit { @@ -1005,283 +1996,513 @@ div[id$="wrapper"] br { clear: left; } } #adminpage #pluginslist { - margin: 0px; padding: 0px; + margin: 0; + padding: 0; } #adminpage .plugin { - list-style: none; - display: block; - border: 1px solid #888888; - padding: 1em; - margin-bottom: 5px; - clear: left; + list-style: none; + display: block; + border: 1px solid #888; + padding: 1em; + margin-bottom: 5px; + clear: left; } #adminpage .toggleplugin { float:left; margin-right: 1em; } -#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #bbc7d7; } -#adminpage .selectall { text-align: right; } +#adminpage table { + width: 100%; + border-bottom: 1px solid #000; + margin: 5px 0; +} +#adminpage table th { + text-align: left; +} +#adminpage td .icon { + float: left; +} +#adminpage table#users img { + width: 16px; height: 16px; +} +#adminpage table tr:hover { + background-color:#bbc7d7; +} +#adminpage .selectall { + text-align: right; +} /** * Form fields */ .field { - margin-bottom: 10px; - padding-bottom: 10px; - overflow: auto; - width: 100% + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; } - .field label { - float: left; - width: 200px; + float: left; + width: 200px; } .field input, .field textarea { - width: 400px; + width: 400px; +} +.field textarea { + height: 100px; } -.field textarea { height: 100px; } .field_help { - display: block; - margin-left: 200px; - color: #666666; - + display: block; + margin-left: 0px; + color: #666; } - - .field .onoff { - float: left; - width: 80px; + float: left; + width: 80px; } .field .onoff a { - display: block; - border:1px solid #666666; - background-image:url("../../../images/onoff.jpg"); - background-repeat: no-repeat; - padding: 4px 2px 2px 2px; - height: 16px; - text-decoration: none; + display: block; + border: 1px solid #666; + background: url("../../../images/onoff.jpg") no-repeat; + padding: 4px 2px 2px; + height: 16px; + text-decoration: none; } .field .onoff .off { - border-color:#666666; - padding-left: 40px; - background-position: left center; - background-color: #cccccc; - color: #666666; - text-align: right; + border-color: #666; + padding-left: 40px; + background: #ccc left center; + color: #666; + text-align:right; } .field .onoff .on { - border-color:#204A87; - padding-right: 40px; - background-position: right center; - background-color: #3465A4; - color: #FFFFFF; - text-align: left; + border-color:#204a87; + padding-right:40px; + background-position:right center; + background-color:#3465A4; + color:#fff; + text-align:left; +} +.hidden { + display:none !important; +} + +.field.radio .field_help { + margin-left:0; +} + + +/* + * UPDATE + */ +.popup { + width: 100%; + height: 100%; + top:0px; + left:0px; + position: absolute; + display: none; +} +.popup .background { + background-color: rgba(0,0,0,128); + opacity: 0.5; + width: 100%; + height: 100%; + position: absolute; + top:0px; + left:0px; +} +.popup .panel { + top: 25%; + left: 25%; + width: 50%; + height: 50%; + padding: 1em; + position: absolute; + border: 4px solid #000000; + background-color: #FFFFFF; +} +#panel { + z-index: 100; +} +.grey { + color: grey; +} +.orange { + color: orange; +} +.red { + color: red; +} +.popup .panel .panel_text { + display: block; + overflow: auto; + height: 80%; +} +.popup .panel .panel_in { + width: 100%; + height: 100%; + position: relative; +} +.popup .panel .panel_actions { + width: 100%; + bottom: 4px; + left: 0px; + position: absolute; +} +.panel_text .progress { + width: 50%; + overflow: hidden; + height: auto; + border: 1px solid #cccccc; + margin-bottom: 5px; +} +.panel_text .progress span { + float: right; + display: block; + width: 25%; + background-color: #eeeeee; + text-align: right; +} + +/** + * OAuth + */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; } -.hidden { display: none!important; } -.field.radio .field_help { margin-left: 0px; } /** * ICONS */ +.iconspacer { + display: block; + width: 16px; + height: 16px; +} .icon { - display: block; width: 20px; height: 20px; - background-image: url('icons.png'); + display: block; + width: 20px; + height: 20px; + background: url(icons.png) no-repeat; + border: 0; + text-decoration: none; } -/*.icon:hover { - border-bottom: 0px; -}*/ - -.starred { - background-image: url("star.png"); - repeat: no-repeat; +.icon:hover { + border: 0; + text-decoration: none; } -.unstarred { - background-image: url("premium.png"); - repeat: no-repeat; +.icon.drop, +.icon.drophide, .icon.delete { + float: left; +} +.icon.s22 { + display: block; + background: url(icons.png) no-repeat; + width: 22px; + height: 22px; +} +.icon.s22.delete { + display: block; + background-position: -110px 0; +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.text { + text-indent: 0px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.s16 .add { + background: url("../../../images/icons/16/add.png") no-repeat; +} +.add { + margin: 0px 5px; +} +.article { + background-position: -50px 0; +} +.audio { + background-position: -70px 0; +} +.block { + background-position: -90px 0px; +} +.drop, .delete { + background-position: -110px 0; +} +.drophide { + background-position: -130px 0; +} +.edit { + background-position: -150px 0; +} +.camera { + background-position: -170px 0; +} +.dislike { + background-position: -190px 0; +} +.like { + background-position: -211px 0; +} +.link { + background-position: -230px 0; +} +.globe, .location { + background-position: -50px -20px; +} +.noglobe, .nolocation { + background-position: -70px -20px; +} +.no { + background-position: -90px -20px; +} +.pause { + background-position: -110px -20px; +} +.play { + background-position: -130px -20px; +} +.pencil { + background-position: -151px -18px; +} +.small-pencil { + background-position: -170px -20px; +} +.recycle { + background-position: -190px -20px; +} +.remote-link { + background-position: -210px -20px; +} +.share { + background-position: -230px -20px; +} +.tools { + background-position: -50px -40px; +} +.lock { + background-position: -70px -40px; +} +.unlock { + background-position: -90px -40px; +} +.video { + background-position: -110px -40px; +} +.attach { + background-position: -190px -40px; +} +.language { + background-position: -210px -40px; +} +.starred { + background-position: -130px -60px; +} +.unstarred { + background-position: -150px -60px; } - .tagged { - background-image: url("tag.png"); - repeat: no-repeat; + background-position: -170px -60px; } - - - -.border { +.on { + background-position: -50px -60px; +} +.off { + background-position: -70px -60px; +} +.prev { + background-position: -90px -60px; +} +.next { + background-position: -110px -60px; +} +.icon.dim { + opacity: 0.3; + filter: alpha(opacity=30); +} +.border, .border:hover { border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } - -.article { background-position: -50px 0px;} -.audio { background-position: -70px 0px;} -.block { background-position: -90px 0px;} -.drop { background-position: -110px 0px;} -.drophide { background-position: -130px 0px;} -.edit { background-position: -150px 0px;} -.camera { background-position: -170px 0px;} -.dislike { background-position: -190px 0px;} -.like { background-position: -210px 0px;} -.link { background-position: -230px 0px;} - -.globe { background-position: -50px -20px;} -.noglobe { background-position: -70px -20px;} -.no { background-position: -90px -20px;} -.pause { background-position: -110px -20px;} -.play { background-position: -130px -20px;} -.pencil { background-position: -150px -20px;} -.small-pencil { background-position: -170px -20px;} -.recycle { background-position: -190px -20px;} -.remote-link { background-position: -210px -20px;} -.share { background-position: -230px -20px;} - -.tools { background-position: -50px -40px;} -.lock { background-position: -70px -40px;} -.unlock { background-position: -90px -40px;} -.video { background-position: -110px -40px;} -.youtube { background-position: -130px -40px;} - -.attach { background-position: -190px -40px;} -.language { background-position: -210px -40px;} - - -.on { background-position: -50px -60px;} -.off { background-position: -70px -60px;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} - - -.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } - .attachtype { - display: block; width: 20px; height: 23px; - background-image: url('../../../images/content-types.png'); + display: block; + width: 20px; + height: 23px; + background-image: url(../../../images/content-types.png); +} +.type-video { + background-position: 0px 0px; +} +.type-image { + background-position: -20px 0; +} +.type-audio { + background-position: -40px 0; +} +.type-text { + background-position: -60px 0px; +} +.type-unkn { + background-position: -80px 0; } - -.type-video { background-position: 0px 0px; } -.type-image { background-position: -20px 0px; } -.type-audio { background-position: -40px 0px; } -.type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } - /** * footer - */ - .cc-license { margin-top: 100px; font-size: 0.7em; } -footer { display: block; margin: 50px 20%; clear: both; } - + */ +.cc-license { + margin-top: 100px; + font-size: 0.7em; +} +footer { + display: block; + margin: 50px 20%; + clear: both; +} #profile-jot-text { height: 20px; - color:#cccccc; - border: 1px solid #cccccc; + color: #666; + border: 1px solid #ccc; + border-radius: 5px; + width: 99.5%; } + + /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, -#profile-jot-acl-wrapper{ - display:block!important; +#profile-jot-acl-wrapper { + display: block !important; } - #acl-wrapper { - width: 690px; - float:left; + width: 690px; + float: left; } #acl-search { - float:right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right:20px; + float: right; + background: #fff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; } #acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 10px 7px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; - color: #999999; + float:left; + display:block; + width:auto; + height:18px; + background-color:#CCC; + background-image:url("../../../images/show_all_off.png"); + background-position:7px 7px; + background-repeat:no-repeat; + padding:7px 10px 7px 30px; + -webkit-border-radius:5px; + -moz-border-radius:5px; + border-radius:5px; + color:#999; } #acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); + color:#000; + background-color:#F90; + background-image:url(../../../images/show_all_on.png); } - #acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; + height:210px; + border:1px solid #ccc; + clear:both; + margin-top:30px; + overflow:auto; } #acl-list-content { } .acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; + display:block; + width:150px; + height:30px; + border:1px solid #ccc; + margin:5px; + float:left; } -.acl-list-item img{ - width:22px; - height: 22px; - float: left; - margin: 4px; +.acl-list-item img { + width:22px; + height:22px; + float:left; + margin:4px; } -.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0; + padding: 2px 0 1px; +} +.acl-list-item a { + font-size:8px; + display:block; + width:40px; + height:10px; + float:left; + color:#999; + background-color:#CCC; + background-position:3px 3px; + background-repeat:no-repeat; + margin-right:5px; + -webkit-border-radius:2px; + -moz-border-radius:2px; + border-radius:2px; + padding-left:15px; } #acl-wrapper a:hover { - text-decoration: none; - color:#000000; + text-decoration:none; + color:#000; +} +.acl-button-show { + background-image:url('../../../images/show_off.png'); +} +.acl-button-hide { + background-image:url('../../../images/hide_off.png'); } -.acl-button-show { background-image: url("../../../images/show_off.png"); } -.acl-button-hide { background-image: url("../../../images/hide_off.png"); } - .acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); + color:#000; + background-color:#9ade00; + background-image:url(../../../images/show_on.png); } .acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); + color:#000; + background-color:#ff4141; + background-image:url(../../../images/hide_on.png); +} +.acl-list-item.groupshow { + border-color:#9ade00; +} +.acl-list-item.grouphide { + border-color:#ff4141; } -.acl-list-item.groupshow { border-color: #9ade00; } -.acl-list-item.grouphide { border-color: #ff4141; } /** /acl **/ @@ -1295,22 +2516,44 @@ footer { display: block; margin: 50px 20%; clear: both; } border:1px solid #cccccc; } .acpopupitem { - background-color:#555753; padding: 4px; + background-color:#555753; + padding: 4px; clear:left; } .acpopupitem img { float: left; margin-right: 4px; } - .acpopupitem.selected { - color: #2e3436; background-color: #eeeeec; + color: #2e3436; + background-color: #eeeeec; +} +.qcomment-wrapper { + padding: 0px; + margin: 2px; + list-style-type: none; +} +.qcomment, .qcomment:hover { + display: inline; + padding: 5px; + margin: 5px; } .qcomment { - opacity: 0; - filter:alpha(opacity=0); + opacity: 0.5; + filter:alpha(opacity=50); } .qcomment:hover { opacity: 1.0; filter:alpha(opacity=100); } +#network-star-link { + margin-top: 10px; +} +.network-star { + float: left; + margin-right: 5px; +} +.network-star.icon.starred { + display: inline-block; +} + diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php new file mode 100644 index 000000000..c72884f1a --- /dev/null +++ b/view/theme/dispy/theme.php @@ -0,0 +1,74 @@ +theme_info = array(); + +$a->page['htmlhead'] .= <<< EOT + +EOT; diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl old mode 100755 new mode 100644 index 09cf64397..b013cfeef --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -38,7 +38,7 @@
    {{ endif }} {{ if $item.edpost }} - ' + {{ endif }}
    @@ -68,10 +68,10 @@
    $item.dislike
    -
    +
    $item.comment
    -
    +
    diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl old mode 100755 new mode 100644 index c3638094c..86453fad2 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -43,7 +43,7 @@
    {{ endif }} {{ if $item.edpost }} - ' + {{ endif }}
    @@ -59,7 +59,7 @@
    $item.body
    {{ for $item.tags as $tag }} - $tag + $tag {{ endfor }}
    @@ -72,7 +72,7 @@
    $item.dislike
    -
    +
    $item.comment
    From 09c2f81cb30a74652b81ab48ffb44cfdad097cb6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 3 Mar 2012 19:20:23 -0500 Subject: [PATCH 31/78] these are more finessing on formatting again Signed-off-by: Simon L'nu --- view/acl_selector.tpl | 2 +- view/theme/duepuntozero/wallwall_item.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 view/acl_selector.tpl diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl old mode 100755 new mode 100644 index 3f8a9e7d2..655ea8980 --- a/view/acl_selector.tpl +++ b/view/acl_selector.tpl @@ -19,7 +19,7 @@ $(document).ready(function() { if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", - [$allowcid,$allowgid,$denycid,$denygid] + [ $allowcid,$allowgid,$denycid,$denygid ] ); } }); diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index 5cb2dbc3b..211906c93 100755 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -28,8 +28,8 @@
    $item.name $item.to $item.owner_name $item.vwall
    -
    $item.ago
    -
    +
    $item.ago
    +
    $item.title
    From eae6418074d8c2addf85acf11e8f83165b847d04 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 3 Mar 2012 19:24:54 -0500 Subject: [PATCH 32/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: tag fix fix navbar fix * master: From e0e0224fa6e3a32a1e6fe22728bc35f581ba89b5 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 4 Mar 2012 05:48:06 +0100 Subject: [PATCH 33/78] some fixes in diabook --- view/theme/diabook/icons/pencil2.png | Bin 0 -> 384 bytes view/theme/diabook/jot.tpl | 4 +- view/theme/diabook/style.css | 34 +++++++-- view/theme/diabook/wall_item.tpl | 7 +- view/theme/diabook/wallwall_item.tpl | 107 +++++++++++++++++++++++++++ 5 files changed, 137 insertions(+), 15 deletions(-) create mode 100644 view/theme/diabook/icons/pencil2.png create mode 100644 view/theme/diabook/wallwall_item.tpl diff --git a/view/theme/diabook/icons/pencil2.png b/view/theme/diabook/icons/pencil2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b47d1864bbf50c59b237f8aa18d90c350b53339 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfSC_6>%uI-JIB?`F1VRzGkh&*dV1-bM*Q?!!4Hz( zJmk4Q_3`s5mt4QG@98$3^Jv+VD3|?BYuMxxMENaa92VEST{`7lHmgB+Vct}iU#x$o zAGmGue9*KRedeohw`_U%*86g^Lj-F_
    - +
    - +
    diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 5e471f621..f005ff4bd 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -114,9 +114,15 @@ .attach { background-image: url("../../../view/theme/diabook/icons/attach.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.video { background-image: url("../../../view/theme/diabook/icons/video.png"); +.video2 { background-image: url("../../../view/theme/diabook/icons/video.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } +.video { background-image: url("../../../view/theme/diabook/icons/video.png"); + display: block; width: 100%; height: 28px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } .audio { background-image: url("../../../view/theme/diabook/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } @@ -129,6 +135,8 @@ .unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } +.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} @@ -138,7 +146,7 @@ .block { background-position: -90px 0px;} /*.drop { background-position: -110px 0px;}*/ /*.drophide { background-position: -130px 0px;}*/ -.edit { background-position: -150px 0px;} +/*.edit { background-position: -150px 0px;}*/ /*.camera { background-position: -170px 0px;}*/ /*.dislike { background-position: -190px 0px;}*/ /*.like { background-position: -210px 0px;}*/ @@ -1000,16 +1008,21 @@ section { padding: 0px 0px 0px 10px; } .tabs { - background-image: url("../../../view/theme/diabook/icons/head.jpg"); + background-position: 0 -20px; background-repeat: repeat-x; - border-bottom: 1px solid #BABDB6; + height: 27px; padding: 0; } .tab.button { margin-right: 15px; margin-left: 15px; + background: none repeat scroll 0 0 #F8F8F8; + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bold; + padding: 3px; } /* wall item */ .tread-wrapper { @@ -1162,7 +1175,7 @@ section { display: none; } .wall-item-comment-wrapper textarea { - height: 1.2em; + height: 2.0em; width: 100%; font-size: 10px; color: #999999; @@ -1312,13 +1325,12 @@ section { margin: 0px 2em 20px 0px; } #profile-jot-form #profile-jot-text { - height: 1.2em; + height: 3.0em; width: 99%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; - margin-top: 30px; margin-bottom: 10px; } #jot #jot-tools { @@ -1658,7 +1670,13 @@ ul.tabs li { margin-left: 7px; } ul.tabs li .active { - border-bottom: 1px solid #3465A4; + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; } /** * Form fields diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 20131c7d1..0a02ba812 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -5,9 +5,6 @@
    {{ endif }} - - -
    @@ -32,7 +29,6 @@
    - {{ if $item.title }}

    $item.title

    {{ endif }} $item.body
    @@ -63,7 +59,8 @@ {{ if $item.vote.share }} {{ endif }} - + + {{ if $item.star }} $item.star.do diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl new file mode 100644 index 000000000..08ea36781 --- /dev/null +++ b/view/theme/diabook/wallwall_item.tpl @@ -0,0 +1,107 @@ +{{ if $item.indent }}{{ else }} +
    + $item.star.starred + {{ if $item.lock }}$item.lock{{ endif }} + +
    +{{ endif }} +
    +
    +
    +
    + + $item.owner_name + +
    +
    + + $item.name + + menu + + +
    +
    +
    + $item.name + $item.to $item.owner_name + $item.vwall -   + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
    +
    + {{ if $item.title }}

    $item.title

    {{ endif }} + $item.body +
    +
    +
    +
    +
    +
    + {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
    +
    +
    +
    + +
    +
    +
    $item.location 
    +
    + + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + $item.star.undo + $item.star.tagger + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
    + +
    + + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
    + +
    +
    +
    +
    + +
    $item.dislike
    +
    +
    + +
    + $item.comment +
    +tb \ No newline at end of file From c28ce8a79cae9721bc5291f7ef7d17674d29ebf3 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 05:00:35 -0500 Subject: [PATCH 34/78] tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P Signed-off-by: Simon L'nu --- view/theme/dispy/jot-header.tpl | 39 +++++++++++++++++++++++++++++---- view/theme/dispy/style.css | 5 ++--- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 0a559aae7..23883036b 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -4,10 +4,11 @@ var editor=false; var textlen = 0; var plaintext = '$editselect'; +// this is here because of the silly tinymce error. didn't help. var skin = 'default'; -function initEditor(cb){ - if (editor==false){ +function initEditor(cb) { + if (editor==false) { $("#profile-jot-text-loading").show(); if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); @@ -22,7 +23,8 @@ function initEditor(cb){ cb(); } return; - } + } + tinyMCE.init({ theme : "advanced", skin : "default", @@ -100,7 +102,36 @@ function initEditor(cb){ ed.pasteAsPlainText = true; $("#profile-jot-text-loading").hide(); $(".jothidden").show(); - if (typeof cb!="undefined") cb(); + + if (typeof cb!="undefined") { cb(); } + + // character count part deux + // + // get # of chars + var textlen = $('#profile-jot-text').val().length(); + $('#character-counter').html(textlen); + + $('#profile-jot-text').keyup(function() { + $('#character-counter').removeClass('jothidden'); + 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'); + } + // get new len + $('#character-counter').html($(this).val().length); + }); + }); } }); diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index f0929094c..8d7bbc630 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -988,7 +988,7 @@ section { } .wall-item-content-wrapper { position: relative; - border-top: 1px #aaa solid; + border-left: 1px #aaa solid; padding: 10px; } .wall-item-outside-wrapper .wall-item-comment-wrapper { @@ -996,7 +996,6 @@ section { } .wall-item-content-wrapper.shiny { background: #efefcf; - border-right: 3px solid #ffd398; } .wall-item-content { overflow-x: auto; @@ -1039,7 +1038,7 @@ section { border-radius: 5px; } [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { - margin: 0 0 10px 0; + margin: 0 0 5px 0; } .wall-item-tools { float: right; From 46783d9189c5243caef72689d91ac80f7bf8f40b Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 05:02:28 -0500 Subject: [PATCH 35/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From cb57a0ebfd805559df8df2ac7d478dffb740fdde Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 05:19:49 -0500 Subject: [PATCH 36/78] soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 8d7bbc630..4d5f51eb2 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -980,22 +980,25 @@ section { /** * items */ -.wall-item-outside-wrapper { - margin-top: 15px; +.wall-item-outside-wrapper { + border: 1px solid #aaa; + border-radius: 5px; +} +.wall-item-outside-wrapper.comment { + margin-top: 5px; } .wall-item-outside-wrapper-end { clear: both; } .wall-item-content-wrapper { position: relative; - border-left: 1px #aaa solid; - padding: 10px; + padding: 10px; } .wall-item-outside-wrapper .wall-item-comment-wrapper { /*margin-left: 90px;*/ } .wall-item-content-wrapper.shiny { - background: #efefcf; + background: #efefdf; } .wall-item-content { overflow-x: auto; From 20d37f2e3ec7736ebf04e4c637398eee0aea78a5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 4 Mar 2012 02:25:32 -0800 Subject: [PATCH 37/78] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index b464d2525..81e84d372 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1269' ); +define ( 'FRIENDICA_VERSION', '2.3.1270' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); From 8e49b4332cf697a1525ca14d598e6fc5cd505cdf Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 4 Mar 2012 14:19:53 +0100 Subject: [PATCH 38/78] style.css fix --- view/theme/diabook/style.css | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index f005ff4bd..309e7b842 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1005,24 +1005,24 @@ section { display: table-cell; vertical-align: top; width: 800px; - padding: 0px 0px 0px 10px; + padding: 0px 0px 0px 12px; } .tabs { background-position: 0 -20px; background-repeat: repeat-x; - height: 27px; padding: 0; } .tab.button { - margin-right: 15px; - margin-left: 15px; - background: none repeat scroll 0 0 #F8F8F8; + margin-right: 5px; + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; border-radius: 3px 3px 3px 3px; - font-weight: bold; + font-weight: normal; padding: 3px; + color: #333333; } /* wall item */ .tread-wrapper { @@ -1663,15 +1663,14 @@ section { ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 13px; + font-size: 12px; } ul.tabs li { float: left; - margin-left: 7px; + margin-left: 5px; } ul.tabs li .active { - background-color: #33ACFF; - background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + background-color: #333333; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; From d98ca8e127eca8cee1953012e0bda5f3fee16672 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 12:19:43 -0500 Subject: [PATCH 39/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: revup * master: From 5f77aff48692d7fbf286b5a1b5476c652a1b608f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 12:21:08 -0500 Subject: [PATCH 40/78] more tweakage. stylesheet and jot-header Signed-off-by: Simon L'nu --- view/theme/dispy/jot-header.tpl | 56 ++++++++++++++++----------------- view/theme/dispy/style.css | 5 ++- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 23883036b..93df84aae 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -104,34 +104,6 @@ function initEditor(cb) { $(".jothidden").show(); if (typeof cb!="undefined") { cb(); } - - // character count part deux - // - // get # of chars - var textlen = $('#profile-jot-text').val().length(); - $('#character-counter').html(textlen); - - $('#profile-jot-text').keyup(function() { - $('#character-counter').removeClass('jothidden'); - 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'); - } - // get new len - $('#character-counter').html($(this).val().length); - }); - }); } }); @@ -146,10 +118,38 @@ function initEditor(cb) { } } +function charCounter() { + // character count part deux + $('#profile-jot-text').keyup(function(event) { + var textlen = $(this).val().length(); + var maxLen1 = 140; + var maxLen2 = 420; + + $('#character-counter').removeClass('jothidden'); + if(textlen <= maxLen1) { + $('#character-counter').removeClass('red'); + $('#character-counter').removeClass('orange'); + $('#character-counter').addClass('grey'); + } + if((textlen > maxLen1) && (textlen <= maxLen2)) { + $('#character-counter').removeClass('grey'); + $('#character-counter').removeClass('red'); + $('#character-counter').addClass('orange'); + } + if(textlen > maxLen2) { + $('#character-counter').removeClass('grey'); + $('#character-counter').removeClass('orange'); + $('#character-counter').addClass('red'); + } + $('#character-counter').html($(this).val().length); + }); +} + function enableOnUser(){ if (editor) return; $(this).val(""); initEditor(); + charCounter(); } diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 4d5f51eb2..95bc1c6f7 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -918,9 +918,12 @@ aside #viewcontacts { #acl-deny-text-end { clear: both; } -#jot-title-desc, #profile-jot-desc { +#jot-title-desc { color: #cccccc; } +#profile-jot-desc { + color: #a00; +} #jot-title-wrapper { margin-bottom: 5px; } From e3ad02d0ddcfa5789f859167737a1f64920ca682 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 14:53:57 -0500 Subject: [PATCH 41/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 25510453bfb00b56ba8f4dd7f78c9a04542fafee Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 14:55:09 -0500 Subject: [PATCH 42/78] fix up toolbar so the notifications line up better together Signed-off-by: Simon L'nu --- view/theme/dispy/nav.tpl | 9 ++++--- view/theme/dispy/style.css | 50 +++++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 67a263519..867751310 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -11,6 +11,10 @@ works --> {{ if $nav.help }} $nav.help.1 {{ endif }} + {{ if $nav.community }} + $nav.community.1 + {{ endif }} {{ if $nav.apps }} $nav.apps.1 {{ endif }} @@ -28,10 +32,6 @@ works -->
  • $emptynotifications
    • {{ endif }} - {{ if $nav.community }} - $nav.community.1 - {{ endif }} {{ if $nav.network }} $nav.network.1 @@ -106,6 +106,7 @@ works --> {{ endif }}
    +
    diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 95bc1c6f7..08db11033 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -81,17 +81,18 @@ mark { font-weight: bold; } /* Redeclare monospace font family: h5bp.com/j */ -pre, code, kbd, samp { +pre, code, kbd, samp, .wall-item-body code { font-family: monospace, monospace; _font-family: 'courier new', monospace; font-size: 1em; } /* Improve readability of pre-formatted text in all browsers */ -pre { +pre, .wall-item-body code { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } + q { quotes: none; } @@ -287,6 +288,11 @@ ul#user-menu-popup li a.nav-sep { } #nav-buttons { clear: both; + list-style: none; + padding: 0px; +} +#nav-buttons li { + padding: 0; } nav .nav-link { float: right; @@ -469,17 +475,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 30px; height: 19px; background: transparent url(notifications.png) 0 0 no-repeat; - color: #fff; + color: #222; font-weight: bold; font-size: 0.8em; padding-top: 0.2em; text-align: center; float: left; - margin-right: -4px; - display: none; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; } .nav-ajax-update.show, .nav-ajax-left.show { - display: block; + visibility: visible; } #net-update { background-position: 0px 0px; @@ -1431,6 +1438,37 @@ div[id$="wrapper"] br { #photos-upload-perms-menu { text-align: right; } +#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { + float: left; + margin-bottom: 25px; +} +#photo-edit-link-wrap { + margin-bottom: 15px; +} +#photo-edit-caption { + width: 100%; +} +#photo-edit-newtag { + width: 100%; +} +#photo-like-div { + margin-bottom: 25px; +} +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end { + clear: both; +} +#photo-edit-delete-button { + margin-left: 200px; +} +#photo-edit-end { + margin-bottom: 35px; +} +#photo-caption { + font-size: 110%; + font-weight: bold; + margin-top: 15px; + margin-bottom: 15px; +} /** * message From 6b8cb80ea3320babcfa8c697c2f99e3d3811b199 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 15:27:10 -0500 Subject: [PATCH 43/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 2441babbe92a804d9d1803a0c7c224cd0a4722da Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 15:52:50 -0500 Subject: [PATCH 44/78] removed extra padding/border on tread-wrapper (heh, tea read :P) Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 08db11033..23f0539d0 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -956,9 +956,10 @@ aside #viewcontacts { * section */ section { - margin: 20px 9% 0 9%; + margin: 20px 8% 0 6%; font-size: 0.8em; padding-right: 250px; + min-width: 475px; } /** tabs **/ @@ -1014,10 +1015,10 @@ section { overflow-x: auto; } [id^="tread-wrapper"], [class^="tread-wrapper"] { - margin: 5px 0; - border: 1px #aaa solid; - border-radius: 5px; - padding: 10px; + margin: 15px 0 0 0; + /*border: 1px #aaa solid;*/ + /*border-radius: 5px;*/ + padding: 0px; } .wall-item-photo-menu { display: none; From cd5a11bb0f29d94d3503a74cbf974c4eaf0633fe Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 4 Mar 2012 13:39:17 -0800 Subject: [PATCH 45/78] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 81e84d372..362b49e9f 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1270' ); +define ( 'FRIENDICA_VERSION', '2.3.1271' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); From b2035ae0c610ac75aee3138c6eb904460f9016cf Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 4 Mar 2012 17:29:00 -0500 Subject: [PATCH 46/78] improved contrast in acl selector, and preview (darkzero) --- view/theme/darkzero/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index fdaf26f19..fa0e254c7 100755 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -92,3 +92,11 @@ blockquote { background: #ddd; color: #000; } + +.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net { + color: #000000; +} + +input#acl-search { + background-color: #aaa; +} From efb60e603cb8a76f96f5f5ff491af7e1b46f1bf0 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 17:47:17 -0500 Subject: [PATCH 47/78] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 4134fd3dcee1b26b888c89c47f798fd3fd058064 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 4 Mar 2012 16:26:16 -0800 Subject: [PATCH 48/78] unused replacement variable displays %1 in all html2bbcode 'code' blocks --- include/html2bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 51d629940..32a90d7d6 100755 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -212,7 +212,7 @@ function html2bbcode($message) node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]'); node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]'); - node2bbcode($doc, 'code', array(), '[code]$1', '[/code]'); + node2bbcode($doc, 'code', array(), '[code]', '[/code]'); $message = $doc->saveHTML(); From 1653e5a615a7165852f1b7cb5e699bd40ab35268 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 5 Mar 2012 02:45:24 +0100 Subject: [PATCH 49/78] fixes in diabook --- view/theme/diabook/jot.tpl | 15 ++++++++------- view/theme/diabook/style.css | 14 +++++++++----- view/theme/diabook/wallwall_item.tpl | 3 +-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 4f784c3f8..59066a19c 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -45,23 +45,25 @@
    - - - + + $preview +
    $bang
    -
    $jotplugins
    - +
    +
    +
    +
    @@ -75,9 +77,8 @@
    -
    -
    +
    {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 309e7b842..06ddf6de1 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -384,9 +384,7 @@ body { font-size: 13px; background-color: #ffffff; color: #2d2d2d; - margin-left: : auto; - margin-right: auto; - margin-top: 50px; + margin: 50px auto auto; display: table; } h4 { @@ -1045,6 +1043,8 @@ section { display: table; width: 780px; } + + .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; } @@ -1221,8 +1221,12 @@ section { border-right: 1px solid #A7C7F7; padding-right: 12px; } + +#jot-preview-content{ + margin-top: 30px;} + #jot-preview-content .tread-wrapper { - background-color: #fce94f; + background-color: #fff797; } .wall-item-tags { @@ -1663,7 +1667,7 @@ section { ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 12px; + font-size: 13px; } ul.tabs li { float: left; diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index 08ea36781..effb7273f 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -103,5 +103,4 @@
    $item.comment -
    -tb \ No newline at end of file +
    \ No newline at end of file From e52891d8abc02635b8d4294b7b9dbb17230ed16a Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 5 Mar 2012 03:08:58 +0100 Subject: [PATCH 50/78] fixes in diabook --- view/theme/diabook/jot.tpl | 29 ++++++++++++++-------------- view/theme/diabook/style.css | 14 +++++++++----- view/theme/diabook/wallwall_item.tpl | 3 +-- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 4f784c3f8..387eb1f91 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -21,47 +21,49 @@
    -
    +
    -
    +
    -