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

Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import

Browse source
This commit is contained in:
Michael Vogel 2016-01-30 16:38:06 +01:00
commit d04e1bdf69
5 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/event.php
View file

@ -61,7 +61,7 @@ function format_event_html($ev, $simple = false) {
. bbcode($ev['location']) . bbcode($ev['location'])
. '</span></p>' . "\r\n"; . '</span></p>' . "\r\n";
if (strpos($ev['location'], "[map")===False) { if (strpos($ev['location'], "[map") !== False) {
$map = generate_named_map($ev['location']); $map = generate_named_map($ev['location']);
if ($map!==$ev['location']) $o.=$map; if ($map!==$ev['location']) $o.=$map;
} }

4
include/text.php
View file

@ -1504,7 +1504,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$pos = strpos($s, $spoilersearch); $pos = strpos($s, $spoilersearch);
$rnd = random_string(8); $rnd = random_string(8);
$spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'. $spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
'<blockquote class="spoiler" id="spoiler-'.$rnd.'" style="display: none;">'; '<blockquote class="spoiler" id="spoiler-'.$rnd.'" style="display: none;">';
$s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch)); $s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch));
} }
@ -1516,7 +1516,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$pos = strpos($s, $authorsearch); $pos = strpos($s, $authorsearch);
$rnd = random_string(8); $rnd = random_string(8);
$authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'. $authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" class="author-wrap fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
'<blockquote class="author" id="author-'.$rnd.'" style="display: block;">'; '<blockquote class="author" id="author-'.$rnd.'" style="display: block;">';
$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch)); $s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
} }

9
mod/display.php
View file

@ -192,12 +192,19 @@ function display_fetchauthor($a, $item) {
$profiledata["photo"] = $r[0]["photo"]; $profiledata["photo"] = $r[0]["photo"];
$profiledata["nickname"] = $r[0]["nick"]; $profiledata["nickname"] = $r[0]["nick"];
$profiledata["addr"] = $r[0]["addr"]; $profiledata["addr"] = $r[0]["addr"];
$profiledata["keywords"] = $r[0]["keywords"];
$profiledata["network"] = $r[0]["network"]; $profiledata["network"] = $r[0]["network"];
if ($r[0]["keywords"])
$profiledata["keywords"] = $r[0]["keywords"];
if ($showdetails) { if ($showdetails) {
if ($r[0]["location"])
$profiledata["address"] = $r[0]["location"]; $profiledata["address"] = $r[0]["location"];
if ($r[0]["about"])
$profiledata["about"] = $r[0]["about"]; $profiledata["about"] = $r[0]["about"];
if ($r[0]["gender"])
$profiledata["gender"] = $r[0]["gender"]; $profiledata["gender"] = $r[0]["gender"];
} }
} }

15
view/theme/vier/mobile.css
View file

@ -67,10 +67,23 @@ nav ul {
@media screen and (max-width: 480px) { @media screen and (max-width: 480px) {
.wall-item-container .wall-item-content img, .wall-item-container .wall-item-content img,
.children .wall-item-container .wall-item-item .wall-item-content img,
.wall-item-container .wall-item-content .type-link img.attachment-image, .type-link img.attachment-image, .type-video img.attachment-image { .wall-item-container .wall-item-content .type-link img.attachment-image, .type-link img.attachment-image, .type-video img.attachment-image {
max-width: 200px; max-width: 200px;
} }
/* fix img width in threaded view - maybe there exists a better possibility to do this
maybe this needs also to be done for tablet view*/
.children .wall-item-container .wall-item-item .wall-item-content img {
max-width: 100%;
}
iframe {
max-width: 100%;
}
/* the top-nav notfication menu
Note: the device needs a min display width of 320px */
#nav-notifications-menu {
width: 270px;
}
} }
.wall-item-container.thread_level_2, .wall-item-container.thread_level_2,

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

@ -1783,7 +1783,8 @@ section.minimal {
} }
#jot-preview-content { #jot-preview-content {
padding-top: 25px; padding-top: 4px;
clear: both;
} }
#jot-preview-content .tread-wrapper { #jot-preview-content .tread-wrapper {