coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

simplify image sources

Browse source
This commit is contained in:
oliver 2015-08-21 10:19:52 +02:00
parent ca6af3fe92
commit 443ddc343a
6 changed files with 14 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/Utils.inc
View file

@ -209,45 +209,6 @@
return $mimetype;
}
/**
* Transform an URL to a label.
*
* @static
* @param string $url URL to transform
* @return string Resulting Label
*/
public static function urlToLabel($url)
{
// Parse URL
$parts = parse_url($url);
// Process URL parts
if(is_array($parts) && array_key_exists('host', $parts))
{
// Use only hostname as label
$url = $parts['host'];
}
else
{
// Strip protocol
if(($p = strpos($url, '://')) !== false) {
$url = substr($url, $p+3);
}
// Shorten to a specific length
$url = substr($url, 0, \nre\configs\AppConfig::$misc['imagesource_length']).'…';
}
// Strip www-prefix
if(strpos($url, 'www.') === 0) {
$url = substr($url, strlen('www.'));
}
return $url;
}
}
?>

4
db/create.sql
View file

@ -1854,9 +1854,7 @@ CREATE TABLE `seminarymedia` (
`seminary_id` int(11) NOT NULL,
`name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`url` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`description` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
`sourcelabel` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`sourceurl` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`mimetype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`id`),
@ -2191,4 +2189,4 @@ DELIMITER ;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2015-08-20 13:14:00
-- Dump completed on 2015-08-21 9:38:24

2
models/MediaModel.inc
View file

@ -121,7 +121,7 @@
public function getSeminaryMediaById($mediaId)
{
$data = $this->db->query(
'SELECT id, name, url, title, description, sourcelabel, sourceurl, mimetype '.
'SELECT id, name, url, description, sourceurl, mimetype '.
'FROM seminarymedia '.
'WHERE id = ?',
'i',

12
views/html/moodpic/questgroup.tpl
View file

@ -2,15 +2,11 @@
<div>
<?php if(!is_null($medium)) : ?>
<img src="<?=$medium['url']?>" <?php if(!empty($medium['title'])) : ?>title="<?=$medium['title']?>"<?php endif ?> <?php if(!empty($medium['description'])) : ?>alt="<?=$medium['description']?>"<?php endif ?>/>
<?php if(!empty($medium['sourcelabel']) || !empty($medium['sourceurl'])) : ?>
<?php $label = (!empty($medium['sourcelabel'])) ? $medium['sourcelabel'] : \hhu\z\Utils::urlToLabel($medium['sourceurl']); ?>
<?php if(!empty($medium['sourceurl'])) : ?>
<span class="source">
<?=_('Image source')?>:
<?php if(!empty($medium['sourceurl'])): ?>
<a href="<?=$medium['sourceurl']?>" target="_blank"><?=$label?></a>
<?php else : ?>
<?=$label?>
<?php endif ?>
<a href="<?=$medium['sourceurl']?>" target="_blank" title="<?=_('Image source')?>" rel="nofollow">
<i class="fa fa-external-link"></i>
</a>
</span>
<?php endif ?>
<?php else : ?>

12
views/html/moodpic/seminary.tpl
View file

@ -2,15 +2,11 @@
<div>
<?php if(!is_null($medium)) : ?>
<img src="<?=$medium['url']?>" <?php if(!empty($medium['title'])) : ?>title="<?=$medium['title']?>"<?php endif ?> <?php if(!empty($medium['description'])) : ?>alt="<?=$medium['description']?>"<?php endif ?>/>
<?php if(!empty($medium['sourcelabel']) || !empty($medium['sourceurl'])) : ?>
<?php $label = (!empty($medium['sourcelabel'])) ? $medium['sourcelabel'] : \hhu\z\Utils::urlToLabel($medium['sourceurl']); ?>
<?php if(!empty($medium['sourceurl'])) : ?>
<span class="source">
<?=_('Image source')?>:
<?php if(!empty($medium['sourceurl'])): ?>
<a href="<?=$medium['sourceurl']?>" target="_blank"><?=$label?></a>
<?php else : ?>
<?=$label?>
<?php endif ?>
<a href="<?=$medium['sourceurl']?>" target="_blank" title="<?=_('Image source')?>" rel="nofollow">
<i class="fa fa-external-link"></i>
</a>
</span>
<?php endif ?>
<?php else : ?>

5
www/css/desktop.css
View file

@ -95,10 +95,13 @@ header a:hover .fa{color:#7fb0b4}
article{padding:70px 0 30px}
aside{display:none}
.source{color:white;font-size:0.8em;padding:0.1em;background-color:rgba(0,0,0,0.3)}
.source i{padding:0 3px}
.moodpic{margin:-15px -5.5% 0 -5.5%;overflow:hidden}
.moodpic img{width:100vw}
.moodpic > div{position:relative}
.moodpic .source{position:absolute;right:0;bottom:15px;color:white;font-size:0.8em;padding:0.2em;background-color:rgba(0,0,0,0.3)}
.moodpic .source{position:absolute;right:0;bottom:10px}
.breadcrumbs li{display:block;font-size:.875em}
.breadcrumbs .fa{padding-right:5px;font-size:.75em;color:#989693}