keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-03-30 09:03:43 +02:00
commit 2212e69310
39 changed files with 391 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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.1295' );
define ( 'FRIENDICA_VERSION', '2.3.1296' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1133 );
@ -1415,3 +1415,21 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
return replace_macros($tpl,array('$tabs' => $arr['tabs']));
}}
function get_my_url() {
if(x($_SESSION,'my_url'))
return $_SESSION['my_url'];
return false;
}
function zrl($s) {
if(! strlen($s))
return $s;
if(! strpos($s,'/profile/'))
return $s;
$achar = strpos($s,'?') ? '&' : '?';
$mine = get_my_url();
if($mine and ! link_compare($mine,$s))
return $s . $achar . 'zrl=' . urlencode($mine);
return $s;
}

48
include/conversation.php
View file

@ -94,9 +94,9 @@ function localize_item(&$item){
}
$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
@ -108,8 +108,8 @@ function localize_item(&$item){
if(count($r)==0) return;
$obj=$r[0];
$author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
$author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
switch($obj['verb']){
case ACTIVITY_POST:
@ -158,14 +158,21 @@ function localize_item(&$item){
$target = $r[0];
$Bname = $target['author-name'];
$Blink = $target['author-link'];
$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
$P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]';
$item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
}
}
}
$matches = null;
if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
foreach($matches as $mtch) {
if(! strpos($mtch[1],'zrl='))
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
}
}
}
@ -276,13 +283,16 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if($item['author-link'] && (! $item['author-name']))
$profile_name = $item['author-link'];
$sp = false;
$profile_link = best_link_url($item,$sp);
if($sp)
$sparkle = ' sparkle';
if($profile_link === 'mailbox')
$profile_link = '';
if($sp)
$sparkle = ' sparkle';
else
$profile_link = zrl($profile_link);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
@ -484,7 +494,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// This will have been stored in $a->page_contact by our calling page.
// Put this person on the left of the wall-to-wall notice.
$owner_url = $a->page_contact['url'];
$owner_url = zrl($a->page_contact['url']);
$owner_photo = $a->page_contact['thumb'];
$owner_name = $a->page_contact['name'];
$template = $wallwall;
@ -501,10 +511,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$commentww = 'ww';
// If it is our contact, use a friendly redirect link
if((link_compare($item['owner-link'],$item['url']))
&& ($item['network'] === 'dfrn')) {
&& ($item['network'] === NETWORK_DFRN)) {
$owner_url = $redirect_url;
$osparkle = ' sparkle';
}
else
$owner_url = zrl($owner_url);
}
}
@ -596,14 +608,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if($item['author-link'] && (! $item['author-name']))
$profile_name = $item['author-link'];
$sp = false;
$profile_link = best_link_url($item,$sp);
if($sp)
$sparkle = ' sparkle';
if($profile_link === 'mailbox')
$profile_link = '';
if($sp)
$sparkle = ' sparkle';
else
$profile_link = zrl($profile_link);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
@ -767,8 +779,10 @@ function item_photo_menu($item){
$photos_link = $profile_link . "?url=photos";
$profile_link = $profile_link . "?url=profile";
$pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
$zurl = '';
}
else {
$profile_link = zrl($profile_link);
if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
$cid = $item['contact-id'];
}
@ -828,6 +842,8 @@ function like_puller($a,$item,&$arr,$mode) {
$url = $a->get_baseurl(true) . '/redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" ';
}
else
$url = zrl($url);
if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
$arr[$item['parent'] . '-l'] = array();
if(! isset($arr[$item['parent']]))

5
include/dba.php
View file

@ -209,9 +209,8 @@ function q($sql) {
if($db && $db->connected) {
$stmt = vsprintf($sql,$args);
if($stmt === false)
logger('dba: vsprintf error: ' . print_r(debug_bracktrace(),true));
$ret = $db->q($stmt);
return $ret;
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
return $db->q($stmt);
}
/**

2
include/nav.php
View file

@ -69,6 +69,8 @@ function nav(&$a) {
* "Home" should also take you home from an authenticated remote profile connection
*/
$homelink = get_my_url();
if(! $homelink)
$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
if(($a->module != 'home') && (! (local_user())))

1
include/security.php
View file

@ -9,6 +9,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $user_record['page-flags'];
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
$a->user = $user_record;

2
include/text.php
View file

@ -610,6 +610,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
$url = $redirect_url;
$sparkle = ' sparkle';
}
else
$url = zrl($url);
}
$click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : '');
if($click)

