diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 60c762dc9..d58d057a1 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -350,7 +350,7 @@ $template->assign( // categories $query = ' -SELECT category_id, uppercats +SELECT category_id, uppercats, dir FROM '.IMAGE_CATEGORY_TABLE.' AS ic INNER JOIN '.CATEGORIES_TABLE.' AS c ON c.id = ic.category_id @@ -373,7 +373,8 @@ while ($row = pwg_db_fetch_assoc($result)) { $template->assign('STORAGE_CATEGORY', $name); } - $related_categories[$row['category_id']] = $name; + + $related_categories[$row['category_id']] = array('name' => $name, 'isVirtual' => !isset($row['dir'])); $related_categories_ids[] = $row['category_id']; } diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl index 78f76941f..650ea38cd 100644 --- a/admin/themes/default/template/picture_modify.tpl +++ b/admin/themes/default/template/picture_modify.tpl @@ -187,7 +187,7 @@ $('#action-delete-picture').on('click', function() {
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 689d87647..ce00e07d1 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -6481,7 +6481,8 @@ color:#FF7B00; font-weight: 400; } -.breadcrumb-item .icon-cancel-circled { +.breadcrumb-item .icon-cancel-circled, +.breadcrumb-item .help-item { margin-left: auto !important; cursor: pointer; position: absolute; diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index c4bb03dfb..d7d70c2ff 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1316,4 +1316,5 @@ $lang['The original picture will be detected with the filename (without extensio $lang['Delete %s format ?'] = 'Delete %s format ?'; $lang['Installed on %s, %s'] = 'Installed on %s, %s'; $lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'; +$lang['This album is physical, it can\'t be unlinked from the picture'] = 'This album is physical, it can\'t be unlinked from the picture'; // Leave this line empty diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index fc60ebc97..318a8f188 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1318,4 +1318,5 @@ $lang['The original picture will be detected with the filename (without extensio $lang['Delete %s format ?'] = 'Supprimer le format %s ?'; $lang['Installed on %s, %s'] = 'Installé le %s, %s'; $lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'En restaurant ce plugin, il reviendra à son paramétrage d’origine et les données associées seront remises à zero'; +$lang['This album is physical, it can\'t be unlinked from the picture'] = 'Cet album est physique, il ne peut pas être dissocié de l\'image'; // Leave this line empty