diff options
| author |  buckaroo-labs | 2023-12-20 21:39:30 -0800 |
|---|---|---|
| committer | buckaroo-labs | 2023-12-20 21:39:30 -0800 |
| commit | 3745b976339b7684c29a10a879857c58d4615663 (patch) | |
| tree | 6fc2dd7f9781e15af07590f1beff74c74f7d4f8d | |
| parent | 78b989f29004fab78946e8606b6b9a752efcd4dc (diff) | |
| parent | 3cc1d14627e664641af8c55ace9d0d48e5bc4892 (diff) | |
| download | scuttle-3745b976339b7684c29a10a879857c58d4615663.tar.gz scuttle-3745b976339b7684c29a10a879857c58d4615663.zip | |
Merge branch 'master' of https://github.com/buckaroo-labs/semantic-scuttle
| -rw-r--r-- | data/templates/sscuttlizr/bookmarks-thumbnail.inc.tpl.php | 5 | ||||
| -rw-r--r-- | data/templates/sscuttlizr/bookmarks.tpl.php | 2 | ||||
| -rw-r--r-- | data/templates/sscuttlizr/bottom.inc.php | 4 | ||||
| -rw-r--r-- | data/templates/sscuttlizr/top.inc.php | 18 |
4 files changed, 17 insertions, 12 deletions
diff --git a/data/templates/sscuttlizr/bookmarks-thumbnail.inc.tpl.php b/data/templates/sscuttlizr/bookmarks-thumbnail.inc.tpl.php index 77cc67f..1cdffde 100644 --- a/data/templates/sscuttlizr/bookmarks-thumbnail.inc.tpl.php +++ b/data/templates/sscuttlizr/bookmarks-thumbnail.inc.tpl.php @@ -5,6 +5,9 @@ * * Expects a $row variable with bookmark data. */ +//2023-12-20 add line to avoid warning +if (!isset($GLOBALS['enableWebsiteThumbnails'])) return; + if (!$GLOBALS['enableWebsiteThumbnails']) { return; } @@ -15,4 +18,4 @@ $thumbnailHash = md5( //echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; echo '<img class="thumbnail" onclick="window.location.href=\''.htmlspecialchars($address).'\'" src="http://www.artviper.net/screenshots/screener.php?url='.htmlspecialchars($address).'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />'; -?>
\ No newline at end of file +?> diff --git a/data/templates/sscuttlizr/bookmarks.tpl.php b/data/templates/sscuttlizr/bookmarks.tpl.php index 944e657..1510d44 100644 --- a/data/templates/sscuttlizr/bookmarks.tpl.php +++ b/data/templates/sscuttlizr/bookmarks.tpl.php @@ -32,7 +32,7 @@ $this->includeTemplate($GLOBALS['top_include']); <?php if($pageName == PAGE_INDEX && $GLOBALS['welcomeMessage']):?> <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> </div> <?php endif?> diff --git a/data/templates/sscuttlizr/bottom.inc.php b/data/templates/sscuttlizr/bottom.inc.php index 4e5b226..3cb3ae8 100644 --- a/data/templates/sscuttlizr/bottom.inc.php +++ b/data/templates/sscuttlizr/bottom.inc.php @@ -5,11 +5,13 @@ echo '<a href="'.createURL('about').'">'.T_('About').'</a>'; echo ' - '; echo T_("Propulsed by "); 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']) { // Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE) echo ' (Thumbnails by <a href="http://www.artviper.net">webdesign</a>)'; } +} ?> </div> diff --git a/data/templates/sscuttlizr/top.inc.php b/data/templates/sscuttlizr/top.inc.php index fcd921e..7a355d6 100644 --- a/data/templates/sscuttlizr/top.inc.php +++ b/data/templates/sscuttlizr/top.inc.php @@ -1,16 +1,16 @@ <!DOCTYPE html> <html class="no-js"> <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta charset="utf-8"/> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title> - <meta name="description" content=""> - <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="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('scuttle.css');?>"> - <link rel="search" type="application/opensearchdescription+xml" href="<?php echo ROOT ?>api/opensearch.php" title="<?php echo htmlspecialchars($GLOBALS['sitename']) ?>"> + <meta name="description" content=""/> + <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="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('scuttle.css');?>"/> + <link rel="search" type="application/opensearchdescription+xml" href="<?php echo ROOT ?>api/opensearch.php" title="<?php echo htmlspecialchars($GLOBALS['sitename']) ?>"/> <?php if (isset($rsschannels)) { $size = count($rsschannels); |