メニュー定義画面更新。

diff --git a/widgets/admin_main/include/help/help_menudef.php b/widgets/admin_main/include/help/help_menudef.php
index 6c77429..fe510ec 100644 (file)
--- a/widgets/admin_main/include/help/help_menudef.php
+++ b/widgets/admin_main/include/help/help_menudef.php
@@ -9,9 +9,9 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2010 Magic3 Project.
+ * @copyright  Copyright 2006-2018 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
- * @version    SVN: $Id: help_menudef.php 4935 2012-06-05 09:40:47Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
 require_once($gEnvManager->getCommonPath()                             . '/helpConv.php' );
@@ -39,9 +39,13 @@ class help_menudef extends HelpConv
                                'title' =>      $this->_('Checkbox to Select'),                 // 選択用チェックボックス
                                'body' =>       $this->_('Select items to edit or delete by using checkboxes.')         // 編集や削除を行う項目を選択します。
                        ),
+                       'menudef_list_name' => array(           // リスト用「名前」
+                               'title' =>      $this->_('Name'),                       // 名前
+                               'body' =>       $this->_('Definition name for menu item. It appears as the title.')             // メニュー項目の定義名です。タイトルとして表示されます。
+                       ),
                        'menudef_name' => array(        
                                'title' =>      $this->_('Name'),                       // 名前
-                               'body' =>       $this->_('Definition name for menu item.<br />If \'Get Title\' button is clicked, it is replaced with the content title on \'URL to link\'.')           // メニュー項目の名前です。「タイトル取得」ボタンを押すと、リンク先URLのコンテンツのタイトルを取得できます。
+                               'body' =>       $this->_('Definition name for menu item.  It appears as the title.<br />If \'Get Title\' button is clicked, it is replaced with the content title on \'URL to link\'.')         // メニュー項目の定義名です。タイトルとして表示されます。「タイトル取得」ボタンを押すと、リンク先URLのコンテンツのタイトルを取得できます。
                        ),
                        'menudef_lang' => array(        
                                'title' =>      $this->_('Language'),                   // 言語

diff --git a/widgets/admin_main/include/locale/ja_JP.mo b/widgets/admin_main/include/locale/ja_JP.mo
index 7471c47..67e67ee 100644 (file)
Binary files a/widgets/admin_main/include/locale/ja_JP.mo and b/widgets/admin_main/include/locale/ja_JP.mo differ

diff --git a/widgets/admin_main/include/locale/ja_JP.po b/widgets/admin_main/include/locale/ja_JP.po
index 121d8fb..56f07d5 100644 (file)
--- a/widgets/admin_main/include/locale/ja_JP.po
+++ b/widgets/admin_main/include/locale/ja_JP.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 06:28+0900\n"
-"PO-Revision-Date: 2018-06-28 06:28+0900\n"
+"POT-Creation-Date: 2018-07-25 16:15+0900\n"
+"PO-Revision-Date: 2018-07-25 16:16+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -156,7 +156,7 @@ msgstr "補助コンテンツ"
 #: ../container/admin_mainEditmenuWidgetContainer.php:56
 #: ../container/admin_mainMenudefWidgetContainer.php:178
 #: ../container/admin_mainSmenudefWidgetContainer.php:172
-#: ../help/help_adjustwidget.php:43 ../help/help_menudef.php:83
+#: ../help/help_adjustwidget.php:43 ../help/help_menudef.php:87
 msgid "Title"
 msgstr "タイトル"
 
@@ -166,7 +166,7 @@ msgstr "タイトル"
 #: ../container/admin_mainPagedefWidgetContainer.php:172
 #: ../container/admin_mainSmenudefWidgetContainer.php:171
 #: ../container/admin_mainSmenudefWidgetContainer.php:195
-#: ../help/help_menudef.php:63 ../help/help_pagedef.php:91
+#: ../help/help_menudef.php:67 ../help/help_pagedef.php:91
 msgid "Visible"
 msgstr "表示"
 
@@ -835,7 +835,8 @@ msgstr "未設定"
 #: ../container/admin_mainUserlistWidgetContainer.php:301
 #: ../container/admin_mainUserlistWidgetContainer.php:377
 #: ../container/admin_mainWidgetlistWidgetContainer.php:665
-#: ../help/help_menudef.php:43 ../help/help_userlist.php:47
+#: ../help/help_menudef.php:43 ../help/help_menudef.php:47
+#: ../help/help_userlist.php:47
 msgid "Name"
 msgstr "名前"
 
@@ -850,7 +851,7 @@ msgstr "オプション"
 #: ../container/admin_mainPortalWidgetContainer.php:101
 #: ../container/admin_mainPortalWidgetContainer.php:254
 #: ../container/admin_mainSmenudefWidgetContainer.php:175
-#: ../help/help_menudef.php:79
+#: ../help/help_menudef.php:83
 msgid "Description"
 msgstr "説明"
 
@@ -1022,7 +1023,7 @@ msgstr "メニュー項目詳細"
 #: ../container/admin_mainMenudefWidgetContainer.php:199
 #: ../container/admin_mainSmenudefWidgetContainer.php:161
 #: ../container/admin_mainSmenudefWidgetContainer.php:192
-#: ../help/help_menudef.php:47
+#: ../help/help_menudef.php:51
 msgid "Language"
 msgstr "言語"
 
@@ -1046,7 +1047,7 @@ msgstr "項目タイプ"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:171
 #: ../container/admin_mainSmenudefWidgetContainer.php:165
-#: ../help/help_menudef.php:59
+#: ../help/help_menudef.php:63
 msgid "Action"
 msgstr "動作"
 
@@ -1065,7 +1066,7 @@ msgstr "別ウィンドウで表示"
 #: ../container/admin_mainPortalWidgetContainer.php:251
 #: ../container/admin_mainSmenudefWidgetContainer.php:168
 #: ../container/admin_mainSmenudefWidgetContainer.php:193
-#: ../help/help_menudef.php:55 ../help/help_pagedef.php:39
+#: ../help/help_menudef.php:59 ../help/help_pagedef.php:39
 msgid "URL"
 msgstr "URL"
 
@@ -1096,7 +1097,6 @@ msgstr "リンク先のコンテンツに連動"
 #: ../container/admin_mainSmenudefWidgetContainer.php:176
 #: ../container/admin_mainSmenudefWidgetContainer.php:189
 #: ../container/admin_mainTempimageWidgetContainer.php:286
-#: ../container/admin_mainTemplistWidgetContainer.php:653
 #: ../container/admin_mainUserlistWidgetContainer.php:138
 #: ../container/admin_mainUserlistWidgetContainer.php:161
 msgid "Delete"
@@ -1163,14 +1163,14 @@ msgstr "区分"
 #: ../container/admin_mainSmenudefWidgetContainer.php:196
 #: ../container/admin_mainTemplistWidgetContainer.php:531
 #: ../container/admin_mainWidgetlistWidgetContainer.php:672
-#: ../help/help_menudef.php:67 ../help/help_templist.php:59
+#: ../help/help_menudef.php:71 ../help/help_templist.php:59
 #: ../help/help_widgetlist.php:63
 msgid "Operation"
 msgstr "操作"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:204
 #: ../container/admin_mainSmenudefWidgetContainer.php:197
-#: ../help/help_menudef.php:75
+#: ../help/help_menudef.php:79
 msgid "Menu Layout"
 msgstr "メニューレイアウト"
 
@@ -1367,7 +1367,6 @@ msgid "Layout"
 msgstr "レイアウト"
 
 #: ../container/admin_mainPagedefWidgetContainer.php:152
-#: ../container/admin_mainTemplistWidgetContainer.php:656
 msgid "Preview"
 msgstr "プレビュー"
 
@@ -1575,9 +1574,9 @@ msgid "Can not access the page."
 msgstr "アクセスできません"
 
 #: ../container/admin_mainTempgeneratecssWidgetContainer.php:299
-#: ../container/admin_mainTemplistWidgetContainer.php:752
-#: ../container/admin_mainTemplistWidgetContainer.php:865
-#: ../container/admin_mainTemplistWidgetContainer.php:890
+#: ../container/admin_mainTemplistWidgetContainer.php:743
+#: ../container/admin_mainTemplistWidgetContainer.php:856
+#: ../container/admin_mainTemplistWidgetContainer.php:881
 msgid "SimpleXML module not installed."
 msgstr "SimpleXML拡張モジュールがインストールされていません"
 
@@ -1846,11 +1845,11 @@ msgstr "テンプレートが見つかりません"
 msgid "Not Detected"
 msgstr "未検出"
 
-#: ../container/admin_mainTemplistWidgetContainer.php:670
+#: ../container/admin_mainTemplistWidgetContainer.php:655
 msgid ".zip Download"
 msgstr ".zip ダウンロード"
 
-#: ../container/admin_mainTemplistWidgetContainer.php:740
+#: ../container/admin_mainTemplistWidgetContainer.php:731
 msgid "Upload file is not the correct template format."
 msgstr ""
 "アップロードしたファイルは正しいテンプレートフォーマットではありません。"
@@ -2418,7 +2417,7 @@ msgstr "その他ボタン"
 msgid "Configure others."
 msgstr "その他の設定を行います。"
 
-#: ../help/help_editmenu.php:35 ../help/help_menudef.php:99
+#: ../help/help_editmenu.php:35 ../help/help_menudef.php:103
 #: ../help/help_userlist.php:103
 msgid "Go back Button"
 msgstr "戻るボタン"
@@ -2448,22 +2447,26 @@ msgid "Select items to edit or delete by using checkboxes."
 msgstr "編集や削除を行う項目を選択します。"
 
 #: ../help/help_menudef.php:44
+msgid "Definition name for menu item. It appears as the title."
+msgstr "メニュー項目の定義名です。タイトルとして表示されます。"
+
+#: ../help/help_menudef.php:48
 msgid ""
-"Definition name for menu item.<br />If 'Get Title' button is clicked, it is "
-"replaced with the content title on 'URL to link'."
+"Definition name for menu item.  It appears as the title.<br />If 'Get Title' "
+"button is clicked, it is replaced with the content title on 'URL to link'."
 msgstr ""
-"ã\83¡ã\83\8bã\83¥ã\83¼é \85ç\9b®ã\81®å\90\8då\89\8dã\81§ã\81\99ã\80\82<br />ã\80\8cã\82¿ã\82¤ã\83\88ã\83«å\8f\96å¾\97ã\80\8dã\83\9cã\82¿ã\83³ã\82\92æ\8a¼ã\81\99ã\81¨ã\80\81ã\80\8cã\83ªã\83³ã\82¯å\85\88URL」"
-"のコンテンツのタイトルを取得できます。"
+"ã\83¡ã\83\8bã\83¥ã\83¼é \85ç\9b®ã\81®å®\9a義å\90\8dã\81§ã\81\99ã\80\82ã\82¿ã\82¤ã\83\88ã\83«ã\81¨ã\81\97ã\81¦è¡¨ç¤ºã\81\95ã\82\8cã\81¾ã\81\99ã\80\82<br />ã\80\8cã\82¿ã\82¤ã\83\88ã\83«å\8f\96å¾\97」"
+"ã\83\9cã\82¿ã\83³ã\82\92æ\8a¼ã\81\99ã\81¨ã\80\81ã\80\8cã\83ªã\83³ã\82¯å\85\88URLã\80\8dã\81®ã\82³ã\83³ã\83\86ã\83³ã\83\84ã\81®ã\82¿ã\82¤ã\83\88ã\83«ã\82\92å\8f\96å¾\97ã\81§ã\81\8dã\81¾ã\81\99ã\80\82"
 
-#: ../help/help_menudef.php:48
+#: ../help/help_menudef.php:52
 msgid "Language for menu item."
 msgstr "メニュー項目の対応言語です。"
 
-#: ../help/help_menudef.php:51
+#: ../help/help_menudef.php:55
 msgid "Menu Item Type"
 msgstr "メニュー項目タイプ"
 
-#: ../help/help_menudef.php:52
+#: ../help/help_menudef.php:56
 msgid ""
 "You can select menu item type below.<br /><strong>Link</strong> - Normal "
 "link item to go page if selected.<br /><strong>Folder</strong> - Item has "
@@ -2475,18 +2478,18 @@ msgstr ""
 "ト」-画面遷移せず文字列を表示するだけの項目です。<br />「セパレータ」-区切り"
 "項目です。"
 
-#: ../help/help_menudef.php:56
+#: ../help/help_menudef.php:60
 msgid "Url to link."
 msgstr "メニュー項目をクリックしたときに表示されるURLです。"
 
-#: ../help/help_menudef.php:60
+#: ../help/help_menudef.php:64
 msgid ""
 "Select type to open page in the same window or in other window if clicked."
 msgstr ""
 "メニュー項目をクリックしたときにリンク先が同じウィンドウで表示するか、別ウィ"
 "ンドウで表示するかを指定します。"
 
-#: ../help/help_menudef.php:64
+#: ../help/help_menudef.php:68
 msgid ""
 "Control menu item visible status. If menu item is hidden when visible status "
 "unchecked.<br />When 'Cotrol visible status linked to contents.' is checked, "
@@ -2498,7 +2501,7 @@ msgstr ""
 "クを入れるとリンク先のコンテンツの表示状態に連動してメニュー項目を自動表示制"
 "御します。"
 
-#: ../help/help_menudef.php:68
+#: ../help/help_menudef.php:72
 msgid ""
 "You can operate the actions below.<br /><strong>Edit Contents</strong> - If "
 "the link target is contents, edit the contents."
@@ -2506,11 +2509,11 @@ msgstr ""
 "各種操作を行います。<br />●コンテンツを編集<br />メニュー項目のリンク先がコン"
 "テンツ表示の場合、表示されるコンテンツの編集を行います。"
 
-#: ../help/help_menudef.php:71
+#: ../help/help_menudef.php:75
 msgid "Select Link Type"
 msgstr "リンク先を選択"
 
-#: ../help/help_menudef.php:72
+#: ../help/help_menudef.php:76
 msgid ""
 "Select the link type of menu item. If 'contents' is selected, you can select "
 "the contents to view."
@@ -2518,49 +2521,49 @@ msgstr ""
 "リンク先を選択します。「コンテンツ」を選択した場合は、表示するコンテンツを指"
 "定します。[任意設定]を選択した場合は、任意のURLにリンク先を設定できます。"
 
-#: ../help/help_menudef.php:76
+#: ../help/help_menudef.php:80
 msgid "Change the order of items by dragging."
 msgstr "項目をドラッグして並び順を変えることができます。"
 
-#: ../help/help_menudef.php:80
+#: ../help/help_menudef.php:84
 msgid "Description about menu item."
 msgstr "メニュー項目についての説明です。"
 
-#: ../help/help_menudef.php:84
+#: ../help/help_menudef.php:88
 msgid "Configure the different value from 'Name' value. You can use HTML tags."
 msgstr ""
 "メニュー項目に「名前」と異なる表示を行う場合に設定します。HTMLタグが使用可能"
 "です。"
 
-#: ../help/help_menudef.php:87 ../help/help_userlist.php:91
+#: ../help/help_menudef.php:91 ../help/help_userlist.php:91
 msgid "New Button"
 msgstr "新規ボタン"
 
-#: ../help/help_menudef.php:88
+#: ../help/help_menudef.php:92
 msgid "Add menu item."
 msgstr "新規メニュー項目を追加します。"
 
-#: ../help/help_menudef.php:91 ../help/help_userlist.php:95
+#: ../help/help_menudef.php:95 ../help/help_userlist.php:95
 msgid "Edit Button"
 msgstr "編集ボタン"
 
-#: ../help/help_menudef.php:92
+#: ../help/help_menudef.php:96
 msgid "Edit menu item.<br />Select the menu item by using the left checkbox."
 msgstr ""
 "選択されているメニュー項目を編集します。<br />メニュー項目を選択するには、一"
 "覧の左端のチェックボックスにチェックを入れます。"
 
-#: ../help/help_menudef.php:95 ../help/help_userlist.php:99
+#: ../help/help_menudef.php:99 ../help/help_userlist.php:99
 msgid "Delete Button"
 msgstr "削除ボタン"
 
-#: ../help/help_menudef.php:96
+#: ../help/help_menudef.php:100
 msgid "Delete menu item.<br />Select the menu item by using the left checkbox."
 msgstr ""
 "選択されているメニュー項目を削除します。<br />メニュー項目を選択するには、一"
 "覧の左端のチェックボックスにチェックを入れます。"
 
-#: ../help/help_menudef.php:100
+#: ../help/help_menudef.php:104
 msgid "Go back to menu item list."
 msgstr "メニュー項目一覧へ戻ります。"
 
@@ -3234,9 +3237,6 @@ msgstr ""
 #~ msgid "Database maintenance such as data initializing."
 #~ msgstr "データの初期化などDBのメンテナンスを行います。"
 
-#~ msgid "Definition name for menu item."
-#~ msgstr "メニュー項目の名前です。"
-
 #~ msgid "Top"
 #~ msgstr "トップ"
 

diff --git a/widgets/admin_main/include/template/menudef.tmpl.html b/widgets/admin_main/include/template/menudef.tmpl.html
index 4f2b819..4f4d876 100644 (file)
--- a/widgets/admin_main/include/template/menudef.tmpl.html
+++ b/widgets/admin_main/include/template/menudef.tmpl.html
@@ -198,7 +198,7 @@ $(function(){
     <thead>\r
     <tr>\r
         <th class="select"><span {_HELP_MENUDEF_CHECK}>{_LC_LABEL_CHECK}</span></th>\r
-        <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>\r
+        <th><span {_HELP_MENUDEF_LIST_NAME}>{_LC_LABEL_NAME}</span></th>\r
            <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_ACT}>{_LC_LABEL_OPERATION}</span></th>\r
@@ -223,7 +223,7 @@ $(function(){
     <thead>\r
     <tr>\r
         <th class="select"><span {_HELP_MENUDEF_CHECK}>{_LC_LABEL_CHECK}</span></th>\r
-        <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>\r
+        <th><span {_HELP_MENUDEF_LIST_NAME}>{_LC_LABEL_NAME}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_LANG}>{_LC_LABEL_LANG}</span></th>\r
            <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>\r

diff --git a/widgets/admin_main/include/template/menudef_detail.tmpl.html b/widgets/admin_main/include/template/menudef_detail.tmpl.html
index c8d8e43..73e6f5d 100644 (file)
--- a/widgets/admin_main/include/template/menudef_detail.tmpl.html
+++ b/widgets/admin_main/include/template/menudef_detail.tmpl.html
@@ -121,7 +121,7 @@ $(function(){
     <tbody>
     <tr>
            <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>
-           <td colspan="3">
+           <td>
                <div class="col-sm-4 m3config_item">
            <select name="item_sel_menuid" class="form-control" onchange="selectMenu();">
                <option value="0" {SELECTED}>-- {_LC_LABEL_NEW} --</option>
@@ -140,28 +140,33 @@ $(function(){
            </td>
        </tr>
     <tr>
-           <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span><div class="pull-right">{CREATE_URL_BUTTON}</div></th>
-           <td colspan="3">
-               <!--<div class="input-group col-sm-12">-->
-                   <input type="text" id="item_url" name="item_url" class="form-control" value="{URL}" readonly />
-                   <!--<span class="input-group-btn">
-                   <a class="btn btn-default" onclick="previewInOtherWindow();return false;" rel="m3help" title="{PREVIEW_STR}"><i class="glyphicon glyphicon-new-window"></i></a>
-                   </span>-->
-               <!--</div>-->
-           </td>
-       </tr>
-    <tr class="option_area" style="display:none;">
            <th><span {_HELP_MENUDEF_ITEM_TYPE}>{_LC_LABEL_ITEM_TYPE}</span></th>
-           <td style="width:200px;">
+           <td>
+               <div class="col-sm-4 m3config_item">
            <select name="item_type" class="form-control">
                 <patTemplate:tmpl name="item_type_list">
                 <option value="{VALUE}" {SELECTED}>{NAME}</option>
                 </patTemplate:tmpl>
            </select>
+               </div>
+           </td>
+       </tr>
+    <tr>
+           <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span><div class="pull-right">{CREATE_URL_BUTTON}</div></th>
+           <td>
+                   <input type="text" id="item_url" name="item_url" class="form-control" value="{URL}" readonly />
            </td>
+       </tr>
+    <tr class="option_area" style="display:none;">
+           <th><span {_HELP_MENUDEF_VISIBLE}>{_LC_LABEL_ITEM_VISIBLE}</span></th>
+           <td><div class="checkbox"><label><input type="checkbox" name="item_visible" {SEL_ITEM_VISIBLE} />{_LC_LABEL_VISIBLE}</label></div>
+               <div class="checkbox"><label><input type="checkbox" name="item_user_limited" {USER_LIMITED_CHECKED} />{_LC_MSG_USER_LIMITED}</label></div>
+               <div class="checkbox"><label><input type="checkbox" name="item_link_content" {LINK_CONTENT} />{_LC_MSG_LINK_TO_CONTENT}</label></div></td>
+       </tr>
+    <tr class="option_area" style="display:none;">
            <th><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>
            <td>
-               <div class="col-sm-6 m3config_item">
+               <div class="col-sm-4 m3config_item">
            <select name="item_link_type" class="form-control">
                <option value="0" {LINK_TYPE_0}>{_LC_LABEL_LINK_SELF}</option>
                    <option value="1" {LINK_TYPE_1}>{_LC_LABEL_LINK_OTHER}</option>
@@ -170,18 +175,8 @@ $(function(){
            </td>
        </tr>
     <tr class="option_area" style="display:none;">
-           <th><span {_HELP_MENUDEF_VISIBLE}>{_LC_LABEL_ITEM_VISIBLE}</span></th>
-           <td colspan="3"><div class="checkbox"><label><input type="checkbox" name="item_visible" {SEL_ITEM_VISIBLE} />{_LC_LABEL_VISIBLE}</label></div>
-               <div class="checkbox"><label><input type="checkbox" name="item_user_limited" {USER_LIMITED_CHECKED} />{_LC_MSG_USER_LIMITED}</label></div>
-               <div class="checkbox"><label><input type="checkbox" name="item_link_content" {LINK_CONTENT} />{_LC_MSG_LINK_TO_CONTENT}</label></div></td>
-       </tr>
-        <!--<tr>
-           <th><span {_HELP_MENUDEF_DESC}>{_LC_LABEL_DESC}</span></th>
-           <td colspan="3"><input type="text" name="item_desc" value="{DESC}" size="100" maxlength="100" /></td>
-       </tr>-->
-    <tr class="option_area" style="display:none;">
            <th><span {_HELP_MENUDEF_TITLE}>{_LC_LABEL_TITLE}</span></th>
-           <td colspan="3">
+           <td>
                <div class="col-sm-11 m3config_item"><input type="text" name="item_title" class="form-control" value="{TITLE}" maxlength="300" /></div><div class="col-sm-1 m3config_item form-control-static">{LANG}</div>
            <patTemplate:tmpl name="input_title" visibility="hidden">
            <div class="col-sm-11 m3config_item"><input type="text" name="item_title_{ID}" class="form-control" value="{VALUE}" maxlength="300" /></div><div class="col-sm-1 m3config_item form-control-static">{LANG}</div>
@@ -189,7 +184,7 @@ $(function(){
                </td>
        </tr>
        <tr>
-           <td colspan="4"><div class="pull-left">{OPEN_BUTTON}{CLOSE_BUTTON}</div></td>
+           <td colspan="2"><div class="pull-left">{OPEN_BUTTON}{CLOSE_BUTTON}</div></td>
        </tr>
     </tbody>
 </table>

diff --git a/widgets/admin_main/include/template/smenudef.tmpl.html b/widgets/admin_main/include/template/smenudef.tmpl.html
index 7126afc..aa98147 100644 (file)
--- a/widgets/admin_main/include/template/smenudef.tmpl.html
+++ b/widgets/admin_main/include/template/smenudef.tmpl.html
@@ -126,7 +126,7 @@ $(function(){
     <thead>\r
     <tr>\r
         <th style="width:50px;"><span {_HELP_MENUDEF_CHECK}>{_LC_LABEL_CHECK}</span></th>\r
-        <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>\r
+        <th><span {_HELP_MENUDEF_LIST_NAME}>{_LC_LABEL_NAME}</span></th>\r
            <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_ACT}>{_LC_LABEL_OPERATION}</span></th>\r
@@ -151,7 +151,7 @@ $(function(){
     <thead>\r
     <tr>\r
         <th style="width:50px;"><span {_HELP_MENUDEF_CHECK}>{_LC_LABEL_CHECK}</span></th>\r
-        <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>\r
+        <th><span {_HELP_MENUDEF_LIST_NAME}>{_LC_LABEL_NAME}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_LANG}>{_LC_LABEL_LANG}</span></th>\r
            <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span></th>\r
            <th style="width:50px;"><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>\r

diff --git a/widgets/admin_main/include/template/smenudef_detail.tmpl.html b/widgets/admin_main/include/template/smenudef_detail.tmpl.html
index 4f7331f..a277535 100644 (file)
--- a/widgets/admin_main/include/template/smenudef_detail.tmpl.html
+++ b/widgets/admin_main/include/template/smenudef_detail.tmpl.html
@@ -120,7 +120,7 @@ $(function(){
     <tbody>
     <tr>
            <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>
-           <td colspan="3">
+           <td>
                <div class="col-sm-4 m3config_item">
            <select name="item_sel_menuid" class="form-control" onchange="selectMenu();">
                <option value="0" {SELECTED}>-- {_LC_LABEL_NEW} --</option>
@@ -139,28 +139,33 @@ $(function(){
            </td>
        </tr>
     <tr>
-           <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span><div class="pull-right">{CREATE_URL_BUTTON}</div></th>
-           <td colspan="3">
-               <!--<div class="input-group col-sm-12">-->
-                   <input type="text" id="item_url" name="item_url" class="form-control" value="{URL}" readonly />
-                   <!--<span class="input-group-btn">
-                   <a class="btn btn-default" onclick="previewInOtherWindow();return false;" rel="m3help" title="{PREVIEW_STR}"><i class="glyphicon glyphicon-new-window"></i></a>
-                   </span>-->
-               <!--</div>-->
-           </td>
-       </tr>
-    <tr class="option_area" style="display:none;">
            <th><span {_HELP_MENUDEF_ITEM_TYPE}>{_LC_LABEL_ITEM_TYPE}</span></th>
-           <td style="width:200px;">
+           <td>
+               <div class="col-sm-4 m3config_item">
            <select name="item_type" class="form-control">
                 <patTemplate:tmpl name="item_type_list">
                 <option value="{VALUE}" {SELECTED}>{NAME}</option>
                 </patTemplate:tmpl>
            </select>
+               </div>
+           </td>
+       </tr>
+    <tr>
+           <th><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span><div class="pull-right">{CREATE_URL_BUTTON}</div></th>
+           <td>
+                   <input type="text" id="item_url" name="item_url" class="form-control" value="{URL}" readonly />
            </td>
+       </tr>
+    <tr class="option_area" style="display:none;">
+           <th><span {_HELP_MENUDEF_VISIBLE}>{_LC_LABEL_ITEM_VISIBLE}</span></th>
+           <td><div class="checkbox"><label><input type="checkbox" name="item_visible" {SEL_ITEM_VISIBLE} />{_LC_LABEL_VISIBLE}</label></div>
+               <div class="checkbox"><label><input type="checkbox" name="item_user_limited" {USER_LIMITED_CHECKED} />{_LC_MSG_USER_LIMITED}</label></div>
+               <div class="checkbox"><label><input type="checkbox" name="item_link_content" {LINK_CONTENT} />{_LC_MSG_LINK_TO_CONTENT}</label></div></td>
+       </tr>
+    <tr class="option_area" style="display:none;">
            <th><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>
            <td>
-               <div class="col-sm-6 m3config_item">
+               <div class="col-sm-4 m3config_item">
            <select name="item_link_type" class="form-control">
                <option value="0" {LINK_TYPE_0}>{_LC_LABEL_LINK_SELF}</option>
                    <option value="1" {LINK_TYPE_1}>{_LC_LABEL_LINK_OTHER}</option>
@@ -169,18 +174,8 @@ $(function(){
            </td>
        </tr>
     <tr class="option_area" style="display:none;">
-           <th><span {_HELP_MENUDEF_VISIBLE}>{_LC_LABEL_ITEM_VISIBLE}</span></th>
-           <td colspan="3"><div class="checkbox"><label><input type="checkbox" name="item_visible" {SEL_ITEM_VISIBLE} />{_LC_LABEL_VISIBLE}</label></div>
-               <div class="checkbox"><label><input type="checkbox" name="item_user_limited" {USER_LIMITED_CHECKED} />{_LC_MSG_USER_LIMITED}</label></div>
-               <div class="checkbox"><label><input type="checkbox" name="item_link_content" {LINK_CONTENT} />{_LC_MSG_LINK_TO_CONTENT}</label></div></td>
-       </tr>
-        <!--<tr>
-           <th><span {_HELP_MENUDEF_DESC}>{_LC_LABEL_DESC}</span></th>
-           <td colspan="3"><input type="text" name="item_desc" value="{DESC}" size="100" maxlength="100" /></td>
-       </tr>-->
-    <tr class="option_area" style="display:none;">
            <th><span {_HELP_MENUDEF_TITLE}>{_LC_LABEL_TITLE}</span></th>
-           <td colspan="3">
+           <td>
                <div class="col-sm-11 m3config_item"><input type="text" name="item_title" class="form-control" value="{TITLE}" maxlength="300" /></div><div class="col-sm-1 m3config_item form-control-static">{LANG}</div>
            <patTemplate:tmpl name="input_title" visibility="hidden">
            <div class="col-sm-11 m3config_item"><input type="text" name="item_title_{ID}" class="form-control" value="{VALUE}" maxlength="300" /></div><div class="col-sm-1 m3config_item form-control-static">{LANG}</div>
@@ -188,7 +183,7 @@ $(function(){
                </td>
        </tr>
        <tr>
-           <td colspan="4"><div class="pull-left">{OPEN_BUTTON}{CLOSE_BUTTON}</div></td>
+           <td colspan="2"><div class="pull-left">{OPEN_BUTTON}{CLOSE_BUTTON}</div></td>
        </tr>
     </tbody>
 </table>