bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #643 from annando/master

Browse source 
Vier - many changes
This commit is contained in:
Tobias Diekershoff 2013-03-05 22:06:39 -08:00
parent b94bd93b0b 86e19dda22
commit 3bf560f22f
10 changed files with 186 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ostatus_conversation.php
View file

@ -46,7 +46,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
//logger('complete_conversation: completing conversation url '.$conversation_url.' for id '.$itemid); //logger('complete_conversation: completing conversation url '.$conversation_url.' for id '.$itemid);
$messages = q("SELECT `uid`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid)); $messages = q("SELECT `uid`, `parent`, `created` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
if (!$messages) if (!$messages)
return; return;
$message = $messages[0]; $message = $messages[0];
@ -57,7 +57,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
if (!$conversation) { if (!$conversation) {
$r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`) VALUES (%d, %d, %d, %d, '%s', '%s')", $r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`) VALUES (%d, %d, %d, %d, '%s', '%s')",
intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc(datetime_convert()), dbesc($conversation_url)); intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($message["created"]), dbesc($conversation_url));
logger('complete_conversation: Storing conversation url '.$conversation_url.' for id '.$itemid); logger('complete_conversation: Storing conversation url '.$conversation_url.' for id '.$itemid);
} }

38
mod/settings.php
View file

