diff --git a/html/modules/altsys/images/module_ui_components.svg b/html/modules/altsys/images/module_ui_components.svg index c22bdd0..9b4ce36 100644 --- a/html/modules/altsys/images/module_ui_components.svg +++ b/html/modules/altsys/images/module_ui_components.svg @@ -1,7 +1,7 @@ - + UI-Components diff --git a/html/modules/altsys/language/english/help/altsys_guide.html b/html/modules/altsys/language/english/help/altsys_guide.html new file mode 100644 index 0000000..3ae50b6 --- /dev/null +++ b/html/modules/altsys/language/english/help/altsys_guide.html @@ -0,0 +1,138 @@ + +
+ +

AltSys Guide

+ +
+ +
+ +
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+ +
+ + + + + + Custom (plain HTML) + + + + +
+ +
+ +
+ + +
+ +
+ +
+ +
+
-
+
+ +
+
+ +
+
+ +
+
-
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ + + + + +
+ +
+ +
+ +
+ + + + Edit + + + + + + + Clone + +
+ +
+
+ + + +
+ + diff --git a/html/modules/altsys/language/english/help/help.html b/html/modules/altsys/language/english/help/help.html index af2e4dd..b1e7cf1 100644 --- a/html/modules/altsys/language/english/help/help.html +++ b/html/modules/altsys/language/english/help/help.html @@ -1,19 +1,17 @@ -
- - - - - -
+
+
+ +
+
@@ -253,3 +251,4 @@

Development

+
diff --git a/html/modules/altsys/language/fr_utf8/help/help.html b/html/modules/altsys/language/fr_utf8/help/help.html index af2e4dd..b1e7cf1 100644 --- a/html/modules/altsys/language/fr_utf8/help/help.html +++ b/html/modules/altsys/language/fr_utf8/help/help.html @@ -1,19 +1,17 @@ -
- - - - - -
+
+
+ +
+
@@ -253,3 +251,4 @@

Development

+
diff --git a/html/modules/altsys/language/ja_utf8/help/help.html b/html/modules/altsys/language/ja_utf8/help/help.html index af2e4dd..b1e7cf1 100644 --- a/html/modules/altsys/language/ja_utf8/help/help.html +++ b/html/modules/altsys/language/ja_utf8/help/help.html @@ -1,19 +1,17 @@ -
- - - - - -
+
+
+ +
+
@@ -253,3 +251,4 @@

Development

+
diff --git a/html/modules/altsys/language/pt_utf8/help/help.html b/html/modules/altsys/language/pt_utf8/help/help.html index af2e4dd..b1e7cf1 100644 --- a/html/modules/altsys/language/pt_utf8/help/help.html +++ b/html/modules/altsys/language/pt_utf8/help/help.html @@ -1,19 +1,17 @@ -
- - - - - -
+
+ +
@@ -253,3 +251,4 @@

Development

+
diff --git a/xoops_trust_path/libs/altsys/blocks/block_functions.php b/xoops_trust_path/libs/altsys/blocks/block_functions.php index 918f864..3291bbe 100644 --- a/xoops_trust_path/libs/altsys/blocks/block_functions.php +++ b/xoops_trust_path/libs/altsys/blocks/block_functions.php @@ -72,6 +72,8 @@ function b_altsys_admin_menu_show($options) $dirname = $mod->getVar('dirname'); + // TODO gigamaster add module icon + $moduleIcon = ''; $modinfo = $mod->getInfo(); $submenus4assign = []; @@ -138,15 +140,16 @@ function b_altsys_admin_menu_show($options) ]; } } - + // TODO gigamaster add module icon $module4assign = [ 'mid' => $mid, 'dirname' => $dirname, 'name' => $mod->getVar('name'), + 'icon' => $moduleIcon, 'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0), 'version_in_file' => sprintf('%.2f', $modinfo['version']), 'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES), - 'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES), +// 'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES), 'isactive' => $mod->getVar('isactive'), 'hasmain' => $mod->getVar('hasmain'), 'hasadmin' => $mod->getVar('hasadmin'), diff --git a/xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php b/xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php index 7202be1..dbe3a91 100644 --- a/xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php +++ b/xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php @@ -100,7 +100,7 @@ public function _loadLanguage( $dirname, $fileBodyName ) { /** * @param string $type */ - public function loadPageTypeMessageCatalog(string $type ) { + public function loadPageTypeMessageCatalog( $type ) { // I dare not to use langman... if ( false === mb_strpos( $type, '.' ) && $this->langman->my_language ) { $mylang_file = $this->langman->my_language . '/' . $this->mLanguageName . '/' . $type . '.php'; diff --git a/xoops_trust_path/libs/altsys/compilehookadmin.php b/xoops_trust_path/libs/altsys/compilehookadmin.php index ccd88c7..efa411e 100644 --- a/xoops_trust_path/libs/altsys/compilehookadmin.php +++ b/xoops_trust_path/libs/altsys/compilehookadmin.php @@ -247,7 +247,7 @@ dd { margin-left:20px; } -
+ \n"; foreach ( $compile_hooks as $command => $compile_hook ) { @@ -270,7 +270,7 @@
-
+

