r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #456 from acrox999/bluditv2 

More Lingonberry updates.
This commit is contained in:
Diego Najar 2017-08-07 19:14:04 +02:00 committed by GitHub
parent a8d701becb 1cc3d59d3b
commit b4bf1d3023
7 changed files with 122 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bl-themes/lingonberry/css/bludit.css
View File

@ -8,8 +8,10 @@
font-size: 80%; font-size: 80%;
} }
.comment-respond { .comment-respond {
display: block; display: block;
}
.featured-media img {
min-width: 100%;
} }

48
bl-themes/lingonberry/index.php
View File

@ -6,13 +6,20 @@
</head> </head>
<?php <?php
if( $WHERE_AM_I=='home' ) if( ($WHERE_AM_I == 'home') || ($WHERE_AM_I == 'tag') )
{ {
echo '<body class="header-image fullwidth">'; echo '<body class="header-image fullwidth">';
} }
else else
{ {
echo '<body class="page page-template-default">'; if( $Page->status() == "fixed" )
{
echo '<body class="page page-template-default">';
}
elseif( $Page->status() == "published" )
{
echo '<body class="single single-post">';
}
} }
?> ?>
@ -20,19 +27,21 @@
<!-- Plugins Site Body Begin --> <!-- Plugins Site Body Begin -->
<?php Theme::plugins('siteBodyBegin') ?> <?php Theme::plugins('siteBodyBegin') ?>
<!-- <div class="navigation" > <div class="navigation" >
<div class="navigation-inner section-inner"> <div class="navigation-inner section-inner">
<ul class="blog-menu"> <ul class="blog-menu">
<?php <?php
/** $parents = $pagesParents[NO_PARENT_CHAR]; $fixedPages = $dbPages->getFixedDB();
foreach($parents as $Parent) { $fpKeys = array_keys($fixedPages);
echo '<li class="menu-item menu-item-type-custom menu-item-object-custom"><a href="'.$Parent->permalink().'">'.$Parent->title().'</a></li> '; foreach($fpKeys as $pageKey) {
} */ $page = buildPage($pageKey);
echo '<li class="menu-item menu-item-type-custom menu-item-object-custom"><a href="'.$page->permalink().'">'.$page->title().'</a></li> ';
}
?> ?>
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>
</div> <!-- /navigation-inner --> </div> <!-- /navigation-inner -->
<!-- </div> <!-- /navigation --> </div> <!-- /navigation -->
<div class="header section"> <div class="header section">
<div class="header-inner section-inner"> <div class="header-inner section-inner">
@ -43,26 +52,33 @@
<a href="<?php echo $Site->url() ?>" rel="home"><?php echo $Site->title() ?></a> <a href="<?php echo $Site->url() ?>" rel="home"><?php echo $Site->title() ?></a>
</h1> </h1>
<!-- <div class="nav-toggle"> <div class="nav-toggle">
<div class="bar"></div> <div class="bar"></div>
<div class="bar"></div> <div class="bar"></div>
<div class="bar"></div> <div class="bar"></div>
<div class="clear"></div> <div class="clear"></div>
</div> --> </div>
<div class="clear"></div> <div class="clear"></div>
</div> <!-- /header section --> </div> <!-- /header section -->
</div> <!-- /header-inner section-inner --> </div> <!-- /header-inner section-inner -->
<?php <?php
if( $WHERE_AM_I=='home' ) if( ($WHERE_AM_I == 'home') || ($WHERE_AM_I == 'tag') )
{ {
include(THEME_DIR_PHP.'home.php'); include(THEME_DIR_PHP.'home.php');
} }
else else
{ {
include(THEME_DIR_PHP.'page.php'); if( $Page->status() == "fixed" )
{
include(THEME_DIR_PHP.'page.php');
}
elseif( $Page->status() == "published" )
{
include(THEME_DIR_PHP.'post.php');
}
} }
?> ?>
@ -77,7 +93,7 @@
</p> </p>
<p class="credits-right"> <p class="credits-right">
<span>Lingonberry by <a href="http://www.andersnoren.se">Anders Noren</a> — </span><span>Ported by <a href="http://www.iamnobuna.ga">Hakim Zulkufli</a> — </span><a class="tothetop">Up ↑</a> <span>Lingonberry by <a href="http://www.andersnoren.se">Anders Noren</a> — Proudly Powered by <a href="https://www.bludit.com/">Bludit</a> — </span><a class="tothetop">Up ↑</a>
</p> </p>
<div class="clear"></div> <div class="clear"></div>
@ -88,9 +104,9 @@
<?php Theme::plugins('siteBodyEnd') ?> <?php Theme::plugins('siteBodyEnd') ?>
<!-- Javascript --> <!-- Javascript -->
<?php Theme::javascript(array( <?php echo Theme::js(array(
'flexslider.min.js', 'js/flexslider.min.js',
'global.js' 'js/global.js'
)); ?> )); ?>
</body> </body>

