Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: the heart should really be red. fix location change notification enhanced profile reporting for single values add db field for removed account, which will also be the first test of update error checking toggle to archive unfriends, though render them useless indicate successful updates diabook-themes: small fix diabook-themes: bug/css-fixes some constants for the db update failure possibilities bring back the email and logging of update failures, but without the transactions * master:
This commit is contained in:
Simon L'nu
commit
34eb843fb4
62
boot.php
62
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1326' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1139 );
|
||||
define ( 'DB_UPDATE_VERSION', 1140 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
|
@ -73,6 +73,14 @@ define ( 'HOOK_HOOK', 0);
|
|||
define ( 'HOOK_FILE', 1);
|
||||
define ( 'HOOK_FUNCTION', 2);
|
||||
|
||||
/**
|
||||
* DB update return values
|
||||
*/
|
||||
|
||||
define ( 'UPDATE_SUCCESS', 0);
|
||||
define ( 'UPDATE_FAILED', 1);
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* page/profile types
|
||||
|
|
@ -658,32 +666,29 @@ if(! function_exists('check_config')) {
|
|||
|
||||
// call the specific update
|
||||
|
||||
// global $db;
|
||||
// $db->excep(TRUE);
|
||||
// try {
|
||||
// $db->beginTransaction();
|
||||
$func = 'update_' . $x;
|
||||
$func($a);
|
||||
// $db->commit();
|
||||
// } catch(Exception $ex) {
|
||||
// $db->rollback();
|
||||
// //send the administrator an e-mail
|
||||
// $email_tpl = get_intltext_template("update_fail_eml.tpl");
|
||||
// $email_tpl = replace_macros($email_tpl, array(
|
||||
// '$sitename' => $a->config['sitename'],
|
||||
// '$siteurl' => $a->get_baseurl(),
|
||||
// '$update' => $x,
|
||||
// '$error' => $ex->getMessage()));
|
||||
// $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
|
||||
$func = 'update_' . $x;
|
||||
$retval = $func($a);
|
||||
if($retval) {
|
||||
//send the administrator an e-mail
|
||||
$email_tpl = get_intltext_template("update_fail_eml.tpl");
|
||||
$email_msg = replace_macros($email_tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
'$siteurl' => $a->get_baseurl(),
|
||||
'$update' => $x,
|
||||
'$error' => sprintf( t('Update %s failed. See error logs.'), $x)
|
||||
));
|
||||
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
|
||||
|
||||
// mail($a->config['admin_email'], $subject, $text,
|
||||
// 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||
// . 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||
// . 'Content-transfer-encoding: 8bit' );
|
||||
// //try the logger
|
||||
// logger('update failed: '.$ex->getMessage().EOL);
|
||||
// }
|
||||
// $db->excep(FALSE);
|
||||
mail($a->config['admin_email'], $subject, $email_msg,
|
||||
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||
. 'Content-transfer-encoding: 8bit' );
|
||||
//try the logger
|
||||
logger('CRITICAL: Update Failed: '. $x);
|
||||
}
|
||||
else
|
||||
set_config('database','update_' . $x, 'success');
|
||||
|
||||
}
|
||||
}
|
||||
set_config('system','build', DB_UPDATE_VERSION);
|
||||
|
|
@ -725,9 +730,10 @@ if(! function_exists('check_config')) {
|
|||
foreach($installed as $i) {
|
||||
if(! in_array($i['name'],$plugins_arr)) {
|
||||
uninstall_plugin($i['name']);
|
||||
}
|
||||
else
|
||||
}
|
||||
else {
|
||||
$installed_arr[] = $i['name'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1019,6 +1019,7 @@ CREATE TABLE IF NOT EXISTS `user` (
|
|||
`pwdreset` char(255) NOT NULL,
|
||||
`maxreq` int(11) NOT NULL DEFAULT '10',
|
||||
`expire` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`account_removed` tinyint(1) NOT NULL DEFAULT '0',
|
||||
`account_expired` tinyint(1) NOT NULL DEFAULT '0',
|
||||
`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
|
|
@ -1036,7 +1037,8 @@ CREATE TABLE IF NOT EXISTS `user` (
|
|||
KEY `blocked` (`blocked`),
|
||||
KEY `verified` (`verified`),
|
||||
KEY `unkmail` (`unkmail`),
|
||||
KEY `cntunkmail` (`cntunkmail`)
|
||||
KEY `cntunkmail` (`cntunkmail`),
|
||||
KEY `account_removed` (`account_removed`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -51,6 +51,21 @@ function user_remove($uid) {
|
|||
|
||||
|
||||
function contact_remove($id) {
|
||||
|
||||
$r = q("select uid from contact where id = %d limit 1",
|
||||
intval($id)
|
||||
);
|
||||
if((! count($r)) || (! intval($r[0]['uid'])))
|
||||
return;
|
||||
|
||||
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
|
||||
if($archive) {
|
||||
q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
|
||||
intval($id)
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($id)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -139,21 +139,49 @@ function profiles_post(&$a) {
|
|||
|
||||
|
||||
$changes = array();
|
||||
$value = '';
|
||||
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($marital != $orig[0]['marital']) {
|
||||
$changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
|
||||
$value = $marital;
|
||||
}
|
||||
if($withchanged) {
|
||||
$changes[] = '♥ ' . t('Romantic Partner');
|
||||
$value = strip_tags($with);
|
||||
}
|
||||
if($work != $orig[0]['work']) {
|
||||
$changes[] = t('Work/Employment');
|
||||
}
|
||||
if($religion != $orig[0]['religion']) {
|
||||
$changes[] = t('Religion');
|
||||
$value = $religion;
|
||||
}
|
||||
if($politic != $orig[0]['politic']) {
|
||||
$changes[] = t('Political Views');
|
||||
$value = $politic;
|
||||
}
|
||||
if($gender != $orig[0]['gender']) {
|
||||
$changes[] = t('Gender');
|
||||
$value = $gender;
|
||||
}
|
||||
if($sexual != $orig[0]['sexual']) {
|
||||
$changes[] = t('Sexual Preference');
|
||||
$value = $sexual;
|
||||
}
|
||||
if($homepage != $orig[0]['homepage']) {
|
||||
$changes[] = t('Homepage');
|
||||
$value = $homepage;
|
||||
}
|
||||
if($interest != $orig[0]['interest']) {
|
||||
$changes[] = t('Interests');
|
||||
$value = $interest;
|
||||
}
|
||||
if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
|
||||
|| $country_name != $orig[0]['country_name'])
|
||||
$changes[] = t('Location');
|
||||
|| $country_name != $orig[0]['country-name']) {
|
||||
$changes[] = t('Location');
|
||||
}
|
||||
|
||||
profile_activity($changes);
|
||||
profile_activity($changes,$value);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -245,7 +273,7 @@ function profiles_post(&$a) {
|
|||
}
|
||||
|
||||
|
||||
function profile_activity($changed) {
|
||||
function profile_activity($changed, $value) {
|
||||
$a = get_app();
|
||||
|
||||
if(! local_user() || ! is_array($changed) || ! count($changed))
|
||||
|
|
@ -289,7 +317,7 @@ function profile_activity($changed) {
|
|||
foreach($changed as $ch) {
|
||||
if(strlen($changes)) {
|
||||
if ($z == ($t - 1))
|
||||
$changes .= ' and ';
|
||||
$changes .= t(' and ');
|
||||
else
|
||||
$changes .= ', ';
|
||||
}
|
||||
|
|
@ -299,7 +327,15 @@ function profile_activity($changed) {
|
|||
|
||||
$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);
|
||||
if($t == 1 && strlen($value)) {
|
||||
$message = sprintf( t('%1$s changed %2$s to %3$s'), $A, $changes, $value);
|
||||
$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
|
||||
}
|
||||
else
|
||||
$message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
|
||||
|
||||
|
||||
$arr['body'] = $message;
|
||||
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
|
||||
. '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';
|
||||
|
|
|
|||
11
update.php
11
update.php
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1139 );
|
||||
define( 'UPDATE_VERSION' , 1140 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -1215,4 +1215,11 @@ function update_1137() {
|
|||
|
||||
function update_1138() {
|
||||
q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
|
||||
}
|
||||
}
|
||||
|
||||
function update_1139() {
|
||||
$r = q("alter table user add account_removed tinyint(1) not null default '0' after expire, add index(account_removed) ");
|
||||
if(! $r)
|
||||
return UPDATE_FAILED ;
|
||||
return UPDATE_SUCCESS ;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -1014,7 +1015,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1243,7 +1244,7 @@ aside #likes a:hover{
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -1013,7 +1014,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1241,7 +1242,7 @@ aside #likes a:hover{
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -983,7 +984,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1203,7 +1204,7 @@ aside #side-peoplefind-url {
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -982,7 +983,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1201,7 +1202,7 @@ aside #side-peoplefind-url {
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
|
||||
/*marker*/
|
||||
|
|
@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out;
|
|||
font-weight: bolder;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -493,7 +493,7 @@ code {
|
|||
float: right;
|
||||
}
|
||||
.tool a {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
.tool a:hover {
|
||||
text-decoration: none;
|
||||
|
|
@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out;
|
|||
font-weight: bolder;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -1964,7 +1964,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
|
||||
/*marker*/
|
||||
|
|
@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out;
|
|||
cursor: pointer;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -1945,7 +1945,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out;
|
|||
cursor: pointer;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -1933,7 +1933,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -476,7 +477,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -614,7 +615,7 @@ header #banner #logo-text {
|
|||
}
|
||||
/* messages */
|
||||
#message-new {
|
||||
background: #194719;
|
||||
background: #2c9936;
|
||||
border: 1px solid #333;
|
||||
width: 150px;
|
||||
}
|
||||
|
|
@ -991,7 +992,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1185,7 +1186,7 @@ aside #side-peoplefind-url {
|
|||
height: auto;
|
||||
}
|
||||
aside #likes a, a:visited, a:link {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
||||
|
|
@ -1220,7 +1221,7 @@ aside #likes a:hover{
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
@ -1422,7 +1423,7 @@ body .pageheader{
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
|
||||
/*marker*/
|
||||
|
|
@ -2073,7 +2074,7 @@ body .pageheader{
|
|||
cursor: pointer;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2207,7 +2208,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2225,7 +2226,7 @@ ul.rs_tabs li {
|
|||
clear: both;
|
||||
}
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -477,7 +478,7 @@ a:hover {
|
|||
}
|
||||
/*color*/
|
||||
.fakelink {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -550,7 +551,7 @@ code {
|
|||
}
|
||||
/*color*/
|
||||
.tool a {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
.tool a:hover {
|
||||
text-decoration: none;
|
||||
|
|
@ -617,7 +618,7 @@ header #banner #logo-text {
|
|||
/*color*/
|
||||
/* messages */
|
||||
#message-new {
|
||||
background: #194719;
|
||||
background: #2c9936;
|
||||
border: 1px solid #333;
|
||||
width: 150px;
|
||||
}
|
||||
|
|
@ -994,7 +995,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1189,7 +1190,7 @@ aside #side-peoplefind-url {
|
|||
}
|
||||
/*color*/
|
||||
aside #likes a, a:visited, a:link {
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
||||
|
|
@ -1224,7 +1225,7 @@ aside #likes a:hover{
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
@ -1425,7 +1426,7 @@ body .pageheader{
|
|||
}
|
||||
/*color*/
|
||||
.tread-wrapper a{
|
||||
color: #194719;
|
||||
color: #2c9936;
|
||||
}
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
@ -2071,7 +2072,7 @@ body .pageheader{
|
|||
}
|
||||
/*color*/
|
||||
.button.creation2 {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2204,7 +2205,7 @@ ul.tabs li {
|
|||
}
|
||||
/*color*/
|
||||
ul.tabs li .active {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2223,7 +2224,7 @@ ul.rs_tabs li {
|
|||
}
|
||||
/*color*/
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #194719;
|
||||
background-color: #2c9936;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -807,7 +807,7 @@ ul.menu-popup a {
|
|||
text-decoration: none;
|
||||
}
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #996d73; /*bdcdd4;*/
|
||||
background-color: #D02B55; /*bdcdd4;*/
|
||||
color: #fff;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
|
|
@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
|
||||
/*marker*/
|
||||
|
|
@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out;
|
|||
font-weight: bolder;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -493,7 +493,7 @@ code {
|
|||
float: right;
|
||||
}
|
||||
.tool a {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
.tool a:hover {
|
||||
text-decoration: none;
|
||||
|
|
@ -807,7 +807,7 @@ ul.menu-popup a {
|
|||
text-decoration: none;
|
||||
}
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #996d73; /*bdcdd4;*/
|
||||
background-color: #D02B55; /*bdcdd4;*/
|
||||
color: #fff;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
|
|
@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out;
|
|||
font-weight: bolder;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -1964,7 +1964,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -807,7 +807,7 @@ ul.menu-popup a {
|
|||
text-decoration: none;
|
||||
}
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #996d73; /*bdcdd4;*/
|
||||
background-color: #D02B55; /*bdcdd4;*/
|
||||
color: #fff;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
|
|
@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
|
||||
/*marker*/
|
||||
|
|
@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out;
|
|||
cursor: pointer;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -1945,7 +1945,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -806,7 +806,7 @@ ul.menu-popup a {
|
|||
text-decoration: none;
|
||||
}
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #996d73; /*bdcdd4;*/
|
||||
background-color: #D02B55; /*bdcdd4;*/
|
||||
color: #fff;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
|
|
@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out;
|
|||
cursor: pointer;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -1933,7 +1933,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -476,7 +477,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -614,7 +615,7 @@ header #banner #logo-text {
|
|||
}
|
||||
/* messages */
|
||||
#message-new {
|
||||
background: #996d73;
|
||||
background: #D02B55;
|
||||
border: 1px solid #333;
|
||||
width: 150px;
|
||||
}
|
||||
|
|
@ -943,7 +944,7 @@ ul.menu-popup a {
|
|||
text-decoration: none;
|
||||
}
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #996d73; /*bdcdd4;*/
|
||||
background-color: #D02B55; /*bdcdd4;*/
|
||||
color: #fff;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
|
|
@ -991,7 +992,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1185,7 +1186,7 @@ aside #side-peoplefind-url {
|
|||
height: auto;
|
||||
}
|
||||
aside #likes a, a:visited, a:link {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
||||
|
|
@ -1220,7 +1221,7 @@ aside #likes a:hover{
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
@ -1422,7 +1423,7 @@ body .pageheader{
|
|||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
|
||||
/*marker*/
|
||||
|
|
@ -2073,7 +2074,7 @@ body .pageheader{
|
|||
cursor: pointer;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2207,7 +2208,7 @@ ul.tabs li {
|
|||
margin-left: 5px;
|
||||
}
|
||||
ul.tabs li .active {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2225,7 +2226,7 @@ ul.rs_tabs li {
|
|||
clear: both;
|
||||
}
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -477,7 +478,7 @@ a:hover {
|
|||
}
|
||||
/*color*/
|
||||
.fakelink {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -550,7 +551,7 @@ code {
|
|||
}
|
||||
/*color*/
|
||||
.tool a {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
.tool a:hover {
|
||||
text-decoration: none;
|
||||
|
|
@ -617,7 +618,7 @@ header #banner #logo-text {
|
|||
/* messages */
|
||||
/*color*/
|
||||
#message-new {
|
||||
background: #996d73;
|
||||
background: #D02B55;
|
||||
border: 1px solid #333;
|
||||
width: 150px;
|
||||
}
|
||||
|
|
@ -946,7 +947,7 @@ ul.menu-popup a {
|
|||
}
|
||||
/*color*/
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #996d73; /*bdcdd4;*/
|
||||
background-color: #D02B55; /*bdcdd4;*/
|
||||
color: #fff;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
|
|
@ -994,7 +995,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1189,7 +1190,7 @@ aside #side-peoplefind-url {
|
|||
}
|
||||
/*color*/
|
||||
aside #likes a, a:visited, a:link {
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
||||
|
|
@ -1224,7 +1225,7 @@ aside #likes a:hover{
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
@ -1425,7 +1426,7 @@ body .pageheader{
|
|||
}
|
||||
/*color*/
|
||||
.tread-wrapper a{
|
||||
color: #996d73;
|
||||
color: #D02B55;
|
||||
}
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
@ -2071,7 +2072,7 @@ body .pageheader{
|
|||
}
|
||||
/*color*/
|
||||
.button.creation2 {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2204,7 +2205,7 @@ ul.tabs li {
|
|||
}
|
||||
/*color*/
|
||||
ul.tabs li .active {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -2223,7 +2224,7 @@ ul.rs_tabs li {
|
|||
}
|
||||
/*color*/
|
||||
ul.rs_tabs li .selected {
|
||||
background-color: #996d73;
|
||||
background-color: #D02B55;
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -1013,7 +1014,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1232,7 +1233,7 @@ aside #side-peoplefind-url {
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -1012,7 +1013,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1230,7 +1231,7 @@ aside #side-peoplefind-url {
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<div style="display: table-cell"></div>
|
||||
<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
|
||||
<div id="footerbox" style="display:none">
|
||||
<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
|
||||
</div>
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
</nav>
|
||||
|
||||
|
||||
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
|
||||
<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
|
||||
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
|
||||
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -974,7 +975,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1195,7 +1196,7 @@ aside #side-peoplefind-url {
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
.admin.linklist {
|
||||
border: 0px; padding: 0px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.admin.link {
|
||||
|
|
@ -974,7 +975,7 @@ ul.menu-popup .empty {
|
|||
background-color: #bdcdd4;
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
width: 400px;
|
||||
width: 425px !important;
|
||||
max-height: 550px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1198,7 +1199,7 @@ aside #side-peoplefind-url {
|
|||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
padding-top: 120px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
aside #login-submit-button{
|
||||
|
|
|
|||
|
|
@ -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.022)
|
||||
* Version: (Version: 1.023)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook (Version: 1.022)";
|
||||
$diabook_version = "Diabook (Version: 1.023)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -313,6 +313,20 @@ $autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogro
|
|||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
|
||||
|
||||
//js scripts
|
||||
|
||||
//check if community_home-plugin is activated and change css
|
||||
$nametocheck = "communityhome";
|
||||
$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
|
||||
if(count($r) == "1") {
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$("div#login-submit-wrapper").attr("style","padding-top: 120px;");
|
||||
});
|
||||
</script>';
|
||||
}
|
||||
|
||||
//comment-edit-wrapper on photo_view
|
||||
if ($a->argv[0].$a->argv[2] === "photos"."image"){
|
||||
|
||||
|
|
@ -324,7 +338,6 @@ $a->page['htmlhead'] .= '
|
|||
|
||||
});
|
||||
</script>';
|
||||
|
||||
}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
|
@ -334,6 +347,10 @@ $a->page['htmlhead'] .= '
|
|||
$("a.lightbox").fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
$(window).load(function() {
|
||||
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>';
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user