From a69bcd08b5e044623e439c2b672ad41d7905154a Mon Sep 17 00:00:00 2001 From: gigamaster <1905497+gigamaster@users.noreply.github.com> Date: Mon, 13 May 2024 03:30:19 +0200 Subject: [PATCH] Pico Dashboard Activity Overview --- .../modules/pico/admin/category_access.php | 12 +- .../modules/pico/admin/contents.php | 16 +- .../modules/pico/admin/extras.php | 4 +- .../modules/pico/admin/import.php | 12 +- xoops_trust_path/modules/pico/admin/index.php | 132 ++++++-- xoops_trust_path/modules/pico/admin/tags.php | 8 +- xoops_trust_path/modules/pico/admin_menu.php | 4 + ...PicoControllerCopywaitingContent.class.php | 2 +- .../PicoControllerDeleteCategory.class.php | 2 +- .../PicoControllerDeleteContent.class.php | 2 +- .../class/PicoControllerGetContent.class.php | 2 +- .../PicoControllerInsertCategory.class.php | 2 +- .../PicoControllerInsertContent.class.php | 2 +- .../PicoControllerPreviewContent.class.php | 2 +- .../PicoControllerUpdateCategory.class.php | 2 +- .../PicoControllerUpdateContent.class.php | 2 +- .../pico/class/PicoExtraFields.class.php | 6 +- .../PicoFormProcessBySmartyBase.class.php | 2 +- .../modules/pico/language/english/admin.php | 6 + .../modules/pico/language/english/main.php | 8 +- .../modules/pico/language/english/modinfo.php | 1 + .../modules/pico/language/fr_utf8/admin.php | 8 +- .../modules/pico/language/fr_utf8/main.php | 6 +- .../modules/pico/language/fr_utf8/modinfo.php | 1 + .../modules/pico/language/ja_utf8/admin.php | 12 +- .../modules/pico/language/ja_utf8/main.php | 8 +- .../modules/pico/language/ja_utf8/modinfo.php | 1 + .../modules/pico/language/pt_utf8/admin.php | 8 +- .../modules/pico/language/pt_utf8/main.php | 22 +- .../modules/pico/language/pt_utf8/modinfo.php | 1 + .../modules/pico/language/ru_utf8/admin.php | 6 + .../modules/pico/language/ru_utf8/main.php | 6 +- .../modules/pico/language/ru_utf8/modinfo.php | 1 + .../pico/templates/admin_activity.html | 156 ++++++++++ .../pico/templates/admin_contents.html | 235 +++++++------- .../modules/pico/templates/admin_extras.html | 96 +++--- .../modules/pico/templates/admin_import.html | 43 +-- .../modules/pico/templates/admin_tags.html | 4 +- .../pico/templates/main_category_form.html | 47 ++- .../pico/templates/main_content_form.html | 207 +++++++------ .../pico/templates/main_list_contents.html | 77 ++--- .../modules/pico/templates/main_menu.html | 8 +- .../pico/templates/main_view_content.html | 289 ++++++++---------- .../modules/pico/xoops_version.php | 40 +-- xoops_trust_path/wraps/page/index.html | 3 + xoops_trust_path/wraps/pico/index.html | 3 + 46 files changed, 893 insertions(+), 624 deletions(-) create mode 100644 xoops_trust_path/modules/pico/templates/admin_activity.html create mode 100644 xoops_trust_path/wraps/page/index.html create mode 100644 xoops_trust_path/wraps/pico/index.html diff --git a/xoops_trust_path/modules/pico/admin/category_access.php b/xoops_trust_path/modules/pico/admin/category_access.php index 006ac8e99..0df7d0e9a 100644 --- a/xoops_trust_path/modules/pico/admin/category_access.php +++ b/xoops_trust_path/modules/pico/admin/category_access.php @@ -40,7 +40,7 @@ // independent permission update if ( !empty( $_POST['independentpermission_update'] ) && 0 != $cat_id) { if ( !$xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } if ( !empty( $_POST['independentpermission'] ) ) { // update permission_id of categories has the same permission_id and children of the category @@ -54,7 +54,7 @@ // update permission_id of categories which permission_id is the cat_id $db->queryF( 'UPDATE ' . $db->prefix( $mydirname . '_categories' ) . ' SET cat_permission_id=' . (int) $cat_permission_id . " WHERE cat_permission_id=$cat_id" ); } - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=category_access&cat_id=$cat_id", 3, _MD_PICO_MSG_UPDATED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=category_access&cat_id=$cat_id", 2, _MD_PICO_MSG_UPDATED ); exit; } @@ -62,7 +62,7 @@ // group update if ( !empty( $_POST['group_update'] ) ) { if ( !$xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } $db->queryF( 'DELETE FROM ' . $db->prefix( $mydirname . '_category_permissions' ) . " WHERE cat_id=$cat_id AND groupid>0" ); $result = $db->query( 'SELECT groupid FROM ' . $db->prefix( 'groups' ) ); @@ -75,14 +75,14 @@ $db->queryF( 'INSERT INTO ' . $db->prefix( $mydirname . '_category_permissions' ) . " (cat_id,groupid,permissions) VALUES ($cat_id,$gid," . $db->quoteString( serialize( $perms ) ) . ')' ); } } - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=category_access&cat_id=$cat_id", 3, _MD_PICO_MSG_UPDATED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=category_access&cat_id=$cat_id", 2, _MD_PICO_MSG_UPDATED ); exit; } // user update if ( !empty( $_POST['user_update'] ) ) { if ( !$xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } $db->queryF( 'DELETE FROM ' . $db->prefix( $mydirname . '_category_permissions' ) . " WHERE cat_id=$cat_id AND uid>0" ); @@ -129,7 +129,7 @@ } } - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=category_access&cat_id=$cat_id", 3, _MD_PICO_MSG_UPDATED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=category_access&cat_id=$cat_id", 2, _MD_PICO_MSG_UPDATED ); exit; } diff --git a/xoops_trust_path/modules/pico/admin/contents.php b/xoops_trust_path/modules/pico/admin/contents.php index f204d8b93..b9360b5a6 100644 --- a/xoops_trust_path/modules/pico/admin/contents.php +++ b/xoops_trust_path/modules/pico/admin/contents.php @@ -70,7 +70,7 @@ // contents update if ( ! empty( $_POST['contents_update'] ) && ! empty( $_POST['weights'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } $errors = []; @@ -90,14 +90,14 @@ } pico_sync_all( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 3, $errors ? sprintf( _MD_A_PICO_MSG_FMT_DUPLICATEDVPATH, implode( ',', $errors ) ) : _MD_PICO_MSG_UPDATED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 2, $errors ? sprintf( _MD_A_PICO_MSG_FMT_DUPLICATEDVPATH, implode( ',', $errors ) ) : _MD_PICO_MSG_UPDATED ); exit; } // contents move if ( ! empty( $_POST['contents_move'] ) && ! empty( $_POST['action_selects'] ) && isset( $_POST['dest_cat_id'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } // cat_id check @@ -118,14 +118,14 @@ } pico_sync_all( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 3, _MD_A_PICO_MSG_CONTENTSMOVED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 2, _MD_A_PICO_MSG_CONTENTSMOVED ); exit; } // contents delete if ( ! empty( $_POST['contents_delete'] ) && ! empty( $_POST['action_selects'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } foreach ( $_POST['action_selects'] as $content_id => $value ) { @@ -137,14 +137,14 @@ } pico_sync_all( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 3, _MD_A_PICO_MSG_CONTENTSDELETED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 2, _MD_A_PICO_MSG_CONTENTSDELETED ); exit; } // contents export if ( ! empty( $_POST['contents_export'] ) && ! empty( $_POST['action_selects'] ) && ! empty( $_POST['export_mid'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } $export_mid = (int) @$_POST['export_mid']; @@ -160,7 +160,7 @@ pico_import_a_content_from_pico( $export_module->getVar( 'dirname' ), $xoopsModule->getVar( 'mid' ), $content_id ); } - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 3, _MD_A_PICO_MSG_CONTENTSEXPORTED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=contents&cat_id=$cat_id", 2, _MD_A_PICO_MSG_CONTENTSEXPORTED ); exit; } diff --git a/xoops_trust_path/modules/pico/admin/extras.php b/xoops_trust_path/modules/pico/admin/extras.php index ecaddc9ef..90acead7d 100644 --- a/xoops_trust_path/modules/pico/admin/extras.php +++ b/xoops_trust_path/modules/pico/admin/extras.php @@ -85,7 +85,7 @@ // extras delete if ( ! empty( $_POST['extras_delete'] ) && ! empty( $_POST['action_selects'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } foreach ( $_POST['action_selects'] as $extra_id => $value ) { @@ -96,7 +96,7 @@ $db->query( 'DELETE FROM ' . $db->prefix( $mydirname . '_content_extras' ) . " WHERE content_extra_id=$extra_id" ); } - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=extras", 3, _MD_A_PICO_MSG_DELETED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=extras", 2, _MD_A_PICO_MSG_DELETED ); exit; } diff --git a/xoops_trust_path/modules/pico/admin/import.php b/xoops_trust_path/modules/pico/admin/import.php index 42ae212c7..905e4c892 100644 --- a/xoops_trust_path/modules/pico/admin/import.php +++ b/xoops_trust_path/modules/pico/admin/import.php @@ -52,7 +52,7 @@ @set_time_limit( 0 ); if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } $import_mid = (int) @$_POST['import_mid']; @@ -72,7 +72,7 @@ break; } - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=import", 3, _MD_A_PICO_MSG_IMPORTDONE ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=import", 2, _MD_A_PICO_MSG_IMPORTDONE ); exit; } @@ -80,12 +80,12 @@ @set_time_limit( 0 ); if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } pico_sync_all( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=import", 3, _MD_A_PICO_MSG_SYNCALLDONE ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=import", 2, _MD_A_PICO_MSG_SYNCALLDONE ); exit; } @@ -93,12 +93,12 @@ @set_time_limit( 0 ); if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } pico_clear_body_cache( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=import", 3, _MD_A_PICO_MSG_CLEARBODYCACHEDONE ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=import", 2, _MD_A_PICO_MSG_CLEARBODYCACHEDONE ); exit; } diff --git a/xoops_trust_path/modules/pico/admin/index.php b/xoops_trust_path/modules/pico/admin/index.php index b979c010f..cd06b66a4 100644 --- a/xoops_trust_path/modules/pico/admin/index.php +++ b/xoops_trust_path/modules/pico/admin/index.php @@ -1,39 +1,115 @@ - * @copyright (c) 2005-2024 The XOOPSCube Project - * @license GPL 2.0 + * @author Nuno Luciano aka Gigamaster, 2020 XCL PHP7 + * @copyright (c) 2005-2024 Authors + * @license GPL v2.0 */ require_once '../../../mainfile.php'; require_once XOOPS_ROOT_PATH . '/header.php'; +// <{$mod_name|ucfirst}> +$mod_name = $xoopsModule->getVar( 'name' ); + +// Query Total from Multiple Tables +$query = "SELECT +(SELECT COUNT(`cat_id`) FROM " . $xoopsDB->prefix($mod_name .'_categories') ." LIMIT 1) as totalCat, +(SELECT COUNT(`content_id`) FROM " . $xoopsDB->prefix($mod_name .'_contents') ." LIMIT 1) as totalContent, +(SELECT COUNT(`content_id`) FROM " . $xoopsDB->prefix($mod_name .'_content_histories') ." LIMIT 1) as totalRevision, +(SELECT COUNT(`count`) FROM " . $xoopsDB->prefix($mod_name .'_tags') ." LIMIT 1) as totalTags, +(SELECT SUM(`comments_count`) FROM " . $xoopsDB->prefix($mod_name .'_contents') ." LIMIT 1) as totalComments, +(SELECT COUNT(`vote_id`) FROM " . $xoopsDB->prefix($mod_name .'_content_votes') ." LIMIT 1) as totalVotes, +(SELECT COUNT(`content_id`) FROM " . $xoopsDB->prefix($mod_name .'_contents') ." WHERE 'subject_waiting' IS NOT NULL +AND TRIM(subject_waiting) <> '' LIMIT 1) as totalApproval, +(SELECT COUNT(`content_extra_id`) FROM " . $xoopsDB->prefix($mod_name .'_content_extras') ." LIMIT 1) as totalExtra +"; +$active = $xoopsDB->query($query); +$total = $active->fetch_array(); + +// QUERY SETTINGS +$items = 10; // TODO Limit of items to display and pagination +$days = 5; /* interval scheduled to expire, default 5 */ + +// QUERY DB +$sql = "SELECT content_id as ID, +subject as Subject, +visible as Visible, +locked as Locked, +viewed as Views, +comments_count as Comments, +expiring_time as Expire +FROM " . $xoopsDB->prefix($mod_name .'_contents'). " +WHERE expiring_time +BETWEEN (UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL $days DAY))) +AND (UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL $days DAY))) +ORDER BY expiring_time ASC LIMIT $items"; + +$result = $xoopsDB->query($sql); +// if no content, prevent warnings +$assignActivity = []??''; + +if ($row = $result->fetch_assoc()) { + +$re=1; + + foreach($result as $active){ + $re; // used to style interval + $id = $active['ID']??''; + $link = htmlspecialchars( XOOPS_URL.'/modules/'.$mod_name.'/index.php?content_id='.$id, ENT_QUOTES ); + $edit = htmlspecialchars( XOOPS_URL.'/modules/'.$mod_name.'/index.php?page=contentmanager&content_id='.$id, ENT_QUOTES ); + $subject = htmlspecialchars( $active['Subject']??'', ENT_QUOTES ); + if (str_contains($active['Visible']??'', '1')) { + $visible = $active['Visible']; // icon + } else { $visible= '';} + if (str_contains($active['Locked']??'', '1')) { + $locked = $active['Locked']; // icon + } else{$locked ='';} + $comments = $active['Comments']; + $views = $active['Views']; + $expire = $active['Expire']??''; + + $assignActivity[] = [ + 're' => $re++, + 'id' => $id, + 'link' => $link, + 'edit' => $edit, + 'subject' => $subject, + 'visible' => $visible, + 'locked' => $locked, + 'comments' => $comments, + 'views' => $views, + 'expire' => $expire, + ]; + } +} + +// RENDER +xoops_cp_header(); include __DIR__ . '/mymenu.php'; -$xoopsTpl = new XoopsTpl(); -$dbfile = 'db:_custom_pico_index.html'; -if (file_exists($dbfile)) { - echo "The file $dbfile exists"; -} else { - echo "The file $dbfile does not exist"; -} -//$test = $xoopsTpl->fetch($dbIndex); - -if (defined('LEGACY_BASE_VERSION')) { - $modname = $xoopsModule->getVar( 'name' ) ; - $dash = XOOPS_URL . '/admin.php'; - $pref = XOOPS_MODULE_URL . '/legacy/admin/index.php?action=PreferenceEdit&confmod_id='; - $help = XOOPS_MODULE_URL . '/legacy/admin/index.php?action=Help&dirname=ckeditor4'; -} -echo '

