Skip to content

Commit

Permalink
Merge pull request #295 from gigamaster/master
Browse files Browse the repository at this point in the history 
builtin help xupdate + admin css
  • Loading branch information
@gigamaster
gigamaster committed May 31, 2023
2 parents 343506c + aa76d44 commit fc673c1
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 37 deletions.
4 changes: 1 addition & 3 deletions html/modules/legacy/admin/theme/stylesheets/ui-card.css
View file
Expand Up @@ -380,19 +380,17 @@ svg text.module-name {
svg.ui-block-module {
background : var( --color-blue );
}

svg.ui-block-html {
background : var( --color-blue );
}

svg.ui-block-html path.block-icon {
color : var( --secondary );
transform : translate(10px, 20px);
}

svg.ui-block-php {
background : var( --color-indigo );
}
:is(svg.ui-block-html, svg.ui-block-php) tspan {color:white}

/* -------------------- -------------------- SVG Custom Settings */

Expand Down
1 change: 1 addition & 0 deletions html/modules/legacy/admin/theme/stylesheets/ui-module.css
View file
Expand Up @@ -172,6 +172,7 @@ h4.help-rel + ul {
list-style: none;
margin:0;
padding:0;
width: max-content;
}
h4.help-rel + ul > li {
background: var(--layer-3);
Expand Down
2 changes: 1 addition & 1 deletion html/modules/legacy/language/english/admin.php
View file
Expand Up @@ -455,7 +455,7 @@
define( '_MD_AM_SSLLINK' , '🔒 URL where SSL login page is located');
define( '_MD_AM_SSLPOST' , '🔒 SSL Post variable name');
define( '_MD_AM_STARTPAGE' , '📦 Module for start page. If none, use defined template: legacy_app_start_page.html');
define( '_MD_AM_THEMEFILE' , '🎨 Update module template .html files from themes/your theme/templates directory?');
define( '_MD_AM_THEMEFILE' , '<a id="theme-template">🎨 Update module template</a> .html files from themes/your theme/templates directory?');
define( '_MD_AM_THEMEFILEDSC' , 'If this option is enabled, module template .html files will be updated automatically if there are newer files under the themes/your theme/templates directory for the current theme. This should be turned off once the site goes public.');
define( '_MD_AM_THEMEOK' , '🎨 Selectable themes');
define( '_MD_AM_THEMEOKDSC' , 'Choose themes that users can select as their default theme');
Expand Down
4 changes: 2 additions & 2 deletions html/modules/legacy/language/fr_utf8/admin.php
View file
Expand Up @@ -452,9 +452,9 @@
define( '_MD_AM_SMTPUSER' , "Nom utilisateur SMTPAuth");
define( '_MD_AM_SMTPUSERDESC' , "Nom utilisateur pour se connecter à l'hôte STMP avec SMTPAuth.");
define( '_MD_AM_SSLLINK' , "🔒 URL pour la page de connexion SSL");
define( '_MD_AM_SSLPOST' , "Nom de la variable SSL");
define( '_MD_AM_SSLPOST' , "🔒 Nom de la variable SSL");
define( '_MD_AM_STARTPAGE' , "📦 Module pour la page de démarrage. Si aucun, utiliser le modèle défini : legacy_app_start_page.html");
define( '_MD_AM_THEMEFILE' , "Mise à jour des fichiers du Theme à partir du répertoire themes/ ?");
define( '_MD_AM_THEMEFILE' , '<a id="theme-template">🎨 Mise à jour des templates</a> à partir du répertoire themes/ ?');
define( '_MD_AM_THEMEFILEDSC' , "La mise à jour se fera automatiquement depuis les fichiers plus récents dans le répertoire themes/ pour le thème actuel. Il est conseillé de désactiver cette option pour un site accessible au public.");
define( '_MD_AM_THEMEOK' , "🎨 Themes sélectionnables");
define( '_MD_AM_THEMEOKDSC' , "Choisissez les Themes que les utilisateurs peuvent choisir comme thème par défaut dans le bloc thèmes");
Expand Down
2 changes: 1 addition & 1 deletion html/modules/legacy/language/ja_utf8/admin.php
View file
Expand Up @@ -352,7 +352,7 @@
define( '_MD_AM_SSLLINK' , '🔒 SSLログインページへのURL');
define( '_MD_AM_SSLPOST' , '🔒 SSLログイン時に使用するPOST変数の名称');
define( '_MD_AM_STARTPAGE' , '📦 スタートページ用モジュール。ない場合は、定義されたテンプレート: legacy_app_start_page.html を使用します。');
define( '_MD_AM_THEMEFILE' , '🎨 themes/ ディレクトリからの自動アップデートを有効にする');
define( '_MD_AM_THEMEFILE' , '<a id="theme-template">🎨 themes/</a> ディレクトリからの自動アップデートを有効にする');
define( '_MD_AM_THEMEFILEDSC' , '現在使用中のテーマよりも更新日時が新しいファイルが themes/ディレクトリ下にある場合に、自動的にデータベース内のデータを更新します。サイト公開時には無効にする事をお勧めします。');
define( '_MD_AM_THEMEOK' , '🎨 選択可能なテーマ');
define( '_MD_AM_THEMEOKDSC' , 'ユーザが選択することのできるテーマファイルを指定してください');
Expand Down
6 changes: 3 additions & 3 deletions html/modules/legacy/language/pt_utf8/admin.php
View file
Expand Up @@ -455,10 +455,10 @@
define( '_MD_AM_SMTPUSER' , "Identidade de acesso SMTP");
define( '_MD_AM_SMTPUSERDESC' , "Nome da conta de acesso ao servidor SMTP. Geralmente é o primeiro nome antes do sinal de arroba (<em>Username</em>), mas também pode ser o endereço de correio-eletrônico completo.");
define( '_MD_AM_SSLLINK' , "🔒 Endereço virtual (URL) da página de entrada com <acronym lang='pt' aria-label='SSL é o acrônimo para Secure Sockets Layer, um padrão aberto para estabelecer um canal de comunicação seguro, de forma a evitar a interceptação de informações críticas, como números de cartão de crédito, senhas, etc.'>SSL</acronym>");
define( '_MD_AM_SSLPOST' , "Nome da variável SSL Post");
define( '_MD_AM_SSLPOST' , "🔒 Nome da variável SSL Post");
define( '_MD_AM_STARTPAGE' , "📦 Módulo para página inicial. Se nenhum, usar modelo definido: legacy_app_start_page.html");
define( '_MD_AM_THEMEFILE' , "Utilizar o conjunto de modelos HTML definido pelo tema selecionado? Se existirem, esses arquivos podem ser encontrados no diretório <q>/themes/{<em>TemaSelecionado<em>}/templates/</q>");
define( '_MD_AM_THEMEFILEDSC' , "Os arquivos dos temas poderão ser atualizados sempre que houver alterações no diretório /themes. Habilite somente se o portal estiver em desenvolvimento.");
define( '_MD_AM_THEMEFILE' , '<a id="theme-template">🎨 Utilizar o conjunto de modelos</a> HTML definido pelo tema selecionado? ');
define( '_MD_AM_THEMEFILEDSC' , "Se existirem, esses arquivos podem ser encontrados no diretório <q>/themes/{<em>TemaSelecionado<em>}/templates/</q>. Os arquivos dos temas poderão ser atualizados sempre que houver alterações no diretório /themes. Habilite somente se o portal estiver em desenvolvimento.");
define( '_MD_AM_THEMEOK' , '🎨 Temas habilitados');
define( '_MD_AM_THEMEOKDSC' , 'Escolha os temas que os associados poderão utilizar além do tema padrão.');
define( '_MD_AM_THEMESET' , '🎨 Tema');
Expand Down
18 changes: 9 additions & 9 deletions html/modules/legacy/language/ru_utf8/admin.php
View file
Expand Up @@ -452,19 +452,19 @@
define('_MD_AM_SMTPPASSDESC', "Пароль для подключения к серверам SMTP с использованием SMTPAuth.");
define('_MD_AM_SMTPUSER', "Имя пользователя SMTPAuth");
define('_MD_AM_SMTPUSERDESC', "Имя пользователя для подключения к серверам SMTP с использованием SMTPAuth.");
define('_MD_AM_SSLLINK', "? URL страницы SSL логина.");
define('_MD_AM_SSLPOST', "? Имя переменной POST для SSL");
define('_MD_AM_STARTPAGE', "? Модуль для стартовой страницы");
define('_MD_AM_THEMEFILE', "? Обновлять шаблоны модуля .html файлы из папки 'themes/ваша_тема/templates'?");
define('_MD_AM_SSLLINK', "🔒 URL страницы SSL логина.");
define('_MD_AM_SSLPOST', "🔒 Имя переменной POST для SSL");
define('_MD_AM_STARTPAGE', "📦 Модуль для стартовой страницы");
define('_MD_AM_THEMEFILE', '<a id="theme-template">🎨 Обновлять шаблоны модуля</a> .html файлы из папки "themes/ваша_тема/templates"?');
define('_MD_AM_THEMEFILEDSC', "Если этот параметр включен шаблоны модуля будут автоматически обновляться если новые файлы появятся в папке 'themes/ваша_тема/templates' для Вашей текущей темы оформления. Этот параметр должен быть выключен на действующем сайте.");
define('_MD_AM_THEMEOK', "? Темы оформления доступные для выбора.");
define('_MD_AM_THEMEOK', "🎨 Темы оформления доступные для выбора.");
define('_MD_AM_THEMEOKDSC', "Выберите темы оформления, которые пользователь может использовать в качестве темы оформления по-умолчанию.");
define('_MD_AM_THEMESET', "? Theme Set");
define('_MD_AM_THEMESET', "🎨 Theme Set");
define('_MD_AM_USEGZIP', "⚡ Использовать сжатие gzip?");
define('_MD_AM_USEMYSESS', "?Use custom session");
define('_MD_AM_USEMYSESS', "🔐 Use custom session");
define('_MD_AM_USEMYSESSDSC', "Выберите да, для получения возможнсоти задать переменные сессии.");
define('_MD_AM_USESSL', "? Использовать SSL авторизацию?");
define('_MD_AM_USESSL', "🔐 Использовать SSL авторизацию?");
define('_MD_AM_YES', "Да");
define( '_MD_AM_COOLURI' , '<a id="cool-uri">? Cool URI</a>');
define( '_MD_AM_COOLURI' , '<a id="cool-uri">🆒 Cool URI</a>');
define( '_MD_AM_COOLURIDSC' , 'If your server can handle apache mod_rewrite, you may use this option. See also <a href="'.XOOPS_URL.'/modules/legacyRender/admin/index.php?action=HtaccessView">.htaccess setting ⭧</a>');

6 changes: 3 additions & 3 deletions html/modules/xupdate/language/english/help/help.html
View file
Expand Up @@ -87,7 +87,7 @@ <h3>X2 Modules</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Module Management ⭢</a>
<li><a href="<{$help}>=legacy">Module Management ⭢</a>
<li><a href="#!">Guide to multi-tenant and multiple instances</a>
</ul>

Expand Down Expand Up @@ -119,7 +119,7 @@ <h3>Allow Users to select Theme</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacyRender'}>">Getting started with themes ⭢</a>
<li><a href="<{$help}>=legacyRender">Getting started with themes ⭢</a>
</ul>

</section>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3>Enable and disable a Preload</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Delegate mechanism and Preload ⭢</a>
<li><a href="<{$help}>=legacy">Delegate mechanism and Preload ⭢</a>
</ul>

</section>
Expand Down
6 changes: 3 additions & 3 deletions html/modules/xupdate/language/fr_utf8/help/help.html
View file
Expand Up @@ -87,7 +87,7 @@ <h3>X2 Modules</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Module Management ⭢</a>
<li><a href="<{$help}>=legacy">Module Management ⭢</a>
<li><a href="#!">Guide to multi-tenant and multiple instances</a>
</ul>

Expand Down Expand Up @@ -119,7 +119,7 @@ <h3>Allow Users to select Theme</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacyRender'}>">Getting started with themes ⭢</a>
<li><a href="<{$help}>=legacyRender">Getting started with themes ⭢</a>
</ul>

</section>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3>Enable and disable a Preload</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Delegate mechanism and Preload ⭢</a>
<li><a href="<{$help}>=legacy">Delegate mechanism and Preload ⭢</a>
</ul>

</section>
Expand Down
6 changes: 3 additions & 3 deletions html/modules/xupdate/language/ja_utf8/help/help.html
View file
Expand Up @@ -87,7 +87,7 @@ <h3>X2 Modules</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Module Management ⭢</a>
<li><a href="<{$help}>=legacy">Module Management ⭢</a>
<li><a href="#!">Guide to multi-tenant and multiple instances</a>
</ul>

Expand Down Expand Up @@ -119,7 +119,7 @@ <h3>Allow Users to select Theme</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacyRender'}>">Getting started with themes ⭢</a>
<li><a href="<{$help}>=legacyRender">Getting started with themes ⭢</a>
</ul>

</section>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3>Enable and disable a Preload</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Delegate mechanism and Preload ⭢</a>
<li><a href="<{$help}>=legacy">Delegate mechanism and Preload ⭢</a>
</ul>

</section>
Expand Down
6 changes: 3 additions & 3 deletions html/modules/xupdate/language/pt_utf8/help/help.html
View file
Expand Up @@ -87,7 +87,7 @@ <h3>X2 Modules</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Module Management ⭢</a>
<li><a href="<{$help}>=legacy">Module Management ⭢</a>
<li><a href="#!">Guide to multi-tenant and multiple instances</a>
</ul>

Expand Down Expand Up @@ -119,7 +119,7 @@ <h3>Allow Users to select Theme</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacyRender'}>">Getting started with themes ⭢</a>
<li><a href="<{$help}>=legacyRender">Getting started with themes ⭢</a>
</ul>

</section>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3>Enable and disable a Preload</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Delegate mechanism and Preload ⭢</a>
<li><a href="<{$help}>=legacy">Delegate mechanism and Preload ⭢</a>
</ul>

</section>
Expand Down
6 changes: 3 additions & 3 deletions html/modules/xupdate/language/ru_utf8/help/help.html
View file
Expand Up @@ -87,7 +87,7 @@ <h3>X2 Modules</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Module Management ⭢</a>
<li><a href="<{$help}>=legacy">Module Management ⭢</a>
<li><a href="#!">Guide to multi-tenant and multiple instances</a>
</ul>

Expand Down Expand Up @@ -119,7 +119,7 @@ <h3>Allow Users to select Theme</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacyRender'}>">Getting started with themes ⭢</a>
<li><a href="<{$help}>=legacyRender">Getting started with themes ⭢</a>
</ul>

</section>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3>Enable and disable a Preload</h3>

<h4 class="help-rel"><i class="i-help"></i> Related content</h4>
<ul>
<li><a href="<{'index.php?action=Help&dirname=legacy'}>">Delegate mechanism and Preload ⭢</a>
<li><a href="<{$help}>=legacy">Delegate mechanism and Preload ⭢</a>
</ul>

</section>
Expand Down
3 changes: 1 addition & 2 deletions xoops_trust_path/libs/altsys/templates/main_blocks_admin_edit.html
View file
Expand Up @@ -46,7 +46,7 @@ <h2><{$smarty.const._MD_A_MYBLOCKSADMIN_BLOCKADMIN}> <{if $target_mname_bread}>
<tr>
<td><{$smarty.const._MD_A_MYBLOCKSADMIN_WEIGHT}></td>
<td>
<input type="text" name="weights[<{$block.bid}>]" value="<{$block.weight}>" size="3" maxlength="5">
<input type="number" size="1" maxlength="4" name="weights[<{$block.bid}>]" value="<{$block.weight}>">
</td>
</tr>
<tr>
Expand Down Expand Up @@ -105,7 +105,6 @@ <h2><{$smarty.const._MD_A_MYBLOCKSADMIN_BLOCKADMIN}> <{if $target_mname_bread}>
<{elseif $block.ctype == 'H' || empty($block.ctype)}>
<{xoops_dhtmltarea cols=74 rows=15 name="contents[`$block.bid`]" id="textarea_content" value="`$block.content_raw`" class=html editor=html}>
<{else}>

<{xoops_dhtmltarea cols=74 rows=15 name="contents[`$block.bid`]" id="textarea_content" value="`$block.content_raw`" myckeditor=true class=bbcode editor=bbcode}>
<{/if}>

Expand Down
2 changes: 1 addition & 1 deletion xoops_trust_path/libs/altsys/xoops_version.php
View file
Expand Up @@ -49,7 +49,7 @@
];

// Menu
$modversion['hasMain'] = 1;
$modversion['hasMain'] = 0;

// Search
$modversion['hasSearch'] = 0;
Expand Down

0 comments on commit fc673c1

Please sign in to comment.