3
index.php
View file

@ -93,6 +93,9 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
load_translation_table($lang);
}
if(x($_GET,'zrl')) {
$_SESSION['my_url'] = $_GET['zrl'];
}
/**
*

2
mod/dirfind.php
View file

@ -46,7 +46,7 @@ function dirfind_content(&$a) {
foreach($j->results as $jj) {
$o .= replace_macros($tpl,array(
'$url' => $jj->url,
'$url' => zrl($jj->url),
'$name' => $jj->name,
'$photo' => $jj->photo,
'$tags' => $jj->tags

6
mod/friendica.php
View file

@ -4,8 +4,12 @@ function friendica_init(&$a) {
if ($a->argv[1]=="json"){
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
$sql_extra = '';
if(x($a->config,'admin_nickname')) {
$sql_extra = sprintf(" AND nickname = '%s' ",dbesc($a->config['admin_nickname']));
}
if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){
$r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']);
$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email']));
$admin = array(
'name' => $r[0]['username'],
'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],

2
mod/match.php
View file

@ -51,7 +51,7 @@ function match_content(&$a) {
$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
$o .= replace_macros($tpl,array(
'$url' => $jj->url,
'$url' => zrl($jj->url),
'$name' => $jj->name,
'$photo' => $jj->photo,
'$inttxt' => ' ' . t('is interested in:'),

4
mod/notifications.php
View file

@ -145,7 +145,7 @@ function notifications_content(&$a) {
'$contact_id' => $rr['contact-id'],
'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
'$fullname' => $rr['fname'],
'$url' => $rr['furl'],
'$url' => zrl($rr['furl']),
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
@ -195,7 +195,7 @@ function notifications_content(&$a) {
'$fullname' => $rr['name'],
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
'$url' => $rr['url'],
'$url' => zrl($rr['url']),
'$knowyou' => $knowyou,
'$approve' => t('Approve'),
'$note' => $rr['note'],

2
mod/suggest.php
View file

@ -52,7 +52,7 @@ function suggest_content(&$a) {
$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
$o .= replace_macros($tpl,array(
'$url' => $rr['url'],
'$url' => zrl($rr['url']),
'$name' => $rr['name'],
'$photo' => $rr['photo'],
'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],

2
mod/viewcontacts.php
View file

@ -54,6 +54,8 @@ function viewcontacts_content(&$a) {
if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
$url = 'redir/' . $rr['id'];
else
$url = zrl($url);
$contacts[] = array(
'id' => $rr['id'],

2
view/field_combobox.tpl
View file

@ -1,6 +1,6 @@
<div class='field combobox'>
<label for='id_$field.0'>$field.1</label>
<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
{# html5 don't work on Chrome, Safari and IE9
<input id="id_$field.0" type="text" list="data_$field.0" >
<datalist id="data_$field.0" >

7
view/theme/diabook-blue/communityhome.tpl
View file

@ -7,10 +7,10 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
{{ endif }}
</div>
@ -30,13 +30,14 @@
{{ endif }}
</div>
<div id="close_friends">
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>
$nv.search
{{ endif }}
</div>

BIN
view/theme/diabook-blue/icons/srch_bg.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 65 B

BIN
view/theme/diabook-blue/icons/srch_l.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 303 B

BIN
view/theme/diabook-blue/icons/srch_r.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 227 B

BIN
view/theme/diabook-blue/icons/srch_r_f2.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 278 B

16
view/theme/diabook-blue/nav.tpl
View file

@ -65,14 +65,10 @@
<ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
@ -84,7 +80,11 @@
</ul>
</li>
{{ if $nav.directory }}
<li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
</li>
{{ endif }}
{{ if $nav.apps }}
@ -98,7 +98,7 @@
</li>
{{ endif }}
{{ if $nav.home }}
{{ if $nav.settings }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span>

34
view/theme/diabook-blue/style-network.css
View file

@ -641,6 +641,10 @@ nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
@ -1003,6 +1007,10 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
aside #side-follow-url {
width: 150px;
@ -1112,6 +1120,32 @@ list-style-type: disc;
background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
}
/* widget: search */
span.sbox_l {
background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
float: left;
width: 19px; height: 19px;
margin-left: 10px;
margin-top: 5px;
}
span.sbox_r {
background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
float: left;
width: 19px; height: 19px;
margin-top: 5px;
}
span.sbox input {
background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
float: left;
margin-top: 5px;
border: 0;
height: 13px; width: 100px;
padding: 3px;
font: 11px/13px arial;
color: #000;
}
#add-search-popup {
width: 200px;
top: 18px;

