メニュー定義管理画面更新。

diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css
index d44b8be..1dc4910 100644 (file)
--- a/templates/_admin4/css/style.css
+++ b/templates/_admin4/css/style.css
@@ -678,7 +678,9 @@ i[rel="m3help"] { cursor: default; }
 /* Hタグ右ボタン */
 .m3config_h_side_buttons {
        display:inline-block;
-       padding-top:10px;
+/*     padding-top:10px;*/
+       margin-top:10px;
+       margin-bottom:10px;
 }
 /* fix item width */
 .m3config_item {

diff --git a/widgets/admin_main/include/container/admin_mainSmenudefWidgetContainer.php b/widgets/admin_main/include/container/admin_mainSmenudefWidgetContainer.php
index 6054000..8e8b1f1 100644 (file)
--- a/widgets/admin_main/include/container/admin_mainSmenudefWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainSmenudefWidgetContainer.php
@@ -32,6 +32,7 @@ class admin_mainSmenudefWidgetContainer extends admin_mainBaseWidgetContainer
        private $availableLangArray;    // 利用可能な言語
        const BREADCRUMB_TITLE = 'メニュー管理(単階層)';               // 画面タイトル名(パンくずリスト)
        const MAIN_MENU_ID = 'main_menu';                       // メインメニューID
+       const CREATE_URL_TAG_ID = 'createurl';                  // URL作成ボタンタグID
        const WIDGET_TYPE_MENU = 'menu';                // メニュー型のウィジェット(キャッシュクリア用)
        const CONTENT_TYPE_PC = '';                     // 汎用コンテンツのコンテンツタイプ(PC用)
        const CONTENT_TYPE_MOBILE = 'mobile';                   // 汎用コンテンツのコンテンツタイプ(携帯用)
@@ -536,6 +537,12 @@ class admin_mainSmenudefWidgetContainer extends admin_mainBaseWidgetContainer
                                $this->tmpl->addVar("_widget", "link_type_1", 'selected');
                                break;
                }
+               
+               // リンク先URL作成ボタン
+               $createUrlButton = $this->gDesign->createEditButton(''/*同画面*/, $this->_('Create URL'), self::CREATE_URL_TAG_ID);
+               $this->tmpl->addVar("_widget", "create_url_button", $createUrlButton);
+               $this->tmpl->addVar("_widget", "tagid_create_url", self::CREATE_URL_TAG_ID);            // URL作成タグ
+               
                // 項目表示、項目利用可否チェックボックス
                $this->tmpl->addVar("_widget", "sel_item_visible", $this->convertToCheckedString($visible));
                $this->tmpl->addVar("_widget", "user_limited_checked", $this->convertToCheckedString($userLimited));            // ユーザ制限するかどうか

diff --git a/widgets/admin_main/include/help/help_menudef.php b/widgets/admin_main/include/help/help_menudef.php
index 0e62b78..19dfa9f 100644 (file)
--- a/widgets/admin_main/include/help/help_menudef.php
+++ b/widgets/admin_main/include/help/help_menudef.php
@@ -41,7 +41,7 @@ class help_menudef extends HelpConv
                        ),
                        '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 the URL to link.')           // メニュー項目の名前です。「タイトル取得」ボタンを押すと、リンク先URLのコンテンツのタイトルを取得できます。
+                               '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のコンテンツのタイトルを取得できます。
                        ),
                        '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 706669c..325d393 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 3d0e86f..cefeb5d 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: 2014-12-06 13:06+0900\n"
-"PO-Revision-Date: 2014-12-06 13:06+0900\n"
+"POT-Creation-Date: 2014-12-09 11:17+0900\n"
+"PO-Revision-Date: 2014-12-09 11:17+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -83,7 +83,7 @@ msgid "Invalid view term."
 msgstr "表示期間が不正です"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:526
-#: ../container/admin_mainConfigsiteWidgetContainer.php:213
+#: ../container/admin_mainConfigsiteWidgetContainer.php:212
 msgid "Update config?"
 msgstr "設定を更新しますか?"
 
@@ -94,18 +94,18 @@ msgstr "ウィジェットタイトル、位置調整"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:531
 #: ../container/admin_mainEditmenuWidgetContainer.php:56
-#: ../container/admin_mainMenudefWidgetContainer.php:170
-#: ../container/admin_mainSmenudefWidgetContainer.php:163
+#: ../container/admin_mainMenudefWidgetContainer.php:172
+#: ../container/admin_mainSmenudefWidgetContainer.php:165
 #: ../help/help_menudef.php:79
 msgid "Title"
 msgstr "タイトル"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:532
-#: ../container/admin_mainMenudefWidgetContainer.php:169
-#: ../container/admin_mainMenudefWidgetContainer.php:194
+#: ../container/admin_mainMenudefWidgetContainer.php:171
+#: ../container/admin_mainMenudefWidgetContainer.php:196
 #: ../container/admin_mainPagedefWidgetContainer.php:162
-#: ../container/admin_mainSmenudefWidgetContainer.php:162
-#: ../container/admin_mainSmenudefWidgetContainer.php:186
+#: ../container/admin_mainSmenudefWidgetContainer.php:164
+#: ../container/admin_mainSmenudefWidgetContainer.php:188
 #: ../help/help_menudef.php:63 ../help/help_pagedef.php:87
 msgid "Visible"
 msgstr "表示"