' . $xoopsModule->getVar( 'name' ) . '

'; -// echo $test; -?> -

HTML template

-

echo $test;

+$tpl = new XoopsTpl(); +$tpl->assign( + [ + 'mydirname' => $mod_name, + 'mod_name' => $xoopsModule->getVar( 'name' ), + 'mod_url' => XOOPS_URL . '/modules/' . $mod_name, + 'mod_imageurl' => XOOPS_URL . '/modules/' . $mod_name . '/' . $xoopsModuleConfig['images_dir'], + 'mod_config' => $xoopsModuleConfig, + 'totalCat' =>$total['totalCat'], + 'totalContent' =>$total['totalContent'], + 'totalRevision' =>$total['totalRevision'], + 'totalTags' =>$total['totalTags'], + 'totalComments' =>$total['totalComments'], + 'totalVotes' =>$total['totalVotes'], + 'totalApproval' =>$total['totalApproval'], + 'totalExtra' =>$total['totalExtra'], + 'active' => $assignActivity, + 'days' => $days + ] +); + +$tpl->display( 'db:' . $mod_name . '_admin_activity.html' ); - diff --git a/xoops_trust_path/modules/pico/admin/tags.php b/xoops_trust_path/modules/pico/admin/tags.php index d74b6cb89..223eaf0c1 100644 --- a/xoops_trust_path/modules/pico/admin/tags.php +++ b/xoops_trust_path/modules/pico/admin/tags.php @@ -33,7 +33,7 @@ // tags update if ( ! empty( $_POST['tags_update'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } foreach ( array_keys( $_POST['labels'] ) as $old_label ) { @@ -62,7 +62,7 @@ } pico_sync_tags( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=tags", 3, _MD_PICO_MSG_UPDATED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=tags", 2, _MD_PICO_MSG_UPDATED ); exit; } @@ -70,7 +70,7 @@ // tags delete if ( ! empty( $_POST['tags_delete'] ) && ! empty( $_POST['action_selects'] ) ) { if ( ! $xoopsGTicket->check( true, 'pico_admin' ) ) { - redirect_header( XOOPS_URL . '/', 3, $xoopsGTicket->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $xoopsGTicket->getErrors() ); } foreach ( $_POST['action_selects'] as $label => $value ) { @@ -95,7 +95,7 @@ } pico_sync_tags( $mydirname ); - redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=tags", 3, _MD_A_PICO_MSG_DELETED ); + redirect_header( XOOPS_URL . "/modules/$mydirname/admin/index.php?page=tags", 2, _MD_A_PICO_MSG_DELETED ); exit; } diff --git a/xoops_trust_path/modules/pico/admin_menu.php b/xoops_trust_path/modules/pico/admin_menu.php index 022292c51..6e64a1aa8 100644 --- a/xoops_trust_path/modules/pico/admin_menu.php +++ b/xoops_trust_path/modules/pico/admin_menu.php @@ -3,6 +3,10 @@ $constpref = '_MI_' . strtoupper( $mydirname ); $adminmenu = [ + [ + 'title' => constant( $constpref . '_ADMENU_ACTIVITY' ), + 'link' => 'admin/index.php', + ], [ 'title' => constant( $constpref . '_ADMENU_CONTENTSADMIN' ), 'link' => 'admin/index.php?page=contents', diff --git a/xoops_trust_path/modules/pico/class/PicoControllerCopywaitingContent.class.php b/xoops_trust_path/modules/pico/class/PicoControllerCopywaitingContent.class.php index e9186057f..262b9763d 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerCopywaitingContent.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerCopywaitingContent.class.php @@ -25,7 +25,7 @@ class PicoControllerCopywaitingContent extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoControllerDeleteCategory.class.php b/xoops_trust_path/modules/pico/class/PicoControllerDeleteCategory.class.php index 29b64a186..eb2446d02 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerDeleteCategory.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerDeleteCategory.class.php @@ -20,7 +20,7 @@ class PicoControllerDeleteCategory extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoControllerDeleteContent.class.php b/xoops_trust_path/modules/pico/class/PicoControllerDeleteContent.class.php index 35820434d..d4c6bfec1 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerDeleteContent.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerDeleteContent.class.php @@ -24,7 +24,7 @@ class PicoControllerDeleteContent extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoControllerGetContent.class.php b/xoops_trust_path/modules/pico/class/PicoControllerGetContent.class.php index f055153b8..f527597c6 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerGetContent.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerGetContent.class.php @@ -89,7 +89,7 @@ public function execute( $request ) { $this->assign['categories_can_read'][ $tmp_data['id'] ] = str_repeat( '--', $tmp_data['cat_depth_in_tree'] ) . $tmp_data['cat_title']; } - // count up 'viewed' + // count up 'viewed' - comment out if 'modifier_ip' for local views if ( $content_data['modifier_ip'] !== @$_SERVER['REMOTE_ADDR'] ) { $contentObj->incrementViewed(); } diff --git a/xoops_trust_path/modules/pico/class/PicoControllerInsertCategory.class.php b/xoops_trust_path/modules/pico/class/PicoControllerInsertCategory.class.php index adca6ad4f..ead916d4f 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerInsertCategory.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerInsertCategory.class.php @@ -22,7 +22,7 @@ class PicoControllerInsertCategory extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoControllerInsertContent.class.php b/xoops_trust_path/modules/pico/class/PicoControllerInsertContent.class.php index e60bb1a85..2b451eaba 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerInsertContent.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerInsertContent.class.php @@ -24,7 +24,7 @@ class PicoControllerInsertContent extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoControllerPreviewContent.class.php b/xoops_trust_path/modules/pico/class/PicoControllerPreviewContent.class.php index d21cdbbe8..7e14a49f8 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerPreviewContent.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerPreviewContent.class.php @@ -23,7 +23,7 @@ class PicoControllerPreviewContent extends PicoControllerEditContent { public function processPreview( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } // initialize diff --git a/xoops_trust_path/modules/pico/class/PicoControllerUpdateCategory.class.php b/xoops_trust_path/modules/pico/class/PicoControllerUpdateCategory.class.php index a2f88a8c8..8b17f24a2 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerUpdateCategory.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerUpdateCategory.class.php @@ -22,7 +22,7 @@ class PicoControllerUpdateCategory extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoControllerUpdateContent.class.php b/xoops_trust_path/modules/pico/class/PicoControllerUpdateContent.class.php index 8ca0abebd..da0ded802 100644 --- a/xoops_trust_path/modules/pico/class/PicoControllerUpdateContent.class.php +++ b/xoops_trust_path/modules/pico/class/PicoControllerUpdateContent.class.php @@ -24,7 +24,7 @@ class PicoControllerUpdateContent extends PicoControllerAbstract { public function execute( $request ) { // Ticket Check if ( ! $GLOBALS['xoopsGTicket']->check( true, 'pico' ) ) { - redirect_header( XOOPS_URL . '/', 3, $GLOBALS['xoopsGTicket']->getErrors() ); + redirect_header( XOOPS_URL . '/', 2, $GLOBALS['xoopsGTicket']->getErrors() ); } parent::execute( $request ); diff --git a/xoops_trust_path/modules/pico/class/PicoExtraFields.class.php b/xoops_trust_path/modules/pico/class/PicoExtraFields.class.php index 66f422eaa..e97bb8b9f 100644 --- a/xoops_trust_path/modules/pico/class/PicoExtraFields.class.php +++ b/xoops_trust_path/modules/pico/class/PicoExtraFields.class.php @@ -90,7 +90,7 @@ public function uploadImage( &$extra_fields, $file, $field_name ) { // check the directory exists // redirect to module preferences if ( ! is_dir( $this->images_path ) ) { - redirect_header( XOOPS_URL . "/modules/$this->mydirname/admin/index.php", 3, 'Create the upload directory first : ' . htmlspecialchars( $this->mod_config['extra_images_dir'], ENT_QUOTES ) ); + redirect_header( XOOPS_URL . "/modules/$this->mydirname/admin/index.php", 2, 'Create the upload directory first : ' . htmlspecialchars( $this->mod_config['extra_images_dir'], ENT_QUOTES ) ); exit; } @@ -119,7 +119,7 @@ public function uploadImage( &$extra_fields, $file, $field_name ) { // redirect to module preferences $upload_result = move_uploaded_file( $file['tmp_name'], $tmp_image ); if ( ! $upload_result ) { - redirect_header( XOOPS_URL . "/modules/$this->mydirname/admin/index.php", 3, 'Check read and write permissions of the directory : ' . htmlspecialchars( $this->mod_config['extra_images_dir'], ENT_QUOTES ) ); + redirect_header( XOOPS_URL . "/modules/$this->mydirname/admin/index.php", 2, 'Check read and write permissions of the directory : ' . htmlspecialchars( $this->mod_config['extra_images_dir'], ENT_QUOTES ) ); exit; } @chmod( $tmp_image, 0644 ); @@ -129,7 +129,7 @@ public function uploadImage( &$extra_fields, $file, $field_name ) { if ( ! is_array( $check_result ) || empty( $check_result['mime'] ) ) { @unlink( $tmp_image ); // upload file is Not valid, redirect message - redirect_header( XOOPS_URL . "/modules/$this->mydirname/index.php", 3, '🛑 Invalid image file uploaded ! Allowed file types JPG, PNG, GIF.'. htmlspecialchars( print_r($this->$content_id), ENT_QUOTES ) ); + redirect_header( XOOPS_URL . "/modules/$this->mydirname/index.php", 2, '🛑 Invalid image file uploaded ! Allowed file types JPG, PNG, GIF.'. htmlspecialchars( print_r($this->$content_id), ENT_QUOTES ) ); exit; } diff --git a/xoops_trust_path/modules/pico/class/PicoFormProcessBySmartyBase.class.php b/xoops_trust_path/modules/pico/class/PicoFormProcessBySmartyBase.class.php index f68f9e97d..63e569264 100644 --- a/xoops_trust_path/modules/pico/class/PicoFormProcessBySmartyBase.class.php +++ b/xoops_trust_path/modules/pico/class/PicoFormProcessBySmartyBase.class.php @@ -224,7 +224,7 @@ public function reload(): void { if ( ! headers_sent() && ! $this->isMobile() ) { header( 'Location: ' . $this->content_uri ); } else { - redirect_header( htmlspecialchars( $this->content_uri, ENT_QUOTES ), 3, ' ' ); + redirect_header( htmlspecialchars( $this->content_uri, ENT_QUOTES ), 2, ' ' ); } exit; } diff --git a/xoops_trust_path/modules/pico/language/english/admin.php b/xoops_trust_path/modules/pico/language/english/admin.php index 3479a0420..ad45fb714 100644 --- a/xoops_trust_path/modules/pico/language/english/admin.php +++ b/xoops_trust_path/modules/pico/language/english/admin.php @@ -82,3 +82,9 @@ define( '_MD_A_PICO_TIPS_CONTENTS' , 'Content Tips'); define( '_MD_A_PICO_TIPS_TAGS' , 'Tags Tips'); define( '_MD_A_PICO_TIPS_EXTRAS' , 'Extras Tips'); + +// ACTIVITY +define( '_MD_A_PICO_ACTIVITY_OVERVIEW' , 'Activity Overview'); +define( '_MD_A_PICO_ACTIVITY_SCHEDULE' , 'Expired and scheduled content'); +define( '_MD_A_PICO_ACTIVITY_INTERVAL' , 'days of interval before and after today'); +define( '_MD_A_PICO_ACTIVITY_LATEST' , 'latest scheduled contents'); diff --git a/xoops_trust_path/modules/pico/language/english/main.php b/xoops_trust_path/modules/pico/language/english/main.php index 88410beb9..1def8769b 100644 --- a/xoops_trust_path/modules/pico/language/english/main.php +++ b/xoops_trust_path/modules/pico/language/english/main.php @@ -10,9 +10,11 @@ define( '_MD_PICO_MENU' , 'Menu'); define( '_MD_PICO_CREATED' , 'Created'); define( '_MD_PICO_MODIFIED' , 'Modified'); +define( '_MD_PICO_EXPIRED' , 'Expired'); define( '_MD_PICO_EXPIRING' , 'Expiring'); define( '_MD_PICO_BYTE' , 'byte'); -define( '_MD_PICO_HISTORY' , 'Revision History'); +define( '_MD_PICO_REVISIONS' , 'Revisions'); +define( '_MD_PICO_HISTORY' , 'Revision Histories'); define( '_MD_PICO_DIFF2NOW' , 'Diff to current'); define( '_MD_PICO_DIFFFROMPREV' , 'Diff from previous'); define( '_MD_PICO_REFERIT' , 'Refer'); @@ -27,7 +29,8 @@ define( '_MD_PICO_FMT_PUBLICCOUNT' , 'Public: %s items'); define( '_MD_PICO_FMT_PRIVATECOUNT' , 'Private: %s items'); define( '_MD_PICO_WAITINGRELEASE' , 'Waiting release'); -define( '_MD_PICO_EXPIRED' , 'Expired'); +define( '_MD_PICO_LOCKED' , 'Locked'); +define( '_MD_PICO_VISIBLE' , 'Visible'); define( '_MD_PICO_INVISIBLE' , 'Invisible'); define( '_MD_PICO_WAITINGAPPROVAL' , 'Waiting approval'); define( '_MD_PICO_WAITINGREGISTER' , 'Waiting - New Article'); @@ -108,6 +111,7 @@ define( '_MD_PICO_LABEL_SHOWINNAVI' , 'Show in navigation'); define( '_MD_PICO_LABEL_SHOWINMENU' , 'Show in menu'); define( '_MD_PICO_LABEL_ALLOWCOMMENT' , 'Allow comments'); +define( '_MD_PICO_LABEL_COMMENTS' , 'Comments'); define( '_MD_PICO_TH_CATEGORYTITLE' , 'Title'); define( '_MD_PICO_TH_CATEGORYDESC' , 'Description'); define( '_MD_PICO_TH_CATEGORYPARENT' , 'Parent'); diff --git a/xoops_trust_path/modules/pico/language/english/modinfo.php b/xoops_trust_path/modules/pico/language/english/modinfo.php index 87e5166a1..547a62465 100644 --- a/xoops_trust_path/modules/pico/language/english/modinfo.php +++ b/xoops_trust_path/modules/pico/language/english/modinfo.php @@ -17,6 +17,7 @@ define( $constpref . '_DESC', 'Content management with CKEditor, versioning, revision history, diff and granular permissions.' ); // admin menus + define( $constpref . '_ADMENU_ACTIVITY', 'Activity' ); define( $constpref . '_ADMENU_CONTENTSADMIN', 'Contents' ); define( $constpref . '_ADMENU_CATEGORYACCESS', 'Permissions' ); define( $constpref . '_ADMENU_IMPORT', 'Import-Sync' ); diff --git a/xoops_trust_path/modules/pico/language/fr_utf8/admin.php b/xoops_trust_path/modules/pico/language/fr_utf8/admin.php index 9be1377d0..1fa0daf91 100644 --- a/xoops_trust_path/modules/pico/language/fr_utf8/admin.php +++ b/xoops_trust_path/modules/pico/language/fr_utf8/admin.php @@ -13,7 +13,7 @@ define( '_MD_A_PICO_TH_CONTENTSVISIBLE' , 'VIS'); define( '_MD_A_PICO_TH_CONTENTSSHOWINNAVI' , 'NAVI'); define( '_MD_A_PICO_TH_CONTENTSSHOWINMENU' , 'MENU'); -define( '_MD_A_PICO_TH_CONTENTSALLOWCOMMENT' , 'Commentaire'); +define( '_MD_A_PICO_TH_CONTENTSALLOWCOMMENT' , 'Com'); define( '_MD_A_PICO_TH_CONTENTSFILTERS' , 'Filtres'); define( '_MD_A_PICO_TH_CONTENTSACTIONS' , 'Action'); define( '_MD_A_PICO_LEGEND_CONTENTSTHS' , 'VIS: visible   NAVI:affiche dans la page de navigation   MENU:affiche dans le menu   COM:autorise les commentaires'); @@ -82,3 +82,9 @@ define( '_MD_A_PICO_TIPS_CONTENTS' , 'Conseils sur le contenu'); define( '_MD_A_PICO_TIPS_TAGS' , 'Conseils sur les Tips'); define( '_MD_A_PICO_TIPS_EXTRAS' , 'Conseils supplémentaires'); + +// ACTIVITY +define( '_MD_A_PICO_ACTIVITY_OVERVIEW' , 'Aactivité général'); +define( '_MD_A_PICO_ACTIVITY_SCHEDULE' , 'Contenu expiré et programmé'); +define( '_MD_A_PICO_ACTIVITY_INTERVAL' , 'jours d\'intervalle avant et après aujourd\'hui'); +define( '_MD_A_PICO_ACTIVITY_LATEST' , 'derniers contenus programmés'); \ No newline at end of file diff --git a/xoops_trust_path/modules/pico/language/fr_utf8/main.php b/xoops_trust_path/modules/pico/language/fr_utf8/main.php index c692b7c6e..6186727b1 100644 --- a/xoops_trust_path/modules/pico/language/fr_utf8/main.php +++ b/xoops_trust_path/modules/pico/language/fr_utf8/main.php @@ -11,8 +11,10 @@ define( '_MD_PICO_MENU' , 'Menu'); define( '_MD_PICO_CREATED' , 'Créé'); define( '_MD_PICO_MODIFIED' , 'Modifié'); +define( '_MD_PICO_EXPIRED' , 'Expiré'); define( '_MD_PICO_EXPIRING' , 'Expirant'); define( '_MD_PICO_BYTE' , 'octet'); +define( '_MD_PICO_REVISIONS' , 'Révisions'); define( '_MD_PICO_HISTORY' , 'Historique des révisions'); define( '_MD_PICO_DIFF2NOW' , 'Diff du présent'); define( '_MD_PICO_DIFFFROMPREV' , 'Diff du précédent'); @@ -28,7 +30,8 @@ define( '_MD_PICO_FMT_PUBLICCOUNT' , 'Public: %s éléments'); define( '_MD_PICO_FMT_PRIVATECOUNT' , 'Privé: %s éléments'); define( '_MD_PICO_WAITINGRELEASE' , 'en attente de publication'); -define( '_MD_PICO_EXPIRED' , 'Expiré'); +define( '_MD_PICO_LOCKED' , 'Bloqué'); +define( '_MD_PICO_VISIBLE' , 'Visible'); define( '_MD_PICO_INVISIBLE' , 'Invisible'); define( '_MD_PICO_WAITINGAPPROVAL' , 'approbation en attente'); define( '_MD_PICO_WAITINGREGISTER' , 'nouveau en attente'); @@ -113,6 +116,7 @@ define( '_MD_PICO_LABEL_SHOWINNAVI' , 'Afficher dans la navigation'); define( '_MD_PICO_LABEL_SHOWINMENU' , 'Afficher dans le menu'); define( '_MD_PICO_LABEL_ALLOWCOMMENT' , 'Autoriser les commentaires'); +define( '_MD_PICO_LABEL_COMMENTS' , 'Commentaires'); define( '_MD_PICO_TH_CATEGORYTITLE' , 'Titre'); define( '_MD_PICO_TH_CATEGORYDESC' , 'Description'); diff --git a/xoops_trust_path/modules/pico/language/fr_utf8/modinfo.php b/xoops_trust_path/modules/pico/language/fr_utf8/modinfo.php index 79cf74ed7..95a609308 100644 --- a/xoops_trust_path/modules/pico/language/fr_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/fr_utf8/modinfo.php @@ -17,6 +17,7 @@ define( $constpref . '_DESC', 'Content management with CKEditor, versioning, revision history, diff and granular permissions.' ); // admin menus + define( $constpref . '_ADMENU_ACTIVITY', 'Activité' ); define( $constpref . '_ADMENU_CONTENTSADMIN', 'Liste de Contenu' ); define( $constpref . '_ADMENU_CATEGORYACCESS', 'Catégories' ); define( $constpref . '_ADMENU_IMPORT', 'Importer/Sync' ); diff --git a/xoops_trust_path/modules/pico/language/ja_utf8/admin.php b/xoops_trust_path/modules/pico/language/ja_utf8/admin.php index 4296ded7b..76b0fe8d2 100644 --- a/xoops_trust_path/modules/pico/language/ja_utf8/admin.php +++ b/xoops_trust_path/modules/pico/language/ja_utf8/admin.php @@ -79,6 +79,12 @@ define( '_MD_A_PICO_LABEL_ORDER' , '並び順'); // tips -define( '_MD_A_PICO_TIPS_CONTENTS' , 'Content Tips'); -define( '_MD_A_PICO_TIPS_TAGS' , 'Tags Tips'); -define( '_MD_A_PICO_TIPS_EXTRAS' , 'Extras Tips'); +define( '_MD_A_PICO_TIPS_CONTENTS' , 'コンテンツのヒント'); +define( '_MD_A_PICO_TIPS_TAGS' , 'タグのヒント'); +define( '_MD_A_PICO_TIPS_EXTRAS' , 'フォームのヒント'); + +// ACTIVITY +define( '_MD_A_PICO_ACTIVITY_OVERVIEW' , '活動概要'); +define( '_MD_A_PICO_ACTIVITY_SCHEDULE' , '期限切れおよびスケジュールされたコンテンツ'); +define( '_MD_A_PICO_ACTIVITY_INTERVAL' , '今日の前後数日間の間隔'); +define( '_MD_A_PICO_ACTIVITY_LATEST' , '最新の予定内容'); \ No newline at end of file diff --git a/xoops_trust_path/modules/pico/language/ja_utf8/main.php b/xoops_trust_path/modules/pico/language/ja_utf8/main.php index 8392e0d56..382b28d01 100644 --- a/xoops_trust_path/modules/pico/language/ja_utf8/main.php +++ b/xoops_trust_path/modules/pico/language/ja_utf8/main.php @@ -11,9 +11,11 @@ define( '_MD_PICO_MENU' , 'メニュー' ); define( '_MD_PICO_CREATED' , '作成' ); define( '_MD_PICO_MODIFIED' , '更新' ); +define( '_MD_PICO_EXPIRED' , '期限切れ' ); define( '_MD_PICO_EXPIRING' , '有効期限' ); define( '_MD_PICO_BYTE' , 'byte' ); -define( '_MD_PICO_HISTORY' , '履歴' ); +define( '_MD_PICO_REVISIONS' , '改訂'); +define( '_MD_PICO_HISTORY' , '改訂履歴' ); define( '_MD_PICO_DIFF2NOW' , '現在との差分' ); define( '_MD_PICO_DIFFFROMPREV' , '前バージョンとの差分' ); define( '_MD_PICO_REFERIT' , '参照する' ); @@ -28,7 +30,8 @@ define( '_MD_PICO_FMT_PUBLICCOUNT' , '公開:%s件' ); define( '_MD_PICO_FMT_PRIVATECOUNT' , '非公開:%s件' ); define( '_MD_PICO_WAITINGRELEASE' , '公開待ち' ); -define( '_MD_PICO_EXPIRED' , '期限切れ' ); +define( '_MD_PICO_LOCKED' , 'ロックされた'); +define( '_MD_PICO_VISIBLE' , '見える'); define( '_MD_PICO_INVISIBLE' , '非表示' ); define( '_MD_PICO_WAITINGAPPROVAL' , '承認待ち' ); define( '_MD_PICO_WAITINGREGISTER' , '新規登録申請中' ); @@ -109,6 +112,7 @@ define( '_MD_PICO_LABEL_SHOWINNAVI' , 'ページナビに表示する' ); define( '_MD_PICO_LABEL_SHOWINMENU' , 'メニューに表示する' ); define( '_MD_PICO_LABEL_ALLOWCOMMENT' , 'コメント可能' ); +define( '_MD_PICO_LABEL_COMMENTS' , 'コメント'); define( '_MD_PICO_TH_CATEGORYTITLE' , 'タイトル' ); define( '_MD_PICO_TH_CATEGORYDESC' , '説明' ); define( '_MD_PICO_TH_CATEGORYPARENT' , '親カテゴリー' ); diff --git a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php index 9d60867db..d573bc8d8 100644 --- a/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/ja_utf8/modinfo.php @@ -16,6 +16,7 @@ define( $constpref . '_DESC', '静的コンテンツ作成モジュール' ); // admin menus + define( $constpref . '_ADMENU_ACTIVITY', '活動概要' ); define( $constpref . '_ADMENU_CONTENTSADMIN', 'コンテンツ管理' ); define( $constpref . '_ADMENU_CATEGORYACCESS', 'カテゴリー一覧' ); define( $constpref . '_ADMENU_IMPORT', 'インポート/同期' ); diff --git a/xoops_trust_path/modules/pico/language/pt_utf8/admin.php b/xoops_trust_path/modules/pico/language/pt_utf8/admin.php index 9f1f3d4a5..21707c99a 100644 --- a/xoops_trust_path/modules/pico/language/pt_utf8/admin.php +++ b/xoops_trust_path/modules/pico/language/pt_utf8/admin.php @@ -68,7 +68,7 @@ define( '_MD_A_PICO_MSG_SYNCALLDONE' , "Sincronizado corretamente"); define( '_MD_A_PICO_NOTICE_ADDUSERS' , "Você pode conceder ou negar permissões a usuários específicos.
Adicione o uid ou uname do usuário e atribua as permissões."); define( '_MD_A_PICO_TH_CONTENTSACTIONS' , "Ações"); -define( '_MD_A_PICO_TH_CONTENTSALLOWCOMMENT' , "Comentários"); +define( '_MD_A_PICO_TH_CONTENTSALLOWCOMMENT' , "Com"); define( '_MD_A_PICO_TH_CONTENTSFILTERS' , "Filtros"); define( '_MD_A_PICO_TH_CONTENTSID' , "Número"); define( '_MD_A_PICO_TH_CONTENTSSHOWINMENU' , "Menu"); @@ -84,3 +84,9 @@ define( '_MD_A_PICO_TIPS_CONTENTS' , 'Content Tips'); define( '_MD_A_PICO_TIPS_TAGS' , 'Tags Tips'); define( '_MD_A_PICO_TIPS_EXTRAS' , 'Extras Tips'); + +// ACTIVITY +define( '_MD_A_PICO_ACTIVITY_OVERVIEW' , 'Atividade Geral'); +define( '_MD_A_PICO_ACTIVITY_SCHEDULE' , 'Conteúdo expirado e programado'); +define( '_MD_A_PICO_ACTIVITY_INTERVAL' , 'dias de intervalo antes e depois de hoje'); +define( '_MD_A_PICO_ACTIVITY_LATEST' , 'últimos conteúdos programados'); diff --git a/xoops_trust_path/modules/pico/language/pt_utf8/main.php b/xoops_trust_path/modules/pico/language/pt_utf8/main.php index e94f61e3c..b64997dcd 100644 --- a/xoops_trust_path/modules/pico/language/pt_utf8/main.php +++ b/xoops_trust_path/modules/pico/language/pt_utf8/main.php @@ -15,15 +15,17 @@ define( '_MD_PICO_NUM' , 'displays'); // Appended by Xoops Language Checker -GIJOE- in 2008-09-17 13:18:19 -define( '_MD_PICO_MSG_CONFIRMSAVEASCONTENT' , 'Are you OK to save as?'); +define( '_MD_PICO_MSG_CONFIRMSAVEASCONTENT' , 'Confirme para salvar uma cópia.'); // Appended by Xoops Language Checker -GIJOE- in 2008-09-07 05:14:32 -define( '_MD_PICO_EXPIRING' , 'Expiring'); -define( '_MD_PICO_FMT_PUBLIC' , 'Public'); -define( '_MD_PICO_FMT_PRIVATE' , 'Private'); -define( '_MD_PICO_FMT_PUBLICCOUNT' , 'Public: %s items'); -define( '_MD_PICO_FMT_PRIVATECOUNT' , 'Private: %s items'); -define( '_MD_PICO_INVISIBLE' , 'Invisible'); +define( '_MD_PICO_EXPIRED' , 'Expirado'); +define( '_MD_PICO_EXPIRING' , 'Expirando'); +define( '_MD_PICO_FMT_PUBLIC' , 'Público'); +define( '_MD_PICO_FMT_PRIVATE' , 'Privado'); +define( '_MD_PICO_FMT_PUBLICCOUNT' , 'Público: %s items'); +define( '_MD_PICO_FMT_PRIVATECOUNT' , 'Privado: %s items'); +define( '_MD_PICO_VISIBLE' , 'Visível'); +define( '_MD_PICO_INVISIBLE' , 'Invisível'); // Appended by Xoops Language Checker -GIJOE- in 2008-04-23 04:51:13 define( '_MD_PICO_TH_TAGS' , 'Etiquetas'); @@ -44,7 +46,8 @@ define( '_MD_PICO_CREATED' , "Criado"); define( '_MD_PICO_MODIFIED' , "Modificado"); define( '_MD_PICO_BYTE' , "byte"); -define( '_MD_PICO_HISTORY' , 'Histórico de Revisão'); +define( '_MD_PICO_REVISIONS' , 'Revisões'); +define( '_MD_PICO_HISTORY' , 'Histórico de revisões'); define( '_MD_PICO_DIFF2NOW' , 'Comparar com atual'); define( '_MD_PICO_DIFFFROMPREV' , 'Comparar com anterior'); define( '_MD_PICO_REFERIT' , 'Referir'); @@ -55,7 +58,7 @@ define( '_MD_PICO_CATEGORYINDEX' , 'Índice'); define( '_MD_PICO_NOSUBJECT' , '(sem título)'); define( '_MD_PICO_WAITINGRELEASE' , 'Publicação pendente'); -define( '_MD_PICO_EXPIRED' , 'Expirado'); +define( '_MD_PICO_LOCKED' , 'Bloqueado'); define( '_MD_PICO_WAITINGAPPROVAL' , 'Esperando por aprovação'); define( '_MD_PICO_WAITINGREGISTER' , 'Novos em espera'); define( '_MD_PICO_WAITINGUPDATE' , 'Atualização pendente'); @@ -129,6 +132,7 @@ define( '_MD_PICO_LABEL_SHOWINNAVI' , "Mostrar na navegação"); define( '_MD_PICO_LABEL_SHOWINMENU' , "Mostrar no menu"); define( '_MD_PICO_LABEL_ALLOWCOMMENT' , "Permitir comentários"); +define( '_MD_PICO_LABEL_COMMENTS' , 'Comentarios'); define( '_MD_PICO_TH_CATEGORYTITLE' , "Título"); define( '_MD_PICO_TH_CATEGORYDESC' , "Descrição"); define( '_MD_PICO_TH_CATEGORYPARENT' , "Principal"); diff --git a/xoops_trust_path/modules/pico/language/pt_utf8/modinfo.php b/xoops_trust_path/modules/pico/language/pt_utf8/modinfo.php index 699302c62..884bf4f6c 100644 --- a/xoops_trust_path/modules/pico/language/pt_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/pt_utf8/modinfo.php @@ -65,6 +65,7 @@ define($constpref."_DESC","Módulo avançado para edição de conteúdo dinâmico e encapsulamento de conteúdo estático"); // admin menus +define( $constpref . '_ADMENU_ACTIVITY', 'Atividade' ); define($constpref."_ADMENU_CONTENTSADMIN","Conteúdo"); define($constpref."_ADMENU_CATEGORYACCESS","Categorias"); define($constpref."_ADMENU_IMPORT","Importar/sincronizar"); diff --git a/xoops_trust_path/modules/pico/language/ru_utf8/admin.php b/xoops_trust_path/modules/pico/language/ru_utf8/admin.php index 9334d1c89..b17d38b58 100644 --- a/xoops_trust_path/modules/pico/language/ru_utf8/admin.php +++ b/xoops_trust_path/modules/pico/language/ru_utf8/admin.php @@ -82,3 +82,9 @@ define( '_MD_A_PICO_TIPS_CONTENTS' , 'Советы по содержанию'); define( '_MD_A_PICO_TIPS_TAGS' , 'Теги Советы'); define( '_MD_A_PICO_TIPS_EXTRAS' , 'Дополнительные советы'); + +// ACTIVITY +define( '_MD_A_PICO_ACTIVITY_OVERVIEW' , 'Обзор деятельности'); +define( '_MD_A_PICO_ACTIVITY_SCHEDULE' , 'Просроченный и запланированный контент'); +define( '_MD_A_PICO_ACTIVITY_INTERVAL' , 'дни перерыва до и после сегодняшнего дня'); +define( '_MD_A_PICO_ACTIVITY_LATEST' , 'последний запланированный контент'); \ No newline at end of file diff --git a/xoops_trust_path/modules/pico/language/ru_utf8/main.php b/xoops_trust_path/modules/pico/language/ru_utf8/main.php index b16d134e7..9e4c8fa86 100644 --- a/xoops_trust_path/modules/pico/language/ru_utf8/main.php +++ b/xoops_trust_path/modules/pico/language/ru_utf8/main.php @@ -10,8 +10,10 @@ define( '_MD_PICO_MENU' , 'Menu'); define( '_MD_PICO_CREATED' , 'Созданный'); define( '_MD_PICO_MODIFIED' , 'Изменено'); +define( '_MD_PICO_EXPIRED' , 'Истекший'); define( '_MD_PICO_EXPIRING' , 'истекает'); define( '_MD_PICO_BYTE' , 'byte'); +define( '_MD_PICO_REVISIONS' , 'пересмотр'); define( '_MD_PICO_HISTORY' , 'История изменений'); define( '_MD_PICO_DIFF2NOW' , 'Diff to current'); define( '_MD_PICO_DIFFFROMPREV' , 'Diff from previous'); @@ -27,7 +29,8 @@ define( '_MD_PICO_FMT_PUBLICCOUNT' , 'Общественный: %s items'); define( '_MD_PICO_FMT_PRIVATECOUNT' , 'Частный: %s items'); define( '_MD_PICO_WAITINGRELEASE' , 'Ожидающий освобождения'); -define( '_MD_PICO_EXPIRED' , 'Истекший'); +define( '_MD_PICO_LOCKED' , 'Заблокировано'); +define( '_MD_PICO_VISIBLE' , 'видимый'); define( '_MD_PICO_INVISIBLE' , 'Невидимый'); define( '_MD_PICO_WAITINGAPPROVAL' , 'Ожидает одобрения'); define( '_MD_PICO_WAITINGREGISTER' , 'Ожидание - Новая статья'); @@ -108,6 +111,7 @@ define( '_MD_PICO_LABEL_SHOWINNAVI' , 'Show in navigation'); define( '_MD_PICO_LABEL_SHOWINMENU' , 'Show in menu'); define( '_MD_PICO_LABEL_ALLOWCOMMENT' , 'Allow comments'); +define( '_MD_PICO_LABEL_COMMENTS' , 'Comments'); define( '_MD_PICO_TH_CATEGORYTITLE' , 'Title'); define( '_MD_PICO_TH_CATEGORYDESC' , 'Description'); define( '_MD_PICO_TH_CATEGORYPARENT' , 'Parent'); diff --git a/xoops_trust_path/modules/pico/language/ru_utf8/modinfo.php b/xoops_trust_path/modules/pico/language/ru_utf8/modinfo.php index dfc6ae93a..73daf916a 100644 --- a/xoops_trust_path/modules/pico/language/ru_utf8/modinfo.php +++ b/xoops_trust_path/modules/pico/language/ru_utf8/modinfo.php @@ -16,6 +16,7 @@ define( $constpref . '_DESC', 'Content management with CKEditor, versioning, revision history, diff and granular permissions.' ); // admin menus + define( $constpref . '_ADMENU_ACTIVITY', 'Активность' ); define( $constpref . '_ADMENU_CONTENTSADMIN', 'Contents' ); define( $constpref . '_ADMENU_CATEGORYACCESS', 'Permissions' ); define( $constpref . '_ADMENU_IMPORT', 'Import-Sync' ); diff --git a/xoops_trust_path/modules/pico/templates/admin_activity.html b/xoops_trust_path/modules/pico/templates/admin_activity.html new file mode 100644 index 000000000..edd5c236a --- /dev/null +++ b/xoops_trust_path/modules/pico/templates/admin_activity.html @@ -0,0 +1,156 @@ + + +

