MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

frio - fix help toc aside

Browse source
This commit is contained in:
rabuzarus 2018-04-25 23:30:56 +02:00
parent a9f1f47be2
commit 3fb993f37b
4 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mod/help.php
View file

@ -69,7 +69,7 @@ function help_content(App $a) {
if ($filename !== "Home") { if ($filename !== "Home") {
// create TOC but not for home // create TOC but not for home
$lines = explode("\n", $html); $lines = explode("\n", $html);
$toc="<style>aside ul {padding-left: 1em;}aside h1{font-size:2em}</style><h2>TOC</h2><ul id='toc'>"; $toc="<h2>TOC</h2><ul id='toc'>";
$lastlevel=1; $lastlevel=1;
$idnum = [0,0,0,0,0,0,0]; $idnum = [0,0,0,0,0,0,0];
foreach($lines as &$line){ foreach($lines as &$line){
@ -94,16 +94,9 @@ function help_content(App $a) {
for($k=0;$k<$lastlevel; $k++) $toc.="</ul>"; for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
$html = implode("\n",$lines); $html = implode("\n",$lines);
$a->page['aside'] = '<section class="help-aside-wrapper">' . $toc . $a->page['aside'] . '</section>'; $a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
} }
$html = "
<style>
.md_warning {
padding: 1em; border: #ff0000 solid 2px;
background-color: #f9a3a3; color: #ffffff;
}
</style>".$html;
return $html; return $html;
} }

16
view/global.css
View file

@ -464,6 +464,22 @@ td.federation-data {
opacity: 0.3; opacity: 0.3;
} }
/* help widget */
aside .help-aside-wrapper ul {
padding-left: 1em;
}
aside .help-aside-wrapper h1 {
font-size:2em
}
.md_warning {
padding: 1em;
border: #ff0000 solid 2px;
background-color: #f9a3a3;
color: #ffffff;
}
#forum-widget-collapse:hover { #forum-widget-collapse:hover {
opacity: 1.0; opacity: 1.0;
} }

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

@ -98,7 +98,6 @@ blockquote {
code { code {
white-space: pre-wrap; white-space: pre-wrap;
} }
.help-content-wrapper code, .help-aside-wrapper code {display: inline}
/** /**
* mobile aside * mobile aside
@ -1055,6 +1054,25 @@ aside > #datebrowse-sidebar .posted-date-selector-months > ul > li:hover{
padding-left: 27px; padding-left: 27px;
} }
/* help page widget */
aside > .help-content-wrapper code, .help-aside-wrapper code {
display: inline
}
aside > .help-aside-wrapper p strong:first-child {
display: block;
margin: 1em 0 0em;
}
aside > .help-aside-wrapper h1 {
font-weight: bold;
font-size: 16px;
margin: 0;
padding: 20px 0 10px;
}
aside > .help-aside-wrapper h2 {
font-weight: bold;
font-size: 14px;
}
/* vcard / h-card */ /* vcard / h-card */
aside .vcard #profile-photo-wrapper{ aside .vcard #profile-photo-wrapper{
margin: 0; margin: 0;

2
view/theme/frio/theme.php
View file

@ -300,7 +300,7 @@ function frio_acl_lookup(App $a, &$results)
$sql_extra = ''; $sql_extra = '';
if ($results["search"]) { if ($results["search"]) {
$search_txt = dbesc(protect_sprintf(preg_quote($results["search"]))); $search_txt = dbesc(protect_sprintf(preg_quote($results["search"])));
$sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') "; $sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%' OR `addr` LIKE '%%" . dbesc($search_txt) . "%%') ";
} }
if ($nets) { if ($nets) {