34
view/theme/diabook-blue/style-profile.css
View file

@ -642,6 +642,10 @@ nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
@ -1002,6 +1006,10 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
aside #side-follow-url {
width: 150px;
@ -1111,6 +1119,32 @@ list-style-type: disc;
background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
}
/* widget: search */
span.sbox_l {
background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
float: left;
width: 19px; height: 19px;
margin-left: 10px;
margin-top: 5px;
}
span.sbox_r {
background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
float: left;
width: 19px; height: 19px;
margin-top: 5px;
}
span.sbox input {
background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
float: left;
margin-top: 5px;
border: 0;
height: 13px; width: 100px;
padding: 3px;
font: 11px/13px arial;
color: #000;
}
#add-search-popup {
width: 200px;
top: 18px;

8
view/theme/diabook-blue/style.css
View file

@ -639,6 +639,10 @@ nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
@ -1000,6 +1004,10 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
aside #side-follow-url {
width: 173px;

19
view/theme/diabook-blue/theme.php
View file

@ -144,6 +144,13 @@ function diabook_blue_community_info(){
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
<span class="sbox_l"></span>
<span class="sbox">
<input type="text" name="search" size="13" maxlength="50">
</span>
<span class="sbox_r" id="srch_clear"></span>';
$aside['$nv'] = $nv;
};
//Community Page
@ -354,6 +361,18 @@ function close_lastlikes(){
$.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;

4
view/theme/diabook/communityhome.tpl
View file

@ -7,10 +7,10 @@
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a><br>
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
{{ endif }}
</div>

8
view/theme/diabook/nav.tpl
View file

@ -66,14 +66,12 @@
<ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
<li><a class="$nav.search.2" onClick="restore_boxes()" title="restore third column" style="cursor: pointer;">Restore right-hand column</a></li>
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
@ -101,7 +99,7 @@
</li>
{{ endif }}
{{ if $nav.home }}
{{ if $nav.settings }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-notify"></span>

8
view/theme/diabook/style-network.css
View file

@ -642,6 +642,10 @@ nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
@ -996,6 +1000,10 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
aside #side-follow-url {
width: 150px;

8
view/theme/diabook/style-profile.css
View file

@ -641,6 +641,10 @@ nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
@ -991,6 +995,10 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}
aside #side-follow-url {
width: 150px;

4
view/theme/diabook/style.css
View file

@ -640,6 +640,10 @@ nav #search-box #search-text {
background-image: url('icons/lupe.png');
background-repeat:no-repeat;
padding-left:20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
}

3
view/theme/diabook/theme.php
View file