" . _TPLSADMIN_DT_GETTPLSVARSINFO_DW . "

" . _TPLSADMIN_DD_GETTPLSVARSINFO_DW . "

@@ -278,7 +278,7 @@
-
+

" . _TPLSADMIN_DT_GETTEMPLATES . "

" . _TPLSADMIN_DD_GETTEMPLATES . "

@@ -286,11 +286,11 @@
-
+

" . _TPLSADMIN_DT_PUTTEMPLATES . "

" . _TPLSADMIN_DD_PUTTEMPLATES . "

-

+

"; diff --git a/xoops_trust_path/libs/altsys/language/english/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/english/compilehookadmin.php index f35194b..ac4a7c1 100644 --- a/xoops_trust_path/libs/altsys/language/english/compilehookadmin.php +++ b/xoops_trust_path/libs/altsys/language/english/compilehookadmin.php @@ -37,7 +37,7 @@ define( '_TPLSADMIN_FMT_MSG_PUTTEMPLATES' , '%d templates are imported.'); define( '_TPLSADMIN_DT_PUTTEMPLATES' , 'Upload templates'); -define( '_TPLSADMIN_DD_PUTTEMPLATES' , 'Select a set you want to upload/overwrite before uploading the zip/tgz archive including the template files (.html).
It is not necessary to check the depth of the paths in the archive.'); +define( '_TPLSADMIN_DD_PUTTEMPLATES' , 'Select a template set you want to upload/overwrite.
Select the file tar archive including the template files (.html)
Automatically extracts all files from the archive to their absolute location no matter the tree structure.'); define( '_TPLSADMIN_ERR_NOTUPLOADED' , 'No files are uploaded.'); diff --git a/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php index fe865dd..57134c0 100644 --- a/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php +++ b/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php @@ -36,7 +36,7 @@ define( '_TPLSADMIN_FMT_MSG_PUTTEMPLATES' , '%d templates are imported.'); define( '_TPLSADMIN_DT_PUTTEMPLATES' , 'Upload templates'); -define( '_TPLSADMIN_DD_PUTTEMPLATES' , 'Select a set you want to upload/overwrite before uploading zip/tgz archive including template files (.html). You need not to check depths of the paths in the archive.'); +define( '_TPLSADMIN_DD_PUTTEMPLATES' , "Sélectionner un ensemble de modèles que vous souhaitez remplacer.
Sélectionner le fichier tar comprenant les modèles (.html)
Extraire automatiquement tous les modèles indépendamment de l'arborescence des répertoires."); define( '_TPLSADMIN_ERR_NOTUPLOADED' , 'No files are uploaded.'); diff --git a/xoops_trust_path/libs/altsys/language/ja_utf8/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/ja_utf8/compilehookadmin.php index fcf1a49..64dfd03 100644 --- a/xoops_trust_path/libs/altsys/language/ja_utf8/compilehookadmin.php +++ b/xoops_trust_path/libs/altsys/language/ja_utf8/compilehookadmin.php @@ -36,7 +36,7 @@ define( '_TPLSADMIN_FMT_MSG_PUTTEMPLATES' , '%d 個のテンプレートをインポートしました'); define( '_TPLSADMIN_DT_PUTTEMPLATES' , 'テンプレートをアップロードする'); -define( '_TPLSADMIN_DD_PUTTEMPLATES' , '上書きしたいテンプレートセットを選択してから、各テンプレートファイル(.html)をzipかtar.gzにくるんでアップロードしてください。テンプレートファイル名さえ正しければ、パスの深さは気にしなくて構いません'); +define( '_TPLSADMIN_DD_PUTTEMPLATES' , '置き換える一連のテンプレートを選択します。
テンプレート (.html) を含む tar ファイルを選択します。
ディレクトリ ツリー構造に関係なく、すべてのテンプレートを自動的に抽出します。'); define( '_TPLSADMIN_ERR_NOTUPLOADED' , 'ファイルがアップロードされていません'); diff --git a/xoops_trust_path/libs/altsys/language/pt_utf8/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/pt_utf8/compilehookadmin.php index 0180cb8..a3fad17 100644 --- a/xoops_trust_path/libs/altsys/language/pt_utf8/compilehookadmin.php +++ b/xoops_trust_path/libs/altsys/language/pt_utf8/compilehookadmin.php @@ -15,7 +15,7 @@ define( '_TPLSADMIN_DD_GETTEMPLATES' , "Selecione um conjunto antes de apertar cada botão."); define( '_TPLSADMIN_DD_GETTPLSVARSINFO_DW' , "Primeiro , abra o Gerenciador de Extensões do Adobe DreamWeaver.
Extraia o arquivo descarregado.
Execute os arquivos com a extensão .mxi e você encontrará diálogos de instalação.
Os snippets para variáveis de modelo de seu site serão utilizáveis após reiniciar o Adobe DreamWeaver."); define( '_TPLSADMIN_DD_HOOKSAVEVARS' , "O primeiro passo para obtenção das informações das variáveis de modelo em seu site. As informações das variáveis do modelo serão coletadas quando o lado público de seu site for exibido. Após os modelos que você deseja editar forem mostrados, obtenha as informações das variáveis do modelo através dos botões subjacentes."); -define( '_TPLSADMIN_DD_PUTTEMPLATES' , "Selecione um conjunto que você queira enviar ou subescrever, antes de enviar o arquivo zip ou tgz incluindo esses arquivos des modelos (.html). Você não precisa verificar a profundidade dos caminhos nos arquivos."); +define( '_TPLSADMIN_DD_PUTTEMPLATES' , "Selecione um conjunto de modelos que você deseja substituir.
Selecione o arquivo tar incluindo os modelos (.html)
Extrair automaticamente todos os modelos, independentemente da estrutura em árvore do directório do arquivo."); define( '_TPLSADMIN_DD_REMOVEHOOKS' , "Isso remove comentários, códigos DIV, e sequências lógicas inseridas pelas operações acima em cada cache compilado do modelo."); define( '_TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV' , "Inserir códigos DIV"); define( '_TPLSADMIN_DT_ENCLOSEBYCOMMENT' , "Inserir comentários"); diff --git a/xoops_trust_path/libs/altsys/mytplsadmin.php b/xoops_trust_path/libs/altsys/mytplsadmin.php index b56a64c..be6506d 100644 --- a/xoops_trust_path/libs/altsys/mytplsadmin.php +++ b/xoops_trust_path/libs/altsys/mytplsadmin.php @@ -316,7 +316,7 @@ function altsys_mytpladmin_check_copy_submit(msg, id, selcheck) { if ( $target_dirname == '_custom' ) { echo '' . _MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE . ''; } -echo 'Render +echo 'Renderer diff --git a/xoops_trust_path/libs/altsys/put_templates.php b/xoops_trust_path/libs/altsys/put_templates.php index 673fd13..0f55708 100644 --- a/xoops_trust_path/libs/altsys/put_templates.php +++ b/xoops_trust_path/libs/altsys/put_templates.php @@ -48,17 +48,30 @@ if ( '.zip' == mb_strtolower( mb_substr( $orig_filename4check, - 4 ) ) ) { // zip + // TODO gigamaster redirect with message + $msg = "Deprecated zip! "._TPLSADMIN_ERR_NOTUPLOADED; + redirect_header( '?mode=admin&lib=altsys&page=compilehookadmin', 3, $msg ); + redirect_header( $_SERVER['REQUEST_URI'], 1, $msg ); + exit; + // zip - require_once __DIR__ . '/include/Archive_Zip.php'; - $reader = new Archive_Zip( $_FILES['tplset_archive']['tmp_name'] ); - $files = $reader->extract( [ 'extract_as_string' => true ] ); - if ( ! is_array( @$files ) ) { - die( $reader->errorName() ); - } - $do_upload = true; + //require_once __DIR__ . '/include/Archive_Zip.php'; + //$reader = new Archive_Zip( $_FILES['tplset_archive']['tmp_name'] ); + //$files = $reader->extract( [ 'extract_as_string' => true ] ); + //if ( ! is_array( @$files ) ) { + // die( $reader->errorName() ); + //} + //$do_upload = true; } elseif ( '.tgz' == mb_substr( $orig_filename4check, - 4 ) || '.tar.gz' == mb_substr( $orig_filename4check, - 7 ) ) { // tar.gz + // TODO gigamaster redirect with message + //$msg = "Deprecated zip"._TPLSADMIN_ERR_NOTUPLOADED; + $msg = "Deprecated .tgz and .tar.gz ! "._TPLSADMIN_ERR_NOTUPLOADED; + redirect_header( '?mode=admin&lib=altsys&page=compilehookadmin', 3, $msg ); + exit; +//TODO gigamaster TAR +} elseif ( '.tar' == mb_substr( $orig_filename4check, - 4 ) ) { // tar.gz require_once XOOPS_ROOT_PATH . '/class/class.tar.php'; $tar = new tar(); diff --git a/xoops_trust_path/libs/altsys/templates/block_admin_menu.html b/xoops_trust_path/libs/altsys/templates/block_admin_menu.html index 3ea021f..30bddce 100644 --- a/xoops_trust_path/libs/altsys/templates/block_admin_menu.html +++ b/xoops_trust_path/libs/altsys/templates/block_admin_menu.html @@ -1,48 +1,27 @@ +<{* altsys_block_admin_menu_custom.html *}>
<{$smarty.template}>
- -
- <{foreach from=$block.modules item="module"}> - -
-
    - <{foreach from=$module.submenu item="sub"}> -
  • - <{$sub.title}> -
    • - <{/foreach}> -
  • - - - <{if $module.version_in_db < $module.version_in_file}> - <{$module.version_in_db}>-><{$module.version_in_file}> - <{else}> - v. <{$module.version_in_db}> - <{/if}> - -
    • -
