Merge branch 'master' of https://github.com/buckaroo-labs/semantic-scuttle
This commit is contained in:
commit
3745b97633
4 changed files with 17 additions and 12 deletions
|
@ -5,6 +5,9 @@
|
||||||
*
|
*
|
||||||
* Expects a $row variable with bookmark data.
|
* Expects a $row variable with bookmark data.
|
||||||
*/
|
*/
|
||||||
|
//2023-12-20 add line to avoid warning
|
||||||
|
if (!isset($GLOBALS['enableWebsiteThumbnails'])) return;
|
||||||
|
|
||||||
if (!$GLOBALS['enableWebsiteThumbnails']) {
|
if (!$GLOBALS['enableWebsiteThumbnails']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ $this->includeTemplate($GLOBALS['top_include']);
|
||||||
|
|
||||||
<?php if($pageName == PAGE_INDEX && $GLOBALS['welcomeMessage']):?>
|
<?php if($pageName == PAGE_INDEX && $GLOBALS['welcomeMessage']):?>
|
||||||
<div class="alert alert-info alert-dismissable">
|
<div class="alert alert-info alert-dismissable">
|
||||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">*</button>
|
||||||
<p id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></p>
|
<p id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></p>
|
||||||
</div>
|
</div>
|
||||||
<?php endif?>
|
<?php endif?>
|
||||||
|
|
|
@ -5,11 +5,13 @@ echo '<a href="'.createURL('about').'">'.T_('About').'</a>';
|
||||||
echo ' - ';
|
echo ' - ';
|
||||||
echo T_("Propulsed by ");
|
echo T_("Propulsed by ");
|
||||||
echo " <a href=\"https://sourceforge.net/projects/semanticscuttle/\">SemanticScuttle</a>";
|
echo " <a href=\"https://sourceforge.net/projects/semanticscuttle/\">SemanticScuttle</a>";
|
||||||
|
//2023-12-20 add if block to avoid warning
|
||||||
|
if (isset($GLOBALS['enableWebsiteThumbnails'])) {
|
||||||
if($GLOBALS['enableWebsiteThumbnails']) {
|
if($GLOBALS['enableWebsiteThumbnails']) {
|
||||||
// Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE)
|
// Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE)
|
||||||
echo ' (Thumbnails by <a href="http://www.artviper.net">webdesign</a>)';
|
echo ' (Thumbnails by <a href="http://www.artviper.net">webdesign</a>)';
|
||||||
}
|
}
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html class="no-js">
|
<html class="no-js">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8"/>
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
|
||||||
<title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?></title>
|
<title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?></title>
|
||||||
<meta name="description" content="">
|
<meta name="description" content=""/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||||
<link rel="icon" type="image/png" href="<?php echo $theme->resource('icon.png');?>">
|
<link rel="icon" type="image/png" href="<?php echo $theme->resource('icon.png');?>"/>
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('css/bootstrap.min.css');?>">
|
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('css/bootstrap.min.css');?>"/>
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('css/font-awesome.min.css');?>">
|
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('css/font-awesome.min.css');?>"/>
|
||||||
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('scuttle.css');?>">
|
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('scuttle.css');?>"/>
|
||||||
<link rel="search" type="application/opensearchdescription+xml" href="<?php echo ROOT ?>api/opensearch.php" title="<?php echo htmlspecialchars($GLOBALS['sitename']) ?>">
|
<link rel="search" type="application/opensearchdescription+xml" href="<?php echo ROOT ?>api/opensearch.php" title="<?php echo htmlspecialchars($GLOBALS['sitename']) ?>"/>
|
||||||
<?php
|
<?php
|
||||||
if (isset($rsschannels)) {
|
if (isset($rsschannels)) {
|
||||||
$size = count($rsschannels);
|
$size = count($rsschannels);
|
||||||
|
|
Loading…
Reference in a new issue