diff options
| author | patdenice <patdenice@piwigo.org> | 2012-03-03 18:09:10 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2012-03-03 18:09:10 +0000 |
| commit | db7e67ae20c106c0666e3bb143da2502194c25cb (patch) | |
| tree | faf1770ec755cdfba7052b0a0cc13bd6b2d9a6f1 /include | |
| parent | 5464e7b6979e6ebdfd64dcdae7be86479d3c24ae (diff) | |
Multisize and mobile theme.
Use ajax loader for thumbnails in mobile theme.
Use standard square parameters for mobile theme.
Change square parameters to 120px.
git-svn-id: http://piwigo.org/svn/trunk@13472 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/derivative_std_params.inc.php | 2 | ||||
| -rw-r--r-- | include/page_tail.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php index 07093e0fc..54122aa94 100644 --- a/include/derivative_std_params.inc.php +++ b/include/derivative_std_params.inc.php @@ -160,7 +160,7 @@ final class ImageStdParams private static function make_default() { self::$watermark = new WatermarkParams(); - self::$type_map[IMG_SQUARE] = new DerivativeParams( SizingParams::square(100,100) ); + self::$type_map[IMG_SQUARE] = new DerivativeParams( SizingParams::square(120,120) ); self::$type_map[IMG_THUMB] = new DerivativeParams( SizingParams::classic(144,144) ); self::$type_map[IMG_SMALL] = new DerivativeParams( SizingParams::classic(240,240) ); self::$type_map[IMG_MEDIUM] = new DerivativeParams( SizingParams::classic(432,432) ); diff --git a/include/page_tail.php b/include/page_tail.php index a24176da5..b150611fd 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -66,11 +66,11 @@ if ($conf['show_gt']) $template->assign('debug', $debug_vars ); //------------------------------------------------------------- mobile version -if ( !empty($conf['mobile_theme']) && get_device() != 'desktop') +if ( !empty($conf['mobile_theme']) && (get_device() != 'desktop' || mobile_theme())) { $template->assign('TOGGLE_MOBILE_THEME_URL', add_url_params( - make_index_url(), + duplicate_index_url(), array('mobile' => mobile_theme() ? 'false' : 'true') ) ); |