- - <{if $module.version_in_db < $module.version_in_file}><{$module.version_in_db}>-><{$module.version_in_file}><{else}><{$module.version_in_db}><{/if}> -
- <{/foreach}> -
+<{foreach from=$block.modules item="module"}> +
+ + <{$module.icon}> <{$module.name}> + +
    + <{foreach from=$module.submenu item="sub"}> +
  • + <{$sub.title}> +
    • + <{/foreach}> +
  • +
  • + +<{if $module.version_in_db < $module.version_in_file}> +<{$module.version_in_db}>-><{$module.version_in_file}> +<{else}> +v. <{$module.version_in_db}> +<{/if}> + +
    • +
+
+<{/foreach}> diff --git a/xoops_trust_path/libs/altsys/templates/main_blocks_admin_list.html b/xoops_trust_path/libs/altsys/templates/main_blocks_admin_list.html index 775bb62..8c0ac9e 100644 --- a/xoops_trust_path/libs/altsys/templates/main_blocks_admin_list.html +++ b/xoops_trust_path/libs/altsys/templates/main_blocks_admin_list.html @@ -11,7 +11,11 @@

<{$smarty.const._MD_A_MYBLOCKSADMIN_BLOCKADMIN}> » <{$ta <{* ////— ACTION-CONTROL —\\\\ *}>
- <{$smarty.const._MI_ALTSYS_MENU_NEWCUSTOMBLOCK}> + + + + + <{$smarty.const._MI_ALTSYS_MENU_NEWCUSTOMBLOCK}>