mirror of
https://github.com/friendica/friendica
synced 2024-11-10 03:42:53 +00:00
Merge remote-tracking branch 'friendica/master'
This commit is contained in:
Fabio Comuni
commit
f6e1ddf7fb
72 changed files with 999 additions and 10983 deletions
3
boot.php
3
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.1309' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1310' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1138 );
|
||||
|
||||
|
|
@ -206,6 +206,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
|
|||
define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
|
||||
define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
|
||||
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' );
|
||||
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' );
|
||||
|
||||
/**
|
||||
* item weight for query ordering
|
||||
|
|
|
|||
|
|
@ -174,3 +174,28 @@ function random_profile() {
|
|||
return dirname($r[0]['url']);
|
||||
return '';
|
||||
}
|
||||
|
||||
|
||||
function contacts_not_grouped($uid,$start = 0,$count = 0) {
|
||||
|
||||
if(! $count) {
|
||||
$r = q("select count(*) as total from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ",
|
||||
intval($uid),
|
||||
intval($uid)
|
||||
);
|
||||
|
||||
return $r;
|
||||
|
||||
|
||||
}
|
||||
|
||||
$r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) and blocked = 0 and pending = 0 limit %d, %d",
|
||||
intval($uid),
|
||||
intval($uid),
|
||||
intval($start),
|
||||
intval($count)
|
||||
);
|
||||
|
||||
return $r;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
|
|||
'$title' => t('Groups'),
|
||||
'$edittext' => t('Edit group'),
|
||||
'$createtext' => t('Create a new group'),
|
||||
'$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''),
|
||||
'$groups' => $groups,
|
||||
'$add' => t('add'),
|
||||
));
|
||||
|
|
|
|||
65
mod/nogroup.php
Normal file
65
mod/nogroup.php
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
<?php
|
||||
|
||||
require_once('include/Contact.php');
|
||||
require_once('include/socgraph.php');
|
||||
require_once('include/contact_selectors.php');
|
||||
|
||||
function nogroup_init(&$a) {
|
||||
|
||||
if(! local_user())
|
||||
return;
|
||||
|
||||
require_once('include/group.php');
|
||||
require_once('include/contact_widgets.php');
|
||||
|
||||
if(! x($a->page,'aside'))
|
||||
$a->page['aside'] = '';
|
||||
|
||||
$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
|
||||
}
|
||||
|
||||
|
||||
function nogroup_content(&$a) {
|
||||
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
return '';
|
||||
}
|
||||
|
||||
require_once('include/Contact.php');
|
||||
$r = contacts_not_grouped(local_user());
|
||||
if(count($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
}
|
||||
$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
|
||||
|
||||
$contacts[] = array(
|
||||
'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
|
||||
'edit_hover' => t('Edit contact'),
|
||||
'photo_menu' => contact_photo_menu($rr),
|
||||
'id' => $rr['id'],
|
||||
'alt_text' => $alt_text,
|
||||
'dir_icon' => $dir_icon,
|
||||
'thumb' => $rr['thumb'],
|
||||
'name' => $rr['name'],
|
||||
'username' => $rr['name'],
|
||||
'sparkle' => $sparkle,
|
||||
'itemurl' => $rr['url'],
|
||||
'url' => $url,
|
||||
'network' => network_to_name($rr['network']),
|
||||
);
|
||||
}
|
||||
}
|
||||
$tpl = get_markup_template("nogroup-template.tpl");
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$header' => t('Contacts who are not members of a group'),
|
||||
'$contacts' => $contacts,
|
||||
'$paginate' => paginate($a),
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
|
@ -198,7 +198,7 @@ function notifications_content(&$a) {
|
|||
'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
|
||||
'$fullname' => $rr['name'],
|
||||
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
|
||||
'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
|
||||
'$activity' => array('activity', t('Post a new friend activity'), get_config('system','post_newfriend'), t('if applicable')),
|
||||
'$url' => zrl($rr['url']),
|
||||
'$knowyou' => $knowyou,
|
||||
'$approve' => t('Approve'),
|
||||
|
|
|
|||
102
mod/profiles.php
102
mod/profiles.php
|
|
@ -51,6 +51,7 @@ function profiles_post(&$a) {
|
|||
if($orig[0]['name'] != $name)
|
||||
$namechanged = true;
|
||||
|
||||
|
||||
$pdesc = notags(trim($_POST['pdesc']));
|
||||
$gender = notags(trim($_POST['gender']));
|
||||
$address = notags(trim($_POST['address']));
|
||||
|
|
@ -61,15 +62,16 @@ function profiles_post(&$a) {
|
|||
$pub_keywords = notags(trim($_POST['pub_keywords']));
|
||||
$prv_keywords = notags(trim($_POST['prv_keywords']));
|
||||
$marital = notags(trim($_POST['marital']));
|
||||
if($marital != $orig[0]['marital'])
|
||||
$maritalchanged = true;
|
||||
|
||||
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
|
||||
|
||||
// linkify the relationship target if applicable
|
||||
|
||||
$withchanged = false;
|
||||
|
||||
if(strlen($with)) {
|
||||
if($with != strip_tags($orig[0]['with'])) {
|
||||
$withchanged = true;
|
||||
$prf = '';
|
||||
$lookup = $with;
|
||||
if(strpos($lookup,'@') === 0)
|
||||
|
|
@ -134,6 +136,27 @@ function profiles_post(&$a) {
|
|||
|
||||
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
|
||||
|
||||
|
||||
|
||||
$changes = array();
|
||||
if($is_default) {
|
||||
if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status');
|
||||
if($withchanged) $changes[] = '♥ ' . t('Romantic Partner');
|
||||
if($work != $orig[0]['work']) $changes[] = t('Work/Employment');
|
||||
if($religion != $orig[0]['religion']) $changes[] = t('Religion');
|
||||
if($politic != $orig[0]['politic']) $changes[] = t('Political Views');
|
||||
if($gender != $orig[0]['gender']) $changes[] = t('Gender');
|
||||
if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference');
|
||||
if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage');
|
||||
if($interest != $orig[0]['interest']) $changes[] = t('Interests');
|
||||
if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
|
||||
|| $country_name != $orig[0]['country_name'])
|
||||
$changes[] = t('Location');
|
||||
|
||||
profile_activity($changes);
|
||||
|
||||
}
|
||||
|
||||
$r = q("UPDATE `profile`
|
||||
SET `profile-name` = '%s',
|
||||
`name` = '%s',
|
||||
|
|
@ -195,7 +218,7 @@ function profiles_post(&$a) {
|
|||
dbesc($education),
|
||||
intval($hide_friends),
|
||||
intval($a->argv[1]),
|
||||
intval($_SESSION['uid'])
|
||||
intval(local_user())
|
||||
);
|
||||
|
||||
if($r)
|
||||
|
|
@ -222,6 +245,79 @@ function profiles_post(&$a) {
|
|||
}
|
||||
|
||||
|
||||
function profile_activity($changed) {
|
||||
$a = get_app();
|
||||
|
||||
if(! local_user() || ! is_array($changed) || ! count($changed))
|
||||
return;
|
||||
|
||||
if($a->user['hidewall'] || get_config('system','block_public'))
|
||||
return;
|
||||
|
||||
if(! get_pconfig(local_user(),'system','post_profilechange'))
|
||||
return;
|
||||
|
||||
require_once('include/items.php');
|
||||
|
||||
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||
intval(local_user())
|
||||
);
|
||||
|
||||
if(! count($self))
|
||||
return;
|
||||
|
||||
$arr = array();
|
||||
$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user());
|
||||
$arr['uid'] = local_user();
|
||||
$arr['contact-id'] = $self[0]['id'];
|
||||
$arr['wall'] = 1;
|
||||
$arr['type'] = 'wall';
|
||||
$arr['gravity'] = 0;
|
||||
$arr['origin'] = 1;
|
||||
$arr['author-name'] = $arr['owner-name'] = $self[0]['name'];
|
||||
$arr['author-link'] = $arr['owner-link'] = $self[0]['url'];
|
||||
$arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
|
||||
$arr['verb'] = ACTIVITY_UPDATE;
|
||||
$arr['object-type'] = ACTIVITY_OBJ_PROFILE;
|
||||
|
||||
$A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
|
||||
|
||||
|
||||
$changes = '';
|
||||
$t = count($changed);
|
||||
$z = 0;
|
||||
foreach($changed as $ch) {
|
||||
if(strlen($changes)) {
|
||||
if ($z == ($t - 1))
|
||||
$changes .= ' and ';
|
||||
else
|
||||
$changes .= ', ';
|
||||
}
|
||||
$z ++;
|
||||
$changes .= $ch;
|
||||
}
|
||||
|
||||
$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
|
||||
|
||||
$arr['body'] = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
|
||||
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
|
||||
. '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';
|
||||
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $self[0]['url'] . '?tab=profile' . '" />' . "\n");
|
||||
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $self[0]['thumb'] . '" />' . "\n");
|
||||
$arr['object'] .= '</link></object>' . "\n";
|
||||
$arr['last-child'] = 1;
|
||||
|
||||
$arr['allow_cid'] = $a->user['allow_cid'];
|
||||
$arr['allow_gid'] = $a->user['allow_gid'];
|
||||
$arr['deny_cid'] = $a->user['deny_cid'];
|
||||
$arr['deny_gid'] = $a->user['deny_gid'];
|
||||
|
||||
$i = item_store($arr);
|
||||
if($i)
|
||||
proc_run('php',"include/notifier.php","activity","$i");
|
||||
|
||||
}
|
||||
|
||||
|
||||
function profiles_content(&$a) {
|
||||
|
|
|
|||
|
|
@ -346,6 +346,8 @@ function settings_post(&$a) {
|
|||
$suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
|
||||
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
|
||||
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
|
||||
$post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0);
|
||||
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
|
||||
|
||||
|
||||
$notify = 0;
|
||||
|
|
@ -428,6 +430,8 @@ function settings_post(&$a) {
|
|||
set_pconfig(local_user(),'expire','photos', $expire_photos);
|
||||
|
||||
set_pconfig(local_user(),'system','suggestme', $suggestme);
|
||||
set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
|
||||
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
|
||||
|
||||
|
||||
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1",
|
||||
|
|
@ -790,6 +794,11 @@ function settings_content(&$a) {
|
|||
$suggestme = get_pconfig(local_user(), 'system','suggestme');
|
||||
$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
|
||||
|
||||
$post_newfriend = get_pconfig(local_user(), 'system','post_newfriend');
|
||||
$post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
|
||||
|
||||
$post_profilechange = get_pconfig(local_user(), 'system','post_profilechange');
|
||||
$post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
|
||||
|
||||
|
||||
if(! strlen($a->user['timezone']))
|
||||
|
|
@ -878,6 +887,8 @@ function settings_content(&$a) {
|
|||
));
|
||||
|
||||
|
||||
|
||||
|
||||
$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
|
||||
? true : false);
|
||||
|
||||
|
|
@ -958,6 +969,9 @@ function settings_content(&$a) {
|
|||
|
||||
|
||||
'$h_not' => t('Notification Settings'),
|
||||
'$activity_options' => t('By default post a status message when:'),
|
||||
'$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''),
|
||||
'$post_profilechange' => array('post_profilechange', t('making an <em>interesting</em> profile change'), $post_profilechange, ''),
|
||||
'$lbl_not' => t('Send a notification email when:'),
|
||||
'$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
|
||||
'$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
|
||||
|
|
|
|||
430
util/messages.po
430
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 2.3.1309\n"
|
||||
"Project-Id-Version: 2.3.1310\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-04-11 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-04-12 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -39,8 +39,8 @@ msgstr ""
|
|||
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
|
||||
#: ../../mod/editpost.php:10 ../../mod/install.php:171
|
||||
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
|
||||
#: ../../mod/settings.php:62 ../../mod/settings.php:473
|
||||
#: ../../mod/settings.php:478 ../../mod/manage.php:86 ../../mod/network.php:6
|
||||
#: ../../mod/settings.php:99 ../../mod/settings.php:510
|
||||
#: ../../mod/settings.php:515 ../../mod/manage.php:86 ../../mod/network.php:6
|
||||
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
|
||||
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
|
||||
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
|
||||
|
|
@ -55,7 +55,7 @@ msgstr ""
|
|||
#: ../../mod/profiles.php:233 ../../mod/delegate.php:6
|
||||
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
|
||||
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:461
|
||||
#: ../../include/items.php:3121 ../../index.php:305
|
||||
#: ../../include/items.php:3132 ../../index.php:305
|
||||
msgid "Permission denied."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -84,8 +84,8 @@ msgstr ""
|
|||
msgid "Return to contact editor"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/crepair.php:148 ../../mod/settings.php:531
|
||||
#: ../../mod/settings.php:558 ../../mod/admin.php:524 ../../mod/admin.php:533
|
||||
#: ../../mod/crepair.php:148 ../../mod/settings.php:530
|
||||
#: ../../mod/settings.php:556 ../../mod/admin.php:524 ../../mod/admin.php:533
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -127,8 +127,8 @@ msgstr ""
|
|||
#: ../../mod/photos.php:1274 ../../mod/photos.php:1305
|
||||
#: ../../mod/install.php:251 ../../mod/install.php:289
|
||||
#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
|
||||
#: ../../mod/settings.php:529 ../../mod/settings.php:679
|
||||
#: ../../mod/settings.php:741 ../../mod/settings.php:926
|
||||
#: ../../mod/settings.php:528 ../../mod/settings.php:674
|
||||
#: ../../mod/settings.php:735 ../../mod/settings.php:919
|
||||
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:354
|
||||
#: ../../mod/admin.php:521 ../../mod/admin.php:650 ../../mod/admin.php:822
|
||||
#: ../../mod/admin.php:902 ../../mod/profiles.php:402 ../../mod/invite.php:119
|
||||
|
|
@ -276,8 +276,8 @@ msgid "Share this event"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
|
||||
#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:530
|
||||
#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45
|
||||
#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:529
|
||||
#: ../../mod/settings.php:555 ../../addon/js_upload/js_upload.php:45
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -321,23 +321,23 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
|
||||
#: ../../mod/settings.php:841 ../../mod/settings.php:847
|
||||
#: ../../mod/settings.php:855 ../../mod/settings.php:859
|
||||
#: ../../mod/settings.php:864 ../../mod/settings.php:870
|
||||
#: ../../mod/settings.php:876 ../../mod/settings.php:882
|
||||
#: ../../mod/settings.php:916 ../../mod/settings.php:917
|
||||
#: ../../mod/settings.php:918 ../../mod/settings.php:919
|
||||
#: ../../mod/settings.php:835 ../../mod/settings.php:841
|
||||
#: ../../mod/settings.php:849 ../../mod/settings.php:853
|
||||
#: ../../mod/settings.php:858 ../../mod/settings.php:864
|
||||
#: ../../mod/settings.php:870 ../../mod/settings.php:876
|
||||
#: ../../mod/settings.php:910 ../../mod/settings.php:911
|
||||
#: ../../mod/settings.php:912 ../../mod/settings.php:913
|
||||
#: ../../mod/register.php:532 ../../mod/profiles.php:379
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
|
||||
#: ../../mod/settings.php:841 ../../mod/settings.php:847
|
||||
#: ../../mod/settings.php:855 ../../mod/settings.php:859
|
||||
#: ../../mod/settings.php:864 ../../mod/settings.php:870
|
||||
#: ../../mod/settings.php:876 ../../mod/settings.php:882
|
||||
#: ../../mod/settings.php:916 ../../mod/settings.php:917
|
||||
#: ../../mod/settings.php:918 ../../mod/settings.php:919
|
||||
#: ../../mod/settings.php:835 ../../mod/settings.php:841
|
||||
#: ../../mod/settings.php:849 ../../mod/settings.php:853
|
||||
#: ../../mod/settings.php:858 ../../mod/settings.php:864
|
||||
#: ../../mod/settings.php:870 ../../mod/settings.php:876
|
||||
#: ../../mod/settings.php:910 ../../mod/settings.php:911
|
||||
#: ../../mod/settings.php:912 ../../mod/settings.php:913
|
||||
#: ../../mod/register.php:533 ../../mod/profiles.php:380
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
|
|
@ -360,7 +360,7 @@ msgstr ""
|
|||
msgid "Upload New Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:69 ../../mod/settings.php:24
|
||||
#: ../../mod/photos.php:69 ../../mod/settings.php:20
|
||||
msgid "everybody"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -560,8 +560,8 @@ msgstr ""
|
|||
msgid "Preview"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1332 ../../mod/settings.php:593
|
||||
#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:528
|
||||
#: ../../mod/photos.php:1332 ../../mod/settings.php:591
|
||||
#: ../../mod/settings.php:672 ../../mod/group.php:168 ../../mod/admin.php:528
|
||||
#: ../../include/conversation.php:318 ../../include/conversation.php:576
|
||||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
|
@ -633,7 +633,7 @@ msgstr ""
|
|||
msgid "Post to Email"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:95 ../../mod/settings.php:592
|
||||
#: ../../mod/editpost.php:95 ../../mod/settings.php:590
|
||||
#: ../../include/conversation.php:563
|
||||
msgid "Edit"
|
||||
msgstr ""
|
||||
|
|
@ -863,7 +863,7 @@ msgstr ""
|
|||
msgid "StatusNet/Federated Social Web"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
|
||||
#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:625
|
||||
#: ../../include/contact_selectors.php:80
|
||||
msgid "Diaspora"
|
||||
msgstr ""
|
||||
|
|
@ -1641,7 +1641,6 @@ msgstr ""
|
|||
#: ../../addon/facebook/facebook.php:622
|
||||
#: ../../addon/facebook/facebook.php:1076
|
||||
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2661
|
||||
#: ../../boot.php:679
|
||||
msgid "Administrator"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1695,490 +1694,493 @@ msgstr ""
|
|||
msgid "Reset"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:89
|
||||
msgid "Missing some important data!"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
|
||||
msgid "Update"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:197
|
||||
msgid "Failed to connect with email account using the settings provided."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:202
|
||||
msgid "Email settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:261
|
||||
msgid "Passwords do not match. Password unchanged."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:266
|
||||
msgid "Empty passwords are not allowed. Password unchanged."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:277
|
||||
msgid "Password changed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:279
|
||||
msgid "Password update failed. Please try again."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:340
|
||||
msgid " Please use a shorter name."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:342
|
||||
msgid " Name too short."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:348
|
||||
msgid " Not valid email."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:350
|
||||
msgid " Cannot change to that email."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:450
|
||||
#: ../../addon/impressum/impressum.php:75
|
||||
#: ../../addon/openstreetmap/openstreetmap.php:80
|
||||
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
|
||||
msgid "Settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:288
|
||||
#: ../../mod/settings.php:49 ../../view/theme/diabook-red/theme.php:288
|
||||
#: ../../view/theme/diabook-blue/theme.php:287
|
||||
#: ../../view/theme/diabook/theme.php:298
|
||||
#: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137
|
||||
msgid "Account settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:293
|
||||
#: ../../mod/settings.php:54 ../../view/theme/diabook-red/theme.php:293
|
||||
#: ../../view/theme/diabook-blue/theme.php:292
|
||||
#: ../../view/theme/diabook/theme.php:303
|
||||
#: ../../view/theme/diabook-aerith/theme.php:293
|
||||
msgid "Display settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:302
|
||||
#: ../../mod/settings.php:60 ../../view/theme/diabook-red/theme.php:302
|
||||
#: ../../view/theme/diabook-blue/theme.php:301
|
||||
#: ../../view/theme/diabook/theme.php:312
|
||||
#: ../../view/theme/diabook-aerith/theme.php:302
|
||||
msgid "Connector settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:307
|
||||
#: ../../mod/settings.php:65 ../../view/theme/diabook-red/theme.php:307
|
||||
#: ../../view/theme/diabook-blue/theme.php:306
|
||||
#: ../../view/theme/diabook/theme.php:317
|
||||
#: ../../view/theme/diabook-aerith/theme.php:307
|
||||
msgid "Plugin settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:312
|
||||
#: ../../view/theme/diabook-blue/theme.php:311
|
||||
#: ../../view/theme/diabook/theme.php:322
|
||||
#: ../../view/theme/diabook-aerith/theme.php:312
|
||||
msgid "Connections"
|
||||
#: ../../mod/settings.php:70
|
||||
msgid "Connected apps"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:317
|
||||
#: ../../mod/settings.php:75 ../../view/theme/diabook-red/theme.php:317
|
||||
#: ../../view/theme/diabook-blue/theme.php:316
|
||||
#: ../../view/theme/diabook/theme.php:327
|
||||
#: ../../view/theme/diabook-aerith/theme.php:317
|
||||
msgid "Export personal data"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:528 ../../mod/settings.php:555
|
||||
#: ../../mod/settings.php:591
|
||||
#: ../../mod/settings.php:83 ../../mod/admin.php:611 ../../mod/admin.php:789
|
||||
#: ../../include/nav.php:137
|
||||
msgid "Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:126
|
||||
msgid "Missing some important data!"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:129 ../../mod/settings.php:554
|
||||
#: ../../mod/admin.php:75
|
||||
msgid "Update"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:234
|
||||
msgid "Failed to connect with email account using the settings provided."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:239
|
||||
msgid "Email settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:298
|
||||
msgid "Passwords do not match. Password unchanged."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:303
|
||||
msgid "Empty passwords are not allowed. Password unchanged."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:314
|
||||
msgid "Password changed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:316
|
||||
msgid "Password update failed. Please try again."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:377
|
||||
msgid " Please use a shorter name."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:379
|
||||
msgid " Name too short."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:385
|
||||
msgid " Not valid email."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:387
|
||||
msgid " Cannot change to that email."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:457 ../../addon/facebook/facebook.php:450
|
||||
#: ../../addon/impressum/impressum.php:75
|
||||
#: ../../addon/openstreetmap/openstreetmap.php:80
|
||||
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
|
||||
msgid "Settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:527 ../../mod/settings.php:553
|
||||
#: ../../mod/settings.php:589
|
||||
msgid "Add application"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:532 ../../mod/settings.php:559
|
||||
#: ../../mod/settings.php:531 ../../mod/settings.php:557
|
||||
#: ../../addon/statusnet/statusnet.php:547
|
||||
msgid "Consumer Key"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:533 ../../mod/settings.php:560
|
||||
#: ../../mod/settings.php:532 ../../mod/settings.php:558
|
||||
#: ../../addon/statusnet/statusnet.php:546
|
||||
msgid "Consumer Secret"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:534 ../../mod/settings.php:561
|
||||
#: ../../mod/settings.php:533 ../../mod/settings.php:559
|
||||
msgid "Redirect"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:535 ../../mod/settings.php:562
|
||||
#: ../../mod/settings.php:534 ../../mod/settings.php:560
|
||||
msgid "Icon url"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:546
|
||||
#: ../../mod/settings.php:545
|
||||
msgid "You can't edit this application."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:590
|
||||
#: ../../mod/settings.php:588
|
||||
msgid "Connected Apps"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:594
|
||||
#: ../../mod/settings.php:592
|
||||
msgid "Client key starts with"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:595
|
||||
#: ../../mod/settings.php:593
|
||||
msgid "No name"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:596
|
||||
#: ../../mod/settings.php:594
|
||||
msgid "Remove authorization"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:608
|
||||
#: ../../mod/settings.php:605
|
||||
msgid "No Plugin settings configured"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
|
||||
#: ../../mod/settings.php:613 ../../addon/widgets/widgets.php:123
|
||||
msgid "Plugin Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:629 ../../mod/settings.php:630
|
||||
#: ../../mod/settings.php:625 ../../mod/settings.php:626
|
||||
#, php-format
|
||||
msgid "Built-in support for %s connectivity is %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:629 ../../mod/settings.php:630
|
||||
#: ../../mod/settings.php:625 ../../mod/settings.php:626
|
||||
msgid "enabled"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:629 ../../mod/settings.php:630
|
||||
#: ../../mod/settings.php:625 ../../mod/settings.php:626
|
||||
msgid "disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:630
|
||||
#: ../../mod/settings.php:626
|
||||
msgid "StatusNet"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:660
|
||||
#: ../../mod/settings.php:656
|
||||
msgid "Connector Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:666
|
||||
#: ../../mod/settings.php:661
|
||||
msgid "Email/Mailbox Setup"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:667
|
||||
#: ../../mod/settings.php:662
|
||||
msgid ""
|
||||
"If you wish to communicate with email contacts using this service "
|
||||
"(optional), please specify how to connect to your mailbox."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:668
|
||||
#: ../../mod/settings.php:663
|
||||
msgid "Last successful email check:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:669
|
||||
#: ../../mod/settings.php:664
|
||||
msgid "Email access is disabled on this site."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:670
|
||||
#: ../../mod/settings.php:665
|
||||
msgid "IMAP server name:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:671
|
||||
#: ../../mod/settings.php:666
|
||||
msgid "IMAP port:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:672
|
||||
#: ../../mod/settings.php:667
|
||||
msgid "Security:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:672 ../../mod/settings.php:677
|
||||
#: ../../mod/settings.php:667 ../../mod/settings.php:672
|
||||
msgid "None"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:673
|
||||
#: ../../mod/settings.php:668
|
||||
msgid "Email login name:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:674
|
||||
#: ../../mod/settings.php:669
|
||||
msgid "Email password:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:675
|
||||
#: ../../mod/settings.php:670
|
||||
msgid "Reply-to address:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:676
|
||||
#: ../../mod/settings.php:671
|
||||
msgid "Send public posts to all email contacts:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:677
|
||||
#: ../../mod/settings.php:672
|
||||
msgid "Action after import:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:677
|
||||
#: ../../mod/settings.php:672
|
||||
msgid "Mark as seen"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:677
|
||||
#: ../../mod/settings.php:672
|
||||
msgid "Move to folder"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:678
|
||||
#: ../../mod/settings.php:673
|
||||
msgid "Move to folder:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:739
|
||||
#: ../../mod/settings.php:733
|
||||
msgid "Display Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:745
|
||||
#: ../../mod/settings.php:739
|
||||
msgid "Display Theme:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:746
|
||||
#: ../../mod/settings.php:740
|
||||
msgid "Update browser every xx seconds"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:746
|
||||
#: ../../mod/settings.php:740
|
||||
msgid "Minimum of 10 seconds, no maximum"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:747
|
||||
#: ../../mod/settings.php:741
|
||||
msgid "Number of items to display on the network page:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:747
|
||||
#: ../../mod/settings.php:741
|
||||
msgid "Maximum of 100 items"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:748
|
||||
#: ../../mod/settings.php:742
|
||||
msgid "Don't show emoticons"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:502
|
||||
#: ../../mod/settings.php:802 ../../mod/admin.php:142 ../../mod/admin.php:502
|
||||
msgid "Normal Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:809
|
||||
#: ../../mod/settings.php:803
|
||||
msgid "This account is a normal personal profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:503
|
||||
#: ../../mod/settings.php:806 ../../mod/admin.php:143 ../../mod/admin.php:503
|
||||
msgid "Soapbox Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:813
|
||||
#: ../../mod/settings.php:807
|
||||
msgid "Automatically approve all connection/friend requests as read-only fans"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:504
|
||||
#: ../../mod/settings.php:810 ../../mod/admin.php:144 ../../mod/admin.php:504
|
||||
msgid "Community/Celebrity Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:817
|
||||
#: ../../mod/settings.php:811
|
||||
msgid "Automatically approve all connection/friend requests as read-write fans"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:505
|
||||
#: ../../mod/settings.php:814 ../../mod/admin.php:145 ../../mod/admin.php:505
|
||||
msgid "Automatic Friend Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:821
|
||||
#: ../../mod/settings.php:815
|
||||
msgid "Automatically approve all connection/friend requests as friends"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:831
|
||||
#: ../../mod/settings.php:825
|
||||
msgid "OpenID:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:831
|
||||
#: ../../mod/settings.php:825
|
||||
msgid "(Optional) Allow this OpenID to login to this account."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:841
|
||||
#: ../../mod/settings.php:835
|
||||
msgid "Publish your default profile in your local site directory?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:847
|
||||
#: ../../mod/settings.php:841
|
||||
msgid "Publish your default profile in the global social directory?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:855
|
||||
#: ../../mod/settings.php:849
|
||||
msgid "Hide your contact/friend list from viewers of your default profile?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:859
|
||||
#: ../../mod/settings.php:853
|
||||
msgid "Hide your profile details from unknown viewers?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:864
|
||||
#: ../../mod/settings.php:858
|
||||
msgid "Allow friends to post to your profile page?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:870
|
||||
#: ../../mod/settings.php:864
|
||||
msgid "Allow friends to tag your posts?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:876
|
||||
#: ../../mod/settings.php:870
|
||||
msgid "Allow us to suggest you as a potential friend to new members?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:882
|
||||
#: ../../mod/settings.php:876
|
||||
msgid "Permit unknown people to send you private mail?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:891
|
||||
#: ../../mod/settings.php:885
|
||||
msgid "Profile is <strong>not published</strong>."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
|
||||
#: ../../mod/settings.php:891 ../../mod/profile_photo.php:211
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:902
|
||||
#: ../../mod/settings.php:896
|
||||
msgid "Your Identity Address is"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:913
|
||||
#: ../../mod/settings.php:907
|
||||
msgid "Automatically expire posts after this many days:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:913
|
||||
#: ../../mod/settings.php:907
|
||||
msgid "If empty, posts will not expire. Expired posts will be deleted"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:914
|
||||
#: ../../mod/settings.php:908
|
||||
msgid "Advanced expiration settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:915
|
||||
#: ../../mod/settings.php:909
|
||||
msgid "Advanced Expiration"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:916
|
||||
#: ../../mod/settings.php:910
|
||||
msgid "Expire posts:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:917
|
||||
#: ../../mod/settings.php:911
|
||||
msgid "Expire personal notes:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:918
|
||||
#: ../../mod/settings.php:912
|
||||
msgid "Expire starred posts:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:919
|
||||
#: ../../mod/settings.php:913
|
||||
msgid "Expire photos:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:924
|
||||
#: ../../mod/settings.php:917
|
||||
msgid "Account Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:933
|
||||
#: ../../mod/settings.php:926
|
||||
msgid "Password Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:934
|
||||
#: ../../mod/settings.php:927
|
||||
msgid "New Password:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:935
|
||||
#: ../../mod/settings.php:928
|
||||
msgid "Confirm:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:935
|
||||
#: ../../mod/settings.php:928
|
||||
msgid "Leave password fields blank unless changing"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:939
|
||||
#: ../../mod/settings.php:932
|
||||
msgid "Basic Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
|
||||
#: ../../mod/settings.php:933 ../../include/profile_advanced.php:15
|
||||
msgid "Full Name:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:941
|
||||
#: ../../mod/settings.php:934
|
||||
msgid "Email Address:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:942
|
||||
#: ../../mod/settings.php:935
|
||||
msgid "Your Timezone:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:943
|
||||
#: ../../mod/settings.php:936
|
||||
msgid "Default Post Location:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:944
|
||||
#: ../../mod/settings.php:937
|
||||
msgid "Use Browser Location:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:947
|
||||
#: ../../mod/settings.php:940
|
||||
msgid "Security and Privacy Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:949
|
||||
#: ../../mod/settings.php:942
|
||||
msgid "Maximum Friend Requests/Day:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:949 ../../mod/settings.php:964
|
||||
#: ../../mod/settings.php:942 ../../mod/settings.php:957
|
||||
msgid "(to prevent spam abuse)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:950
|
||||
#: ../../mod/settings.php:943
|
||||
msgid "Default Post Permissions"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:951
|
||||
#: ../../mod/settings.php:944
|
||||
msgid "(click to open/close)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:964
|
||||
#: ../../mod/settings.php:957
|
||||
msgid "Maximum private messages per day from unknown people:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:967
|
||||
#: ../../mod/settings.php:960
|
||||
msgid "Notification Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:968
|
||||
#: ../../mod/settings.php:961
|
||||
msgid "Send a notification email when:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:969
|
||||
#: ../../mod/settings.php:962
|
||||
msgid "You receive an introduction"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:970
|
||||
#: ../../mod/settings.php:963
|
||||
msgid "Your introductions are confirmed"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:971
|
||||
#: ../../mod/settings.php:964
|
||||
msgid "Someone writes on your profile wall"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:972
|
||||
#: ../../mod/settings.php:965
|
||||
msgid "Someone writes a followup comment"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:973
|
||||
#: ../../mod/settings.php:966
|
||||
msgid "You receive a private message"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:974
|
||||
#: ../../mod/settings.php:967
|
||||
msgid "You receive a friend suggestion"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:975
|
||||
#: ../../mod/settings.php:968
|
||||
msgid "You are tagged in a post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:978
|
||||
#: ../../mod/settings.php:971
|
||||
msgid "Advanced Page Settings"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2735,7 +2737,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
|
||||
#: ../../mod/admin.php:562 ../../mod/admin.php:741 ../../mod/display.php:37
|
||||
#: ../../mod/display.php:142 ../../include/items.php:3033
|
||||
#: ../../mod/display.php:142 ../../include/items.php:3044
|
||||
msgid "Item not found."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3354,10 +3356,6 @@ msgstr ""
|
|||
msgid "Toggle"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:611 ../../mod/admin.php:789 ../../include/nav.php:137
|
||||
msgid "Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:618 ../../mod/admin.php:798
|
||||
msgid "Author: "
|
||||
msgstr ""
|
||||
|
|
@ -5407,6 +5405,13 @@ msgstr ""
|
|||
msgid "Your personal photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/theme.php:312
|
||||
#: ../../view/theme/diabook-blue/theme.php:311
|
||||
#: ../../view/theme/diabook/theme.php:322
|
||||
#: ../../view/theme/diabook-aerith/theme.php:312
|
||||
msgid "Connections"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/quattro/config.php:23
|
||||
msgid "Theme settings"
|
||||
msgstr ""
|
||||
|
|
@ -6283,26 +6288,10 @@ msgid "Image/photo"
|
|||
msgstr ""
|
||||
|
||||
#: ../../include/dba.php:41
|
||||
msgid "Server name of user name are missing. "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/dba.php:50
|
||||
#, php-format
|
||||
msgid "Cannot locate DNS info for database server '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/dba.php:84
|
||||
msgid "There is no db connection. "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/dba.php:107 ../../include/dba.php:109
|
||||
msgid " results"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/dba.php:113
|
||||
msgid "SQL returned "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/message.php:15 ../../include/message.php:171
|
||||
msgid "[no subject]"
|
||||
msgstr ""
|
||||
|
|
@ -6542,28 +6531,28 @@ msgid ""
|
|||
"form has been opened for too long (>3 hours) before subitting it."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:137 ../../include/conversation.php:813
|
||||
#: ../../include/Contact.php:145 ../../include/conversation.php:813
|
||||
msgid "View Status"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:138 ../../include/conversation.php:814
|
||||
#: ../../include/Contact.php:146 ../../include/conversation.php:814
|
||||
msgid "View Profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:139 ../../include/conversation.php:815
|
||||
#: ../../include/Contact.php:147 ../../include/conversation.php:815
|
||||
msgid "View Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:140 ../../include/Contact.php:153
|
||||
#: ../../include/Contact.php:148 ../../include/Contact.php:161
|
||||
#: ../../include/conversation.php:816
|
||||
msgid "Network Posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:141 ../../include/conversation.php:817
|
||||
#: ../../include/Contact.php:149 ../../include/conversation.php:817
|
||||
msgid "Edit Contact"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:142 ../../include/Contact.php:153
|
||||
#: ../../include/Contact.php:150 ../../include/Contact.php:161
|
||||
#: ../../include/conversation.php:818
|
||||
msgid "Send PM"
|
||||
msgstr ""
|
||||
|
|
@ -6766,11 +6755,6 @@ msgstr ""
|
|||
msgid "show fewer"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:676
|
||||
#, php-format
|
||||
msgid "Update Error at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:773
|
||||
msgid "Create a New Account"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@
|
|||
<div id="sidebar-new-group">
|
||||
<a href="group/new">$createtext</a>
|
||||
</div>
|
||||
{{ if $ungrouped }}
|
||||
<div id="sidebar-ungrouped">
|
||||
<a href="nogroup">$ungrouped</a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
12
view/nogroup-template.tpl
Normal file
12
view/nogroup-template.tpl
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<h1>$header</h1>
|
||||
|
||||
{{ for $contacts as $contact }}
|
||||
{{ inc contact_template.tpl }}{{ endinc }}
|
||||
{{ endfor }}
|
||||
<div id="contact-edit-end"></div>
|
||||
|
||||
$paginate
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -99,7 +99,13 @@ $unkmail
|
|||
|
||||
<h3 class="settings-heading">$h_not</h3>
|
||||
|
||||
<div id="settings-notify-desc">$lbl_not </div>
|
||||
<strong>$activity_options</strong>
|
||||
|
||||
{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
|
||||
{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
|
||||
|
||||
|
||||
<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
|
||||
|
||||
<div class="group">
|
||||
{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
|
||||
|
|
|
|||
11
view/theme/diabook-aerith/generic_links_widget.tpl
Normal file
11
view/theme/diabook-aerith/generic_links_widget.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="widget_$title">
|
||||
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
|
||||
{{if $desc}}<div class="desc">$desc</div>{{endif}}
|
||||
|
||||
<ul class="rs_tabs">
|
||||
{{ for $items as $item }}
|
||||
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 680 B After Width: | Height: | Size: 774 B |
Binary file not shown.
|
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 723 B |
Binary file not shown.
|
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 706 B |
Binary file not shown.
|
Before Width: | Height: | Size: 664 B After Width: | Height: | Size: 637 B |
Binary file not shown.
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 764 B |
Binary file not shown.
|
Before Width: | Height: | Size: 710 B After Width: | Height: | Size: 664 B |
Binary file not shown.
|
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 688 B |
11
view/theme/diabook-aerith/nets.tpl
Normal file
11
view/theme/diabook-aerith/nets.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
|
||||
<ul class="nets-ul">
|
||||
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
|
||||
{{ for $nets as $net }}
|
||||
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
</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-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>
|
||||
<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>
|
||||
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></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<span class="menu-profile-icon photos"></span></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<span class="menu-profile-icon pscontacts"></span></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<span class="menu-profile-icon events"></span></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<span class="menu-profile-icon notes"></span></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<span class="menu-profile-icon foren"></span></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<span class="menu-profile-icon com_side"></span></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
|
||||
<ul class="rs_tabs">
|
||||
{{ for $tabs as $tab }}
|
||||
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
|
@ -482,8 +482,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover ,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: aliceBlue;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -941,43 +942,57 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: aliceBlue;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -527,8 +527,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: aliceBlue;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -1062,43 +1063,56 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: aliceBlue;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
@ -2147,6 +2161,41 @@ ul.tabs li .active {
|
|||
box-shadow: 2px 2px 2px #CFCFCF;
|
||||
margin-left: 5px;
|
||||
}
|
||||
//settings tabs
|
||||
ul.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
}
|
||||
ul.rs_tabs li {
|
||||
float: left;
|
||||
margin-bottom: 30px;
|
||||
clear: both;
|
||||
}
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #3465A4;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
box-shadow: 2px 2px 2px #CFCFCF;
|
||||
font-size: 13px;
|
||||
}
|
||||
.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
height: 27px;
|
||||
padding: 0;
|
||||
}
|
||||
.rs_tab.button {
|
||||
/*background: none repeat scroll 0 0 #F8F8F8;*/
|
||||
border: 1px solid #CCCCCC;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
font-weight: bolder;
|
||||
padding: 3px;
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
}
|
||||
/**
|
||||
* Form fields
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
/*
|
||||
* Name: Diabook-aerith
|
||||
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version: (Version: 1.016)
|
||||
* Version: (Version: 1.017)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook-aerith (Version: 1.016)";
|
||||
$diabook_version = "Diabook-aerith (Version: 1.017)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
|
||||
|
|
@ -22,7 +22,6 @@ $cssFile = null;
|
|||
*/
|
||||
function diabook_aerith_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
// last 12 users
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
|
|
@ -280,55 +279,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
|||
}
|
||||
}
|
||||
|
||||
//tabs at right_aside on settings page
|
||||
if ($a->argv[0] === "settings"){
|
||||
|
||||
$tabs = array(
|
||||
array(
|
||||
'label' => t('Account settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings',
|
||||
'sel' => (($a->argc == 1)?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Display settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/display',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Edit/Manage Profiles'),
|
||||
'url' => $a->get_baseurl(true).'/profiles',
|
||||
),
|
||||
array(
|
||||
'label' => t('Connector settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/connectors',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Plugin settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/addon',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Connections'),
|
||||
'url' => $a->get_baseurl(true) . '/settings/oauth',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Export personal data'),
|
||||
'url' => $a->get_baseurl(true) . '/uexport',
|
||||
'sel' => ''
|
||||
)
|
||||
);
|
||||
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
|
||||
$a->page['aside'] = replace_macros($tabtpl, array(
|
||||
'$tabs' => $tabs,
|
||||
));
|
||||
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css";
|
||||
|
||||
}
|
||||
|
||||
|
||||
// custom css
|
||||
|
|
|
|||
11
view/theme/diabook-blue/generic_links_widget.tpl
Normal file
11
view/theme/diabook-blue/generic_links_widget.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="widget_$title">
|
||||
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
|
||||
{{if $desc}}<div class="desc">$desc</div>{{endif}}
|
||||
|
||||
<ul class="rs_tabs">
|
||||
{{ for $items as $item }}
|
||||
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 680 B After Width: | Height: | Size: 774 B |
Binary file not shown.
|
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 723 B |
Binary file not shown.
|
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 706 B |
Binary file not shown.
|
Before Width: | Height: | Size: 664 B After Width: | Height: | Size: 637 B |
Binary file not shown.
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 764 B |
Binary file not shown.
|
Before Width: | Height: | Size: 710 B After Width: | Height: | Size: 664 B |
Binary file not shown.
|
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 688 B |
11
view/theme/diabook-blue/nets.tpl
Normal file
11
view/theme/diabook-blue/nets.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
|
||||
<ul class="nets-ul">
|
||||
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
|
||||
{{ for $nets as $net }}
|
||||
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
</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-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>
|
||||
<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>
|
||||
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></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<span class="menu-profile-icon photos"></span></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<span class="menu-profile-icon pscontacts"></span></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<span class="menu-profile-icon events"></span></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<span class="menu-profile-icon notes"></span></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<span class="menu-profile-icon foren"></span></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<span class="menu-profile-icon com_side"></span></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
|
||||
<ul class="rs_tabs">
|
||||
{{ for $tabs as $tab }}
|
||||
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
|
@ -482,8 +482,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: #308DBF;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -907,43 +908,57 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: #308DBF;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -526,8 +526,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: #308DBF;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -1031,43 +1032,57 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: #308DBF;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
@ -2103,6 +2118,41 @@ ul.tabs li .active {
|
|||
box-shadow: 0 1px 1px #CFCFCF;
|
||||
margin-left: 5px;
|
||||
}
|
||||
//settings tabs
|
||||
ul.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
}
|
||||
ul.rs_tabs li {
|
||||
float: left;
|
||||
margin-bottom: 30px;
|
||||
clear: both;
|
||||
}
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #055580;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
box-shadow: 2px 2px 2px #CFCFCF;
|
||||
font-size: 13px;
|
||||
}
|
||||
.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
height: 27px;
|
||||
padding: 0;
|
||||
}
|
||||
.rs_tab.button {
|
||||
/*background: none repeat scroll 0 0 #F8F8F8;*/
|
||||
border: 1px solid #CCCCCC;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
font-weight: bolder;
|
||||
padding: 3px;
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
}
|
||||
/**
|
||||
* Form fields
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
/*
|
||||
* Name: Diabook-blue
|
||||
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version: (Version: 1.016)
|
||||
* Version: (Version: 1.017)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook-blue (Version: 1.016)";
|
||||
$diabook_version = "Diabook-blue (Version: 1.017)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -21,7 +21,6 @@ $cssFile = null;
|
|||
*/
|
||||
function diabook_blue_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
// last 12 users
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
|
|
@ -279,56 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
|||
}
|
||||
}
|
||||
|
||||
//tabs at right_aside on settings page
|
||||
if ($a->argv[0] === "settings"){
|
||||
|
||||
$tabs = array(
|
||||
array(
|
||||
'label' => t('Account settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings',
|
||||
'sel' => (($a->argc == 1)?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Display settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/display',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Edit/Manage Profiles'),
|
||||
'url' => $a->get_baseurl(true).'/profiles',
|
||||
),
|
||||
array(
|
||||
'label' => t('Connector settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/connectors',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Plugin settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/addon',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Connections'),
|
||||
'url' => $a->get_baseurl(true) . '/settings/oauth',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Export personal data'),
|
||||
'url' => $a->get_baseurl(true) . '/uexport',
|
||||
'sel' => ''
|
||||
)
|
||||
);
|
||||
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
|
||||
$a->page['aside'] = replace_macros($tabtpl, array(
|
||||
'$tabs' => $tabs,
|
||||
));
|
||||
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
|
||||
|
||||
}
|
||||
|
||||
|
||||
// custom css
|
||||
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||
|
|
|
|||
11
view/theme/diabook-red/generic_links_widget.tpl
Normal file
11
view/theme/diabook-red/generic_links_widget.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="widget_$title">
|
||||
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
|
||||
{{if $desc}}<div class="desc">$desc</div>{{endif}}
|
||||
|
||||
<ul class="rs_tabs">
|
||||
{{ for $items as $item }}
|
||||
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 680 B After Width: | Height: | Size: 774 B |
Binary file not shown.
|
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 723 B |
Binary file not shown.
|
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 706 B |
Binary file not shown.
|
Before Width: | Height: | Size: 664 B After Width: | Height: | Size: 637 B |
Binary file not shown.
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 764 B |
Binary file not shown.
|
Before Width: | Height: | Size: 710 B After Width: | Height: | Size: 664 B |
Binary file not shown.
|
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 688 B |
11
view/theme/diabook-red/nets.tpl
Normal file
11
view/theme/diabook-red/nets.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
|
||||
<ul class="nets-ul">
|
||||
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
|
||||
{{ for $nets as $net }}
|
||||
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
</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-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>
|
||||
<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>
|
||||
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></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<span class="menu-profile-icon photos"></span></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<span class="menu-profile-icon pscontacts"></span></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<span class="menu-profile-icon events"></span></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<span class="menu-profile-icon notes"></span></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<span class="menu-profile-icon foren"></span></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<span class="menu-profile-icon com_side"></span></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
|
||||
<ul class="rs_tabs">
|
||||
{{ for $tabs as $tab }}
|
||||
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
|
@ -482,8 +482,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: #FFE499;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -942,43 +943,56 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: #FFE499;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -526,8 +526,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: #FFE499;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -1061,43 +1062,56 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: #FFE499;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
@ -2132,6 +2146,41 @@ ul.tabs li .active {
|
|||
box-shadow: 2px 2px 2px #CFCFCF;
|
||||
margin-left: 5px;
|
||||
}
|
||||
//settings tabs
|
||||
ul.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
}
|
||||
ul.rs_tabs li {
|
||||
float: left;
|
||||
margin-bottom: 30px;
|
||||
clear: both;
|
||||
}
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #535353;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
box-shadow: 2px 2px 2px #CFCFCF;
|
||||
font-size: 13px;
|
||||
}
|
||||
.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
height: 27px;
|
||||
padding: 0;
|
||||
}
|
||||
.rs_tab.button {
|
||||
/*background: none repeat scroll 0 0 #F8F8F8;*/
|
||||
border: 1px solid #CCCCCC;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
font-weight: bolder;
|
||||
padding: 3px;
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
}
|
||||
/**
|
||||
* Form fields
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
/*
|
||||
* Name: Diabook-red
|
||||
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version: (Version: 1.016)
|
||||
* Version: (Version: 1.017)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook-red (Version: 1.016)";
|
||||
$diabook_version = "Diabook-red (Version: 1.017)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -21,7 +21,6 @@ $cssFile = null;
|
|||
*/
|
||||
function diabook_red_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
// last 12 users
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
|
|
@ -279,58 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//tabs at right_aside on settings page
|
||||
if ($a->argv[0] === "settings"){
|
||||
|
||||
$tabs = array(
|
||||
array(
|
||||
'label' => t('Account settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings',
|
||||
'sel' => (($a->argc == 1)?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Display settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/display',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Edit/Manage Profiles'),
|
||||
'url' => $a->get_baseurl(true).'/profiles',
|
||||
),
|
||||
array(
|
||||
'label' => t('Connector settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/connectors',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Plugin settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/addon',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Connections'),
|
||||
'url' => $a->get_baseurl(true) . '/settings/oauth',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Export personal data'),
|
||||
'url' => $a->get_baseurl(true) . '/uexport',
|
||||
'sel' => ''
|
||||
)
|
||||
);
|
||||
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
|
||||
$a->page['aside'] = replace_macros($tabtpl, array(
|
||||
'$tabs' => $tabs,
|
||||
));
|
||||
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css";
|
||||
|
||||
}
|
||||
|
||||
|
||||
// custom css
|
||||
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||
|
||||
|
|
|
|||
11
view/theme/diabook/generic_links_widget.tpl
Normal file
11
view/theme/diabook/generic_links_widget.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="widget_$title">
|
||||
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
|
||||
{{if $desc}}<div class="desc">$desc</div>{{endif}}
|
||||
|
||||
<ul class="rs_tabs">
|
||||
{{ for $items as $item }}
|
||||
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 680 B After Width: | Height: | Size: 774 B |
Binary file not shown.
|
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 723 B |
Binary file not shown.
|
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 706 B |
Binary file not shown.
|
Before Width: | Height: | Size: 664 B After Width: | Height: | Size: 637 B |
Binary file not shown.
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 764 B |
Binary file not shown.
|
Before Width: | Height: | Size: 710 B After Width: | Height: | Size: 664 B |
Binary file not shown.
|
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 688 B |
11
view/theme/diabook/nets.tpl
Normal file
11
view/theme/diabook/nets.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<div id="nets-sidebar" class="widget">
|
||||
<h3>$title</h3>
|
||||
<div id="nets-desc">$desc</div>
|
||||
|
||||
<ul class="nets-ul">
|
||||
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
|
||||
{{ for $nets as $net }}
|
||||
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
</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-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>
|
||||
<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>
|
||||
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></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<span class="menu-profile-icon photos"></span></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<span class="menu-profile-icon pscontacts"></span></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<span class="menu-profile-icon events"></span></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<span class="menu-profile-icon notes"></span></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<span class="menu-profile-icon foren"></span></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<span class="menu-profile-icon com_side"></span></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
|
||||
<ul class="rs_tabs">
|
||||
{{ for $tabs as $tab }}
|
||||
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
|
@ -484,8 +484,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: #E7F2F7;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -899,43 +900,56 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: #E7F2F7;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.menu-profile-list-item:hover{
|
||||
text-decoration: none;
|
||||
}
|
||||
/*http://prothemedesign.com/circular-icons/*/
|
||||
.menu-profile-list.home{
|
||||
.menu-profile-icon.home{
|
||||
background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.pscontacts{
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
|
||||
/* aside */
|
||||
aside {
|
||||
|
|
|
|||
|
|
@ -483,8 +483,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover{
|
||||
background: #E7F2F7;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -897,8 +898,6 @@ ul.menu-popup .empty {
|
|||
.menu-profile-list{
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
padding-left: 16px;
|
||||
min-height: 16px;
|
||||
list-style: none;
|
||||
|
|
@ -908,28 +907,29 @@ ul.menu-popup .empty {
|
|||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.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-icon.home{
|
||||
background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.photos{
|
||||
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.events{
|
||||
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.notes{
|
||||
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.foren{
|
||||
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
|
||||
}
|
||||
.menu-profile-list.com_side{
|
||||
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
|
||||
}
|
||||
|
||||
/* aside */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -529,8 +529,9 @@ code {
|
|||
}
|
||||
#saved-search-ul .tool:hover,
|
||||
#nets-sidebar .tool:hover,
|
||||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
#sidebar-group-list .tool:hover,
|
||||
#fileas-sidebar .tool:hover {
|
||||
background: #E7F2F7;
|
||||
}
|
||||
.tool .label {
|
||||
float: left;
|
||||
|
|
@ -1023,43 +1024,56 @@ ul.menu-popup .empty {
|
|||
.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;
|
||||
background: #E7F2F7;
|
||||
}
|
||||
.menu-profile-list-item{
|
||||
padding-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.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-icon.home{
|
||||
background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
.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{
|
||||
.menu-profile-icon.photos{
|
||||
background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.events{
|
||||
background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.notes{
|
||||
background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.foren{
|
||||
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.com_side{
|
||||
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
.menu-profile-icon.pscontacts{
|
||||
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
|
||||
}
|
||||
float: left;
|
||||
height: 22px;
|
||||
width: 22px;}
|
||||
|
||||
/* aside */
|
||||
aside {
|
||||
|
|
@ -1288,6 +1302,7 @@ body .pageheader{
|
|||
color: #333333;
|
||||
}
|
||||
|
||||
|
||||
#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
|
@ -2072,6 +2087,41 @@ ul.tabs li .active {
|
|||
box-shadow: 0 1px 1px #CFCFCF;
|
||||
margin-left: 5px;
|
||||
}
|
||||
//settings tabs
|
||||
ul.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
}
|
||||
ul.rs_tabs li {
|
||||
float: left;
|
||||
margin-bottom: 30px;
|
||||
clear: both;
|
||||
}
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #333;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
box-shadow: 2px 2px 2px #CFCFCF;
|
||||
font-size: 13px;
|
||||
}
|
||||
.rs_tabs {
|
||||
list-style-type: none;
|
||||
font-size: 11px;
|
||||
background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
height: 27px;
|
||||
padding: 0;
|
||||
}
|
||||
.rs_tab.button {
|
||||
/*background: none repeat scroll 0 0 #F8F8F8;*/
|
||||
border: 1px solid #CCCCCC;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
font-weight: bolder;
|
||||
padding: 3px;
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
}
|
||||
/**
|
||||
* Form fields
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
/*
|
||||
* Name: Diabook
|
||||
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version: (Version: 1.016)
|
||||
* Version: (Version: 1.017)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook (Version: 1.016)";
|
||||
$diabook_version = "Diabook (Version: 1.017)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -24,7 +24,7 @@ $cssFile = null;
|
|||
|
||||
function diabook_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
|
||||
// last 12 users
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
|
|
@ -288,58 +288,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//tabs at aside on settings page
|
||||
if ($a->argv[0] === "settings"){
|
||||
|
||||
$tabs = array(
|
||||
array(
|
||||
'label' => t('Account settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings',
|
||||
'sel' => (($a->argc == 1)?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Display settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/display',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Edit/Manage Profiles'),
|
||||
'url' => $a->get_baseurl(true).'/profiles',
|
||||
),
|
||||
array(
|
||||
'label' => t('Connector settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/connectors',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Plugin settings'),
|
||||
'url' => $a->get_baseurl(true).'/settings/addon',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Connections'),
|
||||
'url' => $a->get_baseurl(true) . '/settings/oauth',
|
||||
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
|
||||
),
|
||||
array(
|
||||
'label' => t('Export personal data'),
|
||||
'url' => $a->get_baseurl(true) . '/uexport',
|
||||
'sel' => ''
|
||||
)
|
||||
);
|
||||
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
|
||||
$a->page['aside'] = replace_macros($tabtpl, array(
|
||||
'$tabs' => $tabs,
|
||||
));
|
||||
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
|
||||
|
||||
}
|
||||
|
||||
// custom css
|
||||
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue