From c51dbd8705b135df1c1166c73ca20ec9235d2e3a Mon Sep 17 00:00:00 2001 From: yamamoto Date: Thu, 22 Oct 2026 14:29:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix(qm):=20=E7=B7=A8=E9=9B=86=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB=E3=80=81?= =?UTF-8?q?=E7=84=A1=E3=81=84=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=82=92=E4=BB=98=E3=81=91=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QuickManager が編集画面に出す保存・キャンセルのボタンは、 media/style/<テーマ>/images/icons/save.png・stop.png を指していたが、 どのテーマにも images/icons が無く、毎回 404 になっていた。 どのテーマも .actionButtons a img を display: none で隠しているので、 画像の場所を直すのではなく、 を付けないようにする。 Co-Authored-By: Claude Opus 5.5 --- assets/plugins/qm/inc/on_doc_form_prerender.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/assets/plugins/qm/inc/on_doc_form_prerender.php b/assets/plugins/qm/inc/on_doc_form_prerender.php index fab6abccb..88f051522 100644 --- a/assets/plugins/qm/inc/on_doc_form_prerender.php +++ b/assets/plugins/qm/inc/on_doc_form_prerender.php @@ -71,9 +71,6 @@ // Hide default manager action buttons $mc->addLine('qmHide([document.getElementById("actions")]);'); -// Get MODx theme -$qm_theme = evo()->config['manager_theme']; - // Get doc id if (anyv('id')) { $doc_id = (int)anyv('id'); @@ -84,25 +81,22 @@ } // Add action buttons +// アイコンは付けない（どのテーマも .actionButtons a img を隠す。テーマに images/icons も無い） if ($this->conf('prop_loadtb')) { $mc->addLine( sprintf( - 'var controls = "";', - $qm_theme, + 'var controls = "";', $_lang['save'], evo()->makeUrl($doc_id, '', '', 'full'), - $qm_theme, $_lang['cancel'] ) ); } else { $mc->addLine( sprintf( - 'var controls = "";', - $qm_theme, + 'var controls = "";', $_lang['save'], evo()->makeUrl($doc_id, '', '', 'full'), - $qm_theme, $_lang['cancel'] ) ); From 3ba0ee6bf1632b5b7944261eb207ad4b6574e907 Mon Sep 17 00:00:00 2001 From: yamamoto Date: Thu, 22 Oct 2026 15:16:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor(manager):=20=E3=83=9C=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E9=9A=A0=E3=82=8C=E3=81=9F=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=92=E6=95=B4=E7=90=86=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 管理画面のボタン（.actionButtons の中のリンク）の は、 どのテーマも .actionButtons a img { display: none; } で隠していて、 画面には出ていなかった。古いデザインの名残なので、まとめて外す。 - 本体のボタンの を外す（各画面、manager()->ab()、 リソースの編集画面のボタン、ユーザーの編集画面の保存ボタン） - ab() に渡していた 'icon' と、使われなくなった変数・プレースホルダーを削除 - 7 テーマの .actionButtons a img { display: none; } を削除 - アイコンだけのボタン（リセット・表示切替）は残し、隠す規則に逆らうための style="display:inline;" を外す 外部のアドオンのボタンに があると、今後は表示される。 Co-Authored-By: Claude Opus 5.5 --- assets/modules/docmanager/templates/main.tpl | 3 +- assets/modules/docmanager/templates/sort.tpl | 6 +-- .../docmanager/templates/sort_list.tpl | 9 ++--- .../modules/docmanager/templates/update.tpl | 6 +-- .../actions/document/document_data.static.php | 10 +---- .../document/move_document.dynamic.php | 4 +- .../mutate_content/action_buttons.php | 39 +++++-------------- .../document/parent_picker.dynamic.php | 3 +- .../document/publish_draft.dynamic.php | 3 +- .../document/resources_list.static.php | 23 ++++------- manager/actions/document/revision.dynamic.php | 3 +- manager/actions/element/files.dynamic.php | 18 +++------ manager/actions/element/modules.static.php | 6 +-- .../element/mutate_htmlsnippet.dynamic.php | 5 +-- .../actions/element/mutate_module.dynamic.php | 5 +-- .../mutate_module_resources.dynamic.php | 12 ++---- .../actions/element/mutate_plugin.dynamic.php | 5 +-- .../mutate_plugin_priority.dynamic.php | 4 +- .../element/mutate_snippet.dynamic.php | 5 +-- .../mutate_template_tv_rank.dynamic.php | 4 +- .../element/mutate_templates.dynamic.php | 9 +---- .../element/mutate_tmplvars.dynamic.php | 5 +-- .../element/resource_selector.static.php | 12 ++---- manager/actions/element/resources.static.php | 21 ++++------ manager/actions/main/refresh_site.dynamic.php | 4 +- manager/actions/main/search.static.php | 13 ++----- .../permission/access_permissions.dynamic.php | 3 +- .../actions/permission/messages.static.php | 19 +++------ .../permission/mutate_password.dynamic.php | 6 +-- .../permission/mutate_role.dynamic.php | 5 +-- .../permission/mutate_user/functions.php | 8 +--- .../permission/mutate_user_pf.dynamic.php | 8 ++-- .../permission/mutate_web_user.dynamic.php | 9 ++--- .../permission/role_management.static.php | 6 +-- .../permission/user_management.static.php | 12 ++---- .../web_access_permissions.dynamic.php | 3 +- .../permission/web_user_management.static.php | 12 ++---- manager/actions/report/eventlog.dynamic.php | 2 +- manager/actions/report/logging.static.php | 6 +-- manager/actions/report/phpinfo.static.php | 4 +- .../actions/report/site_schedule.static.php | 5 +-- manager/actions/report/sysinfo.static.php | 4 +- manager/actions/tool/bkmanager.static.php | 16 ++------ manager/actions/tool/export_site.static.php | 9 +---- manager/actions/tool/help.static.php | 3 +- manager/actions/tool/import_site.static.php | 10 ++--- .../actions/tool/mutate_settings.dynamic.php | 8 +--- manager/includes/extenders/ex_managerapi.php | 7 +--- manager/media/style/AromaHop/style.css | 4 -- manager/media/style/AuroraFlow/style.css | 4 -- manager/media/style/RevoClassic/style.css | 4 -- manager/media/style/RevoStyle/style.css | 4 -- manager/media/style/RubberWhite/style.css | 4 -- manager/media/style/SakuraFlow/style.css | 4 -- manager/media/style/SoftSlate/style.css | 4 -- .../permission/save_user.functions.php | 6 +-- .../permission/save_web_user.processor.php | 6 +-- .../tmplvars/delete_tmplvars.processor.php | 6 +-- 58 files changed, 120 insertions(+), 328 deletions(-) diff --git a/assets/modules/docmanager/templates/main.tpl b/assets/modules/docmanager/templates/main.tpl index faf69f95e..8949bd110 100644 --- a/assets/modules/docmanager/templates/main.tpl +++ b/assets/modules/docmanager/templates/main.tpl @@ -75,8 +75,7 @@

