OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

magic3: Commit

Cloud computing platform


Commit MetaInfo

Revisionb4ce73bcf781ab9824de33b553ab127c3797304c (tree)
Time2015-01-06 13:47:43
Authornaoki hirata <naoki@magi...>
Commiternaoki hirata

Log Message

管理画面ヘルプ用ツールチップを修正。

Change Summary

Incremental Difference

--- a/include/manager/pageManager.php
+++ b/include/manager/pageManager.php
@@ -3550,8 +3550,8 @@ class PageManager extends Core
35503550 $titleStr = '編集終了';
35513551 $linkUrl = $gRequestManager->trimValueOf(M3_REQUEST_PARAM_BACKUP_URL); // 退避していたURLを取得
35523552 if (empty($linkUrl)) $linkUrl = $gEnvManager->getDefaultUrl();
3553- $editTag = '<div class="m3editend"><a href="' . convertUrlToHtmlEntity($linkUrl) . '">';
3554- $editTag .= '<img src="' . $rootUrl . self::EDIT_END_ICON_FILE . '" alt="' . $titleStr . '" title="' . $titleStr . '" rel="m3help" data-placement="bottom" /></a></div>';
3553+ $editTag = '<div class="m3editend"><a href="' . convertUrlToHtmlEntity($linkUrl) . '" rel="m3help" data-placement="bottom" data-container="body" title="' . $titleStr . '">';
3554+ $editTag .= '<img src="' . $rootUrl . self::EDIT_END_ICON_FILE . '" alt="' . $titleStr . '" /></a></div>';
35553555 $linkStr .= $editTag;
35563556
35573557 $this->initScript .= str_repeat(M3_INDENT_SPACE, 1) . 'if (window.parent && window.parent.frames.length == 0){' . M3_NL;// インラインフレームでないときパネルメニューを表示
@@ -3562,7 +3562,7 @@ class PageManager extends Core
35623562 $titleStr = '管理画面へ遷移';
35633563 $linkUrl = $gEnvManager->getDefaultAdminUrl();
35643564 $adminTag = '<li><a href="' . convertUrlToHtmlEntity($linkUrl) . '" rel="m3help" data-placement="bottom" data-container="body" title="' . $titleStr . '">';
3565- $adminTag .= '<img src="' . $rootUrl . self::ADMIN_ICON_FILE . '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></li>';
3565+ $adminTag .= '<img src="' . $rootUrl . self::ADMIN_ICON_FILE . '" alt="' . $titleStr . '" /></a></li>';
35663566
35673567 // 編集ボタン
35683568 $titleStr = '画面を編集';
@@ -3571,7 +3571,7 @@ class PageManager extends Core
35713571 $linkUrl .= '&' . M3_REQUEST_PARAM_DEF_PAGE_SUB_ID . '=' . $gEnvManager->getCurrentPageSubId();
35723572 $linkUrl .= '&' . M3_REQUEST_PARAM_BACKUP_URL . '=' . urlencode($gEnvManager->getCurrentRequestUri()); // URL退避用
35733573 $editTag = '<li><a href="' . convertUrlToHtmlEntity($linkUrl) . '" rel="m3help" data-placement="bottom" data-container="body" title="' . $titleStr . '">';
3574- $editTag .= '<img src="' . $rootUrl . self::EDIT_PAGE_ICON_FILE . '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></li>';
3574+ $editTag .= '<img src="' . $rootUrl . self::EDIT_PAGE_ICON_FILE . '" alt="' . $titleStr . '" /></a></li>';
35753575
35763576 // ログアウトボタン
35773577 $titleStr = 'ログアウト';
@@ -3583,7 +3583,7 @@ class PageManager extends Core
35833583 // }
35843584 $linkUrl = createUrl($linkUrl, M3_REQUEST_PARAM_OPERATION_COMMAND . '=' . M3_REQUEST_CMD_LOGOUT);
35853585 $logoutTag = '<li><a href="' . convertUrlToHtmlEntity($linkUrl) . '" rel="m3help" data-placement="bottom" data-container="body" title="' . $titleStr . '">';
3586- $logoutTag .= '<img src="' . $rootUrl . self::LOGOUT_ICON_FILE . '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></li>';
3586+ $logoutTag .= '<img src="' . $rootUrl . self::LOGOUT_ICON_FILE . '" alt="' . $titleStr . '" /></a></li>';
35873587
35883588 $linkStr .= '<div id="m3slidepanel">';
35893589 $linkStr .= '<div class="m3panelopener m3topleft"><a href="#" rel="m3help" data-placement="bottom" data-container="body" title="メニューバーを表示"><i class="glyphicon glyphicon-align-justify"></i></a></div>';
@@ -3626,18 +3626,18 @@ class PageManager extends Core
36263626 $this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . 'var html = \'\';' . M3_NL;
36273627 $this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . 'if (useconfig == 1){' . M3_NL;
36283628 $this->initScript .= str_repeat(M3_INDENT_SPACE, 3) .
3629- 'html += \'<a href="javascript:void(0);" onclick="m3ShowConfigWindow(\\\'\' + widgetId + \'\\\', \' + configId + \', \' + serialNo + \');return false;" >' .
3630- '<img src="' . $rootUrl . self::CONFIG_ICON32_FILE . '" alt="ウィジェット設定" title="ウィジェット設定" width="32" height="32" /></a>\';' . M3_NL;
3629+ 'html += \'<a href="javascript:void(0);" onclick="m3ShowConfigWindow(\\\'\' + widgetId + \'\\\', \' + configId + \', \' + serialNo + \');return false;" rel="m3help" data-container="body" title="ウィジェット設定">' .
3630+ '<img src="' . $rootUrl . self::CONFIG_ICON32_FILE . '" alt="ウィジェット設定" width="32" height="32" /></a>\';' . M3_NL;
36313631 $this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '}' . M3_NL;
36323632 if ($gEnvManager->isSystemAdmin()){ // 位置調整は管理者権限がある場合のみ有効(管理ウィジェットの機能のため)
36333633 $this->initScript .= str_repeat(M3_INDENT_SPACE, 2) .
3634- 'html += \'<a href="javascript:void(0);" onclick="m3ShowAdjustWindow(\' + configId + \', \' + serialNo + \', M3_PAGE_ID, M3_PAGE_SUB_ID);return false;" >' .
3635- '<img src="' . $rootUrl . self::ADJUST_ICON32_FILE . '" alt="タイトル・位置調整" title="タイトル・位置調整" width="32" height="32" /></a>\';' . M3_NL;
3634+ 'html += \'<a href="javascript:void(0);" onclick="m3ShowAdjustWindow(\' + configId + \', \' + serialNo + \', M3_PAGE_ID, M3_PAGE_SUB_ID);return false;" rel="m3help" data-container="body" title="タイトル・位置調整">' .
3635+ '<img src="' . $rootUrl . self::ADJUST_ICON32_FILE . '" alt="タイトル・位置調整" width="32" height="32" /></a>\';' . M3_NL;
36363636 }
36373637 $this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . 'if (html != \'\'){' . M3_NL;
36383638 $this->initScript .= str_repeat(M3_INDENT_SPACE, 3) .
3639- 'html = \'<div class="m3tooltip" style="display:none;">\' + html + \'<a class="m3closebox" href="javascript:void(0);">' .
3640- '<img src="' . $rootUrl . self::CLOSE_BOX_ICON32_FILE . '" alt="閉じる" title="閉じる" width="11" height="11" /></a></div>\';' . M3_NL;
3639+ 'html = \'<div class="m3tooltip" style="display:none;">\' + html + \'<a class="m3closebox" href="javascript:void(0);" rel="m3help" data-container="body" title="閉じる">' .
3640+ '<img src="' . $rootUrl . self::CLOSE_BOX_ICON32_FILE . '" alt="閉じる" width="11" height="11" /></a></div>\';' . M3_NL;
36413641
36423642 $this->initScript .= str_repeat(M3_INDENT_SPACE, 3) . '$(this).append(html);' . M3_NL;
36433643 $this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '}' . M3_NL;
@@ -4417,14 +4417,17 @@ class PageManager extends Core
44174417 (in_array($widgetContentType, $this->_getAllContentType()) || in_array($widgetContentType, $this->_getAllFeatureType()))){
44184418 //$title = 'ウィジェット配置注意';
44194419 $title = 'ページ属性と不一致';
4420- $configImg .= '<img src="' . $rootUrl . self::NOTICE_ICON_FILE . '" alt="' . $title . '" title="' . $title . '" />&nbsp;';
4420+ $configImg .= '<span rel="m3help" data-container="body" title="' . $title . '"><img src="' . $rootUrl . self::NOTICE_ICON_FILE . '" alt="' . $title . '" /></span>&nbsp;';
44214421 }
44224422 if ($rows[$i]['wd_has_admin']){
44234423 $hasAdmin = '1';
44244424 $title = 'ウィジェット設定';
4425- $configImg .= '<a href="javascript:void(0);" onclick="m3ShowConfigWindow(\'' . $widgetId . '\', \'' . $configId . '\', \'' . $serial . '\');return false;" >' .
4426- '<img src="' . $rootUrl . self::CONFIG_ICON_FILE . '" alt="' . $title . '" title="' . $title . '" /></a>&nbsp;';
4425+ $configImg .= '<a href="javascript:void(0);" onclick="m3ShowConfigWindow(\'' . $widgetId . '\', \'' . $configId . '\', \'' . $serial . '\');return false;" rel="m3help" data-container="body" title="' . $title . '">' .
4426+ '<img src="' . $rootUrl . self::CONFIG_ICON_FILE . '" alt="' . $title . '"/></a>&nbsp;';
44274427 }
4428+ // 表示順
4429+ $configImg .= '<span rel="m3help" data-container="body" title="表示順">' . $widgetIndex . '</span>';
4430+
44284431 $shared = '0'; // 共通属性があるかどうか
44294432 $sharedClassName = '';
44304433 if (empty($rows[$i]['pd_sub_id'])){
@@ -4460,7 +4463,7 @@ class PageManager extends Core
44604463 $contents .= '<dl class="m3_widget m3_widget_sortable" id="' . $widgetTag . '" ' . $m3Option . ' >' . M3_NL;
44614464 $contents .= '<dt class="m3_widget_with_check_box ' . $sharedClassName . '"><div class="m3widgettitle">' . $widgetMark . $rows[$i]['wd_name'] . '</div>' . $operationMenu . '</dt>' . M3_NL;
44624465 $contents .= '<dd><table width="100%"><tr valign="top"><td width="35">' . $imageTag . '</td><td>' . $desc . '</td></tr></table>' . M3_NL;
4463- $contents .= '<table width="100%"><tr><td>' . $configName . '</td><td align="right">' . $configImg . $widgetIndex . '</td></tr></table></dd>' . M3_NL;
4466+ $contents .= '<table width="100%"><tr><td>' . $configName . '</td><td align="right">' . $configImg . '</td></tr></table></dd>' . M3_NL;
44644467 $contents .= '</dl>' . M3_NL;
44654468 }
44664469 return $contents;
--- a/scripts/m3/widget.css
+++ b/scripts/m3/widget.css
@@ -5,7 +5,7 @@
55 *
66 * @package Magic3 Framework
77 * @author 平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
8- * @copyright Copyright 2006-2014 Magic3 Project.
8+ * @copyright Copyright 2006-2015 Magic3 Project.
99 * @license http://www.gnu.org/copyleft/gpl.html GPL License
1010 * @version SVN: $Id$
1111 * @link http://www.magic3.org
@@ -203,3 +203,6 @@ dl.m3_widget_sortable dt span.options a {
203203 height:32px;
204204 z-index:2147483647;
205205 }
206+/* ヘルプ、ツールチップ */
207+i[rel="m3help"] { cursor: default; }
208+span[rel="m3help"] { cursor: default; }
--- a/templates/_admin4/css/style.css
+++ b/templates/_admin4/css/style.css
@@ -463,6 +463,7 @@ background-color: #0081c2;
463463 }
464464 .m3help { cursor: help; }
465465 i[rel="m3help"] { cursor: default; }
466+span[rel="m3help"] { cursor: default; }
466467 /****** sortable box ******/
467468 /*.sortable-box {
468469 background-color:#FFF;
Show on old repository browser