13
bl-themes/lingonberry/php/head.php
View File

@ -10,12 +10,13 @@
'css/bludit.css' 'css/bludit.css'
)); ));
// JQuery from Bludit echo Theme::js(array(
echo Theme::jquery(); 'js/jquery-1.12.0.min.js',
echo Theme::js('js/jquery-migrate-1.2.1.min.js'); 'js/jquery-migrate-1.2.1.min.js'
));
echo '<link href="//fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic|Raleway:600,500,400" rel="stylesheet" type="text/css">'; echo '<link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic|Raleway:600,500,400" rel="stylesheet" type="text/css">';
// Load plugins with the hook siteHead // Load plugins with the hook siteHead
Theme::plugins('siteHead'); Theme::plugins('siteHead');
?> ?>

10
bl-themes/lingonberry/php/home.php
View File

@ -10,14 +10,14 @@
<?php if($Post->coverImage()) { <?php if($Post->coverImage()) {
echo '<div class="featured-media">'; echo '<div class="featured-media">';
echo '<a href="'.$Post->permalink().'" rel="bookmark" title="'.$Post->title().'">'; echo '<img class="attachment-post-image wp-post-image cover-image" src="'.$Post->coverImage().'" alt="Cover Image">';
echo '<img class="attachment-post-image wp-post-image cover-image" src="'.$Post->coverImage().'" alt="Cover Image">';
echo '<div class="media-caption-container">'; echo '<div class="media-caption-container">';
echo '<p class="media-caption">'.$Post->description().'</p>'; echo '<a href="'.$Post->permalink().'" rel="bookmark" title="'.$Post->title().'">';
echo '<p class="media-caption">'.$Post->description().'</p>';
echo '</a>';
echo '</div>'; echo '</div>';
echo '</a>';
echo '</div> <!-- /featured-media -->'; echo '</div> <!-- /featured-media -->';
} ?> } ?>
<h2 class="post-title"><a href="<?php echo $Post->permalink() ?>" rel="bookmark" title="<?php echo $Post->title() ?>"><?php echo $Post->title() ?></a></h2> <h2 class="post-title"><a href="<?php echo $Post->permalink() ?>" rel="bookmark" title="<?php echo $Post->title() ?>"><?php echo $Post->title() ?></a></h2>
<div class="post-meta"> <div class="post-meta">

38
bl-themes/lingonberry/php/page.php
View File

@ -10,47 +10,21 @@
<?php if($Page->coverImage()) { <?php if($Page->coverImage()) {
echo '<div class="featured-media">'; echo '<div class="featured-media">';
echo '<a href="'.$Page->permalink().'" rel="bookmark" title="'.$Page->title().'">'; echo '<img class="attachment-post-image wp-post-image cover-image" src="'.$Page->coverImage().'" alt="Cover Image">';
echo '<img class="attachment-post-image wp-post-image cover-image" src="'.$Page->coverImage().'" alt="Cover Image">'; echo '<div class="media-caption-container">';
//echo '<div class="media-caption-container">'; echo '<a href="'.$Page->permalink().'" rel="bookmark" title="'.$Page->title().'">';
//echo '<p class="media-caption"></p>'; echo '<p class="media-caption">'.$Page->description().'</p>';
//echo '</div>'; echo '</a>';
echo '</a>'; echo '</div>';
echo '</div> <!-- /featured-media -->'; echo '</div> <!-- /featured-media -->';
} ?> } ?>
<h2 class="post-title"><a href="<?php echo $Page->permalink() ?>" rel="bookmark" title="<?php echo $Page->title() ?>"><?php echo $Page->title() ?></a></h2> <h2 class="post-title"><a href="<?php echo $Page->permalink() ?>" rel="bookmark" title="<?php echo $Page->title() ?>"><?php echo $Page->title() ?></a></h2>
<div class="post-meta">
<span class="post-date"><a href="<?php echo $Page->permalink() ?>" title="<?php echo $Page->date() ?>"><?php echo $Page->date() ?></a></span>
<span class="date-sep"> / </span>
<span class="post-author"><?php
if( Text::isNotEmpty($Page->user('firstName')) || Text::isNotEmpty($Page->user('lastName')) ) {
echo $Page->user('firstName').' '.$Page->user('lastName');
}
else {
echo $Page->user('username');
}
?></span>
</div> <!-- /post-meta -->
</div> <!-- /post-header --> </div> <!-- /post-header -->
<div class="post-content"> <div class="post-content">
<?php echo $Page->content() ?> <?php echo $Page->content() ?>
<div class="post-cat-tags">
<p class="post-tags">Tags:
<?php
$tags = $Page->tags(true);
foreach($tags as $tagKey=>$tagName) {
echo '<a class="post-category" href="'.HTML_PATH_ROOT.$Url->filters('tag').'/'.$tagKey.'">'.$tagName.'</a>';
}
?>
</p>
</div>
</div> <!-- /post-content --> </div> <!-- /post-content -->
</div> <!-- /post content-inner --> </div> <!-- /post content-inner -->

