Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed regression in the preview image size in detail page
  • Loading branch information
giterlizzi committed Aug 5, 2020
1 parent cd9cd16 commit faf2760
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 13 deletions.
7 changes: 6 additions & 1 deletion RELEASE.md
Expand Up @@ -2,9 +2,14 @@

## [develop]

### Changed
* Updated all translations from Transifex
* #499: Changed CSS load order for Bootstrap and DokuWiki styles when using `themeByNamespace` option (@Digitalin)


### Fixed
* #480: Fixed Google Search Errors: BreadcrumbList + ListItem (@willmcknight)
* #499: Changed CSS load order for Bootstrap and DokuWiki styles when using `themeByNamespace` option (@Digitalin)
* #500: Fixed the preview image size in detail page (@IanGoo)

## [v2020-07-29]

Expand Down
10 changes: 3 additions & 7 deletions detail.php
Expand Up @@ -232,8 +232,8 @@
);


$maxwidth = 900;
$maxheight = 700;
$maxwidth = 800;
$maxheight = 600;

$originalwidth = $w = (int) tpl_img_getTag('File.Width');
$originalheight = $h = (int) tpl_img_getTag('File.Height');
Expand Down Expand Up @@ -294,10 +294,6 @@
<script type="text/javascript" src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script type="text/javascript" src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<script type="text/javascript">
jQuery(document).ready(function(){
jQuery(document).trigger('bootstrap3:detail');
});
</script>
</head>

Expand Down Expand Up @@ -487,7 +483,7 @@

<?php if ($show_metadata): ?>
<script>
jQuery(document).ready(function(){
window.addEventListener('DOMContentLoaded', function() {
jQuery('.image-metadata').removeClass('hide');
});
</script>
Expand Down
3 changes: 2 additions & 1 deletion js/template.js
Expand Up @@ -834,7 +834,8 @@ jQuery(document).on('bootstrap3:components', function(event) {
'footnotes',
'media-manager',
'collapse-sections',
'alerts'
'alerts',
'detail',
];

for (var i in events) {
Expand Down
14 changes: 11 additions & 3 deletions mediamanager.php
Expand Up @@ -21,9 +21,17 @@
<title><?php echo hsc($lang['mediaselect'])?> [<?php echo strip_tags($conf['title'])?>]</title>
<script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
<?php tpl_includeFile('meta.html') ?>
<?php tpl_metaheaders() ?>
<?php

if ($TEMPLATE->getConf('themeByNamespace')) {
echo '<link href="' . tpl_basedir() . 'css.php?id='. $ID .'" rel="stylesheet" />';
}

echo tpl_favicon(array('favicon', 'mobile'));
tpl_includeFile('meta.html');
tpl_metaheaders();

?>
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion template.info.txt
Expand Up @@ -5,4 +5,4 @@ date 2020-07-29
name Bootstrap3 Template
desc Bootstrap-based template for Dokuwiki
url https://www.dokuwiki.org/template:bootstrap3
build develop/20200804
build develop/20200805

0 comments on commit faf2760

Please sign in to comment.