aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-27 13:20:59 +0200
committerzottel <github@zottel.net>2012-03-27 13:20:59 +0200
commitfb817a29a934a68f194a42c29d3ed11da2da558f (patch)
treefdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23
parentfabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (diff)
parent928e6c7ef78d251429a7d5c1fd4fdb8e6c282d41 (diff)
downloadvolse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.gz
volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.bz2
volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.zip
Merge remote branch 'upstream/master'
-rwxr-xr-xboot.php5
-rw-r--r--images/blank.pngbin0 -> 1366 bytes
-rwxr-xr-xinclude/contact_widgets.php4
-rwxr-xr-xinclude/diaspora.php4
-rwxr-xr-xinclude/enotify.php41
-rwxr-xr-xinclude/items.php28
-rwxr-xr-xinclude/oembed.php5
-rwxr-xr-xinclude/plugin.php11
-rwxr-xr-xinclude/socgraph.php8
-rwxr-xr-xjs/country.js16
-rwxr-xr-xjs/main.js7
-rwxr-xr-xlibrary/mcefixes/plugins.bbcode.editor_plugin_src.js2
-rw-r--r--library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2
-rwxr-xr-xmod/acl.php10
-rwxr-xr-xmod/admin.php8
-rwxr-xr-xmod/dfrn_poll.php21
-rwxr-xr-xmod/friendica.php19
-rwxr-xr-xmod/invite.php21
-rwxr-xr-xmod/item.php2
-rwxr-xr-xmod/message.php7
-rwxr-xr-xmod/network.php20
-rwxr-xr-xmod/photos.php23
-rw-r--r--mod/pretheme.php16
-rwxr-xr-xmod/profile.php2
-rwxr-xr-xview/admin_plugins_details.tpl4
-rwxr-xr-xview/comment_item.tpl10
-rw-r--r--[-rwxr-xr-x]view/contact_edit.tpl2
-rwxr-xr-xview/contact_template.tpl25
-rwxr-xr-xview/conversation.tpl8
-rwxr-xr-xview/de/strings.php20
-rwxr-xr-xview/field_themeselect.tpl9
-rwxr-xr-xview/group_side.tpl35
-rwxr-xr-xview/head.tpl16
-rwxr-xr-xview/jot.tpl82
-rwxr-xr-xview/nav.tpl165
-rwxr-xr-xview/nets.tpl10
-rwxr-xr-xview/profile_vcard.tpl24
-rwxr-xr-xview/saved_searches_aside.tpl19
-rwxr-xr-xview/search_item.tpl123
-rwxr-xr-xview/settings.tpl2
-rw-r--r--view/theme/clean/screenshot.jpgbin0 -> 66210 bytes
-rw-r--r--view/theme/comix-plain/screenshot.jpgbin0 -> 323812 bytes
-rw-r--r--view/theme/comix/screenshot.jpgbin0 -> 96214 bytes
-rw-r--r--view/theme/darkbubble/screenshot.jpgbin0 -> 71056 bytes
-rw-r--r--view/theme/darkness/screenshot.jpgbin0 -> 70330 bytes
-rw-r--r--view/theme/darkzero-NS/screenshot.jpgbin0 -> 84200 bytes
-rw-r--r--view/theme/darkzero/screenshot.jpgbin0 -> 84200 bytes
-rwxr-xr-xview/theme/diabook-blue/communityhome.tpl75
-rwxr-xr-xview/theme/diabook-blue/directory_item.tpl10
-rw-r--r--view/theme/diabook-blue/fpostit/README8
-rwxr-xr-xview/theme/diabook-blue/fpostit/fpostit.js6
-rw-r--r--view/theme/diabook-blue/fpostit/fpostit.php135
-rw-r--r--view/theme/diabook-blue/fpostit/friendika-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/diabook-blue/icons/StatusNet.pngbin0 -> 1257 bytes
-rw-r--r--view/theme/diabook-blue/icons/email.pngbin0 -> 880 bytes
-rw-r--r--view/theme/diabook-blue/icons/facebook.pngbin0 -> 1082 bytes
-rw-r--r--view/theme/diabook-blue/icons/livejournal.pngbin0 -> 2029 bytes
-rw-r--r--view/theme/diabook-blue/icons/posterous.pngbin0 -> 2783 bytes
-rw-r--r--view/theme/diabook-blue/icons/pscontacts.pngbin0 -> 710 bytes
-rw-r--r--view/theme/diabook-blue/icons/pubgroups.pngbin710 -> 781 bytes
-rw-r--r--view/theme/diabook-blue/icons/tumblr.pngbin0 -> 938 bytes
-rw-r--r--view/theme/diabook-blue/icons/twitter.pngbin0 -> 964 bytes
-rw-r--r--view/theme/diabook-blue/icons/wordpress.pngbin0 -> 1693 bytes
-rw-r--r--view/theme/diabook-blue/nav.tpl6
-rwxr-xr-xview/theme/diabook-blue/photo_view.tpl2
-rw-r--r--view/theme/diabook-blue/profile_side.tpl5
-rw-r--r--view/theme/diabook-blue/profile_vcard.tpl2
-rw-r--r--view/theme/diabook-blue/right_aside.tpl20
-rw-r--r--view/theme/diabook-blue/screenshot.pngbin0 -> 278712 bytes
-rw-r--r--view/theme/diabook-blue/style-network.css2518
-rw-r--r--view/theme/diabook-blue/style-profile.css2513
-rw-r--r--view/theme/diabook-blue/style.css17
-rwxr-xr-xview/theme/diabook-blue/theme.php312
-rw-r--r--view/theme/diabook-blue/wall_item.tpl1
-rw-r--r--view/theme/diabook-blue/wallwall_item.tpl1
-rwxr-xr-xview/theme/diabook/communityhome.tpl47
-rw-r--r--view/theme/diabook/fpostit/README8
-rwxr-xr-xview/theme/diabook/fpostit/fpostit.js6
-rw-r--r--view/theme/diabook/fpostit/fpostit.php135
-rw-r--r--view/theme/diabook/fpostit/friendika-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/diabook/icons/StatusNet.pngbin0 -> 1257 bytes
-rw-r--r--view/theme/diabook/icons/email.pngbin0 -> 880 bytes
-rwxr-xr-xview/theme/diabook/icons/expand.pngbin0 -> 263 bytes
-rw-r--r--view/theme/diabook/icons/facebook.pngbin0 -> 1082 bytes
-rw-r--r--view/theme/diabook/icons/livejournal.pngbin0 -> 2029 bytes
-rw-r--r--view/theme/diabook/icons/posterous.pngbin0 -> 2783 bytes
-rw-r--r--view/theme/diabook/icons/pscontacts.pngbin0 -> 710 bytes
-rw-r--r--view/theme/diabook/icons/pubgroups.pngbin710 -> 781 bytes
-rw-r--r--view/theme/diabook/icons/tumblr.pngbin0 -> 938 bytes
-rw-r--r--view/theme/diabook/icons/twitter.pngbin0 -> 964 bytes
-rw-r--r--view/theme/diabook/icons/wordpress.pngbin0 -> 1693 bytes
-rw-r--r--view/theme/diabook/profile_side.tpl1
-rw-r--r--view/theme/diabook/screenshot.pngbin0 -> 276151 bytes
-rw-r--r--view/theme/diabook/style-network.css29
-rw-r--r--view/theme/diabook/style-profile.css30
-rw-r--r--view/theme/diabook/style.css8
-rwxr-xr-xview/theme/diabook/theme.php77
-rw-r--r--view/theme/diabook/wall_item.tpl1
-rw-r--r--view/theme/diabook/wallwall_item.tpl1
-rw-r--r--view/theme/dispy-dark/communityhome.tpl9
-rw-r--r--view/theme/dispy-dark/experimental0
-rw-r--r--view/theme/dispy-dark/fpostit/README8
-rwxr-xr-xview/theme/dispy-dark/fpostit/fpostit.js14
-rw-r--r--view/theme/dispy-dark/fpostit/fpostit.php134
-rw-r--r--view/theme/dispy-dark/fpostit/friendica-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/dispy-dark/fpostit/friendika-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/dispy-dark/icons.pngbin29024 -> 30271 bytes
-rw-r--r--view/theme/dispy-dark/icons.svg69
-rw-r--r--view/theme/dispy-dark/nav.tpl16
-rw-r--r--view/theme/dispy-dark/screenshot.jpgbin0 -> 39101 bytes
-rw-r--r--view/theme/dispy-dark/style.css216
-rw-r--r--view/theme/dispy-dark/theme.php30
-rw-r--r--view/theme/dispy-dark/wall_item.tpl9
-rw-r--r--view/theme/dispy-dark/wallwall_item.tpl5
-rw-r--r--view/theme/dispy/communityhome.tpl9
-rw-r--r--view/theme/dispy/fpostit/README8
-rwxr-xr-xview/theme/dispy/fpostit/fpostit.js14
-rw-r--r--view/theme/dispy/fpostit/fpostit.php134
-rw-r--r--view/theme/dispy/fpostit/friendica-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/dispy/fpostit/friendika-32.pngbin0 -> 1593 bytes
-rw-r--r--view/theme/dispy/icons.pngbin18998 -> 29977 bytes
-rw-r--r--view/theme/dispy/icons.svg22
-rw-r--r--view/theme/dispy/nav.tpl16
-rw-r--r--view/theme/dispy/screenshot.jpgbin0 -> 60400 bytes
-rw-r--r--view/theme/dispy/style.css208
-rw-r--r--view/theme/dispy/theme.php35
-rw-r--r--view/theme/dispy/wall_item.tpl9
-rw-r--r--view/theme/dispy/wallwall_item.tpl5
-rwxr-xr-xview/theme/duepuntozero/contact_template.tpl25
-rwxr-xr-xview/theme/duepuntozero/group_side.tpl28
-rwxr-xr-xview/theme/duepuntozero/jot.tpl84
-rwxr-xr-xview/theme/duepuntozero/nav.tpl68
-rwxr-xr-xview/theme/duepuntozero/nets.tpl10
-rwxr-xr-xview/theme/duepuntozero/saved_searches_aside.tpl14
-rw-r--r--view/theme/duepuntozero/screenshot.jpgbin0 -> 72559 bytes
-rwxr-xr-xview/theme/duepuntozero/search_item.tpl54
-rwxr-xr-xview/theme/duepuntozero/style.css10
-rwxr-xr-xview/theme/duepuntozero/wall_item.tpl78
-rwxr-xr-xview/theme/duepuntozero/wallwall_item.tpl85
-rw-r--r--view/theme/easterbunny/screenshot.jpgbin0 -> 82074 bytes
-rw-r--r--view/theme/goldenrod/screenshot.jpgbin0 -> 74909 bytes
-rw-r--r--view/theme/greenzero/screenshot.jpgbin0 -> 71106 bytes
-rw-r--r--view/theme/loozah/screenshot.jpgbin0 -> 73788 bytes
-rw-r--r--view/theme/purplezero/screenshot.jpgbin0 -> 74424 bytes
-rw-r--r--view/theme/quattro-green/screenshot.pngbin0 -> 147135 bytes
-rw-r--r--view/theme/quattro-green/theme.php11
-rwxr-xr-xview/theme/quattro/comment_item.tpl (renamed from view/theme/duepuntozero/comment_item.tpl)2
-rwxr-xr-xview/theme/quattro/contact_template.tpl26
-rwxr-xr-xview/theme/quattro/conversation.tpl (renamed from view/theme/duepuntozero/conversation.tpl)8
-rwxr-xr-xview/theme/quattro/group_side.tpl29
-rwxr-xr-xview/theme/quattro/jot.tpl48
-rwxr-xr-xview/theme/quattro/nav.tpl131
-rwxr-xr-xview/theme/quattro/nets.tpl12
-rwxr-xr-xview/theme/quattro/profile_vcard.tpl (renamed from view/theme/duepuntozero/profile_vcard.tpl)24
-rwxr-xr-xview/theme/quattro/saved_searches_aside.tpl15
-rw-r--r--view/theme/quattro/screenshot.jpgbin0 -> 71709 bytes
-rwxr-xr-xview/theme/quattro/search_item.tpl91
-rwxr-xr-xview/theme/quattro/wall_item.tpl90
-rwxr-xr-xview/theme/quattro/wallwall_item.tpl96
-rw-r--r--view/theme/shady/screenshot.jpgbin0 -> 69542 bytes
-rw-r--r--view/theme/slackr/screenshot.jpgbin0 -> 75494 bytes
-rw-r--r--view/theme/testbubble/screenshot.jpgbin0 -> 67853 bytes
-rw-r--r--view/theme/three-d/screenshot.jpgbin0 -> 74288 bytes
-rw-r--r--view/theme/vier/screenshot.jpgbin0 -> 78347 bytes
-rwxr-xr-xview/wall_item.tpl138
-rwxr-xr-xview/wallwall_item.tpl153
166 files changed, 7813 insertions, 1297 deletions
diff --git a/boot.php b/boot.php
index f976ef636..13a6f0d1d 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.1289' );
+define ( 'FRIENDICA_VERSION', '2.3.1293' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1133 );
@@ -135,6 +135,9 @@ define ( 'NOTIFY_PROFILE', 0x0040 );
define ( 'NOTIFY_TAGSELF', 0x0080 );
define ( 'NOTIFY_TAGSHARE', 0x0100 );
+define ( 'NOTIFY_SYSTEM', 0x8000 );
+
+
/**
* various namespaces we may need to parse
*/
diff --git a/images/blank.png b/images/blank.png
new file mode 100644
index 000000000..67d391966
--- /dev/null
+++ b/images/blank.png
Binary files differ
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 605a3eb78..135a9e4e8 100755
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -15,8 +15,6 @@ function findpeople_widget() {
$a = get_app();
- $inv = (($a->config['register_policy'] != REGISTER_CLOSED) ? t('Invite Friends') : '');
-
if(get_config('system','invitation_only')) {
$x = get_pconfig(local_user(),'system','invites_remaining');
if($x || is_site_admin()) {
@@ -34,7 +32,7 @@ function findpeople_widget() {
'$findthem' => t('Find'),
'$suggest' => t('Friend Suggestions'),
'$similar' => t('Similar Interests'),
- '$inv' => $inv
+ '$inv' => t('Invite Friends')
));
}
diff --git a/include/diaspora.php b/include/diaspora.php
index 1b5af42cd..84d28a7ec 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1737,7 +1737,7 @@ function diaspora_retraction($importer,$xml) {
contact_remove($contact['id']);
}
elseif($type === 'Post') {
- $r = q("select * from item where guid = '%s' and uid = %d limit 1",
+ $r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
dbesc('guid'),
intval($importer['uid'])
);
@@ -1785,7 +1785,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
}
if($type === 'StatusMessage') {
- $r = q("select * from item where guid = '%s' and uid = %d limit 1",
+ $r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
dbesc($guid),
intval($importer['uid'])
);
diff --git a/include/enotify.php b/include/enotify.php
index a505f1f04..8385bdec5 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -5,6 +5,12 @@ function notification($params) {
logger('notification: entry', LOGGER_DEBUG);
$a = get_app();
+
+ // from here on everything is in the recipients language
+
+ push_lang($params['language']);
+
+
$banner = t('Friendica Notification');
$product = FRIENDICA_PLATFORM;
$siteurl = z_path();
@@ -153,9 +159,33 @@ function notification($params) {
}
- // from here on everything is in the recipients language
+ if($params['type'] == NOTIFY_SYSTEM) {
+
+ }
+
+ $h = array(
+ 'params' => $params,
+ 'subject' => $subject,
+ 'preamble' => $preamble,
+ 'epreamble' => $epreamble,
+ 'body' => $body,
+ 'sitelink' => $sitelink,
+ 'tsitelink' => $tsitelink,
+ 'hsitelink' => $hsitelink,
+ 'itemlink' => $itemlink
+ );
+
+ call_hooks('enotify',$h);
+
+ $subject = $h['subject'];
+ $preamble = $h['preamble'];
+ $epreamble = $h['epreamble'];
+ $body = $h['body'];
+ $sitelink = $h['sitelink'];
+ $tsitelink = $h['tsitelink'];
+ $hsitelink = $h['hsitelink'];
+ $itemlink = $h['itemlink'];
- push_lang($params['language']);
require_once('include/html2bbcode.php');
@@ -207,8 +237,10 @@ function notification($params) {
);
if($r)
$notify_id = $r[0]['id'];
- else
+ else {
+ pop_lang();
return;
+ }
$itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
$msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
@@ -219,11 +251,10 @@ function notification($params) {
);
-
// send email notification if notification preferences permit
require_once('bbcode.php');
- if(intval($params['notify_flags']) & intval($params['type'])) {
+ if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
logger('notification: sending notification email');
diff --git a/include/items.php b/include/items.php
index b96f88566..2eecadad1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -7,14 +7,11 @@ require_once('include/crypto.php');
function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
- // default permissions - anonymous user
-
- if(! strlen($owner_nick))
- killme();
+ $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
$public_feed = (($dfrn_id) ? false : true);
- $starred = false;
- $converse = false;
+ $starred = false; // not yet implemented, possible security issues
+ $converse = false;
if($public_feed && $a->argc > 2) {
for($x = 2; $x < $a->argc; $x++) {
@@ -25,6 +22,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
}
}
+ // default permissions - anonymous user
$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
@@ -1437,7 +1435,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
}
if($deleted && is_array($contact)) {
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id`
- WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
+ WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
dbesc($uri),
intval($importer['uid']),
intval($contact['id'])
@@ -1898,6 +1896,14 @@ function local_delivery($importer,$data) {
);
if(count($r)) {
$fid = $r[0]['id'];
+
+ // OK, we do. Do we already have an introduction for this person ?
+ $r = q("select id from intro where uid = %d and fid = %d limit 1",
+ intval($fsugg['uid']),
+ intval($fid)
+ );
+ if(count($r))
+ return 0;
}
if(! $fid)
$r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
@@ -1918,6 +1924,7 @@ function local_delivery($importer,$data) {
else
return 0;
+
$hash = random_string();
$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
@@ -2038,7 +2045,7 @@ function local_delivery($importer,$data) {
if($deleted) {
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
- WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
+ WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
dbesc($uri),
intval($importer['importer_uid']),
intval($importer['id'])
@@ -2929,6 +2936,11 @@ function item_expire($uid,$days) {
foreach($r as $item) {
+ // don't expire filed items
+
+ if(strpos($item['file'],'[') !== false)
+ continue;
+
// Only expire posts, not photos and photo comments
if($expire_photos==0 && strlen($item['resource-id']))
diff --git a/include/oembed.php b/include/oembed.php
index cc71f9757..1f45d2814 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -38,7 +38,8 @@ function oembed_fetch_url($embedurl){
$entries = $xpath->query("//link[@type='application/json+oembed']");
foreach($entries as $e){
$href = $e->getAttributeNode("href")->nodeValue;
- $txt = fetch_url($href);
+ $txt = fetch_url($href . '&maxwidth=425');
+ break;
}
}
}
@@ -46,7 +47,7 @@ function oembed_fetch_url($embedurl){
if ($txt==false || $txt==""){
// try oohembed service
- $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);
+ $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';
$txt = fetch_url($ourl);
}
diff --git a/include/plugin.php b/include/plugin.php
index 8280b1022..e37ae8435 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -249,6 +249,7 @@ function get_theme_info($theme){
list($k,$v) = array_map("trim", explode(":",$l,2));
$k= strtolower($k);
if ($k=="author"){
+
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
if ($r) {
$info['author'][] = array('name'=>$m[1], 'link'=>$m[2]);
@@ -276,3 +277,13 @@ function get_theme_info($theme){
return $info;
}}
+
+function get_theme_screenshot($theme) {
+ $a = get_app();
+ $exts = array('.png','.jpg');
+ foreach($exts as $ext) {
+ if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
+ return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+ }
+ return($a->get_baseurl() . '/images/blank.png');
+}
diff --git a/include/socgraph.php b/include/socgraph.php
index b2f545509..3f5194049 100755
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -237,12 +237,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
$r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact
left join glink on glink.gcid = gcontact.id
- where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d)
+ where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
+ and not gcontact.name in ( select name from contact where uid = %d )
and not gcontact.id in ( select gcid from gcign where uid = %d )
group by glink.gcid order by total desc limit %d, %d ",
intval($uid),
intval($uid),
intval($uid),
+ intval($uid),
intval($start),
intval($limit)
);
@@ -252,11 +254,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
$r2 = q("SELECT gcontact.* from gcontact
left join glink on glink.gcid = gcontact.id
- where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d)
+ where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
+ and not gcontact.name in ( select name from contact where uid = %d )
and not gcontact.id in ( select gcid from gcign where uid = %d )
order by rand() limit %d, %d ",
intval($uid),
intval($uid),
+ intval($uid),
intval($start),
intval($limit)
);
diff --git a/js/country.js b/js/country.js
index b18a529d1..1c7505580 100755
--- a/js/country.js
+++ b/js/country.js
@@ -52,7 +52,7 @@ aStates[28]="|Central|Chobe|Francistown|Gaborone|Ghanzi|Kgalagadi|Kgatleng|Kwene
aStates[29]="|Acre|Alagoas|Amapa|Amazonas|Bahia|Ceara|Distrito Federal|Espirito Santo|Goias|Maranhao|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Para|Paraiba|Parana|Pernambuco|Piaui|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondonia|Roraima|Santa Catarina|Sao Paulo|Sergipe|Tocantins";
aStates[30]="|Anegada|Jost Van Dyke|Tortola|Virgin Gorda";
aStates[31]="|Belait|Brunei and Muara|Temburong|Tutong";
-aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Khaskovo|Kurdzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Ruse|Shumen|Silistra|Sliven|Smolyan|Sofiya|Sofiya-Grad|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";
+aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Haskovo|Kardzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Rousse|Shumen|Silistra|Sliven|Smolyan|Sofia|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";
aStates[33]="|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komandjari|Kompienga|Kossi|Koupelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Naumbiel|Nayala|Oubritenga|Oudalan|Passore|Poni|Samentenga|Sanguie|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondomo|Zoundweogo";
aStates[34]="|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon";
aStates[35]="|Bubanza|Bujumbura|Bururi|Cankuzo|Cibitoke|Gitega|Karuzi|Kayanza|Kirundo|Makamba|Muramvya|Muyinga|Mwaro|Ngozi|Rutana|Ruyigi";
@@ -105,7 +105,7 @@ aStates[79]="|Estuaire|Haut-Ogooue|Moyen-Ogooue|Ngounie|Nyanga|Ogooue-Ivindo|Ogo
aStates[80]="|Banjul|Central River|Lower River|North Bank|Upper River|Western";
aStates[81]="|Gaza Strip";
aStates[82]="|Abashis|Abkhazia or Ap'khazet'is Avtonomiuri Respublika (Sokhumi)|Adigenis|Ajaria or Acharis Avtonomiuri Respublika (Bat'umi)|Akhalgoris|Akhalk'alak'is|Akhalts'ikhis|Akhmetis|Ambrolauris|Aspindzis|Baghdat'is|Bolnisis|Borjomis|Ch'khorotsqus|Ch'okhatauris|Chiat'ura|Dedop'listsqaros|Dmanisis|Dushet'is|Gardabanis|Gori|Goris|Gurjaanis|Javis|K'arelis|K'ut'aisi|Kaspis|Kharagaulis|Khashuris|Khobis|Khonis|Lagodekhis|Lanch'khut'is|Lentekhis|Marneulis|Martvilis|Mestiis|Mts'khet'is|Ninotsmindis|Onis|Ozurget'is|P'ot'i|Qazbegis|Qvarlis|Rust'avi|Sach'kheris|Sagarejos|Samtrediis|Senakis|Sighnaghis|T'bilisi|T'elavis|T'erjolis|T'et'ritsqaros|T'ianet'is|Tqibuli|Ts'ageris|Tsalenjikhis|Tsalkis|Tsqaltubo|Vanis|Zestap'onis|Zugdidi|Zugdidis";
-aStates[83]="|Baden-Wuerttemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thueringen";
+aStates[83]="|Baden-Württemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thüringen";
aStates[84]="|Ashanti|Brong-Ahafo|Central|Eastern|Greater Accra|Northern|Upper East|Upper West|Volta|Western";
aStates[85]="|Gibraltar";
aStates[86]="|Ile du Lys|Ile Glorieuse";
@@ -131,8 +131,8 @@ aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assa
aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";
aStates[107]="|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan";
aStates[108]="|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit";
-aStates[109]="|Carlow|Cavan|Clare|Cork|Donegal|Dublin|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Waterford|Westmeath|Wexford|Wicklow";
-aStates[110]="|Antrim|Ards|Armagh|Ballymena|Ballymoney|Banbridge|Belfast|Carrickfergus|Castlereagh|Coleraine|Cookstown|Craigavon|Derry|Down|Dungannon|Fermanagh|Larne|Limavady|Lisburn|Magherafelt|Moyle|Newry and Mourne|Newtownabbey|North Down|Omagh|Strabane";
+aStates[109]="|Antrim|Armargh|Carlow|Cavan|Clare|Cork|Derry|Donegal|Down|Dún Laoghaire–Rathdown|Fermanagh|Dublin|Fingal|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Tyrone|Waterford|Westmeath|Wexford|Wicklow";
+aStates[110]="|Antrim|Armagh|Belfast|Down|Fermanagh|Londonderry|Tyrone";
aStates[111]="|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv";
aStates[112]="|Abruzzi|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto";
aStates[113]="|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland";
@@ -222,7 +222,7 @@ aStates[196]="|A'ana|Aiga-i-le-Tai|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|P
aStates[197]="|Acquaviva|Borgo Maggiore|Chiesanuova|Domagnano|Faetano|Fiorentino|Monte Giardino|San Marino|Serravalle";
aStates[198]="|Principe|Sao Tome";
aStates[199]="|'Asir|Al Bahah|Al Hudud ash Shamaliyah|Al Jawf|Al Madinah|Al Qasim|Ar Riyad|Ash Sharqiyah (Eastern Province)|Ha'il|Jizan|Makkah|Najran|Tabuk";
-aStates[200]="|Aberdeen City|Aberdeenshire|Angus|Argyll and Bute|City of Edinburgh|Clackmannanshire|Dumfries and Galloway|Dundee City|East Ayrshire|East Dunbartonshire|East Lothian|East Renfrewshire|Eilean Siar (Western Isles)|Falkirk|Fife|Glasgow City|Highland|Inverclyde|Midlothian|Moray|North Ayrshire|North Lanarkshire|Orkney Islands|Perth and Kinross|Renfrewshire|Shetland Islands|South Ayrshire|South Lanarkshire|Stirling|The Scottish Borders|West Dunbartonshire|West Lothian";
+aStates[200]="|Aberdeenshire|Angus|Argyll|Ayrshire|Banffshire|Berwickshire|Bute|Caithness|Clackmannanshire|Cromartyshire|Dumfriesshire|Dunbartonshire|Dundee City|East Lothian|Edinburgh|Fife|Glasgow City|Inverness-shire|Kincardineshire|Kinross-shire|Kirkcudbrightshire|Lanarkshire|Midlothian|Moray|Nairnshire|Orkney Islands|Peeblesshire|Perthshire|Renfrewshire|Ross and Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland Islands|Stirlingshire|Sutherland|West Lothian|Wigtownshire";
aStates[201]="|Dakar|Diourbel|Fatick|Kaolack|Kolda|Louga|Saint-Louis|Tambacounda|Thies|Ziguinchor";
aStates[202]="|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Louis|Anse Royale|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|Glacis|Grand' Anse (on Mahe)|Grand' Anse (on Praslin)|La Digue|La Riviere Anglaise|Mont Buxton|Mont Fleuri|Plaisance|Pointe La Rue|Port Glaud|Saint Louis|Takamaka";
aStates[203]="|Eastern|Northern|Southern|Western";
@@ -233,7 +233,7 @@ aStates[207]="|Bellona|Central|Choiseul (Lauru)|Guadalcanal|Honiara|Isabel|Makir
aStates[208]="|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed";
aStates[209]="|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Mpumalanga|North-West|Northern Cape|Northern Province|Western Cape";
aStates[210]="|Bird Island|Bristol Island|Clerke Rocks|Montagu Island|Saunders Island|South Georgia|Southern Thule|Traversay Islands";
-aStates[211]="|Andalucia|Aragon|Asturias|Baleares (Balearic Islands)|Canarias (Canary Islands)|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Ceuta|Communidad Valencian|Extremadura|Galicia|Islas Chafarinas|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco (Basque Country)|Penon de Alhucemas|Penon de Velez de la Gomera";
+aStates[211]="|Andalucia|Aragon|Asturias|Ceuta|Islas Baleares|Islas Chafarinas|Islas Canarias|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Extremadura|Galicia|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco|Peñón de Alhucemas|Peñón de Vélez de la Gomera|Valencia";
aStates[212]="|Spratly Islands";
aStates[213]="|Central|Eastern|North Central|North Eastern|North Western|Northern|Sabaragamuwa|Southern|Uva|Western";
aStates[214]="|A'ali an Nil|Al Bahr al Ahmar|Al Buhayrat|Al Jazirah|Al Khartum|Al Qadarif|Al Wahdah|An Nil al Abyad|An Nil al Azraq|Ash Shamaliyah|Bahr al Jabal|Gharb al Istiwa'iyah|Gharb Bahr al Ghazal|Gharb Darfur|Gharb Kurdufan|Janub Darfur|Janub Kurdufan|Junqali|Kassala|Nahr an Nil|Shamal Bahr al Ghazal|Shamal Darfur|Shamal Kurdufan|Sharq al Istiwa'iyah|Sinnar|Warab";
@@ -259,7 +259,7 @@ aStates[233]="|Tuvalu";
aStates[234]="|Adjumani|Apac|Arua|Bugiri|Bundibugyo|Bushenyi|Busia|Gulu|Hoima|Iganga|Jinja|Kabale|Kabarole|Kalangala|Kampala|Kamuli|Kapchorwa|Kasese|Katakwi|Kibale|Kiboga|Kisoro|Kitgum|Kotido|Kumi|Lira|Luwero|Masaka|Masindi|Mbale|Mbarara|Moroto|Moyo|Mpigi|Mubende|Mukono|Nakasongola|Nebbi|Ntungamo|Pallisa|Rakai|Rukungiri|Sembabule|Soroti|Tororo";
aStates[235]="|Avtonomna Respublika Krym (Simferopol')|Cherkas'ka (Cherkasy)|Chernihivs'ka (Chernihiv)|Chernivets'ka (Chernivtsi)|Dnipropetrovs'ka (Dnipropetrovs'k)|Donets'ka (Donets'k)|Ivano-Frankivs'ka (Ivano-Frankivs'k)|Kharkivs'ka (Kharkiv)|Khersons'ka (Kherson)|Khmel'nyts'ka (Khmel'nyts'kyy)|Kirovohrads'ka (Kirovohrad)|Kyyiv|Kyyivs'ka (Kiev)|L'vivs'ka (L'viv)|Luhans'ka (Luhans'k)|Mykolayivs'ka (Mykolayiv)|Odes'ka (Odesa)|Poltavs'ka (Poltava)|Rivnens'ka (Rivne)|Sevastopol'|Sums'ka (Sumy)|Ternopil's'ka (Ternopil')|Vinnyts'ka (Vinnytsya)|Volyns'ka (Luts'k)|Zakarpats'ka (Uzhhorod)|Zaporiz'ka (Zaporizhzhya)|Zhytomyrs'ka (Zhytomyr)"
aStates[236]="|'Ajman|Abu Zaby (Abu Dhabi)|Al Fujayrah|Ash Shariqah (Sharjah)|Dubayy (Dubai)|Ra's al Khaymah|Umm al Qaywayn";
-aStates[237]="|Barking and Dagenham|Barnet|Barnsley|Bath and North East Somerset|Bedfordshire|Bexley|Birmingham|Blackburn with Darwen|Blackpool|Bolton|Bournemouth|Bracknell Forest|Bradford|Brent|Brighton and Hove|Bromley|Buckinghamshire|Bury|Calderdale|Cambridgeshire|Camden|Cheshire|City of Bristol|City of Kingston upon Hull|City of London|Cornwall|Coventry|Croydon|Cumbria|Darlington|Derby|Derbyshire|Devon|Doncaster|Dorset|Dudley|Durham|Ealing|East Riding of Yorkshire|East Sussex|Enfield|Essex|Gateshead|Gloucestershire|Greenwich|Hackney|Halton|Hammersmith and Fulham|Hampshire|Haringey|Harrow|Hartlepool|Havering|Herefordshire|Hertfordshire|Hillingdon|Hounslow|Isle of Wight|Islington|Kensington and Chelsea|Kent|Kingston upon Thames|Kirklees|Knowsley|Lambeth|Lancashire|Leeds|Leicester|Leicestershire|Lewisham|Lincolnshire|Liverpool|Luton|Manchester|Medway|Merton|Middlesbrough|Milton Keynes|Newcastle upon Tyne|Newham|Norfolk|North East Lincolnshire|North Lincolnshire|North Somerset|North Tyneside|North Yorkshire|Northamptonshire|Northumberland|Nottingham|Nottinghamshire|Oldham|Oxfordshire|Peterborough|Plymouth|Poole|Portsmouth|Reading|Redbridge|Redcar and Cleveland|Richmond upon Thames|Rochdale|Rotherham|Rutland|Salford|Sandwell|Sefton|Sheffield|Shropshire|Slough|Solihull|Somerset|South Gloucestershire|South Tyneside|Southampton|Southend-on-Sea|Southwark|St. Helens|Staffordshire|Stockport|Stockton-on-Tees|Stoke-on-Trent|Suffolk|Sunderland|Surrey|Sutton|Swindon|Tameside|Telford and Wrekin|Thurrock|Torbay|Tower Hamlets|Trafford|Wakefield|Walsall|Waltham Forest|Wandsworth|Warrington|Warwickshire|West Berkshire|West Sussex|Westminster|Wigan|Wiltshire|Windsor and Maidenhead|Wirral|Wokingham|Wolverhampton|Worcestershire|York";
+aStates[237]="|Aberdeen|Aberdeenshire|Anglesey|Angus|Antrim|Argyl|Armagh|Avon|Ayrshire|Banffshire|Bedfordshire|Belfast|Berwickshire|Brecknockshire|Bristol|Buckinghamshire|Bute|Caernarfonshire|Cardiganshire|Caithness|Cambridgeshire|Carmarthenshire|Chesire|Clackmannashire|Cleveland|Clwyd|Cornwall|Cromartyshire|Cumberland|Cumbria|Denbighshire|Derbyshire|Devon|Dfyed|Dorset|Down|Dumfriesshire|Dunbartonshire|Dundee|Durham|East Lothian|East Suffolk|Derry|East Sussex|Edinburgh|Essex|Fermanagh|Fife|Flintshire|Glasgow|Glamorgan|Gloucestershire|Greater London|Greater Manchester|Gwent|Gwynedd|Hampshire|Hereford and Worcester|Herefordshire|Inverness-shire|Hertfordshire|Humberside|Huntingdon and Peterborough|Huntingdonshire|Isle of Ely|Isle of Wight|Kent|Kincardineshire|Kincross-shire|Kirkcudbrightshire|Lanarkshire|Lancashire|Leicestershire|Lincolnshire|London|Londonderry|Merionethshire|Merseyside|Middlesex|Mid Glamorgan|Midlothian|Monmouthshire|Montgomeryshire|Moray|Nairnshire|Norfolk|Northamptonshire|Northumberland|North Humberside|North Yorkshire|Nottinghamshire|Orkney|Oxfordshire|Peeblesshire|Pembrokeshire|Perthshire|Powys|Radnorshire|Renfrewshire|Ross And Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland|Stirlingshire|Sutherland|Soke of Peterborough|Rutland|Shropshire|Somerset|South Glamorgan|South Humberside|South Yorkshire|Staffordshite|Suffolk|Surrey|Sussex|Tyne and Wear|Tyrone|Warwickshire|West Glamorgan|West Lothian|West Midlands|Westmorland|West Suffolk|West Sussex|West Yorkshire|Wigtownshire|Wiltshire|Worcestershire|Yorkshire";
aStates[238]="|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres";
aStates[239]="|Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|District of Columbia|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New Hampshire|New Jersey|New Mexico|New York|North Carolina|North Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Rhode Island|South Carolina|South Dakota|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West Virginia|Wisconsin|Wyoming";
aStates[240]="|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati";
@@ -267,7 +267,7 @@ aStates[241]="|Malampa|Penama|Sanma|Shefa|Tafea|Torba";
aStates[242]="|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia";
aStates[243]="|An Giang|Ba Ria-Vung Tau|Bac Giang|Bac Kan|Bac Lieu|Bac Ninh|Ben Tre|Binh Dinh|Binh Duong|Binh Phuoc|Binh Thuan|Ca Mau|Can Tho|Cao Bang|Da Nang|Dac Lak|Dong Nai|Dong Thap|Gia Lai|Ha Giang|Ha Nam|Ha Noi|Ha Tay|Ha Tinh|Hai Duong|Hai Phong|Ho Chi Minh|Hoa Binh|Hung Yen|Khanh Hoa|Kien Giang|Kon Tum|Lai Chau|Lam Dong|Lang Son|Lao Cai|Long An|Nam Dinh|Nghe An|Ninh Binh|Ninh Thuan|Phu Tho|Phu Yen|Quang Binh|Quang Nam|Quang Ngai|Quang Ninh|Quang Tri|Soc Trang|Son La|Tay Ninh|Thai Binh|Thai Nguyen|Thanh Hoa|Thua Thien-Hue|Tien Giang|Tra Vinh|Tuyen Quang|Vinh Long|Vinh Phuc|Yen Bai";
aStates[244]="|Saint Croix|Saint John|Saint Thomas";
-aStates[245]="|Blaenau Gwent|Bridgend|Caerphilly|Cardiff|Carmarthenshire|Ceredigion|Conwy|Denbighshire|Flintshire|Gwynedd|Isle of Anglesey|Merthyr Tydfil|Monmouthshire|Neath Port Talbot|Newport|Pembrokeshire|Powys|Rhondda Cynon Taff|Swansea|The Vale of Glamorgan|Torfaen|Wrexham";
+aStates[245]="|Anglesey|Brecknockshire|Caernfonshire|Cardiganshire|Carmarthenshire|Clwyd|Denbighshire|Dyfed|Flintshire|Glamorgan|Gwent|Gwynedd|Merionethshire|Mid Glamorgan|Monmouthsire|Montgomeryshire|Pembrokeshire|Powys|Radnorshire|South Glamorgan|West Glamorgan";
aStates[246]="|Alo|Sigave|Wallis";
aStates[247]="|West Bank";
aStates[248]="|Western Sahara";
diff --git a/js/main.js b/js/main.js
index 2b4b13791..defd1f951 100755
--- a/js/main.js
+++ b/js/main.js
@@ -588,3 +588,10 @@ Array.prototype.remove = function(item) {
return this.push.apply(this, rest);
};
+function previewTheme(elm) {
+ theme = $(elm).val();
+ $.getJSON('pretheme?f=&theme=' + theme,function(data) {
+ $('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+ });
+
+} \ No newline at end of file
diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
index 183f2bc68..a2829a21c 100755
--- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js
+++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
@@ -150,7 +150,7 @@
rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]");
- rep(/<br \/>/gi,"\n\n");
+ rep(/<br (.*?)\/>/gi,"\n\n");
rep(/<br\/>/gi,"\n\n");
rep(/<br>/gi,"\n");
rep(/<p>/gi,"");
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 183f2bc68..a2829a21c 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -150,7 +150,7 @@
rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]");
- rep(/<br \/>/gi,"\n\n");
+ rep(/<br (.*?)\/>/gi,"\n\n");
rep(/<br\/>/gi,"\n\n");
rep(/<br>/gi,"\n");
rep(/<p>/gi,"");
diff --git a/mod/acl.php b/mod/acl.php
index 375c618c8..fe353d1eb 100755
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -7,10 +7,10 @@ function acl_init(&$a){
return "";
- $start = (x($_POST,'start')?$_POST['start']:0);
- $count = (x($_POST,'count')?$_POST['count']:100);
- $search = (x($_POST,'search')?$_POST['search']:"");
- $type = (x($_POST,'type')?$_POST['type']:"");
+ $start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
+ $count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
+ $search = (x($_REQUEST,'search')?$_REQUEST['search']:"");
+ $type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
if ($search!=""){
@@ -34,7 +34,7 @@ function acl_init(&$a){
$r = q("SELECT COUNT(`id`) AS c FROM `contact`
WHERE `uid` = %d AND `self` = 0
AND `blocked` = 0 AND `pending` = 0
- AND `notify` != '' $sql_extra" ,
+ AND `notify` != '' $sql_extra2" ,
intval(local_user())
);
$contact_count = (int)$r[0]['c'];
diff --git a/mod/admin.php b/mod/admin.php
index a64b26903..53b5ee354 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -583,6 +583,7 @@ function admin_page_plugins(&$a){
'$admin_form' => $admin_form,
'$function' => 'plugins',
+ '$screenshot' => '',
'$readme' => $readme
));
}
@@ -738,7 +739,11 @@ function admin_page_themes(&$a){
}
$admin_form="";
-
+
+ $screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
+ if(! stristr($screenshot[0],$theme))
+ $screenshot = null;
+
$t = get_markup_template("admin_plugins_details.tpl");
return replace_macros($t, array(
'$title' => t('Administration'),
@@ -755,6 +760,7 @@ function admin_page_themes(&$a){
'$admin_form' => $admin_form,
'$str_author' => t('Author: '),
'$str_maintainer' => t('Maintainer: '),
+ '$screenshot' => $screenshot,
'$readme' => $readme
));
}
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index fe5cd4906..6030587ce 100755
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -26,21 +26,24 @@ function dfrn_poll_init(&$a) {
$dfrn_id = substr($dfrn_id,2);
}
- if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+ if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
killme();
}
- $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
- dbesc($a->argv[1])
- );
- if(count($r) && $r[0]['hidewall'])
- killme();
+ $user = '';
+ if($a->argc > 1) {
+ $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+ dbesc($a->argv[1])
+ );
+ if((! count($r)) || (count($r) && $r[0]['hidewall']))
+ killme();
+ $user = $r[0]['nickname'];
+ }
- logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
+ logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
header("Content-type: application/atom+xml");
- $o = get_feed_for($a, '', $a->argv[1],$last_update);
- echo $o;
+ echo get_feed_for($a, '', $user,$last_update);
killme();
}
diff --git a/mod/friendica.php b/mod/friendica.php
index ab92e31ed..d5dad9448 100755
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -51,15 +51,20 @@ function friendica_content(&$a) {
$o .= '<p></p>';
if(count($a->plugins)) {
- $o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
- $o .= '<ul>';
- foreach($a->plugins as $p)
- if(strlen($p))
- $o .= '<li>' . $p . '</li>';
- $o .= '</ul>';
+ $o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
+ $sorted = $a->plugins;
+ $s = '';
+ sort($sorted);
+ foreach($sorted as $p) {
+ if(strlen($p)) {
+ if(strlen($s)) $s .= ', ';
+ $s .= $p;
+ }
+ }
+ $o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>';
}
else
- $o .= '<p>' . t('No installed plugins/addons/apps');
+ $o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
call_hooks('about_hook', $o);
diff --git a/mod/invite.php b/mod/invite.php
index d4eb9c5ef..2dbf93c59 100755
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -56,7 +56,7 @@ function invite_post(&$a) {
else
$nmessage = $message;
- $res = mail($recip, sprintf( t('Please join my network on %s'), $a->config['sitename']),
+ $res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']),
$nmessage,
"From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -94,15 +94,28 @@ function invite_content(&$a) {
}
}
+ $dirloc = get_config('system','directory_submit_url');
+ if(strlen($dirloc)) {
+ if($a->config['register_policy'] == REGISTER_CLOSED)
+ $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
+ elseif($a->config['register_policy'] != REGISTER_CLOSED)
+ $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
+ . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo');
+ }
+ else {
+ $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
+ return $o;
+ }
$o = replace_macros($tpl, array(
'$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'),
- '$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
- . t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
+ '$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
+ . $linktxt
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
- . "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,
+ . "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
+ . "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n" ,
'$submit' => t('Submit')
));
diff --git a/mod/item.php b/mod/item.php
index fc1c5fd0f..5baae2bde 100755
--- a/mod/item.php
+++ b/mod/item.php
@@ -624,7 +624,7 @@ function item_post(&$a) {
dbesc($datarray['attach']),
intval($datarray['bookmark']),
intval($datarray['origin']),
- intval($datarry['moderated'])
+ intval($datarray['moderated'])
);
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
diff --git a/mod/message.php b/mod/message.php
index 0907abd77..8991f643d 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -15,6 +15,13 @@ function message_post(&$a) {
$body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : '');
$recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto']) : 0 );
+ // Work around doubled linefeeds in Tinymce 3.5b2
+
+ $plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
+ if(! $plaintext) {
+ $body = str_replace("\r\n","\n",$body);
+ $body = str_replace("\n\n","\n",$body);
+ }
$ret = send_message($recipient, $body, $subject, $replyto);
$norecip = false;
diff --git a/mod/network.php b/mod/network.php
index 9ec8c23b5..5ca0a8c7d 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -250,6 +250,20 @@ function network_content(&$a, $update = 0) {
if($cid)
$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
+ if($nets) {
+ $r = q("select id from contact where uid = %d and network = '%s' and self = 0",
+ intval(local_user()),
+ dbesc($nets)
+ );
+
+ $str = '';
+ if(count($r))
+ foreach($r as $rr)
+ $str .= '<' . $rr['id'] . '>';
+ if(strlen($str))
+ $def_acl = array('allow_cid' => $str);
+ }
+
if(! $update) {
if($group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@@ -269,9 +283,9 @@ function network_content(&$a, $update = 0) {
'allow_location' => $a->user['allow_location'],
'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'],
- 'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
- 'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
- 'bang' => (($group || $cid) ? '!' : ''),
+ 'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+ 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
+ 'bang' => (($group || $cid || $nets) ? '!' : ''),
'visitor' => 'block',
'profile_uid' => local_user()
);
diff --git a/mod/photos.php b/mod/photos.php
index b294f0a66..2a808cb41 100755
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -38,21 +38,22 @@ function photos_init(&$a) {
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg" alt="' . $a->data['user']['username'] . '" /></div>';
$o .= '</div>';
- $o .= '<div id="side-bar-photos-albums" class="widget">';
- $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+ if(! intval($a->data['user']['hidewall'])) {
+ $o .= '<div id="side-bar-photos-albums" class="widget">';
+ $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
- $o .= '<ul>';
- foreach($albums as $album) {
+ $o .= '<ul>';
+ foreach($albums as $album) {
- // don't show contact photos. We once translated this name, but then you could still access it under
- // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+ // don't show contact photos. We once translated this name, but then you could still access it under
+ // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
- if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
- continue;
- $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
+ if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+ continue;
+ $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
+ }
+ $o .= '</ul>';
}
- $o .= '</ul>';
-
if(local_user() && $a->data['user']['uid'] == local_user()) {
$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
}
diff --git a/mod/pretheme.php b/mod/pretheme.php
new file mode 100644
index 000000000..0efa587d8
--- /dev/null
+++ b/mod/pretheme.php
@@ -0,0 +1,16 @@
+<?php
+
+function pretheme_init(&$a) {
+
+ if($_REQUEST['theme']) {
+ $theme = $_REQUEST['theme'];
+ $info = get_theme_info($theme);
+ if($info) {
+ // unfortunately there will be no translation for this string
+ $desc = $info['description'] . ' ' . $info['version'];
+ }
+ else $desc = '';
+ echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc));
+ }
+ killme();
+}
diff --git a/mod/profile.php b/mod/profile.php
index 428679ffc..782d17d83 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -107,7 +107,7 @@ function profile_content(&$a, $update = 0) {
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
- if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+ if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
notice( t('Access to this profile has been restricted.') . EOL);
return;
}
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index ead356f5b..cbaef2d66 100755
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -16,6 +16,10 @@
{{ endfor }}
</p>
+ {{ if $screenshot }}
+ <a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a>
+ {{ endif }}
+
{{ if $admin_form }}
<h3>$settings</h3>
<form method="post" action="$baseurl/admin/$function/$plugin/">
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index cde4ca3ca..a1d4e1043 100755
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -11,13 +11,15 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
+ <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
{{ if $qcomment }}
- {{ for $qcomment as $qc }}
- <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
- &nbsp;
+ <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+ <option value=""></option>
+ {{ for $qcomment as $qc }}
+ <option value="$qc">$qc</option>
{{ endfor }}
+ </select>
{{ endif }}
- <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index fc1a3d47b..417578a32 100755..100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -63,7 +63,7 @@
<div id="contact-edit-info-wrapper">
<h4>$lbl_info1</h4>
- <textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea>
+ <textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
</div>
<div id="contact-edit-info-end"></div>
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index b826acc65..48930b48a 100755
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,26 +1,25 @@
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
- <div class="contact-photo-wrapper" >
- <div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+ <div class="contact-entry-photo-wrapper" >
+ <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
{{ if $contact.photo_menu }}
- <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
- <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
- $contact.photo_menu
- </ul>
+ <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+ <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+ <ul>
+ $contact.photo_menu
+ </ul>
+ </div>
{{ endif }}
</div>
</div>
- <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
- {{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
- <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
- <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
+ <div class="contact-entry-photo-end" ></div>
+ <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+ <div class="contact-entry-end" ></div>
</div>
-
diff --git a/view/conversation.tpl b/view/conversation.tpl
index ff202bbe4..43bb1dd47 100755
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -17,7 +17,9 @@
{{ endfor }}
{{ if $dropping }}
-<a href="#" onclick="deleteCheckedItems();return false;">
- <span class="icon s22 delete text">$dropping</span>
-</a>
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+ <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+ <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
{{ endif }}
diff --git a/view/de/strings.php b/view/de/strings.php
index 5438a1c9f..3f9176cd7 100755
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -4,23 +4,23 @@ function string_plural_select_de($n){
return ($n != 1);
}
;
-$a->strings["Post successful."] = "Beitrag erfolgreich ver�ffentlicht.";
+$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
$a->strings["Permission denied."] = "Zugriff verweigert.";
$a->strings["Contact not found."] = "Kontakt nicht gefunden.";
$a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zur�ck-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was auf dieser Seite gemacht wird.";
-$a->strings["Return to contact editor"] = "Zur�ck zum Kontakteditor";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
+$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
$a->strings["Name"] = "Name";
$a->strings["Account Nickname"] = "Account-Spitzname";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - �berschreibt Name/Spitzname";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
$a->strings["Account URL"] = "Account-URL";
-$a->strings["Friend Request URL"] = "URL f�r Freundschaftsanfragen";
-$a->strings["Friend Confirm URL"] = "URL f�r Best�tigungen von Freundschaftsanfragen";
-$a->strings["Notification Endpoint URL"] = "URL-Endpunkt f�r Benachrichtigungen";
+$a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen";
+$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen";
+$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
$a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
$a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
$a->strings["Submit"] = "Senden";
@@ -28,7 +28,7 @@ $a->strings["Help:"] = "Hilfe:";
$a->strings["Help"] = "Hilfe";
$a->strings["Not Found"] = "Nicht gefunden";
$a->strings["Page not found."] = "Seite nicht gefunden.";
-$a->strings["File exceeds size limit of %d"] = "Die Datei ist gr��er als das erlaubte Limit von %d";
+$a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d";
$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
$a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
@@ -40,7 +40,7 @@ $a->strings["link to source"] = "Link zum Originalbeitrag";
$a->strings["Events"] = "Veranstaltungen";
$a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
$a->strings["Previous"] = "Vorherige";
-$a->strings["Next"] = "N�chste";
+$a->strings["Next"] = "Nächste";
$a->strings["hour:minute"] = "Stunde:Minute";
$a->strings["Event details"] = "Veranstaltungsdetails";
$a->strings["Format is %s %s. Starting date and Description are required."] = "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig.";
diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl
new file mode 100755
index 000000000..f9f99492c
--- /dev/null
+++ b/view/field_themeselect.tpl
@@ -0,0 +1,9 @@
+
+ <div class='field select'>
+ <label for='id_$field.0'>$field.1</label>
+ <select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
+ {{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+ </select>
+ <span class='field_help'>$field.3</span>
+ <div id="theme-preview"></div>
+ </div>
diff --git a/view/group_side.tpl b/view/group_side.tpl
index 596a8d13f..0353b1d2c 100755
--- a/view/group_side.tpl
+++ b/view/group_side.tpl
@@ -1,29 +1,28 @@
-<div id="group-sidebar" class="widget">
- <div class="title tool">
- <h3 class="label">$title</h3>
- <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a>
- </div>
+<div class="widget" id="group-sidebar">
+<h3>$title</h3>
- <div id="sidebar-group-list">
- <ul>
- {{ for $groups as $group }}
- <li class="tool {{ if $group.selected }}selected{{ endif }}">
- <a href="$group.href" class="label">
- $group.text
- </a>
- {{ if $group.edit }}
- <a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a>
- {{ endif }}
+<div id="sidebar-group-list">
+ <ul id="sidebar-group-ul">
+ {{ for $groups as $group }}
+ <li class="sidebar-group-li">
{{ if $group.cid }}
<input type="checkbox"
class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
{{ if $group.ismember }}checked="checked"{{ endif }}
/>
+ {{ endif }}
+ {{ if $group.edit }}
+ <a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
{{ endif }}
+ <a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
</li>
- {{ endfor }}
- </ul>
+ {{ endfor }}
+ </ul>
</div>
-</div>
+ <div id="sidebar-new-group">
+ <a href="group/new">$createtext</a>
+ </div>
+</div>
+
diff --git a/view/head.tpl b/view/head.tpl
index 722c79441..cd6f5ca97 100755
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -65,6 +65,22 @@
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
+ function qCommentInsert(obj,id) {
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == '$comment') {
+ tmpStr = '';
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+ openMenu("comment-edit-submit-wrapper-" + id);
+ }
+ var ins = $(obj).val();
+ ins = ins.replace('&lt;','<');
+ ins = ins.replace('&gt;','>');
+ ins = ins.replace('&amp;','&');
+ ins = ins.replace('&quot;','"');
+ $("#comment-edit-text-" + id).val(tmpStr + ins);
+ }
+
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();
diff --git a/view/jot.tpl b/view/jot.tpl
index 2f89d4372..5fe1f954e 100755
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -1,9 +1,12 @@
-<form id="profile-jot-form" action="$action" method="post">
- <div id="jot">
- <div id="profile-jot-desc" class="jothidden">&nbsp;</div>
- <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
- <div id="character-counter" class="grey jothidden"></div>
+<div id="profile-jot-wrapper" >
+ <div id="profile-jot-banner-wrapper">
+ <div id="profile-jot-desc" >&nbsp;</div>
+ <div id="character-counter" class="grey"></div>
+ </div>
+ <div id="profile-jot-banner-end"></div>
+
+ <form id="profile-jot-form" action="$action" method="post" >
<input type="hidden" name="type" value="$ptyp" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" />
@@ -11,25 +14,54 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
-
+ <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+ <div id="jot-text-wrap">
+ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+ </div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+ <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+
+ <div id="profile-upload-wrapper" style="display: $visitor;" >
+ <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+ </div>
+ <div id="profile-attach-wrapper" style="display: $visitor;" >
+ <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+ </div>
+
+ <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+ <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+ </div>
+ <div id="profile-video-wrapper" style="display: $visitor;" >
+ <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+ </div>
+ <div id="profile-audio-wrapper" style="display: $visitor;" >
+ <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+ </div>
+ <div id="profile-location-wrapper" style="display: $visitor;" >
+ <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+ </div>
+ <div id="profile-nolocation-wrapper" style="display: none;" >
+ <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+ </div>
+
+ <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+ <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
+ </div>
+
+ <span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
+
+ <div id="profile-jot-perms-end"></div>
+
- <ul id="jot-tools" class="jothidden" style="display:none">
- <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
- <li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li>
- <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
- <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
- <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
- <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
- <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
- <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
- $jotplugins
-
- <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang" title="$permset" ></a></li>
- <li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
- <li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></li>
- </ul>
+ <div id="profile-jot-plugin-wrapper">
+ $jotplugins
</div>
+
+ <div id="profile-rotator-wrapper" style="display: $visitor;" >
+ <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
<div id="jot-preview-content" style="display:none;"></div>
@@ -43,6 +75,10 @@
</div>
</div>
-</form>
-{{ if $content }}<script>initEditor();</script>{{ endif }}
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+ {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/nav.tpl b/view/nav.tpl
index 8c872864c..4675c3e5c 100755
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -1,131 +1,68 @@
-<header>
- {# $langselector #}
+<nav>
+ $langselector
<div id="site-location">$sitelocation</div>
- <div id="banner">$banner</div>
-</header>
-<nav>
- <ul>
- {{ if $userinfo }}
- <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
- <ul id="nav-user-menu" class="menu-popup">
- {{ for $nav.usermenu as $usermenu }}
- <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
- {{ endfor }}
-
- {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
- {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
- {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
- </ul>
- </li>
- {{ endif }}
-
- {{ if $nav.community }}
- <li id="nav-community-link" class="nav-menu $sel.community">
- <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- </li>
- {{ endif }}
-
- {{ if $nav.network }}
- <li id="nav-network-link" class="nav-menu $sel.network">
- <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-notify"></span>
- </li>
- {{ endif }}
- {{ if $nav.home }}
- <li id="nav-home-link" class="nav-menu $sel.home">
- <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-notify"></span>
- </li>
- {{ endif }}
-
- {{ if $nav.notifications }}
- <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
- <span id="notify-update" class="nav-notify"></span>
- <ul id="nav-notifications-menu" class="menu-popup">
- <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
- <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
- <li class="empty">$emptynotifications</li>
- </ul>
- </li>
- {{ endif }}
-
- <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
- <ul id="nav-site-menu" class="menu-popup">
- {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
- {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
- {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+ {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+ {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
- {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
- {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
- </ul>
- </li>
-
- {{ if $nav.help }}
- <li id="nav-help-link" class="nav-menu $sel.help">
- <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
- </li>
- {{ endif }}
+ <span id="nav-link-wrapper" >
- <li id="nav-search-link" class="nav-menu $sel.search">
- <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- </li>
- <li id="nav-directory-link" class="nav-menu $sel.directory">
- <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
- </li>
+ {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
- {{ if $nav.apps }}
- <li id="nav-apps-link" class="nav-menu $sel.apps">
- <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
- <ul id="nav-apps-menu" class="menu-popup">
- {{ for $apps as $ap }}
- <li>$ap</li>
- {{ endfor }}
- </ul>
- </li>
- {{ endif }}
- </ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+
+ {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-{#
+ <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+ <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+ {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-<span id="nav-link-wrapper" >
+ {{ if $nav.network }}
+ <a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+ <span id="net-update" class="nav-ajax-left"></span>
+ {{ endif }}
+ {{ if $nav.home }}
+ <a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+ <span id="home-update" class="nav-ajax-left"></span>
+ {{ endif }}
+ {{ if $nav.community }}
+ <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+ {{ endif }}
+ {{ if $nav.introductions }}
+ <a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+ <span id="intro-update" class="nav-ajax-left"></span>
+ {{ endif }}
+ {{ if $nav.messages }}
+ <a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+ <span id="mail-update" class="nav-ajax-left"></span>
+ {{ endif }}
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+ {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+ {{ if $nav.notifications }}
+ <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+ <span id="notify-update" class="nav-ajax-left"></span>
+ <ul id="nav-notifications-menu" class="menu-popup">
+ <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+ <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+ <li class="empty">$emptynotifications</li>
+ </ul>
+ {{ endif }}
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+ {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+ {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+ {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+ </span>
+ <span id="nav-end"></span>
+ <span id="banner">$banner</span>
+</nav>
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+ <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/nets.tpl b/view/nets.tpl
index cbadf1361..b0cb8890c 100755
--- a/view/nets.tpl
+++ b/view/nets.tpl
@@ -1,12 +1,10 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
-
+ <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
- <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
- {{ for $nets as $net }}
- <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
- {{ endfor }}
+ {{ for $nets as $net }}
+ <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ {{ endfor }}
</ul>
-
</div>
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 7cd02f164..154f22363 100755
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,27 +1,11 @@
<div class="vcard">
- <div class="tool">
- <div class="fn label">$profile.name</div>
- {{ if $profile.edit }}
- <div class="action">
- <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
- <ul id="profiles-menu" class="menu-popup">
- {{ for $profile.menu.entries as $e }}
- <li>
- <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
- </li>
- {{ endfor }}
- <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
- <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+ <div class="fn label">$profile.name</div>
+
- </ul>
- </div>
- {{ endif }}
- </div>
-
-
+
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
- <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
diff --git a/view/saved_searches_aside.tpl b/view/saved_searches_aside.tpl
index 9c10a26de..e6a0d6278 100755
--- a/view/saved_searches_aside.tpl
+++ b/view/saved_searches_aside.tpl
@@ -1,15 +1,14 @@
-<div id="saved-search-list" class="widget">
- <h3 class="title">$title</h3>
-
+<div class="widget" id="saved-search-list">
+ <h3 id="search">$title</h3>
+ $searchbox
+
<ul id="saved-search-ul">
{{ for $saved as $search }}
- <li class="tool {{if $search.selected}}selected{{endif}}">
- <a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
- <a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
- </li>
+ <li class="saved-search-li clear">
+ <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+ <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+ </li>
{{ endfor }}
</ul>
-
- $searchbox
-
+ <div class="clear"></div>
</div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index 80d6678fb..bfad1b7b7 100755
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,91 +1,54 @@
-
-<div class="wall-item-decor">
- <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
- {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent">
- <div class="wall-item-item">
- <div class="wall-item-info">
- <div class="contact-photo-wrapper"
- onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
- onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+ <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+ <div class="wall-item-info" id="wall-item-info-$item.id">
+ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
- </a>
- <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
- <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
- $item.item_photo_menu
- </ul>
-
+ <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+ <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+ <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+ <ul>
+ $item.item_photo_menu
+ </ul>
+ </div>
+ </div>
+ <div class="wall-item-photo-end"></div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
- <div class="wall-item-location">$item.location</div>
- </div>
- <div class="wall-item-content">
- {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
- $item.body
- </div>
- </div>
- <div class="wall-item-bottom">
- <div class="wall-item-links">
- </div>
- <div class="wall-item-tags">
- {{ for $item.tags as $tag }}
- <span class='tag'>$tag</span>
- {{ endfor }}
</div>
- </div>
- <div class="wall-item-bottom">
- <div class="">
- {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
</div>
- <div class="wall-item-actions">
- <div class="wall-item-actions-author">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
- </div>
-
- <div class="wall-item-actions-social">
- {{ if $item.star }}
- <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
- <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
- {{ endif }}
-
- {{ if $item.vote }}
- <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
- <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
- {{ endif }}
-
- {{ if $item.vote.share }}
- <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
- {{ endif }}
+ <div class="wall-item-tools" id="wall-item-tools-$item.id">
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+ {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
-
- <div class="wall-item-actions-tools">
-
- {{ if $item.drop.dropping }}
- <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
- <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
- {{ endif }}
- {{ if $item.edpost }}
- <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
- {{ endif }}
- </div>
-
+ {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
</div>
- <div class="wall-item-bottom">
- <div class="wall-item-links"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
- {{ if $item.conv }}
- <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+ <div class="wall-item-wrapper-end"></div>
+
+
+ <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+ {{ if $item.conv }}
<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
- {{ endif }}
- </div>
+ {{ endif }}
</div>
-
-
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
</div>
+
diff --git a/view/settings.tpl b/view/settings.tpl
index 2b739c968..75225a0f1 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -28,7 +28,7 @@ $nickname_block
{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
{{inc field_input.tpl with $field=$defloc }}{{endinc}}
{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-{{inc field_select.tpl with $field=$theme }}{{endinc}}
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
diff --git a/view/theme/clean/screenshot.jpg b/view/theme/clean/screenshot.jpg
new file mode 100644
index 000000000..8d9d772f4
--- /dev/null
+++ b/view/theme/clean/screenshot.jpg
Binary files differ
diff --git a/view/theme/comix-plain/screenshot.jpg b/view/theme/comix-plain/screenshot.jpg
new file mode 100644
index 000000000..80e66e312
--- /dev/null
+++ b/view/theme/comix-plain/screenshot.jpg
Binary files differ
diff --git a/view/theme/comix/screenshot.jpg b/view/theme/comix/screenshot.jpg
new file mode 100644
index 000000000..5ad46cd8b
--- /dev/null
+++ b/view/theme/comix/screenshot.jpg
Binary files differ
diff --git a/view/theme/darkbubble/screenshot.jpg b/view/theme/darkbubble/screenshot.jpg
new file mode 100644
index 000000000..0d9af2c04
--- /dev/null
+++ b/view/theme/darkbubble/screenshot.jpg
Binary files differ
diff --git a/view/theme/darkness/screenshot.jpg b/view/theme/darkness/screenshot.jpg
new file mode 100644
index 000000000..aec866e99
--- /dev/null
+++ b/view/theme/darkness/screenshot.jpg
Binary files differ
diff --git a/view/theme/darkzero-NS/screenshot.jpg b/view/theme/darkzero-NS/screenshot.jpg
new file mode 100644
index 000000000..e91ae13f5
--- /dev/null
+++ b/view/theme/darkzero-NS/screenshot.jpg
Binary files differ
diff --git a/view/theme/darkzero/screenshot.jpg b/view/theme/darkzero/screenshot.jpg
new file mode 100644
index 000000000..e91ae13f5
--- /dev/null
+++ b/view/theme/darkzero/screenshot.jpg
Binary files differ
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
new file mode 100755
index 000000000..748e6d077
--- /dev/null
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -0,0 +1,75 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">Help or @NewHere ?</h3>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3>Connectable Services</h3>
+<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+
+{{ if $nv }}
+<h3>Find Friends</h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3>$lastusers_title</h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{ for $lastusers_items as $i }}
+ $i
+{{ endfor }}
+</div>
+{{ endif }}
+
+{{ if $activeusers_title }}
+<h3>$activeusers_title</h3>
+<div class='items-wrapper'>
+{{ for $activeusers_items as $i }}
+ $i
+{{ endfor }}
+</div>
+{{ endif }}
+
+{{ if $photos_title }}
+<h3>$photos_title</h3>
+<div id='ra-photos-wrapper' class='items-wrapper'>
+{{ for $photos_items as $i }}
+ $i
+{{ endfor }}
+</div>
+{{ endif }}
+
+
+{{ if $like_title }}
+<h3>$like_title</h3>
+<ul id='likes'>
+{{ for $like_items as $i }}
+ <li id='ra-photos-wrapper'>$i</li>
+{{ endfor }}
+</ul>
+{{ endif }}
diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl
new file mode 100755
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-blue/directory_item.tpl
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+ <div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
+ <div class="directory-photo" id="directory-photo-$id" >
+ <a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+ <img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+ </a>
+ </div>
+ </div>
+</div>
diff --git a/view/theme/diabook-blue/fpostit/README b/view/theme/diabook-blue/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/README
@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js
new file mode 100755
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/fpostit.js
@@ -0,0 +1,6 @@
+javascript: (function() {
+ the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+ if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
+ else {a_funct()}})()" \ No newline at end of file
diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php
new file mode 100644
index 000000000..65c43a2b9
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/fpostit.php
@@ -0,0 +1,135 @@
+<?php
+if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+ setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
+ setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+ <style>
+ body {
+ font-family: arial, Helvetica,sans-serif;
+ margin: 0px;
+ }
+ .wrap1 {
+ padding: 2px 5px;
+ background-color: #000;
+ margin-bottom: 10px;
+ }
+ .wrap2 {
+ margin-left: 10px;
+ font-size: 12px;
+ }
+ .logo {
+ margin-left: 3px;
+ margin-right: 5px;
+ float: left;
+ }
+ h2 {
+ color: #ffffff;
+ }
+ .error {
+ background-color: #FFFF66;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+ </style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+ $title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+ $text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+ $url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+ $content = "$title\nsource:$url\n\n$text";
+} else {
+ $content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+
+ if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+ $acctname = $_POST["friendika_acct_name"];
+ $tmp_account_array = explode("@", $acctname);
+ if (isset($tmp_account_array[1])) {
+ $username = $tmp_account_array[0];
+ $hostname = $tmp_account_array[1];
+ }
+ $password = $_POST["friendika_password"];
+ $content = $_POST["content"];
+
+ $url = "http://" . $hostname . '/api/statuses/update';
+ $data = array('status' => $content);
+
+ // echo "posting to: $url<br/>";
+
+ $c = curl_init();
+ curl_setopt($c, CURLOPT_URL, $url);
+ curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+ curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+ curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+ $c_result = curl_exec($c);
+ if(curl_errno($c)){
+ $error = curl_error($c);
+ showForm($error, $content);
+ }
+
+ curl_close($c);
+ if (!isset($error)) {
+ echo '<script language="javascript" type="text/javascript">window.close();</script>';
+ }
+
+ } else {
+ $error = "Missing account name and/or password...try again please";
+ showForm($error, $content);
+ }
+
+} else {
+ showForm(null, $content);
+}
+
+function showForm($error, $content) {
+ $username_cookie = $_COOKIE['username'];
+ $password_cookie = $_COOKIE['password'];
+
+ echo <<<EOF
+ <div class='wrap1'>
+ <h2><img class='logo' src='friendika-32.png' align='middle';/>
+ Friendika Bookmarklet</h2>
+ </div>
+
+ <div class="wrap2">
+ <form method="post" action="{$_SERVER['PHP_SELF']}">
+ Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
+ Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+ <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+ <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
+ </form>
+ <p></p>
+ </div>
+EOF;
+
+}
+?>
+
+</body>
+</html> \ No newline at end of file
diff --git a/view/theme/diabook-blue/fpostit/friendika-32.png b/view/theme/diabook-blue/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/friendika-32.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/StatusNet.png b/view/theme/diabook-blue/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook-blue/icons/StatusNet.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/email.png b/view/theme/diabook-blue/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook-blue/icons/email.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/facebook.png b/view/theme/diabook-blue/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook-blue/icons/facebook.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/livejournal.png b/view/theme/diabook-blue/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/livejournal.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/posterous.png b/view/theme/diabook-blue/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/posterous.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
index acf857f32..6d9539610 100644
--- a/view/theme/diabook-blue/icons/pubgroups.png
+++ b/view/theme/diabook-blue/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/tumblr.png b/view/theme/diabook-blue/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook-blue/icons/tumblr.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/twitter.png b/view/theme/diabook-blue/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook-blue/icons/twitter.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/wordpress.png b/view/theme/diabook-blue/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook-blue/icons/wordpress.png
Binary files differ
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 289581c36..651b9647d 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -85,11 +85,7 @@
</li>
- {{ if $nav.directory }}
- <li id="nav-directory-link" class="nav-menu $sel.directory">
- <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
- </li>
- {{ endif }}
+
{{ if $nav.apps }}
<li id="nav-apps-link" class="nav-menu $sel.apps">
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 902c2a0ed..511fc73ac 100755
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -12,7 +12,7 @@
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
- <a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a>
+ <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div>
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index a65677696..94396300f 100644
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -9,12 +9,13 @@
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
</ul>
</div>
- \ No newline at end of file
+
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index 3a545f9ba..918cfc97c 100644
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -22,7 +22,7 @@
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
- <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
diff --git a/view/theme/diabook-blue/right_aside.tpl b/view/theme/diabook-blue/right_aside.tpl
new file mode 100644
index 000000000..a65677696
--- /dev/null
+++ b/view/theme/diabook-blue/right_aside.tpl
@@ -0,0 +1,20 @@
+<div id="profile_side">
+ <div id="ps-usernameicon">
+ <a href="$ps.usermenu.status.0" title="$userinfo.name">
+ <img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
+ </a>
+ <a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
+ </div>
+
+<ul id="profile-side-menu" class="menu-profile-side">
+ <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
+ <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+ <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
+ <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+ <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+</ul>
+
+</div>
+
+ \ No newline at end of file
diff --git a/view/theme/diabook-blue/screenshot.png b/view/theme/diabook-blue/screenshot.png
new file mode 100644
index 000000000..b1c890285
--- /dev/null
+++ b/view/theme/diabook-blue/screenshot.png
Binary files differ
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
new file mode 100644
index 000000000..d0bcd3209
--- /dev/null
+++ b/view/theme/diabook-blue/style-network.css
@@ -0,0 +1,2518 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/* width: 80%;*/
+}
+
+#pending-update {
+ float:right;
+ color: #ffffff;
+ font-weight: bold;
+ background-color: #FF0000;
+ padding: 0em 0.3em;
+}
+
+.admin.linklist {
+ border: 0px; padding: 0px;
+}
+
+.admin.link {
+ list-style-position: inside;
+ font-size: 1em;
+ padding: 5px;
+ width: 100px;
+ margin: 5px;
+}
+
+#adminpage dl {
+ clear: left;
+ margin-bottom: 2px;
+ padding-bottom: 2px;
+ border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+ width: 200px;
+ float: left;
+ font-weight: bold;
+}
+
+#adminpage dd {
+ margin-left: 200px;
+}
+#adminpage h3 {
+ border-bottom: 1px solid #898989;
+ margin-bottom: 5px;
+ margin-top: 10px;
+}
+
+#adminpage .submit {
+ clear:left;
+}
+
+#adminpage #pluginslist {
+ margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+ list-style: none;
+ display: block;
+ /* border: 1px solid #888888; */
+ padding: 1em;
+ margin-bottom: 5px;
+ clear: left;
+}
+
+#adminpage .toggleplugin {
+ float:left;
+ margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+ background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+ background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+.icon.notify {
+ background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+.icon.messages {
+ background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+.icon.community {
+ background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+
+.icon.drop { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
+.icon.drophide { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
+.icon.dislike { background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
+.icon.like { background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
+.icon.pencil { background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
+.icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
+.icon.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
+.icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
+.icon.lock { background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
+.icon.unlock { background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
+.icon.language { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
+
+
+.camera { background-image: url("../../../view/theme/diabook-blue/icons/camera.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.attach { background-image: url("../../../view/theme/diabook-blue/icons/attach.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.video2 { background-image: url("../../../view/theme/diabook-blue/icons/video.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.video { background-image: url("../../../view/theme/diabook-blue/icons/video.png");
+ display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+ }
+.audio2 { background-image: url("../../../view/theme/diabook-blue/icons/audio.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.audio { background-image: url("../../../view/theme/diabook-blue/icons/audio.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.weblink { background-image: url("../../../view/theme/diabook-blue/icons/weblink.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.globe { background-image: url("../../../view/theme/diabook-blue/icons/globe.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.unglobe { background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.edit {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+
+
+
+
+.article { background-position: -50px 0px;}
+/*.audio { background-position: -70px 0px;}*/
+.block { background-position: -90px 0px;}
+/*.drop { background-position: -110px 0px;}*/
+/*.drophide { background-position: -130px 0px;}*/
+/*.edit { background-position: -150px 0px;}*/
+/*.camera { background-position: -170px 0px;}*/
+/*.dislike { background-position: -190px 0px;}*/
+/*.like { background-position: -210px 0px;}*/
+/*.link { background-position: -230px 0px;}*/
+
+/*.globe { background-position: -50px -20px;}*/
+/*.noglobe { background-position: -70px -20px;}*/
+.no { background-position: -90px -20px;}
+.pause { background-position: -110px -20px;}
+.play { background-position: -130px -20px;}
+/*.pencil { background-position: -150px -20px;}*/
+.small-pencil { background-position: -170px -20px;}
+/*.recycle { background-position: -190px -20px;}*/
+/*.remote-link { background-position: -210px -20px;}*/
+.share { background-position: -230px -20px;}
+
+.tools { background-position: -50px -40px;}
+/*.lock { background-position: -70px -40px;}*/
+
+/*.video { background-position: -110px -40px;}*/
+.youtube { background-position: -130px -40px;}
+
+/*.attach { background-position: -190px -40px;}*/
+/*.language { background-position: -210px -40px;}*/
+
+
+.icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev { background-position: -90px -60px;}
+.next { background-position: -110px -60px;}
+/*.tagged { background-position: -130px -60px;}*/
+
+.attachtype {
+ display: block; width: 20px; height: 23px;
+ background-image: url('../../../images/content-types.png');
+}
+
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text { background-position: -60px 0px; }
+.type-unkn { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+ display: block;
+ width: 20px;
+ height: 20px;
+ /*background-image: url('icons.png');*/
+}
+
+.icon {
+ background-color: transparent ;
+ background-repeat: no-repeat;
+ /* background-position: left center; */
+ display: block;
+ overflow: hidden;
+ text-indent: -9999px;
+ padding: 1px;
+}
+
+.icon.border.camera{
+ background-image: url("../../../view/theme/diabook-blue/icons/camera.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+
+.icon.border.link{
+ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ margin-left: 10px;
+ }
+
+.icon.text {
+ text-indent: 0px;
+}
+.icon.s10 {
+ min-width: 10px;
+ height: 10px;
+}
+.icon.s10.notify {
+ background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+ background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+ background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+ background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+ background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+ background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+ background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+ background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+ background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+ padding: 2px 0px 0px 15px;
+ font-size: 10px;
+}
+.icon.s16 {
+ min-width: 16px;
+ height: 16px;
+}
+.icon.s16.notify {
+ background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+ background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+ background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+ background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+ background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+ background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+ background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+ background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+ background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+ padding: 4px 0px 0px 20px;
+ font-size: 10px;
+}
+.icon.s22 {
+ min-width: 22px;
+ height: 22px;
+}
+.icon.s22.notify {
+ background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+ background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+ background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+ background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+ background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+ background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+ background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+ background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+ background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+ padding: 10px 0px 0px 25px;
+ width: 200px;
+}
+.icon.s48 {
+ width: 48px;
+ height: 48px;
+}
+.icon.s48.notify {
+ background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+ background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+ background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+ background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+ background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+ background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+ background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+ background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+ background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+ list-style: none;
+ list-style-type: none;
+}
+
+.hide-comments-outer {
+ margin-left: 80px;
+ margin-bottom: 1px;
+ width: 484px;
+ border-bottom: 1px solid #BDCDD4;
+ background-color: #fff;
+ padding: 8px;
+}
+
+/* global */
+body {
+ font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 12.5px;
+ background-color: #ffffff;
+ color: #2d2d2d;
+ margin: 50px auto auto;
+ display: table;
+}
+
+h4 {
+ font-size: 1.1em;
+}
+
+a {
+ color: #333333;
+ /* color: #3e3e8c; */
+ text-decoration: none;
+}
+a:hover {
+ /* color: blue; */
+ text-decoration: underline
+}
+
+.wall-item-name-link {
+/* float: left;*/
+}
+
+.wall-item-photo {
+ width: 48px;
+ height: 48px;
+ overflow: hidden;
+ display: block;
+}
+
+.left {
+ float: left;
+}
+.right {
+ float: right;
+}
+.hidden {
+ display: none;
+}
+.clear {
+ clear: both;
+}
+.fakelink {
+ color: #1872A2;
+ /* color: #3e3e8c; */
+ text-decoration: none;
+ cursor: pointer;
+}
+.fakelink:hover {
+ /* color: blue; */
+ /*color: #005c94; */
+ text-decoration: underline;
+}
+code {
+ font-family: Courier, monospace;
+ white-space: pre;
+ display: block;
+ overflow: auto;
+ border: 1px solid #444;
+ background: #EEE;
+ color: #444;
+ padding: 10px;
+ margin-top: 20px;
+}
+#panel {
+ position: absolute;
+ width: 12em;
+ background: #ffffff;
+ color: #2d2d2d;
+ margin: 0px;
+ padding: 1em;
+ list-style: none;
+ border: 3px solid #364e59;
+ z-index: 100000;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+ height: auto;
+ overflow: auto;
+ padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+ background: #EEE;
+}
+.tool .label {
+ float: left;
+}
+.tool .action {
+ float: right;
+}
+.tool a {
+ color: ##3F8FBA;
+}
+.tool a:hover {
+ text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+ background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+}
+div.jGrowl div.info {
+ background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+}
+/* header */
+header {
+ position: fixed;
+ left: 0%;
+ right: 80%;
+ top: 0px;
+ margin: 0px;
+ padding: 0px;
+ width: 22%;
+ height: 32px;
+ background: #1872a2;
+ background-color: #1872a2;
+ z-index: 100;
+ border-bottom: 1px;
+ border-bottom-color: black;
+ border-bottom-style: inset;
+}
+header #site-location {
+ display: none;
+}
+header #banner {
+ overflow: hidden;
+ text-align: left;
+ width: 82%%;
+ margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ outline: none;
+ vertical-align: middle;
+}
+header #banner #logo-img {
+ height: 25px;
+ margin-top: 5px;
+}
+header #banner #logo-text {
+ font-size: 22px;
+ position: absolute;
+ top: 15%;
+}
+/* nav */
+nav {
+ width: 80%;
+ height: 32px;
+ position: fixed;
+ left: 22%;
+ top: 0px;
+ padding: 0px;
+ background: #1872a2;
+ color: #ffffff;
+ z-index: 99;
+ border-bottom: 1px;
+ border-bottom-color: black;
+ border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ outline: none;
+}
+nav #banner {
+ overflow: hidden;
+ /*text-align: center;*/
+ width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ outline: none;
+ vertical-align: bottom;
+}
+nav #banner #logo-img {
+ height: 22px;
+ margin-top: 5px;
+}
+nav #banner #logo-text {
+ font-size: 22px;
+}
+nav #navbar{
+ }
+nav ul {
+ margin: 0px;
+ padding: 0px 20px;
+}
+nav ul li {
+ list-style: none;
+ margin: 0px;
+ /* padding: 1px 1px 3px 1px; */
+ float: left;
+}
+nav ul li .menu-popup {
+ left: 0px;
+ right: auto;
+}
+
+nav #logo-img {
+ height: 25px;
+ margin-top: 4px;
+ margin-left: 30px;
+}
+
+nav #logo-text {
+ font-size: 22px;
+ margin-top: 3px;
+ margin-right: 15px;
+}
+nav .nav-menu-search {
+ position: relative;
+
+ margin: 3px 17px;
+ margin-right: 0px;
+ height: 17px;
+ width: 180px;
+
+}
+
+nav #search-box #search-text {
+ background-image: url('icons/lupe.png');
+ background-repeat:no-repeat;
+ padding-left:20px;
+ }
+
+
+nav .nav-menu-icon {
+ position: relative;
+ height: 22px;
+ padding: 5px;
+ margin: 0px 5px;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+ background-color: #308dbf;
+ position: relative;
+ height: 22px;
+ padding: 5px;
+ margin: 0px 5px;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+ background-color: #fff;
+}
+nav .nav-menu-icon img {
+ width: 22px;
+ height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+ top: 3px;
+}
+nav .nav-menu {
+ position: relative;
+ height: 16px;
+ padding: 5px;
+ margin: 3px 15px 0px;
+ font-size: 13px;
+ /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+ /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+ display: none;
+ position: absolute;
+ background-color: #ff0000;
+ /* background-color: #19aeff; */
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ font-size: 10px;
+ font-weight: 900;
+ padding: 1px 4px;
+ top: 0px;
+ right: -6px;
+ min-width: 10px;
+ text-align: center;
+}
+nav .nav-notify.show {
+ display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu,
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+ float: right;
+}
+nav #nav-user-linkmenu{
+ margin-right: 0px;
+ }
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+ margin-left: 0px;
+ margin-right: 0px;
+ font-weight: bold;
+ margin: 3px 5px;
+ }
+nav #nav-directory-link{
+ margin-right: 0px;
+ }
+nav #nav-home-link{
+ margin-left: 0px;
+ }
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+ right: 0px;
+ left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+ background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+ }
+
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+ background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+ }
+
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+ background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+ }
+
+nav #nav-apps-link.selected {
+ background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+ /* padding: 1px 1px 2px 26px; */
+ /* border-bottom: 1px solid #364E59; */
+ /* margin: 0px 0px 2px 0px;
+ padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+ /* padding: 1px 1px 2px 26px; */
+ /* border-bottom: 1px solid #364E59; */
+ /* margin: 0px 0px 2px 0px;
+ padding: 5px 10px; */
+}
+
+.notify-seen {
+ background: none repeat scroll 0 0 #DDDDDD;
+ }
+
+ul.menu-popup {
+ position: absolute;
+ display: none;
+ width: 11em;
+ background: #ffffff;
+ color: #2d2d2d;
+ margin: 0px;
+ padding: 0px;
+ list-style: none;
+ z-index: 100000;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+ display: block;
+ color: #2d2d2d;
+ padding: 5px 10px;
+ text-decoration: none;
+}
+ul.menu-popup a:hover {
+ background-color: #14618a; /*bdcdd4;*/
+ color: #fff;
+}
+ul.menu-popup .menu-sep {
+ border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+ float: none;
+ overflow: auto;
+ height: auto;
+ display: block;
+}
+ul.menu-popup li img {
+ float: left;
+ width: 16px;
+ height: 16px;
+ padding-right: 5px;
+}
+ul.menu-popup .empty {
+ padding: 5px;
+ text-align: center;
+ color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+ max-height: 150px;
+ background-color: #ffffff;
+ color: #2d2d2d;
+ border: 1px solid #MenuBorder;
+ overflow: auto;
+ z-index: 100000;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+ color: #2d2d2d;
+ padding: 4px;
+ clear: left;
+}
+.acpopupitem img {
+ float: left;
+ margin-right: 4px;
+}
+.acpopupitem.selected {
+ background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+ width: 400px;
+ max-height: 550px;
+ overflow: auto;
+}
+/* #nav-notifications-menu a {
+ display: inline;
+ padding: 5px 0px;
+ margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+ background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+ float: left;
+ margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+ font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+ font-size: 10px;
+ color: #9eabb0;
+ display: block;
+}
+
+.notif-image {
+ width: 32px;
+ height: 32px;
+ padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+ margin-bottom: 30px;
+}
+#ps-usericon{
+ height: 25px
+ }
+#ps-username{
+ font-size: 1.17em;
+ font-weight: bold;
+ vertical-align: top;
+ position: absolute;
+ padding-top: 4px;
+ padding-left: 5px;
+ word-wrap: break-word;
+ width: 130px;
+ }
+#ps-username:hover{
+ text-decoration: none;
+ }
+.menu-profile-side{
+ list-style: none;
+ padding-left: 0px;
+ min-height: 0px;
+ }
+.menu-profile-list{
+ height: auto;
+ overflow: auto;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 16px;
+ min-height: 16px;
+ list-style: none;
+ }
+.menu-profile-list:hover{
+ background: #EEE;
+ }
+.menu-profile-list-item{
+ padding-left: 5px;
+ }
+.menu-profile-list-item:hover{
+ text-decoration: none;
+ }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+ background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+ }
+.menu-profile-list.photos{
+ background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+ }
+.menu-profile-list.events{
+ background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+ }
+.menu-profile-list.notes{
+ background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+ }
+.menu-profile-list.foren{
+ background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+ }
+.menu-profile-list.com_side{
+ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+ }
+.menu-profile-list.pscontacts{
+ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+ }
+/* aside */
+aside {
+ display: table-cell;
+ vertical-align: top;
+ width: 160px;
+ padding: 0px 10px 0px 10px;
+ border-right: 1px solid #D2D2D2;
+ float: left;
+ /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+ font-size: 18px;
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+aside .vcard .title {
+ margin-bottom: 5px;
+}
+aside .vcard dl {
+ height: auto;
+ overflow: auto;
+}
+aside .vcard dt {
+ float: left;
+ margin-left: 0px;
+ /*width: 35%;*/
+ text-align: right;
+ color: #999999;
+}
+aside .vcard dd {
+ float: left;
+ margin-left: 5px;
+ /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+ padding: 0px;
+ margin: 0px;
+}
+aside #profile-extra-links li {
+ padding: 0px;
+ margin: 0px;
+ list-style: none;
+}
+aside #dfrn-request-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+ text-decoration: none;
+ background-color: #36c;
+ /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+ width: 20em;
+}
+aside #search-text {
+ width: 150px;
+}
+aside #side-follow-url {
+ width: 150px;
+ }
+aside #side-peoplefind-url {
+ width: 150px;
+ }
+#contact-block {
+ overflow: auto;
+ height: auto;
+}
+#contact-block .contact-block-h4 {
+ float: left;
+ margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+ float: right;
+ margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+ clear: both;
+ overflow: auto;
+ height: auto;
+}
+#contact-block .contact-block-link {
+ float: left;
+ margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+ widht: 55px;
+ height: 55px;
+}
+#lost-password-link {
+ float: left;
+ margin-right: 20px;
+ }
+/* widget */
+.widget {
+ margin-bottom: 2em;
+ /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+ .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/* font-size: 12px; */
+}
+.widget h3 {
+ padding: 0px;
+ margin: 2px;
+}
+.widget .action {
+ opacity: 0.1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget input.action {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget:hover .title .action {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action.ticked {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget ul {
+ padding: 0px;
+}
+.widget ul li {
+ padding-left: 16px;
+ min-height: 16px;
+ list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+ margin-left: 30px;
+ padding-left: 0px;
+ }
+#side-bar-photos-albums ul li a{
+ color: #1872A2;
+}
+.widget .tool.selected {
+ background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+ width: 200px;
+ top: 18px;
+}
+/* section */
+section {
+ display: table-cell;
+ vertical-align: top;
+ width: auto;
+ padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+ text-align: center;
+ margin-top: 25px;
+ font-size: 0px;
+ }
+
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
+#contact-edit-end {
+ }
+.pager {
+ padding: 10px;
+ text-align: center;
+ font-size: 1.0em;
+ clear: both;
+ display: block;
+}
+
+.tabs {
+
+ background-position: 0 -20px;
+ background-repeat: repeat-x;
+ height: 27px;
+ padding: 0;
+ }
+.tab.button {
+ margin-right: 5px;
+ margin-left: 5px;
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ font-weight: normal;
+ padding: 3px;
+ color: #333333;
+ }
+
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+ margin-bottom: 10px;
+ }
+
+right_aside {
+ display: table-cell;
+ vertical-align: top;
+ width: 160px;
+ padding-right: 10px;
+ /*border-left: 1px solid #D2D2D2;*/
+
+ /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
+margin-top:30px;}
+right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto; width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+/* wall item */
+.tread-wrapper {
+ border-bottom: 1px solid #D2D2D2;
+ position: relative;
+ padding: 5px;
+ margin-bottom: 0px;
+ width: 575px;
+}
+.tread-wrapper a{
+ color: #1872A2;
+}
+
+.wall-item-decor {
+ position: absolute;
+ left: 790px;
+ top: -10px;
+ width: 16px;
+}
+
+.wall-item-container {
+ display: table;
+ width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+ display: table-row;
+}
+
+.wall-item-bottom {
+ font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/* opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/* opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+ display: table-cell;
+ vertical-align: top;
+ text-align: left;
+ width: 80px;
+}
+.wall-item-container .wall-item-location {
+ padding-right: 40px;
+ display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+ word-wrap: break-word;
+ width: 50px;
+ margin-left: 10px;
+ color: #999;
+}
+.wall-item-location {
+
+ clear: both;
+ overflow: hidden;
+
+ margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+ font-size: 12.5px;
+ max-width: 420px;
+ word-wrap: break-word;
+ line-height: 1.2;
+}
+
+.wall-item-container .wall-item-content img {
+ max-width: 400px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+ display: table-cell;
+ vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-name {
+ font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+ width: 100%;
+ margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+ float: left;
+ margin-bottom: 1px;
+ display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+ margin-right: 1em;
+}
+.wall-item-actions-social a {
+ float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+ float: right;
+ width: 80px;
+ display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+ float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+ float: right;
+}
+.wall-item-container.comment {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-left: 80px;
+ width: 500px;
+ border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+ width: 32px;
+ height: 32px;
+ margin-left: 16px;
+ /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+ top: 15px !important;
+ left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+ padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+ margin: 1px 0px 0px 80px;
+ background-color: #fff;
+ width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+ display: none;
+}
+.wall-item-comment-wrapper textarea {
+ height: 2.0em;
+ width: 93%;
+ font-size: 10px;
+ color: #999999;
+ border: 1px solid #DDD;
+ padding: 0.3em;
+ font-size: 14px;
+ margin-left: 20px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+ font-size: 14px;
+ height: 4em;
+ color: #2d2d2d;
+ border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+ width: 710px;
+ border: 1px solid #2d2d2d;
+ margin-top: 10px;
+}
+.comment-edit-preview .contact-photo {
+ width: 32px;
+ height: 32px;
+ margin-left: 16px;
+ /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+ top: 15px !important;
+ left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+ padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+ width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+ width: 700px;
+ padding: 0;
+ margin: 10px 0;
+}
+
+.shiny {
+ /* border-right: 10px solid #fce94f; */
+ border-right: 1px solid #A7C7F7;
+ padding-right: 12px;
+}
+
+#jot-preview-content{
+ margin-top: 30px;}
+
+#jot-preview-content .tread-wrapper {
+ background-color: #fff797;
+}
+
+.wall-item-tags {
+ padding-top: 1px;
+ padding-bottom: 2px;
+}
+.tag {
+ /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+ color: #999;
+ padding-left: 3px;
+ font-size: 12px;
+}
+.tag a {
+ padding-right: 5px;
+ /*background: url("../../../images/tag.png") no-repeat center right;*/
+ color: #999;
+}
+.wwto {
+ position: absolute !important;
+ width: 25px;
+ height: 25px;
+ background: #FFFFFF;
+ border: 2px solid #364e59;
+ height: 25px;
+ width: 25px;
+ overflow: hidden;
+ padding: 1px;
+ position: absolute !important;
+ top: 40px;
+ left: 30px;
+ -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+ width: auto;
+ height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+ position: relative;
+ width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+ width: 25px;
+}
+
+.contact-photo {
+ width: 48px;
+ height: 48px;
+ overflow: hidden;
+ display: block;
+}
+.contact-photo img {
+ width: 48px;
+ height: 48px;
+}
+
+.contact-wrapper {
+ float: left;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper .contact-photo img {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper {
+ left: 0px;
+ top: 63px;
+}
+.contact-photo {
+ width: 48px;
+ height: 48px;
+}
+.contact-photo img {
+ width: 48px;
+ height: 48px;
+}
+.contact-name {
+ /* text-align: center; */
+ /*font-weight: bold;*/
+ font-size: 12px;
+}
+.contact-details {
+ color: #999999;
+}
+/* editor */
+.jothidden {
+ display: none;
+}
+#jot {
+ width: 585px;
+ margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+ height: 2.0em;
+ width: 99%;
+ font-size: 15px;
+ color: #999999;
+ border: 1px solid #DDD;
+ padding: 0.3em;
+ margin-bottom: 10px;
+}
+#jot #jot-tools {
+ margin: 0px;
+ padding: 0px;
+ height: 40px;
+ overflow: none;
+ width: 583px;
+ background-color: #fff;
+ border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+ list-style: none;
+ float: left;
+ width: 80px;
+ height: 40px;
+ border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+ display: block;
+ color: #cccccc;
+ width: 100%;
+ height: 40px;
+ text-align: center;
+ line-height: 40px;
+ overflow: hidden;
+}
+#jot #jot-tools li:hover {
+ background-color: #364e59;
+ border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+ float: right;
+ width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+ width: 30px;
+ border-left: 10px solid #cccccc;
+ background-color: #cccccc;
+ background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+ width: 30px;
+ border-left: 10px solid #666666;
+ background-color: #666666;
+}
+#jot #jot-tools li.submit {
+ float: right;
+ background-color: #cccccc;
+ border-bottom: 2px solid #cccccc;
+ border-right: 1px solid #666666;
+ border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+ border: 0px;
+ margin: 0px;
+ padding: 0px;
+ background-color: #cccccc;
+ color: #666666;
+ width: 80px;
+ height: 40px;
+ line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+ background-color: #bdcdd4;
+ color: #666666;
+}
+#jot #jot-tools li.loading {
+ float: right;
+ background-color: #ffffff;
+ width: 20px;
+ vertical-align: center;
+ text-align: center;
+ border-top: 2px solid #9eabb0;
+ height: 38px;
+}
+#jot #jot-tools li.loading img {
+ margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+
+ border-radius: 5px 5px 5px 5px;
+ font-weight: bold;
+ height: 20px;
+ margin: 0 0 5px;
+ width: 60%;
+ border: 1px solid #ffffff;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+ font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+ font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+ width: 585px;
+ height: 100px;
+ }
+#jot #jot-title:hover {
+ border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+ border: 1px solid #999999;
+}
+#jot #character-counter {
+ width: 80px;
+ float: right;
+ text-align: right;
+ height: 20px;
+ line-height: 20px;
+ padding-right: 20px;
+}
+#jot-perms-icon,
+#profile-location,
+#profile-nolocation,
+#profile-youtube,
+#profile-video,
+#profile-audio,
+#profile-link,
+#profile-title,
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+ cursor: pointer;
+ margin-top: 2px;
+}
+#profile-jot-wrapper{
+ margin: 0 2em 20px 0;
+ width: 585px;
+ }
+
+#profile-jot-submit-wrapper {
+ margin-bottom: 50px;
+ width: 585px;
+}
+
+#profile-jot-submit {
+ float: right;
+ margin-top: 2px;
+
+}
+#profile-upload-wrapper {
+ float: left;
+ margin-top: 2px;
+ margin-left: 10px;
+
+}
+#profile-attach-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-rotator {
+ float: left;
+ margin-left: 30px;
+ margin-top: 2px;
+}
+#profile-link-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-youtube-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-location-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-jot-perms {
+ float: left;
+ margin-left: 45px;
+ margin-top: 2px;
+}
+#jot-preview-link {
+ float: right;
+ margin-left: 10px;
+ margin-top: 2px;
+ font-size: 10px;
+}
+#profile-jot-perms{
+ float: right;
+ margin-left: 10px;
+ margin-top: 2px;
+ }
+/** buttons **/
+.button.creation1 {
+ background-color: #fff;
+ border: 1px solid #777777;
+ background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+}
+.button.creation2 {
+ background-color: #1872A2;
+ background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+}
+/*input[type="submit"] {
+ border: 0px;
+ background-color: @ButtonBackgroundColor;
+ color: @ButtonColor;
+ padding: 0px 10px;
+ .rounded(5px);
+ height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+ display: block!important;
+}
+#acl-wrapper {
+ width: 690px;
+ float: left;
+}
+#acl-search {
+ float: right;
+ background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+ padding-right: 20px;
+}
+#acl-showall {
+ float: left;
+ display: block;
+ width: auto;
+ height: 18px;
+ background-color: #cccccc;
+ background-image: url("../../../images/show_all_off.png");
+ background-position: 7px 7px;
+ background-repeat: no-repeat;
+ padding: 7px 5px 0px 30px;
+ color: #999999;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+ color: #000000;
+ background-color: #ff9900;
+ background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+ height: 210px;
+ border: 1px solid #cccccc;
+ clear: both;
+ margin-top: 30px;
+ overflow: auto;
+}
+.acl-list-item {
+ display: block;
+ width: 150px;
+ height: 30px;
+ border: 1px solid #cccccc;
+ margin: 5px;
+ float: left;
+}
+.acl-list-item img {
+ width: 22px;
+ height: 22px;
+ float: left;
+ margin: 4px;
+}
+.acl-list-item p {
+ height: 12px;
+ font-size: 10px;
+ margin: 0px;
+ padding: 2px 0px 1px;
+ overflow: hidden;
+}
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
+ float: left;
+ color: #999999;
+ background-color: #cccccc;
+ background-position: 3px 3px;
+ background-repeat: no-repeat;
+ margin-right: 5px;
+ -webkit-border-radius: 2px ;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ padding-left: 15px;
+}
+#acl-wrapper a:hover {
+ text-decoration: none;
+ color: #000000;
+}
+.acl-button-show {
+ background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+ background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+ color: #000000;
+ background-color: #ff4141;
+ background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+ border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+ border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+ list-style-type: none;
+ padding-bottom: 10px;
+ font-size: 13px;
+}
+ul.tabs li {
+ float: left;
+ margin-left: 5px;
+}
+ul.tabs li .active {
+ background-color: #055580;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+ margin-bottom: 10px;
+ padding-bottom: 10px;
+ overflow: auto;
+ width: 100%;
+}
+.field label {
+ float: left;
+ width: 200px;
+}
+.field input, .field textarea {
+ width: 400px;
+}
+.field textarea {
+ height: 100px;
+}
+.field .field_help {
+ display: block;
+ margin-left: 200px;
+ color: #666666;
+}
+.field .onoff {
+ float: left;
+ width: 80px;
+}
+.field .onoff a {
+ display: block;
+ border: 1px solid #666666;
+ background-image: url("../../../images/onoff.jpg");
+ background-repeat: no-repeat;
+ padding: 4px 2px 2px 2px;
+ height: 16px;
+ text-decoration: none;
+}
+.field .onoff .off {
+ border-color: #666666;
+ padding-left: 40px;
+ background-position: left center;
+ background-color: #cccccc;
+ color: #666666;
+ text-align: right;
+}
+.field .onoff .on {
+ border-color: #204A87;
+ padding-right: 40px;
+ background-position: right center;
+ background-color: #D7E3F1;
+ color: #204A87;
+ text-align: left;
+}
+.field .hidden {
+ display: none!important;
+}
+.field.radio .field_help {
+ margin-left: 0px;
+}
+#directory-search-form{
+ margin-bottom: 50px;
+ }
+#profile-edit-links-end {
+ clear: both;
+ margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+ float: left;
+ list-style: none;
+ margin-left: 10px;
+}
+
+.profile-edit-side-div {
+ display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+ width: 300px; float: left;
+}
+
+.required {
+ display: inline;
+ color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+ height: auto;
+ overflow: auto;
+ border-bottom: 2px solid #cccccc;
+ padding-bottom: 1em;
+ margin-bottom: 1em;
+}
+.oauthapp img {
+ float: left;
+ width: 48px;
+ height: 48px;
+ margin: 10px;
+}
+.oauthapp img.noicon {
+ background-image: url("../../../images/icons/48/plugin.png");
+ background-position: center center;
+ background-repeat: no-repeat;
+}
+.oauthapp a {
+ float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+ width: 120px;
+ height: 120px;
+ float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.lframe {
+ float: left;
+ /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+ float: left;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+ width: 80px;
+ height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+ width: 80px;
+ height: 80px;
+}
+.profile-match-wrapper {
+ left: 0px;
+ top: 63px;
+}
+
+.contact-photo-menu-button {
+ position: relative;
+ background-image: url("../../../images/icons/16/menu.png");
+ background-position: top left;
+ background-repeat: no-repeat;
+ margin: 0px 0px -16px 0px;
+ padding: 0px;
+ width: 16px;
+ height: 16px;
+ top: -20px; left:0px;
+ overflow: hidden;
+ text-indent: 40px;
+ display: none;
+
+}
+.contact-photo-menu {
+ width: 11em;
+ border: 3px solid #364e59;
+ color: #2d2d2d;
+ background: #FFFFFF;
+/* position: absolute;*/
+ position: relative;
+ left: 0px; top: 0px;
+ display: none;
+ z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+ display: block;
+ padding: 5px 10px;
+ color: #2d2d2d;
+ text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+ background-color: #bdcdd4;
+}
+
+/* page footer */
+footer {
+ height: 100px;
+ display: table-row;
+}
+
+blockquote {
+ border-left: 1px solid #D2D2D2;
+ padding-left: 9px;
+ margin: 0 0 0 .8ex;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+ color: #666666;
+ margin: 15px 0 5px;
+ padding-left: 5px;
+ }
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+ width: 55px;
+ height: 55px;
+ padding-right: 3px;
+}
+.contact-block-div {
+ float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; }
+
+#group-edit-wrapper {
+ margin-bottom: 10px;
+}
+
+#group-members-end {
+ clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+ margin-bottom: 10px;
+ margin-top: 20px;
+}
+
+#prvmail-submit {
+ float: right;
+ margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;
+ }
+
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+ float: left;
+ margin-top: 10px;
+ margin-right: 10px;
+ width: 24px;
+}
+
+#prvmail-end {
+ clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+ float: left;
+}
+.mail-list-detail {
+ margin-left: 20px;
+}
+
+.mail-list-subject {
+ font-size: 1.1em;
+ margin-top: 10px;
+}
+a.mail-list-link {
+ display: block;
+ font-size: 1.3em;
+ padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+* background-color: #15607B;
+* color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-list-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+ border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+ float: left;
+}
+.mail-conv-detail {
+ margin-left: 20px;
+ width: 500px;
+}
+
+.mail-conv-subject {
+ font-size: 1.4em;
+ margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-conv-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+.mail-conv-break {
+ clear: both;
+}
+
+.mail-conv-delete-icon {
+ border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+ float: left;
+ font-size: 20px;
+}
+
+.vevent {
+ border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+.vevent .event-start {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#new-event-link {
+ margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+ float: left;
+ margin-top: 4px;
+ margin-right: 4px;
+ margin-bottom: 15px;
+}
+
+.event-description:before {
+ content: url('../../../images/calendar.png');
+ margin-right: 15px;
+}
+
+.event-start, .event-end {
+ margin-left: 10px;
+ width: 330px;
+ clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+ float: right;
+}
+
+.event-list-date {
+ margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+ float: left;
+ margin-left: 32px;
+ margin-right: 32px;
+ margin-top: 64px;
+}
+.event-calendar-end {
+ clear: both;
+}
+
+
+.calendar {
+ font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+ color: #1872A2;
+ }
+.today {
+ font-weight: bold;
+ color: #FF0000;
+}
+
+.settings-block {
+ border: 1px solid #AAA;
+ margin: 10px;
+ padding: 10px;
+}
+
+.app-title {
+ margin: 10px;
+}
+
+#identity-manage-desc {
+ margin-top:15px;
+ margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+ margin-bottom: 15px;
+}
+
+#identity-submit {
+ margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+ padding: 10px;
+ float: left;
+}
+.lightbox{
+ float: left;
+ }
+
+#photo-photo {
+ float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+ float: left;
+ margin-right: 5px;
+ margin-top: 30px;
+ }
+.comment-edit-text-empty {
+ margin: 10px 0 0;
+ width: 85%;
+}
+.comment-edit-photo {
+ margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+ clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+ display: block;
+ margin-top: 30px;
+ margin-left: 50px;
+ }
+
+.profile-match-photo {
+ float: left;
+ text-align: center;
+ width: 120px;
+}
+
+.profile-match-name {
+ float: left;
+ text-align: center;
+ width: 120px;
+ overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+ clear: both;
+}
+
+.profile-match-connect {
+ text-align: center;
+ font-weight: bold;
+}
+
+.profile-match-wrapper {
+ float: left;
+ padding: 10px;
+ width: 120px;
+ height: 120px;
+ scroll: auto;
+}
+#profile-match-wrapper-end {
+ clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+ position: relative;
+}
+.contact-photo {
+ width: 48px;
+ height: 48px;
+ overflow: hidden;
+ display: block;
+}
+.contact-photo img {
+ width: 48px;
+ height: 48px;
+}
+.contact-photo-menu-button {
+ display: none;
+ /* position: absolute; */
+ /* position: absolute; */
+ left: -2px;
+ top: -20px;
+}
+.contact-wrapper {
+ float: left;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper .contact-photo img {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+ left: 0px;
+ top: 63px;
+}
+.directory-item {
+ float: left;
+ width: 200px;
+ height: 200px;
+}
+.directory-item .contact-photo {
+ width: 175px;
+ height: 175px;
+}
+.directory-item .contact-photo img {
+ width: 175px;
+ height: 175px;
+}
+.contact-name {
+ text-align: left;
+ font-weight: bold;
+ font-size: 12px;
+}
+.contact-details {
+ color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+ margin-left: 30px;
+ padding-left: 0px;
+ }
+#side-bar-photos-albums{
+ margin-top: 15px;
+ }
+.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-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: #000;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding-bottom: 20px;
+ position: relative;
+ margin: 0 10px 10px 0;
+ width: 200px; height: 140px;
+ overflow: hidden;
+}
+.photo-top-album-name {
+ width: 100%;
+ position: absolute;
+ bottom: 0px;
+ padding-left: 3px;
+ background-color: #EEE;
+}
+.photo-top-album-link{
+ color: #1872A2;
+ }
+.photo-top-album-img{
+
+ }
+/*.photo-top-image-wrapper {
+ position: relative;
+ float: left;
+ margin-top: 15px;
+ margin-right: 15px;
+ width: 200px; height: 200px;
+ overflow: hidden;
+}
+.photo-top-album-name {
+ width: 100%;
+ min-height: 2em;
+ position: absolute;
+ bottom: 0px;
+ padding: 0px 3px;
+ padding-top: 0.5em;
+ background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+ clear: both;
+}
+
+#photo-top-links {
+ margin-bottom: 30px;
+ margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+ float: left;
+ width: 175px;
+}
+
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
new file mode 100644
index 000000000..1296f1647
--- /dev/null
+++ b/view/theme/diabook-blue/style-profile.css
@@ -0,0 +1,2513 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/* width: 80%;*/
+}
+
+#pending-update {
+ float:right;
+ color: #ffffff;
+ font-weight: bold;
+ background-color: #FF0000;
+ padding: 0em 0.3em;
+}
+
+.admin.linklist {
+ border: 0px; padding: 0px;
+}
+
+.admin.link {
+ list-style-position: inside;
+ font-size: 1em;
+ padding: 5px;
+ width: 100px;
+ margin: 5px;
+}
+
+#adminpage dl {
+ clear: left;
+ margin-bottom: 2px;
+ padding-bottom: 2px;
+ border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+ width: 200px;
+ float: left;
+ font-weight: bold;
+}
+
+#adminpage dd {
+ margin-left: 200px;
+}
+#adminpage h3 {
+ border-bottom: 1px solid #898989;
+ margin-bottom: 5px;
+ margin-top: 10px;
+}
+
+#adminpage .submit {
+ clear:left;
+}
+
+#adminpage #pluginslist {
+ margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+ list-style: none;
+ display: block;
+ /* border: 1px solid #888888; */
+ padding: 1em;
+ margin-bottom: 5px;
+ clear: left;
+}
+
+#adminpage .toggleplugin {
+ float:left;
+ margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+ background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+ background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+.icon.notify {
+ background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+.icon.messages {
+ background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+.icon.community {
+ background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+
+.icon.drop { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
+.icon.drophide { background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
+.icon.dislike { background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
+.icon.like { background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
+.icon.pencil { background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
+.icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
+.icon.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
+.icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
+.icon.lock { background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
+.icon.unlock { background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
+.icon.language { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
+
+
+.camera { background-image: url("../../../view/theme/diabook-blue/icons/camera.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.attach { background-image: url("../../../view/theme/diabook-blue/icons/attach.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.video2 { background-image: url("../../../view/theme/diabook-blue/icons/video.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.video { background-image: url("../../../view/theme/diabook-blue/icons/video.png");
+ display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+ }
+.audio2 { background-image: url("../../../view/theme/diabook-blue/icons/audio.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.audio { background-image: url("../../../view/theme/diabook-blue/icons/audio.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.weblink { background-image: url("../../../view/theme/diabook-blue/icons/weblink.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.globe { background-image: url("../../../view/theme/diabook-blue/icons/globe.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.unglobe { background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.edit {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+
+
+
+
+.article { background-position: -50px 0px;}
+/*.audio { background-position: -70px 0px;}*/
+.block { background-position: -90px 0px;}
+/*.drop { background-position: -110px 0px;}*/
+/*.drophide { background-position: -130px 0px;}*/
+/*.edit { background-position: -150px 0px;}*/
+/*.camera { background-position: -170px 0px;}*/
+/*.dislike { background-position: -190px 0px;}*/
+/*.like { background-position: -210px 0px;}*/
+/*.link { background-position: -230px 0px;}*/
+
+/*.globe { background-position: -50px -20px;}*/
+/*.noglobe { background-position: -70px -20px;}*/
+.no { background-position: -90px -20px;}
+.pause { background-position: -110px -20px;}
+.play { background-position: -130px -20px;}
+/*.pencil { background-position: -150px -20px;}*/
+.small-pencil { background-position: -170px -20px;}
+/*.recycle { background-position: -190px -20px;}*/
+/*.remote-link { background-position: -210px -20px;}*/
+.share { background-position: -230px -20px;}
+
+.tools { background-position: -50px -40px;}
+/*.lock { background-position: -70px -40px;}*/
+
+/*.video { background-position: -110px -40px;}*/
+.youtube { background-position: -130px -40px;}
+
+/*.attach { background-position: -190px -40px;}*/
+/*.language { background-position: -210px -40px;}*/
+
+
+.icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev { background-position: -90px -60px;}
+.next { background-position: -110px -60px;}
+/*.tagged { background-position: -130px -60px;}*/
+
+.attachtype {
+ display: block; width: 20px; height: 23px;
+ background-image: url('../../../images/content-types.png');
+}
+
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text { background-position: -60px 0px; }
+.type-unkn { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+ display: block;
+ width: 20px;
+ height: 20px;
+ /*background-image: url('icons.png');*/
+}
+
+.icon {
+ background-color: transparent ;
+ background-repeat: no-repeat;
+ /* background-position: left center; */
+ display: block;
+ overflow: hidden;
+ text-indent: -9999px;
+ padding: 1px;
+}
+
+.icon.border.camera{
+ background-image: url("../../../view/theme/diabook-blue/icons/camera.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+
+.icon.border.link{
+ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ margin-left: 10px;
+ }
+
+.icon.text {
+ text-indent: 0px;
+}
+.icon.s10 {
+ min-width: 10px;
+ height: 10px;
+}
+.icon.s10.notify {
+ background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+ background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+ background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+ background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+ background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+ background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+ background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+ background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+ background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+ padding: 2px 0px 0px 15px;
+ font-size: 10px;
+}
+.icon.s16 {
+ min-width: 16px;
+ height: 16px;
+}
+.icon.s16.notify {
+ background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+ background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+ background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+ background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+ background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+ background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+ background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+ background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+ background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+ padding: 4px 0px 0px 20px;
+ font-size: 10px;
+}
+.icon.s22 {
+ min-width: 22px;
+ height: 22px;
+}
+.icon.s22.notify {
+ background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+ background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+ background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+ background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+ background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+ background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+ background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+ background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+ background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+ padding: 10px 0px 0px 25px;
+ width: 200px;
+}
+.icon.s48 {
+ width: 48px;
+ height: 48px;
+}
+.icon.s48.notify {
+ background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+ background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+ background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+ background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+ background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+ background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+ background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+ background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+ background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+ background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+ list-style: none;
+ list-style-type: none;
+}
+
+.hide-comments-outer {
+ margin-left: 80px;
+ margin-bottom: 5px;
+ width: 484px;
+ border-bottom: 1px solid #BDCDD4;
+ border-top: 1px solid #BDCDD4;
+
+ padding: 8px;
+}
+
+/* global */
+body {
+ font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 12.5px;
+ background-color: #ffffff;
+ color: #2d2d2d;
+ margin: 50px auto auto;
+ display: table;
+}
+
+h4 {
+ font-size: 1.1em;
+}
+
+a {
+ color: #333333;
+ /* color: #3e3e8c; */
+ text-decoration: none;
+}
+a:hover {
+ /* color: blue; */
+ text-decoration: underline
+}
+
+.wall-item-name-link {
+/* float: left;*/
+}
+
+.wall-item-photo {
+ width: 48px;
+ height: 48px;
+ overflow: hidden;
+ display: block;
+}
+
+.left {
+ float: left;
+}
+.right {
+ float: right;
+}
+.hidden {
+ display: none;
+}
+.clear {
+ clear: both;
+}
+.fakelink {
+ color: #1872A2;
+ /* color: #3e3e8c; */
+ text-decoration: none;
+ cursor: pointer;
+}
+.fakelink:hover {
+ /* color: blue; */
+ /*color: #005c94; */
+ text-decoration: underline;
+}
+code {
+ font-family: Courier, monospace;
+ white-space: pre;
+ display: block;
+ overflow: auto;
+ border: 1px solid #444;
+ background: #EEE;
+ color: #444;
+ padding: 10px;
+ margin-top: 20px;
+}
+#panel {
+ position: absolute;
+ width: 12em;
+ background: #ffffff;
+ color: #2d2d2d;
+ margin: 0px;
+ padding: 1em;
+ list-style: none;
+ border: 3px solid #364e59;
+ z-index: 100000;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+ height: auto;
+ overflow: auto;
+ padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+ background: #EEE;
+}
+.tool .label {
+ float: left;
+}
+.tool .action {
+ float: right;
+}
+.tool a {
+ color: ##3F8FBA;
+}
+.tool a:hover {
+ text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+ background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+}
+div.jGrowl div.info {
+ background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+ color: #ffffff;
+ padding-left: 58px;
+}
+/* header */
+header {
+ position: fixed;
+ left: 0%;
+ right: 80%;
+ top: 0px;
+ margin: 0px;
+ padding: 0px;
+ width: 22%;
+ height: 32px;
+ background: #1872a2;
+ background-color: #1872a2;
+ z-index: 100;
+ border-bottom: 1px;
+ border-bottom-color: black;
+ border-bottom-style: inset;
+}
+header #site-location {
+ display: none;
+}
+header #banner {
+ overflow: hidden;
+ text-align: left;
+ width: 82%%;
+ margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ outline: none;
+ vertical-align: middle;
+}
+header #banner #logo-img {
+ height: 25px;
+ margin-top: 5px;
+}
+header #banner #logo-text {
+ font-size: 22px;
+ position: absolute;
+ top: 15%;
+}
+/* nav */
+nav {
+ width: 80%;
+ height: 32px;
+ position: fixed;
+ left: 22%;
+ top: 0px;
+ padding: 0px;
+ background: #1872a2;
+ color: #ffffff;
+ z-index: 99;
+ border-bottom: 1px;
+ border-bottom-color: black;
+ border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ outline: none;
+}
+nav #banner {
+ overflow: hidden;
+ /*text-align: center;*/
+ width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+ color: #ffffff;
+ text-decoration: none;
+ outline: none;
+ vertical-align: bottom;
+}
+nav #banner #logo-img {
+ height: 22px;
+ margin-top: 5px;
+}
+nav #banner #logo-text {
+ font-size: 22px;
+}
+nav #navbar{
+ }
+nav ul {
+ margin: 0px;
+ padding: 0px 20px;
+}
+nav ul li {
+ list-style: none;
+ margin: 0px;
+ /* padding: 1px 1px 3px 1px; */
+ float: left;
+}
+nav ul li .menu-popup {
+ left: 0px;
+ right: auto;
+}
+
+nav #logo-img {
+ height: 25px;
+ margin-top: 4px;
+ margin-left: 30px;
+}
+
+nav #logo-text {
+ font-size: 22px;
+ margin-top: 3px;
+ margin-right: 15px;
+}
+nav .nav-menu-search {
+ position: relative;
+
+ margin: 3px 17px;
+ margin-right: 0px;
+ height: 17px;
+ width: 180px;
+
+}
+
+nav #search-box #search-text {
+ background-image: url('icons/lupe.png');
+ background-repeat:no-repeat;
+ padding-left:20px;
+ }
+
+
+nav .nav-menu-icon {
+ position: relative;
+ height: 22px;
+ padding: 5px;
+ margin: 0px 5px;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+ background-color: #308dbf;
+ position: relative;
+ height: 22px;
+ padding: 5px;
+ margin: 0px 5px;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+ background-color: #fff;
+}
+nav .nav-menu-icon img {
+ width: 22px;
+ height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+ top: 3px;
+}
+nav .nav-menu {
+ position: relative;
+ height: 16px;
+ padding: 5px;
+ margin: 3px 15px 0px;
+ font-size: 13px;
+ /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+ /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+ display: none;
+ position: absolute;
+ background-color: #ff0000;
+ /* background-color: #19aeff; */
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ font-size: 10px;
+ font-weight: 900;
+ padding: 1px 4px;
+ top: 0px;
+ right: -6px;
+ min-width: 10px;
+ text-align: center;
+}
+nav .nav-notify.show {
+ display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu,
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+ float: right;
+}
+nav #nav-user-linkmenu{
+ margin-right: 0px;
+ }
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+ margin-left: 0px;
+ margin-right: 0px;
+ font-weight: bold;
+ margin: 3px 5px;
+ }
+nav #nav-directory-link{
+ margin-right: 0px;
+ }
+nav #nav-home-link{
+ margin-left: 0px;
+ }
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+ right: 0px;
+ left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+ background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+ }
+
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+ background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+ }
+
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+ background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+ }
+
+nav #nav-apps-link.selected {
+ background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+ /* padding: 1px 1px 2px 26px; */
+ /* border-bottom: 1px solid #364E59; */
+ /* margin: 0px 0px 2px 0px;
+ padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+ /* padding: 1px 1px 2px 26px; */
+ /* border-bottom: 1px solid #364E59; */
+ /* margin: 0px 0px 2px 0px;
+ padding: 5px 10px; */
+}
+
+.notify-seen {
+ background: none repeat scroll 0 0 #DDDDDD;
+ }
+
+ul.menu-popup {
+ position: absolute;
+ display: none;
+ width: 11em;
+ background: #ffffff;
+ color: #2d2d2d;
+ margin: 0px;
+ padding: 0px;
+ list-style: none;
+ z-index: 100000;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+ display: block;
+ color: #2d2d2d;
+ padding: 5px 10px;
+ text-decoration: none;
+}
+ul.menu-popup a:hover {
+ background-color: #14618a; /*bdcdd4;*/
+ color: #fff;
+}
+ul.menu-popup .menu-sep {
+ border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+ float: none;
+ overflow: auto;
+ height: auto;
+ display: block;
+}
+ul.menu-popup li img {
+ float: left;
+ width: 16px;
+ height: 16px;
+ padding-right: 5px;
+}
+ul.menu-popup .empty {
+ padding: 5px;
+ text-align: center;
+ color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+ max-height: 150px;
+ background-color: #ffffff;
+ color: #2d2d2d;
+ border: 1px solid #MenuBorder;
+ overflow: auto;
+ z-index: 100000;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+ color: #2d2d2d;
+ padding: 4px;
+ clear: left;
+}
+.acpopupitem img {
+ float: left;
+ margin-right: 4px;
+}
+.acpopupitem.selected {
+ background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+ width: 400px;
+ max-height: 550px;
+ overflow: auto;
+}
+/* #nav-notifications-menu a {
+ display: inline;
+ padding: 5px 0px;
+ margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+ background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+ float: left;
+ margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+ font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+ font-size: 10px;
+ color: #9eabb0;
+ display: block;
+}
+
+.notif-image {
+ width: 32px;
+ height: 32px;
+ padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+ margin-bottom: 30px;
+}
+#ps-usericon{
+ height: 25px
+ }
+#ps-username{
+ font-size: 1.17em;
+ font-weight: bold;
+ vertical-align: top;
+ position: absolute;
+ padding-top: 4px;
+ padding-left: 5px;
+ word-wrap: break-word;
+ width: 130px;
+ }
+#ps-username:hover{
+ text-decoration: none;
+ }
+.menu-profile-side{
+ list-style: none;
+ padding-left: 0px;
+ min-height: 0px;
+ }
+.menu-profile-list{
+ height: auto;
+ overflow: auto;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-left: 16px;
+ min-height: 16px;
+ list-style: none;
+ }
+.menu-profile-list:hover{
+ background: #EEE;
+ }
+.menu-profile-list-item{
+ padding-left: 5px;
+ }
+.menu-profile-list-item:hover{
+ text-decoration: none;
+ }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+ background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+ }
+.menu-profile-list.photos{
+ background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+ }
+.menu-profile-list.events{
+ background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+ }
+.menu-profile-list.notes{
+ background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+ }
+.menu-profile-list.foren{
+ background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+ }
+.menu-profile-list.com_side{
+ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+ }
+
+/* aside */
+aside {
+ display: table-cell;
+ vertical-align: top;
+ width: 160px;
+ padding: 0px 10px 0px 10px;
+ border-right: 1px solid #D2D2D2;
+ float: left;
+ /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+ font-size: 18px;
+ font-weight: bold;
+ margin-bottom: 5px;
+}
+aside .vcard .title {
+ margin-bottom: 5px;
+}
+aside .vcard dl {
+ height: auto;
+ overflow: auto;
+}
+aside .vcard dt {
+ float: left;
+ margin-left: 0px;
+ /*width: 35%;*/
+ text-align: right;
+ color: #999999;
+}
+aside .vcard dd {
+ float: left;
+ margin-left: 5px;
+ /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+ padding: 0px;
+ margin: 0px;
+}
+aside #profile-extra-links li {
+ padding: 0px;
+ margin: 0px;
+ list-style: none;
+}
+aside #dfrn-request-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+ text-decoration: none;
+ background-color: #36c;
+ /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+ width: 20em;
+}
+aside #search-text {
+ width: 150px;
+}
+aside #side-follow-url {
+ width: 150px;
+ }
+aside #side-peoplefind-url {
+ width: 150px;
+ }
+#contact-block {
+ overflow: auto;
+ height: auto;
+}
+#contact-block .contact-block-h4 {
+ float: left;
+ margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+ float: right;
+ margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+ clear: both;
+ overflow: auto;
+ height: auto;
+}
+#contact-block .contact-block-link {
+ float: left;
+ margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+ widht: 48px;
+ height: 48px;
+}
+#lost-password-link {
+ float: left;
+ margin-right: 20px;
+ }
+/* widget */
+.widget {
+ margin-bottom: 2em;
+ /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+ .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/* font-size: 12px; */
+}
+.widget h3 {
+ padding: 0px;
+ margin: 2px;
+}
+.widget .action {
+ opacity: 0.1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget input.action {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget:hover .title .action {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget .tool:hover .action.ticked {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.widget ul {
+ padding: 0px;
+}
+.widget ul li {
+ padding-left: 16px;
+ min-height: 16px;
+ list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+ margin-left: 30px;
+ padding-left: 0px;
+ }
+#side-bar-photos-albums ul li a{
+ color: #1872A2;
+}
+.widget .tool.selected {
+ background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+ width: 200px;
+ top: 18px;
+}
+/* section */
+section {
+ display: table-cell;
+ vertical-align: top;
+ width: 611px;
+ padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+ text-align: center;
+ margin-top: 25px;
+ font-size: 0px;
+ }
+
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
+#contact-edit-end {
+ }
+.pager {
+ padding: 10px;
+ text-align: center;
+ font-size: 1.0em;
+ clear: both;
+ display: block;
+}
+
+.tabs {
+
+ background-position: 0 -20px;
+ background-repeat: repeat-x;
+ height: 27px;
+ padding: 0;
+ }
+.tab.button {
+ margin-right: 5px;
+ margin-left: 5px;
+ /*background: none repeat scroll 0 0 #F8F8F8;*/
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ font-weight: normal;
+ padding: 3px;
+ color: #333333;
+ }
+
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+ margin-bottom: 10px;
+ }
+
+right_aside {
+ display: table-cell;
+ vertical-align: top;
+ width: 160px;
+ padding-right: 10px;
+ /*border-left: 1px solid #D2D2D2;*/
+
+ /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
+margin-top:30px;}
+right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto; width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+/* wall item */
+.tread-wrapper {
+ border-bottom: 1px solid #D2D2D2;
+ position: relative;
+ padding: 5px;
+ margin-bottom: 0px;
+ width: 575px;
+}
+.tread-wrapper a{
+ color: #1872A2;
+}
+
+.wall-item-decor {
+ position: absolute;
+ left: 790px;
+ top: -10px;
+ width: 16px;
+}
+
+.wall-item-container {
+ display: table;
+ width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+ display: table-row;
+}
+
+.wall-item-bottom {
+ font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/* opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/* opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+ display: table-cell;
+ vertical-align: top;
+ text-align: left;
+ width: 80px;
+}
+.wall-item-container .wall-item-location {
+ padding-right: 40px;
+ display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+ word-wrap: break-word;
+ width: 50px;
+ margin-left: 10px;
+ color: #999;
+}
+.wall-item-location {
+
+ clear: both;
+ overflow: hidden;
+
+ margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+ font-size: 12.5px;
+ max-width: 420px;
+ word-wrap: break-word;
+ line-height: 1.2;
+}
+
+.wall-item-container .wall-item-content img {
+ max-width: 400px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+ display: table-cell;
+ vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-name {
+ font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+ width: 100%;
+ margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+ float: left;
+ margin-bottom: 1px;
+ display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+ margin-right: 1em;
+}
+.wall-item-actions-social a {
+ float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+ float: right;
+ width: 80px;
+ display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+ float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+ float: right;
+}
+.wall-item-container.comment {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-left: 80px;
+ width: 500px;
+ border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+ width: 32px;
+ height: 32px;
+ margin-left: 16px;
+ /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+ top: 15px !important;
+ left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+ padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+ margin: 1px 5px 1px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+ display: none;
+}
+.wall-item-comment-wrapper textarea {
+ height: 2.0em;
+ width: 100%;
+ font-size: 10px;
+ color: #999999;
+ border: 1px solid #DDD;
+ padding: 0.3em;
+ font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+ font-size: 14px;
+ height: 4em;
+ color: #2d2d2d;
+ border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+ width: 710px;
+ border: 1px solid #2d2d2d;
+ margin-top: 10px;
+}
+.comment-edit-preview .contact-photo {
+ width: 32px;
+ height: 32px;
+ margin-left: 16px;
+ /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+ top: 15px !important;
+ left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+ padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+ width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+ width: 700px;
+ padding: 0;
+ margin: 10px 0;
+}
+
+.shiny {
+ /* border-right: 10px solid #fce94f; */
+ border-right: 1px solid #A7C7F7;
+ padding-right: 12px;
+}
+
+#jot-preview-content{
+ margin-top: 30px;}
+
+#jot-preview-content .tread-wrapper {
+ background-color: #fff797;
+}
+
+.wall-item-tags {
+ padding-top: 1px;
+ padding-bottom: 2px;
+}
+.tag {
+ /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+ color: #999;
+ padding-left: 3px;
+ font-size: 12px;
+}
+.tag a {
+ padding-right: 5px;
+ /*background: url("../../../images/tag.png") no-repeat center right;*/
+ color: #999;
+}
+.wwto {
+ position: absolute !important;
+ width: 25px;
+ height: 25px;
+ background: #FFFFFF;
+ border: 2px solid #364e59;
+ height: 25px;
+ width: 25px;
+ overflow: hidden;
+ padding: 1px;
+ position: absolute !important;
+ top: 40px;
+ left: 30px;
+ -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+ width: auto;
+ height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+ position: relative;
+ width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+ width: 25px;
+}
+
+.contact-photo {
+ width: 48px;
+ height: 48px;
+ overflow: hidden;
+ display: block;
+}
+.contact-photo img {
+ width: 48px;
+ height: 48px;
+}
+
+.contact-wrapper {
+ float: left;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper .contact-photo img {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper {
+ left: 0px;
+ top: 63px;
+}
+.contact-photo {
+ width: 48px;
+ height: 48px;
+}
+.contact-photo img {
+ width: 48px;
+ height: 48px;
+}
+.contact-name {
+ /* text-align: center; */
+ /*font-weight: bold;*/
+ font-size: 12px;
+}
+.contact-details {
+ color: #999999;
+}
+/* editor */
+.jothidden {
+ display: none;
+}
+#jot {
+ width: 585px;
+ margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+ height: 2.0em;
+ width: 99%;
+ font-size: 15px;
+ color: #999999;
+ border: 1px solid #DDD;
+ padding: 0.3em;
+ margin-bottom: 10px;
+}
+#jot #jot-tools {
+ margin: 0px;
+ padding: 0px;
+ height: 40px;
+ overflow: none;
+ width: 583px;
+ background-color: #fff;
+ border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+ list-style: none;
+ float: left;
+ width: 80px;
+ height: 40px;
+ border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+ display: block;
+ color: #cccccc;
+ width: 100%;
+ height: 40px;
+ text-align: center;
+ line-height: 40px;
+ overflow: hidden;
+}
+#jot #jot-tools li:hover {
+ background-color: #364e59;
+ border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+ float: right;
+ width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+ width: 30px;
+ border-left: 10px solid #cccccc;
+ background-color: #cccccc;
+ background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+ width: 30px;
+ border-left: 10px solid #666666;
+ background-color: #666666;
+}
+#jot #jot-tools li.submit {
+ float: right;
+ background-color: #cccccc;
+ border-bottom: 2px solid #cccccc;
+ border-right: 1px solid #666666;
+ border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+ border: 0px;
+ margin: 0px;
+ padding: 0px;
+ background-color: #cccccc;
+ color: #666666;
+ width: 80px;
+ height: 40px;
+ line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+ background-color: #bdcdd4;
+ color: #666666;
+}
+#jot #jot-tools li.loading {
+ float: right;
+ background-color: #ffffff;
+ width: 20px;
+ vertical-align: center;
+ text-align: center;
+ border-top: 2px solid #9eabb0;
+ height: 38px;
+}
+#jot #jot-tools li.loading img {
+ margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+
+ border-radius: 5px 5px 5px 5px;
+ font-weight: bold;
+ height: 20px;
+ margin: 0 0 5px;
+ width: 60%;
+ border: 1px solid #ffffff;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+ font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+ font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+ width: 585px;
+ height: 100px;
+ }
+#jot #jot-title:hover {
+ border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+ border: 1px solid #999999;
+}
+#jot #character-counter {
+ width: 80px;
+ float: right;
+ text-align: right;
+ height: 20px;
+ line-height: 20px;
+ padding-right: 20px;
+}
+#jot-perms-icon,
+#profile-location,
+#profile-nolocation,
+#profile-youtube,
+#profile-video,
+#profile-audio,
+#profile-link,
+#profile-title,
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+ cursor: pointer;
+ margin-top: 2px;
+}
+#profile-jot-wrapper{
+ margin: 0 2em 20px 0;
+ width: 585px;
+ }
+
+#profile-jot-submit-wrapper {
+ margin-bottom: 50px;
+ width: 585px;
+}
+
+#profile-jot-submit {
+ float: right;
+ margin-top: 2px;
+
+}
+#profile-upload-wrapper {
+ float: left;
+ margin-top: 2px;
+ margin-left: 10px;
+
+}
+#profile-attach-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-rotator {
+ float: left;
+ margin-left: 30px;
+ margin-top: 2px;
+}
+#profile-link-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-youtube-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-location-wrapper {
+ float: left;
+ margin-left: 15px;
+ margin-top: 2px;
+}
+#profile-jot-perms {
+ float: left;
+ margin-left: 45px;
+ margin-top: 2px;
+}
+#jot-preview-link {
+ float: right;
+ margin-left: 10px;
+ margin-top: 2px;
+ font-size: 10px;
+}
+#profile-jot-perms{
+ float: right;
+ margin-left: 10px;
+ margin-top: 2px;
+ }
+/** buttons **/
+.button.creation1 {
+ background-color: #fff;
+ border: 1px solid #777777;
+ background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+}
+.button.creation2 {
+ background-color: #1872A2;
+ background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+}
+/*input[type="submit"] {
+ border: 0px;
+ background-color: @ButtonBackgroundColor;
+ color: @ButtonColor;
+ padding: 0px 10px;
+ .rounded(5px);
+ height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+ display: block!important;
+}
+#acl-wrapper {
+ width: 690px;
+ float: left;
+}
+#acl-search {
+ float: right;
+ background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+ padding-right: 20px;
+}
+#acl-showall {
+ float: left;
+ display: block;
+ width: auto;
+ height: 18px;
+ background-color: #cccccc;
+ background-image: url("../../../images/show_all_off.png");
+ background-position: 7px 7px;
+ background-repeat: no-repeat;
+ padding: 7px 5px 0px 30px;
+ color: #999999;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+ color: #000000;
+ background-color: #ff9900;
+ background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+ height: 210px;
+ border: 1px solid #cccccc;
+ clear: both;
+ margin-top: 30px;
+ overflow: auto;
+}
+.acl-list-item {
+ display: block;
+ width: 150px;
+ height: 30px;
+ border: 1px solid #cccccc;
+ margin: 5px;
+ float: left;
+}
+.acl-list-item img {
+ width: 22px;
+ height: 22px;
+ float: left;
+ margin: 4px;
+}
+.acl-list-item p {
+ height: 12px;
+ font-size: 10px;
+ margin: 0px;
+ padding: 2px 0px 1px;
+ overflow: hidden;
+}
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
+ float: left;
+ color: #999999;
+ background-color: #cccccc;
+ background-position: 3px 3px;
+ background-repeat: no-repeat;
+ margin-right: 5px;
+ -webkit-border-radius: 2px ;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ padding-left: 15px;
+}
+#acl-wrapper a:hover {
+ text-decoration: none;
+ color: #000000;
+}
+.acl-button-show {
+ background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+ background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+ color: #000000;
+ background-color: #ff4141;
+ background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+ border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+ border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+ list-style-type: none;
+ padding-bottom: 10px;
+ font-size: 13px;
+}
+ul.tabs li {
+ float: left;
+ margin-left: 5px;
+}
+ul.tabs li .active {
+ background-color: #055580;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+ margin-bottom: 10px;
+ padding-bottom: 10px;
+ overflow: auto;
+ width: 100%;
+}
+.field label {
+ float: left;
+ width: 200px;
+}
+.field input, .field textarea {
+ width: 400px;
+}
+.field textarea {
+ height: 100px;
+}
+.field .field_help {
+ display: block;
+ margin-left: 200px;
+ color: #666666;
+}
+.field .onoff {
+ float: left;
+ width: 80px;
+}
+.field .onoff a {
+ display: block;
+ border: 1px solid #666666;
+ background-image: url("../../../images/onoff.jpg");
+ background-repeat: no-repeat;
+ padding: 4px 2px 2px 2px;
+ height: 16px;
+ text-decoration: none;
+}
+.field .onoff .off {
+ border-color: #666666;
+ padding-left: 40px;
+ background-position: left center;
+ background-color: #cccccc;
+ color: #666666;
+ text-align: right;
+}
+.field .onoff .on {
+ border-color: #204A87;
+ padding-right: 40px;
+ background-position: right center;
+ background-color: #D7E3F1;
+ color: #204A87;
+ text-align: left;
+}
+.field .hidden {
+ display: none!important;
+}
+.field.radio .field_help {
+ margin-left: 0px;
+}
+#directory-search-form{
+ margin-bottom: 50px;
+ }
+#profile-edit-links-end {
+ clear: both;
+ margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+ float: left;
+ list-style: none;
+ margin-left: 10px;
+}
+
+.profile-edit-side-div {
+ display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+ width: 300px; float: left;
+}
+
+.required {
+ display: inline;
+ color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+ height: auto;
+ overflow: auto;
+ border-bottom: 2px solid #cccccc;
+ padding-bottom: 1em;
+ margin-bottom: 1em;
+}
+.oauthapp img {
+ float: left;
+ width: 48px;
+ height: 48px;
+ margin: 10px;
+}
+.oauthapp img.noicon {
+ background-image: url("../../../images/icons/48/plugin.png");
+ background-position: center center;
+ background-repeat: no-repeat;
+}
+.oauthapp a {
+ float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+ width: 120px;
+ height: 120px;
+ float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.lframe {
+ float: left;
+ /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+ float: left;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+ width: 80px;
+ height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+ width: 80px;
+ height: 80px;
+}
+.profile-match-wrapper {
+ left: 0px;
+ top: 63px;
+}
+
+.contact-photo-menu-button {
+ position: relative;
+ background-image: url("../../../images/icons/16/menu.png");
+ background-position: top left;
+ background-repeat: no-repeat;
+ margin: 0px 0px -16px 0px;
+ padding: 0px;
+ width: 16px;
+ height: 16px;
+ top: -20px; left:0px;
+ overflow: hidden;
+ text-indent: 40px;
+ display: none;
+
+}
+.contact-photo-menu {
+ width: 11em;
+ border: 3px solid #364e59;
+ color: #2d2d2d;
+ background: #FFFFFF;
+/* position: absolute;*/
+ position: relative;
+ left: 0px; top: 0px;
+ display: none;
+ z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+ display: block;
+ padding: 5px 10px;
+ color: #2d2d2d;
+ text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+ background-color: #bdcdd4;
+}
+
+/* page footer */
+footer {
+ height: 100px;
+ display: table-row;
+}
+
+blockquote {
+ border-left: 1px solid #D2D2D2;
+ padding-left: 9px;
+ margin: 0 0 0 .8ex;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+ color: #666666;
+ margin: 15px 0 5px;
+ padding-left: 5px;
+ }
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+ width: 48px;
+ height: 48px;
+ padding-right: 3px;
+}
+.contact-block-div {
+ float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; }
+
+#group-edit-wrapper {
+ margin-bottom: 10px;
+}
+
+#group-members-end {
+ clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+ margin-bottom: 10px;
+ margin-top: 20px;
+}
+
+#prvmail-submit {
+ float: right;
+ margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;
+ }
+
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+ float: left;
+ margin-top: 10px;
+ margin-right: 10px;
+ width: 24px;
+}
+
+#prvmail-end {
+ clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+ float: left;
+}
+.mail-list-detail {
+ margin-left: 20px;
+}
+
+.mail-list-subject {
+ font-size: 1.1em;
+ margin-top: 10px;
+}
+a.mail-list-link {
+ display: block;
+ font-size: 1.3em;
+ padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+* background-color: #15607B;
+* color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-list-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+ border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+ float: left;
+}
+.mail-conv-detail {
+ margin-left: 20px;
+ width: 500px;
+}
+
+.mail-conv-subject {
+ font-size: 1.4em;
+ margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-conv-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+.mail-conv-break {
+ clear: both;
+}
+
+.mail-conv-delete-icon {
+ border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+ float: left;
+ font-size: 20px;
+}
+
+.vevent {
+ border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+.vevent .event-start {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#new-event-link {
+ margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+ float: left;
+ margin-top: 4px;
+ margin-right: 4px;
+ margin-bottom: 15px;
+}
+
+.event-description:before {
+ content: url('../../../images/calendar.png');
+ margin-right: 15px;
+}
+
+.event-start, .event-end {
+ margin-left: 10px;
+ width: 330px;
+ clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+ float: right;
+}
+
+.event-list-date {
+ margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+ float: left;
+ margin-left: 32px;
+ margin-right: 32px;
+ margin-top: 64px;
+}
+.event-calendar-end {
+ clear: both;
+}
+
+
+.calendar {
+ font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+ color: #1872A2;
+ }
+.today {
+ font-weight: bold;
+ color: #FF0000;
+}
+
+.settings-block {
+ border: 1px solid #AAA;
+ margin: 10px;
+ padding: 10px;
+}
+
+.app-title {
+ margin: 10px;
+}
+
+#identity-manage-desc {
+ margin-top:15px;
+ margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+ margin-bottom: 15px;
+}
+
+#identity-submit {
+ margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+ padding: 10px;
+ float: left;
+}
+.lightbox{
+ float: left;
+ }
+
+#photo-photo {
+ float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+ float: left;
+ margin-right: 5px;
+ margin-top: 30px;
+ }
+.comment-edit-text-empty {
+ margin: 10px 0 0;
+ width: 85%;
+}
+.comment-edit-photo {
+ margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+ clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+ display: block;
+ margin-top: 30px;
+ margin-left: 50px;
+ }
+
+.profile-match-photo {
+ float: left;
+ text-align: center;
+ width: 120px;
+}
+
+.profile-match-name {
+ float: left;
+ text-align: center;
+ width: 120px;
+ overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+ clear: both;
+}
+
+.profile-match-connect {
+ text-align: center;
+ font-weight: bold;
+}
+
+.profile-match-wrapper {
+ float: left;
+ padding: 10px;
+ width: 120px;
+ height: 120px;
+ scroll: auto;
+}
+#profile-match-wrapper-end {
+ clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+ position: relative;
+}
+.contact-photo {
+ width: 48px;
+ height: 48px;
+ overflow: hidden;
+ display: block;
+}
+.contact-photo img {
+ width: 48px;
+ height: 48px;
+}
+.contact-photo-menu-button {
+ display: none;
+ /* position: absolute; */
+ /* position: absolute; */
+ left: -2px;
+ top: -20px;
+}
+.contact-wrapper {
+ float: left;
+ width: 90px;
+ height: 90px;
+ margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper .contact-photo img {
+ width: 80px;
+ height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+ left: 0px;
+ top: 63px;
+}
+.directory-item {
+ float: left;
+ width: 200px;
+ height: 200px;
+}
+.directory-item .contact-photo {
+ width: 175px;
+ height: 175px;
+}
+.directory-item .contact-photo img {
+ width: 175px;
+ height: 175px;
+}
+.contact-name {
+ text-align: left;
+ font-weight: bold;
+ font-size: 12px;
+}
+.contact-details {
+ color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+ margin-left: 30px;
+ padding-left: 0px;
+ }
+#side-bar-photos-albums{
+ margin-top: 15px;
+ }
+.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-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: #000;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding-bottom: 20px;
+ position: relative;
+ margin: 0 10px 10px 0;
+ width: 200px; height: 140px;
+ overflow: hidden;
+}
+.photo-top-album-name {
+ width: 100%;
+ position: absolute;
+ bottom: 0px;
+ padding-left: 3px;
+ background-color: #EEE;
+}
+.photo-top-album-link{
+ color: #1872A2;
+ }
+.photo-top-album-img{
+
+ }
+/*.photo-top-image-wrapper {
+ position: relative;
+ float: left;
+ margin-top: 15px;
+ margin-right: 15px;
+ width: 200px; height: 200px;
+ overflow: hidden;
+}
+.photo-top-album-name {
+ width: 100%;
+ min-height: 2em;
+ position: absolute;
+ bottom: 0px;
+ padding: 0px 3px;
+ padding-top: 0.5em;
+ background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+ clear: both;
+}
+
+#photo-top-links {
+ margin-bottom: 30px;
+ margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+ float: left;
+ width: 175px;
+}
+
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index d3d3d9eb7..65a019dbf 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -178,8 +178,8 @@
.icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
.icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
-.prev { background-position: -90px -60px;}
-.next { background-position: -110px -60px;}
+.icon.prev { background-image: url("../../../view/theme/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next { background-image: url("../../../view/theme/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
/*.tagged { background-position: -130px -60px;}*/
.attachtype {
@@ -387,15 +387,13 @@
margin-bottom: 5px;
width: 684px;
border-bottom: 1px solid #BDCDD4;
- border-top: 1px solid #BDCDD4;
-
padding: 8px;
}
/* global */
body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
+ font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
@@ -887,6 +885,8 @@ ul.menu-popup .empty {
position: absolute;
padding-top: 4px;
padding-left: 5px;
+ word-wrap: break-word;
+ width: 130px;
}
#ps-username:hover{
text-decoration: none;
@@ -933,6 +933,9 @@ ul.menu-popup .empty {
.menu-profile-list.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
}
+.menu-profile-list.pscontacts{
+ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+ }
/* aside */
aside {
display: table-cell;
@@ -1235,10 +1238,10 @@ body .pageheader{
}
.wall-item-container .wall-item-content {
- font-size: 13px;
+ font-size: 12.5px;
max-width: 720px;
word-wrap: break-word;
- line-height: 1.4;
+ line-height: 1.2;
}
.wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index f9128ea1f..e12d940aa 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -7,118 +7,254 @@
* Author:
*/
-$a->theme_info = array(
- 'extends' => 'diabook',
-);
-//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
+//change css on network and profilepages
+$cssFile = null;
-//profile_side
-$nav['usermenu']=array();
-$userinfo = null;
+/**
+ * prints last community activity
+ */
+function diabook_blue_community_info(){
+ $a = get_app();
+ //right_aside at networkpages
+
+ // last 12 users
+ $aside['$lastusers_title'] = t('Last users');
+ $aside['$lastusers_items'] = array();
+ $sql_extra = "";
+ $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
+ $order = " ORDER BY `register_date` DESC ";
-if(local_user()) {
+ $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+ FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
+ WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+ 0,
+ 9
+ );
+ $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+ if(count($r)) {
+ $photo = 'thumb';
+ foreach($r as $rr) {
+ $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+ $entry = replace_macros($tpl,array(
+ '$id' => $rr['id'],
+ '$profile-link' => $profile_link,
+ '$photo' => $rr[$photo],
+ '$alt-text' => $rr['name'],
+ ));
+ $aside['$lastusers_items'][] = $entry;
+ }
+ }
+
+ // last 10 liked items
+ $aside['$like_title'] = t('Last likes');
+ $aside['$like_items'] = array();
+ $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
+ (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link`
+ FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
+ INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri`
+ WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
+ GROUP BY `uri`
+ ORDER BY `T1`.`created` DESC
+ LIMIT 0,5",
+ $a->get_baseurl(),$a->get_baseurl()
+ );
+ foreach ($r as $rr) {
+ $author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
+ $objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
+
+ //var_dump($rr['verb'],$rr['object-type']); killme();
+ switch($rr['verb']){
+ case 'http://activitystrea.ms/schema/1.0/post':
+ switch ($rr['object-type']){
+ case 'http://activitystrea.ms/schema/1.0/event':
+ $post_type = t('event');
+ break;
+ default:
+ $post_type = t('status');
+ }
+ break;
+ default:
+ if ($rr['resource-id']){
+ $post_type = t('photo');
+ $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
+ $rr['plink'] = $m[1];
+ } else {
+ $post_type = t('status');
+ }
+ }
+ $plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+ $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-$userinfo = array(
- 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
- 'name' => $a->user['username'],
- );
+ }
-$ps['usermenu'][status] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-$ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
-$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
-
-if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
-$tpl = get_markup_template('profile_side.tpl');
-
-$a->page['aside'] .= replace_macros($tpl, array(
- '$userinfo' => $userinfo,
- '$ps' => $ps,
- ));
-}
-}
+
+ // last 12 photos
+ $aside['$photos_title'] = t('Last photos');
+ $aside['$photos_items'] = array();
+ $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM
+ (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo`
+ WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
+ AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
+ INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
+ `user`
+ WHERE `user`.`uid` = `photo`.`uid`
+ AND `user`.`blockwall`=0
+ AND `user`.`hidewall`=0
+ ORDER BY `photo`.`edited` DESC
+ LIMIT 0, 9",
+ dbesc(t('Contact Photos')),
+ dbesc(t('Profile Photos'))
+ );
+ if(count($r)) {
+ $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+ foreach($r as $rr) {
+ $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
+ $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
+
+ $entry = replace_macros($tpl,array(
+ '$id' => $rr['id'],
+ '$profile-link' => $photo_page,
+ '$photo' => $photo_url,
+ '$alt-text' => $rr['username']." : ".$rr['desc'],
+ ));
-//js scripts
-$a->page['htmlhead'] .= <<< EOT
+ $aside['$photos_items'][] = $entry;
+ }
+ }
+
+ $fostitJS = "javascript: (function() {
+ the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+ if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
+ else {a_funct()}})()" ;
+
+ $aside['$fostitJS'] = $fostitJS;
+
+ //nav FIND FRIENDS
+ if(local_user()) {
+ $nv = array();
+ $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['match'] = Array('match', t('Similar Interests'), "", "");
+ $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+ $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+
+ $aside['$nv'] = $nv;
+ };
+ //Community Page
+ $page = '<div id="page-sidebar-right_aside" class="widget">
+ <div class="title tool">
+ <h3>'.t("Community Pages").'</h3></div>
+ <div id="sidebar-page-list"><ul>';
-<script>
+ $pagelist = array();
-//contacts
-$('html').click(function() {
- $('#nav-contacts-linkmenu').removeClass('selected');
- document.getElementById( "nav-contacts-menu" ).style.display = "none";
- });
-
- $('#nav-contacts-linkmenu').click(function(event){
- event.stopPropagation();
- });
+ $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+ WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+ intval($a->user['uid'])
+ );
-//messages
-$('html').click(function() {
- $('#nav-messages-linkmenu').removeClass('selected');
- document.getElementById( "nav-messages-menu" ).style.display = "none";
- });
+ $pageD = array();
- $('#nav-messages-linkmenu').click(function(event){
- event.stopPropagation();
- });
+ // Look if the profile is a community page
+ foreach($contacts as $contact) {
+ $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+ };
+
-//notifications
-$('html').click(function() {
- $('#nav-notifications-linkmenu').removeClass('selected');
- document.getElementById( "nav-notifications-menu" ).style.display = "none";
- });
+ $contacts = $pageD;
- $('#nav-notifications-linkmenu').click(function(event){
- event.stopPropagation();
- });
+ foreach($contacts as $contact) {
+ $page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+ $contact["name"]."</a></li>";
+ }
+ $page .= '</ul></div></div>';
+ if (sizeof($contacts) > 0)
+
+ $aside['$page'] = $page;
+
+ //END Community Page
+
+
+
+ $url = $a->get_baseurl($ssl_state);
+ $aside['$url'] = $url;
-//usermenu
-$('html').click(function() {
- $('#nav-user-linkmenu').removeClass('selected');
- document.getElementById( "nav-user-menu" ).style.display = "none";
- });
+ $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+ $a->page['right_aside'] = replace_macros($tpl, $aside);
+
+}
- $('#nav-user-linkmenu').click(function(event){
- event.stopPropagation();
- });
-
- //settingsmenu
- $('html').click(function() {
- $('#nav-site-linkmenu').removeClass('selected');
- document.getElementById( "nav-site-menu" ).style.display = "none";
- });
- $('#nav-site-linkmenu').click(function(event){
- event.stopPropagation();
- });
- //appsmenu
- $('html').click(function() {
- $('#nav-apps-link').removeClass('selected');
- document.getElementById( "nav-apps-menu" ).style.display = "none";
- });
+//profile_side at networkpages
+if ($a->argv[0] === "network" && local_user()){
- $('#nav-apps-link').click(function(event){
- event.stopPropagation();
- });
-
+ // USER MENU
+ if(local_user()) {
+
+ $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+
+ $userinfo = array(
+ 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+ 'name' => $a->user['username'],
+ );
+ $ps = array('usermenu'=>array());
+ $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+ $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+ $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));
+ $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+ $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
+ $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+ $ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
+ $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Public Groups'), "", "");
+ $tpl = get_markup_template('profile_side.tpl');
- $(document).ready(function() {
- $("a.fancy-photo").fancybox(); // Select all links with lightbox class
- $("a.fancy-album").fancybox();
-});
+ $a->page['aside'] .= replace_macros($tpl, array(
+ '$userinfo' => $userinfo,
+ '$ps' => $ps,
+ ));
+ }
+
+ // COMMUNITY
+ diabook_blue_community_info();
+
+ // CUSTOM CSS
+ $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
+
+}
-
+
+//right_aside at profile pages
+if ($a->argv[0] === "profile"){
+
+ // COMMUNITY
+ diabook_blue_community_info();
+
+ // CUSTOM CSS
+ $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
+
+}
+
+
+// custom css
+if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+
+//js scripts
+
+$a->page['htmlhead'] .= <<< EOT
+
+<script>
+ $(function() {
+ $('a.lightbox').fancybox(); // Select all links with lightbox class
+ });
</script>
EOT;
+
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index 20d24702b..123834064 100644
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
- {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index e02e5a8be..c5b6b36b5 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
- {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 944aec2dd..7e50423ce 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -1,13 +1,45 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">Help or @NewHere ?</h3>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3>Connectable Services</h3>
+<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+
+{{ if $nv }}
+<h3>Find Friends</h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>
+{{ endif }}
+
{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or #NewHere?</h3>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; color:#000;" title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; color:#000;" title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; color:#000;" target="blank">NewHere</a>
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
{{ endif }}
{{ if $lastusers_title }}
<h3>$lastusers_title</h3>
-<div class='items-wrapper'>
+<div id='lastusers-wrapper' class='items-wrapper'>
{{ for $lastusers_items as $i }}
$i
{{ endfor }}
@@ -25,19 +57,18 @@
{{ if $photos_title }}
<h3>$photos_title</h3>
-<div class='items-wrapper'>
+<div id='ra-photos-wrapper' class='items-wrapper'>
{{ for $photos_items as $i }}
$i
{{ endfor }}
</div>
{{ endif }}
-
{{ if $like_title }}
<h3>$like_title</h3>
<ul id='likes'>
{{ for $like_items as $i }}
- <li>$i</li>
+ <li id='ra-photos-wrapper'>$i</li>
{{ endfor }}
</ul>
{{ endif }}
diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook/fpostit/README
@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
new file mode 100755
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook/fpostit/fpostit.js
@@ -0,0 +1,6 @@
+javascript: (function() {
+ the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+ if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
+ else {a_funct()}})()" \ No newline at end of file
diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
new file mode 100644
index 000000000..65c43a2b9
--- /dev/null
+++ b/view/theme/diabook/fpostit/fpostit.php
@@ -0,0 +1,135 @@
+<?php
+if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+ setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
+ setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+ <style>
+ body {
+ font-family: arial, Helvetica,sans-serif;
+ margin: 0px;
+ }
+ .wrap1 {
+ padding: 2px 5px;
+ background-color: #000;
+ margin-bottom: 10px;
+ }
+ .wrap2 {
+ margin-left: 10px;
+ font-size: 12px;
+ }
+ .logo {
+ margin-left: 3px;
+ margin-right: 5px;
+ float: left;
+ }
+ h2 {
+ color: #ffffff;
+ }
+ .error {
+ background-color: #FFFF66;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+ </style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+ $title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+ $text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+ $url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+ $content = "$title\nsource:$url\n\n$text";
+} else {
+ $content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+
+ if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+ $acctname = $_POST["friendika_acct_name"];
+ $tmp_account_array = explode("@", $acctname);
+ if (isset($tmp_account_array[1])) {
+ $username = $tmp_account_array[0];
+ $hostname = $tmp_account_array[1];
+ }
+ $password = $_POST["friendika_password"];
+ $content = $_POST["content"];
+
+ $url = "http://" . $hostname . '/api/statuses/update';
+ $data = array('status' => $content);
+
+ // echo "posting to: $url<br/>";
+
+ $c = curl_init();
+ curl_setopt($c, CURLOPT_URL, $url);
+ curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+ curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+ curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+ $c_result = curl_exec($c);
+ if(curl_errno($c)){
+ $error = curl_error($c);
+ showForm($error, $content);
+ }
+
+ curl_close($c);
+ if (!isset($error)) {
+ echo '<script language="javascript" type="text/javascript">window.close();</script>';
+ }
+
+ } else {
+ $error = "Missing account name and/or password...try again please";
+ showForm($error, $content);
+ }
+
+} else {
+ showForm(null, $content);
+}
+
+function showForm($error, $content) {
+ $username_cookie = $_COOKIE['username'];
+ $password_cookie = $_COOKIE['password'];
+
+ echo <<<EOF
+ <div class='wrap1'>
+ <h2><img class='logo' src='friendika-32.png' align='middle';/>
+ Friendika Bookmarklet</h2>
+ </div>
+
+ <div class="wrap2">
+ <form method="post" action="{$_SERVER['PHP_SELF']}">
+ Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
+ Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+ <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+ <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
+ </form>
+ <p></p>
+ </div>
+EOF;
+
+}
+?>
+
+</body>
+</html> \ No newline at end of file
diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/diabook/fpostit/friendika-32.png
Binary files differ
diff --git a/view/theme/diabook/icons/StatusNet.png b/view/theme/diabook/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook/icons/StatusNet.png
Binary files differ
diff --git a/view/theme/diabook/icons/email.png b/view/theme/diabook/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook/icons/email.png
Binary files differ
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
new file mode 100755
index 000000000..a46e88ea5
--- /dev/null
+++ b/view/theme/diabook/icons/expand.png
Binary files differ
diff --git a/view/theme/diabook/icons/facebook.png b/view/theme/diabook/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook/icons/facebook.png
Binary files differ
diff --git a/view/theme/diabook/icons/livejournal.png b/view/theme/diabook/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook/icons/livejournal.png
Binary files differ
diff --git a/view/theme/diabook/icons/posterous.png b/view/theme/diabook/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook/icons/posterous.png
Binary files differ
diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook/icons/pscontacts.png
Binary files differ
diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index acf857f32..6d9539610 100644
--- a/view/theme/diabook/icons/pubgroups.png
+++ b/view/theme/diabook/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook/icons/tumblr.png b/view/theme/diabook/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook/icons/tumblr.png
Binary files differ
diff --git a/view/theme/diabook/icons/twitter.png b/view/theme/diabook/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook/icons/twitter.png
Binary files differ
diff --git a/view/theme/diabook/icons/wordpress.png b/view/theme/diabook/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook/icons/wordpress.png
Binary files differ
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 0fa8a27fd..fc949639e 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -9,6 +9,7 @@
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+ <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
diff --git a/view/theme/diabook/screenshot.png b/view/theme/diabook/screenshot.png
new file mode 100644
index 000000000..2826f4261
--- /dev/null
+++ b/view/theme/diabook/screenshot.png
Binary files differ
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index f0cf04d65..20c273ec3 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -111,6 +111,7 @@
.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");}
+
.camera { background-image: url("../../../view/theme/diabook/icons/camera.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
@@ -395,7 +396,7 @@
/* global */
body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
+ font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
@@ -877,6 +878,8 @@ ul.menu-popup .empty {
padding-top: 4px;
padding-left: 5px;
color: #2D2D2D;
+ word-wrap: break-word;
+ width: 130px;
}
#ps-username:hover{
text-decoration: none;
@@ -923,6 +926,9 @@ ul.menu-popup .empty {
.menu-profile-list.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
}
+.menu-profile-list.pscontacts{
+ background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+ }
/* aside */
aside {
@@ -934,6 +940,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
+aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
@@ -1161,7 +1168,16 @@ right_aside .directory-item { width: 50px; height: 50px; vertical-align: center;
right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px solid #D2D2D2;}
+right_aside .items-wrapper{ overflow: auto; width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+.icon.expand {
+ background-image: url("../../../view/theme/diabook/icons/expand.png");
+ float: right;
+ cursor: pointer;
+ }
/* wall item */
.tread-wrapper {
@@ -1187,6 +1203,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
+
.wall-item-bottom {
font-size: 13px;
}
@@ -1231,14 +1248,14 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
}
.wall-item-container .wall-item-content {
- font-size: 13px;
- max-width: 720px;
+ font-size: 12.5px;
+ max-width: 420px;
word-wrap: break-word;
- line-height: 1.4;
+ line-height: 1.2;
}
.wall-item-container .wall-item-content img {
- max-width: 700px;
+ max-width: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index f0cf04d65..0f05bf6c1 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -395,7 +395,7 @@
/* global */
body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
+ font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
@@ -877,6 +877,8 @@ ul.menu-popup .empty {
padding-top: 4px;
padding-left: 5px;
color: #2D2D2D;
+ word-wrap: break-word;
+ width: 130px;
}
#ps-username:hover{
text-decoration: none;
@@ -1018,8 +1020,8 @@ aside #side-peoplefind-url {
margin: 0px 2px 2px 0px;
}
#contact-block .contact-block-link img {
- widht: 55px;
- height: 55px;
+ widht: 48px;
+ height: 48px;
}
#lost-password-link {
float: left;
@@ -1096,7 +1098,7 @@ aside #side-peoplefind-url {
section {
display: table-cell;
vertical-align: top;
- width: auto;
+ width: 610px;
padding: 0px 0px 0px 12px;
}
@@ -1161,8 +1163,11 @@ right_aside .directory-item { width: 50px; height: 50px; vertical-align: center;
right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px solid #D2D2D2;}
-
+right_aside .items-wrapper{ overflow: auto; width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
@@ -1187,6 +1192,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
+
.wall-item-bottom {
font-size: 13px;
}
@@ -1231,14 +1237,14 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
}
.wall-item-container .wall-item-content {
- font-size: 13px;
- max-width: 720px;
+ font-size: 12.5px;
+ max-width: 420px;
word-wrap: break-word;
- line-height: 1.4;
+ line-height: 1.2;
}
.wall-item-container .wall-item-content img {
- max-width: 700px;
+ max-width: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
@@ -2026,8 +2032,8 @@ box-shadow: 1px 1px 5px 0;
/* ================== */
.contact-block-img {
- width: 55px;
- height: 55px;
+ width: 48px;
+ height: 48px;
padding-right: 3px;
}
.contact-block-div {
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index ffab5b4c4..5154459d3 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -394,7 +394,7 @@
/* global */
body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
+ font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
@@ -876,6 +876,8 @@ ul.menu-popup .empty {
padding-top: 4px;
padding-left: 5px;
color: #2D2D2D;
+ word-wrap: break-word;
+ width: 130px;
}
#ps-username:hover{
text-decoration: none;
@@ -1212,10 +1214,10 @@ body .pageheader{
}
.wall-item-container .wall-item-content {
- font-size: 13px;
+ font-size: 12.5px;
max-width: 720px;
word-wrap: break-word;
- line-height: 1.4;
+ line-height: 1.2;
}
.wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index b487b8f88..6eb623d95 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,9 +7,6 @@
* Author:
*/
-$a->theme_info = array(
- 'extends' => 'diabook',
-);
//change css on network and profilepages
$cssFile = null;
@@ -18,6 +15,9 @@ $cssFile = null;
/**
* prints last community activity
*/
+
+
+
function diabook_community_info(){
$a = get_app();
//right_aside at networkpages
@@ -33,7 +33,7 @@ function diabook_community_info(){
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
0,
- 12
+ 9
);
$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
if(count($r)) {
@@ -61,7 +61,7 @@ function diabook_community_info(){
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri`
ORDER BY `T1`.`created` DESC
- LIMIT 0,10",
+ LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl()
);
@@ -109,7 +109,7 @@ function diabook_community_info(){
AND `user`.`blockwall`=0
AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC
- LIMIT 0, 12",
+ LIMIT 0, 9",
dbesc(t('Contact Photos')),
dbesc(t('Profile Photos'))
);
@@ -130,15 +130,74 @@ function diabook_community_info(){
}
}
+ $fostitJS = "javascript: (function() {
+ the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+ if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
+ else {a_funct()}})()" ;
+
+ $aside['$fostitJS'] = $fostitJS;
+
+ //right_aside FIND FRIENDS
+ if(local_user()) {
+ $nv = array();
+ $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['match'] = Array('match', t('Similar Interests'), "", "");
+ $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+ $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+
+ $aside['$nv'] = $nv;
+ };
+
+ //Community Page
+ $page = '<div id="page-sidebar-right_aside" class="widget">
+ <div class="title tool">
+ <h3>'.t("Community Pages").'</h3></div>
+ <div id="sidebar-page-list"><ul>';
+
+ $pagelist = array();
+
+ $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+ WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+ intval($a->user['uid'])
+ );
+
+ $pageD = array();
+
+ // Look if the profile is a community page
+ foreach($contacts as $contact) {
+ $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+ };
+
+
+ $contacts = $pageD;
+
+ foreach($contacts as $contact) {
+ $page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+ $contact["name"]."</a></li>";
+ }
+ $page .= '</ul></div></div>';
+ if (sizeof($contacts) > 0)
+
+ $aside['$page'] = $page;
+ //END Community Page
+
+
+ $url = $a->get_baseurl($ssl_state);
+ $aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
$a->page['right_aside'] = replace_macros($tpl, $aside);
+
+
+
}
//profile_side at networkpages
-if ($a->argv[0] === "network"){
+if ($a->argv[0] === "network" && local_user()){
// USER MENU
if(local_user()) {
@@ -152,11 +211,12 @@ if ($a->argv[0] === "network"){
$ps = array('usermenu'=>array());
$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+ $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));
$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
- $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Public Groups'), "", "");
+ $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Public Groups'), "", "");
$tpl = get_markup_template('profile_side.tpl');
@@ -200,6 +260,7 @@ $a->page['htmlhead'] .= <<< EOT
$(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class
});
+
</script>
EOT;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 20d24702b..123834064 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
- {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index e02e5a8be..c5b6b36b5 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
- {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
new file mode 100644
index 000000000..dfc0467f7
--- /dev/null
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -0,0 +1,9 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;">
+<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span>
+</div>
+{{ endif }}
diff --git a/view/theme/dispy-dark/experimental b/view/theme/dispy-dark/experimental
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/dispy-dark/experimental
+++ /dev/null
diff --git a/view/theme/dispy-dark/fpostit/README b/view/theme/dispy-dark/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/README
@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/dispy-dark/fpostit/fpostit.js b/view/theme/dispy-dark/fpostit/fpostit.js
new file mode 100755
index 000000000..eb593d838
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/fpostit.js
@@ -0,0 +1,14 @@
+javascript: (function() {
+ the_url = 'view/theme/dispy-dark/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
+ encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
+ document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
+ location.href = the_url
+ };
+ if (/Firefox/.test(navigator.userAgent)) {
+ setTimeout(a_funct, 0)
+ } else {
+ a_funct();
+ }
+ })();"
diff --git a/view/theme/dispy-dark/fpostit/fpostit.php b/view/theme/dispy-dark/fpostit/fpostit.php
new file mode 100644
index 000000000..d00182946
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/fpostit.php
@@ -0,0 +1,134 @@
+<?php
+if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
+ setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+ <style>
+ body {
+ font-family: sans-serif;
+ margin: 0px;
+ }
+ .wrap1 {
+ padding: 2px 5px;
+ background-color: #000;
+ margin-bottom: 10px;
+ }
+ .wrap2 {
+ margin-left: 10px;
+ font-size: 12px;
+ }
+ .logo {
+ margin-left: 3px;
+ margin-right: 5px;
+ float: left;
+ }
+ h2 {
+ color: #ffffff;
+ }
+ .error {
+ background-color: #FFFF66;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+ </style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+ $title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+ $text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+ $url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+ $content = "$title\nsource:$url\n\n$text";
+} else {
+ $content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+
+ if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ $acctname = $_POST["friendica_acct_name"];
+ $tmp_account_array = explode("@", $acctname);
+ if (isset($tmp_account_array[1])) {
+ $username = $tmp_account_array[0];
+ $hostname = $tmp_account_array[1];
+ }
+ $password = $_POST["friendica_password"];
+ $content = $_POST["content"];
+
+ $url = "http://" . $hostname . '/api/statuses/update';
+ $data = array('status' => $content);
+
+ // echo "posting to: $url<br/>";
+
+ $c = curl_init();
+ curl_setopt($c, CURLOPT_URL, $url);
+ curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+ curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+ curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+ $c_result = curl_exec($c);
+ if(curl_errno($c)){
+ $error = curl_error($c);
+ showForm($error, $content);
+ }
+
+ curl_close($c);
+ if (!isset($error)) {
+ echo '<script language="javascript" type="text/javascript">window.close();</script>';
+ }
+
+ } else {
+ $error = "Missing account name and/or password. Please try again.";
+ showForm($error, $content);
+ }
+
+} else {
+ showForm(null, $content);
+}
+
+function showForm($error, $content) {
+ $username_cookie = $_COOKIE['username'];
+ $password_cookie = $_COOKIE['password'];
+
+ echo <<<EOF
+ <div class="wrap1">
+ <h2><img class="logo" src="friendica-32.png" align="middle" />Friendica Bookmarklet</h2>
+ </div>
+
+ <div class="wrap2">
+ <form method="post" action="{$_SERVER['PHP_SELF']}">
+ Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)<br /><br />
+ Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50" /><br />
+ Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50" /><br />
+ <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+ <input type="submit" value="PostIt!" name="submit" />&#160;&#160;<span class="error">$error</span>
+ </form>
+ <p></p>
+ </div>
+EOF;
+
+}
+?>
+
+</body>
+</html>
diff --git a/view/theme/dispy-dark/fpostit/friendica-32.png b/view/theme/dispy-dark/fpostit/friendica-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/friendica-32.png
Binary files differ
diff --git a/view/theme/dispy-dark/fpostit/friendika-32.png b/view/theme/dispy-dark/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/friendika-32.png
Binary files differ
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
index 648811373..203568135 100644
--- a/view/theme/dispy-dark/icons.png
+++ b/view/theme/dispy-dark/icons.png
Binary files differ
diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg
index 10f8cc667..2c4b3abd3 100644
--- a/view/theme/dispy-dark/icons.svg
+++ b/view/theme/dispy-dark/icons.svg
@@ -51,9 +51,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1.3859292"
- inkscape:cx="105.02551"
- inkscape:cy="107.90767"
+ inkscape:zoom="1.9403009"
+ inkscape:cx="95.950174"
+ inkscape:cy="115.58345"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -63,7 +63,7 @@
inkscape:window-width="1065"
inkscape:window-height="742"
inkscape:window-x="40"
- inkscape:window-y="61"
+ inkscape:window-y="50"
inkscape:window-maximized="0"
width="0px"
height="0px"
@@ -330,7 +330,7 @@
sodipodi:cy="33.612183"
sodipodi:rx="7.3214288"
sodipodi:ry="7.3214288"
- d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+ d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
transform="matrix(0.43114968,0,0,0.43114968,-201.51175,889.48158)" />
<rect
style="fill:#2e2f2e;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -380,7 +380,7 @@
transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)" />
<path
transform="matrix(0.43114968,0,0,0.43114968,-179.51175,889.48158)"
- d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+ d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
sodipodi:ry="7.3214288"
sodipodi:rx="7.3214288"
sodipodi:cy="33.612183"
@@ -450,7 +450,7 @@
id="path4110" />
<path
transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-436.65386,-211.76762)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -466,11 +466,11 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-261.29289,65.614849)" />
<path
transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-291.03317,15.446827)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -492,7 +492,7 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-346.37171,-55.312424)" />
<path
inkscape:connector-curvature="0"
@@ -510,7 +510,7 @@
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
- style="fill:#999999;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
id="rect4387-8"
width="14.5"
height="9"
@@ -523,7 +523,7 @@
inkscape:export-ydpi="90" />
<path
sodipodi:type="arc"
- style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+ style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
id="path4391-3"
sodipodi:cx="408.8125"
sodipodi:cy="220.26843"
@@ -1006,7 +1006,7 @@
ry="0.42804927"
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
<rect
- style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
id="rect4290"
width="3.5355339"
height="1.8561553"
@@ -1047,7 +1047,7 @@
sodipodi:cy="220.62782"
sodipodi:rx="7.4246211"
sodipodi:ry="7.4246211"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+ d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
transform="translate(-204.73743,661.76269)" />
<path
inkscape:export-ydpi="90"
@@ -1559,7 +1559,7 @@
sodipodi:cy="143.46553"
sodipodi:rx="5.5219707"
sodipodi:ry="5.2590199"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
sodipodi:start="3.1415927"
sodipodi:end="6.2831853" />
@@ -1567,7 +1567,7 @@
sodipodi:end="6.2831853"
sodipodi:start="3.1415927"
transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
sodipodi:ry="5.2590199"
sodipodi:rx="5.5219707"
sodipodi:cy="143.46553"
@@ -1579,7 +1579,7 @@
sodipodi:end="6.2831853"
sodipodi:start="3.1415927"
transform="matrix(1.2380952,0,0,1.675,6.476807,759.33575)"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
sodipodi:ry="5.2590199"
sodipodi:rx="5.5219707"
sodipodi:cy="143.46553"
@@ -1595,7 +1595,7 @@
sodipodi:cy="143.46553"
sodipodi:rx="5.5219707"
sodipodi:ry="5.2590199"
- d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+ d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
transform="matrix(0.4523809,0,0,0.775,51.234821,888.45473)"
sodipodi:start="3.1415927"
sodipodi:end="6.2831853" />
@@ -1655,7 +1655,7 @@
sodipodi:cy="194.45924"
sodipodi:rx="2.0660436"
sodipodi:ry="1.5964882"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)" />
<use
x="0"
@@ -1675,7 +1675,7 @@
height="200" />
<path
transform="matrix(0.93050058,0,0,0.90640134,6.0478791,864.58985)"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
sodipodi:ry="1.5964882"
sodipodi:rx="2.0660436"
sodipodi:cy="194.45924"
@@ -1727,7 +1727,7 @@
sodipodi:nodetypes="cc" />
<path
transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
sodipodi:ry="1.5964882"
sodipodi:rx="2.0660436"
sodipodi:cy="194.45924"
@@ -1761,7 +1761,7 @@
sodipodi:cy="194.45924"
sodipodi:rx="2.0660436"
sodipodi:ry="1.5964882"
- d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+ d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
transform="matrix(0.93050058,0,0,0.90640134,28.047879,864.58985)" />
<path
transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
@@ -1992,11 +1992,11 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-621.38007,-53.76762)" />
<path
transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-446.0191,223.61485)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -2012,7 +2012,7 @@
sodipodi:cy="21.754047"
sodipodi:rx="0.88388348"
sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-475.75938,173.44683)" />
<path
style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -2022,7 +2022,7 @@
transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-187.51596,643.71067)" />
<path
transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-531.09792,102.68758)"
- d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+ d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
sodipodi:ry="0.88388348"
sodipodi:rx="0.88388348"
sodipodi:cy="21.754047"
@@ -2092,5 +2092,22 @@
inkscape:connector-curvature="0"
transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)" />
</g>
+ <g
+ id="g4823">
+ <path
+ style="fill:#e6e6e6"
+ d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+ id="path4821"
+ inkscape:connector-curvature="0"
+ transform="translate(232.52235,913.88168)"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccszscc"
+ transform="translate(232.52235,913.88168)"
+ inkscape:connector-curvature="0"
+ id="path4819"
+ d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+ style="fill:#1a1a1a" />
+ </g>
</g>
</svg>
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 11469dc66..589d68352 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -5,7 +5,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
- <div id="nav-floater">
+<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
@@ -33,17 +33,23 @@ works -->
{{ endif }}
{{ if $nav.network }}
<a id="nav-network-link" class="nav-link $nav.network.2"
- href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+ href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
{{ endif }}
{{ if $nav.home }}
<a id="nav-home-link" class="nav-link $nav.home.2"
- href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+ href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
{{ endif }}
{{ if $nav.login }}
<a id="nav-login-link" class="nav-login-link $nav.login.2"
- href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+ href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
{{ endif }}
- </div>
+ </div>
+
+ <div class="search-box">
+ <form method="get" action="$nav.search.0">
+ <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+ </form>
+ </div>
<div id="user-menu">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
diff --git a/view/theme/dispy-dark/screenshot.jpg b/view/theme/dispy-dark/screenshot.jpg
new file mode 100644
index 000000000..ada60ca61
--- /dev/null
+++ b/view/theme/dispy-dark/screenshot.jpg
Binary files differ
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 9883b2fd7..8be441c8b 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -48,8 +48,7 @@ body {
body, button, input, select, textarea {
font-family: sans-serif;
color: #eec;
- /*background-color: #2e3436;*/
- background-color: #2e2f2e;
+ background-color: #2e2f2e;
}
select {
border: 1px #555 dotted;
@@ -60,6 +59,9 @@ option {
padding: 3px;
vertical-align: middle;
}
+li {
+ padding: 0 0 0 2px;
+}
/* remember to define focus styles! */
:focus {
outline: 0;
@@ -200,21 +202,56 @@ input[type=submit] {
.action {
margin: 5px 0;
}
+.tool {
+ margin: 5px 0;
+ list-style: none;
+}
/**
* login
*/
+#login-extra-links {
+ overflow: auto;
+ padding-top: 140px !important;
+ width: 100%;
+}
#login-extra-links a {
margin-right: 20px;
}
+#login_standard {
+ display: block;
+ float: none;
+ height: 100px;
+ position: absolute;
+ width: 100%;
+}
+#login_standard .field label {
+ width: 200px;
+}
+#login_standard input, #login_standard input[type="text"] {
+ margin: 0 0 8px;
+ width: 210px;
+}
+#login-submit-wrapper {
+ margin: 0;
+}
+#login-submit-button {
+ margin-left: 0px !important;
+}
+#login_openid #id_openid_url {
+ width: 200px;
+}
+#login_openid label {
+ width: 208px;
+}
/**
* nav
*/
nav {
- height: 60px;
+ height: 85px;
display: block;
background-color: #1d1f1d;
color: #eeeeec;
@@ -244,25 +281,6 @@ nav #banner #logo-text a {
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;
@@ -291,14 +309,6 @@ ul#user-menu-popup li a:hover {
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;
@@ -406,13 +416,6 @@ nav .nav-link {
.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;
@@ -461,6 +464,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.show {
display: block;
}
+#notifications {
+ height: 20px;
+ width: 170px;
+ position: absolute;
+ top: -19px;
+ left: 15px;
+}
#nav-floater {
position: fixed;
top: 20px;
@@ -470,12 +480,23 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: transparent;
border-radius: 5px;
z-index: 100;
+ width: 28%;
+ height: 80px;
+}
+#nav-buttons {
+ clear: both;
+ list-style: none;
+ padding: 0px;
+ height: 25px;
+}
+#nav-buttons li {
+ padding: 0;
}
.floaterflip {
display: block;
position: fixed;
z-index: 110;
- top: 53px;
+ top: 56px;
right: 19px;
width: 22px;
height: 22px;
@@ -483,6 +504,39 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 0px;
background: transparent url(icons.png) -190px -60px no-repeat;
}
+.search-box {
+ display: inline-block;
+ height: 20px;
+ margin: 0;
+ position: relative;
+ left: 7px;
+ top: 5px;
+ /*width: 210px;*/
+}
+#search-text {
+ border: 1px #eec solid;
+ background: #2e2f2e;
+ color: #eec;
+}
+nav #user-menu {
+ display: block;
+ width: 75%;
+ margin: 3px 0 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;
+ top: 12px;
+ left: 7px;
+}
+nav #user-menu-label {
+ font-size: 12px;
+ padding: 3px 20px 9px 5px;
+ height: 10px;
+}
.nav-ajax-update, .nav-ajax-left {
width: 30px;
height: 19px;
@@ -688,7 +742,11 @@ aside #viewcontacts {
padding:.2em .5em;
}
#netsearch-box {
- margin: 30px 0px;
+ margin: 20px 0px 30px;
+ width: 150px;
+}
+#netsearch-box #search-submit {
+ margin: 5px 5px 0px 0px;
}
.ttright {
margin: 0px 0px 0px 0px;
@@ -947,7 +1005,7 @@ aside #viewcontacts {
background-color: #3e3f3e;
color: #eec;
border: 1px #eec solid;
- border-radius: 3px;
+ border-radius: 5px;
padding: 3px 3px 6px 10px;
}
#jot-preview-content .wall-item-outside-wrapper {
@@ -979,7 +1037,7 @@ section {
border: 1px solid #729fcf;
padding: 4px;
}
-.tab:hover {
+.tab:hover, .tab.active:hover {
background: #88a9d2;
color: #2e2f2e;
}
@@ -991,6 +1049,9 @@ section {
background: #88a9d2;
color: #2e2f2e;
}
+.tab.active a {
+ color: #2e2f2e;
+}
.tab a {
border: 0;
text-decoration: none;
@@ -1020,6 +1081,9 @@ section {
.shiny {
background: #2e3436;
}
+.wall-outside-wrapper .shiny {
+ border-radius: 5px;
+}
.heart {
color: red;
}
@@ -1713,8 +1777,10 @@ div[id$="wrapper"] br {
/**
* register, settings & profile forms
*/
-#id_openid_url,
.openid {
+
+}
+#id_openid_url {
background:url(login-bg.gif) no-repeat;
background-position:0 50%;
padding-left:18px;
@@ -1756,16 +1822,7 @@ div[id$="wrapper"] br {
margin: 30px 0px;
}
.profile-edit-side-div {
- /*background: #111;
- border-radius: 5px 5px 0px 0px;
- margin: 0px 0px 0px 0px;
- width: 100px;
- height: 25px;
- position: absolute;*/
display: none;
- /*left: 35%;
- top: 41%;
- cursor: pointer;*/
}
/*.profile-edit-side-div:hover {
display: block;
@@ -1819,10 +1876,12 @@ div[id$="wrapper"] br {
* contacts selector
*/
.group-delete-wrapper {
- margin: -31px 122px 0 0;
+ margin: -31px 50px 0 0;
float: right;
}
-
+/*.group-delete-icon {
+ margin: 0 0 0 10px;
+}*/
#group-edit-submit-wrapper {
margin: 0 0 10px 0;
display: inline;
@@ -1862,6 +1921,7 @@ div[id$="wrapper"] br {
display: none;
}
+
/**
* profile
*/
@@ -2033,6 +2093,16 @@ div[id$="wrapper"] br {
opacity: 1.0 !important;
filter:alpha(opacity=100) !important;
}
+.filesavetags {
+ margin: 20px 0;
+ opacity: 0.5;
+ filter:alpha(opacity=50);
+}
+.filesavetags:hover {
+ margin: 20px 0;
+ opacity: 1.0 !important;
+ filter:alpha(opacity=100) !important;
+}
.item-select {
opacity: 0.1;
filter:alpha(opacity=10);
@@ -2086,13 +2156,13 @@ div[id$="wrapper"] br {
#group-sidebar {
margin-bottom: 10px;
}
-.group-selected, .nets-selected {
+.group-selected, .nets-selected, .fileas-selected {
padding: 3px;
color: #2e2f2e;
background: #88a9d2;
font-weight: bold;
}
-.group-selected:hover, .nets-selected:hover {
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
color: #2e2f2e;
}
.groupsideedit {
@@ -2170,6 +2240,7 @@ div[id$="wrapper"] br {
margin: 5px 0px 0px 0px;
}
+
/**
* ADMIN
*/
@@ -2257,7 +2328,7 @@ div[id$="wrapper"] br {
.field {
/*margin-bottom: 10px;*/
/*padding-bottom: 10px;*/
- overflow: auto;
+ overflow: auto;
width: 100%;
}
.field label, label {
@@ -2265,7 +2336,6 @@ div[id$="wrapper"] br {
width: 275px;
display: block;
font-size: 1.077em;
- /*font-weight: bold;*/
margin: 0 10px 0.5em 0;
border: 1px #2e2f2e solid;
padding: 5px;
@@ -2484,6 +2554,9 @@ div[id$="wrapper"] br {
.dislike {
background-position: -190px 0;
}
+.file-as {
+ background-position: -230px -60px;
+}
.like {
background-position: -211px 0;
}
@@ -2570,9 +2643,9 @@ div[id$="wrapper"] br {
}
.border, .border:hover {
border: 1px solid #babdb6;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
.attachtype {
display: block;
@@ -2781,6 +2854,29 @@ footer {
.network-star.icon.starred {
display: inline-block;
}
+#fileas-sidebar {
+
+}
+.fileas-ul {
+ padding: 0;
+}
+
+
+
+/*
+ * ADDONS THEMING
+ */
+
+#sidebar-page-list {
+
+}
+#sidebar-page-list ul {
+ padding: 0;
+ margin: 5px 0;
+}
+#sidebar-page-list li {
+ list-style: none;
+}
@media handheld {
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 700136173..4c938997b 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -3,9 +3,10 @@
/*
* Name: Dispy Dark
* Description: Dispy Dark, Friendica theme
- * Version: 0.9
+ * Version: 1.0
* Author: Simon <http://simon.kisikew.org/>
* Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.png">screenshot</a>
*/
@@ -126,3 +127,30 @@ $(document).ready(function() {
</script>
EOT;
+function dispydark_community_info() {
+ $a = get_app();
+
+ $fostitJS = "javascript: (function() {
+ the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
+ encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
+ encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
+ document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
+ location.href = the_url;
+ }
+ if (/Firefox/.test(navigator.userAgent)) {
+ setTimeout(a_funct, 0)
+ } else {
+ a_funct();
+ }
+ })();" ;
+
+ $aside['$fostitJS'] = $fostitJS;
+ $url = $a->get_baseurl($ssl_state);
+ $aside['$url'] = $url;
+
+ $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+ $a->page['aside'] = replace_macros($tpl, $aside);
+}
+
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index c67a88635..c9ac20c89 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -4,9 +4,7 @@
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
- </a>
+ <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul>
@@ -37,6 +35,11 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+
+ {{ if $item.filer }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+ {{ endif }}
+
{{ if $item.plink }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index f251d7352..b25d13409 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -38,11 +38,14 @@
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ if $item.vote.share }}
- <a href="#" id="share-$item.id"
+ <a href="#" id="share-$item.id"
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+ {{ if $item.filer }}
+ <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+ {{ endif }}
{{ if $item.plink }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
new file mode 100644
index 000000000..dfc0467f7
--- /dev/null
+++ b/view/theme/dispy/communityhome.tpl
@@ -0,0 +1,9 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;">
+<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span>
+</div>
+{{ endif }}
diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/dispy/fpostit/README
@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js
new file mode 100755
index 000000000..d18f5d345
--- /dev/null
+++ b/view/theme/dispy/fpostit/fpostit.js
@@ -0,0 +1,14 @@
+javascript: (function() {
+ the_url = 'view/theme/dispy/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
+ encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
+ document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
+ location.href = the_url
+ };
+ if (/Firefox/.test(navigator.userAgent)) {
+ setTimeout(a_funct, 0)
+ } else {
+ a_funct();
+ }
+ })();"
diff --git a/view/theme/dispy/fpostit/fpostit.php b/view/theme/dispy/fpostit/fpostit.php
new file mode 100644
index 000000000..d00182946
--- /dev/null
+++ b/view/theme/dispy/fpostit/fpostit.php
@@ -0,0 +1,134 @@
+<?php
+if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = '';
+if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
+if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
+if (!isset($hostname)) $hostname = '';
+if (!isset($username)) $username = '';
+
+
+if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
+ setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+ <style>
+ body {
+ font-family: sans-serif;
+ margin: 0px;
+ }
+ .wrap1 {
+ padding: 2px 5px;
+ background-color: #000;
+ margin-bottom: 10px;
+ }
+ .wrap2 {
+ margin-left: 10px;
+ font-size: 12px;
+ }
+ .logo {
+ margin-left: 3px;
+ margin-right: 5px;
+ float: left;
+ }
+ h2 {
+ color: #ffffff;
+ }
+ .error {
+ background-color: #FFFF66;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+ </style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+ $title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+ $text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+ $url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+ $content = "$title\nsource:$url\n\n$text";
+} else {
+ $content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+
+ if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ $acctname = $_POST["friendica_acct_name"];
+ $tmp_account_array = explode("@", $acctname);
+ if (isset($tmp_account_array[1])) {
+ $username = $tmp_account_array[0];
+ $hostname = $tmp_account_array[1];
+ }
+ $password = $_POST["friendica_password"];
+ $content = $_POST["content"];
+
+ $url = "http://" . $hostname . '/api/statuses/update';
+ $data = array('status' => $content);
+
+ // echo "posting to: $url<br/>";
+
+ $c = curl_init();
+ curl_setopt($c, CURLOPT_URL, $url);
+ curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+ curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+ curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+ $c_result = curl_exec($c);
+ if(curl_errno($c)){
+ $error = curl_error($c);
+ showForm($error, $content);
+ }
+
+ curl_close($c);
+ if (!isset($error)) {
+ echo '<script language="javascript" type="text/javascript">window.close();</script>';
+ }
+
+ } else {
+ $error = "Missing account name and/or password. Please try again.";
+ showForm($error, $content);
+ }
+
+} else {
+ showForm(null, $content);
+}
+
+function showForm($error, $content) {
+ $username_cookie = $_COOKIE['username'];
+ $password_cookie = $_COOKIE['password'];
+
+ echo <<<EOF
+ <div class="wrap1">
+ <h2><img class="logo" src="friendica-32.png" align="middle" />Friendica Bookmarklet</h2>
+ </div>
+
+ <div class="wrap2">
+ <form method="post" action="{$_SERVER['PHP_SELF']}">
+ Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)<br /><br />
+ Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50" /><br />
+ Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50" /><br />
+ <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+ <input type="submit" value="PostIt!" name="submit" />&#160;&#160;<span class="error">$error</span>
+ </form>
+ <p></p>
+ </div>
+EOF;
+
+}
+?>
+
+</body>
+</html>
diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy/fpostit/friendica-32.png
Binary files differ
diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy/fpostit/friendika-32.png
Binary files differ
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index 2f0459bd3..f42330d65 100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/icons.png
Binary files differ
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg
index 998e2641f..7b82b94ea 100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -52,7 +52,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.9403009"
- inkscape:cx="73.744486"
+ inkscape:cx="64.725266"
inkscape:cy="108.36719"
inkscape:document-units="px"
inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
inkscape:window-width="1065"
inkscape:window-height="742"
inkscape:window-x="40"
- inkscape:window-y="61"
+ inkscape:window-y="50"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
@@ -2168,5 +2168,23 @@
transform="translate(22,0)"
width="250"
height="200" />
+ <g
+ transform="translate(-2.0523e-4,-5e-4)"
+ id="g4823">
+ <path
+ style="fill:#e6e6e6"
+ d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+ id="path4821"
+ inkscape:connector-curvature="0"
+ transform="translate(232.52235,913.88168)"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="cccccccccccccszscc"
+ transform="translate(232.52235,913.88168)"
+ inkscape:connector-curvature="0"
+ id="path4819"
+ d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+ style="fill:#1a1a1a" />
+ </g>
</g>
</svg>
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 11469dc66..589d68352 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -5,7 +5,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
- <div id="nav-floater">
+<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
@@ -33,17 +33,23 @@ works -->
{{ endif }}
{{ if $nav.network }}
<a id="nav-network-link" class="nav-link $nav.network.2"
- href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+ href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
{{ endif }}
{{ if $nav.home }}
<a id="nav-home-link" class="nav-link $nav.home.2"
- href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+ href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
{{ endif }}
{{ if $nav.login }}
<a id="nav-login-link" class="nav-login-link $nav.login.2"
- href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+ href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
{{ endif }}
- </div>
+ </div>
+
+ <div class="search-box">
+ <form method="get" action="$nav.search.0">
+ <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+ </form>
+ </div>
<div id="user-menu">
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
diff --git a/view/theme/dispy/screenshot.jpg b/view/theme/dispy/screenshot.jpg
new file mode 100644
index 000000000..81ee35afb
--- /dev/null
+++ b/view/theme/dispy/screenshot.jpg
Binary files differ
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 6547cf986..74a7809a1 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -59,6 +59,9 @@ option {
padding: 3px;
vertical-align: middle;
}
+li {
+ padding: 0 0 0 2px;
+}
/* remember to define focus styles! */
:focus {
outline: 0;
@@ -199,21 +202,56 @@ input[type=submit] {
.action {
margin: 5px 0;
}
+.tool {
+ margin: 5px 0;
+ list-style: none;
+}
/**
* login
*/
+#login-extra-links {
+ overflow: auto;
+ padding-top: 140px !important;
+ width: 100%;
+}
#login-extra-links a {
margin-right: 20px;
}
+#login_standard {
+ display: block;
+ float: none;
+ height: 100px;
+ position: absolute;
+ width: 100%;
+}
+#login_standard .field label {
+ width: 200px;
+}
+#login_standard input, #login_standard input[type="text"] {
+ margin: 0 0 8px;
+ width: 210px;
+}
+#login-submit-wrapper {
+ margin: 0;
+}
+#login-submit-button {
+ margin-left: 0px !important;
+}
+#login_openid #id_openid_url {
+ width: 200px;
+}
+#login_openid label {
+ width: 208px;
+}
/**
* nav
*/
nav {
- height: 60px;
+ height: 85px;
display: block;
background-color: #2e3436;
color: #eeeeec;
@@ -243,25 +281,6 @@ nav #banner #logo-text a {
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;
@@ -290,14 +309,6 @@ ul#user-menu-popup li a:hover {
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;
@@ -405,13 +416,6 @@ nav .nav-link {
.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;
@@ -460,6 +464,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.show {
display: block;
}
+#notifications {
+ height: 20px;
+ width: 170px;
+ position: absolute;
+ top: -19px;
+ left: 15px;
+}
#nav-floater {
position: fixed;
top: 20px;
@@ -469,12 +480,23 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: transparent;
border-radius: 5px;
z-index: 100;
+ width: 28%;
+ height: 80px;
+}
+#nav-buttons {
+ clear: both;
+ list-style: none;
+ padding: 0px;
+ height: 25px;
+}
+#nav-buttons li {
+ padding: 0;
}
.floaterflip {
display: block;
position: fixed;
z-index: 110;
- top: 53px;
+ top: 56px;
right: 19px;
width: 22px;
height: 22px;
@@ -482,6 +504,39 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 0px;
background: transparent url(icons.png) -190px -60px no-repeat;
}
+.search-box {
+ display: inline-block;
+ height: 20px;
+ margin: 0;
+ position: relative;
+ left: 7px;
+ top: 5px;
+ /*width: 210px;*/
+}
+#search-text {
+ border: 1px #eec solid;
+ background: #2e3436;
+ color: #eec;
+}
+nav #user-menu {
+ display: block;
+ width: 75%;
+ margin: 3px 0 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;
+ top: 12px;
+ left: 7px;
+}
+nav #user-menu-label {
+ font-size: 12px;
+ padding: 3px 20px 9px 5px;
+ height: 10px;
+}
.nav-ajax-update, .nav-ajax-left {
width: 30px;
height: 19px;
@@ -687,7 +742,11 @@ aside #viewcontacts {
padding:.2em .5em;
}
#netsearch-box {
- margin: 30px 0px;
+ margin: 20px 0px 30px;
+ width: 150px;
+}
+#netsearch-box #search-submit {
+ margin: 5px 5px 0px 0px;
}
.ttright {
margin: 0px 0px 0px 0px;
@@ -946,7 +1005,7 @@ aside #viewcontacts {
background-color: #ffffe0;
color: #111;
border: 1px #aa0 solid;
- border-radius: 3px;
+ border-radius: 5px;
padding: 3px 3px 6px 10px;
}
#jot-preview-content .wall-item-outside-wrapper {
@@ -978,7 +1037,7 @@ section {
border: 1px solid #729fcf;
padding: 4px;
}
-.tab:hover {
+.tab:hover, .tab.active:hover {
background: #729fcf;
color: #eeeeec;
}
@@ -990,6 +1049,9 @@ section {
background: #729fcf;
color: #eeeeec;
}
+.tab.active a {
+ color: #729fcf;
+}
.tab a {
border: 0;
text-decoration: none;
@@ -1019,6 +1081,9 @@ section {
.shiny {
background: #efefdf;
}
+.wall-outside-wrapper .shiny {
+ border-radius: 5px;
+}
.heart {
color: red;
}
@@ -1712,8 +1777,10 @@ div[id$="wrapper"] br {
/**
* register, settings & profile forms
*/
-#id_openid_url,
.openid {
+
+}
+#id_openid_url {
background:url(login-bg.gif) no-repeat;
background-position:0 50%;
padding-left:18px;
@@ -1809,10 +1876,12 @@ div[id$="wrapper"] br {
* contacts selector
*/
.group-delete-wrapper {
- margin: -31px 122px 0 0;
+ margin: -31px 50px 0 0;
float: right;
}
-
+/*.group-delete-icon {
+ margin: 0 0 0 10px;
+}*/
#group-edit-submit-wrapper {
margin: 0 0 10px 0;
display: inline;
@@ -1852,6 +1921,7 @@ div[id$="wrapper"] br {
display: none;
}
+
/**
* profile
*/
@@ -2023,6 +2093,16 @@ div[id$="wrapper"] br {
opacity: 1.0 !important;
filter:alpha(opacity=100) !important;
}
+.filesavetags {
+ margin: 20px 0;
+ opacity: 0.5;
+ filter:alpha(opacity=50);
+}
+.filesavetags:hover {
+ margin: 20px 0;
+ opacity: 1.0 !important;
+ filter:alpha(opacity=100) !important;
+}
.item-select {
opacity: 0.1;
filter:alpha(opacity=10);
@@ -2076,13 +2156,13 @@ div[id$="wrapper"] br {
#group-sidebar {
margin-bottom: 10px;
}
-.group-selected, .nets-selected {
+.group-selected, .nets-selected, .fileas-selected {
padding: 3px;
color: #111;
background: #f8f8f8;
font-weight: bold;
}
-.group-selected:hover, .nets-selected:hover {
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
color: #111;
}
.groupsideedit {
@@ -2160,6 +2240,7 @@ div[id$="wrapper"] br {
margin: 5px 0px 0px 0px;
}
+
/**
* ADMIN
*/
@@ -2247,7 +2328,7 @@ div[id$="wrapper"] br {
.field {
/*margin-bottom: 10px;*/
/*padding-bottom: 10px;*/
- overflow: auto;
+ /*overflow: auto;*/
width: 100%;
}
.field label, label {
@@ -2255,11 +2336,10 @@ div[id$="wrapper"] br {
width: 275px;
display: block;
font-size: 1.077em;
- /*font-weight: bold;*/
margin: 0 10px 0.5em 0;
border: 1px #999 solid;
padding: 5px;
- background: #eee;
+ background: #ccc;
vertical-align: middle;
color: #111;
}
@@ -2474,6 +2554,9 @@ div[id$="wrapper"] br {
.dislike {
background-position: -190px 0;
}
+.file-as {
+ background-position: -230px -60px;
+}
.like {
background-position: -211px 0;
}
@@ -2560,9 +2643,9 @@ div[id$="wrapper"] br {
}
.border, .border:hover {
border: 1px solid #babdb6;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
.attachtype {
display: block;
@@ -2689,7 +2772,7 @@ footer {
vertical-align: middle;
}
#acl-wrapper a:hover {
- text-decoration:none;
+ text-decoration: none;
color: #000;
border: 0;
}
@@ -2771,6 +2854,29 @@ footer {
.network-star.icon.starred {
display: inline-block;
}
+#fileas-sidebar {
+
+}
+.fileas-ul {
+ padding: 0;
+}
+
+
+
+/*
+ * ADDONS THEMING
+ */
+
+#sidebar-page-list {
+
+}
+#sidebar-page-list ul {
+ padding: 0;
+ margin: 5px 0;
+}
+#sidebar-page-list li {
+ list-style: none;
+}
@media handheld {
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 26e07b1f7..db8cf5ccd 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,9 +3,10 @@
/*
* Name: Dispy
* Description: Dispy, Friendica theme
- * Version: 0.9
+ * Version: 1.0
* Author: unknown
* Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
@@ -126,3 +127,35 @@ $(document).ready(function() {
</script>
EOT;
+function dispy_community_info() {
+ $a = get_app();
+
+ $fostitJS = "javascript: (function() {
+ the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' +
+ encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
+ encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
+ document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
+ location.href = the_url;
+ }
+ if (/Firefox/.test(navigator.userAgent)) {
+ setTimeout(a_funct, 0)
+ } else {
+ a_funct();
+ }
+ })();" ;
+
+ $aside['$fostitJS'] = $fostitJS;
+ $url = $a->get_baseurl($ssl_state);
+ $aside['$url'] = $url;
+
+ $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+ $a->page['aside'] = replace_macros($tpl, $aside);
+}
+
+//right_aside at profile pages
+if ($a->argv[0] === "profile") {
+ // COMMUNITY
+ dispy_community_info();
+}
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index c67a88635..c9ac20c89 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -4,9 +4,7 @@
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
- </a>
+ <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul>
@@ -37,6 +35,11 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+
+ {{ if $item.filer }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+ {{ endif }}
+
{{ if $item.plink }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index f251d7352..b25d13409 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -38,11 +38,14 @@
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ if $item.vote.share }}
- <a href="#" id="share-$item.id"
+ <a href="#" id="share-$item.id"
class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
+ {{ if $item.filer }}
+ <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+ {{ endif }}
{{ if $item.plink }}
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
{{ endif }}
diff --git a/view/theme/duepuntozero/contact_template.tpl b/view/theme/duepuntozero/contact_template.tpl
deleted file mode 100755
index 48930b48a..000000000
--- a/view/theme/duepuntozero/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
- <div class="contact-entry-photo-wrapper" >
- <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
- onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
- onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
- <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
- {{ if $contact.photo_menu }}
- <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
- <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
- <ul>
- $contact.photo_menu
- </ul>
- </div>
- {{ endif }}
- </div>
-
- </div>
- <div class="contact-entry-photo-end" ></div>
- <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
- <div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/duepuntozero/group_side.tpl b/view/theme/duepuntozero/group_side.tpl
deleted file mode 100755
index 0353b1d2c..000000000
--- a/view/theme/duepuntozero/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
- <ul id="sidebar-group-ul">
- {{ for $groups as $group }}
- <li class="sidebar-group-li">
- {{ if $group.cid }}
- <input type="checkbox"
- class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
- onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
- {{ if $group.ismember }}checked="checked"{{ endif }}
- />
- {{ endif }}
- {{ if $group.edit }}
- <a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
- {{ endif }}
- <a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
- </li>
- {{ endfor }}
- </ul>
- </div>
- <div id="sidebar-new-group">
- <a href="group/new">$createtext</a>
- </div>
-</div>
-
-
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
deleted file mode 100755
index 5fe1f954e..000000000
--- a/view/theme/duepuntozero/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
- <div id="profile-jot-banner-wrapper">
- <div id="profile-jot-desc" >&nbsp;</div>
- <div id="character-counter" class="grey"></div>
- </div>
- <div id="profile-jot-banner-end"></div>
-
- <form id="profile-jot-form" action="$action" method="post" >
- <input type="hidden" name="type" value="$ptyp" />
- <input type="hidden" name="profile_uid" value="$profile_uid" />
- <input type="hidden" name="return" value="$return_path" />
- <input type="hidden" name="location" id="jot-location" value="$defloc" />
- <input type="hidden" name="coord" id="jot-coord" value="" />
- <input type="hidden" name="post_id" value="$post_id" />
- <input type="hidden" name="preview" id="jot-preview" value="0" />
- <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
- <div id="jot-text-wrap">
- <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
- </div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
- <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
- <div id="profile-upload-wrapper" style="display: $visitor;" >
- <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
- </div>
- <div id="profile-attach-wrapper" style="display: $visitor;" >
- <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
- </div>
-
- <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
- <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
- </div>
- <div id="profile-video-wrapper" style="display: $visitor;" >
- <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
- </div>
- <div id="profile-audio-wrapper" style="display: $visitor;" >
- <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
- </div>
- <div id="profile-location-wrapper" style="display: $visitor;" >
- <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
- </div>
- <div id="profile-nolocation-wrapper" style="display: none;" >
- <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
- </div>
-
- <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
- <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
- </div>
-
- <span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
- <div id="profile-jot-perms-end"></div>
-
-
- <div id="profile-jot-plugin-wrapper">
- $jotplugins
- </div>
-
- <div id="profile-rotator-wrapper" style="display: $visitor;" >
- <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- </div>
-
- <div id="jot-preview-content" style="display:none;"></div>
-
- <div style="display: none;">
- <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
- $acl
- <hr style="clear:both"/>
- <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
- <div id="profile-jot-email-end"></div>
- $jotnets
- </div>
- </div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
- {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
deleted file mode 100755
index 4675c3e5c..000000000
--- a/view/theme/duepuntozero/nav.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav>
- $langselector
-
- <div id="site-location">$sitelocation</div>
-
- {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
- {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
- <span id="nav-link-wrapper" >
-
- {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-
- {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
- <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
- <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
- {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
- {{ if $nav.network }}
- <a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
- <span id="net-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.home }}
- <a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
- <span id="home-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.community }}
- <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
- {{ endif }}
- {{ if $nav.introductions }}
- <a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
- <span id="intro-update" class="nav-ajax-left"></span>
- {{ endif }}
- {{ if $nav.messages }}
- <a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
- <span id="mail-update" class="nav-ajax-left"></span>
- {{ endif }}
-
-
-
- {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
- {{ if $nav.notifications }}
- <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
- <ul id="nav-notifications-menu" class="menu-popup">
- <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
- <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
- <li class="empty">$emptynotifications</li>
- </ul>
- {{ endif }}
-
- {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
- {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
- {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
- </span>
- <span id="nav-end"></span>
- <span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/duepuntozero/nets.tpl b/view/theme/duepuntozero/nets.tpl
deleted file mode 100755
index b0cb8890c..000000000
--- a/view/theme/duepuntozero/nets.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
- <h3>$title</h3>
- <div id="nets-desc">$desc</div>
- <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
- <ul class="nets-ul">
- {{ for $nets as $net }}
- <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
- {{ endfor }}
- </ul>
-</div>
diff --git a/view/theme/duepuntozero/saved_searches_aside.tpl b/view/theme/duepuntozero/saved_searches_aside.tpl
deleted file mode 100755
index e6a0d6278..000000000
--- a/view/theme/duepuntozero/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
- <h3 id="search">$title</h3>
- $searchbox
-
- <ul id="saved-search-ul">
- {{ for $saved as $search }}
- <li class="saved-search-li clear">
- <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
- <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
- </li>
- {{ endfor }}
- </ul>
- <div class="clear"></div>
-</div>
diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/screenshot.jpg
new file mode 100644
index 000000000..5f00ec39e
--- /dev/null
+++ b/view/theme/duepuntozero/screenshot.jpg
Binary files differ
diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl
deleted file mode 100755
index bfad1b7b7..000000000
--- a/view/theme/duepuntozero/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
- <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
- <div class="wall-item-info" id="wall-item-info-$item.id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
- onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
- onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
- <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
- <ul>
- $item.item_photo_menu
- </ul>
- </div>
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
- </div>
- </div>
- <div class="wall-item-author">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
- </div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
- <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$item.id">
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
- {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
- {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
- <div class="wall-item-delete-end"></div>
- </div>
- </div>
- <div class="wall-item-wrapper-end"></div>
-
-
- <div class="wall-item-conv" id="wall-item-conv-$item.id" >
- {{ if $item.conv }}
- <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
- {{ endif }}
- </div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b79b00ef4..33be8b359 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -249,6 +249,10 @@ div.wall-item-content-wrapper.shiny {
background: #FFFFC8;
}
+#theme-preview {
+ margin: 15px 0 15px 150px;
+}
+
/* from default */
#jot-perms-icon,
#profile-location,
@@ -2974,11 +2978,13 @@ div.jGrowl div.info {
.qcomment {
border: 1px solid #EEE;
padding: 3px;
+ margin-top: 15px;
+ margin-left: 25px;
}
.qcomment {
- opacity: 0;
- filter:alpha(opacity=0);
+ opacity: 0.3;
+ filter:alpha(opacity=30);
}
.qcomment:hover {
opacity: 1.0;
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
deleted file mode 100755
index 9d1dd7d70..000000000
--- a/view/theme/duepuntozero/wall_item.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
- <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
- <div class="wall-item-info" id="wall-item-info-$item.id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
- onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
- onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
- </a>
- <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
- <ul>
- $item.item_photo_menu
- </ul>
- </div>
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
- </div>
- </div>
- <div class="wall-item-author">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
-
- </div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
- <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
- <div class="body-tag">
- {{ for $item.tags as $tag }}
- <span class='tag'>$tag</span>
- {{ endfor }}
- </div>
- </div>
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$item.id">
- {{ if $item.vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
- <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
- {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
- </div>
- {{ endif }}
- {{ if $item.plink }}
- <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
- {{ endif }}
- {{ if $item.edpost }}
- <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
- {{ endif }}
-
- {{ if $item.star }}
- <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
- {{ endif }}
- {{ if $item.filer }}
- <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
- {{ endif }}
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
- {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
- {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
- <div class="wall-item-delete-end"></div>
- </div>
- </div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
- <div class="wall-item-comment-wrapper" >
- $item.comment
- </div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
deleted file mode 100755
index bad5680c7..000000000
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
- <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
- <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
- <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
- <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
- <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
- </div>
- <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
- <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id"
- onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
- onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
- <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
- <ul>
- $item.item_photo_menu
- </ul>
- </div>
-
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
- {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
- </div>
- </div>
- <div class="wall-item-author">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
- <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
- </div>
- <div class="wall-item-content" id="wall-item-content-$item.id" >
- <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
- <div class="body-tag">
- {{ for $item.tags as $tag }}
- <span class='tag'>$tag</span>
- {{ endfor }}
- </div>
- </div>
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$item.id">
- {{ if $item.vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
- <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
- {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
- </div>
- {{ endif }}
- {{ if $item.plink }}
- <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
- {{ endif }}
- {{ if $item.edpost }}
- <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
- {{ endif }}
-
- {{ if $item.star }}
- <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
- {{ endif }}
- {{ if $item.filer }}
- <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
- {{ endif }}
-
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
- {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
- {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
- <div class="wall-item-delete-end"></div>
- </div>
- </div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
- <div class="wall-item-comment-separator"></div>
- <div class="wall-item-comment-wrapper" >
- $item.comment
- </div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
-
diff --git a/view/theme/easterbunny/screenshot.jpg b/view/theme/easterbunny/screenshot.jpg
new file mode 100644
index 000000000..5ac613e78
--- /dev/null
+++ b/view/theme/easterbunny/screenshot.jpg
Binary files differ
diff --git a/view/theme/goldenrod/screenshot.jpg b/view/theme/goldenrod/screenshot.jpg
new file mode 100644
index 000000000..357e00ae2
--- /dev/null
+++ b/view/theme/goldenrod/screenshot.jpg
Binary files differ
diff --git a/view/theme/greenzero/screenshot.jpg b/view/theme/greenzero/screenshot.jpg
new file mode 100644
index 000000000..692ad354b
--- /dev/null
+++ b/view/theme/greenzero/screenshot.jpg
Binary files differ
diff --git a/view/theme/loozah/screenshot.jpg b/view/theme/loozah/screenshot.jpg
new file mode 100644
index 000000000..41d6929ca
--- /dev/null
+++ b/view/theme/loozah/screenshot.jpg
Binary files differ
diff --git a/view/theme/purplezero/screenshot.jpg b/view/theme/purplezero/screenshot.jpg
new file mode 100644
index 000000000..c1d346bb5
--- /dev/null
+++ b/view/theme/purplezero/screenshot.jpg
Binary files differ
diff --git a/view/theme/quattro-green/screenshot.png b/view/theme/quattro-green/screenshot.png
new file mode 100644
index 000000000..a764f4f9a
--- /dev/null
+++ b/view/theme/quattro-green/screenshot.png
Binary files differ
diff --git a/view/theme/quattro-green/theme.php b/view/theme/quattro-green/theme.php
new file mode 100644
index 000000000..7a0a869f8
--- /dev/null
+++ b/view/theme/quattro-green/theme.php
@@ -0,0 +1,11 @@
+<?php
+/*
+ * Name: quattro-green
+ * Version: 1.0
+ * Author: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Tobias Diekershoff
+ */
+$a->theme_info = array(
+ 'extends' => 'quattro',
+);
+EOT;
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index 3503c3843..cde4ca3ca 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@@ -11,13 +11,13 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
- <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
{{ if $qcomment }}
{{ for $qcomment as $qc }}
<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
&nbsp;
{{ endfor }}
{{ endif }}
+ <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
new file mode 100755
index 000000000..b826acc65
--- /dev/null
+++ b/view/theme/quattro/contact_template.tpl
@@ -0,0 +1,26 @@
+
+<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
+ <div class="contact-photo-wrapper" >
+ <div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
+ onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
+ onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+ <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+ {{ if $contact.photo_menu }}
+ <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
+ <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
+ $contact.photo_menu
+ </ul>
+ {{ endif }}
+ </div>
+
+ </div>
+ <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+ {{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+ <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+ <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+
+</div>
+
diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/quattro/conversation.tpl
index 43bb1dd47..ff202bbe4 100755
--- a/view/theme/duepuntozero/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -17,9 +17,7 @@
{{ endfor }}
{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
- <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
- <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
+<a href="#" onclick="deleteCheckedItems();return false;">
+ <span class="icon s22 delete text">$dropping</span>
+</a>
{{ endif }}
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl
new file mode 100755
index 000000000..596a8d13f
--- /dev/null
+++ b/view/theme/quattro/group_side.tpl
@@ -0,0 +1,29 @@
+<div id="group-sidebar" class="widget">
+ <div class="title tool">
+ <h3 class="label">$title</h3>
+ <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a>
+ </div>
+
+ <div id="sidebar-group-list">
+ <ul>
+ {{ for $groups as $group }}
+ <li class="tool {{ if $group.selected }}selected{{ endif }}">
+ <a href="$group.href" class="label">
+ $group.text
+ </a>
+ {{ if $group.edit }}
+ <a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a>
+ {{ endif }}
+ {{ if $group.cid }}
+ <input type="checkbox"
+ class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
+ onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+ {{ if $group.ismember }}checked="checked"{{ endif }}
+ />
+ {{ endif }}
+ </li>
+ {{ endfor }}
+ </ul>
+ </div>
+</div>
+
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
new file mode 100755
index 000000000..2f89d4372
--- /dev/null
+++ b/view/theme/quattro/jot.tpl
@@ -0,0 +1,48 @@
+<form id="profile-jot-form" action="$action" method="post">
+ <div id="jot">
+ <div id="profile-jot-desc" class="jothidden">&nbsp;</div>
+ <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+ <div id="character-counter" class="grey jothidden"></div>
+
+ <input type="hidden" name="type" value="$ptyp" />
+ <input type="hidden" name="profile_uid" value="$profile_uid" />
+ <input type="hidden" name="return" value="$return_path" />
+ <input type="hidden" name="location" id="jot-location" value="$defloc" />
+ <input type="hidden" name="coord" id="jot-coord" value="" />
+ <input type="hidden" name="post_id" value="$post_id" />
+ <input type="hidden" name="preview" id="jot-preview" value="0" />
+
+ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+ <ul id="jot-tools" class="jothidden" style="display:none">
+ <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
+ <li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li>
+ <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
+ <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
+ <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
+ <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
+ <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
+ <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
+ $jotplugins
+
+ <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang" title="$permset" ></a></li>
+ <li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
+ <li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></li>
+ </ul>
+ </div>
+
+ <div id="jot-preview-content" style="display:none;"></div>
+
+ <div style="display: none;">
+ <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+ $acl
+ <hr style="clear:both"/>
+ <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+ <div id="profile-jot-email-end"></div>
+ $jotnets
+ </div>
+ </div>
+
+</form>
+
+{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
new file mode 100755
index 000000000..8c872864c
--- /dev/null
+++ b/view/theme/quattro/nav.tpl
@@ -0,0 +1,131 @@
+<header>
+ {# $langselector #}
+
+ <div id="site-location">$sitelocation</div>
+ <div id="banner">$banner</div>
+</header>
+<nav>
+ <ul>
+ {{ if $userinfo }}
+ <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+ <ul id="nav-user-menu" class="menu-popup">
+ {{ for $nav.usermenu as $usermenu }}
+ <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+ {{ endfor }}
+
+ {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+ {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+ {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
+ </ul>
+ </li>
+ {{ endif }}
+
+ {{ if $nav.community }}
+ <li id="nav-community-link" class="nav-menu $sel.community">
+ <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+ </li>
+ {{ endif }}
+
+ {{ if $nav.network }}
+ <li id="nav-network-link" class="nav-menu $sel.network">
+ <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+ <span id="net-update" class="nav-notify"></span>
+ </li>
+ {{ endif }}
+ {{ if $nav.home }}
+ <li id="nav-home-link" class="nav-menu $sel.home">
+ <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+ <span id="home-update" class="nav-notify"></span>
+ </li>
+ {{ endif }}
+
+ {{ if $nav.notifications }}
+ <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+ <span id="notify-update" class="nav-notify"></span>
+ <ul id="nav-notifications-menu" class="menu-popup">
+ <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+ <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+ <li class="empty">$emptynotifications</li>
+ </ul>
+ </li>
+ {{ endif }}
+
+ <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+ <ul id="nav-site-menu" class="menu-popup">
+ {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
+
+ {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+ {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+ {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+ {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+ </ul>
+ </li>
+
+ {{ if $nav.help }}
+ <li id="nav-help-link" class="nav-menu $sel.help">
+ <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+ </li>
+ {{ endif }}
+
+ <li id="nav-search-link" class="nav-menu $sel.search">
+ <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+ </li>
+ <li id="nav-directory-link" class="nav-menu $sel.directory">
+ <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+ </li>
+
+ {{ if $nav.apps }}
+ <li id="nav-apps-link" class="nav-menu $sel.apps">
+ <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+ <ul id="nav-apps-menu" class="menu-popup">
+ {{ for $apps as $ap }}
+ <li>$ap</li>
+ {{ endfor }}
+ </ul>
+ </li>
+ {{ endif }}
+ </ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+ <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+{#
+
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+<span id="nav-link-wrapper" >
+
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+{{ if $nav.notifications }}
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{ endif }}
+{{ if $nav.messages }}
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{ endif }}
+
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">$banner</span>
+#}
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl
new file mode 100755
index 000000000..cbadf1361
--- /dev/null
+++ b/view/theme/quattro/nets.tpl
@@ -0,0 +1,12 @@
+<div id="nets-sidebar" class="widget">
+ <h3>$title</h3>
+ <div id="nets-desc">$desc</div>
+
+ <ul class="nets-ul">
+ <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
+ {{ for $nets as $net }}
+ <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
+ {{ endfor }}
+ </ul>
+
+</div>
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index 154f22363..7cd02f164 100755
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
@@ -1,11 +1,27 @@
<div class="vcard">
- <div class="fn label">$profile.name</div>
-
+ <div class="tool">
+ <div class="fn label">$profile.name</div>
+ {{ if $profile.edit }}
+ <div class="action">
+ <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+ <ul id="profiles-menu" class="menu-popup">
+ {{ for $profile.menu.entries as $e }}
+ <li>
+ <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+ </li>
+ {{ endfor }}
+ <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+ <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-
+ </ul>
+ </div>
+ {{ endif }}
+ </div>
+
+
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
- <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
+ <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl
new file mode 100755
index 000000000..9c10a26de
--- /dev/null
+++ b/view/theme/quattro/saved_searches_aside.tpl
@@ -0,0 +1,15 @@
+<div id="saved-search-list" class="widget">
+ <h3 class="title">$title</h3>
+
+ <ul id="saved-search-ul">
+ {{ for $saved as $search }}
+ <li class="tool {{if $search.selected}}selected{{endif}}">
+ <a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
+ <a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
+ </li>
+ {{ endfor }}
+ </ul>
+
+ $searchbox
+
+</div>
diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg
new file mode 100644
index 000000000..7f50ec70e
--- /dev/null
+++ b/view/theme/quattro/screenshot.jpg
Binary files differ
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
new file mode 100755
index 000000000..80d6678fb
--- /dev/null
+++ b/view/theme/quattro/search_item.tpl
@@ -0,0 +1,91 @@
+
+<div class="wall-item-decor">
+ <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+ {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="contact-photo-wrapper"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+ <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
+ $item.item_photo_menu
+ </ul>
+
+ </div>
+ <div class="wall-item-location">$item.location</div>
+ </div>
+ <div class="wall-item-content">
+ {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+ $item.body
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ </div>
+ <div class="wall-item-tags">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="">
+ {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+ </div>
+ <div class="wall-item-actions">
+ <div class="wall-item-actions-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+ </div>
+
+ <div class="wall-item-actions-social">
+ {{ if $item.star }}
+ <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+ <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+ {{ endif }}
+
+ {{ if $item.vote }}
+ <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+ <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+ {{ endif }}
+
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+ {{ endif }}
+ </div>
+
+ <div class="wall-item-actions-tools">
+
+ {{ if $item.drop.dropping }}
+ <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+ <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+ {{ endif }}
+ </div>
+
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links"></div>
+ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ {{ if $item.conv }}
+ <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+ <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+ {{ endif }}
+ </div>
+ </div>
+
+
+</div>
+
diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl
new file mode 100755
index 000000000..e771db068
--- /dev/null
+++ b/view/theme/quattro/wall_item.tpl
@@ -0,0 +1,90 @@
+
+<div class="wall-item-decor">
+ <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+ {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="contact-photo-wrapper"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+ <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+ $item.item_photo_menu
+ </ul>
+
+ </div>
+ <div class="wall-item-location">$item.location</div>
+ </div>
+ <div class="wall-item-content">
+ {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+ $item.body
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ </div>
+ <div class="wall-item-tags">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="">
+ {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+ </div>
+ <div class="wall-item-actions">
+ <div class="wall-item-actions-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+ </div>
+
+ <div class="wall-item-actions-social">
+ {{ if $item.star }}
+ <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+ <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+ {{ endif }}
+ {{ if $item.filer }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
+ {{ endif }}
+
+ {{ if $item.vote }}
+ <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+ <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+ {{ endif }}
+
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+ {{ endif }}
+ </div>
+
+ <div class="wall-item-actions-tools">
+
+ {{ if $item.drop.dropping }}
+ <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+ <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+ {{ endif }}
+ </div>
+
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links"></div>
+ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ </div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+ $item.comment
+</div>
diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl
new file mode 100755
index 000000000..693ebaba6
--- /dev/null
+++ b/view/theme/quattro/wallwall_item.tpl
@@ -0,0 +1,96 @@
+<div class="wall-item-decor">
+ <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+ {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="contact-photo-wrapper mframe wwfrom"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+ <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+ $item.item_photo_menu
+ </ul>
+
+ </div>
+ <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+ <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+ <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+ </a>
+ </div>
+ <div class="wall-item-location">$item.location</div>
+ </div>
+ <div class="wall-item-content">
+ {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+ $item.body
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ </div>
+ <div class="wall-item-tags">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+ </div>
+ <div class="wall-item-actions">
+ <div class="wall-item-actions-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+ <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
+
+ </div>
+
+ <div class="wall-item-actions-social">
+ {{ if $item.star }}
+ <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+ <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+
+ {{ endif }}
+ {{ if $item.filer }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
+ {{ endif }}
+
+ {{ if $item.vote }}
+ <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+ <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+ {{ endif }}
+
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+ {{ endif }}
+ </div>
+
+ <div class="wall-item-actions-tools">
+
+ {{ if $item.drop.dropping }}
+ <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+ <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+ {{ endif }}
+ </div>
+
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links"></div>
+ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ </div>
+</div>
+<div class="wall-item-comment-wrapper" >
+ $item.comment
+</div>
diff --git a/view/theme/shady/screenshot.jpg b/view/theme/shady/screenshot.jpg
new file mode 100644
index 000000000..79a9162a0
--- /dev/null
+++ b/view/theme/shady/screenshot.jpg
Binary files differ
diff --git a/view/theme/slackr/screenshot.jpg b/view/theme/slackr/screenshot.jpg
new file mode 100644
index 000000000..eb1586d5d
--- /dev/null
+++ b/view/theme/slackr/screenshot.jpg
Binary files differ
diff --git a/view/theme/testbubble/screenshot.jpg b/view/theme/testbubble/screenshot.jpg
new file mode 100644
index 000000000..ac9136a25
--- /dev/null
+++ b/view/theme/testbubble/screenshot.jpg
Binary files differ
diff --git a/view/theme/three-d/screenshot.jpg b/view/theme/three-d/screenshot.jpg
new file mode 100644
index 000000000..c3f8e85dc
--- /dev/null
+++ b/view/theme/three-d/screenshot.jpg
Binary files differ
diff --git a/view/theme/vier/screenshot.jpg b/view/theme/vier/screenshot.jpg
new file mode 100644
index 000000000..f8e0bf8e6
--- /dev/null
+++ b/view/theme/vier/screenshot.jpg
Binary files differ
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index e771db068..9d1dd7d70 100755
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,90 +1,78 @@
-
-<div class="wall-item-decor">
- <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
- {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent">
- <div class="wall-item-item">
- <div class="wall-item-info">
- <div class="contact-photo-wrapper"
- onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
- onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+ <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+ <div class="wall-item-info" id="wall-item-info-$item.id">
+ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
</a>
- <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
- <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
- $item.item_photo_menu
- </ul>
-
+ <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+ <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+ <ul>
+ $item.item_photo_menu
+ </ul>
+ </div>
+ </div>
+ <div class="wall-item-photo-end"></div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
- <div class="wall-item-location">$item.location</div>
- </div>
- <div class="wall-item-content">
- {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
- $item.body
- </div>
- </div>
- <div class="wall-item-bottom">
- <div class="wall-item-links">
- </div>
- <div class="wall-item-tags">
- {{ for $item.tags as $tag }}
- <span class='tag'>$tag</span>
- {{ endfor }}
</div>
- </div>
- <div class="wall-item-bottom">
- <div class="">
- {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
+
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+ <div class="body-tag">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
- <div class="wall-item-actions">
- <div class="wall-item-actions-author">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+ <div class="wall-item-tools" id="wall-item-tools-$item.id">
+ {{ if $item.vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+ <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+ {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
-
- <div class="wall-item-actions-social">
+ {{ endif }}
+ {{ if $item.plink }}
+ <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+ {{ endif }}
+
{{ if $item.star }}
- <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
- <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
- <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
- {{ endif }}
-
- {{ if $item.vote }}
- <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
- <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
- {{ endif }}
-
- {{ if $item.vote.share }}
- <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
{{ endif }}
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+ {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
-
- <div class="wall-item-actions-tools">
-
- {{ if $item.drop.dropping }}
- <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
- <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
- {{ endif }}
- {{ if $item.edpost }}
- <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
- {{ endif }}
- </div>
-
+ {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
</div>
- <div class="wall-item-bottom">
- <div class="wall-item-links"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-wrapper-end"></div>
+ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-comment-wrapper" >
+ $item.comment
</div>
-</div>
-<div class="wall-item-comment-wrapper" >
- $item.comment
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 693ebaba6..bad5680c7 100755
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,96 +1,85 @@
-<div class="wall-item-decor">
- <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
- {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
- <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
+<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
+ <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+ <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+ <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+ <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+ <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+ </div>
+ <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+ <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+ <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+ <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+ <ul>
+ $item.item_photo_menu
+ </ul>
+ </div>
-<div class="wall-item-container $item.indent">
- <div class="wall-item-item">
- <div class="wall-item-info">
- <div class="contact-photo-wrapper mframe wwfrom"
- onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
- onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
- <img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
- </a>
- <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
- <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
- $item.item_photo_menu
- </ul>
-
- </div>
- <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
- <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
- <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
- </a>
- </div>
- <div class="wall-item-location">$item.location</div>
- </div>
- <div class="wall-item-content">
- {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
- $item.body
- </div>
- </div>
- <div class="wall-item-bottom">
- <div class="wall-item-links">
- </div>
- <div class="wall-item-tags">
- {{ for $item.tags as $tag }}
- <span class='tag'>$tag</span>
- {{ endfor }}
+ </div>
+ <div class="wall-item-photo-end"></div>
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+ {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+ {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+ <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+ </div>
</div>
- </div>
- <div class="wall-item-bottom">
- <div class="wall-item-links">
- {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+ <div class="wall-item-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
+ <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$item.id" >
+ <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+ <div class="wall-item-title-end"></div>
+ <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+ <div class="body-tag">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
- <div class="wall-item-actions">
- <div class="wall-item-actions-author">
- <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
- <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
-
+ <div class="wall-item-tools" id="wall-item-tools-$item.id">
+ {{ if $item.vote }}
+ <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+ <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+ {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
-
- <div class="wall-item-actions-social">
+ {{ endif }}
+ {{ if $item.plink }}
+ <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+ {{ endif }}
+
{{ if $item.star }}
- <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
- <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a>
- <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
- <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
{{ endif }}
- {{ if $item.vote }}
- <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
- <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
- {{ endif }}
-
- {{ if $item.vote.share }}
- <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
- {{ endif }}
- </div>
-
- <div class="wall-item-actions-tools">
-
- {{ if $item.drop.dropping }}
- <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
- <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
- {{ endif }}
- {{ if $item.edpost }}
- <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
- {{ endif }}
+ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+ {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
-
+ {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+ <div class="wall-item-delete-end"></div>
</div>
- </div>
- <div class="wall-item-bottom">
- <div class="wall-item-links"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
-</div>
-<div class="wall-item-comment-wrapper" >
+ <div class="wall-item-wrapper-end"></div>
+ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-comment-separator"></div>
+ <div class="wall-item-comment-wrapper" >
$item.comment
+ </div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
</div>
+