friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote branch 'upstream/master'

This commit is contained in:
zottel 2012-04-03 09:27:46 +02:00
parent 7127626f55 5d0d9f8772
commit e5cd5aab5c
41 changed files with 471 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1299' );
define ( 'FRIENDICA_VERSION', '2.3.1300' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );

8
include/delivery.php
View File

@ -321,6 +321,14 @@ function delivery_run($argv, $argc){
$x[0]['writable'] = 1;
}
$ssl_policy = get_config('system','ssl_policy');
fix_contact_ssl_policy($x[0],$ssl_policy);
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);

45
include/network.php
View File

@ -824,3 +824,48 @@ function scale_external_images($s,$include_link = true) {
}
return $s;
}
function fix_contact_ssl_policy(&$contact,$new_policy) {
$ssl_changed = false;
if((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'],'https:')) {
$ssl_changed = true;
$contact['url'] = str_replace('https:','http:',$contact['url']);
$contact['request'] = str_replace('https:','http:',$contact['request']);
$contact['notify'] = str_replace('https:','http:',$contact['notify']);
$contact['poll'] = str_replace('https:','http:',$contact['poll']);
$contact['confirm'] = str_replace('https:','http:',$contact['confirm']);
$contact['poco'] = str_replace('https:','http:',$contact['poco']);
}
if((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'],'http:')) {
$ssl_changed = true;
$contact['url'] = str_replace('http:','https:',$contact['url']);
$contact['request'] = str_replace('http:','https:',$contact['request']);
$contact['notify'] = str_replace('http:','https:',$contact['notify']);
$contact['poll'] = str_replace('http:','https:',$contact['poll']);
$contact['confirm'] = str_replace('http:','https:',$contact['confirm']);
$contact['poco'] = str_replace('http:','https:',$contact['poco']);
}
if($ssl_changed) {
q("update contact set
url = '%s',
request = '%s',
notify = '%s',
poll = '%s',
confirm = '%s',
poco = '%s'
where id = %d limit 1",
dbesc($contact['url']),
dbesc($contact['request']),
dbesc($contact['notify']),
dbesc($contact['poll']),
dbesc($contact['confirm']),
dbesc($contact['poco']),
intval($contact['id'])
);
}
}

11
include/notifier.php
View File

@ -537,6 +537,17 @@ function notifier_run($argv, $argc){
$x[0]['writable'] = 1;
}
// if contact's ssl policy changed, which we just determined
// is on our own server, update our contact links
$ssl_policy = get_config('system','ssl_policy');
fix_contact_ssl_policy($x[0],$ssl_policy);
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);

3
include/text.php
View File

@ -225,6 +225,9 @@ if(! function_exists('paginate')) {
function paginate(&$a) {
$o = '';
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];

1
index.php
View File

@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
if(x($_GET,'zrl')) {
$_SESSION['my_url'] = $_GET['zrl'];
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
}
/**

33
mod/admin.php
View File

@ -208,6 +208,38 @@ function admin_page_site_post(&$a){
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
if($ssl_policy == SSL_POLICY_FULL) {
q("update `contact` set
`url` = replace(`url` , 'http:' , 'https:'),
`photo` = replace(`photo` , 'http:' , 'https:'),
`thumb` = replace(`thumb` , 'http:' , 'https:'),
`micro` = replace(`micro` , 'http:' , 'https:'),
`request` = replace(`request`, 'http:' , 'https:'),
`notify` = replace(`notify` , 'http:' , 'https:'),
`poll` = replace(`poll` , 'http:' , 'https:'),
`confirm` = replace(`confirm`, 'http:' , 'https:'),
`poco` = replace(`poco` , 'http:' , 'https:')
where `self` = 1"
);
}
elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
q("update `contact` set
`url` = replace(`url` , 'https:' , 'http:'),
`photo` = replace(`photo` , 'https:' , 'http:'),
`thumb` = replace(`thumb` , 'https:' , 'http:'),
`micro` = replace(`micro` , 'https:' , 'http:'),
`request` = replace(`request`, 'https:' , 'http:'),
`notify` = replace(`notify` , 'https:' , 'http:'),
`poll` = replace(`poll` , 'https:' , 'http:'),
`confirm` = replace(`confirm`, 'https:' , 'http:'),
`poco` = replace(`poco` , 'https:' , 'http:')
where `self` = 1"
);
}
}
set_config('system','ssl_policy',$ssl_policy);
set_config('config','sitename',$sitename);
if ($banner==""){
// don't know why, but del_config doesn't work...
@ -218,7 +250,6 @@ function admin_page_site_post(&$a){
} else {
set_config('system','banner', $banner);
}
set_config('system','ssl_policy',$ssl_policy);
set_config('system','language', $language);
set_config('system','theme', $theme);
set_config('system','maximagesize', $maximagesize);

59
mod/dfrn_notify.php
View File

@ -99,65 +99,10 @@ function dfrn_notify_post(&$a) {
$importer['forum'] = $page;
}
// if contact's ssl policy changed, update our links
$ssl_changed = false;
if($ssl_policy == 'self' && strstr($importer['url'],'https:')) {
$ssl_changed = true;
$importer['url'] = str_replace('https:','http:',$importer['url']);
$importer['nurl'] = normalise_link($importer['url']);
$importer['photo'] = str_replace('https:','http:',$importer['photo']);
$importer['thumb'] = str_replace('https:','http:',$importer['thumb']);
$importer['micro'] = str_replace('https:','http:',$importer['micro']);
$importer['request'] = str_replace('https:','http:',$importer['request']);
$importer['notify'] = str_replace('https:','http:',$importer['notify']);
$importer['poll'] = str_replace('https:','http:',$importer['poll']);
$importer['confirm'] = str_replace('https:','http:',$importer['confirm']);
$importer['poco'] = str_replace('https:','http:',$importer['poco']);
}
if($ssl_policy == 'full' && strstr($importer['url'],'http:')) {
$ssl_changed = true;
$importer['url'] = str_replace('http:','https:',$importer['url']);
$importer['nurl'] = normalise_link($importer['url']);
$importer['photo'] = str_replace('http:','https:',$importer['photo']);
$importer['thumb'] = str_replace('http:','https:',$importer['thumb']);
$importer['micro'] = str_replace('http:','https:',$importer['micro']);
$importer['request'] = str_replace('http:','https:',$importer['request']);
$importer['notify'] = str_replace('http:','https:',$importer['notify']);
$importer['poll'] = str_replace('http:','https:',$importer['poll']);
$importer['confirm'] = str_replace('http:','https:',$importer['confirm']);
$importer['poco'] = str_replace('http:','https:',$importer['poco']);
}
if($ssl_changed) {
q("update contact set
url = '%s',
nurl = '%s',
photo = '%s',
thumb = '%s',
micro = '%s',
request = '%s',
notify = '%s',
poll = '%s',
confirm = '%s',
poco = '%s'
where id = %d limit 1",
dbesc($importer['url']),
dbesc($importer['nurl']),
dbesc($importer['photo']),
dbesc($importer['thumb']),
dbesc($importer['micro']),
dbesc($importer['request']),
dbesc($importer['notify']),
dbesc($importer['poll']),
dbesc($importer['confirm']),
dbesc($importer['poco']),
intval($importer['id'])
);
}
fix_contact_ssl_policy($importer,$ssl_policy);
logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
logger('dfrn_notify: data: ' . $data, LOGGER_DATA);

8
mod/events.php
View File

@ -284,11 +284,11 @@ function events_content(&$a) {
if (x($_GET,'id')){
$tpl = get_markup_template("event.tpl");
} else {
if (get_config('experimentals','new_calendar')==1){
// if (get_config('experimentals','new_calendar')==1){
$tpl = get_markup_template("events-js.tpl");
} else {
$tpl = get_markup_template("events.tpl");
}
// } else {
// $tpl = get_markup_template("events.tpl");
// }
}
$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),

2
view/theme/diabook-aerith/jot.tpl
View File

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div>
<div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

4
view/theme/diabook-aerith/profile_vcard.tpl
View File

@ -21,9 +21,9 @@
</div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }}

17
view/theme/diabook-aerith/style-network.css
View File

@ -1198,10 +1198,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1256,7 +1260,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1613,6 +1617,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;

18
view/theme/diabook-aerith/style-profile.css
View File

@ -1193,10 +1193,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1251,7 +1255,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1603,6 +1607,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2076,6 +2085,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
border-radius: 10px;
}
.lframe {
float: left;

6
view/theme/diabook-aerith/style-settings.css
View File

@ -1191,8 +1191,10 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
#id_username {

19
view/theme/diabook-aerith/style.css
View File

@ -1,4 +1,4 @@
/opt/lampp/htdocs/friendica/view/theme/diabook/search_item.tpl/**
/**
* Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
* Additional Changes: Michael Vogel <icarus@dabo.de>
**/
@ -1062,6 +1062,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
font-weight: bold;
@ -1254,10 +1255,14 @@ section {
}
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1622,6 +1627,11 @@ body .pageheader{
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2096,6 +2106,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
border-radius: 10px;
}
.lframe {
float: left;

75
view/theme/diabook-aerith/theme.php
View File

@ -3,7 +3,7 @@
/*
* 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: (Version: 1.011)
* Author:
*/
@ -164,7 +164,8 @@ function diabook_aerith_community_info(){
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts
$a->page['htmlhead'] .= <<< EOT
$a->page['htmlhead'] .= '
<script>
$(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
</script>';
</script>
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie('close_pages') == '1')
if($.cookie("close_pages") == "1")
{
document.getElementById( "close_pages" ).style.display = "none";
};
if($.cookie('close_helpers') == '1')
if($.cookie("close_helpers") == "1")
{
document.getElementById( "close_helpers" ).style.display = "none";
};
if($.cookie('close_services') == '1')
if($.cookie("close_services") == "1")
{
document.getElementById( "close_services" ).style.display = "none";
};
if($.cookie('close_friends') == '1')
if($.cookie("close_friends") == "1")
{
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie('close_postit') == '1')
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie('close_lastusers') == '1')
if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
};
if($.cookie('close_lastphotos') == '1')
if($.cookie("close_lastphotos") == "1")
{
document.getElementById( "close_lastphotos" ).style.display = "none";
};
if($.cookie('close_lastlikes') == '1')
if($.cookie("close_lastlikes") == "1")
{
document.getElementById( "close_lastlikes" ).style.display = "none";
};}
@ -374,57 +377,55 @@ $("right_aside").ready(function(){
function close_pages(){
document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' });
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' });
$.cookie("close_helpers","1", { expires: 365, path: "/" });
};
function close_services(){
document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' });
$.cookie("close_services","1", { expires: 365, path: "/" });
};
function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' });
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' });
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
};
function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
};
function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' });
$.cookie('close_helpers','2', { expires: 365, path: '/' });
$.cookie('close_services','2', { expires: 365, path: '/' });
$.cookie('close_friends','2', { expires: 365, path: '/' });
$.cookie('close_postit','2', { expires: 365, path: '/' });
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
alert('Right-hand column was restored. Please refresh your browser');
};
</script>
EOT;
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
</script>';}

