jrenslin/md-cms
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /var/www/vhosts/museum-digital.info/cms.museum-digital.info/new/..

Browse Source
This commit is contained in:
Stefan Rohde-Enslin 2018-06-22 15:08:48 +02:00
commit 151fb2462b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
/data /data
/files /files
/new
*.swp

10
inc/mdEmbeds.php
View File

@ -155,7 +155,7 @@ function drawObjectDetails(array $contents, array $settings):string {
foreach ($contents['object_images'] as $image) { foreach ($contents['object_images'] as $image) {
if ($image['is_main'] != "j") continue; if ($image['is_main'] != "j") continue;
$output .= ' $output .= '
<img class="objMainImg" src="' . $settings['mdImgFolder'] . $image['folder'] . '/' . $image['filename_loc'] . '" />'; <a href="' . $settings['mdImgFolder'] . $image['folder'] . '/' . $image['filename_loc'] . '"><img class="objMainImg" src="' . $settings['mdImgFolder'] . $image['folder'] . '/' . $image['filename_loc'] . '" /></a>';
} }
} }
@ -329,7 +329,7 @@ function drawInstitutionDetails(array $contents, array $settings):string {
if (isset($contents['institution_image']) and $contents['institution_image']) { if (isset($contents['institution_image']) and $contents['institution_image']) {
$output .= ' $output .= '
<img class="objMainImg" src="' . $settings['mdImgFolder'] . $contents['institution_image'] . '" />'; <a href="' . $settings['mdImgFolder'] . $contents['institution_image'] . '"><img class="objMainImg" src="' . $settings['mdImgFolder'] . $contents['institution_image'] . '" /></a>';
} }
$output .= ' $output .= '
@ -456,7 +456,7 @@ function drawCollectionDetails(array $contents, array $settings):string {
if (isset($contents['collection_image']) and $contents['collection_image']) { if (isset($contents['collection_image']) and $contents['collection_image']) {
$output .= ' $output .= '
<img class="objMainImg" src="' . $settings['mdImgFolder'] . $contents['collection_image'] . '" />'; <a href="' . $settings['mdImgFolder'] . $contents['collection_image'] . '"><img class="objMainImg" src="' . $settings['mdImgFolder'] . $contents['collection_image'] . '" /></a>';
} }
$output .= ' $output .= '
@ -566,7 +566,7 @@ function drawExhibitionDetails(array $contents, array $settings):string {
if (isset($contents['image']) and $contents['image']) { if (isset($contents['image']) and $contents['image']) {
$output .= ' $output .= '
<img class="objMainImg" src="' . $settings['mdVersion'] . $contents['image'] . '" />'; <a href="' . $settings['mdVersion'] . $contents['image'] . '"><img class="objMainImg" src="' . $settings['mdVersion'] . $contents['image'] . '" /></a>';
} }
$output .= ' $output .= '
@ -722,7 +722,7 @@ function drawEventDetails(array $contents, array $settings):string {
if (isset($contents['image']) and $contents['image']) { if (isset($contents['image']) and $contents['image']) {
$output .= ' $output .= '
<img class="objMainImg" src="' . $settings['mdVersion'] . $contents['image'] . '" />'; <a href="' . $settings['mdVersion'] . $contents['image'] . '"><img class="objMainImg" src="' . $settings['mdVersion'] . $contents['image'] . '" /></a>';
} }
$output .= ' $output .= '

2
inc/search.php
View File

@ -40,7 +40,7 @@ function searchInPages(string $searchTerm):array {
} }
usort($results, function($a, $b) { uasort($results, function($a, $b) {
if ($a['priority'] == $b['priority']) return 0; if ($a['priority'] == $b['priority']) return 0;
return ($a['priority'] > $b['priority']) ? -1 : 1; return ($a['priority'] > $b['priority']) ? -1 : 1;
}); });

3
themes/default/mdEmbeds.css
View File

@ -53,8 +53,7 @@ div.objDetails { }
div.objDetails dt { font-weight: bold; margin-top: .5em; } div.objDetails dt { font-weight: bold; margin-top: .5em; }
div.objDetails dd { margin-left: 0; padding-left: 0; } div.objDetails dd { margin-left: 0; padding-left: 0; }
div.objDetails .objMainImg { max-width: 200px; margin: .5em 1em 1em 0; float: left; div.objDetails .objMainImg { max-width: 200px; margin: .5em 1em 1em 0; float: left;
border: 1px solid #D6D6D6; transition: max-width .4s; } border: 1px solid #D6D6D6; }
div.objDetails .objMainImg:hover { max-width: 100vw; max-height: 80vh; float: initial; }
.metadataLine { margin-top: 2.5em; color: #666; border-top: 1px solid #D6D6D6; } .metadataLine { margin-top: 2.5em; color: #666; border-top: 1px solid #D6D6D6; }
.metadataLine > span { margin-right: 2em; font-size: .95em; font-style: italic; } .metadataLine > span { margin-right: 2em; font-size: .95em; font-style: italic; }