Added option to disable date_modified.

Also began moving html/styling out of the functions/php logic.
This commit is contained in:
kisselev 2013-07-29 11:49:58 -07:00
parent be90aa14c9
commit c2059e4df8
8 changed files with 72 additions and 15 deletions

View File

@ -6725,6 +6725,10 @@ code {
.page-header h1 {
margin-top: 0px;
}
/* To be applied to the same element as page-header for sites that have sub-heading content such as Last modified time */
.page-header .sub-heading {
padding: 0px, 0px, 20px;
}
pre {
border: none;
background-color: #82becd;

View File

@ -6725,6 +6725,10 @@ code {
.page-header h1 {
margin-top: 0px;
}
/* To be applied to the same element as page-header for sites that have sub-heading content such as Last modified time */
.page-header .sub-heading {
padding: 0px, 0px, 20px;
}
pre {
border: none;
background-color: #8acc37;

View File

@ -6725,6 +6725,10 @@ code {
.page-header h1 {
margin-top: 0px;
}
/* To be applied to the same element as page-header for sites that have sub-heading content such as Last modified time */
.page-header .sub-heading {
padding: 0px, 0px, 20px;
}
pre {
border: none;
background-color: #7795b4;

View File

@ -6725,6 +6725,10 @@ code {
.page-header h1 {
margin-top: 0px;
}
/* To be applied to the same element as page-header for sites that have sub-heading content such as Last modified time */
.page-header .sub-heading {
padding: 0px, 0px, 20px;
}
pre {
border: none;
background-color: #ecb5a1;

View File

@ -3,6 +3,7 @@
"tagline": "The Easiest Way To Document Your Project",
"image": "img/app.png",
"theme": "navy",
"date_modified": true,
"repo": "justinwalsh/daux.io",
"twitter": ["justin_walsh", "todaymade"],
"google_analytics": "UA-12653604-10",

View File

@ -70,6 +70,8 @@ $tree = get_tree("docs", $base_url);
$homepage_url = homepage_url($tree);
$docs_url = docs_url($tree);
$page = load_page($tree);
// If a timezone has been set in the config file, override the default PHP timezone for this application.
if(isset($options['timezone']))
{
@ -183,7 +185,24 @@ if ($homepage && $homepage_url !== '/') {
<div class="container">
<div class="row">
<div class="span10 offset1">
<?php echo load_page($tree); ?>
<?php if($options['date_modified'] && isset($page['modified'])) { ?>
<div class="page-header sub-header">';
<h1><?php echo $page['title'];?></h1>';
<span style="float: left; font-size: 10px; color: gray;">';
<?php date("l, F j, Y", $page['modified']);?>
</span>
<span style="float: right; font-size: 10px; color: gray;">';
<?php date ("g:i A", $modified);?>
</span>
</div>
<?php } else { ?>
<div class="page-header">';
<h1><?php echo $page['title'];?></h1>
</div>
<?php } ?>
<?php echo $page['html'];?>
</div>
</div>
</div>
@ -265,7 +284,23 @@ if ($homepage && $homepage_url !== '/') {
<div class="right-column <?php echo ($options['float']?'float-view':''); ?> content-area span9">
<div class="content-page">
<article>
<?php echo load_page($tree); ?>
<?php if($options['date_modified'] && isset($page['modified'])) { ?>
<div class="page-header sub-header">
<h1><?php echo $page['title'];?></h1>
<span style="float: left; font-size: 10px; color: gray;">
<?php echo date("l, F j, Y", $page['modified']);?>
</span>
<span style="float: right; font-size: 10px; color: gray;">
<?php echo date ("g:i A", $page['modified']);?>
</span>
</div>
<?php } else { ?>
<div class="page-header">
<h1><?php echo $page['title'];?></h1>
</div>
<?php } ?>
<?php echo $page['html'];?>
</article>
</div>
</div>

View File

@ -478,6 +478,9 @@ code {
h1 {
margin-top: 0px;
}
sub-heading {
padding: 0px, 0px, 20px;
}
}
pre {
border: none;

View File

@ -34,6 +34,7 @@ function get_options() {
'tagline' => false,
'image' => false,
'theme' => 'blue',
'date_modified' => true,
'float' => true,
'repo' => false,
'twitter' => array(),
@ -101,28 +102,29 @@ function docs_url($tree, $branch = false) {
function load_page($tree) {
$branch = find_branch($tree);
$page = array();
if (isset($branch['type']) && $branch['type'] == 'file') {
$html = '';
if ($branch['name'] !== 'index') {
$html .= '<div class="page-header">';
$html .= '<h1>'. $branch['title'] . '</h1>';
// Show last modified time for docs. Needs to be cleaned up and use template colours.
$modified = filemtime($branch['path']);
$html .= '<span style="float: left; font-size: 10px; color: gray;">';
$html .= date ("l, F j, Y", $modified);
$html .= '</span><span style="float: right; font-size: 10px; color: gray;">';
$html .= date ("g:i A", $modified);
$html .= '</span>';
$html .= '</div>';
$page['title'] = $branch['title'];
$page['modified'] = filemtime($branch['path']);
}
$html .= MarkdownExtended(file_get_contents($branch['path']));
return $html;
$page['html'] = $html;
} else {
return "Oh No. That page dosn't exist";
$page['title'] = "Oh no";
$page['html'] = "<h3>Oh No. That page dosn't exist</h3>";
}
return $page;
}
function find_branch($tree) {