@@ -236,13 +236,13 @@ msgid "Additional CSS Class"
 msgstr "追加CSSクラス"
 
 #: ../container/admin_mainAdjustwidgetWidgetContainer.php:562
-#: ../container/admin_mainConfigsiteWidgetContainer.php:228
+#: ../container/admin_mainConfigsiteWidgetContainer.php:227
 #: ../container/admin_mainEditmenuWidgetContainer.php:184
 #: ../container/admin_mainEditmenuWidgetContainer.php:202
-#: ../container/admin_mainMenudefWidgetContainer.php:175
+#: ../container/admin_mainMenudefWidgetContainer.php:177
 #: ../container/admin_mainOpelogWidgetContainer.php:193
 #: ../container/admin_mainPagedefWidgetContainer.php:496
-#: ../container/admin_mainSmenudefWidgetContainer.php:168
+#: ../container/admin_mainSmenudefWidgetContainer.php:170
 #: ../container/admin_mainTemplistWidgetContainer.php:573
 #: ../container/admin_mainUserlistWidgetContainer.php:139
 #: ../container/admin_mainWidgetlistWidgetContainer.php:943
@@ -305,74 +305,73 @@ msgid "Failed in sending email. To:"
 msgstr "メール送信に失敗しました。メールアドレス:"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:184
-#: ../container/admin_mainConfigsiteWidgetContainer.php:185
 msgid "Change logo"
 msgstr "ロゴを変更"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:214
+#: ../container/admin_mainConfigsiteWidgetContainer.php:213
 msgid "Send test email to default email address?"
 msgstr "デフォルトメールアドレス宛にテストメールを送信しますか?"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:215
+#: ../container/admin_mainConfigsiteWidgetContainer.php:214
 #: ../container/admin_mainEditmenuWidgetContainer.php:88
 #: ../container/admin_mainPortalWidgetContainer.php:252
 #: ../help/help_configsite.php:31 ../help/help_portal.php:35
 msgid "Site Information"
 msgstr "サイト情報"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:216
+#: ../container/admin_mainConfigsiteWidgetContainer.php:215
 #: ../container/admin_mainPortalWidgetContainer.php:168
 #: ../container/admin_mainPortalWidgetContainer.php:253
 #: ../help/help_configsite.php:35 ../help/help_portal.php:39
 msgid "Site Name"
 msgstr "サイト名"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:217
+#: ../container/admin_mainConfigsiteWidgetContainer.php:216
 msgid "Required"
 msgstr "必須"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:218
+#: ../container/admin_mainConfigsiteWidgetContainer.php:217
 #: ../help/help_configsite.php:39
 msgid "Site Email"
 msgstr "メールアドレス"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:219
+#: ../container/admin_mainConfigsiteWidgetContainer.php:218
 msgid "Send Test Email"
 msgstr "テストメール送信"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:220
+#: ../container/admin_mainConfigsiteWidgetContainer.php:219
 #: ../help/help_configsite.php:43
 msgid "Site Slogan"
 msgstr "サイトスローガン"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:221
+#: ../container/admin_mainConfigsiteWidgetContainer.php:220
 #: ../help/help_configsite.php:47
 msgid "Site Copyright"
 msgstr "サイト著作権"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:222
+#: ../container/admin_mainConfigsiteWidgetContainer.php:221
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:223
+#: ../container/admin_mainConfigsiteWidgetContainer.php:222
 msgid "Page Header Info (Default)"
 msgstr "ページヘッダ情報(デフォルト値)"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:224
+#: ../container/admin_mainConfigsiteWidgetContainer.php:223
 msgid "Header Tilte"
 msgstr "タイトル名"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:225
+#: ../container/admin_mainConfigsiteWidgetContainer.php:224
 #: ../help/help_configsite.php:63
 msgid "Site Description"
 msgstr "サイト説明"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:226
+#: ../container/admin_mainConfigsiteWidgetContainer.php:225
 #: ../help/help_configsite.php:67
 msgid "Header Keywords"
 msgstr "検索キーワード"
 
-#: ../container/admin_mainConfigsiteWidgetContainer.php:227
+#: ../container/admin_mainConfigsiteWidgetContainer.php:226
 #: ../help/help_configsite.php:71
 msgid "Header Others (by Tag Style)"
 msgstr "その他(タグ形式)"
@@ -704,10 +703,10 @@ msgstr "管理メニューその他"
 
 #: ../container/admin_mainEditmenuWidgetContainer.php:181
 #: ../container/admin_mainLoginstatusWidgetContainer.php:149
-#: ../container/admin_mainMenudefWidgetContainer.php:157
+#: ../container/admin_mainMenudefWidgetContainer.php:159
 #: ../container/admin_mainOpelogWidgetContainer.php:185
 #: ../container/admin_mainPagedefWidgetContainer.php:156
-#: ../container/admin_mainSmenudefWidgetContainer.php:150
+#: ../container/admin_mainSmenudefWidgetContainer.php:152
 #: ../container/admin_mainUserlistWidgetContainer.php:137
 msgid "Go back"
 msgstr "戻る"