4
view/theme/diabook-aerith/wallwall_item.tpl
View File

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

2
view/theme/diabook-blue/jot.tpl
View File

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div>
<div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

4
view/theme/diabook-blue/profile_vcard.tpl
View File

@ -21,9 +21,9 @@
</div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }}

17
view/theme/diabook-blue/style-network.css
View File

@ -1160,10 +1160,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1215,7 +1219,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1571,6 +1575,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;

18
view/theme/diabook-blue/style-profile.css
View File

@ -1159,10 +1159,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1214,7 +1218,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1566,6 +1570,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2035,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
border-radius: 10px;
}
.lframe {
float: left;

6
view/theme/diabook-blue/style-settings.css
View File

@ -1156,8 +1156,10 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
#id_username {

17
view/theme/diabook-blue/style.css
View File

@ -1030,6 +1030,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
font-weight: bold;
@ -1210,10 +1211,14 @@ section {
}
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1575,6 +1580,11 @@ body .pageheader{
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2044,6 +2054,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
border-radius: 10px;
}
.lframe {
float: left;

75
view/theme/diabook-blue/theme.php
View File

@ -3,7 +3,7 @@
/*
* 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: (Version: 1.011)
* Author:
*/
@ -164,7 +164,8 @@ function diabook_blue_community_info(){
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts
$a->page['htmlhead'] .= <<< EOT
$a->page['htmlhead'] .= '
<script>
$(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
</script>';
</script>
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie('close_pages') == '1')
if($.cookie("close_pages") == "1")
{
document.getElementById( "close_pages" ).style.display = "none";
};
if($.cookie('close_helpers') == '1')
if($.cookie("close_helpers") == "1")
{
document.getElementById( "close_helpers" ).style.display = "none";
};
if($.cookie('close_services') == '1')
if($.cookie("close_services") == "1")
{
document.getElementById( "close_services" ).style.display = "none";
};
if($.cookie('close_friends') == '1')
if($.cookie("close_friends") == "1")
{
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie('close_postit') == '1')
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie('close_lastusers') == '1')
if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
};
if($.cookie('close_lastphotos') == '1')
if($.cookie("close_lastphotos") == "1")
{
document.getElementById( "close_lastphotos" ).style.display = "none";
};
if($.cookie('close_lastlikes') == '1')
if($.cookie("close_lastlikes") == "1")
{
document.getElementById( "close_lastlikes" ).style.display = "none";
};}
@ -374,57 +377,55 @@ $("right_aside").ready(function(){
function close_pages(){
document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' });
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' });
$.cookie("close_helpers","1", { expires: 365, path: "/" });
};
function close_services(){
document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' });
$.cookie("close_services","1", { expires: 365, path: "/" });
};
function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' });
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' });
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
};
function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
};
function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' });
$.cookie('close_helpers','2', { expires: 365, path: '/' });
$.cookie('close_services','2', { expires: 365, path: '/' });
$.cookie('close_friends','2', { expires: 365, path: '/' });
$.cookie('close_postit','2', { expires: 365, path: '/' });
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
alert('Right-hand column was restored. Please refresh your browser');
};
</script>
EOT;
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
</script>';}

