管理画面の詳細画面に「次へ」「前へ」ボタンをつけるためのリソースを追加。

diff --git a/images/system/next48.png b/images/system/next48.png
new file mode 100644 (file)
index 0000000..f0276e7
Binary files /dev/null and b/images/system/next48.png differ

diff --git a/images/system/prev48.png b/images/system/prev48.png
new file mode 100644 (file)
index 0000000..58d0def
Binary files /dev/null and b/images/system/prev48.png differ

diff --git a/include/manager/pageManager.php b/include/manager/pageManager.php
index 3e92aed..b5cb5f2 100644 (file)
--- a/include/manager/pageManager.php
+++ b/include/manager/pageManager.php
@@ -144,6 +144,8 @@ class PageManager extends Core
        const EDIT_PAGE_ICON_FILE = '/images/system/create_page64.png';         // パネルメニュー編集用アイコン
        const EDIT_END_ICON_FILE = '/images/system/close64.png';                // パネルメニュー編集終了用アイコン
        const CLOSE_ICON_FILE = '/images/system/close32.png';           // ウィンドウ閉じるアイコン
+       const PREV_ICON_FILE = '/images/system/prev48.png';             // ウィンドウ「前へ」アイコン
+       const NEXT_ICON_FILE = '/images/system/next48.png';             // ウィンドウ「次へ」アイコン
        const DEFAULT_READMORE_TITLE = 'もっと読む';                       // もっと読むボタンのデフォルトタイトル
        
        // アドオンオブジェクト用