@@ -750,14 +749,14 @@ msgstr "未設定"
 
 #: ../container/admin_mainEditmenuWidgetContainer.php:195
 #: ../container/admin_mainEditmenuWidgetContainer.php:586
-#: ../container/admin_mainMenudefWidgetContainer.php:158
-#: ../container/admin_mainMenudefWidgetContainer.php:190
-#: ../container/admin_mainMenudefWidgetContainer.php:430
-#: ../container/admin_mainMenudefWidgetContainer.php:473
-#: ../container/admin_mainSmenudefWidgetContainer.php:151
-#: ../container/admin_mainSmenudefWidgetContainer.php:182
-#: ../container/admin_mainSmenudefWidgetContainer.php:366
-#: ../container/admin_mainSmenudefWidgetContainer.php:409
+#: ../container/admin_mainMenudefWidgetContainer.php:160
+#: ../container/admin_mainMenudefWidgetContainer.php:192
+#: ../container/admin_mainMenudefWidgetContainer.php:432
+#: ../container/admin_mainMenudefWidgetContainer.php:475
+#: ../container/admin_mainSmenudefWidgetContainer.php:153
+#: ../container/admin_mainSmenudefWidgetContainer.php:184
+#: ../container/admin_mainSmenudefWidgetContainer.php:368
+#: ../container/admin_mainSmenudefWidgetContainer.php:411
 #: ../container/admin_mainTemplistWidgetContainer.php:459
 #: ../container/admin_mainUserlistWidgetContainer.php:122
 #: ../container/admin_mainUserlistWidgetContainer.php:150
@@ -775,10 +774,10 @@ msgstr "オプション"
 
 #: ../container/admin_mainEditmenuWidgetContainer.php:197
 #: ../container/admin_mainEditmenuWidgetContainer.php:588
-#: ../container/admin_mainMenudefWidgetContainer.php:173
+#: ../container/admin_mainMenudefWidgetContainer.php:175
 #: ../container/admin_mainPortalWidgetContainer.php:101
 #: ../container/admin_mainPortalWidgetContainer.php:254
-#: ../container/admin_mainSmenudefWidgetContainer.php:166
+#: ../container/admin_mainSmenudefWidgetContainer.php:168
 #: ../help/help_menudef.php:75
 msgid "Description"
 msgstr "説明"
@@ -882,16 +881,16 @@ msgid "Create directory?"
 msgstr "ディレクトリを作成しますか?"
 
 #: ../container/admin_mainFilebrowseWidgetContainer.php:198
-#: ../container/admin_mainMenudefWidgetContainer.php:185
+#: ../container/admin_mainMenudefWidgetContainer.php:187
 msgid "Path:"
 msgstr "パス："
 
 #: ../container/admin_mainFilebrowseWidgetContainer.php:199
-#: ../container/admin_mainMenudefWidgetContainer.php:174
-#: ../container/admin_mainMenudefWidgetContainer.php:188
+#: ../container/admin_mainMenudefWidgetContainer.php:176
+#: ../container/admin_mainMenudefWidgetContainer.php:190
 #: ../container/admin_mainPagedefWidgetContainer.php:497
-#: ../container/admin_mainSmenudefWidgetContainer.php:167
-#: ../container/admin_mainSmenudefWidgetContainer.php:180
+#: ../container/admin_mainSmenudefWidgetContainer.php:169
+#: ../container/admin_mainSmenudefWidgetContainer.php:182
 #: ../container/admin_mainTemplistWidgetContainer.php:574
 #: ../container/admin_mainUserlistWidgetContainer.php:138
 #: ../container/admin_mainUserlistWidgetContainer.php:161
@@ -900,9 +899,9 @@ msgid "Delete"
 msgstr "削除"
 
 #: ../container/admin_mainFilebrowseWidgetContainer.php:200
-#: ../container/admin_mainMenudefWidgetContainer.php:189
+#: ../container/admin_mainMenudefWidgetContainer.php:191
 #: ../container/admin_mainOpelogWidgetContainer.php:205
-#: ../container/admin_mainSmenudefWidgetContainer.php:181
+#: ../container/admin_mainSmenudefWidgetContainer.php:183
 #: ../container/admin_mainUserlistWidgetContainer.php:149
 msgid "Select"
 msgstr "選択"
@@ -1048,159 +1047,160 @@ msgid "Out of Range"
 msgstr "該当なし"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:70
-#: ../container/admin_mainMenudefWidgetContainer.php:757
+#: ../container/admin_mainMenudefWidgetContainer.php:759
 #: ../container/admin_mainSmenudefWidgetContainer.php:62
 msgid "Link"
 msgstr "リンク"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:71
-#: ../container/admin_mainMenudefWidgetContainer.php:761
+#: ../container/admin_mainMenudefWidgetContainer.php:763
 #: ../container/admin_mainSmenudefWidgetContainer.php:63
 msgid "Folder"
 msgstr "フォルダ"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:72
-#: ../container/admin_mainMenudefWidgetContainer.php:765
+#: ../container/admin_mainMenudefWidgetContainer.php:767
 #: ../container/admin_mainSmenudefWidgetContainer.php:64
 msgid "Text"
 msgstr "テキスト"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:73
