From 42d622d6bfb5768205573cb6b149340d28f46886 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 9 Mar 2012 02:50:57 -0800 Subject: [PATCH 01/19] recover contacts total count which got lost --- mod/contacts.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index c99ac14520..001bf12af4 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -447,9 +447,10 @@ function contacts_content(&$a) { $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ", intval($_SESSION['uid'])); - if(count($r)) + if(count($r)) { $a->set_pager_total($r[0]['total']); - + $total = $r[0]['total']; + } @@ -518,7 +519,7 @@ function contacts_content(&$a) { $o .= replace_macros($tpl,array( '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$tabs' => $t, - '$total' => $r[0]['total'], + '$total' => $total, '$search' => $search_hdr, '$desc' => t('Search your contacts'), '$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""), From 9f441731af6929272b27ad9097235aab82f25b29 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 9 Mar 2012 13:23:38 +0100 Subject: [PATCH 02/19] fixes in css --- view/theme/diabook-blue/comment_item.tpl | 35 ------------------------ view/theme/diabook-blue/nav.tpl | 4 +-- view/theme/diabook-blue/style.css | 16 +++++++---- view/theme/diabook/comment_item.tpl | 35 ------------------------ view/theme/diabook/nav.tpl | 4 +-- view/theme/diabook/style.css | 15 ++++++---- 6 files changed, 23 insertions(+), 86 deletions(-) delete mode 100644 view/theme/diabook-blue/comment_item.tpl delete mode 100644 view/theme/diabook/comment_item.tpl diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl deleted file mode 100644 index 85176732b7..0000000000 --- a/view/theme/diabook-blue/comment_item.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - - {{ if $qcomment }} -
    - {{ for $qcomment as $qc }} -
  • $qc
    • - {{ endfor }} -
- {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index d0ff066737..289581c36a 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -140,8 +140,8 @@
-
$langselector
-
+
$langselector
+
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 5b7a3f3d67..7f5fe1fecf 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -515,7 +515,7 @@ header { top: 0px; margin: 0px; padding: 0px; - width: 20%; + width: 22%; height: 32px; background: #1872a2; background-color: #1872a2; @@ -529,8 +529,9 @@ header #site-location { } header #banner { overflow: hidden; - text-align: center; - width: 100%; + text-align: banner; + width: 82%; + margin-left: 25%; } header #banner a, header #banner a:active, @@ -556,12 +557,12 @@ nav { width: 80%; height: 32px; position: fixed; - left: 20%; + left: 22%; top: 0px; padding: 0px; background: #1872a2; - color: #1872a2; - z-index: 100; + color: #ffffff; + z-index: 99; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -1036,6 +1037,9 @@ section { width: 800px; padding: 0px 0px 0px 12px; } +#contact-edit-end { + margin-top: 140%; + } .pager { padding: 10px; text-align: center; diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl deleted file mode 100644 index 85176732b7..0000000000 --- a/view/theme/diabook/comment_item.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - - {{ if $qcomment }} -
    - {{ for $qcomment as $qc }} -
  • $qc
    • - {{ endfor }} -
- {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index d0ff066737..289581c36a 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -140,8 +140,8 @@
-
$langselector
-
+
$langselector
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index bccfea149e..6e3909ab4f 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -515,7 +515,7 @@ header { top: 0px; margin: 0px; padding: 0px; - width: 20%; + width: 22%; height: 32px; background: #000; z-index: 100; @@ -528,8 +528,9 @@ header #site-location { } header #banner { overflow: hidden; - text-align: center; - width: 100%; + text-align: left; + width: 82%%; + margin-left: 25%; } header #banner a, header #banner a:active, @@ -555,12 +556,12 @@ nav { width: 80%; height: 32px; position: fixed; - left: 20%; + left: 22%; top: 0px; padding: 0px; background: #000; color: #ffffff; - z-index: 100; + z-index: 99; -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); @@ -1035,12 +1036,14 @@ section { width: 800px; padding: 0px 0px 0px 12px; } +#contact-edit-end { + margin-top: 140%; + } .pager { padding: 10px; text-align: center; font-size: 1.0em; } - .tabs { background-position: 0 -20px; From 8fe4645a5d97a66b823744248698c624f7146d5b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 9 Mar 2012 18:15:27 +0100 Subject: [PATCH 03/19] add js to hide nav-menus, when clicked outside --- view/theme/diabook-blue/icons/starred.png | Bin 1617 -> 501 bytes view/theme/diabook-blue/theme.php | 66 ++++++++++++++++++++++ view/theme/diabook/icons/starred.png | Bin 1617 -> 501 bytes view/theme/diabook/nav.tpl | 2 + view/theme/diabook/theme.php | 66 ++++++++++++++++++++++ 5 files changed, 134 insertions(+) create mode 100755 view/theme/diabook-blue/theme.php create mode 100755 view/theme/diabook/theme.php diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png index 72a49c157c8ccf21376e953984ffc30c6fe78b06..2b82dfca319a3a370d8c7e1242b792fbbf963c86 100755 GIT binary patch delta 430 zcmV;f0a560-7Gk*;$5r>!!W&i*IbxA})R5;6p(?4qz zVGsuJ-+PzbMLkIn)J}^P_7L&`#KOiVjR7kQMFg9GDEdLP(Mqtg6bnJHu+=6u3L-0R zqhO;mhjAzDcg$|kn|6%H z=70jQ+EnLM)QCv3sfq#d1P*=V{$~j9ZbxlUNi_17rOilQO$GBZr zCXjR1ODV~D@ALk~Y7lA)#Ztt!y5f}5zdPs<;7}xWdrv|;K2~wCtmzdT41&yV`UhOX z6?_Wc5bKe4Tx0C?Jslgn=#RTRd5V~?km60yOw z#j4O1i#9?@G<~Q|glKEWu9Y?zYnl`%LaHX?YkSDeczS1?KGX&3h8-=4J>nr&`~el} zf?ZcAm8yb}D%Mm8RH>*NRLsJUnU+8~t8>5eo$q}2TwTb0>VJlz$_UsDV(nB*qOrOr zcKt+#SDB!|gzH6Nv0h&SaKljXk9hI}2Ee_Uo$LP@6HOU;VC)9E&B)sX<1%E=d!dfO zybH`-io+OkyMerJtgbz9*b&Nq^LJx8*CDvipMa|BOx58_jzem<;2R0~`SUXz9}{z!VsTtDWU{fjwZ9 z{CIJBh&O`u+B*Zj@xey-tTW_%-IV1DFb&4-XzN^M#JSp8s0}&4yzic=0|hYt3gh}v zC$le5wWWc6=7fwY=SFzTKfO4_TcN5i4fHb~>7KI!ynhavZ(Uuf4*3scurln;W}0sK zEHDe%De6cxEqoLLhbkomRU`oq(fD|DsiWzRS#2JUs~71Z5jdQubhFT#N>r}v3%<8~ zDjc2rEwmjpYymnc?IV~0Dl zd=x$_1o&J+qKR-(1YAL+cQNWVUo#Jxi{_j;k1$V~r_2*(*_<=qG?zvUt74U{BEovZ znzs&FXRKm!6YHQ=w&tyaR^^!&@KSe8zo1O9WPfTSGpr+t*g)g6g+vh{A(oe8fQ4>& zMf>eeEDqcDaZwCICBP1ETDu~k7vlqR4@>IPmT2KTpilS{1 zu}~3hV=*mO(AXfqAnupvTb|SpSgbmQmGVlU1tDVrIebKQUlPc z>pDxNQvU}4Kr)%sP1D@NIdgH&T&8L6NhXu}-)aSb1^{b39#7CTO;gh}qg*aG3nBWd zQij2p0Kql?WqurhTi11ewOaK%j(?*AsIs2kp1$0-#lFeONw<_FRaJ$eD8l7-MO0PQ z0H9K-luM=3oKtbCl}ZJQqHwFtvVA_^Rq^QY!>zGcYyA4iFIw4Mn=YlbBp;BXPgxZ1u7Pb z#5rfVT)s3q@_g8eCob2TiGK*}x5F4L%Tk08BgJB&lMBJTUN49U`CJZCN~){#ypUD7 zeJVBO)Owbf&!_8=NK@W0R#RtJryRa}Cx7eq&3s2khcpa>B9W%Nt~dCW{{a9X8g14% z$H9efiwC;9xAK9({;9T&8_tG;!Fy}tEt@}m`fSdm)7;~!f9H?-Q*sO0h3XPOQ#foG zrg0@6k3|MA4o)Q6tp0d&>qFBFObeAyx5U=A&!lGqE|+F-;`g)j*}{_XcW&PqI(6pM z_^US)Z|1*#-n9H>XFtB*_H^_~=J1h2Z>{x-P)+{<%pw}k+Ei^w00000NkvXXu0mjf Dq@?=~ diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php new file mode 100755 index 0000000000..0a20c9fbca --- /dev/null +++ b/view/theme/diabook-blue/theme.php @@ -0,0 +1,66 @@ +theme_info = array( + 'extends' => 'diabook', +); + +$a->page['htmlhead'] .= <<< EOT + +EOT; diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png index 72a49c157c8ccf21376e953984ffc30c6fe78b06..2b82dfca319a3a370d8c7e1242b792fbbf963c86 100755 GIT binary patch delta 430 zcmV;f0a560-7Gk*;$5r>!!W&i*IbxA})R5;6p(?4qz zVGsuJ-+PzbMLkIn)J}^P_7L&`#KOiVjR7kQMFg9GDEdLP(Mqtg6bnJHu+=6u3L-0R zqhO;mhjAzDcg$|kn|6%H z=70jQ+EnLM)QCv3sfq#d1P*=V{$~j9ZbxlUNi_17rOilQO$GBZr zCXjR1ODV~D@ALk~Y7lA)#Ztt!y5f}5zdPs<;7}xWdrv|;K2~wCtmzdT41&yV`UhOX z6?_Wc5bKe4Tx0C?Jslgn=#RTRd5V~?km60yOw z#j4O1i#9?@G<~Q|glKEWu9Y?zYnl`%LaHX?YkSDeczS1?KGX&3h8-=4J>nr&`~el} zf?ZcAm8yb}D%Mm8RH>*NRLsJUnU+8~t8>5eo$q}2TwTb0>VJlz$_UsDV(nB*qOrOr zcKt+#SDB!|gzH6Nv0h&SaKljXk9hI}2Ee_Uo$LP@6HOU;VC)9E&B)sX<1%E=d!dfO zybH`-io+OkyMerJtgbz9*b&Nq^LJx8*CDvipMa|BOx58_jzem<;2R0~`SUXz9}{z!VsTtDWU{fjwZ9 z{CIJBh&O`u+B*Zj@xey-tTW_%-IV1DFb&4-XzN^M#JSp8s0}&4yzic=0|hYt3gh}v zC$le5wWWc6=7fwY=SFzTKfO4_TcN5i4fHb~>7KI!ynhavZ(Uuf4*3scurln;W}0sK zEHDe%De6cxEqoLLhbkomRU`oq(fD|DsiWzRS#2JUs~71Z5jdQubhFT#N>r}v3%<8~ zDjc2rEwmjpYymnc?IV~0Dl zd=x$_1o&J+qKR-(1YAL+cQNWVUo#Jxi{_j;k1$V~r_2*(*_<=qG?zvUt74U{BEovZ znzs&FXRKm!6YHQ=w&tyaR^^!&@KSe8zo1O9WPfTSGpr+t*g)g6g+vh{A(oe8fQ4>& zMf>eeEDqcDaZwCICBP1ETDu~k7vlqR4@>IPmT2KTpilS{1 zu}~3hV=*mO(AXfqAnupvTb|SpSgbmQmGVlU1tDVrIebKQUlPc z>pDxNQvU}4Kr)%sP1D@NIdgH&T&8L6NhXu}-)aSb1^{b39#7CTO;gh}qg*aG3nBWd zQij2p0Kql?WqurhTi11ewOaK%j(?*AsIs2kp1$0-#lFeONw<_FRaJ$eD8l7-MO0PQ z0H9K-luM=3oKtbCl}ZJQqHwFtvVA_^Rq^QY!>zGcYyA4iFIw4Mn=YlbBp;BXPgxZ1u7Pb z#5rfVT)s3q@_g8eCob2TiGK*}x5F4L%Tk08BgJB&lMBJTUN49U`CJZCN~){#ypUD7 zeJVBO)Owbf&!_8=NK@W0R#RtJryRa}Cx7eq&3s2khcpa>B9W%Nt~dCW{{a9X8g14% z$H9efiwC;9xAK9({;9T&8_tG;!Fy}tEt@}m`fSdm)7;~!f9H?-Q*sO0h3XPOQ#foG zrg0@6k3|MA4o)Q6tp0d&>qFBFObeAyx5U=A&!lGqE|+F-;`g)j*}{_XcW&PqI(6pM z_^US)Z|1*#-n9H>XFtB*_H^_~=J1h2Z>{x-P)+{<%pw}k+Ei^w00000NkvXXu0mjf Dq@?=~ diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 289581c36a..5776b6cf75 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -26,6 +26,7 @@ + {{ endif }} {{ if $nav.messages }} @@ -145,6 +146,7 @@ + diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php new file mode 100755 index 0000000000..0a20c9fbca --- /dev/null +++ b/view/theme/diabook/theme.php @@ -0,0 +1,66 @@ +theme_info = array( + 'extends' => 'diabook', +); + +$a->page['htmlhead'] .= <<< EOT + +EOT; From 92a93642e16e58621f8445534ed2348a53891488 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 9 Mar 2012 14:43:48 -0800 Subject: [PATCH 04/19] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 76d2f9326c..45f728999d 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.1275' ); +define ( 'FRIENDICA_VERSION', '2.3.1276' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); From 686fe47b8892d3c3cd82b77b77adf3c990a7c160 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 9 Mar 2012 19:02:29 -0500 Subject: [PATCH 05/19] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: add js to hide nav-menus, when clicked outside fixes in css recover contacts total count which got lost bug #324 - tinymce used for mail even if editplain being used. bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed keep tony from talking to himself * master: From fd1f8fb4361b415defa8d6da2c93d2f19fb59ba1 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Fri, 9 Mar 2012 21:29:39 -0500 Subject: [PATCH 06/19] allow user to set number of items to show on network page --- mod/network.php | 3 ++- mod/settings.php | 9 +++++++++ view/settings.tpl | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mod/network.php b/mod/network.php index 27c6e315b8..b04a7b4890 100755 --- a/mod/network.php +++ b/mod/network.php @@ -403,7 +403,8 @@ function network_content(&$a, $update = 0) { if(count($r)) { $a->set_pager_total($r[0]['total']); - $a->set_pager_itemspage(40); + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40)); } $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); } diff --git a/mod/settings.php b/mod/settings.php index a9d00bc981..2ef582fdfe 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -237,6 +237,10 @@ function settings_post(&$a) { if($browser_update < 10000) $browser_update = 40000; + $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40); + if($itemspage_network > 100) + $itemspage_network = 40; + $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0); @@ -331,6 +335,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','suggestme', $suggestme); set_pconfig(local_user(),'system','update_interval', $browser_update); + set_pconfig(local_user(),'system','itemspage_network', $itemspage_network); $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1", dbesc($username), @@ -648,6 +653,9 @@ function settings_content(&$a) { $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds + + $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network')); + $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items if(! strlen($a->user['timezone'])) $timezone = date_default_timezone_get(); @@ -814,6 +822,7 @@ function settings_content(&$a) { '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''), '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes), '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), + '$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')), '$h_prv' => t('Security and Privacy Settings'), diff --git a/view/settings.tpl b/view/settings.tpl index b7f427b324..46c737b23a 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -30,6 +30,7 @@ $nickname_block {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} {{inc field_select.tpl with $field=$theme }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}} +{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
From 0e3b9097f68e3bc6fcd3a9b18f0715951300bbd1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 9 Mar 2012 19:50:31 -0800 Subject: [PATCH 07/19] spec directory --- spec/dfrn-snap2.jpg | Bin 0 -> 246724 bytes spec/dfrn2.odt | Bin 0 -> 209276 bytes spec/dfrn2.pdf | Bin 0 -> 304958 bytes zot.txt => spec/zot.txt | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 spec/dfrn-snap2.jpg create mode 100755 spec/dfrn2.odt create mode 100755 spec/dfrn2.pdf rename zot.txt => spec/zot.txt (100%) diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg new file mode 100755 index 0000000000000000000000000000000000000000..ee00f5654ce9d183d0f0f60ee483c4c2a458d2bc GIT binary patch literal 246724 zcmeFZc~Dbn_bwXS0YxDqGYDx#W&sr@F|TbqoP6*T9K*QQ3+czaCZOBt#hkx*;S|SsbAIo<6`9xw#mzW*Iw&c z&wAE+v-Nt51KaOp?`RL(whac`2K|F=y@lC9zx|*6{I$sc*$U97x1Pe}c5nZA2WR`X z!>}LZwr!W&w$%?qK=--xf36Mtzkas;uzknQT~fRENbiN-z}OG_VcYiYKkV4PbLWm7 z(7RKh|A+06+j-#7@zcBH-9n@e$0?k+@muX~E!);UMfX?05!28sse7cAlvPyKv~_g# z^bO3AC(SJ^t?Yg}WAE^@qmzfHm$#3vpMTi-@Cy-p1F`ODXJ!3Owk^RInvgKhs`Ci|Zo`+w|94%*ibJ9cc}A@$e3w*8Oyq zt^=ptq(b8451+WPTfz3X+Sa~3TBh!RV(67u(n?3nxZ3=`w)S5;``_DG>i?^q{jZJv z-}{<@?c2T$dU)IAU}%`+o!;FX*#H0f=Qc3p!v!cHX%#0tE&0zD?BVnfQ*{g0=fb=g zWIBjY--1P$q#~5NeHy?pZl*{+d6?}_$|h0AySfiJ8+FQ_wGo!yJXg99=GB(PufpFZoyJd6Ni}l3A!Ak7+!gHxAGQj$FjHz z<#LB$0W1gVJekiAuoqW#%cq2K^R@4P9f=08%jWxs!ea%e5Z>KibbgpV%Y5{CHC!kQ ze;RTeynp^UJ{eysy}#6A;-S+eN=p@Gcf(Y9Ns0S=%GC>tQ_TS~nQX>tt75HfMakk= zUZYo4h>H`&&$im)v7^3g{rv8x=U3cZ=wVy144k;0xu{3(giF-PpblvZ=FBPtFKoeP zoFzrs!pmDQ?qlfwBeq~)yA3&oZ#E>-F-?R3z@eZ!Bu@Af@%Pyyd?~ico6#YXlEhG? z1~6CV_|s3x3cczeolV?F+OJ{C-Y+@_u7=+s;Kxvh?!S()GS6F0(6HnFr>gJn@D^+j zCgTuarg@Tihj1ABQ`sU{Fk5&|^aJRCV4s<`kr(-i^HKUj`=uJxO*T;pKx8-LM5pP^ z`5OgCUNH)1Ob2Fg=@P}rlV>-tKIWQq;1_s7)T~&X_REiaY({zmBS~ni#a6@nKWaoi zyf0(<%cqI{Q0;)X+f14?a&GW}P zI48(z*1yzwd(FEm0+Y;mR7+LuL7S5q>T;{~UkH1tnWcI>1KY-`D2s{uB{6Obwr@`8 zNE&lPUqXn?(ZJa)n4~-%0gPXIbUI`|k}S$EzLB8K93wc~!~4fPs!Q?cBdUNjo=HAd)~MS{qrRL7FXzp% z$S@m5%n{=-Mv>e8HD)w`iJKG&s8Si z4p)erF~s}ug32>dru^$q$(=r_q%cyJGI0->*hH`e%=6w3UhV3j+`%`ox?CUgE4c-9 zfXD9dN=Zw-zKZFeQ(P0llc>KJ@)Y{!^{?`s|!>lM`ai zh(~j$*(x^LSG6=?s@<;?PBwW~=`6lb@L?1+w%+RA5oK4jENAtoYL|`z@&58)r|zF0 zbY@OzNmQAFqAghcUE(`5c!|Why#*7SNTa!xTd*jTO()$|$SX1yBzwqPurYwX8+6-( z?Yt~5lITUx%$CQKcqW;PcM0lKz1AZ%FxMA!m=ChS!0?yetcm_*T+VSAz~)(%XLN_v zE#AYe*=T~}uE0}PP9+ZGgFPYIPr3FM+WE30MT`&U^ zPvdaxg0sO0DeRAR=}p-K;h+^p(F&jJ-haXO`Rje!7LznT+xmqZc4*Y|QeF3U?aUSm zrs6?$KEnzwIxU-Cb8+)|+exMgBSc&2nqL}EaQXzX) z@O450ndKirVkRHED(22@A8x>hd4O{Kg#m=ZMG0()+@9G_&(z%U5VUTL!S1zD`7}Lr zHU&3eRaVERy8@SLQ|RydQj)l&-5`8W(~6%jsgC>{7&+A`v(NMoa84o}4tTKr*I1)) zya|`Os>okB2aW(?XFxtjPqLk0umwxogxv6{|8&+W%A#$_-x<95^Yquf?~R=sCKBgX zdkzmdkHs2YXziL*?stFvDd{$w{o1q1we)CeX_OZ|0PZ+eVqhD8hu`S2kRPG)vSQeD z&#QjVxY{gA>Hvg+6f4DWO()-jQw%k)MeedwX`uPkyy1AX1@WwgmwTOiG#Po6z1?5B zF1N`}*|rC1g$%PyP7;}tR<*Zajz5VXk$`tlLN(ojZ3ZhYOiy9k%b${FoCRv*i6(E$ z1^M6thg?8v#})SO7ukW=pqNFsdSzxXOk{kC16aoB;CqA3Aumu{s6|la3rbs}f^9%k zPSe|%N)xq#khl;fYD08#xR@b4>c3qgtqsITl&x&CGg2Atdc)_a6|QOB=1v=wJSO)svW(rnAGqO22k9e1i+AiOG*Kh`&${!^9i zzMlfMbzjs~JNf=@gm)jXrRY0(DQi3HYCFgW?D1;h7wF0a7g}|PTX`u2v_&kY5D!U) zYGlRDTd+v<8-&0g+?Yp$`kkw}4S4oEY2^c8$J@yHI=7E-49X8UKYR>^Z_-cCAgb_d zo`i9iPx%Obm|{4)$c}qXwcHttWf(@wR z+Z+aPGBb-wy@x?4o$q)Gn#_xL4F{(Fxp3ym6hT91fRE|73h$ufLasN=VHz;ksizf1 zCzJEjCpwx90%m8PKeHl4Nd0o`c7~xcMmdw3m8a)XqUCn7PS?w@3EB1Po5ucHta45t z2N=0dxS&&}R8&$Dx-?Cb_ME66cPm6q&YijX_0+~c1E@4~1Qyg^7{KHZ&BcWhWx`JY zmQCMIum#D@B21_Fj#<{q`s>vM`ffkM-Yr=AGJxeFSi;Ie)j1h+)+`F>5mX!3n&$-c z$Fq|fz;cJrU!S~3QZbF)+aTaO1iJCHJiw^fT7n5UAI4oPnCEpP+L(oe({~A$W8H`N zAqmul7QxHR!E#mPQp9AX+e^Y!N|SO zmL8W(S=|w+Xpe;X%nU7LtyN21Q5wx7!|_&Fv^Q1%Wk!I5(B8{iHu&{d?BCEcz3)R; z?|u*pf}Pgj?Rol}0Ks)|p6}duk|evn1|S&5 zvyhi`vwOSnIKjIE#B$blb+Wc#Z@%y_Z1~={ojEq@_>;49{hFGuY>Y*w;M_bmC%Jud zu$hiQ77iKda$O6l(MjdUXO}86$n_wyi^)?OFECNONh=ReXbLeLmN7RNueQ2%Z~n^J zUW;h?IEZo{}K&d*|sn5^KCOyT&l8{Xb?sNdsH3-3jW>mdFt`7m`qE>T4ji9P{fvuV##l zgI2ANT!1V;;quE8O`R6C32oQzV=aySR`^??$JURFWgkE?PAAZEZ z?hw9NdGc&C7pDR`b4!%cks1i>6z)DIeI46ma~LutQI23b*{kC_hlkH2^1H18<+Gq$ zitsc61L$TDRO2|o>!1;~?-8Y6T_m!>zW~7+AJZa}k6+}CmKHMH6rz4h*E?f`IsRLd}#{?mmtCNpT$+7;PHC|U;Y;C=2tjuNpsgr z(JB7SsN-Y6A^ReofyuTqW;8GIV&k1!ClXe5Pe0+KirxicBZ-KquP!FOlL?aEd5N?< zkh~x$m?VX-?E>QmdeLC%oh2KUvGv3;RFDvjw|!%R!qgTj?0jhk&t)F8Q78Pw7g;H1 zsNiq*`(S0dW#-jmZJvIMb50^j(tX+NPZQ}@zi~eatsW)iYmu!l+X4_5SQYe{FMJ2nFh8+@msC%XVSB0q(0*<*a}G0A}zN;eq6i0iN)sg z?Ums-N2qpt?G^M56pqmPkc#?e9-j)BTsLJucc)%EIcMsVQd-!Le*L9yj=@}&5^70? zv6><%8SgwPZcP|fA>hPSy}Jp){NPG%VFm(lSvHZ0l4ygaz$jbObowIUR79iXss9u$ zs&*#2Vsb*wrGs*RX&Uf#z$t#Dk}ekoIe*3d4F~%&z4Dl^6$qL`sozChZDWED9d~5% zO;}7&o616DNimq3!^Pg7tNqv zy~X;UeHMrKXp;%udcT;uKDV7XI7Q`{uzQqw<^805(l(T`@LaS%Jwrrf?h}~L z$?trJry5w!JX9ayc8+{x@^!hCDQ1h)3_V*E5XpkOR%{^MEJ^0IK(N%TB-y7%S&z{7hw3FZ1Ync_C=su48acb8Uw%c%6cIF9M^@ZCu zUb~%@D?&m%27hmhzUHMDdOW^K4XO8$!8N#?nDVYBLs>pIH_t?G_%)CAyo#de!WfA41&eD%yC#VUQmkKawMlHTKY~}SPUwrbg8;FY#o}ClLfY(y^vh!z{xEJ@q6auB~>f|@WuFUa^>H|8X zT$4d`j>KqueYox(V}N=SS-5wxS15KMMPLNpzQ()mNa52{ z%h}j%-58<0nCdYG||$lL2w=KmYV-L zw)1G0K_L57cMz6;boQ{tN2DG;q#`WpgXiVfdEtQ_rTbo#w+&$AT*;HsAHe%wC>F)? z7ru$IgGre|$1a5k9}Nr~GZ(*aelOD2ZP500#p^&Djgd#!qi?+qUq4neI%98~z*qQk z_F=-Z;j5DPg9<&A)`S%5H2LooxG>=!d>!w-pi>w_K!OZ@+YkbA9^5PR`vhT^)ck0+ z=0VVsOIL&Mz~2;@ivMk6@$7EQF~UC34~T!-RVYX*=sgb3x>&nocFaKe_l@~gtE+XS zdoosgGG&As#J9mxVur}P5kJl?|Fs)i3!1ogjA@|US_nUh%L#E|agEUerI`l+Lr@KD z7i58xJQFEA^XwR|UF_foO!vFU_sz6a%80w=1H_Ln8T|;sN+|l95gPE=f(dQbe%OL7 zw=+4_lVE2KN-m4zzy2_AT)(zt;nu#v4E1BI@qTWc*Re5L8r_e(?9~?<=c(mw_@=8p zrK!n2YP?Cs(>-T(xOJkH?***)^z1p)m3Wx4vJjy-;_9B`rPchHJE9q`H+S37O@#?c?3vVnmW-zpTzLprvC0%^q+E3wAj3NgB?8amWXe z7WiBKq{`$y@ywMT&gT`jS%0YhFFvRT%R3EzyV7|y?r~XA$rza>{txfVQL`q;8MAxW z{l^F;f20I`f2)71U1#DWB+_=ZY+#%t{`drF;$a3bxwAUr0?~0HR^$(KK6QcjE!cx` zoKtqTW0%&0{F6W`RDOOuKY_en?G2a4o1UIV#mqlh*3h|je*A(@YuCh8Q5?i7P@p_F z;Jxu%cJOZS75~z-ueh{uwK(EF!3>zbNf{gGl=f1Ss7qa?q8f9E;-;FIH7D7nvc9-a zLh$_JRsZFd{IIwb-f$CIHZa8tCtGLF@IUdN$mgChJm5>!!61v_ou~xE$tsGw%`hC2 zZ?EMo@(c|Un%w(Bm&U8Ow(WHa54%4yTLr$+UlO@{#vNIIBDH_b*FN$`wdK^cnjiy( zr7IJ3jCw|slPT5Tw7iMLHkXWHzm{O$LZnD$R3wkyf>F2*f5XNWX62!qE|rW*4o$Tj zMXthmR5lilUYU*;`hT)H1>WGg=!~;!j6g()nbKxqwwWPL22bvnoXC*8h|=~Ip?Qei zpR8Wc735|?;;7Gq$!>JweIIcJiPJ!C8(KZXM>~UOI8U$&k(wu<{>(?PockmN7YrWf zJvkM|emSfb{Q7;MNCkYt_v=>Yy+66feZw8_>GvgQ@R|&5M@|;CIULbH0r2}mwT;!I zLi9%EvM*IK3_L0M`4J|w1pKw|M<6fCaFXpTmF>lK8M{{&|MWsTu-@vyo-RPhKKPSz zq5N=xPK{Et>gl{be_HcTfc^hd^9}XuAma}HH!9KpJU>1ldShFA{jVG(jYj3DZ-NjG=esm*+S6ecjho7=U$g{_o4TT zj^D-a?YGeem>In&;taEGt?}Zo5&O3PLiczK-|-X=Mn)UeabSlXK6D0XZ(D%ofK2I58P6I)sw)nJ%~3j&~-+&Q_>)|0iywu=ZA6P{7AN zby4PQWD?au5_@KC05c;$k4cm45~0Y0SEB8nN>rv$E;t%C5M&Mrx{w29ZTCNI%91Ig zrg+lN6YcqSzK_cGMkc0M{#3rVeBPvR3$~whK}H@!78Ego@2g zo?CG&rvcc9^3Q0BD~vmT~++omuxNY!U)Pg z1h0x{sB^TIT7kHEQRLi&-##Bs&6ZkqY>*7i9s$qQr~rvuuzuz)Lip6-iAxDhLD9o! z`QnZA#6p?qt0(2Ki^M~KZZ07#wkcrATc0v;{c1&i2bqJ`KyzpngM}PYCbWzqfa{;` z)k1Wh{7tAqhyc+2Lc|Z`{di|A!#RVmoc`6Z`#8UMoV8(N#@`c@2uS5Li~M+qjC(Uz zJ5X5Kr!5%YNa%AxnSG15>_)*Hy3^CE1<#;**K^ellxcGm)qZPQ4U7)?*oNwG>vtEF zgdZfz3|`rM504th=)Q>1RklsI*jiq8IN=k^WV`c;reM>OKT56dlaHrcdVZjKH>lNz zm|tf;Bz?a|I(eYrI+(hm*dQbFLa`^_wgC`yj9I{gi-35R4$~uUk49d_df8qa_(5OEc&@!R>-b z@m+!saFbm@zq!(_VKlipgU_@B=F%aRufmX?H?uj)_m6ph!8$*_U(m!|OMT!g5u+j^ zfe{&Ewq%s4X;wI+)pvsMFX$u4LOA|Hkkf+eD~2IdGZLi1n+^EVi$Trndsp}NqhZ8j zgm9pKYKB;+_@emwP63m;RJNH<`Tax`%gnE)m9R6t&#g?S!|mo~yVgydoNKdH$u<6? zqdFn>Y3Cb-U}@S=h~ZT2PJ@zr(-i+WPlIuq^$^GO=)=U?Tqo&_6CK+o^8Mqf9`bgT zGxm9PI?MK`V%K{4)M~5t`bq!95LFU~tZ4-n^Q8o_&g^#P70M7G_DqU2Ne$lC%a<($n0<5b?(IsCm4787@E3-?9|NPQ-R2=Q?9999 z*ao}!Yu4!7k|{Oj;F`Q-8qp^86q7+}rw(A=u=^yY;wt7vT<)yd1XQtO1XuaW*#r+B z_U0B$9vzCL!L%Qz|A;&fMPz0b25|P<_2N`Yi{glzk2ln z)|UY}JlZ`V-&h#*s@v@jd*?7h{w(TrgG0lo%^eRGH-e8$piXP2mo*7X5wiNBmmeJs zR@Y%o7udKJsFfU?^wTFr3rA}bh3mX z&nJk?JH&TG#if^+k#e>8qXa|;IA?VK8Zgl~i^k?)U%y-~qNY*#V}xU*Z3Da$hi$Ya z&$YbK(*LcEk32-CSzM80xCP2AB9rYyL7k;2`tkU;ZT8A!P^E)s=+lOtqgS5)#&)eT zxPH(}^%-Q~2mQh7S}%^vdp4^f!?TBh1e$kAwg2n;L#kO%U)4I5s(90^CR$ZcfyX@` zdj*<3n5229#e5zkFPi@|*VFWs%x#dRNs()yUT`h{%TPH+XhVE4yG>k%I?aLaU7S?_ zMmp#bEuug`v3gaKdv`QuX9vA;Y1WK?wJt0s9G-^?xn7G;b}l~k@kuTI(y-fP?DbV^ ziS#$2?t8rXyiYCz4my9O_3rWqb-wfyH6KnAWkj~*{`~~IiP!|}US=992FT=X^kdU} zhEH~0kFAd$y-#p_SqF@)WJ(VBjK$WKaSwK%3@kA?_n)ZwLs*$o-j6`ZvRCxA4)yIh z>|eeesdaBSS!H@qAA&SX5AczZVEgdJeSe=+_l z6k;9?G5$fYXWqq`3;!?1F9#XKMjJ#!jQpt!P zX7g+3mV7q+&v(vL2{zB4Z1(s*TbTjh{ufm*Wd23f?~?zb>g9~j=Bv=-*|}qS3w8lM zBgG=^C1B_vLVySDp#D=YKM&E49>Co|s}s>+(opazn?r5mhd?h5#4$xb@_pFMl^_px z#gQb*5xz}Z6P_9nwu^elUuN&mj;r+b!hjnVSebrbe-%7OkH=>;ge9SXw#785SJvK?--|*kf`jES!(X^dEfkps=y#{?-e_sgfb@Dzg$&yONYXywCvY(H*hnM-BOrJ<$P$=TR#5*^7iC1yK1lhJ(mZJ)n+ z|A^hW9=_L9UZM(>&m1h2!s9T&g@UQic;|qZ>p^PpgK%~K;Gn2~&w*xdV;+hNMRxZL z5}UdU(vGzsy6wVi(hs@k7@iQf&eunsz4zikDT;pZ(_pv071R6vm>b3a+`Vwi?t9J$ z7KH|Tck^4D{26NJXqmowyEI%6R88Q_Z*dyO^4^7GWr9_53@G}8?wjTR%!X+;&@4rt zt3(ICEbxW~>nud>fD4)3Lzxjsi8Isb!5Id<2ku`U_X<&aeJyS8gAQ zX3zN9HZkYfm%JnV%hmcLoW}Wkydd2X6^wEJ$6J9;K5mJYx= zY3^^J&+YrA*tHALn83~xAUcNk*60A6n>6H-)R&yOim8(fPGMEPj;M1>ne1G8K}Eel z(5YtBT=Rq3c4$@lM$m{>v0a3*jLk;XhIISJA^ znXI|JAiIB)nTiVHF?ZwZ`msQnWONhRTZ&G-ba)(Ml)J!Ky67_0evY)J?~dAh->)VO zRt$3nUfjM;`<)z8_Hih2iQfXNU$kcmc50vDhUX>faCdvKS!L4QRDX|VMO&wWkQ+@a zP1mhn)EJaZnyYq%V2wu}Oe{~*ZJQ17;mKdBX!pj;I|f3;#e~i2%|R(uyCr@P370{4 z92b-qv7MM{uf zDF+7h&CF%2liqxR^h!Cpj#z4*S-67CH^)vQ#fOEfYC#hxmC7s5C&9lCt@8P%PzPft zDFpY{d0v-&3MY}HXCwBIpw&%z5$rWN2=x}#Mnzf@a{$q|rUFt~6>|cItfR;vDKE+M z>Gr0*P`}_k&UvCecTH=ht2F&XRa?L_?j~7OKPT|qg0(>_q(XPR{4XdROq$xE-zcQ# zC(xWagdh~nn3J?^^c#o*vVgD0Zcmv)6|0(AlsKTM%D7JRqV}HW)3M8zPMDy#hx4jv zXP&)(@}8-W{H8Vf&v;yfNC7U$;?q|s!o#8f@Efq^40N>3BepqksIR`xsrg0E6lSzw zvLuJ`&Mcp~8SiAxPVR_%h*Bjz7!xH3x-c64_3GH!h#T4+l`kbI$rw>aTthg{kqH~{ zH_wIq2c1K-0Ww*mnFx3<;&tSP#DqUoNC;gM$Y}kHm5-4q1B17tA|hf*P0^bRIRv*m zkyhTfLrjCBQ~!)ncOHGM2VB5rvAJ<(C#p{Q&YSvwJE>NsK=E%t!!w`rO&e-Q>NQYv zJBQsE%KDz}Q67~#7J&($ILqw046BwHr+lg+ZY9trDCc(r?<*hD)fA3>D^qJ<_AH4S zte{&yKSr_CBz-^3{#LFfkNgGG;BhG^&9>JACWEK>dc;@15udvV(Z)A89bh+EUAGFQ ziHP#yZ38{TnKoGtIkkM2$PKq+m6CzIb7d=XE@L!nMmN(a_G^lh z_k?Qr7@Cn>#}(<&Wf5u9j9MpS=@SC_fzRMen*AiUlRbH@A#gsoZuMA;#XD3_r;+FE zsL_kVl{ISZ3K8B_?;WIxqpzJc)EEX|p4&W6H!uBY>|0Uwh!`kqOq?!D_d&S)!{%8= zu0+}r@JhhKgO_?`LB<_?xu>|f8!c4A7jkFmck$*Dd2}X8mEdf&Ch+V%W`!$EMC^GF z>hK1~jDiu0pz=VlSx4_Uy}8o4lldgqt^L8baX}UoBK1qbDi6mBSHwVZf3U#>%3Mf{ z!nXPh9GdSjVO^dHj#i>womoN1+6?oH*&Zi*cxC&CfDJ6)?IAGG6xG$oe^1UV3es3( zus}%uKb)aicIGtdOte|lWL4ck>%@gJRzBuZqt%sKw~yb>)4Xq1TfH0#S#X@l_w8&x zO15mW?0Z>_h&bp;J^B;Zwu(sI_ad=Qe~4U;asF z#%{qt?feffvKt*6Txg#*l+l1Y_Kjv#dyjpPyxWvn6z=Ocjb@W0W5^Vbv)8lE$H>@k zP7K7GECmtKgDMA4Vk_L)+{m$7IL)JK-jQbOWz(9S)<98pI?)}XKvA`Lc4R#2J)cX} zAHPzJn;l!EUh-|Ph(h+#>eqT}u{qEg5JUzlaUKI|O|JxTF&X6>$v*k(Yp+cOXU5x& zd@x{X3UJeH?2k&$DBGknIvLj=YtE$(s?%kn{fW0saAw~~+yH#ToLf(ZjHY1f#qhaD zlSfI>hM%Dm6i|N%H^|&2Q4^g4AwdVy&V)($c4aOA z`^KGjv3l==jhdDS`Ez3=qdX%`>_>N zxR!_jM>)C$A_OqZb^Wb{upLyUN=5{yw_q1nG2X3UF_6l3>zE{QRlxGt7AUKnShu?} zomBSchClVj2SBHRcI}#C_2k{NiZ+l*Gqk{QXwKM1{DcXlLy;9l`ugPF_b)fC!@=Cw z=!g|>9}DiJrMs{1IoiI%6!(H~+h)bIjJSg*>ilbP71yJkil`7aEBfDuWaW=ysfsYl z9*+c|_eETZhQ-9tU{#pjFHxVz)8d@WO2W!GLFn_fE7Wv~ce(b@H1dAYL2=0zEN1Q3 zTrNhIVB8K(yky$Q;)5YT)avLOJ#cbk`xy{5mh-Opm1V z8VSekiQ!GvMNenPAm`sRx^7O3lEH1lAW;%n2w3yx@mgFT7Bh?7_HJ(f0+_@@XOKG1 zh*lNI^6f^Z>|kB17sY%B$(~Za`RU2+kzG-352T!Lu4HU}=6vh49lUM=RXf})i5WEY zk6~U~6CEOPDzIYXCG__$-o|&PmKoGo`2{(K>EFi)&(fw!qeoTKX*UL)72OtGeV_3j zltzc}k;gB!FOOB#dAqy(Ca%rdoID%D`miSNpJ6Bye93~U_VxIy0Xq%X9$oAkZ{PpS z$Hgct*}Bu$b6T2;i(5aW>xa=`+oH|?nd+E<92$NIw4Q2*ipP(O&faKRIa%C zB~)A3TmIo?;C9W`PtB8d#iMSYtY)spFi^ ze$3kf31Ua#4`AWX9e^-uGlK?fNcP<1AhLRY?0K2s>^a_TcpqOrl>CCmow#QFb@?9S zaA#8?NvKAgnmr<}>2?+xiB1=?$?`V)VtThhj?5m>WzQZLwGOrpx0Ib7Y{Oq()lQo$E}J>}LWl zCX(_*#CNU*c4Jwt^-IG?E1TRI`#hJdke0KiGTuGODj!T%bBB&m1LTA64h`H7t9H=$ ziM4-G6O~_Qh1BDI-ZW*0(!wscCU?aCz6GT7lJ^G;SNrfe{lIA@dc?$lN^l)Q{lz~+wDv5jm^vb#r z9cfOMB1NiJp>uYa$32Tf zuBT6m)~;irK0I4a1RaH{CllY#fwmAFnlU$nCP?4C>O3GiTDvkELOw-scK4V)| za@=jflUv5ocaQ&=a4+Q8SA7dNigcVvfNsUEo;F#XGgn^7K+nc@bgoA5moUEuTksM6h1)Jd%A4FmNuBfgAqIvrmiSg%sq=x;Fn;PL5qK1dv4^*8l^%(AL%C1{K z`@`@9eY=f>2QO)(P9^UH+443{`p*^W?=GkXzes!SL-y{=#`U?96iaovozI=mGhgR`%@fK#Mm6fLsBYoE}IG1W8XkbA=4~h zH)w*W1wBej(uFygbHj45MK_2G*U6v9yqSO6tH#&1dZ45&nnaFx2uQ&S7hk0d*~F^XA2eIEKjD7)UcU}FRnuB?;zhMwR~sB6vaG|9n9Gzmv~K}u4* z&EvS*;W|>^Nizfjto?f3dRdHM>GC29QArThoyN>hL`kxHL-)0W9##kY;kFKx5@i~TwAKnF$`phrg zPZ*J*6ObVaWiyg$Ud)#mqZ#9dHphJc5z>*r7tMczTxgX~Ryj>ic`0}482QnQw#889 z3&%g2F7}&a`tcqH(&eolb}vo$xi@)xR94n(!QNh@PU-WQZzQc4^@D?oDGin`VYPV! zALRyuLN6|-Tu0;&Shl}w3XOi@bHy8cj($@t=mypXNGgP1K+GLbibKxoJ+esL{s644 z1EmDRK`|`S{xzaTR2ww+&evqzCHO%R6G(7TGs&t4zVy{bPfMh_fD-@e>Qct!0A0Wi zT1pCrL=ON1FUaKu7%GOEU6T-(<&^u7 z=v(fg%Nx+IdjbcCPd zL9vtaF{X^7?|*rI`Dv&jr!+#>j~nB4=i}l?zvu&>yt0!&KiGRfOzTAiL5Gt6EChst z$NUL|eD4v^)K<)(|1zF{%`)VX_TU>g25k0BBH^Hp5`|Z7wdUOeB<8o&H7w5_;v4^Z zac$kFZS3f}{%WGSA@cz9mn~Q!`T%1z$ES^81*UM;q(%4#pic-C%=A>|C7ir3-eg{y za3}^(u#Dqb=SN8PG|};MY~_lE;)sYlV8=W+DNlmv%=%jC8SqN5*g|hX+mXJ4prP?Z=y`!Ddk9Oq4qbb$MpjR0#C0(wa?Fmcax71!nwulwF1ts!@T<;eIKk`|Psr<0_G%huo1>RFhF`4*CIh z5Ss(#$E#h_eay59ZSv~12Ey)Fl0$xAnBYA>Je{6#6djQ^UI&;V;D`U>wYccqI?5mZ zLG8hZT&_zF;QtJp?Q)8|LoFjKkwVagq=S+}U;s~Q0Gm$Q-tCW4Z3It1kv6MI7L)-O zDmICg9P3XEm%XgZ1h-ctPO(33RSKR~aIaG>T~Zj!FM@ZB-iwy&Va>d&OcXM94WBS{t3JErP7N-QI{K7Lo4)B)>kL;^rRqOk z5Yq}gC$*h-(FW6imrlMDi!W)v4xi{Mp*e??E_8V>#lj`uUAZ1hF@$bM6Q zfEvOd2?zO8b>eCcHjilTV(wZvD5$^)dL}dK?!8{p!engUSSMPOKYE%54&u8}2COQY zduo0p%e4FOc&shu=Qm$B=ZDu`K8$+ONm*@vQcpZg{9SV=-(KRaz}06d_cSj1w)z&=KTt#2dCZG(2>8?kPm6*7AFI z;J6_hq>dD>Z6k{Q6sFM@v;(R_Og|IIuBtT zyI&pNr6k1t_sI{|g?JdNUcVj`Fa_IXbx|jqGseT`*Y}gn6dS8XgvtLYe z0#B#+^Ohqf3`0z#uLV5U%3=@c@ZOQ7#Wk`m2BlV|ml=kSc+2*Q;XCaW2)}##9Sxdy zZ}Xg0KGtUy#RD`|MBB$AtF<`8#h4t4sU zM+4@5qk=c&*!F6r#v1=P-&wNfix7h^7nB2QtJryZ8nbO7ANraG^gvf; z0m_8-UNT9R6{%mN;>AY&!c>xxJGc(bSM|^U@I$rIg1;GXC zRjIpB8DjBBb+>uBd!Pn-7erT0nUPHRQm21r9#Ktn4D1UtS&3^R_6dU3`5UWiHksTJ zbwT39TD$NQ>Qwz}5dvEFw8*eVCf?pE`RyW6`%!n-gui;_?L_ZMld`eT)9Xx$O5r?4 zd_*Yt6H+vlC3~QWz_CB;zI&B!-#L!SZgQ{QbN;njLaUCH z*qz1ypmILpUG#+D)wB5FYoT>{)lp6*OOySB4SwE8 zL(dvDkLKvdC%xQko2ro>Calr&iV}b5gh~p;Bge%ZB2#|D#^Bt6b~JRd9Gdh$W3pm? zO(+#Lx0`4zneNpcU++P4ZR&V3)}CFAa$Zv38mNO~Wh0$c5}GX*t>SutF!0Z@KR3Vl zKLU$W%#y=fD%YS%Iwo{%MsJ#hkO6Uh!3zB9?p`SX@hg&)iIyQCnk93ZDwFM)ZIPV< zrDX5?q;2Jr-480Lg$(r0sH?|(@fM=6iC*o+iu0NwPsWj|??$k9ng5%P86SZ-dv-MI z$HfSgI_q|Z`Vx2+bs71YFfKfq(>FHwl9I&^|2Gc|2LoBn`-U~_)GI=OiMFH93k(=X z*~&Ro^8=BV zqz;-wpMs|Si1JZW{?8^DF4%q>bT398KO1ZJ(@V32j1=R|&kHU>9|2UK6+sp0PBhfx z`V%mbJb@74y@TjDVvxM)xUu>k>NlE*eJin-`MqZ2IlS?J&qnKSfjdykYepxjru^Uci68_)>3 zXMM*c(#YA9`G_eV<<6Sm8M*uz)3R$7=c*5mQ3bK8g9!i4Qk0HQ`KU4L728g|^1}aM z?@xo8%G#)5*uEW52BR{MX!s71jq{B*>gRxgR+bn`esjC@dhPI@G!Ojv3LA7c=i9Bcw2s0 zQi!yi6`uxglGC4J1IV)`l-5?1Y(`B9FrxwY$`!aO_Ugt^kIrsBDiy@!g!ln-cis0* z7pN-JkYyj5ba(xwxl^3eSSLncd8SdI@>h&VB(WIF`Z^6)1zk1Mt7&lU*deCe3tDU3 ziXmvh9_l0P=vK#R3h)p3k!K}^<}7(Ei4Nb63l!w_&u*j9nj{sdOQ>vSLm4%cNgarU zPtW*cqtWlyB#ti6hPhqCbI(S8d5(Ag_f2Tz7$*Dh@om2A2KUd}{!(?`2&ZE39{;LZ zqahfi2INyNsX63kP?LMca*LZN#H@mXkJ$6hhFj6C=S|6?)tYDegPpNGLDwE+t4rsq z^x}P%cd9DNy|VYHaGJIyeF~t8w&CB6gqFja`5|`^>U^pve`uK=D*8FRT%QkHp;NL5 zTvU%Xa`@GV%P{V0Ie?URE@J5?iHvx{R0FwDK)St#+KMgick(-zKH`@0)@<6}`s%7s z4SKp!@OCbXugE4P$1I?N6heebP5ike(KYeO2-P!?Wj*VBn5srs#u9<=q8;K#;%b?m zfB6wh^d66OI?B$AqCkXmUAYMq{I~xJi`FiYdCIcsVOXuRU5}o))i4>+p4cI(!6JCb zZQmA8*9{%<;2d`_Q?XWRT+F4qIyQk$$6+CI@Yv;qtqx|TVZ0HCuEYKLAL z9(G<%>3OF>sTd|!962@N-9O>#W2ZjRdAuHbWANQyU#)KB1jiRnSV+f2M$#ctYh({g zS#0_q7tSsDAtw@ciuLQTrZ#*~g>4Ne5$qYF$M3uR-VYn4NJo2%6^GccROH^7%S{Vt zXJX|H_WLHD`I~ah_n+5|+$Kcc=aOS2HuJQ9MPC1o$C??~=P7+|47d7Q4CiC1;ycqM7!2RT zfC;X*fbg;nvXl-Hr8@}UH&G8u?k&+I<*46D5a^WJ(`^X)onb2q0+uihN)to_zzfu@ zC7r#{REP)_ikj4sgY>B4O9E6VS zjlncHgRn(x$2Ve4A!7MFI+YSSdysFJx>n|LMuaark!tCPK;`hBtVJE~JKI|tW?^Pig+mY=^iy>2Ht9zCnuQbCFnr5+(E)N>~l_cZH07*(6X(pF08I7UQ%5vlNOVp zt;_t29;sWx-9L7~%JL=hs3f0u1(jx{ONtceqF`8Ff4Le|1&9u)8|yEU+CB-rGm*;J z*PJy|=KMcc)sy@p@tzSnVF!D-)zEszd8E(EJGEN_n?2EYB+RY5&BXXnOz7Is)Bm1B zOMKI$zIk>FDG6izjNR$$42m{XSMTt-;>gc5^yZ z_f03blDpl4o|MlY;)~9f=DSh9R6+d`epla)qOp{+L zSxv>X))Cr@v6U{8cJrxqaPWvj+dD*_m5{}WaOsYUS||n^FcKpa%+DIWLwHA-*N-tQ zi^~Srf0wBLZ(CR!^2ocSj1(C~m#NVzx8mw2yRwd-qZE$)Njas?Oty*%&ifdab3B2_YA0`wK}tp zj&$&joa zWpc{z{Djh-O@ zTDmw?Fu{Z8;E#)c9glq~)xzp=25v_nCwNp~=SsA6<^zM@@ka~Ac9UlFhwNKJ=f1F* zaG^a2fD#A{IWB#xF#J1~_K)_#RMK`aOpw6o&f&uE+#oay>m@WcEvpz1P?93_+7{$o zh)#;PLV}8yAD2i!iGND0471wyfFnT<{54ij?(S?JEuS^{i+^m<=gMqhpqsh22KL!R z)SZkPj=ue)O8tJV@!XDR$3$oQldp$0NfNqAEi-%9h95wE6(IbzzpAlT@|9nGYiYHr}MlRVCtgg#p@fr3FiiK&95Q zr*KAf&_kHY3}z-2aKtU5#0c?8ovN#U_|4dG)y)2WVxm>-(R}YZ?d1O=*pF@Wp_H1K zQFN2#H@{US_jtdaAI)v3ZhZRmVnuq@<&blCviAl(DSvOfJ4>K^T**B>$8P+If|GN$ z%A*?2;YpC)boP3|6^lK`d^igpe=~X!E#okSV6{GzV9ouxcAq+FjYR|YAXv1Plmb^! zH##MCKwC=6QvapI_22eD0zzWQ)#Y%a)$!=UsE4G;T!c0 zh!t-v4xD|*{7U!QZ685hnAN3OG|fC*3^)5@NM;`OuLSVlX`%l;L6QP2@Z~Lr-QxS+ z8VjGhT)yW&Z=5x*6Q<)RUIkZ5^mFUo%j+tOE-VaQC!Z?a$80VgG+(%wORrfwqK5M~ zNN+gdaIDS<=WLLz`&udgiJW3)-$etj+*m_zhG#9>Q_nc~n~3{;)1)<*oU=|~x_b#o zFW`5WkmPZvIp`njwj7z0bRhRH2+P$<*jICct3dLP30+hVB$1WsaI{|P+ESSX-LLcM zSZn02(4vj9_NlpHT4O_Gi(kVW1~^Pbqn+klmK>Jc*Wr>4%$=%Om$Up69|Dd^>hPLS zkwXi=ub}Vm;&KuIYyMxwyVtw5p*y_38%0f_ItJs2NcO7oQhfD2EeqF0uiJ9%Q>gz^ zP&nJ^-{ZWi%H6Om%wue;b6LE(;Rs0DGuKkKbXIPD&|g{(Qy}(wmMR6O($7`e>{=Wq zZ?{u^aPiyaJ`P_oTj!Y1IU&ujX5L1I_`31wW!KmvdtxeGVEG?gzFpu}H^yjWbD zoSw5qe2i~IW{P7${oAE_VOEuIM>H!lJtNvywl&S79>Lnt--&TdUvy;{U{k#_IYTQC z3(Os|RSNecTY2|gyj0(Un;gZ@8 zm+g!ta8^?Qu-m3(!3`*lp96@2YPaURbT6a_ zh(Q=@S}F%kQN`*4R3@lrhN4>FFEBY8TIB)H`0y91OpD4tL(Ab~b+{}vGhylV3Huf9 z7u3I!rVgxo<~6MoNkX;KEl)Pe6AJWlP75vMN)pFMtM zNvy~0NW&H%rVrwtxC#ZOU8NOnWjkcEqL6-7<}m)NX6+J`5DW zW!+-!z$;4Mb{~R*`3)|2iX&5zN+1_RZ|tK$m2O%`OEVH%^Ncikc4EbFE-QI`VOeY! zMQG^Z>b{HUbk(hRd|vZy*dkK_Is2MCLJI~S@v{((Pvmt5sPPYc>N813$<0B>3EZ-9 z;mnx$WTGJag=K)Qj#1}ux4vTo0eI2M|YsfY9NI@Q(r04(j$}MEthVK&WbJgovgOL(Q{Z-ztzrmE^QZ~_ee0s zhtOlP+*o&9vQX7Sad zYs0ahQYpS2_m{>f8HK?Jk55+|=E{G$*&S-t6hDYv{3o*5p86UNasm;A@GkFuogL$d zpMv>uFQh+wS}XS|q|AW5kZFx{w0JcWCr1(6j!>N|YxR=N?*R-T07&47~J?7C4mI!CG--!UzFk7%!e=Xn1FJic4$^1rpI^0rnBF^&+qc{^2^Y50W zfB$Y#W`2-Emch+L2ZDD626n3M@XEzdcSax|i>|*IaAoOLZAB3~w7=CMuXa1<@;}aq z3e2%LQAg@E@~5gyLpCT9X*oZLR9AGWWOOY9}u(_Clo^ zcaiW<9%0H|`o>Nw3v4s>o58K=ZWxiu7JT1y@Go#xnS`lS=>%b8h_$QMjw7?|m&j-F z8i=Bkpy{VUQbo8tqz<`rEE%jM{H_t?(NI!Te=;XW9vj5{nu$~ZySb%M1=Gx09^mVF zj>fLoc|wY8xdcDz?j`gbsd_=keB^~bZ)sK99=fJCFqDK>lRWI+iVKyHa1jJ*C|({~ z;+JqOduXa*c$JQkH+_@l~i@*mr#%rKJ>Vx{f*SBezno9+?l$eGaR)>R*e zlkVKz+{6TEH{FbD=(v+pN9xGyYb()r@6a9)SLY4OHLp~ zuwe?@Yh-sy5ZwM^h^eC98pwt3oVS2ghUskbvwo`qI-j5UN4s=AX}%-k4QWVUliG+3 zmI5};7An$9#zj)0&0NddQo|pa90?)}Hi%ws4mt87|ML=eXdS)-{u4Mrb#VtcPM2Pv ze==$uL)|k^+k-IVz14IZd9~j{#rt5pr|{GNfXFa)7ZC0*f+1|+{6{FQztCFbkmb-4 z>6L9Ud93sFj*++e39@-9m?W~7ho@ygp-!2>=PEPq#0(YACm*89>)ZdTxM1&Y%3`>YP1ti7F>f ze>PW#FhmyLC6YOPif@t$&IgGhdmvMs(14$0wy#vOfr3%4E}@8Bz?;v7-$v>NROf81 zYuktuTYulwN7xzrQnz^|vK~Z#5ZGsMs$8|$=VNVros_~3Hy`|?e}4i0^}A#9?t84j_B#|W)oP@zes5q~L(pj*Z;( z0qgdaGeDn0geHm{LrJZJl>!F-1AZ^yc2t63=TgKsB0D^B<6m~`H?p~4Zn{Sf3(*X*O<*5d-~k)Wy`~l z`wMa%zFc)4pLKTn{P)bH>uKdL)fK0e&i(ZNeg5ZrAj2sVtALR7C=uZLJqVCr(BDDm zSxp8G1$}_69)grfM4agKLiYjC9vRJBF=UgM*Q>;q0wTjGgkvtf$8(XNzoDb|9<*>I z^>_agBe2ckmRR#Dd{2g7$gL~fAOh{D2h?TRk977)vc7K$THPrQkQA-uY!U}RGlF7f zVz?0h4sh=J1{^{FyMxf=fAxjF2>iG@9px$l)ZKNzp&eKZ+b*folgjj82sqFvvh7Ob z_{HWfYJQ18mE&hObnbB@Awxa!?q)jv=aDPxSuzYHIBD+W&d1N*dpzCuBMZ#7UWCMI z(A~hUcgZ_tZgArjH{7rGrt8Dv9RbIc3sO<#LO9=fh-odnF1b%*SH-ulnAcyH8beN^ zU+_JcHr3^Junmkomk#H6PZSAb1Ry$BOc1y*x)FjHeXdb}k?DZf#)$zsZEAygGln1= zb`Fd#kRMlxKg^d_Z0q6;Mj!$D@=aerrXYYRJ9jWA!wwyw7U#l^VII#y#U)t>hTk z5%qfED!7vZTCa<&*aM2>V$x~yD=pzeX>j>Y6fZ|U9JLD%XJWI*OmHV+d4z4D%&MVO zv3>;A_oeo17P6~)@^lTlldug#2ZlQCFow=(p+4}=|1xGOg2@`NCorw_gdTVnGLM9QwF z!dvW8544x`$p}+NT6{bGEHkMM$xRS$AwGh3`?DG5KMMh{;(;$VXTUT29Y0-;04bS@ zI6LSxe_EV+Tn@`w#;#soBeR&I$oulEGJfn%X=oj}FICwOr-}E*@ z#9S8HAF?%Q3%6CH)l%pOOZ9AzynV!RBYc>_%S{n_yzxh&IH{ZwFdoW7MQnJA3cM+? zx|!e3k)e|^t(@9ZV_2!hn3dfE3|prJOg)nBfs!a;vlgBFHu6JgW8hb)jKkXA$64Jv zzj14#g|%~`D6U;q)w3_Mcy)x8$i!yusSbo^=)#AN2^{&W@qZ z?dyj(Rk2p`L>REWz5qdFmUTHh#BPoxNKci4x~*evd&UIuli(94XZb7e)6;q}DpRb2 z(6#p=T#2U3ld;G{Ov53_Ze9B#Q{8>Vs65Qw zV(<>v$^ckw>`=b*Sdl~dWzJi@B1d)SJoo%d-DzMQWDt6Mq-OXxw07@hg6N=h2)`A= z@Jx1Kr+IP9GyEapb3qP6dtYBXuxZhsM>3na+bTG#NweBe0xCru&9OFwYlrLXhN1;Y zeMLD_~^JMH5?TGrAfRx~^^N)=2bdYt8NVn?Y`j>4mNs@5}i{ z0t_#NmPG)a03ifOm(~Yk4mtBb7Ohl>ya+vU;CMsjkXpn@wP!@v_W&8yU*z@U;e3}~ z!p_BO*o?mMe?TC;3_TInE8X$l$ZS<{sl&W$to%tFIgHsZEa-2hB>IbPgyWA$T2WV5 z(+EwlWhyv!K*{mW@8X*fOLR!A2f1={GEps`#7bXZc+Fbz8;BfQ8jF7qo79WihF1eE zMdjPa@g_@YQ99KKKX~?<UZWIm%I|;nFjV@>s2D{FkGEAm_;K>efq7o^!6+|6 zQok4drFWMs!l<|NbQ;~2F%s1~_Tq1~(rMLO^f{y9iu;_#wWar&Po5R3%DH`7uHous zWQGSG-owFF!iiM@yDJT1!vp~d^q40;#qKW38dHDsv1eVz^wcjN726`SWoga5Y(r17 zL=I9MnB4+ZaTGRlVRRD>$dPMutJC{JF*R8n$#&U2FE!>9)68D(&)q*71KR`PznpvD znjurDALRJfN;o(3DEqfPDz=*k#4yoCJRszX-MWjkt#}RTD66@MVUk&_J&p0H^JBt>Xj zvbAYxS9JxdNjN`LRe5YJx#x0CWl?2JzNF-20OunbQB+jLPZC~ z-V##x7W}JX_se{&o`!>EteU#rq2nCLqZ&Dby>q(xCK zGg)bflM>p;0H?>Hrrq~;HSS-qlhn5#dUgTAC~;1?GA=0yY+dY*S7|7PR>>|YICS&| z*Nc=HPdAReF;?*n@9{4FSVEEAopH|RWzf_1ZTTZr#B`3mhP{>sPq9HCGn3J| zlCQ$k2C;f>$1^@=c27V#q6^ZO7#aM}q3|8u#?nzjGr4yt9shINaHJVLg|u60AvOc~ zg$h?kFx^i_%na-I^>phBEQ+`%9H!Bub)VNHx(O#NF1Knf`DHj-6k`u$;Xd(lRyI># zvRP9}1GHw7e%9nOv9^FDOajv}5?JcuC@3#}Rsnj#C-l9p|9~aZY0WaJ-S8zlM*(X^ zhMQoxJp{6U!W&lyfD{dMFJIB`(n-uVR0uU4 z)#{xtzA1{pW(cWJyT}G|?*Xw>cD=N;StS5|R!H2!3~& zZ{VWc?pu^(Ugor-Q-4-)a1NdGm>nVSX(?|UncPr2oTZ`6E_})o`d)ffR^!$ijMuk4 zT3!&G!A5M^w-WUF^Lw9H5Ya2QbCDgqUC&^o`lHDryr0#g3S#Su!TACQ;7${aNJ35E z_VI<7jB>;GxCnt^Pr1@q=Mnxx1%ENhlCipLf%&;L@a9AD31UFjnmsO*ViUo6x*n5g zzP>lUdN+|z6;dQcQY+Ant=D71v|*d{8-<+Xw@zeVG0RCNs3CR4r$$$C%0XOflFTgB zJ528l_+{+#XPi+8ciM1B&L4Y6jbz_0(5@OxGh&8aa||P;v*3ha!W2&kuz%7mu^#8g ztT_(+F47$9$6<;0OxQtb9MU$NO;ZsgU@LG<_QRP81G9VD#yU^4!>3riNDD_JSYP~_ zg+@qL3}#oTit5C@a4)Z2;qmyA$5U${)PcN4)!=noc_G65J&Dnjf zul=rVe7?ZHZ;*d&ZB)=oi(19+7oT_{m?8GolHk~1hPc&FIQ}jJ8Yc7vmePEo)Orl3 zS;?9XwW4N#$rlGUu-T&Cj)3~apz1LE&n+WW!*!9XMs*EWxzC=aSbmEZUX?sDDG{FG zhYaK}Kk+7(9VVD5l=?|1k7u$xBd`q;?Z;@c(&A}JxE&$vp;VG$?1=dwB~B3=*V{4E zC2gD|q(#)u$6HyIXriH7>5k4qS}SU0pD32lb2f61f;%0xOB@;{f=gdAnRTYVuSKTP zH}P#C`l6_BR`Y4((a$HWxt|6?#Ze72MY*%quTip4{OP9DQ@YQ@n6CG0tGfVVsiy5T zQ@A+2Qf&K-_kGiU<~ORyWhZFNmK7JNtlrjw^>$MDA=Se-g(I(3%OcE72cF}O4*XJ^ zoa`CyMnCPI)HkP$RWT^=bpY+F5dHX@g$oxyE!TR{FY5pP<+a{}UZ42f$_J8gx#gPS zUbljab&q>4sg`UsVD9rCBTlQGY7NVM*>t|wxA<;iy+-U~JIfy4Jm+HV2sx8}uIHkp zRqq6P!@wNMC>7 zv`xAd_Z#F5=#7db8F7GPk_M(NsaHeM+}~$)M!WY-Lf&2@xKM${pt+!(@o{|ZV$j4@ zLh{xHvXz2bOmRa_1LM z+Y5?PV&KXPH#Uj}T-0nH_mHs}4lQHL6}0pTVSHy>y3jEEuiQoJgy)a<#NNC3to(3O zyOZRZ=+yU3?@fM~vxz*=HX+$*E{N+RP22UNp2#daf*DdL1-iGo4~}&v{3!;L3fYN( z@iR6eZzB%P8VKxeA8O!?cE$-dd$o+#A$G9K;Ae+pjqEUj--?lK8!?A%>GtJ%)s3=sz?A3BR?k{0b{d%g8T;HJ313Y*0`JFNF<0_8Z@7|zI1AAEl7Z} zg?4k^+Hgj@)r$?SGr9;2{N_%6^0MXAR>Ahd+211ne8F!^cyNI~l>+-uP2iFH3&HoT z^7`0~U-~cY#>O7f-IJ}S=+JG@;$@KkQA4Tb`mkqB8zu0GY1P8HmtV9TdOD8bBdMcg z$8A;UNi8N4;IT|XL3l*u z_f7A3cEV39a^E-oMq>|2;W?m`v36|Y53Hha0`N{&5<#K+aG1_ENkz-^$W%14ma*z#oOci} zH5QXxJo}uDQo6jyPKg4>^8|myLPaltzY3crQuBN8r zdVxkh&+=4?p`ur*zfX_VyNWygPVc0q8}-%WEjRoY-qY*~+>qeFi&qrd7j(+}<)dJ8;nslJJh@Nv7qilxBu*C1<4-CAGV*o3K zc{SFXQ`E;&#@RwSwb)Z4-w}jcxhiDM8Tu)VplY&=J3;t!QH9yxh}cz(B<%~Oh0?NO zyOb8S!im^B&PTFOmpZtY8C-Kb)Zc!5qA)~uSGtFZ{&=BdscpXJjD7I&;yZaSE*2bE z*NV;CC^s1TO-e<-mALsP7d@kjwj9VBkpfGv3;*I=SCAh>6y)`~&UcW~rRw6NNxzOF zLfEkFtQl+q&m=vz{^EdCaa9Y7d(qaBT%Je4$@4!Jf)2X`u66iQhJEW>)4|sEvVG5d z&xXxdX5*qkIlDgq`0#Iw_i;#yVY9mYp={urjN;O?!n$QgT4tS8L5}GObCUg6uOtJZV|ik2a-BNs(<_P>uLzH>QA)IW2Twq2Cm4ay@UN21pQ}9PY+`R~Z?<-M zE|h$*WwcWNl>I#Kn0gjX*p{oFb8S_oD>8|k2ElamlOL>kc1CM*K*SF`on>ONq)>MP?Y%N zkyC9;y{f~0Q=cb{5hhgeMZWl%?TC?i?MqpI8nX?>_sW@+{lv{l>fSahj>|a-jqz&1 znnT+Wr7Gbhm{bo9HSv5U6*zq|c8HTw{F{zK$NS%<@7}FP9O<;F^<7fM>+nxYE2|gq zrsHNtHtr)40AYu{m1aqg{XH3*PT>sREOE=$X){rJ>U=X!bNp4~Q(RH<)Aa6rNcy#_ zmM0k3)-`-hG_N&S#YVsK#VI3JWt^of<}i6~^lj6kDdSYPaUp!MAX?UZk$b!m!g{`X z(t32cUrrf)nC^i^MChMuSQsnLxK=h}mH!D5-yd~ z2a{Y2S$tOv9IJ}{!Qya7Bss_f3ncl@%_b`-kiaryxpAZ6B`~6UU=!F*v>p$r{<8TA+>I*svPR|N2@XlwCKAQymPEJo+lro!r!ixS&z{>&6EV5`sXMj!GF6* z<8T1I+{p7mSs;gTOD#%?eP5hyh^&suB>IVrr^|c>tHJ4$xG3}`30g)Z{lN&HY(gp&4 zl=SXZLo(p$DHCrY_lx&Kulbh!@k4Z&Qo#8IrU@f*2R4L91b+O4}DR-J!ER-bKW+%;P*9^%_;vJdYu;C>3QX~ zb^phyOB#ikdmq)ak&m7ndu9CS@NnfxPliXOE!jVQv~kps8}68!qLF;X=_b?d?@A)s zV2u1)S>G|Y^nkHXzgt1Q+A}i}xUv5ogyE0|P>|859Pw8E5Fn zPH;A*$hO+%w7^`;_`o=)Lp{8Y2i?5nd;VaQg0m54{@S>1HnK~8!?${m`jw?os)ORk zst4@aixo-9!7Gc$-O0|6f^9vcl)h+vF{n?fl6|FY5Ogr;Se!-j6~tbHd*qbZ+?c92 zT~txDF!}qYhZuec82LB=%5EE4m;djz^sSgKmGu)Hf~dVHwRI8^|BGNCtuurl$$kN? zP;j~eSPzIl=HxI|cZ;n@4@DXy%(*~J#-X6w{Jh_w+dSCjrJ}-jzD~TH%@C@u8~$!s z`s%A!xm-f6OUpOASyi&Zr* z-^{mU4q1JK&c@~tu`bFf^?&f@Kkee~Gg{F~BaaP-* z;2*Iy!%nd{xFss|(o|5nMrqU}I!DzJj=oD7Pe!|w3vGV#*7_JwQlN3Y($TcX>+f1O z#oAMkmRz$Od~j#yC7l0quf!JSfUDmn$y$#j!nKeF{$BhoQA|(z}(xga=|0^5E1g)Ta47!R0^9)9i)Mh{U>Q0DRx!PQ=cC9C07V z?~o2-6bP3OwrY}yRw4a<;YQZZ!{(7ICh73zkQH_QKKrqjmDsEMM~uZrwYX@=lmE#{ zka?YcbwV*`$4t0OV1#+W+YRRQqQ#!`;_+b4SDn8n5%eQ(p?w+u)Y0@A?|bH+F27D` zF5L+`)W^N{RQ?8B?*7FmJ_a6#eM)WR%wGxeFJBCCs6THUe2d|pNeMdqh0+;y-(G|~ z@1+qiUKQ{0EPS}Ar8c>)5i0gr(HnAyrRHDu2J@%Pi>q91BYs;W5Os{f{(hVPe`NgjYzrb`S0je8-I=gZ@m2$AYE{;iPqgqcWw^`-kQ=n&Vp zwi1x02Bc0)Y?S0439R;wyO(2^$NrHy<9b?Y)BnpqKXGR*CFMvMK>j^^cOEOVbFZXX z5F)&h!##wNK>)#EhfF#!*g!TssQJ$YsXBCvHi`CX58_aF5hCZ~{j;)h?v+asRX5?G z?{}8mJT$TA24Rm>3$o;a@|2EP7s{$6^qvOG3V6p5E_~5|m5eZ@_7UMK)~4UeXqDJ$ z|A-Ja@6Ei_UJcH?`HifPr0KORN0-rM@oI}t0CUDpX<^#c75Ft;bX4m0x+@&?A|E<& zrawmOh`E6$&anm zm6mRKRc=PkB~@;26sLas-iTKgc~`y#xk}Orm;C)WPqBt(;j+Meh3Q{eM#N=ZePQ>-m_?egE+AUBQ1%qU6gf;pLeuS&(gcj_3 z>MRA41B40|oeX2Oo@l>|pyp_-_C}bnZ`AUB%zsltF}qdfXAPbU+DbSC$aeoYtEVxs zgz@!jJV`jyPOK0p%|=c(nBR<9%YJ|2Vfw6Rt#h3~vDVG=Q+j_8NPy0-8PdFeq0m34 z-?{SY^}e7cXyB(z#&N5srF(qPBV}7C_Ybhobqf;5)Fdg%2K3@zx6) zA?cmhkQ!q9@k?#(Eu&y?pji2-0IZB{m4fp2EjzpSgDYVh!c?FK>k46!yTZ|>OliAr z1wR|u^S6ls!_bbQW?U0TG=e~1ogQ97q&h99zK*~-0zEUKTN8F!JlbfY%k-#A_rBz# z;c`8I8qMRk8Uxy)cntRK~7x9xM`=#yAIZ&e5Csy?@7l)N0~$v734 z6_)p~K!5OIew9=y3J>K#pVtq@93l7BhK0s$Sf6&tytrVN8xs}%=3oo>ZT;|Qqvw&9 zVyTXCH4J96198>}?GtA9*x_oyu~U{S1_`WAQddgK&VaS9o5J4OO@l8&BB<3u?2VZ!~o5J~VXjZdwU`6R*OKVYEr47;C7+62bQ+@sc%X&X z>)jqzxy5Ro|7h_^|G32v?~@Re6Ytyp4P1 zFuy0ZUd73F%v>RaVd+(_F8Fz@)7q%5LJ3`+lW?Hw`RR?HPCLs^$}1iA*yB*HXV7l| zxCccm!10jN+2_i(S+L+cJ>0`kW-ty&G`)dgulLM5yGQk02uvAKkv`9)WY#{a3H*Z4 zd{|Oune>)Ntjg*2to0x7zt}j|IEg-HXQv75*FKREE(M)l2A*Oc{19A*xB{e*Rv$i5 zjCqNK_3?L$Z~mVX?l|NmlNlmd3s3@YF-8J1XgwjC$I#LS5Mrx3}@I zOw4w?7LEY<^1%HdsESR(c^Ci*lyD%;)NlZ=)Y&<@HgC>S2p`Y&4Z8tnq7MkcFzGz| zEt%uY@*GO&Mnl>4CjkrX<3)`pqu`I;yIRF8a-9DC!9KBn>6T-^G*qewE+HF1H)fE1kBXl1| zUEB|yZWms77wd0{9_|K=y*E*SkQBKOBlnT}-dcTD~PI^Y=@!{}X zw+ulJ;3LhfUKkT~l21%QnnE^GMI#WCs@S<1h>V4(Y3V`!s?eK}lcF(-|AlXv3VdTu z;WnM!Qu_EWjzi0d4%{y%M}-oS&+xjO+Xdv%Y2{M4yCK_+eLScL4-Wi>DPy!Eh3>&{ zHhAT^7})58KrERpI;1EnIJm{kyJZ>&tW_RQ7|A-w;pvATe3y(~=hz;NuQ^9eXN+f= zjqdZ_9q=%{44r*i$@SN*|35zPGN~@)E70T)E#DIvT}EyN!LA%Z$eAX7QBRpWR}WlW z&dH~v-J0TG`4O~RW*qa@?B_qqZSBaNf`$x=c}hJeXO}%2rM$rZV1q!X!PcA%TsRma z1W(4nc}{*l0-20K8krvY5W8*K5xU7qj6PRn*DCNRx;Gymx2$)kTMHM<*Gs}3U?=Y5 zw)cjY>GgE0zr*QQeF($+M;vHTi7eyH7>t~0Dwg_Tm@0!zzp02iZUV(<#puFKrfoWN z`zuD5r4at3ws6`8)E3kTKWYnh-lKnugUbH)#p@ZpHgu=I>vw?d`4(pHP6r(Z(Vz;QEq0}z79Be@jLqnk>b<|(nt<5^)pAgo z;v=C!vF1%su237}H?oQ_bpiW`tvE4Bs1L1*P(2OOp>8FhHWRLbN>MnB7y##2*YkdZ zoGP(Mb)2>WnVv8ch*V$D7)ZuAjw{^dBP6;~#rD9R@_6)J5T8=>dW991U8{(cgNGt^ z{!CP?$*c0-?UfZeWJzqH1aw*5Z@(+N856bpMPMWL3Swk1%A;}ey!J8IY}FmkagW+KC73a|vbo)rQQ!ze+?P1;cxXN@}eLum-$ZF82Cte@~>IA0LNOrSrL zs5pK8L#AVOUv=nLjXM~NCm|fnP6E4N_86bAoFmc)P$-E{WMleGG6~IfEVXqf8Q!)e zkw4JGn{PbhH#2mQP*E**OoxC*{Lt#zL4oilu_y4b8kWPK#3`RY#0OCmZ}`}b zm}`5ulnaOd7~q&{s4d1ECM=aFZXc~mC1*0+7$cS0eHZ87C!5-lf=UmsO_Q&fJ9u7X zFS!-i*%_6)I4GBCj7qB1KIZxye^2P3Ive<;dQlAWNPp3`bjymb|48c#A|$iG;dYsp z)j=ItP2ULlf7pAksHWO>``d;T5u`T-mEL)D6j`yTAmJ;rwcCzO$~)?Ke_&ff%jnXk{XV_{)cyBfeS z-AVy!HF?B<%3e&TKNqywmEf5Ww8nfT`_s(vA*;hTA1=;fO)sSy0i&jwrd-+D=E*;5 z|88w3dT=eojz39lUZoX(gcD70oeG-dAU`C!YrjSU^$~s4u}$1c9~zYehS>?aeu1ph7RbfUF+ z=DHLyh1a3x*tG#T?Hmk(^sx^~3I?Cs`8CdHubA{b%?t52am9Jz% zyh`K6O~*XmCkv{M1+Ia~D5JATe2ltDJ%{M! z(-IdLEL?6JLbY5ik0FG71~tX(hlh~v0}3m5OiB_+z_*9*I~2Y)sF9tdr3v_D*YnE& zeOC`N?EZq%ic3>i_7vF#gNk<+5QhXJl_?Y1QdtXN1KyJKUCTdzO?305rRRHadsTRh8y^H0eCrg(7@2%bX3R zt&g_T^;+gmw*GU;G^51)PmlZ2zdi0~fq#44EOR8L@ZWI+a2%LjUmdIQZA_HoS+ZHL zTJtp zeI|~{QP*+RZni-(dso0Q%Qt=k$6+@xxii~9962h9@tr}^i|Gp00y_@*D)8+&1*tUo z3f0K9cLQ6;N2W7fG(B;rG|GUyJ7tskd4T{g7Ses_X`hA+3Wwq(8hu_s(7O@sN{P&U z+F~fc*d1C9jTlS?wj(!Q>#VGhmnu=AD(U?B9}mfvz;o1rPs7zH?-A=Y0+*Ev`N&MI z1pR#+>51${G+p9CZ}Q%d)=HnYkSVz(_JoQ z;XOuBR7=mqFDG46?tgiLvj`U|&|I_B{b_? z*vpV9LzF|WxB$4Tw7FF1rLdYIqe@%Pxw5yW zaHxI75 zm*O{3SY~Ej$deq|gy4jVps?0if2qB?eb*WHGl!FV0QyFREKMoW=7j|jJArfLWU!OhMV~e|-V-ew-KvoXms^kx(y1XX zKbnyVHkO&ZTQHYyH+yV44c-F*?X>t9pq(a1{kNT#T=HKwt*YMfp7d2IPndinhH*%x zL@I$T9iw0feMs|gSvZ-GHfEiP6F+&a(&Ed}(^lrZAq9-g6->1Vh_-)Lajb4P)MxA& zl#ySNBdIEO+|3T=V^&!ts-YNJyfq9&mF#RBZ(C$YT2x&6xG?(c_@`y0i*uB>b(LW? zU?%v_21pOEm%fSlS5^ZHCwWq*3IStW98g|v@@Il+P_nf}V1@+GfwsrQOo9al+`nRj zrYhCrueKC&^%ZiGg&Ug*oY`2uP?#j#udbLd^s3hPcFwFFge~+`oOx9aCNS$xyoEzW zcA(<-YLEQ|7GdrwmIUWqOvUeUjY%`&0G64D7=N;Z?gL^?=MJn#@3#{o>+QceLW@HW zZ`P-b&laV|>^&pGq zSQeLPJTHq+w#vu#Ambu&7W4@xYL)&=W^vnCFAIR~sb=4`I?55<@8a{T$1Y6DnCENN zsBpFW-i}e0k!`1P!=E^k6YzLMyHv4
-
$item.location 
+
@@ -82,7 +82,7 @@ {{ endif }}
- +
$item.location 
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl index 603a908c5a..e02e5a8bec 100644 --- a/view/theme/diabook-blue/wallwall_item.tpl +++ b/view/theme/diabook-blue/wallwall_item.tpl @@ -52,7 +52,7 @@
-
$item.location 
+
@@ -88,7 +88,7 @@ {{ endif }}
- +
$item.location 
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png index 5bdc34f7648dde8433ab9c76c621915da1efb7b6..2709977406afc940f8e7a3376db1c6828aa2b151 100755 GIT binary patch delta 665 zcmV;K0%ra81iBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPwie*+2t zHZ4u|AwU2C0!m3lK~y-)wbW0j&UqBa@z?#M6y@Hcd+)-NP_memvZKL<2_;!xn#kEr z7PFWvEfqyJ(^h;c;!wbNzaH)I&M-?fHGb=bZQN z^PKbj9lnzdbRIHu2&>VKhzDN-f62_%7{Y^yXv1K`zY>>lDKkgE0y^5sE5>KVrS=q# z;w*l{2Yl=(=m8umVZ%6qUvLJ$Mnt=#xK+>@9LHN6!S2jl)C0N*yDR2x<;)bL)hxwf zv@snK&#@OL>%3Q4M$2~+dn;$U7>Aps_#Yoj#Zycb{1DD#DK;1MAH2fPe>jIfDsBvy zF&GhRI*M1}5$<9ge#CWLt(Tv{@3l@x#C-X#V{7HyEyk*5DF*7A&6m1S+=__D*nn+S zyB4-*=Em~fs@SEK+wN4MdEMsg_k9Jd$jl{pSU03&Z9FXBirT;LVl05)U|D7^$7B49 zpRhh6Uexnkt)11Z_1KBqe|S>4%ZjxC{tIidAtLTq6UK2UGe_#|9o|L6{mdMxhE3o~ zMBJ;Atu599cnTxfU;7KV)>VSRuF`#|m zLzy`d5py_(gAs8jGxuS#7&F~NXa}y~CiXaBNhVNzdAxliO6RE_p8-Zzvw`70{hK z+~?RGujYLb+-?1WTMcllpM=3a!NcDm=KI(uq@dF1M8N9200000NkvXXu0mjfAj&_K delta 710 zcmV;%0y+K41@;9YiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)}e*zp1 z7#StW&>#Q+0(MD6K~y-)mDDk4o@EdR@Zb9;4r;JTNlA+2qlQ8$4h6wYNOY>=P^6Pk zlok#gM5vUu;8;k73W|ergViNnBrdH*u#g5fDd^y$HPDncI2a_D3{Ahr<-YPYCRiUh z-g}M;zPWPPw;+|na^Pn^EiqX zyn{RVHX=5*NPGgX;aPl!-S`^Qm~3$ZUCc(rpE!aGbw099+eRvO0Y?fme_I?Un#}wi z5AZtvz{MgxjxRBUmx}BM{EfHq1-_}gFCNqy^ z=33dY9bTP>*tQ3*pVP$DjHYS&s~GRAaJ+Z8xw&aO?BMO|XCKk9bzdX{ef~~)ZeKrZ s@G&0cP9I_CzmnU>93ULr!QXcM1M4~U6?a^Jvj6}907*qoM6N<$f+Y1%i~s-t diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 6e3909ab4f..ad7119c2aa 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1036,13 +1036,23 @@ section { width: 800px; padding: 0px 0px 0px 12px; } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } #contact-edit-end { - margin-top: 140%; + } .pager { padding: 10px; text-align: center; font-size: 1.0em; + margin-top: 140%; } .tabs { @@ -1116,6 +1126,7 @@ section { } .wall-item-container .wall-item-location { padding-right: 40px; + display: table-cell; } .wall-item-container .wall-item-ago { word-wrap: break-word; @@ -1171,6 +1182,7 @@ section { .wall-item-container .wall-item-actions-social { float: left; margin-bottom: 1px; + display: table-cell; } .wall-item-container .wall-item-actions-social a { margin-right: 1em; @@ -1181,6 +1193,7 @@ section { .wall-item-container .wall-item-actions-tools { float: right; width: 80px; + display: table-cell; } .wall-item-container .wall-item-actions-tools a { float: right; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 0a20c9fbca..5a1828ad75 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -13,6 +13,7 @@ $a->theme_info = array( $a->page['htmlhead'] .= <<< EOT + EOT; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index b1a0149490..ebe40fd4ea 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -46,7 +46,7 @@
-
$item.location 
+
@@ -82,7 +82,7 @@ {{ endif }}
- +
$item.location 
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index 603a908c5a..e02e5a8bec 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -52,7 +52,7 @@
-
$item.location 
+
@@ -88,7 +88,7 @@ {{ endif }}
- +
$item.location 
From 20d1a16dbb8a406bdeef62e8ee6973082e8d026a Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 10 Mar 2012 14:44:43 -0800 Subject: [PATCH 10/19] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 45f728999d..1414adb069 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.1276' ); +define ( 'FRIENDICA_VERSION', '2.3.1277' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); From 1bddd4866151f53f4469dee636a3742fe8381306 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 10 Mar 2012 15:50:51 -0800 Subject: [PATCH 11/19] bug #327 - composed private message is lost if no recip specified. --- mod/message.php | 20 +++++++++++++++----- view/prv_message.tpl | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mod/message.php b/mod/message.php index 91db5baef1..dcaaf69753 100755 --- a/mod/message.php +++ b/mod/message.php @@ -10,17 +10,19 @@ function message_post(&$a) { return; } - $replyto = ((x($_POST,'replyto')) ? notags(trim($_POST['replyto'])) : ''); - $subject = ((x($_POST,'subject')) ? notags(trim($_POST['subject'])) : ''); - $body = ((x($_POST,'body')) ? escape_tags(trim($_POST['body'])) : ''); - $recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto']) : 0 ); + $replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : ''); + $subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : ''); + $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); + $recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto']) : 0 ); $ret = send_message($recipient, $body, $subject, $replyto); + $norecip = false; switch($ret){ case -1: notice( t('No recipient selected.') . EOL ); + $norecip = true; break; case -2: notice( t('Unable to locate contact information.') . EOL ); @@ -35,6 +37,13 @@ function message_post(&$a) { info( t('Message sent.') . EOL ); } + // fake it to go back to the input form if no recipient listed + + if($norecip) { + $a->argc = 2; + $a->argv[1] = 'new'; + } + } function message_content(&$a) { @@ -151,7 +160,8 @@ function message_content(&$a) { '$header' => t('Send Private Message'), '$to' => t('To:'), '$subject' => t('Subject:'), - '$subjtxt' => '', + '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), + '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), '$readonly' => '', '$yourmessage' => t('Your message:'), '$select' => $select, diff --git a/view/prv_message.tpl b/view/prv_message.tpl index 25bf93b99c..4b904cbcd6 100755 --- a/view/prv_message.tpl +++ b/view/prv_message.tpl @@ -13,7 +13,7 @@ $select
$yourmessage
- +
From d9c5d9d2ebf1d0830020e4dc5971cf5bd2227ed5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 10 Mar 2012 15:53:36 -0800 Subject: [PATCH 12/19] default the text template var on conversations --- mod/message.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/message.php b/mod/message.php index dcaaf69753..57d45ee3c7 100755 --- a/mod/message.php +++ b/mod/message.php @@ -305,6 +305,7 @@ function message_content(&$a) { '$subjtxt' => template_escape($message['title']), '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', '$yourmessage' => t('Your message:'), + '$text' => '', '$select' => $select, '$parent' => $parent, '$upload' => t('Upload photo'), From 5915325367013f96ffdabb7ef5ca56aa652ccd8d Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 10 Mar 2012 18:52:50 -0800 Subject: [PATCH 13/19] bug #328 --- include/bbcode.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index cff26f5c8e..d69cb263f8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -216,6 +216,9 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text); + $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '', $Text); + + $Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '', $Text); // Try to Oembed $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text); @@ -224,9 +227,6 @@ function bbcode($Text,$preserve_nl = false) { // html5 video and audio - $Text = preg_replace("/\[video\](.*?)\[\/video\]/ism", '', $Text); - - $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '', $Text); $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '', $Text); From f7ade749b827c22efe873b4f99941a1b7e5d0d62 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 01:32:11 -0500 Subject: [PATCH 14/19] preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! Signed-off-by: Simon L'nu --- view/theme/dispy-dark/comment_item.tpl | 35 + view/theme/dispy-dark/connect.png | Bin 0 -> 443 bytes view/theme/dispy-dark/contact_template.tpl | 28 + view/theme/dispy-dark/conversation.tpl | 23 + view/theme/dispy-dark/experimental | 0 view/theme/dispy-dark/group_side.tpl | 30 + view/theme/dispy-dark/head.tpl | 99 + view/theme/dispy-dark/icons.png | Bin 0 -> 29039 bytes view/theme/dispy-dark/icons.svg | 2096 +++++++++++++ view/theme/dispy-dark/jot-header.tpl | 312 ++ view/theme/dispy-dark/jot.tpl | 72 + view/theme/dispy-dark/login-bg.gif | Bin 0 -> 237 bytes view/theme/dispy-dark/mail_head.tpl | 5 + view/theme/dispy-dark/menu-user-pin.jpg | Bin 0 -> 385 bytes view/theme/dispy-dark/nav.tpl | 123 + view/theme/dispy-dark/nets.tpl | 10 + view/theme/dispy-dark/next.png | Bin 0 -> 590 bytes view/theme/dispy-dark/notifications.png | Bin 0 -> 2494 bytes view/theme/dispy-dark/notifications.svg | 273 ++ view/theme/dispy-dark/photo-menu.jpg | Bin 0 -> 459 bytes view/theme/dispy-dark/photo_view.tpl | 40 + view/theme/dispy-dark/premium.png | Bin 0 -> 2304 bytes view/theme/dispy-dark/prev.png | Bin 0 -> 593 bytes view/theme/dispy-dark/profile_vcard.tpl | 66 + .../theme/dispy-dark/saved_searches_aside.tpl | 14 + view/theme/dispy-dark/search_item.tpl | 51 + view/theme/dispy-dark/star.png | Bin 0 -> 2129 bytes view/theme/dispy-dark/style.css | 2631 +++++++++++++++++ view/theme/dispy-dark/tag.png | Bin 0 -> 571 bytes view/theme/dispy-dark/theme.php | 74 + view/theme/dispy-dark/wall_item.tpl | 77 + view/theme/dispy-dark/wallwall_item.tpl | 81 + view/theme/dispy/style.css | 17 +- 33 files changed, 6144 insertions(+), 13 deletions(-) create mode 100644 view/theme/dispy-dark/comment_item.tpl create mode 100644 view/theme/dispy-dark/connect.png create mode 100644 view/theme/dispy-dark/contact_template.tpl create mode 100644 view/theme/dispy-dark/conversation.tpl create mode 100644 view/theme/dispy-dark/experimental create mode 100644 view/theme/dispy-dark/group_side.tpl create mode 100644 view/theme/dispy-dark/head.tpl create mode 100644 view/theme/dispy-dark/icons.png create mode 100644 view/theme/dispy-dark/icons.svg create mode 100644 view/theme/dispy-dark/jot-header.tpl create mode 100644 view/theme/dispy-dark/jot.tpl create mode 100644 view/theme/dispy-dark/login-bg.gif create mode 100644 view/theme/dispy-dark/mail_head.tpl create mode 100644 view/theme/dispy-dark/menu-user-pin.jpg create mode 100644 view/theme/dispy-dark/nav.tpl create mode 100644 view/theme/dispy-dark/nets.tpl create mode 100644 view/theme/dispy-dark/next.png create mode 100644 view/theme/dispy-dark/notifications.png create mode 100644 view/theme/dispy-dark/notifications.svg create mode 100644 view/theme/dispy-dark/photo-menu.jpg create mode 100644 view/theme/dispy-dark/photo_view.tpl create mode 100644 view/theme/dispy-dark/premium.png create mode 100644 view/theme/dispy-dark/prev.png create mode 100644 view/theme/dispy-dark/profile_vcard.tpl create mode 100644 view/theme/dispy-dark/saved_searches_aside.tpl create mode 100644 view/theme/dispy-dark/search_item.tpl create mode 100644 view/theme/dispy-dark/star.png create mode 100644 view/theme/dispy-dark/style.css create mode 100644 view/theme/dispy-dark/tag.png create mode 100644 view/theme/dispy-dark/theme.php create mode 100644 view/theme/dispy-dark/wall_item.tpl create mode 100644 view/theme/dispy-dark/wallwall_item.tpl diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl new file mode 100644 index 0000000000..85176732b7 --- /dev/null +++ b/view/theme/dispy-dark/comment_item.tpl @@ -0,0 +1,35 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+ + + {{ if $qcomment }} +
    + {{ for $qcomment as $qc }} +
  • $qc
    • + {{ endfor }} +
+ {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/dispy-dark/connect.png b/view/theme/dispy-dark/connect.png new file mode 100644 index 0000000000000000000000000000000000000000..b76fc13dce9eee21d5a9449f80e21444c801cabe GIT binary patch literal 443 zcmV;s0Yv_ZP)!~>``3MAvsy{nQinWJDuHZx1&Pfqp!=gT=cM`lKyLI}%}9ZNh)BkQeJ zD-LE{Z8zYYZ2}8steO=om6>6HveX4oNah=j|4kQ32q`FWJ0A6G+T71AW8BLI{g#n%)co^zxF;6@}Xd-KJ@J z*f;V#UviF9U;=aoESTAybB*10yM6x+81~9Q^J{Dah|#Y}+9^vDFbnMc2B?x^%wK^~ l;NdT49F&>aKJXyv-~)f?rYbayUt9nH002ovPDHLkV1mQvvw#2q literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/contact_template.tpl b/view/theme/dispy-dark/contact_template.tpl new file mode 100644 index 0000000000..fbf354b475 --- /dev/null +++ b/view/theme/dispy-dark/contact_template.tpl @@ -0,0 +1,28 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+
+ Profile URL
+
$contact.network
+ +
+
diff --git a/view/theme/dispy-dark/conversation.tpl b/view/theme/dispy-dark/conversation.tpl new file mode 100644 index 0000000000..41b6aeadff --- /dev/null +++ b/view/theme/dispy-dark/conversation.tpl @@ -0,0 +1,23 @@ +{{ 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-dark/experimental b/view/theme/dispy-dark/experimental new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/theme/dispy-dark/group_side.tpl b/view/theme/dispy-dark/group_side.tpl new file mode 100644 index 0000000000..516d70d5b4 --- /dev/null +++ b/view/theme/dispy-dark/group_side.tpl @@ -0,0 +1,30 @@ +
+

$title

+ + + +
+ + diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl new file mode 100644 index 0000000000..793af6fd2d --- /dev/null +++ b/view/theme/dispy-dark/head.tpl @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png new file mode 100644 index 0000000000000000000000000000000000000000..f99ec29ee211b6ab448ed3502134dae0f109a623 GIT binary patch literal 29039 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 literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg new file mode 100644 index 0000000000..05a00d93c4 --- /dev/null +++ b/view/theme/dispy-dark/icons.svg @@ -0,0 +1,2096 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lorem Ip + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + ? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl new file mode 100644 index 0000000000..43dcdbb841 --- /dev/null +++ b/view/theme/dispy-dark/jot-header.tpl @@ -0,0 +1,312 @@ + + + + diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl new file mode 100644 index 0000000000..94c31da23b --- /dev/null +++ b/view/theme/dispy-dark/jot.tpl @@ -0,0 +1,72 @@ +
+
+
 
+ +
+ + + + + + + + + + + + + +
+ + +
+
+ $acl +
+
$emailcc
+ +
+ $jotnets +
+
+ +
+{{ if $content }}{{ endif }} diff --git a/view/theme/dispy-dark/login-bg.gif b/view/theme/dispy-dark/login-bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..cde836c893f64bcfec04b9c817e3371ff122fe19 GIT binary patch literal 237 zcmVb{bmUKcqz}))c5uC(7v?)v4a2P)ZNa- z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS* literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/mail_head.tpl b/view/theme/dispy-dark/mail_head.tpl new file mode 100644 index 0000000000..d49d7c1af9 --- /dev/null +++ b/view/theme/dispy-dark/mail_head.tpl @@ -0,0 +1,5 @@ +

$messages

+ +
+$tab_content +
diff --git a/view/theme/dispy-dark/menu-user-pin.jpg b/view/theme/dispy-dark/menu-user-pin.jpg new file mode 100644 index 0000000000000000000000000000000000000000..26449569f40425feda7ce4986e1935b4a67076d1 GIT binary patch literal 385 zcmex=LJ%Z3brsW+o;O z0s6Oj-S z5fuR$!pIEN!@|nR%E~Fi%grl7GWdUhL6C!igMo*cQHg;`kdaxC@&6G9F|hj?kO4D0 zP+UoX0ca!8(Qp|?CT11}RyIK)MRrHSz(k-LQIOYB024D%SX>Y&jv~PbwD12dkj+2_ zvmk>#!}N~gJ*B%@y6YT;gydRoMhD3xvih4@Kir$MLU@5~^Uuh%)Ox?j37$JRdX8kK Zcl($$OlaY6yuN=|Q1|jygZ=++0szW8M1TMQ literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl new file mode 100644 index 0000000000..4a030e7ae1 --- /dev/null +++ b/view/theme/dispy-dark/nav.tpl @@ -0,0 +1,123 @@ + + + + diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl new file mode 100644 index 0000000000..b0cb8890c5 --- /dev/null +++ b/view/theme/dispy-dark/nets.tpl @@ -0,0 +1,10 @@ +
+

$title

+
$desc
+ $all +
    + {{ for $nets as $net }} +
  • $net.name
    • + {{ endfor }} +
+
diff --git a/view/theme/dispy-dark/next.png b/view/theme/dispy-dark/next.png new file mode 100644 index 0000000000000000000000000000000000000000..5e0067c4b4abd31370a945244aee2c8aae6d85f6 GIT binary patch literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^;y|p(yEr+qAXP8FD1G)j8!4cor2#%6 zuK)l4Z)j+6aBxUVOA8GR_4M>iNJs!Oe0_amV`G7g$jHdxh~TiWps+9?85|lJ7#a~2 z5*`v35gZyG90C*x4-N|t4h;(dGC+ttMnn))JH!xF@`LXUN1%hvN`m}?8JJjD+1NQa zxwv^m%pG0aJ^Z4xd;6BITD@lNy7e12ZrZ$M>$dGXcJA7}XYaoK2M!)OdgAh(&)?bI z6YGH{-1KyD4AD4Wdil9flYxNSMUF)Y;=4OKlGt}w{&(N}tk}HmZ)Kj^>_)X^q6o04=EWH^U4H^)gCQw ye;Zc2hc*3Sy~V|d3h~P?uk$}hzq@SdYvvuhe13;LEnW}wB!j1`pUXO@geCxYQ|Ye& literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/notifications.png b/view/theme/dispy-dark/notifications.png new file mode 100644 index 0000000000000000000000000000000000000000..66c432eacc83d32ac6ab803a23a65674dbfa3173 GIT binary patch literal 2494 zcmV;v2|@OWP)*^{Zg8*gi z>^vnUB$1f_~rp)E8)Ps>XJ1hDP6Rk0|d5J-sIEZeoc?shnLTY0e+ zLJ>jw?D_r4%ReOlmxPzw?abZxj{gh!-7o(S-{<>0!NcR>>*4Ev?F9GaC-DCQQbVNYP+e%oP@S;bR392O8*37PQkD9wG?l&|1?ft|q1oE6 zDp@s8o1;$9$}8KnS=z<3`B`V)@LikPDJakA^lO>z=X_tDxOP+~DIb$bW@hcX>OgN( ztx$m=^`gM6FQ7U2(V5y*!nx)JW{`T*R2}eINjngrP{VtQ4J&5y110d($kht1T-}2L zN;&GcW(6d@|Aq{MUju?Pjsi+I{3B*#?XiQB4G2*KY8(ZWvc=Q4_P6z$mZ2jRAv}XL zkZh_Iil=*1>2H5IKdrPQ1Ht)cno+Skq|o}9LF%`HWYc}E zqGHv|Sii@deFi}!!qaMnh%SR)`;1i`505zyWYWknxun$!k)6a-U;CamY^A9#RE5xt z5O4;oHo}nhm*51dTk!Eq^QU8D3Ptmy2uv~p(@j8<7G8(w!@2#v`JNOV5Q`wkE zt9>M0sgFaLKC?KIDDM))ooEIud601O8b}bNlwuvcdgvman{X)%=oh98lB{ZlR;E@V zC?gyoS@d14tSVrt>t-3f7iSp#vM?icbAd#YZdyRfN?tscEzQD=)XfQ!4Je(9r7iS% zgrfm9J{g$1XP!Zz=0k6;CzDI{_I4D5s=VfZW1UgAniI%K(YpJO2n0R9J_2i zCc*qw#YHP{6iJE|W8QJEJ=FL+O!FZW_}sePSG!}x$SDwD2v=-6oLNeG9(g{*>q zL_P~&r);Lg11iV0&0QO~qW+UlaNc9873Oic(qTFnBqzn>H&J0b=1nYRZ(W7tcUmD$ zX$6IHF3Yh+#GSS%F3`(jHyJT7yHe#LCXndLk3UL5Rh(MP%cW}NniSUZ*6FWc0*OfS zu{Ufk^n|Fhi>PvEcMaW2deNH+s%FmiUoKHFfn*0&d>H&YHU#b;h=;-St?<>ZP!6cX zj%%Chg+Yu^)NBG%b)fyZszB%~@N*i-Cuw+CD_qXB$yB8whz>>~I@Hc%SFDgE7PV52 zL^?YWYWtf_R2j5$Epyf)Wlvgojh3bK*-Y!!$kai60I7K69As_D0eSQxsF79jfvS&f z*on>*#1^un&Mku7&AyD+*<5O`VQDBUP%>!{pRi4Ux-HrO#^(fZbHn#x__sUYKM2@p zb^=S5l7>2QDPhZGAOAJ zr=krusjOAp&T?-DBh1?0X~OvcQk`7^vS{6LGe1)t)VOPehrwJ1XVfPM$t{$>|E-|B}Y)qAXywKrMQh5 zB%8+4l^s83cB#rXK9H2{KMQ4VoQ1QmpXTXO>M{D-V}y;{vKDKHPdddJusUheOw?OJS=oatA0=O%Rp2*fP~{eeerxgU!hi7} zTgPW0Q+Q|V*2>f(zAojeu=Ksm2$a!J#FmwI)i0rjoGyT5%Tk?!U=EiOIRoM|;cA3w zA$%UT#x;=aph^sO_(wT>_+9Qm#Y0WZUj)NkeE3~cg@+L;r9Q@~Ly5GHkfG$vK&APM z0zXfu`vs4=`0%^j0fvW~x&9dvAAZ+l7)S^wU%$8wlX))nU$;yo%S4+3GXMYp07*qo IM6N<$f|!e*qyPW_ literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/notifications.svg b/view/theme/dispy-dark/notifications.svg new file mode 100644 index 0000000000..0ec2c05699 --- /dev/null +++ b/view/theme/dispy-dark/notifications.svg @@ -0,0 +1,273 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/theme/dispy-dark/photo-menu.jpg b/view/theme/dispy-dark/photo-menu.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fde5eb53524ddb12ec5642f33d0d34e14e256193 GIT binary patch literal 459 zcmex=&g!NbMF!_CFb&C4ewz{@Ad$IUGuCLky*A}T7%!!Ir&CL$pu zA}RthgpnDjhlQ1sm6cP3mz!6FWbpq0gCGZk0D}NCqY?v?AS1IN>UQrQGDKoE6M2QoDc3G+f#K-Lz&!r^Qc^B##H0%WszGMCU1W znAE#pe4KOt&Ml**OEy0VoUS}?d3@zno#;NjlP3257arA~E4nCar)(9G=iXTV|0V#| C@@!oI literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl new file mode 100644 index 0000000000..4582751c60 --- /dev/null +++ b/view/theme/dispy-dark/photo_view.tpl @@ -0,0 +1,40 @@ +
+

$album.1

+ + + +
+ {{ if $prevlink }}{{ endif }} + + {{ if $nextlink }}{{ endif }} +
+ +
+
$desc
+{{ if $tags }} +
$tags.0
+
$tags.1
+{{ endif }} +{{ if $tags.2 }}{{ endif }} + +{{ if $edit }}$edit{{ endif }} + +{{ if $likebuttons }} +
+ $likebuttons + $like + $dislike +
+{{ endif }} + +$comments + +$paginate + diff --git a/view/theme/dispy-dark/premium.png b/view/theme/dispy-dark/premium.png new file mode 100644 index 0000000000000000000000000000000000000000..d2855a4f5df42e22c7a39f2ffb1bde0468a82cf8 GIT binary patch literal 2304 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 + +
$profile.name
+ + {{ if $pdesc }} +
$profile.pdesc
+ {{ endif }} +
+ $profile.name +
+ + {{ if $location }} +
+ $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 $profile.pubkey }} + + {{ endif }} + + {{ if $marital }} +
+ + ♥$marital + $profile.marital +
+ {{ endif }} + + {{ if $homepage }} +
+ $homepage + $profile.homepage +
{{ endif }} + + {{ inc diaspora_vcard.tpl }}{{ endinc }} + + +
+ +$contact_block + + diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl new file mode 100644 index 0000000000..e2aae1e77c --- /dev/null +++ b/view/theme/dispy-dark/saved_searches_aside.tpl @@ -0,0 +1,14 @@ +
+ + $searchbox + +
    + {{ for $saved as $search }} +
  • + + $search.term +
    • + {{ endfor }} +