4
view/theme/diabook-blue/wallwall_item.tpl
View File

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

2
view/theme/diabook-red/jot.tpl
View File

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div>
<div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

4
view/theme/diabook-red/profile_vcard.tpl
View File

@ -21,9 +21,9 @@
</div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }}

17
view/theme/diabook-red/style-network.css
View File

@ -1198,10 +1198,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1253,7 +1257,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1609,6 +1613,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;

18
view/theme/diabook-red/style-profile.css
View File

@ -1176,10 +1176,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1231,7 +1235,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1583,6 +1587,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2057,6 +2066,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
border-radius: 10px;
}
.lframe {
float: left;

6
view/theme/diabook-red/style-settings.css
View File

@ -1173,8 +1173,10 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
#id_username {

17
view/theme/diabook-red/style.css
View File

@ -1061,6 +1061,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
font-weight: bold;
@ -1243,10 +1244,14 @@ section {
}
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1608,6 +1613,11 @@ body .pageheader{
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2081,6 +2091,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
border-radius: 10px;
}
.lframe {
float: left;

75
view/theme/diabook-red/theme.php
View File

@ -3,7 +3,7 @@
/*
* 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: (Version: 1.011)
* Author:
*/
@ -164,7 +164,8 @@ function diabook_red_community_info(){
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
@ -317,56 +318,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts
$a->page['htmlhead'] .= <<< EOT
$a->page['htmlhead'] .= '
<script>
$(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
</script>';
</script>
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie('close_pages') == '1')
if($.cookie("close_pages") == "1")
{
document.getElementById( "close_pages" ).style.display = "none";
};
if($.cookie('close_helpers') == '1')
if($.cookie("close_helpers") == "1")
{
document.getElementById( "close_helpers" ).style.display = "none";
};
if($.cookie('close_services') == '1')
if($.cookie("close_services") == "1")
{
document.getElementById( "close_services" ).style.display = "none";
};
if($.cookie('close_friends') == '1')
if($.cookie("close_friends") == "1")
{
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie('close_postit') == '1')
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie('close_lastusers') == '1')
if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
};
if($.cookie('close_lastphotos') == '1')
if($.cookie("close_lastphotos") == "1")
{
document.getElementById( "close_lastphotos" ).style.display = "none";
};
if($.cookie('close_lastlikes') == '1')
if($.cookie("close_lastlikes") == "1")
{
document.getElementById( "close_lastlikes" ).style.display = "none";
};}
@ -375,57 +378,55 @@ $("right_aside").ready(function(){
function close_pages(){
document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' });
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' });
$.cookie("close_helpers","1", { expires: 365, path: "/" });
};
function close_services(){
document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' });
$.cookie("close_services","1", { expires: 365, path: "/" });
};
function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' });
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' });
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
};
function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
};
function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' });
$.cookie('close_helpers','2', { expires: 365, path: '/' });
$.cookie('close_services','2', { expires: 365, path: '/' });
$.cookie('close_friends','2', { expires: 365, path: '/' });
$.cookie('close_postit','2', { expires: 365, path: '/' });
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
alert('Right-hand column was restored. Please refresh your browser');
};
</script>
EOT;
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
</script>';}

