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

OStatus conversation: now the creation date of the item is store with the conversation 

vier: The link color and the color of the top bar is changed.
This commit is contained in:
Michael Vogel 2013-03-03 23:44:50 +01:00
parent 00888a73bb
commit 8e1d253568
3 changed files with 91 additions and 59 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);
} }

2
object/Item.php
View File

@ -232,7 +232,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 = "";

144
view/theme/vier/style.css
View File

@ -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,42 @@ 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 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 {
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 +581,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 {
@ -597,17 +622,20 @@ 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;
} }
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 +655,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;
@ -816,7 +845,7 @@ aside {
/* 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 {
@ -883,14 +912,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 +1112,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,7 +1172,13 @@ 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;
} }
.wall-item-container .wall-item-actions-author { .wall-item-container .wall-item-actions-author {
@ -1308,6 +1345,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 +1394,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 +1727,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 +1744,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 {