diff options
-rw-r--r-- | admin/include/functions_plugins.inc.php | 30 | ||||
-rw-r--r-- | admin/plugins.php | 18 | ||||
-rw-r--r-- | admin/plugins_list.php | 4 | ||||
-rw-r--r-- | admin/plugins_new.php | 114 | ||||
-rw-r--r-- | admin/plugins_update.php | 170 | ||||
-rw-r--r-- | plugins/LocalFilesEditor/main.inc.php | 6 | ||||
-rw-r--r-- | plugins/add_index/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/admin_advices/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/admin_multi_view/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/c13y_upgrade/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/event_tracer/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/extended_description/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/hello_world/main.inc.php | 2 | ||||
-rw-r--r-- | plugins/language_switch/main.inc.php | 4 | ||||
-rw-r--r-- | template-common/default-layout.css | 48 | ||||
-rw-r--r-- | template/yoga/admin/default-layout.css | 8 | ||||
-rw-r--r-- | template/yoga/admin/plugins_list.tpl | 36 | ||||
-rw-r--r-- | template/yoga/admin/plugins_new.tpl | 32 | ||||
-rw-r--r-- | template/yoga/admin/plugins_update.tpl | 58 |
19 files changed, 277 insertions, 265 deletions
diff --git a/admin/include/functions_plugins.inc.php b/admin/include/functions_plugins.inc.php index 25ad0dd65..9b59fdb0f 100644 --- a/admin/include/functions_plugins.inc.php +++ b/admin/include/functions_plugins.inc.php @@ -182,18 +182,24 @@ function extract_plugin_files($action, $source, $dest) { // we search main.inc.php in archive if (basename($file['filename']) == 'main.inc.php' - and (!isset($main_filepath) or strlen($file['filename']) < strlen($main_filepath))) + and (!isset($main_filepath) + or strlen($file['filename']) < strlen($main_filepath))) { $main_filepath = $file['filename']; } } - if (isset($main_filepath)) { $root = dirname($main_filepath); // main.inc.php path in archive - if ($action == 'upgrade') $extract_path = PHPWG_PLUGINS_PATH . $dest; - else $extract_path = PHPWG_PLUGINS_PATH . ($root == '.' ? 'extension_' . $dest : basename($root)); - + if ($action == 'upgrade') + { + $extract_path = PHPWG_PLUGINS_PATH.$dest; + } + else + { + $extract_path = PHPWG_PLUGINS_PATH + . ($root == '.' ? 'extension_' . $dest : basename($root)); + } if($result = $zip->extract(PCLZIP_OPT_PATH, $extract_path, PCLZIP_OPT_REMOVE_PATH, $root, PCLZIP_OPT_REPLACE_NEWER)) @@ -226,7 +232,7 @@ function extract_plugin_files($action, $source, $dest) * delete $path directory * @param string - path */ -function pm_deltree($path) +function deltree($path) { if (is_dir($path)) { @@ -236,8 +242,14 @@ function pm_deltree($path) if ($file != '.' and $file != '..') { $pathfile = $path . '/' . $file; - if (is_dir($pathfile)) pm_deltree($pathfile); - else @unlink($pathfile); + if (is_dir($pathfile)) + { + deltree($pathfile); + } + else + { + @unlink($pathfile); + } } } closedir($fh); @@ -250,7 +262,7 @@ function pm_deltree($path) * send $path to trash directory * @param string - path */ -function send_pm_trash($path) +function send_to_trash($path) { $trash_path = PHPWG_PLUGINS_PATH . 'trash'; if (!is_dir($trash_path)) diff --git a/admin/plugins.php b/admin/plugins.php index 63054fc55..d40158b33 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -151,26 +151,26 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; } } break; - + case 'delete': - if (!pm_deltree(PHPWG_PLUGINS_PATH . $plugin_id)) + if (!deltree(PHPWG_PLUGINS_PATH . $plugin_id)) { - send_pm_trash(PHPWG_PLUGINS_PATH . $plugin_id); + send_to_trash(PHPWG_PLUGINS_PATH . $plugin_id); } break; } if (empty($errors)) - { - $my_base_url .= isset($_GET['upgrade']) ? + { + $my_base_url .= isset($_GET['upgrade']) ? '&plugin='.$plugin_id.'&upgrade='.$_GET['upgrade'].'&reactivate=true':''; - $my_base_url .= isset($_GET['upgradestatus']) ? + $my_base_url .= isset($_GET['upgradestatus']) ? '&plugin='.$plugin_id.'&upgradestatus='.$_GET['upgradestatus']:''; - redirect($my_base_url); + redirect($my_base_url); } - else - { + else + { $page['errors'] = array_merge($page['errors'], $errors); } } diff --git a/admin/plugins_list.php b/admin/plugins_list.php index a4c41e868..7e7a153cb 100644 --- a/admin/plugins_list.php +++ b/admin/plugins_list.php @@ -80,7 +80,7 @@ foreach($fs_plugins as $plugin_id => $fs_plugin) 'VERSION' => $fs_plugin['version'], 'DESCRIPTION' => $desc); - $action_url = htmlentities($my_base_url) . '&plugin=' . $plugin_id; + $action_url = htmlentities($my_base_url) . '&plugin=' . $plugin_id; if (isset($db_plugins_by_id[$plugin_id])) { @@ -109,7 +109,7 @@ foreach($fs_plugins as $plugin_id => $fs_plugin) array('U_ACTION' => $action_url . '&action=install', 'L_ACTION' => l10n('Install'), 'CONFIRM' => l10n('Are you sure?')); - $tpl_plugin['actions'][] = + $tpl_plugin['actions'][] = array('U_ACTION' => $action_url . '&action=delete', 'L_ACTION' => l10n('plugins_delete'), 'CONFIRM' => l10n('plugins_confirm_delete')); diff --git a/admin/plugins_new.php b/admin/plugins_new.php index f7fc21a75..e3bdf8f7d 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -34,40 +34,40 @@ $template->set_filenames(array('plugins' => 'admin/plugins_new.tpl')); //------------------------------------------------------automatic installation if (isset($_GET['install']) and isset($_GET['extension']) and !is_adviser()) { - include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); + include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); - $install_status = extract_plugin_files('install', - $_GET['install'], - $_GET['extension']); + $install_status = extract_plugin_files('install', + $_GET['install'], + $_GET['extension']); - redirect($my_base_url . '&installstatus=' . $install_status); + redirect($my_base_url . '&installstatus=' . $install_status); } //--------------------------------------------------------------install result if (isset($_GET['installstatus'])) { - switch ($_GET['installstatus']) - { - case 'ok': - array_push($page['infos'], l10n('plugins_install_ok'), l10n('plugins_install_need_activate')); - break; - - case 'temp_path_error': - array_push($page['errors'], l10n('plugins_temp_path_error')); - break; - - case 'dl_archive_error': - array_push($page['errors'], l10n('plugins_dl_archive_error')); - break; + switch ($_GET['installstatus']) + { + case 'ok': + array_push($page['infos'], l10n('plugins_install_ok'), l10n('plugins_install_need_activate')); + break; + + case 'temp_path_error': + array_push($page['errors'], l10n('plugins_temp_path_error')); + break; + + case 'dl_archive_error': + array_push($page['errors'], l10n('plugins_dl_archive_error')); + break; - case 'archive_error': - array_push($page['errors'], l10n('plugins_archive_error')); - break; + case 'archive_error': + array_push($page['errors'], l10n('plugins_archive_error')); + break; - default: - array_push($page['errors'], sprintf(l10n('plugins_extract_error'), $_GET['installstatus']), l10n('plugins_check_chmod')); - } + default: + array_push($page['errors'], sprintf(l10n('plugins_extract_error'), $_GET['installstatus']), l10n('plugins_check_chmod')); + } } @@ -88,45 +88,45 @@ $template->assign('selected', htmlentities($my_base_url.'&order=').$order); $plugins_infos = check_server_plugins(true); if ($plugins_infos !== false) { - if ($order == 'date') krsort($plugins_infos); - else uasort($plugins_infos, 'extension_'.$order.'_compare'); - - foreach($plugins_infos as $plugin) - { - $ext_desc = nl2br(htmlspecialchars(strip_tags( + if ($order == 'date') krsort($plugins_infos); + else uasort($plugins_infos, 'extension_'.$order.'_compare'); + + foreach($plugins_infos as $plugin) + { + $ext_desc = nl2br(htmlspecialchars(strip_tags( utf8_encode($plugin['ext_description'])))); - - $ver_desc = sprintf(l10n('plugins_description'), - $plugin['version'], - date('Y-m-d', $plugin['date']), - nl2br(htmlspecialchars(strip_tags( + + $ver_desc = sprintf(l10n('plugins_description'), + $plugin['version'], + date('Y-m-d', $plugin['date']), + nl2br(htmlspecialchars(strip_tags( utf8_encode($plugin['description']))))); - - $url_auto_install = htmlentities($my_base_url) - . '&extension=' . $plugin['id_extension'] - . '&install=%2Fupload%2Fextension-' . $plugin['id_extension'] - . '%2Frevision-' . $plugin['id_revision'] . '%2F' + + $url_auto_install = htmlentities($my_base_url) + . '&extension=' . $plugin['id_extension'] + . '&install=%2Fupload%2Fextension-' . $plugin['id_extension'] + . '%2Frevision-' . $plugin['id_revision'] . '%2F' . str_replace(' ', '%20',$plugin['url']); - - $url_download = PEM_URL .'/upload/extension-'.$plugin['id_extension'] - . '/revision-' . $plugin['id_revision'] - . '/' . $plugin['url']; - - $template->append('plugins', - array('EXT_NAME' => $plugin['ext_name'], - 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin['id_extension'], - 'EXT_DESC' => $ext_desc, - 'VERSION' => $plugin['version'], - 'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin['id_revision'], - 'VER_DESC' => $ver_desc, - 'AUTHOR' => $plugin['author'], - 'URL_INSTALL' => $url_auto_install, - 'URL_DOWNLOAD' => $url_download)); - } + + $url_download = PEM_URL .'/upload/extension-'.$plugin['id_extension'] + . '/revision-' . $plugin['id_revision'] + . '/' . $plugin['url']; + + $template->append('plugins', + array('EXT_NAME' => $plugin['ext_name'], + 'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin['id_extension'], + 'EXT_DESC' => $ext_desc, + 'VERSION' => $plugin['version'], + 'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin['id_revision'], + 'VER_DESC' => $ver_desc, + 'AUTHOR' => $plugin['author'], + 'URL_INSTALL' => $url_auto_install, + 'URL_DOWNLOAD' => $url_download)); + } } else { - array_push($page['errors'], l10n('plugins_server_error')); + array_push($page['errors'], l10n('plugins_server_error')); } ?>
\ No newline at end of file diff --git a/admin/plugins_update.php b/admin/plugins_update.php index f92eb112d..2e9e22cd5 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -34,46 +34,46 @@ $template->set_filenames(array('plugins' => 'admin/plugins_update.tpl')); //-----------------------------------------------------------automatic upgrade if (isset($_GET['upgrade']) and isset($_GET['plugin']) and !is_adviser()) { - include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); + include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); - $upgrade_status = extract_plugin_files('upgrade', - $_GET['upgrade'], - $_GET['plugin']); + $upgrade_status = extract_plugin_files('upgrade', + $_GET['upgrade'], + $_GET['plugin']); - $my_base_url .= isset($_GET['reactivate']) ? '&action=activate' : ''; + $my_base_url .= isset($_GET['reactivate']) ? '&action=activate' : ''; - redirect($my_base_url.'&plugin='.$_GET['plugin'].'&upgradestatus='.$upgrade_status); + redirect($my_base_url.'&plugin='.$_GET['plugin'].'&upgradestatus='.$upgrade_status); } //--------------------------------------------------------------upgrade result if (isset($_GET['upgradestatus']) and isset($_GET['plugin'])) { - switch ($_GET['upgradestatus']) - { - case 'ok': - array_push($page['infos'], + switch ($_GET['upgradestatus']) + { + case 'ok': + array_push($page['infos'], sprintf(l10n('plugins_upgrade_ok'), $fs_plugins[$_GET['plugin']]['name'])); - break; - - case 'temp_path_error': - array_push($page['errors'], l10n('plugins_temp_path_error')); - break; - - case 'dl_archive_error': - array_push($page['errors'], l10n('plugins_dl_archive_error')); - break; - - case 'archive_error': - array_push($page['errors'], l10n('plugins_archive_error')); - break; - - default: - array_push($page['errors'], + break; + + case 'temp_path_error': + array_push($page['errors'], l10n('plugins_temp_path_error')); + break; + + case 'dl_archive_error': + array_push($page['errors'], l10n('plugins_dl_archive_error')); + break; + + case 'archive_error': + array_push($page['errors'], l10n('plugins_archive_error')); + break; + + default: + array_push($page['errors'], sprintf(l10n('plugins_extract_error'), - $_GET['upgradestatus'])); - } + $_GET['upgradestatus'])); + } } @@ -84,75 +84,75 @@ $plugins_infos = check_server_plugins(); if ($plugins_infos !== false) { - foreach($fs_plugins as $plugin_id => $fs_plugin) - { - if (isset($fs_plugin['extension']) + foreach($fs_plugins as $plugin_id => $fs_plugin) + { + if (isset($fs_plugin['extension']) and isset($plugins_infos[$fs_plugin['extension']])) - { - $plugin_info = $plugins_infos[$fs_plugin['extension']]; - - $ext_desc = nl2br(htmlspecialchars(strip_tags( + { + $plugin_info = $plugins_infos[$fs_plugin['extension']]; + + $ext_desc = nl2br(htmlspecialchars(strip_tags( utf8_encode($plugin_info['ext_description'])))); - - $ver_desc = sprintf(l10n('plugins_description'), - $plugin_info['version'], - date('Y-m-d', $plugin_info['date']), - nl2br(htmlspecialchars(strip_tags( + + $ver_desc = sprintf(l10n('plugins_description'), + $plugin_info['version'], + date('Y-m-d', $plugin_info['date']), + nl2br(htmlspecialchars(strip_tags( utf8_encode($plugin_info['description']))))); - - if ($plugin_info['version'] == $fs_plugin['version']) - { - // Plugin is up to date - $template->append('plugins_uptodate', - array('URL' => $fs_plugin['uri'], - 'NAME' => $fs_plugin['name'], - 'EXT_DESC' => $ext_desc, - 'VERSION' => $fs_plugin['version'], - 'VER_DESC' => $ver_desc)); - } - else - { - // Plugin need upgrade - $url_auto_update = htmlentities($my_base_url) - . '&plugin=' . $plugin_id - . ( + + if ($plugin_info['version'] == $fs_plugin['version']) + { + // Plugin is up to date + $template->append('plugins_uptodate', + array('URL' => $fs_plugin['uri'], + 'NAME' => $fs_plugin['name'], + 'EXT_DESC' => $ext_desc, + 'VERSION' => $fs_plugin['version'], + 'VER_DESC' => $ver_desc)); + } + else + { + // Plugin need upgrade + $url_auto_update = htmlentities($my_base_url) + . '&plugin=' . $plugin_id + . ( (isset($db_plugins_by_id[$plugin_id]) and $db_plugins_by_id[$plugin_id]['state'] == 'active' and $plugin_id != PLUGINSMANAGER_DIR) ? '&action=deactivate' : '' ) - . '&upgrade=%2Fupload%2Fextension-' . $fs_plugin['extension'] - . '%2Frevision-' . $plugin_info['id_revision'] + . '&upgrade=%2Fupload%2Fextension-' . $fs_plugin['extension'] + . '%2Frevision-' . $plugin_info['id_revision'] . '%2F' . $plugin_info['url']; - - $url_download = PEM_URL.'/upload/extension-'. $fs_plugin['extension'] - . '/revision-' . $plugin_info['id_revision'] - . '/' . $plugin_info['url']; - - $template->append('plugins_not_uptodate', - array('EXT_NAME' => $fs_plugin['name'], - 'EXT_URL' => $fs_plugin['uri'], - 'EXT_DESC' => $ext_desc, - 'VERSION' => $fs_plugin['version'], - 'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin_info['id_revision'], - 'NEW_VERSION' => $plugin_info['version'], - 'NEW_VER_DESC' => $ver_desc, - 'URL_UPDATE' => $url_auto_update, - 'URL_DOWNLOAD' => $url_download)); - } - } - else - { - // Can't check plugin - $template->append('plugins_cant_check', - array('NAME' => $fs_plugin['name'], - 'VERSION' => $fs_plugin['version'])); - } - } + + $url_download = PEM_URL.'/upload/extension-'. $fs_plugin['extension'] + . '/revision-' . $plugin_info['id_revision'] + . '/' . $plugin_info['url']; + + $template->append('plugins_not_uptodate', + array('EXT_NAME' => $fs_plugin['name'], + 'EXT_URL' => $fs_plugin['uri'], + 'EXT_DESC' => $ext_desc, + 'VERSION' => $fs_plugin['version'], + 'VERSION_URL' => PEM_URL.'/revision_view.php?rid='.$plugin_info['id_revision'], + 'NEW_VERSION' => $plugin_info['version'], + 'NEW_VER_DESC' => $ver_desc, + 'URL_UPDATE' => $url_auto_update, + 'URL_DOWNLOAD' => $url_download)); + } + } + else + { + // Can't check plugin + $template->append('plugins_cant_check', + array('NAME' => $fs_plugin['name'], + 'VERSION' => $fs_plugin['version'])); + } + } } else { - array_push($page['errors'], l10n('plugins_server_error')); + array_push($page['errors'], l10n('plugins_server_error')); } ?>
\ No newline at end of file diff --git a/plugins/LocalFilesEditor/main.inc.php b/plugins/LocalFilesEditor/main.inc.php index e2dad5f05..8046d5467 100644 --- a/plugins/LocalFilesEditor/main.inc.php +++ b/plugins/LocalFilesEditor/main.inc.php @@ -1,9 +1,9 @@ <?php /* Plugin Name: LocalFiles Editor -Version: 1.0 -Description: Edit local files from administration panel -Plugin URI: http://www.phpwebgallery.net +Version: 1.8 +Description: Edit local files from administration panel / Editeur de fichiers locaux +Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=144 Author: PhpWebGallery team Author URI: http://www.phpwebgallery.net */ diff --git a/plugins/add_index/main.inc.php b/plugins/add_index/main.inc.php index 64e0cf896..9a3c915b4 100644 --- a/plugins/add_index/main.inc.php +++ b/plugins/add_index/main.inc.php @@ -1,6 +1,6 @@ <?php /* Plugin Name: Add Index -Version: 1.0 +Version: 1.8 Description: Add file index.php file on all sub-directories of local galleries pictures. / Ajoute le fichier index.php sur les sous-répertoires de galeries d'images locales. Plugin URI: http://www.phpwebgallery.net Author: PhpWebGallery team diff --git a/plugins/admin_advices/main.inc.php b/plugins/admin_advices/main.inc.php index fcefc1cb4..eff6ec82a 100644 --- a/plugins/admin_advices/main.inc.php +++ b/plugins/admin_advices/main.inc.php @@ -1,6 +1,6 @@ <?php /* Plugin Name: Admin Advices -Version: 1.0 +Version: 1.8 Description: Give you an advice on the administration page. Plugin URI: http://www.phpwebgallery.net Author: PhpWebGallery team diff --git a/plugins/admin_multi_view/main.inc.php b/plugins/admin_multi_view/main.inc.php index 16f3e7410..99dbd722b 100644 --- a/plugins/admin_multi_view/main.inc.php +++ b/plugins/admin_multi_view/main.inc.php @@ -1,6 +1,6 @@ <?php /* Plugin Name: Multi view -Version: 1.0 +Version: 1.8 Description: Allows administrators to view gallery as guests and/or change the language and/or theme on the fly. Practical to debug changes ... Plugin URI: http://www.phpwebgallery.net Author: PhpWebGallery team diff --git a/plugins/c13y_upgrade/main.inc.php b/plugins/c13y_upgrade/main.inc.php index 2b89cde5c..fdd4b2029 100644 --- a/plugins/c13y_upgrade/main.inc.php +++ b/plugins/c13y_upgrade/main.inc.php @@ -1,7 +1,7 @@ <?php
/*
Plugin Name: Check upgrades
-Version:
+Version: 1.8
Description: Check integrity of upgrades / Contrôle d'intégrité des mises à jour
Plugin URI: http://www.phpwebgallery.net
Author: PhpWebGallery team
diff --git a/plugins/event_tracer/main.inc.php b/plugins/event_tracer/main.inc.php index d31708e9f..c2676bd27 100644 --- a/plugins/event_tracer/main.inc.php +++ b/plugins/event_tracer/main.inc.php @@ -1,6 +1,6 @@ <?php /* Plugin Name: Event tracer -Version: 1.0 +Version: 1.8 Description: For developers. Shows all calls to trigger_event. Plugin URI: http://www.phpwebgallery.net Author: PhpWebGallery team diff --git a/plugins/extended_description/main.inc.php b/plugins/extended_description/main.inc.php index aef78082c..02192a21b 100644 --- a/plugins/extended_description/main.inc.php +++ b/plugins/extended_description/main.inc.php @@ -1,7 +1,7 @@ <?php /* Plugin Name: Extended Description -Version: 1.8.a +Version: 1.8 Description: Allow multilanguage description / Permet d'avoir des descriptions mutilingues Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=175 Author: PhpWebGallery team diff --git a/plugins/hello_world/main.inc.php b/plugins/hello_world/main.inc.php index 5f6dd9134..33e052d75 100644 --- a/plugins/hello_world/main.inc.php +++ b/plugins/hello_world/main.inc.php @@ -1,6 +1,6 @@ <?php /* Plugin Name: Hello World -Version: 1.0 +Version: 1.8 Description: This example plugin changes the page banner for the administration page. Plugin URI: http://www.phpwebgallery.net Author: PhpWebGallery team diff --git a/plugins/language_switch/main.inc.php b/plugins/language_switch/main.inc.php index 82eb5dc2e..0747d9514 100644 --- a/plugins/language_switch/main.inc.php +++ b/plugins/language_switch/main.inc.php @@ -1,8 +1,8 @@ <?php /* Plugin Name: Language Switch -Version: 1.0 +Version: 1.8 Description: Switch to another language from flags on your gallery home page. -Plugin URI: http://www.phpwebgallery.net +Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=123 Author: PhpWebGallery team Author URI: http://www.phpwebgallery.net */ diff --git a/template-common/default-layout.css b/template-common/default-layout.css index 41090e76b..debdfba4a 100644 --- a/template-common/default-layout.css +++ b/template-common/default-layout.css @@ -5,12 +5,12 @@ width: 18em; } #content { - margin-left: 20em; /* = #menubar width + 2em */ + margin-left: 20em; /* = #menubar width + 2em */ } /* Set minimum width of the page before getting a scrollbar */ /* IE5 and IE6 don't get that */ BODY { - min-width: 60em; /* ~ 3* #menubar width */ + min-width: 60em; /* ~ 3* #menubar width */ } BODY#thePopuphelpPage { min-width: 0; @@ -21,7 +21,7 @@ BODY#theAdminPage #menubar { width: 12.5em; } BODY#theAdminPage #content { - margin-left: 14.5em; /* = #menubar width + 2em */ + margin-left: 14.5em; /* = #menubar width + 2em */ } /* Set some sizes according to your maximum thumbnail width and height */ @@ -29,25 +29,25 @@ BODY#theAdminPage #content { #content UL.thumbnails SPAN.wrap2 A, #content UL.thumbnails LABEL, #content DIV.thumbnailCategory DIV.illustration { - width: 140px; /* max thumbnail width + 2px */ + width: 140px; /* max thumbnail width + 2px */ } #content UL.thumbnails SPAN.wrap2, #content DIV.thumbnailCategory DIV.description { - height: 140px; /* max thumbnail height + 2px */ + height: 140px; /* max thumbnail height + 2px */ } #content DIV.comment BLOCKQUOTE { - margin-left: 150px; /*maximum thumbnail width + ~10px */ + margin-left: 150px; /*maximum thumbnail width + ~10px */ } /* Category thumbnails on main page */ #content UL.thumbnailCategories LI { - width: 49.7%; /* 49.7% for 2 per line, 33.2% for 3 per line*/ + width: 49.7%; /* 49.7% for 2 per line, 33.2% for 3 per line*/ } /* Set defaults for thumbnails legend */ #content UL.thumbnails SPAN.thumbLegend { - display: block; /* display: none; if you don't want legend */ - height: 4em; /* legend height (don't set auto to be Gecko friendly)*/ + display: block; /* display: none; if you don't want legend */ + height: 4em; /* legend height (don't set auto to be Gecko friendly)*/ } /* Tooltips*/ @@ -60,23 +60,23 @@ BODY#theAdminPage #content { } .tooltip:hover { - cursor: pointer; - z-index: 500; + cursor: pointer; + z-index: 500; } .tooltip:hover span { - display: inline; - position: absolute; - top: 30px; - left: -50px; - width: 400px; + display: inline; + position: absolute; + top: 30px; + left: -50px; + width: 400px; - font-size: 11px; - text-decoration: none; - text-align: justify; - background-color: #FFFFCC; - color: #444444; - - padding: 10px; - border: 1px solid Black; + font-size: 11px; + text-decoration: none; + text-align: justify; + background-color: #FFFFCC; + color: #444444; + + padding: 10px; + border: 1px solid Black; } diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css index 6ebb4a320..f12fa2048 100644 --- a/template/yoga/admin/default-layout.css +++ b/template/yoga/admin/default-layout.css @@ -200,10 +200,10 @@ UL.tabsheet LI { } UL.tabsheet LI.selected_tab { - font-weight: bold; - position: relative; - top: 1px; - padding-top: 4px; + font-weight: bold; + position: relative; + top: 1px; + padding-top: 4px; } .over{ diff --git a/template/yoga/admin/plugins_list.tpl b/template/yoga/admin/plugins_list.tpl index e96cf7f89..89b57d448 100644 --- a/template/yoga/admin/plugins_list.tpl +++ b/template/yoga/admin/plugins_list.tpl @@ -11,28 +11,28 @@ {if isset($plugins)} <table class="table2"> <thead> - <tr class="throw"> - <td>{'Name'|@translate}</td> - <td>{'Version'|@translate}</td> - <td>{'Description'|@translate}</td> - <td>{'Actions'|@translate}</td> - </tr> + <tr class="throw"> + <td>{'Name'|@translate}</td> + <td>{'Version'|@translate}</td> + <td>{'Description'|@translate}</td> + <td>{'Actions'|@translate}</td> + </tr> </thead> {foreach from=$plugins item=plugin name=plugins_loop} - <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> - <td>{$plugin.NAME}</td> - <td>{$plugin.VERSION}</td> - <td>{$plugin.DESCRIPTION}</td> - <td> - {foreach from=$plugin.actions item=action} - <a href="{$action.U_ACTION}" - {if isset($action.CONFIRM)} + <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> + <td>{$plugin.NAME}</td> + <td>{$plugin.VERSION}</td> + <td>{$plugin.DESCRIPTION}</td> + <td> + {foreach from=$plugin.actions item=action} + <a href="{$action.U_ACTION}" + {if isset($action.CONFIRM)} onclick="return confirm('{$action.CONFIRM|@escape:javascript}');" {/if} - {$TAG_INPUT_ENABLED}>{$action.L_ACTION}</a> - {/foreach} - </td> - </tr> + {$TAG_INPUT_ENABLED}>{$action.L_ACTION}</a> + {/foreach} + </td> + </tr> {/foreach} </table> {/if} diff --git a/template/yoga/admin/plugins_new.tpl b/template/yoga/admin/plugins_new.tpl index b906914db..bf0081703 100644 --- a/template/yoga/admin/plugins_new.tpl +++ b/template/yoga/admin/plugins_new.tpl @@ -12,24 +12,24 @@ <br> <table class="table2"> <thead> - <tr class="throw"> - <td>{'Name'|@translate}</td> - <td>{'Version'|@translate}</td> - <td>{'Author'|@translate}</td> - <td>{'Actions'|@translate}</td> - </tr> + <tr class="throw"> + <td>{'Name'|@translate}</td> + <td>{'Version'|@translate}</td> + <td>{'Author'|@translate}</td> + <td>{'Actions'|@translate}</td> + </tr> </thead> {foreach from=$plugins item=plugin name=plugins_loop} - <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> - <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.EXT_NAME} - <span>{$plugin.EXT_DESC}</span></a></td> - <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.VERSION} - <span>{$plugin.VER_DESC}</span></a></td> - <td>{$plugin.AUTHOR}</td> - <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a> - / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a> - </td> - </tr> + <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> + <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.EXT_NAME} + <span>{$plugin.EXT_DESC}</span></a></td> + <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.VERSION} + <span>{$plugin.VER_DESC}</span></a></td> + <td>{$plugin.AUTHOR}</td> + <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a> + / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a> + </td> + </tr> {/foreach} </table> {/if} diff --git a/template/yoga/admin/plugins_update.tpl b/template/yoga/admin/plugins_update.tpl index 946b67ad9..6712726ff 100644 --- a/template/yoga/admin/plugins_update.tpl +++ b/template/yoga/admin/plugins_update.tpl @@ -8,23 +8,23 @@ <b>{'plugins_need_update'|@translate}</b> <table class="table2"> <thead> - <tr class="throw"> - <td>{'Name'|@translate}</td> - <td>{'plugins_actual_version'|@translate}</td> - <td>{'plugins_new_version'|@translate}</td> - <td>{'plugins_action'|@translate}</td> - </tr> + <tr class="throw"> + <td>{'Name'|@translate}</td> + <td>{'plugins_actual_version'|@translate}</td> + <td>{'plugins_new_version'|@translate}</td> + <td>{'plugins_action'|@translate}</td> + </tr> </thead> {foreach from=$plugins_not_uptodate item=plugin name=plugins_loop} - <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> - <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.EXT_NAME} + <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> + <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.EXT_NAME} <span>{$plugin.EXT_DESC}</span></a></td> - <td style="text-align:center;">{$plugin.VERSION}</td> - <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.NEW_VERSION} + <td style="text-align:center;">{$plugin.VERSION}</td> + <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.NEW_VERSION} <span>{$plugin.NEW_VER_DESC}</span></a></td> - <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a> - / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a></td> - </tr> + <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a> + / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a></td> + </tr> {/foreach} </table> {/if} @@ -35,17 +35,17 @@ <b>{'plugins_dontneed_update'|@translate}</b> <table class="table2"> <thead> - <tr class="throw"> - <td>{'Name'|@translate}</td> - <td>{'Version'|@translate}</td> - </tr> + <tr class="throw"> + <td>{'Name'|@translate}</td> + <td>{'Version'|@translate}</td> + </tr> </thead> {foreach from=$plugins_uptodate item=plugin name=plugins_loop} - <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> - <td><a href="{$plugin.URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.NAME} + <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> + <td><a href="{$plugin.URL}" onclick="window.open(this.href); return false;" class="tooltip">{$plugin.NAME} <span>{$plugin.EXT_DESC}</span></a></td> - <td style="text-align:center;"><span class="tooltip">{$plugin.VERSION}<span>{$plugin.VER_DESC}</span></span></td> - </tr> + <td style="text-align:center;"><span class="tooltip">{$plugin.VERSION}<span>{$plugin.VER_DESC}</span></span></td> + </tr> {/foreach} </table> {/if} @@ -56,16 +56,16 @@ <b>{'plugins_cant_check'|@translate}</b> <table class="table2"> <thead> - <tr class="throw"> - <td>{'Name'|@translate}</td> - <td>{'Version'|@translate}</td> - </tr> + <tr class="throw"> + <td>{'Name'|@translate}</td> + <td>{'Version'|@translate}</td> + </tr> </thead> {foreach from=$plugins_cant_check item=plugin name=plugins_loop} - <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> - <td> {$plugin.NAME} </td> - <td style="text-align:center;">{$plugin.VERSION}</td> - </tr> + <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> + <td> {$plugin.NAME} </td> + <td style="text-align:center;">{$plugin.VERSION}</td> + </tr> {/foreach} </table> {/if} |