[+lang.DM_module_title+]

diff --git a/assets/modules/docmanager/templates/sort.tpl b/assets/modules/docmanager/templates/sort.tpl index 775218b7b..b96b72e29 100644 --- a/assets/modules/docmanager/templates/sort.tpl +++ b/assets/modules/docmanager/templates/sort.tpl @@ -9,8 +9,6 @@ \ No newline at end of file diff --git a/assets/modules/docmanager/templates/sort_list.tpl b/assets/modules/docmanager/templates/sort_list.tpl index 8e7c99f2e..b76bbbb0a 100644 --- a/assets/modules/docmanager/templates/sort_list.tpl +++ b/assets/modules/docmanager/templates/sort_list.tpl @@ -95,12 +95,9 @@
diff --git a/assets/modules/docmanager/templates/update.tpl b/assets/modules/docmanager/templates/update.tpl index d1f4953ba..e1f454966 100644 --- a/assets/modules/docmanager/templates/update.tpl +++ b/assets/modules/docmanager/templates/update.tpl @@ -24,10 +24,8 @@

[+lang.DM_module_title+]

diff --git a/manager/actions/document/document_data.static.php b/manager/actions/document/document_data.static.php index 058ad6ee4..1ede5f7ba 100644 --- a/manager/actions/document/document_data.static.php +++ b/manager/actions/document/document_data.static.php @@ -143,7 +143,6 @@ function movedocument() { hasPermission('save_document')) : ?>
  • - "/>
    • @@ -151,7 +150,6 @@ function movedocument() { hasPermission('save_document') && evo()->hasPermission('move_document')) : ?>
  • - "/>
    • @@ -159,7 +157,6 @@ function movedocument() { hasPermission('new_document') && evo()->hasPermission('save_document')) : ?>
  • - "/>
    • @@ -167,7 +164,6 @@ function movedocument() { hasPermission('delete_document') && evo()->hasPermission('save_document')) : ?>
  • - "/>
    • @@ -181,7 +177,6 @@ function movedocument() { : sprintf("window.open('../index.php?id=%s','previeWin')", $id); ?>" > - "/> @@ -200,10 +195,7 @@ function movedocument() { echo 'document.location.href=\'index.php?a=2\';'; } ?>" - >icons_cancel" - /> + >
    diff --git a/manager/actions/document/move_document.dynamic.php b/manager/actions/document/move_document.dynamic.php index 3edf7d472..ee1f391c2 100644 --- a/manager/actions/document/move_document.dynamic.php +++ b/manager/actions/document/move_document.dynamic.php @@ -44,8 +44,8 @@ function get_src_content($id, $parent)

    {$_lang['move_resource_title']}

    diff --git a/manager/actions/document/mutate_content/action_buttons.php b/manager/actions/document/mutate_content/action_buttons.php index f7b241b75..436821b57 100644 --- a/manager/actions/document/mutate_content/action_buttons.php +++ b/manager/actions/document/mutate_content/action_buttons.php @@ -65,18 +65,14 @@ function getActionButtons($id) function ab_preview($id = 0) { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style('icons_preview_resource'); - $ph['alt'] = 'preview resource'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('preview'); return parseText($tpl, $ph); } function ab_save() { - $tpl = '
  • [+alt+] [+label+][+select+]
    • '; - $ph['icon'] = style('icons_save'); - $ph['alt'] = 'icons_save'; + $tpl = '
  • [+label+][+select+]
    • '; $ph['label'] = lang('update'); $ph['select'] = ' + '; @@ -114,9 +110,7 @@ function ab_save() function ab_open_draft($id) { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_save"); - $ph['alt'] = 'icons_draft'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('open_draft'); return parseText($tpl, $ph); } @@ -131,9 +125,7 @@ function ab_create_draft($id) return false; } - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_save"); - $ph['alt'] = 'icons_draft'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('create_draft'); return parseText($tpl, $ph); @@ -141,53 +133,42 @@ function ab_create_draft($id) function ab_cancel($id) { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_cancel"); - $ph['alt'] = 'icons_cancel'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('cancel'); return parseText($tpl, $ph); } function ab_move() { - $tpl = '
  • [+label+]
    • '; - $ph['icon'] = style("icons_move_document"); + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('move'); return parseText($tpl, $ph); } function ab_duplicate() { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_resource_duplicate"); - $ph['alt'] = 'icons_resource_duplicate'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('duplicate'); return parseText($tpl, $ph); } function ab_delete() { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_delete_document"); - $ph['alt'] = 'icons_delete_document'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('delete'); return parseText($tpl, $ph); } function ab_undelete() { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_undelete_resource"); - $ph['alt'] = 'icons_undelete_document'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('undelete_resource'); return parseText($tpl, $ph); } function ab_delete_draft() { - $tpl = '
  • [+alt+] [+label+]
    • '; - $ph['icon'] = style("icons_delete_document"); - $ph['alt'] = 'icons_delete_document'; + $tpl = '
  • [+label+]
    • '; $ph['label'] = lang('delete_draft'); return parseText($tpl, $ph); } diff --git a/manager/actions/document/parent_picker.dynamic.php b/manager/actions/document/parent_picker.dynamic.php index 24b864a2e..1e36ae759 100644 --- a/manager/actions/document/parent_picker.dynamic.php +++ b/manager/actions/document/parent_picker.dynamic.php @@ -46,8 +46,7 @@ checkPermissions(0)): ?>
    • -
    • +
    • diff --git a/manager/actions/document/publish_draft.dynamic.php b/manager/actions/document/publish_draft.dynamic.php index b9eee379a..8bd398a62 100644 --- a/manager/actions/document/publish_draft.dynamic.php +++ b/manager/actions/document/publish_draft.dynamic.php @@ -21,7 +21,6 @@ include_once(MODX_MANAGER_PATH . 'actions/document/mutate_content/functions.php'); $ph['id'] = $docid; -$ph['style_icons_cancel'] = style('icons_cancel'); $ph['lang_cancel'] = lang('cancel'); $tpl = getTplDraft(); @@ -94,7 +93,7 @@ function getTplDraft() diff --git a/manager/actions/document/resources_list.static.php b/manager/actions/document/resources_list.static.php index 0deec5aef..ece03a39a 100644 --- a/manager/actions/document/resources_list.static.php +++ b/manager/actions/document/resources_list.static.php @@ -162,27 +162,26 @@
      %s'; + $tpl = '
    • %s
      • '; if (hasPermission('save_document') && $id != 0 && manager()->isAllowed($id)) { - echo sprintf($tpl, 'Button1', 'editdocument();', $_style["icons_edit_document"], $_lang['edit']); + echo sprintf($tpl, 'Button1', 'editdocument();', $_lang['edit']); } if (hasPermission('move_document') && hasPermission('save_document') && $id != 0 && manager()->isAllowed($id)) { - echo sprintf($tpl, 'Button2', 'movedocument();', $_style["icons_move_document"], $_lang['move']); + echo sprintf($tpl, 'Button2', 'movedocument();', $_lang['move']); } if (evo()->doc->canCopyDoc() && $id != 0 && manager()->isAllowed($id)) { - echo sprintf($tpl, 'Button4', 'duplicatedocument();', $_style["icons_resource_duplicate"], - $_lang['duplicate']); + echo sprintf($tpl, 'Button4', 'duplicatedocument();', $_lang['duplicate']); } if (hasPermission('delete_document') && hasPermission('save_document') && $id != 0 && manager()->isAllowed($id)) { - echo sprintf($tpl, 'Button3', 'deletedocument();', $_style["icons_delete_document"], $_lang['delete']); + echo sprintf($tpl, 'Button3', 'deletedocument();', $_lang['delete']); } $url = evo()->makeUrl($id); $prev = "window.open('" . $url . "','previeWin')"; - echo sprintf($tpl, 'Button6', $prev, $_style["icons_preview_resource"], + echo sprintf($tpl, 'Button6', $prev, $id == 0 ? $_lang["view_site"] : $_lang['view_resource']); $action = "documentDirty=false;document.location.href='" . getReturnAction($current) . "'"; - echo sprintf($tpl, 'Button5', $action, $_style["icons_cancel"], $_lang['cancel']); + echo sprintf($tpl, 'Button5', $action, $_lang['cancel']); ?>
    @@ -194,19 +193,11 @@
    • - " - align="absmiddle" - />
    • - " - align="absmiddle" - />
      • diff --git a/manager/actions/document/revision.dynamic.php b/manager/actions/document/revision.dynamic.php index 545aa2135..f6714c5ef 100644 --- a/manager/actions/document/revision.dynamic.php +++ b/manager/actions/document/revision.dynamic.php @@ -16,7 +16,6 @@ } $ph['id'] = $id; -$ph['style_icons_cancel'] = $_style["icons_cancel"]; $ph['lang_cancel'] = $_lang['cancel']; switch (getv('mode')) { @@ -46,7 +45,7 @@ function tpl() diff --git a/manager/actions/element/files.dynamic.php b/manager/actions/element/files.dynamic.php index 0b4fa8d3c..c2e09ec90 100644 --- a/manager/actions/element/files.dynamic.php +++ b/manager/actions/element/files.dynamic.php @@ -71,24 +71,21 @@ $_ = ''; if (anyv('mode') === 'save') { $_ = $modx->parseText( - '
    • [+lang_save+]
      • ', + '
    • [+lang_save+]
      • ', [ - 'icons_save' => $_style['icons_save'], 'lang_save' => lang('save') ] ) . "\n"; } $_ .= $modx->parseText( - '
    • [+subject+]
      • ', + '
    • [+subject+]
      • ', [ 'href' => hsc('index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name='), - 'tree_folder' => $_style['tree_folder'], 'subject' => lang('add_folder') ] ); - $tpl = '
    • [+lang_newfile+]
      • '; - $ph['image'] = $_style['tree_page']; + $tpl = '
    • [+lang_newfile+]
      • '; $ph['href'] = hsc('index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name='); $ph['lang_newfile'] = lang('files_create_textfile'); $_ .= $modx->parseText($tpl, $ph); @@ -98,9 +95,7 @@
    • icons_cancel" /> + onclick="documentDirty=false;document.location.href='index.php?';">
    @@ -384,10 +379,7 @@ function deleteFile(file) { ' - . lang('files_uploadfile') - ?> + style="display:inline;float:none;"> diff --git a/manager/actions/element/modules.static.php b/manager/actions/element/modules.static.php index 45a8fb846..5ce365103 100644 --- a/manager/actions/element/modules.static.php +++ b/manager/actions/element/modules.static.php @@ -131,12 +131,10 @@ function menuAction(a) {
    diff --git a/manager/actions/element/mutate_htmlsnippet.dynamic.php b/manager/actions/element/mutate_htmlsnippet.dynamic.php index 481b4f532..8250cbb64 100644 --- a/manager/actions/element/mutate_htmlsnippet.dynamic.php +++ b/manager/actions/element/mutate_htmlsnippet.dynamic.php @@ -177,7 +177,7 @@ function resetpubdate() { hasPermission('save_chunk')): ?>
  • - " /> + + @@ -340,7 +340,6 @@ function SetUrl(url, width, height, alt) { echo manager()->ab( [ 'onclick' => 'deletedocument();', - 'icon' => $_style['icons_delete_document'], 'label' => $_lang['delete'] ] ); @@ -349,7 +348,6 @@ function SetUrl(url, width, height, alt) { echo manager()->ab( [ 'onclick' => "document.location.href='index.php?a=106';", - 'icon' => $_style['icons_cancel'], 'label' => $_lang['cancel'] ] ); @@ -532,7 +530,6 @@ class="inputBox" />

    - " align="absmiddle" />

    diff --git a/manager/actions/element/mutate_module_resources.dynamic.php b/manager/actions/element/mutate_module_resources.dynamic.php index b81acf723..ae658a52b 100644 --- a/manager/actions/element/mutate_module_resources.dynamic.php +++ b/manager/actions/element/mutate_module_resources.dynamic.php @@ -215,8 +215,7 @@ function openSelector(resource, mode, callback, w, h) {
    @@ -228,10 +227,8 @@ function openSelector(resource, mode, callback, w, h) {
    diff --git a/manager/actions/element/mutate_plugin.dynamic.php b/manager/actions/element/mutate_plugin.dynamic.php index 2dc1c571e..5d4809f17 100644 --- a/manager/actions/element/mutate_plugin.dynamic.php +++ b/manager/actions/element/mutate_plugin.dynamic.php @@ -464,7 +464,7 @@ function decode(s) {
  • - " /> + + @@ -296,21 +296,18 @@ function decode(s) { if (evo()->hasPermission('new_snippet')) { echo manager()->ab([ 'onclick' => 'duplicaterecord();', - 'icon' => $_style['icons_resource_duplicate'], 'label' => $_lang['duplicate'] ]); } if (evo()->hasPermission('delete_snippet')) { echo manager()->ab([ 'onclick' => 'deletedocument();', - 'icon' => $_style['icons_delete_document'], 'label' => $_lang['delete'] ]); } } echo manager()->ab([ 'onclick' => "document.location.href='index.php?a=76';", - 'icon' => $_style['icons_cancel'], 'label' => $_lang['cancel'] ]); ?> diff --git a/manager/actions/element/mutate_template_tv_rank.dynamic.php b/manager/actions/element/mutate_template_tv_rank.dynamic.php index ffbeba583..4a5b18ff8 100644 --- a/manager/actions/element/mutate_template_tv_rank.dynamic.php +++ b/manager/actions/element/mutate_template_tv_rank.dynamic.php @@ -138,8 +138,8 @@
    diff --git a/manager/actions/element/mutate_templates.dynamic.php b/manager/actions/element/mutate_templates.dynamic.php index 9ca6b59e8..f8d1e98ec 100644 --- a/manager/actions/element/mutate_templates.dynamic.php +++ b/manager/actions/element/mutate_templates.dynamic.php @@ -64,8 +64,7 @@ function deletedocument() { hasPermission('save_template')) : ?>
  • + onclick="document.querySelectorAll('#templatesPane select').forEach(function(el){el.disabled=false;});documentDirty=false;document.getElementById('Button1').style.display='none';document.querySelectorAll('input,textarea,select').forEach(function(el){el.classList.add('readonly');});var f=document.getElementById('mutate');f.noValidate=true;f.requestSubmit();"> +
    • + >
    @@ -80,15 +77,11 @@ class="mutate" class="default" href="#" onclick="document.getElementById('submitok').click();" - >
    • diff --git a/manager/actions/permission/access_permissions.dynamic.php b/manager/actions/permission/access_permissions.dynamic.php index 66e443038..c9f511a48 100644 --- a/manager/actions/permission/access_permissions.dynamic.php +++ b/manager/actions/permission/access_permissions.dynamic.php @@ -36,8 +36,7 @@ diff --git a/manager/actions/permission/messages.static.php b/manager/actions/permission/messages.static.php index fc61f2ea7..19b2b8268 100644 --- a/manager/actions/permission/messages.static.php +++ b/manager/actions/permission/messages.static.php @@ -21,9 +21,7 @@
    • icons_cancel" />
      • + onclick="documentDirty=false;document.location.href='index.php?a=';">
    @@ -59,14 +57,11 @@
    • " /> + href="index.php?a=10&t=c&m=rp&id=">
      • -
    • " /> +
      • -
    • " /> +