@ -377,7 +377,7 @@ function restore_boxes(){
$.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');
alert('Right-hand column was restored. Please refresh your browser');
};
@ -385,4 +385,3 @@ function restore_boxes(){
EOT;

22
view/theme/dispy-dark/style.css
View file

@ -1031,6 +1031,7 @@ section {
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
width: 65%;
}
/** tabs **/
@ -1161,10 +1162,18 @@ section {
transition: all 1s ease-in-out;
}
.wall-item-subtools1 {
list-style: none;
height: 30px;
list-style: none outside none;
margin: 20px 0 30px -20px;
padding: 0;
width: 30px;
}
.wall-item-subtools2 {
list-style: none;
height: 25px;
list-style: none outside none;
margin: -75px 0 0 5px;
padding: 0;
width: 25px;
}
.wall-item-title {
font-size: 1.2em;
@ -1172,11 +1181,15 @@ section {
margin-bottom: 1em;
}
.wall-item-body {
margin: 10px 10px 10px 0px;
margin: 20px 20px 10px 0px;
text-align: left;
}
.wall-item-lock-wrapper {
float: right;
height: 22px;
margin: 0 -5px 0 0;
width: 22px;
opacity: 1;
}
.wall-item-dislike,
.wall-item-like {
@ -2141,8 +2154,7 @@ div[id$="wrapper"] br {
opacity: 0.1;
filter:alpha(opacity=10);
float: right;
margin-right: 10px;
margin-right: 5px;
}
.item-select:hover, .checkeditem {
opacity: 1;

23
view/theme/dispy-dark/theme.php
View file

@ -6,14 +6,9 @@
* Version: 1.0
* Author: Simon <http://simon.kisikew.org/>
* Maintainer: Simon <http://simon.kisikew.org/>
* Screenshot: <a href="screenshot.png">screenshot</a>
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
$a->theme_info = array(
'extends' => 'dispy-dark'
);
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
/* $('#profile-photo-wrapper').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() {
$('.profile-edit-side-div').css({display: 'none'});
return false;
});
$('img.photo').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() {
$('.profile-edit-side-div').css({display: 'none'});
return false;
});*/
});
</script>
EOT;
@ -157,6 +138,6 @@ function dispydark_community_info() {
}
// aside on profile page
if ($a->argv[0] === "profile") {
if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispydark_community_info();
}

8
view/theme/dispy-dark/wall_item.tpl
View file

@ -16,11 +16,11 @@
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
<ul class="wall-item-subtools1">
<li class="wall-item-lock-wrapper">
<div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
</li>
</div>
<ul class="wall-item-subtools1">
{{ if $item.star }}
<li>
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
@ -37,7 +37,7 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li>
{{ endif }}
</ul>
</ul><br style="clear:left;" />
<ul class="wall-item-subtools2">
{{ if $item.filer }}
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>

20
view/theme/dispy/style.css
View file

@ -1031,6 +1031,7 @@ section {
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
width: 65%;
}
/** tabs **/
@ -1161,10 +1162,18 @@ section {
transition: all 1s ease-in-out;
}
.wall-item-subtools1 {
list-style: none;
height: 30px;
list-style: none outside none;
margin: 20px 0 30px -20px;
padding: 0;
width: 30px;
}
.wall-item-subtools2 {
list-style: none;
height: 25px;
list-style: none outside none;
margin: -75px 0 0 5px;
padding: 0;
width: 25px;
}
.wall-item-title {
font-size: 1.2em;
@ -1172,11 +1181,15 @@ section {
margin-bottom: 1em;
}
.wall-item-body {
margin: 10px 10px 10px 0px;
margin: 20px 20px 10px 0px;
text-align: left;
}
.wall-item-lock-wrapper {
float: right;
height: 22px;
margin: 0 -5px 0 0;
width: 22px;
opacity: 1;
}
.wall-item-dislike,
.wall-item-like {
@ -2142,7 +2155,6 @@ div[id$="wrapper"] br {
filter:alpha(opacity=10);
float: right;
margin-right: 10px;
}
.item-select:hover, .checkeditem {
opacity: 1;

21
view/theme/dispy/theme.php
View file

@ -9,11 +9,6 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
$a->theme_info = array(
'extends' => 'dispy'
);
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
/* $('#profile-photo-wrapper').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() {
$('.profile-edit-side-div').css({display: 'none'});
return false;
});
$('img.photo').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() {
$('.profile-edit-side-div').css({display: 'none'});
return false;
});*/
});
</script>
EOT;
@ -157,6 +138,6 @@ function dispy_community_info() {
}
// aside on profile page
if ($a->argv[0] === "profile") {
if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_community_info();
}

8
view/theme/dispy/wall_item.tpl
View file

@ -16,11 +16,11 @@
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
<ul class="wall-item-subtools1">
<li class="wall-item-lock-wrapper">
<div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
</li>
</div>
<ul class="wall-item-subtools1">
{{ if $item.star }}
<li>
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
@ -37,7 +37,7 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li>
{{ endif }}
</ul>
</ul><br style="clear:left;" />
<ul class="wall-item-subtools2">
{{ if $item.filer }}
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>

7
view/theme/duepuntozero/style.css
View file

@ -3059,3 +3059,10 @@ ul.menu-popup {
.notify-seen {
background: #DDDDDD;
}
#id_term_label {
width:75px;
}
#id_term {
width:100px;
}

8
view/theme/quattro-green/colors.less
View file

@ -98,3 +98,11 @@
@JotLoadingBackgroundColor: @Grey1;
@JotPreviewBackgroundColor: @Green4;
@MessageNewBackgroundColor: @Blue1;
@MessageNewBorderColor: @Blue3;
@MessageNewColor: @Grey1;
@MailListBackgroundColor: #f6f7f8;
@MailDisplaySubjectColor: @Grey5;
@MailDisplaySubjectBackgroundColor: #f6f7f8;

149
view/theme/quattro-green/style.css
View file

@ -626,35 +626,6 @@ aside #profiles-menu {
width: 48px;
height: 48px;
}
/* mail view */
.mail-conv-sender, .mail-conv-detail {
float: left;
}
.mail-conv-detail {
margin-left: 20px;
width: 500px;
}
.mail-conv-subject {
font-size: 1.4em;
margin: 10px 0;
}
.mail-conv-outside-wrapper-end {
clear: both;
}
.mail-conv-outside-wrapper {
margin-top: 30px;
}
.mail-conv-delete-wrapper {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-break {
clear: both;
}
.mail-conv-delete-icon {
border: none;
}
/* group member */
#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
float: right;
@ -1355,6 +1326,9 @@ ul.tabs li .active {
.field input, .field textarea {
width: 400px;
}
.field input[type="checkbox"], .field input[type="radio"] {
width: auto;
}
.field textarea {
height: 100px;
}
@ -1503,6 +1477,123 @@ ul.tabs li .active {
left: 0px;
top: 63px;
}
/* messages */
#message-new {
background: #19aeff;
border: 1px solid #005c94;
width: 150px;
}
#message-new a {
color: #ffffff;
text-align: center;
display: block;
font-weight: bold;
padding: 1em 0px;
}
.mail-list-wrapper {
background-color: #f6f7f8;
margin-bottom: 5px;
width: 100%;
height: auto;
overflow: hidden;
}
.mail-list-wrapper span {
display: block;
float: left;
width: 20%;
overflow: hidden;
}
.mail-list-wrapper .mail-subject {
width: 30%;
padding: 4px 0px 0px 4px;
}
.mail-list-wrapper .mail-subject a {
display: block;
}
.mail-list-wrapper .mail-subject.unseen a {
font-weight: bold;
}
.mail-list-wrapper .mail-date {
padding: 4px 4px 0px 4px;
}
.mail-list-wrapper .mail-from {
padding: 4px 4px 0px 4px;
}
.mail-list-wrapper .mail-count {
padding: 4px 4px 0px 4px;
text-align: right;
}
.mail-list-wrapper .mail-delete {
float: right;
}
#mail-display-subject {
background-color: #f6f7f8;
color: #2d2d2d;
margin-bottom: 10px;
width: 100%;
height: auto;
overflow: hidden;
}
#mail-display-subject span {
float: left;
overflow: hidden;
padding: 4px 0px 0px 10px;
}
#mail-display-subject .mail-delete {
float: right;
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
#mail-display-subject:hover .mail-delete {
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
/* mail view */
/*
.mail-conv-sender,
.mail-conv-detail {
float: left;
}
.mail-conv-detail {
margin-left: 20px;
width: 500px;
}
.mail-conv-subject {
font-size: 1.4em;
margin: 10px 0;
}
.mail-conv-outside-wrapper-end {
clear: both;
}
.mail-conv-outside-wrapper {
margin-top: 30px;
}
.mail-conv-delete-wrapper {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-break {
clear: both;
}
.mail-conv-delete-icon {
border: none;
}
*/
/* page footer */
footer {
height: 100px;