<{$smarty.const._MD_A_PICO_ACTIVITY_OVERVIEW}>

+

<{$mydirname|ucfirst}>

+
+
+
+
+
<{$smarty.const._MD_PICO_CATEGORIES}>
+
<{$totalCat}> %
+
+
+
<{$smarty.const._MD_PICO_CONTENTS}>
+
<{$totalContent}> %
+
+
+
<{$smarty.const._MD_PICO_REVISIONS}>
+
<{$totalRevision}> %
+
+
+
<{$smarty.const._MD_PICO_TH_TAGS}>
+
<{$totalTags}> %
+
+
+
<{$smarty.const._MD_PICO_LABEL_COMMENTS}>
+
<{$totalComments}>%
+
+
+
<{$smarty.const._MD_PICO_VOTECOUNT}>
+
<{$totalVotes}> %
+
+
+
<{$smarty.const._MD_A_PICO_H2_EXTRAS}>
+
<{$totalExtra}>
+
+
+
+
+
<{$smarty.const._MD_PICO_WAITINGAPPROVAL}>
+ +
+ +
+

<{$totalApproval}> <{$smarty.const._MD_PICO_CONTENTS}>

+
+
+
+ +
+ +

+ <{$smarty.const._MD_A_PICO_ACTIVITY_SCHEDULE}>