+
+
diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl new file mode 100644 index 0000000000..54c3e389c0 --- /dev/null +++ b/view/theme/dispy-dark/search_item.tpl @@ -0,0 +1,51 @@ +
+
+
+
+ + $item.name + menu +
+
    + $item.item_photo_menu +
+
+
+
+
{{ if $item.location }}$item.location {{ endif }}
+
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
+
+
+ {{ if $item.drop.dropping }}{{ endif }} +
+ {{ if $item.drop.dropping }}{{ endif }} +
+
+
+
$item.title
+
+
$item.body
+
+
+ $item.name +
$item.ago
+ +
+ +
+
+
+ +
+
+ {{ if $item.conv }} + $item.conv.title + {{ endif }} +
+ diff --git a/view/theme/dispy-dark/star.png b/view/theme/dispy-dark/star.png new file mode 100644 index 0000000000000000000000000000000000000000..a327ba14e462a494523d9d5be1195989b08b36ad GIT binary patch literal 2129 zcmZ8h3pf+%8=p&!&6Eg9TEpnJ86(!LT*9)MTji2z7S4x@eU49cNQa*7D)vFxC)8h!x261T1zje1vR6om@o}h zTzF|>zLN?Ck3*;!`AQN z#MCp|d*RNzSM}8KJ_u&j4ca3)QpRxQQgAQ-f||yRKD0TRk%0|8wzB2Alzq>ZEt)Y0pLsFkGC9KoruRjq@DJ_l~-En(7Z#}&dtm3hhGG6OK zramT}^yrVanmF&3`#l=mWu7B7KC;F~P58$Q`OB6_5Ghedl-u(BVdv{AjgI)k+i;bI zUgGxm#@&SO>5#^jlzIDh-G%cg2fu=5BVvAv&8HXcV3U`-m@d+p-xIrOrrDwy7udi^qLdFc_k>Irqx`1t^kfQ)YLDh*44KGm(fEHnJ&I;006AH zED8XAzAgZu5JL0z;rI{rBgW+D3=}?#l~=LVLuQU zxxVa1!k|AOoCsT(578a!z+h3KXapKz2E&1%P$-ra5{mJ3bov=Cw`^hI91atMM8?F# zAYv>K3|1HtWn*K5G&4t(1dq_TrqG$x0}h=MNXr35je zIkqs^a-m=6XPAmpRDBkkX#BAi9(nme`S^jV&xn$4lF8#!(e$c7?C);lFhgZ%T2a-qrJ3$<1{rFLJ`MRRv9qqiWH41VD zBQ!m<+PmJ<%1~uA0pVgFqFt+A+b^{wI#C$^Ed`0YmehRB!*0dpIlQ}8JuV4mx&)R6 z`LB3Zj?+r?8!F?MJk<*x8VEJl?80l}J)D^%69&=+DRS6$veRrZQu~}ip4duf7Q!Qv zV3}V+OD5B@a%LA|5&5$5Xr04W%5}WaK$G-0?=QWyH{AI5KG)LuTR52NWtSASpCSOM+Xu;B`>#O_UlyZi`jIxnl%)@mt~Rtl~|HL4FpBfBkK* znI5VimD^F8t-GT;N3>Pol+!8`^#(l+J&IXWzR}5klIMG*Ea)RQ-#Uz>C2N!8Ri+43zD5Z;!92h*!7kK|i(J@cbOe>-y&K00YH_A~pXB z9|V(hc~@ZzwDAgPhtS!{$yz(WY?~7HteJAKAhGbRm z3Y+d6vtqm$5YNeEDWMjX%&djC4>FEBOJ6l1k3>f+jetYU@dE*{@!xg5*l`5n_{$q) z0cbVaH^8eWVY0EzbZ`FV=fDQj#Z$*6nGa_YR(%*gYq0C6B4fC@!>_7O5#daXa}CYC zg|>+3uXm_vUZPSvG<)cc+(be-;>JK*K_;BAi|cQ9I{ zQrzbVFWeUikro-5pGPn{0DV$TTX&uSpZT^pGS9Qia(vG`Ba9%y*KBq9MmmJny8wr` zM??o`0)c01-0Z9mZ&7<7a;C&V0XNT3SK~EP+d{YLc%(+CaBHb|^;|zDv9Q`*34Z<# zneT)zI<8EKs$cC)KZZ?Vy*UcxHl>`)*M2#xh?IpS*nmwt>are{#O#4xcJ0i!g%HI= z+f;3&5HA)%@}Va82nKMB@a z_1_OdwfoiIkZNaB;rZ&$4 + * + */ + +/* 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: 0; + font-size: 16px; + line-height: 1.1em; +} +body, button, input, select, textarea { + font-family: sans-serif; + color: #eec; + /*background-color: #2e3436;*/ + background-color: #2e2f2e; +} +select { + border: 1px #555 dotted; + padding: 3px; + margin: 2px; +} +option { + padding: 3px; + vertical-align: middle; +} +/* remember to define focus styles! */ +:focus { + outline: 0; +} + +/* remember to highlight inserts somehow! */ +ins { + background-color: #2e302e; + color: #ff9; + text-decoration: none; +} +mark { + background-color: #2e302e; + color: #ff9; + font-style: italic; + font-weight: bold; +} +/* Redeclare monospace font family: h5bp.com/j */ +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, .wall-item-body code { + 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: #88a9d2; + text-decoration: none; + margin-bottom: 1px; + text-decoration: none; +} +/*a:hover { */ +/* text-decoration: none;*/ +/*}*/ +a:hover img { + text-decoration: none; +} +blockquote { + background: #444; + color: #eec; + 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: #ff0; + font-size: 16px; + font-weight: bold; + margin: 3px; +} +.fakelink, .lockview { + color: #729fcf; + cursor: pointer; +} +.fakelink:hover { + color: #729fcf; +} +input[type=submit] { + font-weight: bold; + background-color: #eee; + color: #2e302e; + margin-top: 10px; + height: 22px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 0; +} +.smalltext { + font-size: 0.7em; +} +#panel { + position: absolute; + font-size: 0.8em; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 1px solid #fff; + background-color: #2e302e; + color: #eeeeec; + padding: 1em; +} +.pager { + margin-top: 60px; + display: block; + clear: both; + text-align: center; +} +.pager span { + padding: 4px; + margin: 4px; +} +.pager_current { + background-color: #729fcf; + color: #fff; +} + +/** + * global + */ +/* .tool .action */ +.action { + float: right; +} + +/** + * login + */ +#login-extra-links a { + margin-right: 20px; +} + +/********* +* nav +*********/ +nav { + height: 60px; + display: block; + background-color: #1d1f1d; + color: #eeeeec; + position: relative; + 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 #banner { + display: block; + position: absolute; + left: 51px; + top: 25px; +} +nav #banner #logo-text a { + font-size: 40px; + font-weight: bold; + margin-left: 3px; +} +nav #user-menu { + display: block; + width: auto; + float: right; + margin: 3px 68px 0 0; + position: relative; + 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; + font-size: 12px; + padding: 3px 20px 9px 5px; + height: 10px; +} +ul#user-menu-popup { + display: none; + position: absolute; + background-color: #555753; + width: 100%; + padding: 10px 0px; + margin: 0px; + 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: #2e302e; + background-color: #eeeeec; +} +ul#user-menu-popup li a.nav-sep { + border-top: 1px solid #eeeeec; +} +#nav-buttons { + clear: both; + list-style: none; + padding: 0px; +} +#nav-buttons li { + padding: 0; +} +nav .nav-link { + 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-intro-link { + background-position: 0px -190px; +} +#nav-intro-link:hover { + background-position: -44px -190px; +} +#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; +} +#notifications { + height: 20px; + width: 100%; + position: absolute; + top: -19px; + left: 0; +} +/* 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: 30px 0 0 -45px; + width: 300px; + 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: #1d1f1d; + color: transparent; + 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.svg) 0 0 no-repeat; + color: #222; + font-weight: bold; + font-size: 0.8em; + padding-top: 0.2em; + text-align: center; + float: left; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; +} +.nav-ajax-update.show, .nav-ajax-left.show { + visibility: visible; +} +#net-update { + background-position: 0px 0px; +} +#mail-update { + background-position: -30px 0; +} +#notify-update { + background-position: -60px 0px; +} +#home-update { + background-position: -90px 0px; +} +#intro-update { + background-position: -120px 0px; +} +#lang-select-icon { + cursor: pointer; + position: absolute; + left: 0; + top: 0; +} +#language-selector { + position: absolute; + top: 0; + left: 16px; +} +.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: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: 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; +} + + +/** +* aside +**/ +aside { + position: absolute; + right: 15px; + width: 245px; + padding-top: 15px; + font-size: smaller; +} +.vcard .fn { + font-size: 1.7em; + font-weight: bold; + border-bottom: 1px solid #729fcf; + padding-bottom: 3px; +} +.vcard #profile-photo-wrapper { + margin: 20px; +} +/* http://css-tricks.com/snippets/css/css-box-shadow/ + * box-shadow: + * 1. The horizontal offset of the shadow, positive means + * the shadow will be on the right of the box, a negative + * offset will put the shadow on the left of the box. + * 2. The vertical offset of the shadow, a negative one + * means the box-shadow will be above the box, a + * positive one means the shadow will be below the box. + * 3. The blur radius (optional), if set to 0 the shadow + * will be sharp, the higher the number, the more blurred + * it will be. + * 4. The spread radius (optional), positive values increase + * the size of the shadow, negative values decrease the size. + * Default is 0 (the shadow is same size as blur). + * 5. Colo[u]r + */ +.vcard #profile-photo-wrapper img { + box-shadow: 3px 3px 10px 0 #000; +} +aside h4 { + font-size: 1.2em; +} +aside #viewcontacts { + text-align: right; +} +.aprofile dt { + box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; +} +#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:#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; +} + + +/** + * jot + **/ +#jot { + /*width: 785px;*/ + margin: 10px 0 20px 0px; + width: 100%; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 35px; + 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; +} +#jot #jot-tools .perms { + float: right; + width: 40px; +} +#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: 1px solid #ccc; + margin: 0 0 5px; + height: 20px; + width: 90%; + font-weight: bold; + border-radius: 5px; + vertical-align: middle; +} +#jot #character-counter { + width: 6%; + float: right; + text-align: right; + height: 15px; + line-height: 20px; + padding: 2px 20px 5px 0; +} +#profile-jot-text_tbl { + margin-bottom: 10px; +} +#profile-jot-text_ifr { + width:99.900002% !important; +} +#profile-attach-wrapper, +#profile-audio-wrapper, +#profile-link-wrapper, +#profile-location-wrapper, +#profile-nolocation-wrapper, +#profile-title-wrapper, +#profile-upload-wrapper, +#profile-video-wrapper { + float: left; + margin: 0 20px 0 0; +} +#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 10px; + border: 0; + text-decoration: none; + float: right; +} +.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; + float: right; +} +#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-plugin-wrapper { + width: 1px; + margin: 10px 0 0 0; + float: right; +} +#profile-jot-submit-wrapper { + float: right; + width: 100%; + list-style: none; + margin: 10px 0 0 0; + padding: 0; +} +#profile-jot-submit { + height: 22px; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + border-radius: 0 5px 5px 0; + border: 0; + margin: 0; + float: right; +} +#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: 0 10px; + border: 1px solid #555753; + border-top: 0; + display: block !important; +} +#group_allow_wrapper, +#group_deny_wrapper, +#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-permit-text-end, +#acl-deny-text-end { + clear: both; +} +#jot-title-desc { + color: #cccccc; +} +#profile-jot-desc { + color: #a00; +} +#jot-title-wrapper { + margin-bottom: 5px; +} +#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: 20px 6% 0 4%; + font-size: 0.8em; + padding-right: 230px; + min-width: 475px; +} + +/** tabs **/ +.tabs { + list-style: none; + margin: 10px 0 10px; + padding: 0; + border-bottom: 1px solid #729fcf; + font-size: 14px; +} +.tabs li { + display: inline; +} +.tab { + padding: 0 5px; +} +.tab:hover { + background-color: #88a9d2; + color: #111; + border: 0px; +} +.tab:active { + background-color: #88a9d2; + color: #111; + border: 0px; +} +.tab.active { + background-color: #88a9d2; + color: #111; +} + +/** + * items + */ +.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; + padding: 10px; + width: auto; +} +.wall-item-outside-wrapper .wall-item-comment-wrapper { + /*margin-left: 90px;*/ +} +.shiny { + background: #2e3436; +} +.wall-item-content { + overflow-x: auto; +} +/* removing it from here, vs. putting it in .wall-item-content + * might break things for people. we shall see ;) */ +[id^="tread-wrapper"], [class^="tread-wrapper"] { + margin: 15px 0 0 0; + padding: 0px; + /*overflow-x: auto;*/ +} +.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: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: 110px; +} +.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 5px 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 { + 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-dislike, +.wall-item-like { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 5px 0 5px 120px; +} +.wall-item-author, .wall-item-actions-author { + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 0 0 110px; +} +.wall-item-ago { + display: inline; + padding-left: 10px; +} +.wall-item-wrapper-end { + clear:both; +} +.wall-item-location { + margin-top: 15px; + 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; +} +.wallwall .wwto { + left: 5px; + margin: 0; + position: absolute; + top: 75px; + width: 30px; + z-index: 10001; + width: 30px; + height: 30px; +} +.wallwall .wwto img { + width: 30px !important; + height: 30px !important; +} +.wallwall .wall-item-photo-end { + clear: both; +} +.wall-item-arrowphoto-wrapper { + position: absolute; + left: 35px; + top: 80px; + z-index: 10002; +} +.wall-item-photo-menu { + min-width: 92px; + border: 2px solid #FFFFFF; + border-top: 0px; + background: #555753; + position: absolute; + left: -2px; top: 101px; + display: none; + z-index: 10003; + -webkit-border-radius: 0px 5px 5px 5px; + -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; +} +#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; +} +.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-author { + margin-left: 50px; +} + +.wall-item-outside-wrapper.comment .wall-item-photo-menu { + min-width: 50px; + top: 60px; +} +.comment-wwedit-wrapper { + /*margin: 30px 0px 0px 80px;*/ +} +.comment-edit-wrapper { + border-top: 1px #aaa solid; +} +.comment-wwedit-wrapper img, +.comment-edit-wrapper img { + width: 20px; + height: 20px; +} +.comment-edit-photo-link, .comment-edit-photo { + float: left; + margin-left: 10px; +} +.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 #c8bebe solid; + border-radius: 5px; + color: #c8bebe; + -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: 5px 5px 10px 50px; + 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 { + display: block; + padding: 0 0 10px 5px; + border-color: #ccc; + border-style: solid; + border-width: 1px 1px 1px 10px; + background: #eee; + width: 95%; +} + + +/** + * profile + **/ +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 + **/ +.photos { + height: auto; + overflow: auto; +} +#photo-top-links { + margin-bottom: 30px; +} +.photo-album-image-wrapper, +.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-top-image-wrapper a:hover, +#photo-photo a:hover, +.photo-album-image-wrapper a:hover { + border-bottom: 0; +} +.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-prev-link, +#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: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 .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; +} +#photos-upload-spacer, +#photos-upload-new-wrapper, +#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-album-select, +#photos-upload-newalbum { + width: 99%; +} +#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 + */ +.prvmail-text { + width: 100%; +} +#prvmail-subject { + width: 100%; +} +#prvmail-submit-wrapper { + margin-top: 10px; +} +#prvmail-submit { + float:right; + margin-top: 0; +} +#prvmail-submit-wrapper > div { + 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; +} + + +/** + * contacts + */ +.view-contact-wrapper, +.contact-entry-wrapper { + float: left; + margin-right: 5px; + margin-bottom: 40px; + width: 120px; + height: 120px; + padding: 3px; + 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-photo { + position: relative; +} +.contact-entry-edit-links .icon { + border: 1px solid #babdb6; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + 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-nav-wrapper .icon { + border: 1px solid #babdb6; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +#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; +} +.contact-photo-menu { + 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; +} + + + +/** + * register, settings & profile forms + */ +#id_openid_url, +.openid { + background:url(login-bg.gif) no-repeat; + background-position:0 50%; + padding-left:18px; +} + +#settings-nickname-desc { + background-color: #eec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; + color: #111; +} +#settings-default-perms { + margin-bottom: 20px; +} +#register-form div, +#profile-edit-form div { + clear: both; +} + +#register-form label, +#profile-edit-form label { + width: 300px; + float: left; +} + +#register-form span, +#profile-edit-form span { + color:#555753; + display:block; + margin-bottom:20px; +} +.settings-submit-wrapper, +.profile-edit-submit-wrapper { + margin: 30px 0px; +} +.profile-edit-side-div { + margin: 5px 2px 0 0; +} +.profile-edit-side-link { + margin: 0 20px -18px 0; + float: right; +} +.profile-listing { + float: left; + margin: 20px 20px 0px 0px; +} +#profile-edit-links ul { + margin: 20px 0; + padding: 0; + list-style: none; +} +#register-sitename { + display: inline; + font-weight: bold; +} +#advanced-expire-popup { + background: #2e2f2e; + color: #eec; +} + +/** + * contacts selector + */ +.group-delete-wrapper { + margin: -31px 122px 0 0; + float: right; +} + +#group-edit-submit-wrapper { + margin: 0 0 10px 0; + display: inline; +} +#group-edit-desc { + margin: 10px 0px; +} +#group-members, +#prof-members { + 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: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:0; + padding:5px; +} +#group-separator, +#prof-separator { + display: none; +} + +/** + * profile + */ +#cropimage-wrapper { + float:left; +} +#crop-image-form { + clear:both; +} + +/** + * events + **/ +.clear { clear: both; } +.eventcal { + float:left; + font-size:20px; +} +.vevent { + border:1px solid #ccc; +} +.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; +} +.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: 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-adjust-text, +#event-share-checkbox { + float:left; +} +#event-datetime-break { + margin-bottom: 10px; +} +#event-nofinish-break, +#event-adjust-break, +#event-share-break { + clear: both; +} +#event-desc-text, +#event-location-text { + margin-top: 10px; + margin-bottom: 5px; +} +#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; +} +/* was tired of having no way of moving it around, so + * here's a little 'hook' to do so */ +.delete-checked { + position: absolute; + left: 35px; + margin-top: 20px; +} +#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; +} + + +/** + * sidebar + */ +#group-sidebar { + margin-bottom: 10px; +} +.group-selected, .nets-selected { + padding: 3px; + border: 1px solid #f8f8f8; + background: #2e302e; + 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; +} +#peoplefind-sidebar form { + margin-bottom: 10px; +} +#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; +} +#side-peoplefind-url { + background-color: #2e2f2e; + color: #eec; + border: 1px 999 solid; + margin-right: 3px; + width: 75%; +} +#side-peoplefind-url:hover, #side-peoplefind-url:focus { + background-color: #efefef; + color: #222; + border: 1px 333 solid; +} +.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: #fff; + font-weight: bold; + background-color: #ff0000; + padding: 0 .3em; +} +.admin.linklist { + border: 0; padding: 0; +} +.admin.link { + list-style-position: inside; +} +#adminpage dl { + clear:left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid #000; +} +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom:1px solid #ccc; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0; + padding: 0; +} +#adminpage .plugin { + 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: 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%; +} +.field label, label { + float: left; + width: 275px; + display: block; + font-size: 1.077em; + /*font-weight: bold;*/ + margin: 0 10px 0.5em 0; + border: 1px #2e2f2e solid; + padding: 5px; + background: #eec; + vertical-align: middle; + color: #111; +} +.field input, input[type="text"] { + width: 250px; + height: 25px; + border: 1px #999 solid; +} +.field textarea { + width: 80%; + height: 100px; +} +.field_help { + display: block; + margin-left: 297px; + color: #aaa; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666; + padding: 3px 6px 4px 10px; + height: 16px; + text-decoration: none; +} +.field .onoff .on { + background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999; + color: #111; + text-align: left; +} +.field .onoff .off { + background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc; + color: #333; + text-align: right; +} +.hidden { + display:none !important; +} +.field.radio .field_help { + margin-left: 297px; +} + + +/* + * 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; +} + + +/** + * ICONS + */ +.iconspacer { + display: block; + width: 16px; + height: 16px; +} +.icon { + display: block; + width: 20px; + height: 20px; + background: url(icons.png) no-repeat; + border: 0; + text-decoration: none; + border-radius: 5px; +} +.icon:hover { + border: 0; + text-decoration: none; +} +.icon.drop, +.icon.drophide, .icon.delete { + float: left; +} +.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-position: -170px -60px; +} +.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); +} +#pause { + position: fixed; + bottom: 5px; + right: 5px; +} +.border, .border:hover { + border: 1px solid #babdb6; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.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 0; +} +.type-audio { + background-position: -40px 0; +} +.type-text { + background-position: -60px 0px; +} +.type-unkn { + background-position: -80px 0; +} + + +/** + * footer + */ +.cc-license { + margin-top: 100px; + font-size: 0.7em; +} +footer { + display: block; + margin: 50px 20%; + clear: both; +} +#profile-jot-text { + height: 20px; + 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; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + 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:#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:#000; + background-color:#F90; + background-image:url(../../../images/show_all_on.png); +} +#acl-list { + 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 #ccc; + 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: 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:#000; +} +.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:#000; + background-color:#9ade00; + background-image:url(../../../images/show_on.png); +} +.acl-button-hide.selected { + 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 **/ + + +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #555753; + color: #fff; + overflow: auto; + z-index: 100000; + border: 1px solid #cccccc; +} +.acpopupitem { + background-color: #555753; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + color: #2e302e; + 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.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-dark/tag.png b/view/theme/dispy-dark/tag.png new file mode 100644 index 0000000000000000000000000000000000000000..9b5a7223eb3e5755bb6dd642cd8bd97db3c16acb GIT binary patch literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pdfpRr>`sf9VTf8b$+?7sDD7As{uYCu0Yzx#>T^uq@=vOyt=x&wzig3^))p$_4V~LXU?2EckaA-^XAW= zzhudhrAwDCTefWZ^5rX5tXR2n<)K4|4j(>z^yty!$B&;pdGhq>(`V0~J$LTh`Sa&5 zUc7ke(xq$HuHCqCh`?8bDZJT`d#g}JhJyKl!W1U||;TLDF8C%}umIxV@%~N0Q$l1Gh zt#H<(chXEVc4dF%G`+XutB73IxhgLw<=ZP&1wBL7UTqObP7M{V=nS9M{jp%theme_info = array(); + +$a->page['htmlhead'] .= <<< EOT + +EOT; diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl new file mode 100644 index 0000000000..b013cfeef4 --- /dev/null +++ b/view/theme/dispy-dark/wall_item.tpl @@ -0,0 +1,77 @@ +
+
+
+
+ + $item.name + + menu +
+
    + $item.item_photo_menu +
