adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-10 10:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature:2577

Browse Source 
Many improvements

git-svn-id: http://piwigo.org/svn/trunk@13234 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2012-02-18 20:26:52 +00:00
parent 4b696df2da
commit 26ed60c972
20 changed files with 185 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/category_default.inc.php
+2
View File
@@ -35,6 +35,8 @@ $selection = array_slice(
$page['nb_image_page']
);
$selection = trigger_event('loc_index_thumbnails_selection', $selection);
if (count($selection) > 0)
{
$rank_of = array_flip($selection);
include/common.inc.php
+1 -22
View File
@@ -192,28 +192,7 @@ if (defined('IN_ADMIN') and IN_ADMIN )
}
else
{ // Classic template
$theme = $user['theme'];
if (!isset($_SESSION['is_mobile']))
{
include_once(PHPWG_ROOT_PATH.'include/mdetect.php');
$uagent_obj = new uagent_info();
if ($_SESSION['is_mobile'] = $uagent_obj->DetectMobileLong())
{
$_SESSION['use_mobile_theme'] = !empty($conf['mobile_theme']);
}
}
if ($_SESSION['is_mobile'])
{
if (isset($_REQUEST['mobile']))
{
$_SESSION['use_mobile_theme'] = get_boolean($_REQUEST['mobile']);
}
if ($_SESSION['use_mobile_theme'])
{
$theme = $conf['mobile_theme'];
}
}
$theme = mobile_theme() ? $conf['mobile_theme'] : $user['theme'];
$template = new Template(PHPWG_ROOT_PATH.'themes', $theme );
}
include/functions.inc.php
+61
View File
@@ -1678,4 +1678,65 @@ function get_branch_from_version($version)
{
return implode('.', array_slice(explode('.', $version), 0, 2));
}
/**
* return the device type: mobile, tablet or desktop
*/
function get_device()
{
$device = pwg_get_session_var('device');
if (is_null($device))
{
include_once(PHPWG_ROOT_PATH.'include/mdetect.php');
$uagent_obj = new uagent_info();
if ($uagent_obj->DetectTierIphone())
{
$device = 'mobile';
}
elseif ($uagent_obj->DetectTierTablet())
{
$device = 'tablet';
}
else
{
$device = 'desktop';
}
pwg_set_session_var('device', $device);
}
return $device;
}
/**
* return true if mobile theme should be loaded
*/
function mobile_theme()
{
global $conf;
if (empty($conf['mobile_theme']))
{
return false;
}
if (isset($_GET['mobile']))
{
$is_mobile_theme = get_boolean($_GET['mobile']);
pwg_set_session_var('mobile_theme', $is_mobile_theme);
unset($_GET['mobile']);
}
else
{
$is_mobile_theme = pwg_get_session_var('mobile_theme');
}
if (is_null($is_mobile_theme))
{
$is_mobile_theme = (get_device() == 'mobile');
pwg_set_session_var('mobile_theme', $is_mobile_theme);
}
return $is_mobile_theme;
}
?>
include/page_tail.php
+11
View File
@@ -65,6 +65,17 @@ if ($conf['show_gt'])
$template->assign('debug', $debug_vars );
//------------------------------------------------------------- mobile version
if (get_device() != 'desktop')
{
$template->assign('TOGGLE_MOBILE_THEME_URL',
add_url_params(
make_index_url(),
array('mobile' => mobile_theme() ? 'false' : 'true')
)
);
}
trigger_action('loc_end_page_tail');
//
// Generate the page