From b24c6c48f1fdc90dcb8cbcde64235f8294a47a32 Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 29 Sep 2020 15:12:19 +0200 Subject: [PATCH] fixes #1069 config settings to promote mobile app (iOS only for now) --- admin/configuration.php | 2 ++ .../default/images/piwigo_app_banner.jpg | Bin 0 -> 21612 bytes .../default/template/configuration_main.tpl | 26 ++++++++++++++++++ admin/themes/default/template/header.tpl | 3 ++ include/page_header.php | 8 ++++++ install/db/157-database.php | 21 ++++++++++++++ language/en_UK/admin.lang.php | 4 +++ language/fr_FR/admin.lang.php | 4 +++ themes/default/template/header.tpl | 3 ++ 9 files changed, 71 insertions(+) create mode 100644 admin/themes/default/images/piwigo_app_banner.jpg create mode 100644 install/db/157-database.php diff --git a/admin/configuration.php b/admin/configuration.php index cfb753f3a..95ba049d4 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -43,6 +43,8 @@ $main_checkboxes = array( 'log', 'history_admin', 'history_guest', + 'show_mobile_app_banner_in_gallery', + 'show_mobile_app_banner_in_admin', ); $sizes_checkboxes = array( diff --git a/admin/themes/default/images/piwigo_app_banner.jpg b/admin/themes/default/images/piwigo_app_banner.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b5ad4f3369bb2ec41b6293b453cb7bca879d74e8 GIT binary patch literal 21612 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 literal 0 HcmV?d00001 diff --git a/admin/themes/default/template/configuration_main.tpl b/admin/themes/default/template/configuration_main.tpl index a7f536c34..3d9dfcaa8 100644 --- a/admin/themes/default/template/configuration_main.tpl +++ b/admin/themes/default/template/configuration_main.tpl @@ -19,6 +19,13 @@ }); })(target); }; + + jQuery('.tiptip-with-img').tipTip({ + maxWidth: "300px", + delay: 0, + fadeIn: 200, + fadeOut: 200 + }); }()); {if !isset($ORDER_BY_IS_CUSTOM)} @@ -183,6 +190,24 @@ jQuery("input[name='mail_theme']").change(function() { +
  • + {'Promote mobile app on mobile devices'|translate} + + + + + + +
  • +
  • @@ -204,6 +229,7 @@ jQuery("input[name='mail_theme']").change(function() { {/foreach}
  • + diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl index 775b84548..dd365bdfd 100644 --- a/admin/themes/default/template/header.tpl +++ b/admin/themes/default/template/header.tpl @@ -5,6 +5,9 @@ +{if $SHOW_MOBILE_APP_BANNER} + +{/if} {$GALLERY_TITLE} :: {$PAGE_TITLE} diff --git a/include/page_header.php b/include/page_header.php index d007a5961..f39ee9b20 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -13,6 +13,12 @@ $template->set_filenames(array('header'=>'header.tpl')); trigger_notify('loc_begin_page_header'); +$show_mobile_app_banner = conf_get_param('show_mobile_app_banner_in_gallery', false); +if (defined('IN_ADMIN') and IN_ADMIN) +{ + $show_mobile_app_banner = conf_get_param('show_mobile_app_banner_in_admin', true); +} + $template->assign( array( 'GALLERY_TITLE' => @@ -39,6 +45,8 @@ $template->assign( 'U_HOME' => get_gallery_home_url(), 'LEVEL_SEPARATOR' => $conf['level_separator'], + + 'SHOW_MOBILE_APP_BANNER' => $show_mobile_app_banner, )); diff --git a/install/db/157-database.php b/install/db/157-database.php new file mode 100644 index 000000000..7773c85cd --- /dev/null +++ b/install/db/157-database.php @@ -0,0 +1,21 @@ + diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index f5c3d18e8..75ef71b78 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1011,3 +1011,7 @@ $lang['Posted %s'] = 'Posted %s'; $lang['File type: %s'] = 'File type: %s'; $lang['or'] = 'or'; $lang['Open in gallery'] = "Open in gallery"; +$lang['Promote mobile app on mobile devices'] = 'Promote mobile app on mobile devices'; +$lang['in gallery'] = 'in gallery'; +$lang['in administration'] = 'in administration'; +$lang['Displays a banner to install or open the official Piwigo app'] = 'Displays a banner to install or open the official Piwigo app'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index acc39223c..1fe5c7085 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1016,3 +1016,7 @@ $lang['Some checksums are missing.'] = 'Il manque des sommes de contrôle'; $lang['Display category date'] = 'Afficher la date de la catégorie'; $lang['Deletion in progress'] = 'Suppression en cours'; $lang['Open in gallery'] = "Ouvrir dans la galerie"; +$lang['Promote mobile app on mobile devices'] = 'Promouvoir l\'application mobile sur les smartphones et tablettes'; +$lang['in gallery'] = 'dans la galerie'; +$lang['in administration'] = 'dans l\'administration'; +$lang['Displays a banner to install or open the official Piwigo app'] = 'Affiche une bannière pour installer et/ou ouvrir l\'application mobile officielle Piwigo'; diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index 03084aa87..5092b3814 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -1,6 +1,9 @@ +{if $SHOW_MOBILE_APP_BANNER} + +{/if}