+ +<{* use the date_format modifier to show current date and time : 2024-04-20 20:04:20 *}> +<{* $smarty.now|date_format:'%Y-%m-%d %H:%M:%S' *}> +
+ <{$days}> <{$smarty.const._MD_A_PICO_ACTIVITY_INTERVAL}> + <{$smarty.now|date_format:"%A, %e %B %Y - %H:%M:%S"}> + +
+ + + + + + + + + + + + + + + + <{foreach from=$active item=active name=active}> + + + + + + + + + + + <{if $smarty.foreach.active.last}> + + + <{/if}> + <{/foreach}> +
ID<{$smarty.const._MD_PICO_CONTENT}><{$smarty.const._MD_PICO_VISIBLE}><{$smarty.const._MD_PICO_LOCKED}><{$smarty.const._MD_PICO_LABEL_COMMENTS}><{$smarty.const._MD_PICO_VIEWED}><{$smarty.const._MD_PICO_EXPIRING}><{$smarty.const._ACTION}>
<{$active.id}> + <{if $active.re > $days}> + + <{/if}> <{$active.subject}> + <{if $active.visible}><{/if}> + + <{if $active.locked}><{/if}> + <{$active.comments}><{$active.views}><{$active.expire|date_format:'%Y-%m-%d %H:%M'}> + + + + + + +
<{$smarty.foreach.active.total}> <{$smarty.const._MD_A_PICO_ACTIVITY_LATEST}>
diff --git a/xoops_trust_path/modules/pico/templates/admin_contents.html b/xoops_trust_path/modules/pico/templates/admin_contents.html index 949c58b91..6c0b69843 100644 --- a/xoops_trust_path/modules/pico/templates/admin_contents.html +++ b/xoops_trust_path/modules/pico/templates/admin_contents.html @@ -50,117 +50,116 @@
<{$mydirname|ucfirst}> <{$smarty.const._ACTION}><
<{$gticket_hidden}> - - - - - - - - - - - - - - - - <{foreach from=$contents item="content"}> - +
<{$smarty.const._MD_A_PICO_TH_CONTENTSID}><{$smarty.const._MD_PICO_TH_SUBJECT}> / <{$smarty.const._MD_PICO_TH_VIRTUALPATH}> <{$smarty.const._MD_A_PICO_TH_CONTENTSWEIGHT}><{$smarty.const._MD_A_PICO_TH_CONTENTSVISIBLE}>
- -
<{$smarty.const._MD_A_PICO_TH_CONTENTSSHOWINNAVI}>
- -
<{$smarty.const._MD_A_PICO_TH_CONTENTSSHOWINMENU}>
- -
<{$smarty.const._MD_A_PICO_TH_CONTENTSALLOWCOMMENT}>
- -
Revisionbatch
- - -
- <{$smarty.const._MD_A_PICO_TH_CONTENTSACTIONS}> -
+ + + + + + + + + + + + + + + + + <{foreach from=$contents item="content"}> + + + <{/if}> + - - + + + + <{/if}> + <{/foreach}> - - + + + + + diff --git a/xoops_trust_path/modules/pico/templates/admin_extras.html b/xoops_trust_path/modules/pico/templates/admin_extras.html index 17efb8f64..b0d3c6a6b 100644 --- a/xoops_trust_path/modules/pico/templates/admin_extras.html +++ b/xoops_trust_path/modules/pico/templates/admin_extras.html @@ -1,88 +1,110 @@ -
<{$smarty.template}>
+ +