-#: ../container/admin_mainMenudefWidgetContainer.php:769
+#: ../container/admin_mainMenudefWidgetContainer.php:771
 #: ../container/admin_mainSmenudefWidgetContainer.php:65
 msgid "Separator"
 msgstr "セパレータ"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:153
-#: ../container/admin_mainSmenudefWidgetContainer.php:146
+#: ../container/admin_mainMenudefWidgetContainer.php:155
+#: ../container/admin_mainSmenudefWidgetContainer.php:148
 msgid "Add menu item?"
 msgstr "項目を新規追加しますか?"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:154
-#: ../container/admin_mainSmenudefWidgetContainer.php:147
+#: ../container/admin_mainMenudefWidgetContainer.php:156
+#: ../container/admin_mainSmenudefWidgetContainer.php:149
 msgid "Update menu item?"
 msgstr "項目を更新しますか?"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:155
-#: ../container/admin_mainSmenudefWidgetContainer.php:148
+#: ../container/admin_mainMenudefWidgetContainer.php:157
+#: ../container/admin_mainSmenudefWidgetContainer.php:150
 msgid "Delete menu item?"
 msgstr "項目を削除しますか?"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:156
-#: ../container/admin_mainSmenudefWidgetContainer.php:149
+#: ../container/admin_mainMenudefWidgetContainer.php:158
+#: ../container/admin_mainSmenudefWidgetContainer.php:151
 #: ../help/help_menudef.php:35
 msgid "Menu Item Detail"
 msgstr "メニュー項目詳細"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:159
-#: ../container/admin_mainMenudefWidgetContainer.php:191
-#: ../container/admin_mainSmenudefWidgetContainer.php:152
-#: ../container/admin_mainSmenudefWidgetContainer.php:183
+#: ../container/admin_mainMenudefWidgetContainer.php:161
+#: ../container/admin_mainMenudefWidgetContainer.php:193
+#: ../container/admin_mainSmenudefWidgetContainer.php:154
+#: ../container/admin_mainSmenudefWidgetContainer.php:185
 #: ../help/help_menudef.php:47
 msgid "Language"
 msgstr "言語"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:160
-#: ../container/admin_mainMenudefWidgetContainer.php:186
-#: ../container/admin_mainSmenudefWidgetContainer.php:153
-#: ../container/admin_mainSmenudefWidgetContainer.php:178
+#: ../container/admin_mainMenudefWidgetContainer.php:162
+#: ../container/admin_mainMenudefWidgetContainer.php:188
+#: ../container/admin_mainSmenudefWidgetContainer.php:155
+#: ../container/admin_mainSmenudefWidgetContainer.php:180
 #: ../container/admin_mainUserlistWidgetContainer.php:159
 msgid "New"
 msgstr "新規"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:161
-#: ../container/admin_mainSmenudefWidgetContainer.php:154
+#: ../container/admin_mainMenudefWidgetContainer.php:163
+#: ../container/admin_mainSmenudefWidgetContainer.php:156
 msgid "Get Title"
 msgstr "タイトル取得"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:162
-#: ../container/admin_mainSmenudefWidgetContainer.php:155
+#: ../container/admin_mainMenudefWidgetContainer.php:164
+#: ../container/admin_mainSmenudefWidgetContainer.php:157
 msgid "Item Type"
 msgstr "項目タイプ"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:163
-#: ../container/admin_mainMenudefWidgetContainer.php:193
-#: ../container/admin_mainSmenudefWidgetContainer.php:156
-#: ../container/admin_mainSmenudefWidgetContainer.php:185
+#: ../container/admin_mainMenudefWidgetContainer.php:165
+#: ../container/admin_mainMenudefWidgetContainer.php:195
+#: ../container/admin_mainSmenudefWidgetContainer.php:158
+#: ../container/admin_mainSmenudefWidgetContainer.php:187
 #: ../help/help_menudef.php:59
 msgid "Action"
 msgstr "動作"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:164
-#: ../container/admin_mainSmenudefWidgetContainer.php:157
+#: ../container/admin_mainMenudefWidgetContainer.php:166
+#: ../container/admin_mainSmenudefWidgetContainer.php:159
 msgid "Open page in the same window"
 msgstr "同ウィンドウで表示"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:165
-#: ../container/admin_mainSmenudefWidgetContainer.php:158
+#: ../container/admin_mainMenudefWidgetContainer.php:167
+#: ../container/admin_mainSmenudefWidgetContainer.php:160
 msgid "Open page in the other window"
 msgstr "別ウィンドウで表示"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:166
-#: ../container/admin_mainMenudefWidgetContainer.php:192
-#: ../container/admin_mainSmenudefWidgetContainer.php:159
-#: ../container/admin_mainSmenudefWidgetContainer.php:184
+#: ../container/admin_mainMenudefWidgetContainer.php:168
+#: ../container/admin_mainMenudefWidgetContainer.php:194
+#: ../container/admin_mainSmenudefWidgetContainer.php:161
+#: ../container/admin_mainSmenudefWidgetContainer.php:186
 msgid "Link URL"
 msgstr "リンク先URL"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:167
-#: ../container/admin_mainSmenudefWidgetContainer.php:160
+#: ../container/admin_mainMenudefWidgetContainer.php:169
+#: ../container/admin_mainSmenudefWidgetContainer.php:162
+#: ../container/admin_mainSmenudefWidgetContainer.php:542
 msgid "Create URL"
 msgstr "URL作成"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:168