@ -30,7 +30,7 @@ function settings_init(&$a) {
'label' => t('Account settings'), 'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings', 'url' => $a->get_baseurl(true).'/settings',
'selected' => (($a->argc == 1)?'active':''), 'selected' => (($a->argc == 1)?'active':''),
), ),
array( array(
'label' => t('Additional features'), 'label' => t('Additional features'),
'url' => $a->get_baseurl(true).'/settings/features', 'url' => $a->get_baseurl(true).'/settings/features',
@ -40,8 +40,8 @@ function settings_init(&$a) {
'label' => t('Display settings'), 'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display', 'url' => $a->get_baseurl(true).'/settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
), ),
array( array(
'label' => t('Connector settings'), 'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors', 'url' => $a->get_baseurl(true).'/settings/connectors',
@ -68,7 +68,7 @@ function settings_init(&$a) {
'selected' => '' 'selected' => ''
) )
); );
$tabtpl = get_markup_template("generic_links_widget.tpl"); $tabtpl = get_markup_template("generic_links_widget.tpl");
$a->page['aside'] = replace_macros($tabtpl, array( $a->page['aside'] = replace_macros($tabtpl, array(
'$title' => t('Settings'), '$title' => t('Settings'),
@ -96,19 +96,19 @@ function settings_post(&$a) {
if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){ if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove']; $key = $_POST['remove'];
q("DELETE FROM tokens WHERE id='%s' AND uid=%d", q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
dbesc($key), dbesc($key),
local_user()); local_user());
goaway($a->get_baseurl(true)."/settings/oauth/"); goaway($a->get_baseurl(true)."/settings/oauth/");
return; return;
} }
if(($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) { if(($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$name = ((x($_POST,'name')) ? $_POST['name'] : ''); $name = ((x($_POST,'name')) ? $_POST['name'] : '');
$key = ((x($_POST,'key')) ? $_POST['key'] : ''); $key = ((x($_POST,'key')) ? $_POST['key'] : '');
$secret = ((x($_POST,'secret')) ? $_POST['secret'] : ''); $secret = ((x($_POST,'secret')) ? $_POST['secret'] : '');
@ -116,7 +116,7 @@ function settings_post(&$a) {
$icon = ((x($_POST,'icon')) ? $_POST['icon'] : ''); $icon = ((x($_POST,'icon')) ? $_POST['icon'] : '');
if ($name=="" || $key=="" || $secret==""){ if ($name=="" || $key=="" || $secret==""){
notice(t("Missing some important data!")); notice(t("Missing some important data!"));
} else { } else {
if ($_POST['submit']==t("Update")){ if ($_POST['submit']==t("Update")){
$r = q("UPDATE clients SET $r = q("UPDATE clients SET
@ -236,7 +236,7 @@ function settings_post(&$a) {
call_hooks('connector_settings_post', $_POST); call_hooks('connector_settings_post', $_POST);
return; return;
} }
if(($a->argc > 1) && ($a->argv[1] === 'features')) { if(($a->argc > 1) && ($a->argv[1] === 'features')) {
check_form_security_token_redirectOnErr('/settings/features', 'settings_features'); check_form_security_token_redirectOnErr('/settings/features', 'settings_features');
foreach($_POST as $k => $v) { foreach($_POST as $k => $v) {
@ -249,7 +249,7 @@ function settings_post(&$a) {
} }
if(($a->argc > 1) && ($a->argv[1] === 'display')) { if(($a->argc > 1) && ($a->argv[1] === 'display')) {
check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
$theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']);
@ -611,8 +611,8 @@ function settings_content(&$a) {
WHERE clients.uid IN (%d,0)", WHERE clients.uid IN (%d,0)",
local_user(), local_user(),
local_user()); local_user());
$tpl = get_markup_template("settings_oauth.tpl"); $tpl = get_markup_template("settings_oauth.tpl");
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"), '$form_security_token' => get_form_security_token("settings_oauth"),
@ -627,19 +627,19 @@ function settings_content(&$a) {
'$apps' => $r, '$apps' => $r,
)); ));
return $o; return $o;
} }
if(($a->argc > 1) && ($a->argv[1] === 'addon')) { if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
$settings_addons = ""; $settings_addons = "";
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
if(! count($r)) if(! count($r))
$settings_addons = t('No Plugin settings configured'); $settings_addons = t('No Plugin settings configured');
call_hooks('plugin_settings', $settings_addons); call_hooks('plugin_settings', $settings_addons);
$tpl = get_markup_template("settings_addons.tpl"); $tpl = get_markup_template("settings_addons.tpl");
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_addon"), '$form_security_token' => get_form_security_token("settings_addon"),
@ -650,7 +650,7 @@ function settings_content(&$a) {
} }
if(($a->argc > 1) && ($a->argv[1] === 'features')) { if(($a->argc > 1) && ($a->argv[1] === 'features')) {
$arr = array(); $arr = array();
$features = get_features(); $features = get_features();
foreach($features as $fname => $fdata) { foreach($features as $fname => $fdata) {
@ -675,7 +675,7 @@ function settings_content(&$a) {
if(($a->argc > 1) && ($a->argv[1] === 'connectors')) { if(($a->argc > 1) && ($a->argv[1] === 'connectors')) {
$settings_connectors = ""; $settings_connectors = "";
call_hooks('connector_settings', $settings_connectors); call_hooks('connector_settings', $settings_connectors);
$diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled'))); $diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled')));

28
object/Item.php
View file

@ -158,22 +158,24 @@ class Item extends BaseObject {
$hashtags = array(); $hashtags = array();
$mentions = array(); $mentions = array();
$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", if (!get_config('system','suppress_tags')) {
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
foreach($taglist as $tag) { foreach($taglist as $tag) {
if ($tag["url"] == "") if ($tag["url"] == "")
$tag["url"] = $searchpath.strtolower($tag["term"]); $tag["url"] = $searchpath.strtolower($tag["term"]);
if ($tag["type"] == TERM_HASHTAG) { if ($tag["type"] == TERM_HASHTAG) {
$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>"; $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
$prefix = "#"; $prefix = "#";
} elseif ($tag["type"] == TERM_MENTION) { } elseif ($tag["type"] == TERM_MENTION) {
$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>"; $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
$prefix = "@"; $prefix = "@";
}
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
} }
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
} }
/*foreach(explode(',',$item['tag']) as $tag){ /*foreach(explode(',',$item['tag']) as $tag){
@ -239,7 +241,7 @@ class Item extends BaseObject {
localize_item($item); localize_item($item);
if ($item["postopts"]) { if ($item["postopts"] and !get_config("system", "suppress_language")) {
//$langdata = explode(";", $item["postopts"]); //$langdata = explode(";", $item["postopts"]);
//$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)"; //$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
$langstr = ""; $langstr = "";

2
view/theme/vier/nav.tpl
View file

@ -35,7 +35,7 @@
</li> </li>
{{ endif }} {{ endif }}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
<ul id="nav-site-menu" class="menu-popup"> <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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} {{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}

4
view/theme/vier/search_item.tpl
View file

@ -23,9 +23,9 @@
</div> </div>
<div class="wall-item-actions-author"> <div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
<span class="wall-item-ago">- &nbsp; <span class="wall-item-ago">
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} {{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
</span> </span>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">

2
view/theme/vier/smarty3/nav.tpl
View file

@ -40,7 +40,7 @@
</li> </li>
{{/if}} {{/if}}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
<ul id="nav-site-menu" class="menu-popup"> <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>{{/if}} {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}} {{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}

4
view/theme/vier/smarty3/search_item.tpl
View file

@ -28,9 +28,9 @@
</div> </div>
<div class="wall-item-actions-author"> <div class="wall-item-actions-author">
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
<span class="wall-item-ago">- &nbsp; <span class="wall-item-ago">
{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}} {{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}} {{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
</span> </span>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">

4
view/theme/vier/smarty3/wall_thread.tpl
View file

@ -58,9 +58,9 @@
<div class="wall-item-actions-author"> <div class="wall-item-actions-author">
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}} {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
<span class="wall-item-ago">- <span class="wall-item-ago">
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}} {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}} {{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
</span> </span>
</div> </div>

199
view/theme/vier/style.css
View file

@ -169,9 +169,9 @@ img {
min-width: 22px; min-width: 22px;
height: 22px; height: 22px;
} }
.icon.s22.notify { /*.icon.s22.notify {
color: gray; color: gray;
} }*/
.icon.s22.text { .icon.s22.text {
padding: 10px 0px 0px 25px; padding: 10px 0px 0px 25px;
width: 230px; width: 230px;
@ -238,7 +238,18 @@ div.pager {
margin-top: 5px; margin-top: 5px;
} }
.shared_header a {
color: black;
}
.shared_header a:hover {
color: #36c;
}
.shared_header img { .shared_header img {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
float: left; float: left;
} }
@ -279,7 +290,8 @@ body {
/* background-color: #ddd; */ /* background-color: #ddd; */
background-color: #F2F2F2; background-color: #F2F2F2;
color: #2d2d2d; color: #2d2d2d;
margin: 37px 0px 0px 0px; /* margin: 37px 0px 0px 0px; */
margin: 32px 0px 0px 0px;
display: table; display: table;
/* width: 100% */ /* width: 100% */
} }
@ -288,14 +300,14 @@ h4 {
} }
a { a {
/* color: #36C; */ color: #36C;
/* color: #3e3e8c; */ /* color: #3e3e8c; */
/* color: #3465A4; */ /* color: #3465A4; */
color: #3E3E8C; /*color: #3E3E8C; */
text-decoration: none; text-decoration: none;
} }
a:hover { a:hover {
color: blue; /* color: blue; */
text-decoration: underline text-decoration: underline
} }
@ -323,15 +335,15 @@ a:hover {
clear: both; clear: both;
} }
.fakelink { .fakelink {
/* color: #36c; */ color: #36c;
/* color: #3e3e8c; */ /* color: #3e3e8c; */
/* color: #3465A4; */ /* color: #3465A4; */
color: #3E3E8C; /* color: #3E3E8C; */
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
.fakelink:hover { .fakelink:hover {
color: blue; /*color: blue;*/
/*color: #005c94; */ /*color: #005c94; */
text-decoration: underline; text-decoration: underline;
} }
@ -514,30 +526,50 @@ nav {
top: 0px; top: 0px;
padding: 0px; padding: 0px;
padding-left: 0px; padding-left: 0px;
background: #364A84; background: #2d2d2d;
/*background: #364A84;
background: -moz-linear-gradient(top, #516499 0%, #364a84 100%); background: -moz-linear-gradient(top, #516499 0%, #364a84 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%); background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%);
background: -o-linear-gradient(top, #516499 0%,#364a84 100%); background: -o-linear-gradient(top, #516499 0%,#364a84 100%);
background: -ms-linear-gradient(top, #516499 0%,#364a84 100%); background: -ms-linear-gradient(top, #516499 0%,#364a84 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 );
background: linear-gradient(top, #516499 0%,#364a84 100%); background: linear-gradient(top, #516499 0%,#364a84 100%); */
color: #ffffff; color: #ffffff;
z-index: 100; z-index: 100;
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); /*-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
border-bottom: 5px solid #F80; border-bottom: 5px solid #F80; */
} }
nav a,
nav .icon {
color: #ccc;
}
nav a:active, nav a:active,
nav a:visited, nav a:visited,
nav a:link, nav a:link,
nav a:hover { nav a {
color: #ffffff;
text-decoration: none; text-decoration: none;
outline: none; outline: none;
color: #ccc;
padding-bottom: 8px;
padding-top: 8px;
} }
nav a:hover .icon {
color: #fff;
}
nav a:hover {
text-decoration: none;
outline: none;
color: #fff;
padding-bottom: 8px;
padding-top: 8px;
}
nav ul { nav ul {
margin: 0px; margin: 0px;
padding: 0px 10px; padding: 0px 10px;
@ -557,15 +589,16 @@ nav #search-box #search-text {
/*background-image: url('icons/lupe.png'); /*background-image: url('icons/lupe.png');
background-repeat:no-repeat; */ background-repeat:no-repeat; */
padding-left:0px; padding-left:0px;
border-top-left-radius: 15px; /*border-top-left-radius: 15px;
border-top-right-radius: 15px; border-top-right-radius: 15px;
border-bottom-right-radius: 15px; border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px; border-bottom-left-radius: 15px;*/
position: relative; position: relative;
height: 17px; height: 17px;
margin: 4px 0px 4px 4px; margin: 4px 0px 4px 4px;
width: 150px; width: 150px;
max-width: 150px; max-width: 150px;
background-color: #eee;
} }
nav .nav-menu-icon { nav .nav-menu-icon {
@ -583,6 +616,9 @@ nav .nav-menu-icon.selected {
nav .nav-menu-icon img { nav .nav-menu-icon img {
width: 22px; width: 22px;
height: 22px; height: 22px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
} }
nav .nav-menu-icon .nav-notify { nav .nav-menu-icon .nav-notify {
top: 3px; top: 3px;
@ -597,17 +633,25 @@ nav .nav-menu {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
margin: 3px 3px 0px; margin: 3px 3px 0px;
font-size: 14px; font-size: 13px;
border-bottom: 3px solid #364A84; /* border-bottom: 3px solid #364A84; */
color: #ccc;
font-weight: bold;
} }
/*nav .nav-menu.selected a {
color: white;
}*/
nav .nav-menu.selected { nav .nav-menu.selected {
border-bottom: 3px solid #9eabb0; border-bottom: 3px solid #9eabb0;
/* background-color: #364E59; */ /* background-color: #364E59; */
} }
nav .nav-menu:hover { nav .nav-menu:hover {
color: #fff !important; /* color: #fff !important; */
color: #fff;
/* text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); */ /* text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); */
background: #4c619c; /* background: #4c619c; */
text-decoration: none; text-decoration: none;
} }
nav .nav-notify { nav .nav-notify {
@ -627,6 +671,7 @@ nav .nav-notify {
min-width: 15px; min-width: 15px;
/* text-align: right; */ /* text-align: right; */
text-align: center; text-align: center;
color: white;
} }
nav .nav-notify.show { nav .nav-notify.show {
display: block; display: block;
@ -809,14 +854,14 @@ right_aside {
/* aside */ /* aside */
aside { aside {
display: table-cell; /* display: table-cell; */
vertical-align: top; vertical-align: top;
width: 185px; width: 185px;
padding: 10px 10px 10px 20px; padding: 10px 10px 10px 20px;
/* border-right: 1px solid #D2D2D2; */ /* border-right: 1px solid #D2D2D2; */
/* background-color: #ECECF2; */ /* background-color: #ECECF2; */
background-color: #F2F2F2; background-color: #F2F2F2;
font-size: 14px; font-size: 13px;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside .vcard .fn { aside .vcard .fn {
@ -836,6 +881,7 @@ aside .vcard dl {
aside select { aside select {
background-color: white; background-color: white;
width: 165px; width: 165px;
border-color: #ccc;
} }
aside .vcard dt { aside .vcard dt {
@ -883,14 +929,14 @@ aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
width: 150px; width: 150px;
height: 17px; height: 17px;
padding-left: 10px; padding-left: 10px;
border-top-left-radius: 15px; /*border-top-left-radius: 15px;
border-top-right-radius: 15px; border-top-right-radius: 15px;
border-bottom-right-radius: 15px; border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px; border-bottom-left-radius: 15px;
-moz-border-bottom-colors: #dbdbdb; -moz-border-bottom-colors: #dbdbdb;
-moz-border-top-colors: #999; -moz-border-top-colors: #999;
-moz-border-left-colors: #999; -moz-border-left-colors: #999;
-moz-border-right-colors: #dbdbdb; -moz-border-right-colors: #dbdbdb;*/
} }
aside h4 { aside h4 {
@ -1083,10 +1129,12 @@ border-bottom: 1px solid #D2D2D2;
width: 50px; width: 50px;
margin-left: 10px; margin-left: 10px;
color: #999; color: #999;
font-size: 12px;
} }
.wall-item-location { .wall-item-location {
width: 350px; width: 350px;
float: left; float: left;
font-size: 12px;
} }
.wall-item-container .wall-item-content { .wall-item-container .wall-item-content {
@ -1141,9 +1189,47 @@ border-bottom: 1px solid #D2D2D2;
-ms-transition: all 0.2s ease-in-out; -ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
} }
.wall-item-container .wall-item-name:hover {
color: #36c;
}
.wall-item-container .wall-item-name { .wall-item-container .wall-item-name {
color: black;
font-weight: bold; font-weight: bold;
} }
.toplevel_item:hover .wall-item-name,
.wall-item-container:hover .wall-item-name {
color: #36c;
font-weight: bold;
-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;
}
/* .wall-item-container .wall-item-content a, */
.toplevel_item .fakelink,
.wall-item-container .fakelink {
color: black;
/* color: darkblue; */
/* color: #3E3E8C; */
}
.toplevel_item:hover .fakelink,
.wall-item-container:hover .fakelink,
.toplevel_item:hover .wall-item-content a,
.wall-item-container:hover .wall-item-content a {
color: #36c;
-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;
}
.wall-item-container .wall-item-actions-author { .wall-item-container .wall-item-actions-author {
width: 100%; width: 100%;
margin-bottom: 0.3em; margin-bottom: 0.3em;
@ -1308,6 +1394,7 @@ border-bottom: 1px solid #D2D2D2;
.wall-item-tags { .wall-item-tags {
padding-top: 1px; padding-top: 1px;
padding-bottom: 2px; padding-bottom: 2px;
font-size: 12px;
/*display: none;*/ /*display: none;*/
} }
@ -1356,7 +1443,11 @@ border-bottom: 1px solid #D2D2D2;
height: 48px; height: 48px;
overflow: hidden; overflow: hidden;
display: block; display: block;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
} }
.contact-photo img { .contact-photo img {
width: 48px; width: 48px;
height: 48px; height: 48px;
@ -1685,9 +1776,13 @@ border-bottom: 1px solid #D2D2D2;
ul.tabs { ul.tabs {
list-style-type: none; list-style-type: none;
padding-bottom: 10px; padding-bottom: 10px;
font-size: 14px;
padding-left: 0px; padding-left: 0px;
margin-bottom: 30px; margin-bottom: 5px;
line-height: 27px;
height: 27px;
font-size: 11px;
font-weight: bold;
/* margin-bottom: 30px; */
} }
ul.tabs li { ul.tabs li {
float: left; float: left;
@ -1698,52 +1793,38 @@ ul.tabs li {
}*/ }*/
ul.tabs a { ul.tabs a {
/* min-width: 34px; */
display: block; display: block;
float: left; float: left;
padding-bottom: 0px;
padding: 0px 12px 0px 12px;
color: #444;
}
div.pager, .birthday-notice, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
padding: 2px 7px 2px 7px;
color: black;
} }
div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink { div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
border: 1px solid lightgray; border: 1px solid lightgray;
color: black;
background: #F2F2F2; background: #F2F2F2;
padding: 2px 7px 2px 7px;
margin-top: 2px; margin-top: 2px;
margin-bottom: 2px; margin-bottom: 2px;
/* padding: 0px 10px 1px 10px; */
/*padding: 0px 5px 1px 5px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border: 1px solid #ECECF2;
font-weight: bold;
line-height: 1.4em;
color: #3e3e8c;
text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
background: #ececf2;
background: -moz-linear-gradient(top, #ffffff 0%, #ececf2 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ececf2));
background: -webkit-linear-gradient(top, #ffffff 0%,#ececf2 100%);
background: -o-linear-gradient(top, #ffffff 0%,#ececf2 100%);
background: -ms-linear-gradient(top, #ffffff 0%,#ececf2 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 );
background: linear-gradient(top, #ffffff 0%,#ececf2 100%);*/
} }
#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover { ul.tabs a:hover {
color: #333;
}
#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
color: black; color: black;
}
ul.tabs a:hover, #event-notice:hover, #birthday-notice:hover, ul.tabs li .active, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
background-color: #e5e5e5; background-color: #e5e5e5;
text-decoration: none; text-decoration: none;
border: 1px solid darkgray; border: 1px solid darkgray;
/*text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);*/
} }
.comment-edit-bb { .comment-edit-bb {

4
view/theme/vier/wall_thread.tpl
View file

@ -53,9 +53,9 @@
<div class="wall-item-actions-author"> <div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
{{ if $item.owner_url }}$item.via <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> <!-- $item.vwall -->{{ endif }} {{ if $item.owner_url }}$item.via <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> <!-- $item.vwall -->{{ endif }}
<span class="wall-item-ago">- <span class="wall-item-ago">
{{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }} {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }} {{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
</span> </span>
</div> </div>