Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-theme: small fix diabook-theme: made boxes at right_aside sortable use cid rather than uid in perms Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. use mysql replace on cache items fixing common friends rev update Moved Meta Viewport from global head.tpl to diabook's header * master:
This commit is contained in:
commit
0446766f04
2
boot.php
2
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.1329' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1330' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1143 );
|
||||
|
||||
|
|
|
@ -14,22 +14,40 @@
|
|||
}
|
||||
|
||||
public static function set($key,$value) {
|
||||
$r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
|
||||
dbesc($key)
|
||||
);
|
||||
if(count($r)) {
|
||||
q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
|
||||
dbesc($value),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($key));
|
||||
}
|
||||
else {
|
||||
q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
|
||||
|
||||
q("REPLACE INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
|
||||
dbesc($key),
|
||||
dbesc($value),
|
||||
dbesc(datetime_convert()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
* Leaving this legacy code temporaily to see how REPLACE fares
|
||||
* as opposed to non-atomic checks when faced with fast moving key duplication.
|
||||
* As a MySQL extension it isn't portable, but we're not yet very portable.
|
||||
*/
|
||||
|
||||
/*
|
||||
* $r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
|
||||
* dbesc($key)
|
||||
* );
|
||||
* if(count($r)) {
|
||||
* q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
|
||||
* dbesc($value),
|
||||
* dbesc(datetime_convert()),
|
||||
* dbesc($key));
|
||||
* }
|
||||
* else {
|
||||
* q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
|
||||
* dbesc($key),
|
||||
* dbesc($value),
|
||||
* dbesc(datetime_convert()));
|
||||
* }
|
||||
* }
|
||||
*/
|
||||
|
||||
|
||||
public static function clear(){
|
||||
q("DELETE FROM `cache` WHERE `updated` < '%s'",
|
||||
|
|
|
@ -99,11 +99,12 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
|
|||
$gcid = $x[0]['id'];
|
||||
|
||||
if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) {
|
||||
q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s'
|
||||
q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s'
|
||||
where `nurl` = '%s' limit 1",
|
||||
dbesc($name),
|
||||
dbesc($profile_photo),
|
||||
dbesc($connect_url),
|
||||
dbesc($profile_url),
|
||||
dbesc(normalise_link($profile_url))
|
||||
);
|
||||
}
|
||||
|
@ -168,7 +169,7 @@ function count_common_friends($uid,$cid) {
|
|||
$r = q("SELECT count(*) as `total`
|
||||
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||
where `glink`.`cid` = %d and `glink`.`uid` = %d
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ",
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ",
|
||||
intval($cid),
|
||||
intval($uid),
|
||||
intval($uid),
|
||||
|
@ -192,8 +193,8 @@ function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
|
|||
$r = q("SELECT `gcontact`.*
|
||||
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||
where `glink`.`cid` = %d and `glink`.`uid` = %d
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d )
|
||||
sql_extra limit 0, %d",
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d )
|
||||
$sql_extra limit 0, %d",
|
||||
intval($cid),
|
||||
intval($uid),
|
||||
intval($uid),
|
||||
|
@ -211,7 +212,7 @@ function count_common_friends_zcid($uid,$zcid) {
|
|||
$r = q("SELECT count(*) as `total`
|
||||
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||
where `glink`.`zcid` = %d
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ",
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
|
||||
intval($zcid),
|
||||
intval($uid)
|
||||
);
|
||||
|
@ -232,7 +233,7 @@ function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
|
|||
$r = q("SELECT `gcontact`.*
|
||||
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
|
||||
where `glink`.`zcid` = %d
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 )
|
||||
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 )
|
||||
$sql_extra limit 0, %d",
|
||||
intval($zcid),
|
||||
intval($uid),
|
||||
|
|
|
@ -28,6 +28,9 @@ function events_post(&$a) {
|
|||
$adjust = intval($_POST['adjust']);
|
||||
$nofinish = intval($_POST['nofinish']);
|
||||
|
||||
// The default setting for the `private` field in event_store() is false, so mirror that
|
||||
$private_event = false;
|
||||
|
||||
|
||||
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
||||
if($nofinish)
|
||||
|
@ -65,14 +68,38 @@ function events_post(&$a) {
|
|||
|
||||
$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
|
||||
|
||||
$c = q("select id from contact where uid = %d and self = 1 limit 1",
|
||||
intval(local_user())
|
||||
);
|
||||
if(count($c))
|
||||
$self = $c[0]['id'];
|
||||
else
|
||||
$self = 0;
|
||||
|
||||
|
||||
if($share) {
|
||||
$str_group_allow = perms2str($_POST['group_allow']);
|
||||
$str_contact_allow = perms2str($_POST['contact_allow']);
|
||||
$str_group_deny = perms2str($_POST['group_deny']);
|
||||
$str_contact_deny = perms2str($_POST['contact_deny']);
|
||||
|
||||
// Undo the pseudo-contact of self, since there are real contacts now
|
||||
if( strpos($str_contact_allow, '<' . $self . '>') !== false )
|
||||
{
|
||||
$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
|
||||
}
|
||||
// Make sure to set the `private` field as true. This is necessary to
|
||||
// have the posts show up correctly in Diaspora if an event is created
|
||||
// as visible only to self at first, but then edited to display to others.
|
||||
if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) )
|
||||
{
|
||||
$private_event = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$str_contact_allow = '<' . local_user() . '>';
|
||||
// Note: do not set `private` field for self-only events. It will
|
||||
// keep even you from seeing them!
|
||||
$str_contact_allow = '<' . $self . '>';
|
||||
$str_group_allow = $str_contact_deny = $str_group_deny = '';
|
||||
}
|
||||
|
||||
|
@ -91,6 +118,7 @@ function events_post(&$a) {
|
|||
$datarray['allow_gid'] = $str_group_allow;
|
||||
$datarray['deny_cid'] = $str_contact_deny;
|
||||
$datarray['deny_gid'] = $str_group_deny;
|
||||
$datarray['private'] = $private_event;
|
||||
$datarray['id'] = $event_id;
|
||||
$datarray['created'] = $created;
|
||||
$datarray['edited'] = $edited;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 2.3.1329\n"
|
||||
"Project-Id-Version: 2.3.1330\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-05-01 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-05-02 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"
|
||||
|
@ -3584,7 +3584,7 @@ msgstr ""
|
|||
msgid "Access to this profile has been restricted."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profile.php:147
|
||||
#: ../../mod/profile.php:151
|
||||
msgid "Tips for New Members"
|
||||
msgstr ""
|
||||
|
||||
|
@ -3783,7 +3783,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/profiles.php:331
|
||||
#, php-format
|
||||
msgid "%1$s changed %2$s to %3$s"
|
||||
msgid "%1$s changed %2$s to \"%3$s\""
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:332
|
||||
|
@ -6431,6 +6431,13 @@ msgstr ""
|
|||
msgid "Categories"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/contact_widgets.php:183
|
||||
#, php-format
|
||||
msgid "%d friend in common"
|
||||
msgid_plural "%d friends in common"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../include/auth.php:29
|
||||
msgid "Logged out."
|
||||
msgstr ""
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
|
||||
<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3" />
|
||||
|
||||
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
|
||||
<link rel="search"
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
});
|
||||
function tautogrow(id){
|
||||
$("textarea#comment-edit-text-" +id).autogrow();
|
||||
};
|
||||
$(document).ready(function() {
|
||||
$("iframe").each(function(){
|
||||
var ifr_source = $(this).attr("src");
|
||||
|
@ -21,9 +16,28 @@ $(document).ready(function() {
|
|||
});
|
||||
|
||||
});
|
||||
|
||||
$(document).ready(function(){
|
||||
$("#sortable_boxes").sortable({
|
||||
update: function(event, ui) {
|
||||
var BoxOrder = $(this).sortable("toArray").toString();
|
||||
$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
|
||||
}
|
||||
});
|
||||
|
||||
var cookie = $.cookie("Boxorder");
|
||||
if (!cookie) return;
|
||||
var SavedID = cookie.split(",");
|
||||
for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
|
||||
$("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
|
||||
}
|
||||
});
|
||||
|
||||
function tautogrow(id){
|
||||
$("textarea#comment-edit-text-" +id).autogrow();
|
||||
};
|
||||
|
||||
function yt_iframe() {
|
||||
|
||||
$("iframe").load(function() {
|
||||
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
||||
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
||||
|
|
|
@ -1,8 +1,13 @@
|
|||
<div id="pos_null">
|
||||
</div>
|
||||
|
||||
<div id="sortable_boxes">
|
||||
|
||||
<div id="close_pages">
|
||||
{{ if $page }}
|
||||
<div>$page</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="close_profiles">
|
||||
{{ if $comunity_profilest_title }}
|
||||
|
@ -96,4 +101,5 @@ $nv.search
|
|||
</div>
|
||||
|
||||
<div id="twitter">
|
||||
</div>
|
||||
</div>
|
|
@ -1290,8 +1290,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1285,8 +1285,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1261,8 +1261,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1253,8 +1253,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1248,8 +1248,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1233,8 +1233,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1228,8 +1228,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1262,8 +1262,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1242,8 +1242,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1237,8 +1237,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1262,8 +1262,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1242,8 +1242,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1237,8 +1237,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1287,8 +1287,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1282,8 +1282,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1246,8 +1246,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1241,8 +1241,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
37
view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js
vendored
Normal file
37
view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -1235,8 +1235,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1229,8 +1229,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1210,8 +1210,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -1205,8 +1205,8 @@ right_aside .directory-photo { margin: 0px; }
|
|||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
|
|
|
@ -557,6 +557,7 @@ code {
|
|||
text-decoration: none;
|
||||
}
|
||||
/* popup notifications */
|
||||
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
|
||||
div.jGrowl div.notice {
|
||||
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||
color: #ffffff;
|
||||
|
|
|
@ -558,6 +558,7 @@ code {
|
|||
text-decoration: none;
|
||||
}
|
||||
/* popup notifications */
|
||||
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
|
||||
div.jGrowl div.notice {
|
||||
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||
color: #ffffff;
|
||||
|
|
|
@ -26,6 +26,14 @@ $resolution=false;
|
|||
$resolution = get_pconfig(local_user(), "diabook", "resolution");
|
||||
if ($resolution===false) $resolution="normal";
|
||||
|
||||
//Add META viewport tag respecting the resolution to header for tablets
|
||||
if ($resolution=="wide") {
|
||||
$a->page['htmlhead'] .= '<meta name="viewport" content="width=1200" />';
|
||||
} else {
|
||||
$a->page['htmlhead'] .= '<meta name="viewport" content="width=980" />';
|
||||
}
|
||||
|
||||
|
||||
$color = false;
|
||||
$site_color = get_config("diabook", "color" );
|
||||
if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
|
||||
|
@ -108,6 +116,10 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
|||
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
|
||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
|
||||
|
||||
//load jquery.ui.js
|
||||
$jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js";
|
||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $jqueryuiJS);
|
||||
|
||||
//load jquery.twitter.search.js
|
||||
if($_COOKIE['close_twitter'] != "1") {
|
||||
$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
|
||||
|
@ -125,6 +137,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
|||
var footer_top = $(document).height() - 30;
|
||||
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
|
||||
});
|
||||
|
||||
|
||||
|
||||
</script>';
|
||||
|
||||
//check if twitterbox is active and print
|
||||
|
@ -178,6 +193,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
|||
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
$.cookie("Boxorder",null, { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
}
|
||||
</script>';}
|
||||
|
@ -459,7 +475,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
|||
//Community_Pages at right_aside
|
||||
if($_COOKIE['close_pages'] != "1") {
|
||||
if(local_user()) {
|
||||
$page = '<div id="" >
|
||||
$page = '
|
||||
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
|
||||
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
|
||||
|
||||
|
@ -485,7 +501,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
|||
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
|
||||
$contact["name"]."</a></li>";
|
||||
}
|
||||
$page .= '</ul></div></div>';
|
||||
$page .= '</ul></div>';
|
||||
//if (sizeof($contacts) > 0)
|
||||
$aside['$page'] = $page;
|
||||
}}
|
||||
|
|
Loading…
Reference in a new issue