ウィジェット一覧画面更新。

diff --git a/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php b/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
index b7ce9b4..5379fb7 100644 (file)
--- a/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
@@ -618,7 +618,15 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
                        $this->tmpl->setAttribute('show_list_detail', 'visibility', 'visible');// 一覧を詳細表示
                }
                // ウィジェットタイプ選択メニュー作成
-               $this->createWidgetTypeMenu();
+               $widgetTypeCount = count($this->widgetTypeArray);
+               if ($widgetTypeCount > 1){
+                       $this->createWidgetTypeMenu();
+               } else {
+                       $this->tmpl->setAttribute('show_widget_type_menu', 'visibility', 'hidden');// ウィジェットタイプメニューを非表示
+                       
+                       // PC用以外の場合はウィジェットタイプを固定表示
+                       if ($widgetTypeCount == 1 && $this->widgetTypeArray[0]['value'] != '0') $this->tmpl->addVar("_widget", "widget_type", '(' . $this->widgetTypeArray[0]['name'] . ')');
+               }
                
                // ウィジェットリストを取得
                $this->db->getAllWidgetList(intval($this->widgetType), array($this, 'widgetListLoop'));

diff --git a/widgets/admin_main/include/template/widgetlist.tmpl.html b/widgets/admin_main/include/template/widgetlist.tmpl.html
index 6b72c14..c970ac1 100644 (file)
--- a/widgets/admin_main/include/template/widgetlist.tmpl.html
+++ b/widgets/admin_main/include/template/widgetlist.tmpl.html
@@ -5,7 +5,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2016 Magic3 Project.
+ * @copyright  Copyright 2006-2018 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
@@ -116,12 +116,14 @@ $(function(){
 <input type="hidden" name="serial" />
 <input type="hidden" name="no" />
 <input type="hidden" name="widget" />
-<h3 class="m3config_h" style="margin-bottom:0;"><span {_HELP_WIDGETLIST}>{_LC_LABEL_WIDGET_LIST}</span>
+<h3 class="m3config_h" style="margin-bottom:0;"><span {_HELP_WIDGETLIST}>{_LC_LABEL_WIDGET_LIST}{WIDGET_TYPE}</span>
+<patTemplate:tmpl name="show_widget_type_menu">
 <select name="item_type" class="form-control" onchange="changeType();" style="display:inline-block;width:200px;margin-top:-7px;">
 <patTemplate:tmpl name="item_type_list">
 <option value="{VALUE}" {SELECTED}>{NAME}</option>
 </patTemplate:tmpl>
 </select>
+</patTemplate:tmpl>
 {AREA_OPEN_BUTTON}<input type="hidden" name="item_show_detail" value="{SHOW_DETAIL}" />
 </h3>
 <div class="m3config_h_side_buttons pull-right"><div {_HELP_WIDGETLIST_BUTTONS}><div class="btn-group">