@@ -2222,30 +2224,39 @@ class PageManager extends Core
                        $cmd == M3_REQUEST_CMD_CONFIG_WIDGET || // ウィジェット詳細設定画面のとき
                        $cmd == M3_REQUEST_CMD_DO_WIDGET){              // ウィジェット単体実行のとき
 
-                       if ($this->isEditMode && !empty($openBy)){// 一般画面編集モードのとき
-                               // サーバ指定されている場合はサーバ情報を取得
-                               $serverName = '';
-                               $server = $gRequestManager->trimValueOf(M3_REQUEST_PARAM_SERVER);
-                               if (!empty($server)){
-                                       // 設定データを取得
-                                       $ret = $this->db->getServerById($server, $row);
-                                       if ($ret){
-                                               $serverName = 'サーバ名：' . $row['ts_name'];// サーバ名
-                                               echo '<div align="left" style="float:left;padding-left:30px;"><label>' . convertToHtmlEntity($serverName) . '</label></div>';
+                       if ($this->isEditMode){// 一般画面編集モードのとき
+                               if (!empty($openBy)){
+                                       // サーバ指定されている場合はサーバ情報を取得
+                                       $serverName = '';
+                                       $server = $gRequestManager->trimValueOf(M3_REQUEST_PARAM_SERVER);
+                                       if (!empty($server)){
+                                               // 設定データを取得
+                                               $ret = $this->db->getServerById($server, $row);
+                                               if ($ret){
+                                                       $serverName = 'サーバ名：' . $row['ts_name'];// サーバ名
+                                                       echo '<div align="left" style="float:left;padding-left:30px;"><label>' . convertToHtmlEntity($serverName) . '</label></div>';
+                                               }
                                        }
-                               }
-                               // タブ形式以外のときは「閉じる」ボタンを表示
-                               if ($openBy != 'tabs'){
-                                       if ($openBy == 'logout'){
-                                               $titleStr = 'ログアウト';
-                                               echo '<div class="m3configclose"><a href="#" onclick="location.href=\'?cmd=logout\';"><img src="' . $rootUrl . self::CLOSE_ICON_FILE . 
-                                                                       '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></div>' . M3_NL;
-                                       } else {
-                                               $titleStr = '閉じる';
-                                               echo '<div class="m3configclose"><a href="#" onclick="window.close();"><img src="' . $rootUrl . self::CLOSE_ICON_FILE . 
-                                                                       '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></div>' . M3_NL;
+                                       // タブ形式以外のときは「閉じる」ボタンを表示
+                                       if ($openBy != 'tabs'){
+                                               if ($openBy == 'logout'){
+                                                       $titleStr = 'ログアウト';
+                                                       echo '<div class="m3configclose"><a href="#" onclick="location.href=\'?cmd=logout\';"><img src="' . $rootUrl . self::CLOSE_ICON_FILE . 
+                                                                               '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></div>' . M3_NL;
+                                               } else {
+                                                       $titleStr = '閉じる';
+                                                       echo '<div class="m3configclose"><a href="#" onclick="window.close();"><img src="' . $rootUrl . self::CLOSE_ICON_FILE . 
+                                                                               '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></div>' . M3_NL;
+                                               }
                                        }
                                }
+                               // 「前へ」「次へ」ボタン
+                               $titleStr = '前へ';
+                               echo '<div class="m3configprev" style="display:none;"><a id="m3configprev" href="#"><img src="' . $rootUrl . self::PREV_ICON_FILE . 
+                                                       '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></div>' . M3_NL;
+                               $titleStr = '次へ';
+                               echo '<div class="m3confignext" style="display:none;"><a id="m3confignext" href="#"><img src="' . $rootUrl . self::NEXT_ICON_FILE . 
+                                                       '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></div>' . M3_NL;
                        }
                }
                echo '<!-- Widget Start -->' . M3_NL;

diff --git a/scripts/m3/edit.css b/scripts/m3/edit.css
index 3304b2e..73061a7 100644 (file)
--- a/scripts/m3/edit.css
+++ b/scripts/m3/edit.css
@@ -7,7 +7,7 @@
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
  * @copyright  Copyright 2006-2013 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
- * @version    SVN: $Id: edit.css 5922 2013-04-10 22:43:51Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
 img.m3icon {
@@ -35,6 +35,24 @@ img.m3icon {
 .m3configclose img {
        border:0;       /* for IE */
 }
+/* 設定画面「前へ」アイコン */
+.m3configprev {
+       position:fixed;
+       bottom:100px;
+       left:50px;
+       margin:5px;
+       padding:0;
+       z-index:2;
+}
+/* 設定画面「次へ」アイコン */
+.m3confignext {
+       position:fixed;
+       bottom:100px;
+       right:50px;
+       margin:5px;
+       padding:0;
+       z-index:2;
+}
 /* ツールチップ */
 .m3tooltip {
        background-color:#FFF;

diff --git a/widgets/banner3/include/template/admin_image_detail.tmpl.html b/widgets/banner3/include/template/admin_image_detail.tmpl.html
index 841eb16..6863129 100644 (file)
--- a/widgets/banner3/include/template/admin_image_detail.tmpl.html
+++ b/widgets/banner3/include/template/admin_image_detail.tmpl.html
@@ -185,7 +185,7 @@ $(function(){
 <span {_HELP_IMAGE_RET_BTN}><input type="button" class="button" onclick="cancelItem();" value="戻る" /></span>\r
 </td></tr>\r
 <tr><td colspan="2">\r
-<table class="simple-table" width="100%">\r
+<table class="simple-table">\r
     <tbody>\r
         <tr>\r
            <td class="table-headside" width="150"><span {_HELP_IMAGE_NAME_INPUT}>名前</span></td>\r
@@ -230,8 +230,8 @@ $(function(){
        </tr>\r
        <tr>\r
            <td class="table-headside"><span {_HELP_IMAGE_LINK_URL}>リンク</span></td>\r
-           <td colspan="3"><label><span style="width:10%;display:inline-block;">デフォルト：</span><input type="text" id="item_link_url" name="item_link_url" value="{LINK_URL}" maxlength="200" style="width:80%;" /></label><input type="button" class="button" onclick="createUrl(0);" value="URL作成" /><br />\r
-           <label><span style="width:10%;display:inline-block;">スマートフォン：</span><input type="text" id="item_link_url_s" name="item_link_url_s" value="{LINK_URL_S}" maxlength="200" style="width:80%;" /></label><input type="button" class="button" onclick="createUrl(2);" value="URL作成" />\r
+           <td colspan="3"><label><span style="width:13%;display:inline-block;">デフォルト：</span><input type="text" id="item_link_url" name="item_link_url" value="{LINK_URL}" maxlength="200" style="width:77%;" /></label><input type="button" class="button" onclick="createUrl(0);" value="URL作成" /><br />\r
+           <label><span style="width:13%;display:inline-block;">スマートフォン：</span><input type="text" id="item_link_url_s" name="item_link_url_s" value="{LINK_URL_S}" maxlength="200" style="width:77%;" /></label><input type="button" class="button" onclick="createUrl(2);" value="URL作成" />\r
            </td>\r
        </tr>\r
        <tr class="even">\r
@@ -250,7 +250,7 @@ $(function(){
        </tr>\r
     <tr class="even">\r
            <td class="table-headside"><span {_HELP_IMAGE_LAYOUT}>レイアウト</span></td>\r
-           <td colspan="3"><textarea name="item_html">{HTML}</textarea></td>\r
+           <td colspan="3" width="800"><textarea name="item_html">{HTML}</textarea></td>\r
        </tr>\r
     <tr>\r
            <td class="table-headside"><span {_HELP_IMAGE_NOTE}>管理者用備考</span></td>\r

diff --git a/widgets/default_content/include/template/admin_main_detail.tmpl.html b/widgets/default_content/include/template/admin_main_detail.tmpl.html
index 99a6af8..e37050d 100644 (file)
--- a/widgets/default_content/include/template/admin_main_detail.tmpl.html
+++ b/widgets/default_content/include/template/admin_main_detail.tmpl.html
@@ -219,7 +219,7 @@ $(function(){
 </patTemplate:tmpl>\r
 </td></tr>\r
 <tr><td colspan="2">\r
-<table id="input_content" class="simple-table" width="100%">\r
+<table id="input_content" class="simple-table">\r
     <tbody>\r
         <tr>\r
            <td class="table-headside" width="150"><span {_HELP_CONTENT_ID}>ID</span></td>\r