<{$mod_name|ucfirst}> : <{$smarty.const._MD_A_PICO_H2_EXTRAS}>

-

<{$mod_name|ucfirst}> » <{$smarty.const._MD_A_PICO_H2_EXTRAS}>

+
<{$smarty.template}>
-
- <{$smarty.const._MD_A_PICO_TIPS_EXTRAS}> -
<{* ////— ACTION-CONTROL —\\\\ *}> -
+
- + <{$pagenav}>
- + + +
-<{* !--&cat_id=<{$cat_id}>-- undefined cat id *}> -
+ + <{$gticket_hidden}>
<{$smarty.const._MD_A_PICO_TH_CONTENTSID}><{$smarty.const._MD_PICO_TH_SUBJECT}><{$smarty.const._MD_PICO_TH_VIRTUALPATH}><{$smarty.const._MD_A_PICO_TH_CONTENTSWEIGHT}><{$smarty.const._MD_A_PICO_TH_CONTENTSVISIBLE}> +
+ +
<{$smarty.const._MD_A_PICO_TH_CONTENTSSHOWINNAVI}> +
+ +
<{$smarty.const._MD_A_PICO_TH_CONTENTSSHOWINMENU}> +
+ +
<{$smarty.const._MD_A_PICO_TH_CONTENTSALLOWCOMMENT}> +
+ +
Revision + <{$smarty.const._MD_A_PICO_TH_CONTENTSACTIONS}> + +
<{$content.id}> - <{if $cat_id == $smarty.const.SPECIAL_CAT_ID_ALL}> + <{if $cat_id == $smarty.const.SPECIAL_CAT_ID_ALL}> - + <{/if}> - - - - - <{if $content.wrap_file}>
- -
+ +
+ <{if $content.wrap_file}> + <{if strstr($content.filters,"wraps")}>*<{/if}> + +
<{$content.wrap_file.mtime_formatted}> (<{$content.wrap_file.size}> <{$smarty.const._MD_PICO_BYTE}>) - <{/if}> -
- + - checked="checked"<{/if}>> + checked="checked"<{/if}>> - checked="checked"<{/if}>> + checked="checked"<{/if}>> - checked="checked"<{/if}>> + checked="checked"<{/if}>> - checked="checked"<{/if}>> - <{if $content.is_deleted}> -
    - <{foreach from=$content.histories item="history"}> -
  • - <{$history.modified_time_formatted}> - - - <{$history.modifier_uname}> - (<{$history.body_size|number_format}><{$smarty.const._MD_PICO_BYTE}>) -
    -   - - - - - <{if $history.prev_id}> - - - - <{/if}> -
  • - <{/foreach}> -
+ + <{if $content.is_deleted}> +
    + <{foreach from=$content.histories item="history"}> +
  • + <{$history.modified_time_formatted}> + - + <{$history.modifier_uname}> + (<{$history.body_size|number_format}><{$smarty.const._MD_PICO_BYTE}>) +
    + + - + + <{if $history.prev_id}> + - + + <{/if}> +
  • + <{/foreach}> +
<{else}> + <{if ! $content.approval}> <{$smarty.const._MD_PICO_WAITINGAPPROVAL}> <{/if}> @@ -179,20 +178,13 @@
<{$mydirname|ucfirst}> <{$smarty.const._ACTION}>< <{if $content.expiring_time < time()}> <{$smarty.const._MD_PICO_EXPIRED}> - <{/if}> + <{/if}>
avatar <{$content.modifier_uname}>
- <{$content.modified_time_formatted}> - <{/if}> -
- - + <{$content.modified_time_formatted}> + <{if !$content.is_deleted}> @@ -201,30 +193,35 @@
<{$mydirname|ucfirst}> <{$smarty.const._ACTION}>< <{/if}> -
- <{* ACTION BATCH - DELETE, MOVE, EXPORT *}> - <{$smarty.const._MD_A_PICO_LABEL_CONTENTSRIGHTCHECKED}>
- - - - - - +
+ <{* ACTION BATCH - DELETE, MOVE, EXPORT *}> + <{$smarty.const._MD_A_PICO_LABEL_CONTENTSRIGHTCHECKED}> + +
+ + + + +
- - - - - - + + + + + <{foreach from=$extras item="extra"}> - - + "> + - - - - + + <{/foreach}> -
<{$smarty.const._MD_A_PICO_TH_ID}><{$smarty.const._MD_PICO_TH_SUBJECT}><{$smarty.const._MD_PICO_CREATED}><{$smarty.const._MD_A_PICO_TH_TYPE}><{$smarty.const._MD_A_PICO_TH_SUMMARY}><{$smarty.const._MD_A_PICO_TH_EXTRASACTIONS}> - + + <{$smarty.const._MD_A_PICO_TH_ID}> + + <{$smarty.const._MD_PICO_TH_SUBJECT}> + + <{$smarty.const._MD_PICO_CREATED}> + + <{$smarty.const._MD_A_PICO_TH_TYPE}> + + <{$smarty.const._MD_A_PICO_TH_SUMMARY}> + + <{$smarty.const._MD_A_PICO_TH_EXTRASACTIONS}> +
<{$extra.id}>
- <{$extra.content_subject}> ⭧ + <{$extra.id}> + + + <{$extra.content_subject}> + + [<{$smarty.const._EDIT}>] + [<{$smarty.const._MD_A_PICO_LINK_EXTRACT}>] <{$extra.created_time_formatted}><{$extra.extra_type_formatted}> + + <{$extra.created_time_formatted}> <{$extra.data_summary_short_raw|escape}> - - - - + + <{$extra.extra_type_formatted}> + + <{$extra.data_summary_short_raw|escape}> + - + <{$smarty.const._MD_A_PICO_LINK_DETAIL}>
+ <{$smarty.const._MD_A_PICO_LABEL_EXTRASRIGHTCHECKED}> - - - + + +
diff --git a/xoops_trust_path/modules/pico/templates/admin_import.html b/xoops_trust_path/modules/pico/templates/admin_import.html index c47184f66..269472b3a 100644 --- a/xoops_trust_path/modules/pico/templates/admin_import.html +++ b/xoops_trust_path/modules/pico/templates/admin_import.html @@ -2,18 +2,13 @@

<{$mod_name|ucfirst}> » <{$smarty.const._MD_A_PICO_H2_IMPORTFROM}>

-
+
<{$smarty.const._MD_A_PICO_HELP_IMPORTFROM}>
<{$gticket_hidden}> -
-
- -
-

@@ -21,49 +16,41 @@

<{$mod_name|ucfirst}> » <{$smarty.const._MD_A_PICO_H2_IMPORTFROM}>

value="<{$smarty.const._MD_A_PICO_BTN_DOIMPORT}>" onclick="return confirm('<{$smarty.const._MD_A_PICO_CONFIRM_DOIMPORT}>')">

-
-
-

<{$smarty.const._MD_A_PICO_H2_SYNCALL}>

+

<{$smarty.const._MD_A_PICO_H2_SYNCALL}>

-
+
<{$smarty.const._MD_A_PICO_HELP_SYNCALL}>
<{$gticket_hidden}> - -
-
- -
-
-

-
-
+

+ +

-

<{$smarty.const._MD_A_PICO_H2_CLEARBODYCACHE}>

+

<{$smarty.const._MD_A_PICO_H2_CLEARBODYCACHE}>

-
+
<{$smarty.const._MD_A_PICO_HELP_CLEARBODYCACHE}>
<{$gticket_hidden}> -
-
-
-
-

-
-
+

+ +

diff --git a/xoops_trust_path/modules/pico/templates/admin_tags.html b/xoops_trust_path/modules/pico/templates/admin_tags.html index b8c8fc895..831964940 100644 --- a/xoops_trust_path/modules/pico/templates/admin_tags.html +++ b/xoops_trust_path/modules/pico/templates/admin_tags.html @@ -25,7 +25,7 @@

<{$mod_name|ucfirst}> » <{$smarty.const._MD_A_PICO_H2_TAGS}>

- <{$pagenav}> +
@@ -70,7 +70,7 @@

<{$mod_name|ucfirst}> » <{$smarty.const._MD_A_PICO_H2_TAGS}>

<{$tag.created_time|formatTimestamp}> - + <{/foreach}> diff --git a/xoops_trust_path/modules/pico/templates/main_category_form.html b/xoops_trust_path/modules/pico/templates/main_category_form.html index 9a511458a..673499d54 100644 --- a/xoops_trust_path/modules/pico/templates/main_category_form.html +++ b/xoops_trust_path/modules/pico/templates/main_category_form.html @@ -3,8 +3,8 @@ <{include file="db:`$mydirname`_inc_breadcrumbs.html"}> -

<{$smarty.const._MD_PICO_CATEGORYMANAGER}>

- +
<{$gticket_hidden}> @@ -12,7 +12,7 @@

<{$smarty.const._MD_PICO_CATEGORYMANAGER}>

-

<{$formtitle}>

+

<{$formtitle}>

+ <{$category.option_desc}>
<{* ----- /CATEGORY OPTIONS *}>
-
- <{if $page == 'categorymanager' && $children_count == 0}> - - <{/if}> - +
+ <{if $page == 'categorymanager' && isset($children_count) == 0}> +
+ +
+ <{/if}> +
+ +
- - - - - diff --git a/xoops_trust_path/modules/pico/templates/main_content_form.html b/xoops_trust_path/modules/pico/templates/main_content_form.html index a38fa93ff..8e847b60d 100644 --- a/xoops_trust_path/modules/pico/templates/main_content_form.html +++ b/xoops_trust_path/modules/pico/templates/main_content_form.html @@ -4,11 +4,11 @@ <{include file="db:`$mydirname`_inc_breadcrumbs.html"}> +
<{$gticket_hidden}> @@ -19,7 +19,7 @@
-

<{$formtitle}>: <{$content.subject}>

+

<{$formtitle}> <{$content.subject}>

<{if !$content.approval}> @@ -48,19 +48,6 @@

<{$formtitle}>: <{$content.subject}>

- <{if isset($preview)}> - <{foreach from=$preview.errors item="error_message"}> -

- <{$error_message}> -

- <{/foreach}> -

<{$smarty.const._PREVIEW}>

-
- <{$preview.body}> -
- <{/if}> - - <{* -------Article subject of waiting content *}> <{if $content.subject_waiting && $page !='makecontent'}>

@@ -83,7 +70,7 @@

<{$smarty.const._PREVIEW}>

<{* ------- subject *}> <{* ------- category *}> @@ -106,7 +93,7 @@

<{$smarty.const._PREVIEW}>

<{if $xoops_isadmin}> @@ -115,19 +102,25 @@

<{$smarty.const._PREVIEW}>

<{* ------- image upload *}> <{* ------- extra fields sample (TEXTBOX) ------- -
+
- +<{if isset($preview)}> +<{$gticket_hidden}><{* 📍gticket might not be need *}> + +
+
+ +

<{$smarty.const._PREVIEW}>

+
+
+ <{foreach from=$preview.errors item="error_message"}> +

+ <{$error_message}> +

+ <{/foreach}> + + <{$preview.body}> +
+
+
+ Cancel + <{if trim($smarty.capture.controllers)}> + <{$smarty.capture.controllers}> + <{/if}> +
+
+
+
+<{/if}> + - <{* ------- Start Form Validation JavaScript /*}> - - <{* ------- End Form Validation JavaScript *}> diff --git a/xoops_trust_path/modules/pico/templates/main_list_contents.html b/xoops_trust_path/modules/pico/templates/main_list_contents.html index f257eddd8..805d28fd2 100644 --- a/xoops_trust_path/modules/pico/templates/main_list_contents.html +++ b/xoops_trust_path/modules/pico/templates/main_list_contents.html @@ -30,16 +30,17 @@

<{/if}>

<{* ------- Activity Overview - Top Category *}> - +

folder - <{$smarty.const._MD_PICO_SUBCATEGORIES_TOTAL}> <{$category.redundants.subcategories_total}> + <{$smarty.const._MD_PICO_SUBCATEGORIES_TOTAL}> + <{$category.redundants.subcategories_total|default:''}> file <{$smarty.const._MD_PICO_CONTENTS_TOTAL}> <{$category.redundants.contents_total}> - +

<{* ------- /Activity Overview *}>
@@ -56,43 +57,42 @@

<{if isset($subcategories)}> <{foreach from=$subcategories item="subcategory"}>
-
-

+
+

category <{$subcategory.title}> - <{if $mod_config.show_rss}> - - rss - - <{/if}> -

- - <{* ----- Activity Overview - Subcategories ----- *}> + <{* ----- Activity Overview - Subcategories ----- *}> + <{* ----- if $category.isadminormod *}> <{* REMOVE SMARTY COMMENT TO MAKE ACTIVITY PRIVATE *}> +
+ + folder + <{* ----- <{$smarty.const._MD_PICO_SUBCATEGORIES_TOTAL}> ----- *}> + <{$subcategory.redundants.subcategories_total > 0}> + - <{* ----- if $category.isadminormod *}> <{* REMOVE SMARTY COMMENT TO MAKE ACTIVITY PRIVATE *}> -

- - folder - <{* ----- <{$smarty.const._MD_PICO_SUBCATEGORIES_TOTAL}> ----- *}> - <{$subcategory.redundants.subcategories_total > 0}> - + + file + <{* ----- <{$smarty.const._MD_PICO_CONTENTS_TOTAL}> ----- *}> + <{$subcategory.redundants.contents_total}> + - - file - <{* ----- <{$smarty.const._MD_PICO_CONTENTS_TOTAL}> ----- *}> - <{$subcategory.redundants.contents_total}> - -

- <{* ----- /if *}> <{* REMOVE SMARTY COMMENT TO MAKE ACTIVITY PRIVATE *}> - <{* ----- /Activity Overview - Subcategories ----- *}> -
+ <{if $mod_config.show_rss}> + + rss + + <{/if}> +
+ <{* ----- /if *}> <{* REMOVE SMARTY COMMENT TO MAKE ACTIVITY PRIVATE *}> + <{* ----- /Activity Overview - Subcategories ----- *}> +

+
-
- <{$subcategory.desc}> -
+
+ <{$subcategory.desc}> +
<{/foreach}> @@ -129,7 +129,7 @@

<{/if}>

-
+ <{/foreach}> <{/if}> @@ -138,21 +138,24 @@

<{if $xoops_isuser}>