-#: ../container/admin_mainSmenudefWidgetContainer.php:161
+#: ../container/admin_mainMenudefWidgetContainer.php:170
+#: ../container/admin_mainSmenudefWidgetContainer.php:163
 msgid "Item Control"
 msgstr "表示制御"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:171
-#: ../container/admin_mainSmenudefWidgetContainer.php:164
+#: ../container/admin_mainMenudefWidgetContainer.php:173
+#: ../container/admin_mainSmenudefWidgetContainer.php:166
 msgid "Limit user"
 msgstr "ユーザ制限"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:172
-#: ../container/admin_mainSmenudefWidgetContainer.php:165
+#: ../container/admin_mainMenudefWidgetContainer.php:174
+#: ../container/admin_mainSmenudefWidgetContainer.php:167
 msgid "Cotrol visible status linked to contents."
 msgstr "リンク先のコンテンツに連動"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:176
-#: ../container/admin_mainSmenudefWidgetContainer.php:169
+#: ../container/admin_mainMenudefWidgetContainer.php:178
+#: ../container/admin_mainSmenudefWidgetContainer.php:171
 #: ../container/admin_mainUserlistWidgetContainer.php:140
 msgid "Add"
 msgstr "新規追加"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:181
-#: ../container/admin_mainSmenudefWidgetContainer.php:174
+#: ../container/admin_mainMenudefWidgetContainer.php:183
+#: ../container/admin_mainSmenudefWidgetContainer.php:176
 msgid "Select menu item to edit."
 msgstr "編集する項目を選択してください"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:182
-#: ../container/admin_mainSmenudefWidgetContainer.php:175
+#: ../container/admin_mainMenudefWidgetContainer.php:184
+#: ../container/admin_mainSmenudefWidgetContainer.php:177
 msgid "Select menu item to delete."
 msgstr "削除する項目を選択してください"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:183
+#: ../container/admin_mainMenudefWidgetContainer.php:185
 #: ../container/admin_mainOpelogWidgetContainer.php:200
-#: ../container/admin_mainSmenudefWidgetContainer.php:176
+#: ../container/admin_mainSmenudefWidgetContainer.php:178
 #: ../container/admin_mainUserlistWidgetContainer.php:147
 msgid "Delete selected item?"
 msgstr "選択項目を削除しますか?"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:184
-#: ../container/admin_mainSmenudefWidgetContainer.php:177
+#: ../container/admin_mainMenudefWidgetContainer.php:186
+#: ../container/admin_mainSmenudefWidgetContainer.php:179
 msgid "Menu Item List"
 msgstr "メニュー項目一覧"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:187
+#: ../container/admin_mainMenudefWidgetContainer.php:189
 #: ../container/admin_mainOpelogWidgetContainer.php:204
-#: ../container/admin_mainSmenudefWidgetContainer.php:179
+#: ../container/admin_mainSmenudefWidgetContainer.php:181
 #: ../container/admin_mainUserlistWidgetContainer.php:160
 msgid "Edit"
 msgstr "編集"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:195
+#: ../container/admin_mainMenudefWidgetContainer.php:197
 #: ../container/admin_mainPagedefWidgetContainer.php:164
-#: ../container/admin_mainSmenudefWidgetContainer.php:187
+#: ../container/admin_mainSmenudefWidgetContainer.php:189
 #: ../container/admin_mainTemplistWidgetContainer.php:464
 #: ../container/admin_mainWidgetlistWidgetContainer.php:646
 #: ../help/help_menudef.php:67 ../help/help_templist.php:59
@@ -1208,83 +1208,83 @@ msgstr "編集"
 msgid "Operation"
 msgstr "操作"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:196
-#: ../container/admin_mainSmenudefWidgetContainer.php:188
+#: ../container/admin_mainMenudefWidgetContainer.php:198
+#: ../container/admin_mainSmenudefWidgetContainer.php:190
 msgid "Menu Layout"
 msgstr "メニューレイアウト"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:197
-#: ../container/admin_mainSmenudefWidgetContainer.php:189
+#: ../container/admin_mainMenudefWidgetContainer.php:199
+#: ../container/admin_mainSmenudefWidgetContainer.php:191
 msgid "Menu items can be sorted by mouse drag and drop."
 msgstr "マウスドラッグで項目の表示順を変更できます"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:198
+#: ../container/admin_mainMenudefWidgetContainer.php:200
 msgid "Menu Top"
 msgstr "メニュートップ"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:199
+#: ../container/admin_mainMenudefWidgetContainer.php:201
 msgid "Open All"
 msgstr "すべて開く"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:200
+#: ../container/admin_mainMenudefWidgetContainer.php:202
 msgid "Close All"
 msgstr "すべて閉じる"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:263
+#: ../container/admin_mainMenudefWidgetContainer.php:265
 msgid "You are not allowed to delete menu item with child item."
 msgstr "子項目を持つメニュー項目は削除できません。"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:274