4
view/theme/diabook-red/wallwall_item.tpl
View File

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

2
view/theme/diabook/jot.tpl
View File

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div>
<div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

4
view/theme/diabook/profile_vcard.tpl
View File

@ -21,9 +21,9 @@
</div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }}

16
view/theme/diabook/style-network.css
View File

@ -1144,8 +1144,13 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
@ -1196,7 +1201,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1544,6 +1549,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;

20
view/theme/diabook/style-profile.css
View File

@ -1138,10 +1138,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1191,7 +1195,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@ -1539,6 +1543,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2003,6 +2012,9 @@ ul.tabs li .active {
float: left;
}
/* photo */
.photo {
border-radius: 10px;
}
.lframe {
float: left;
}

7
view/theme/diabook/style-settings.css
View File

@ -1135,8 +1135,11 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
max-width: 575px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
#id_username {

20
view/theme/diabook/style.css
View File

@ -1022,7 +1022,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
font-weight: bold;
@ -1190,10 +1190,14 @@ section {
body .pageheader{
text-align: center;
margin-top: 25px;
font-size: 0px;
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
}
#id_username {
width: 173px;
}
@ -1550,6 +1554,11 @@ body .pageheader{
padding: 0.3em;
margin-bottom: 10px;
}
.grey
{
display: inline;
float: right;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
@ -2014,6 +2023,9 @@ ul.tabs li .active {
float: left;
}
/* photo */
.photo {
border-radius: 10px;
}
.lframe {
float: left;
}

73
view/theme/diabook/theme.php
View File

@ -3,7 +3,7 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version:
* Version: (Version: 1.011)
* Author:
*/
@ -169,7 +169,8 @@ function diabook_community_info(){
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
@ -264,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
//tabs at right_aside on settings page
//tabs at aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
@ -323,55 +324,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts
$a->page['htmlhead'] .= <<< EOT
$a->page['htmlhead'] .= '
<script>
$(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
</script>
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie('close_pages') == '1')
if($.cookie("close_pages") == "1")
{
document.getElementById( "close_pages" ).style.display = "none";
};
if($.cookie('close_helpers') == '1')
if($.cookie("close_helpers") == "1")
{
document.getElementById( "close_helpers" ).style.display = "none";
};
if($.cookie('close_services') == '1')
if($.cookie("close_services") == "1")
{
document.getElementById( "close_services" ).style.display = "none";
};
if($.cookie('close_friends') == '1')
if($.cookie("close_friends") == "1")
{
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie('close_postit') == '1')
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie('close_lastusers') == '1')
if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
};
if($.cookie('close_lastphotos') == '1')
if($.cookie("close_lastphotos") == "1")
{
document.getElementById( "close_lastphotos" ).style.display = "none";
};
if($.cookie('close_lastlikes') == '1')
if($.cookie("close_lastlikes") == "1")
{
document.getElementById( "close_lastlikes" ).style.display = "none";
};}
@ -380,60 +384,55 @@ $("right_aside").ready(function(){
function close_pages(){
document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' });
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' });
$.cookie("close_helpers","1", { expires: 365, path: "/" });
};
function close_services(){
document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' });
$.cookie("close_services","1", { expires: 365, path: "/" });
};
function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' });
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' });
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
};
function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
};
function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' });
$.cookie('close_helpers','2', { expires: 365, path: '/' });
$.cookie('close_services','2', { expires: 365, path: '/' });
$.cookie('close_friends','2', { expires: 365, path: '/' });
$.cookie('close_postit','2', { expires: 365, path: '/' });
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
alert('Right-hand column was restored. Please refresh your browser');
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
</script>
EOT;
</script>';}

4
view/theme/diabook/wallwall_item.tpl
View File

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}