+
+
+
+
{{ if $item.location }}$item.location {{ endif }}
+
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
+
+ {{ if $item.star }} + + + {{ endif }} + {{ if $item.vote }} + + {{ endif }} + {{ if $item.plink }} +
+ {{ endif }} + {{ if $item.edpost }} + + {{ endif }} + +
+ {{ if $item.drop.dropping }}{{ endif }} +
+ {{ if $item.drop.dropping }}{{ endif }} +
+ +
+
+
$item.title
+
+
$item.body +
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ $item.name +
$item.ago
+ +
+
+
+ +
$item.dislike
+
+ $item.comment +
+
+ +
+ diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl new file mode 100644 index 0000000000..86453fad21 --- /dev/null +++ b/view/theme/dispy-dark/wallwall_item.tpl @@ -0,0 +1,81 @@ +
+
+
+
+ + $item.owner_name +
+
$item.wall
+
+ + $item.name + menu +
+
    + $item.item_photo_menu +
+
+ +
+
+
{{ if $item.location }}$item.location {{ endif }}
+
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
+
+ {{ if $item.star }} + + + {{ endif }} + {{ if $item.vote }} + + {{ endif }} + {{ if $item.plink }} +
+ {{ endif }} + {{ if $item.edpost }} + + {{ endif }} + +
+ {{ if $item.drop.dropping }}{{ endif }} +
+ {{ if $item.drop.dropping }}{{ endif }} +
+ +
+
+
$item.title
+
+
$item.body +
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ $item.name +
$item.ago
+
+
+
+ +
$item.dislike
+
+ $item.comment +
+
+ +
+ diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 0977d5fcbf..1bee0396cd 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -57,6 +57,7 @@ select { } option { padding: 3px; + vertical-align: middle; } /* remember to define focus styles! */ :focus { @@ -75,17 +76,6 @@ mark { 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, .wall-item-body code { font-family: monospace, monospace; @@ -1302,7 +1292,7 @@ section { **/ .wall-item-body code { display: block; - padding-left: 10px; + padding: 0 0 10px 5px; border-color: #ccc; border-style: solid; border-width: 1px 1px 1px 10px; @@ -1768,9 +1758,10 @@ div[id$="wrapper"] br { * contacts selector */ .group-delete-wrapper { - margin: -28px 150px 0 0; + margin: -31px 122px 0 0; float: right; } + #group-edit-submit-wrapper { margin: 0 0 10px 0; display: inline; From 57d83703766a0e2071ef4b4ecdb6032091bf23cb Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 09:12:31 -0400 Subject: [PATCH 15/19] fix some stuff right away Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index d5e6826a8f..1e28a87406 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -928,11 +928,16 @@ aside #viewcontacts { display: none; } #jot-preview-content { - background-color: #ffffe0; - border: 1px #aaaa00 solid; + background-color: #3e3f3e; + color: #eec; + border: 1px #eec solid; border-radius: 3px; padding: 3px 3px 6px 10px; } +#jot-preview-content .wall-item-outside-wrapper { + border: 0; + border-radius: 0px; +} /** From 62fe48f064127e39e705a1970e5715b7a0631f9f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:14:31 -0400 Subject: [PATCH 16/19] fix more stuff Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 1e28a87406..5a07218bf2 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -80,7 +80,7 @@ mark { /* Redeclare monospace font family: h5bp.com/j */ pre, code, kbd, samp, .wall-item-body code { font-family: monospace, monospace; - _font-family: 'courier new', monospace; + _font-family: monospace; font-size: 1em; } /* Improve readability of pre-formatted text in all browsers */ @@ -667,8 +667,10 @@ aside #viewcontacts { text-align: right; } .aprofile dt { - box-shadow: 1px 1px 5px 0; - color: #666666; + background: #eec; + color: #2e2f2e; + font-weight: bold; + box-shadow: 1px 1px 5px 0 #000; margin: 15px 0 5px; padding-left: 5px; } @@ -1289,6 +1291,7 @@ section { border-style: solid; border-width: 1px 1px 1px 10px; background: #eee; + color: #2e2f2e; width: 95%; } @@ -1658,8 +1661,9 @@ div[id$="wrapper"] br { } .contact-photo-menu { width: auto; - border: 2px solid #444444; - background: #FFFFFF; + border: 2px solid #444; + background: #2e2f2e; + color: #eec; position: absolute; left: 0px; top: 90px; display: none; From fa0cb8514da3935d7780a70a38cf33b3096a914c Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:24:49 -0400 Subject: [PATCH 17/19] add some '@media handheld' types for dispys Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 8 +++++++- view/theme/dispy/style.css | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 5a07218bf2..8e59b151dc 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -42,7 +42,7 @@ html { } body { margin: 0; - font-size: 16px; + font-size: 12pt; line-height: 1.1em; } body, button, input, select, textarea { @@ -2638,3 +2638,9 @@ footer { display: inline-block; } + +@media handheld { + body { + font-size: 15pt; + } +} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 1bee0396cd..8081bfc281 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2643,3 +2643,10 @@ footer { display: inline-block; } + +@media handheld { + body { + font-size: 15pt; + } +} + From 467aa66d375eb2a6c626f4b3033dc3b552046a4a Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:25:39 -0400 Subject: [PATCH 18/19] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 258a8c0871083791eb5ec1d5f13b03e67248392d Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:29:12 -0400 Subject: [PATCH 19/19] screwed up on the font-size for screen last push Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 8e59b151dc..805749b1c5 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -42,7 +42,7 @@ html { } body { margin: 0; - font-size: 12pt; + font-size: 16px; line-height: 1.1em; } body, button, input, select, textarea {