-#: ../container/admin_mainMenudefWidgetContainer.php:517
-#: ../container/admin_mainSmenudefWidgetContainer.php:261
-#: ../container/admin_mainSmenudefWidgetContainer.php:452
+#: ../container/admin_mainMenudefWidgetContainer.php:276
+#: ../container/admin_mainMenudefWidgetContainer.php:519
+#: ../container/admin_mainSmenudefWidgetContainer.php:263
+#: ../container/admin_mainSmenudefWidgetContainer.php:454
 msgid "Menu item deleted."
 msgstr "データを削除しました"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:277
-#: ../container/admin_mainMenudefWidgetContainer.php:520
-#: ../container/admin_mainSmenudefWidgetContainer.php:264
-#: ../container/admin_mainSmenudefWidgetContainer.php:455
+#: ../container/admin_mainMenudefWidgetContainer.php:279
+#: ../container/admin_mainMenudefWidgetContainer.php:522
+#: ../container/admin_mainSmenudefWidgetContainer.php:266
+#: ../container/admin_mainSmenudefWidgetContainer.php:457
 msgid "Failed in deleting menu item."
 msgstr "データ削除に失敗しました"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:431
-#: ../container/admin_mainSmenudefWidgetContainer.php:367
+#: ../container/admin_mainMenudefWidgetContainer.php:433
+#: ../container/admin_mainSmenudefWidgetContainer.php:369
 msgid "Menu ID"
 msgstr "メニューID"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:461
-#: ../container/admin_mainSmenudefWidgetContainer.php:396
+#: ../container/admin_mainMenudefWidgetContainer.php:463
+#: ../container/admin_mainSmenudefWidgetContainer.php:398
 msgid "Menu item added."
 msgstr "データを追加しました"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:466
-#: ../container/admin_mainSmenudefWidgetContainer.php:402
+#: ../container/admin_mainMenudefWidgetContainer.php:468
+#: ../container/admin_mainSmenudefWidgetContainer.php:404
 msgid "Failed in adding menu item."
 msgstr "データ追加に失敗しました"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:503
-#: ../container/admin_mainSmenudefWidgetContainer.php:438
+#: ../container/admin_mainMenudefWidgetContainer.php:505
+#: ../container/admin_mainSmenudefWidgetContainer.php:440
 msgid "Menu item updated."
 msgstr "データを更新しました"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:508
-#: ../container/admin_mainSmenudefWidgetContainer.php:443
+#: ../container/admin_mainMenudefWidgetContainer.php:510
+#: ../container/admin_mainSmenudefWidgetContainer.php:445
 msgid "Failed in updating menu item."
 msgstr "データ更新に失敗しました"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:786
-#: ../container/admin_mainSmenudefWidgetContainer.php:587
+#: ../container/admin_mainMenudefWidgetContainer.php:788
+#: ../container/admin_mainSmenudefWidgetContainer.php:595
 msgid "Show in self window"
 msgstr "同じウィンドウで表示"
 
-#: ../container/admin_mainMenudefWidgetContainer.php:792
-#: ../container/admin_mainSmenudefWidgetContainer.php:593
+#: ../container/admin_mainMenudefWidgetContainer.php:793
+#: ../container/admin_mainSmenudefWidgetContainer.php:600
 msgid "Show in other window"
 msgstr "別ウィンドウで表示"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:840
-#: ../container/admin_mainSmenudefWidgetContainer.php:646
+#: ../container/admin_mainSmenudefWidgetContainer.php:652
 msgid "Edit Content"
 msgstr "コンテンツを編集"
 
@@ -2360,10 +2360,10 @@ msgstr "編集や削除を行う項目を選択します。"
 #: ../help/help_menudef.php:44
 msgid ""
 "Definition name for menu item.<br />If 'Get Title' button is clicked, it is "
-"replaced with the content title on the URL to link."
+"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ã\83ªã\83³ã\82¯å\85\88URLã\81®ã\82³"
-"ンテンツのタイトルを取得できます。"
+"ã\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ã\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
 msgid "Language for menu item."