67
bl-themes/lingonberry/php/post.php Normal file
View File

@ -0,0 +1,67 @@
<div class="content section-inner">
<div class="posts">
<div class="post">
<!-- Plugins Post Begin -->
<?php Theme::plugins('pageBegin') ?>
<div class="content-inner comments-allowed">
<div class="post-header">
<?php if($Page->coverImage()) {
echo '<div class="featured-media">';
echo '<img class="attachment-post-image wp-post-image cover-image" src="'.$Page->coverImage().'" alt="Cover Image">';
echo '<div class="media-caption-container">';
echo '<a href="'.$Page->permalink().'" rel="bookmark" title="'.$Page->title().'">';
echo '<p class="media-caption">'.$Page->description().'</p>';
echo '</a>';
echo '</div>';
echo '</div> <!-- /featured-media -->';
} ?>
<h2 class="post-title"><a href="<?php echo $Page->permalink() ?>" rel="bookmark" title="<?php echo $Page->title() ?>"><?php echo $Page->title() ?></a></h2>
<div class="post-meta">
<span class="post-date"><a href="<?php echo $Page->permalink() ?>" title="<?php echo $Page->date() ?>"><?php echo $Page->date() ?></a></span>
<span class="date-sep"> / </span>
<span class="post-author"><?php
if( Text::isNotEmpty($Page->user('firstName')) || Text::isNotEmpty($Page->user('lastName')) ) {
echo $Page->user('firstName').' '.$Page->user('lastName');
}
else {
echo $Page->user('username');
}
?></span>
</div> <!-- /post-meta -->
</div> <!-- /post-header -->
<div class="post-content">
<?php echo $Page->content() ?>
<div class="post-cat-tags">
<p class="post-tags">Tags:
<?php
$tags = $Page->tags(true);
foreach($tags as $tagKey=>$tagName) {
echo '<a class="post-category" href="'.HTML_PATH_ROOT.$Url->filters('tag').'/'.$tagKey.'">'.$tagName.'</a>';
}
?>
</p>
</div>
</div> <!-- /post-content -->
</div> <!-- /post content-inner -->
<div class="comments">
<!-- Post plugins -->
<?php Theme::plugins('pageEnd') ?>
</div>
</div> <!-- /post -->
<div class="clear"></div>
</div> <!-- /posts -->
</div> <!-- /content section-inner -->

6
bl-themes/lingonberry/php/sidebar.php
View File

@ -6,7 +6,7 @@
<h3 class="widget-title">Recent Posts</h3> <h3 class="widget-title">Recent Posts</h3>
<ul> <ul>
<?php <?php
$pages = $dbPages->getList(1, 5, true, false); $pages = $dbPages->getList(1, 5, true);
$keys = array_keys($pages); $keys = array_keys($pages);
foreach($keys as $pageKey) { foreach($keys as $pageKey) {
@ -27,10 +27,6 @@
<h3 class="widget-title">Tags</h3> <h3 class="widget-title">Tags</h3>
<ul> <ul>
<?php <?php
global $Language;
global $dbTags;
global $Url;
$db = $dbTags->db; $db = $dbTags->db;
$filter = $Url->filters('tag'); $filter = $Url->filters('tag');