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

New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.

This commit is contained in:
Michael Vogel 2013-12-04 23:46:51 +01:00
parent b0dd16696a
commit 3e5b9e97e7
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
index.php
View File

@ -428,7 +428,7 @@ else
$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']); $a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet)); //$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
if ($_GET["mode"] == "raw") { if (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal")) {
$doc = new DOMDocument(); $doc = new DOMDocument();
$target = new DOMDocument(); $target = new DOMDocument();
@ -449,6 +449,9 @@ if ($_GET["mode"] == "raw") {
// And then append it to the target // And then append it to the target
$target->documentElement->appendChild($item); $target->documentElement->appendChild($item);
} }
}
if ($_GET["mode"] == "raw") {
header("Content-type: text/html; charset=utf-8"); header("Content-type: text/html; charset=utf-8");
@ -515,13 +518,21 @@ $profile = $a->profile;
header("Content-type: text/html; charset=utf-8"); header("Content-type: text/html; charset=utf-8");
$template = 'view/theme/' . current_theme() . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
if(file_exists($template)) if ($_GET["mode"] == "minimal") {
require_once($template); //$page['content'] = substr($target->saveHTML(), 6, -8)."\n\n".
else // '<div id="conversation-end"></div>'."\n\n";
require_once(str_replace('theme/' . current_theme() . '/', '', $template));
require "view/minimal.php";
} else {
$template = 'view/theme/' . current_theme() . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
if(file_exists($template))
require_once($template);
else
require_once(str_replace('theme/' . current_theme() . '/', '', $template));
}
session_write_close(); session_write_close();
exit; exit;

2
view/minimal.php
View File

@ -6,7 +6,7 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body>
<section style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?> <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
</body> </body>

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

@ -1088,6 +1088,12 @@ section {
position: absolute; position: absolute;
left: 215px; left: 215px;
} }
section.minimal {
top: 0px;
left: 0px;
}
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
/* border-bottom: 1px solid #BDCDD4; */ /* border-bottom: 1px solid #BDCDD4; */