diff --git a/widgets/admin_main/include/template/configsite.tmpl.html b/widgets/admin_main/include/template/configsite.tmpl.html
index 7760eee..613357d 100644 (file)
--- a/widgets/admin_main/include/template/configsite.tmpl.html
+++ b/widgets/admin_main/include/template/configsite.tmpl.html
@@ -77,7 +77,7 @@ $(function(){
            <td><input type="text" name="sitecopyright" class="form-control" value="{SITE_COPYRIGHT}" size="60" maxlength="100" style="width:100%;" /></td>\r
        </tr>\r
     <tr>\r
-           <th><span {_HELP_CONFIGSITE_LOGO}>{_LC_LABEL_SITE_LOGO}</span><div class="pull-right" style="v-align:bottom;">{EDIT_LOGO_BUTTON}</div></th>\r
+           <th><span {_HELP_CONFIGSITE_LOGO}>{_LC_LABEL_SITE_LOGO}</span><div class="pull-right">{EDIT_LOGO_BUTTON}</div></th>\r
            <td><img class="pull-left" src="{SITELOGO_URL}" style="width:100px;height:100px;"/></td>\r
        </tr>\r
     </tbody>\r

diff --git a/widgets/admin_main/include/template/smenudef.tmpl.html b/widgets/admin_main/include/template/smenudef.tmpl.html
index c73d049..aa73d32 100644 (file)
--- a/widgets/admin_main/include/template/smenudef.tmpl.html
+++ b/widgets/admin_main/include/template/smenudef.tmpl.html
@@ -107,8 +107,8 @@ $(function(){
 <input type="hidden" name="serial" />\r
 <input type="hidden" name="seriallist" value="{SERIAL_LIST}" />\r
 <input type="hidden" name="menuitems" />\r
-<h3 class="m3config_h" style="margin-bottom:2px;"><span {_HELP_MENUDEF_LIST}>{_LC_LABEL_MENU_ITEM_LIST}</span>\r
-    <select name="menuid" class="form-control" onchange="selectMenu();" {SEL_MENU_ID_DISABLED} style="display:inline-block;width:450px;">\r
+<h3 class="m3config_h" style="margin-bottom:0;"><span {_HELP_MENUDEF_LIST}>{_LC_LABEL_MENU_ITEM_LIST}</span>\r
+    <select name="menuid" class="form-control" onchange="selectMenu();" {SEL_MENU_ID_DISABLED} style="display:inline-block;width:450px;margin-top:-7px;">\r
         <patTemplate:tmpl name="menu_id_list">\r
         <option value="{VALUE}" {SELECTED}>{NAME}</option>\r
         </patTemplate:tmpl>\r

diff --git a/widgets/admin_main/include/template/smenudef_detail.tmpl.html b/widgets/admin_main/include/template/smenudef_detail.tmpl.html
index 8ddabf8..966b7a3 100644 (file)
--- a/widgets/admin_main/include/template/smenudef_detail.tmpl.html
+++ b/widgets/admin_main/include/template/smenudef_detail.tmpl.html
@@ -5,7 +5,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2013 Magic3 Project.
+ * @copyright  Copyright 2006-2014 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
@@ -47,11 +47,12 @@ function previewInOtherWindow()
        m3ShowPreviewWindow({DEVICE_TYPE}, url);
 }
 // URL作成
+/*
 function createUrl()
 {
        var url = $('#item_url').val();
        m3CreateLinkUrl({DEVICE_TYPE}, url, setLinkUrl);
-}
+}*/
 // 作成リンク取得用
 function setLinkUrl(url)
 {
@@ -81,6 +82,9 @@ function getTitle()
        }
 }
 $(function(){
+       // テーブル作成
+       m3SetConfigTable('mainconfig');
+       
        // タイトル取得ボタン制御
        var url = $('#item_url').val();
        if (url == ''){
@@ -89,13 +93,18 @@ $(function(){
                $("#get_title_button").prop('disabled', false);
        }
        
+       // URL作成
+       $("#{TAGID_CREATE_URL}").click(function (){
+               var url = $('#item_url').val();
+               m3CreateLinkUrl({DEVICE_TYPE}, url, setLinkUrl);
+       });
+
        // CKEditorプラグイン直接実行
        m3LoadCKTools();
 });
 //]]>
 </script>
-<div align="center">
-<br />
+<div class="m3config_container">
 <!-- m3:ErrorMessage -->
 <form method="post" name="main">
 <input type="hidden" name="fixed_mode" value="{FIXED_MODE}" />
@@ -103,71 +112,88 @@ $(function(){
 <input type="hidden" name="act" />
 <input type="hidden" name="serial" value="{SERIAL}" />
 <input type="hidden" name="menuid" value="{MENU_ID}" />
-<table>
-<tr><td><span {_HELP_MENUDEF_DETAIL}><label>{_LC_LABEL_MENU_ITEM_DETAIL}</label></span></td>
-<td align="right"><span {_HELP_MENUDEF_RET_BTN}><input type="button" class="button" onclick="cancelItem();" value="{_LC_LABEL_GO_BACK}" /></span>
-</td></tr>
-<tr><td colspan="2">
+<h3 class="m3config_h"><span {_HELP_MENUDEF_DETAIL}>{_LC_LABEL_MENU_ITEM_DETAIL}</span></h3>
+<div class="m3config_h_side_buttons pull-right"><div {_HELP_MENUDEF_BUTTONS2}><div class="btn-group">
+<input type="button" class="button" onclick="cancelItem();" value="{_LC_LABEL_GO_BACK}" />
+</div></div></div>
 
-<table class="simple-table" style="margin:0 auto;width:950px;">
+<table id="mainconfig">
     <tbody>
     <tr>
-           <td class="table-headside" width="150"><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></td>
-           <td width="800" colspan="3">
-           <select name="item_sel_menuid" onchange="selectMenu();">
+           <th><span {_HELP_MENUDEF_NAME}>{_LC_LABEL_NAME}</span></th>
+           <td colspan="3">
+               <div class="col-sm-6 m3config_item form-group">
+           <select name="item_sel_menuid" class="form-control" onchange="selectMenu();">
                <option value="0" {SELECTED}>-- {_LC_LABEL_NEW} --</option>
                 <patTemplate:tmpl name="menuid_list">
                 <option value="{VALUE}" {SELECTED}>{NAME}</option>
                 </patTemplate:tmpl>
            </select>
-           <input type="text" id="item_name" name="item_name" value="{SEL_ITEM_NAME}" size="40" maxlength="40" style="width:50%;" /><input type="button" id="get_title_button" class="button" onclick="getTitle();" value="{_LC_LABEL_GET_TITLE}" {GET_TITLE_DISABLED} />&nbsp;&nbsp;{LANG}<br />
+               </div>
+               <div class="col-sm-6 m3config_item"><input type="button" id="get_title_button" class="button" onclick="getTitle();" value="{_LC_LABEL_GET_TITLE}" {GET_TITLE_DISABLED} /></div>
+
+               <div class="form-group">
+           <div class="col-sm-11 m3config_item"><input type="text" id="item_name" name="item_name" class="form-control" value="{SEL_ITEM_NAME}" size="40" maxlength="40" /></div><div class="col-sm-1 m3config_item form-control-static">{LANG}</div>
+               </div>
            <patTemplate:tmpl name="input_lang" visibility="hidden">
-           <input type="text" name="item_name_{ID}" value="{VALUE}" size="40" maxlength="40" />&nbsp;&nbsp;{LANG}<br />
+               <div class="form-group">
+           <div class="col-sm-11 m3config_item"><input type="text" name="item_name_{ID}" class="form-control" value="{VALUE}" size="40" maxlength="40" /></div><div class="col-sm-1 m3config_item form-control-static">{LANG}</div>
+               </div>
            </patTemplate:tmpl>
            </td>
        </tr>
-    <tr class="even">
-           <td class="table-headside"><span {_HELP_MENUDEF_ITEM_TYPE}>{_LC_LABEL_ITEM_TYPE}</span></td>
-           <td>
-           <select name="item_type">
+    <tr>
+           <th><span {_HELP_MENUDEF_ITEM_TYPE}>{_LC_LABEL_ITEM_TYPE}</span></th>
+           <td style="width:200px;">
+           <select name="item_type" class="form-control">
                 <patTemplate:tmpl name="item_type_list">
                 <option value="{VALUE}" {SELECTED}>{NAME}</option>
                 </patTemplate:tmpl>
            </select>
            </td>
-           <td class="table-headside" width="150"><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></td>
+           <th><span {_HELP_MENUDEF_LINK_TYPE}>{_LC_LABEL_LINK_TYPE}</span></th>
            <td>
-           <select name="item_link_type">
+               <div class="col-sm-6 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>
+                   <option value="1" {LINK_TYPE_1}>{_LC_LABEL_LINK_OTHER}</option>
            </select>
+               </div>
            </td>
        </tr>
     <tr>
-           <td class="table-headside"><span {_HELP_MENUDEF_LINK_URL}>{_LC_LABEL_LINK_URL}</span></td>
-           <td colspan="3"><input type="text" id="item_url" name="item_url" value="{URL}" style="width:80%" readonly /><input type="button" class="button" onclick="createUrl();" value="{_LC_LABEL_CREATE_URL}" /><input type="image" src="{PREVIEW_IMG}" width="16" height="16" border="0" alt="{PREVIEW_STR}" title="{PREVIEW_STR}" onclick="previewInOtherWindow();return false;" />
+           <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">
+                   <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="even">
-           <td class="table-headside"><span {_HELP_MENUDEF_VISIBLE}>{_LC_LABEL_ITEM_VISIBLE}</span></td>
-           <td colspan="3"><input type="checkbox" name="item_visible" {SEL_ITEM_VISIBLE} />{_LC_LABEL_VISIBLE}<br /><input type="checkbox" name="item_user_limited" {USER_LIMITED_CHECKED} />{_LC_MSG_USER_LIMITED}<br />
-               <input type="checkbox" name="item_link_content" {LINK_CONTENT} />{_LC_MSG_LINK_TO_CONTENT}</td>
+    <tr>
+           <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>
-           <td class="table-headside"><span {_HELP_MENUDEF_DESC}>{_LC_LABEL_DESC}</span></td>
+           <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>
-           <td class="table-headside"><span {_HELP_MENUDEF_TITLE}>{_LC_LABEL_TITLE}</span></td>
+           <th><span {_HELP_MENUDEF_TITLE}>{_LC_LABEL_TITLE}</span></th>
            <td colspan="3">
-               <input type="text" name="item_title" value="{TITLE}" maxlength="300" style="width:80%" />&nbsp;&nbsp;{LANG}<br />
+               <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">
-           <input type="text" name="item_title_{ID}" value="{VALUE}" maxlength="300" style="width:80%" />&nbsp;&nbsp;{LANG}<br />
+           <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>
            </patTemplate:tmpl>
                </td>
        </tr>
-       <tr class="even">
-       <td colspan="4" align="right">
+    </tbody>
+</table>
+<div class="well m3config_update_buttons">
 <patTemplate:tmpl name="del_button" visibility="hidden">
                <input type="button" class="button" onclick="delItem();" value="{_LC_LABEL_DELETE}" />
                <input type="button" class="button" onclick="updateItem();" value="{_LC_LABEL_UPDATE}" />
@@ -175,13 +201,7 @@ $(function(){
 <patTemplate:tmpl name="add_button" visibility="hidden">
                <input type="button" class="button" onclick="addItem();" value="{_LC_LABEL_ADD}" />
 </patTemplate:tmpl>
-       </td>
-       </tr>
-    </tbody>
-</table>
-
-</td></tr>
-</table>
+</div>
 
 </form>
 </div>