管理機能のログイン機能をBootstrap対応にする。

diff --git a/include/container/baseWidgetContainer.php b/include/container/baseWidgetContainer.php
index 3b470fe..931884f 100644 (file)
--- a/include/container/baseWidgetContainer.php
+++ b/include/container/baseWidgetContainer.php
@@ -1756,9 +1756,16 @@ class BaseWidgetContainer extends Core
                if (count($this->guideMessage) > 0){
                        $this->tmpl->setAttribute('_guide_message', 'visibility', 'visible');                   // メッセージ表示タグを表示
                        
+                       // メッセージ追加クラス
+                       if ($useBootstrap){
+                               $messageClassArray = $this->gDesign->getBootstrapMessageClass('info');
+                               if (!empty($messageClassArray)) $messageClassStr = ' ' . implode(' ', $messageClassArray);
+                       }
+                       
                        foreach ($this->guideMessage as $value) {
                                $row = array(
-                                       'message' => $value
+                                       'message'       => $value,
+                                       'class'         => $messageClassStr                     // メッセージ追加クラス
                                );
                                $this->tmpl->addVars('_guide_message', $row);
                                $this->tmpl->parseTemplate('_guide_message', 'a');                              

diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css
index 3fddef5..e9aede3 100644 (file)
--- a/templates/_admin4/css/style.css
+++ b/templates/_admin4/css/style.css
@@ -535,3 +535,7 @@ background-color: #0081c2;
 .m3field_calendar {
        width: 80px;
 }
+/****** login box ******/
+.login_box {
+       margin-top:20%;
+}
\ No newline at end of file

diff --git a/widgets/admin/opelog/include/container/admin_opelogWidgetContainer.php b/widgets/admin/opelog/include/container/admin_opelogWidgetContainer.php
index d1caa0d..fe95b55 100644 (file)
--- a/widgets/admin/opelog/include/container/admin_opelogWidgetContainer.php
+++ b/widgets/admin/opelog/include/container/admin_opelogWidgetContainer.php
@@ -19,6 +19,7 @@ require_once($gEnvManager->getCurrentWidgetDbPath() . '/admin_opelogDb.php');
 class admin_opelogWidgetContainer extends BaseAdminWidgetContainer
 {
        private $db;    // DB接続オブジェクト
+       private $currentYear;           // 現在の年号
        const DEFAULT_LOG_LEVEL = '0';          // デフォルトのログレベル
        const DEFAULT_LOG_STATUS = '1';         // デフォルトのログステータス(未参照のみ)
        const DEFAULT_LIST_COUNT = 30;                  // 最大リスト表示数
@@ -41,6 +42,8 @@ class admin_opelogWidgetContainer extends BaseAdminWidgetContainer
                
                // DBオブジェクト作成
                $this->db = new admin_opelogDb();
+               
+               $this->currentYear = intval(date('Y'));
        }
        /**
         * テンプレートファイルを設定
@@ -184,12 +187,20 @@ class admin_opelogWidgetContainer extends BaseAdminWidgetContainer
                        $iconTag = '<a href="'. $this->getUrl($link) .'">' . $iconTag . '</a>';
                }
                
+               // 日時
+               $outputDate = $fetchedRow['ol_dt'];
+               if (intval(date('Y', strtotime($outputDate))) == $this->currentYear){
+                       $dispDate = $this->convertToDispDateTime($outputDate, 11/*年省略,0なし年月*/, 10/*時分表示*/);
+               } else {
+                       $dispDate = $this->convertToDispDateTime($outputDate, 0, 10/*時分表示*/);
+               }
+               
                $row = array(
                        'index'         => $index,                                                                                                      // 行番号
                        'serial'        => $this->convertToDispString($serial),                 // シリアル番号
                        'type'          => $iconTag,                    // メッセージタイプを示すアイコン
                        'message'       => $this->convertToDispString($fetchedRow['ol_message']),               // メッセージ
-                       'output_dt' => $this->convertToDispDateTime($fetchedRow['ol_dt']),      // 出力日時
+                       'output_dt' => $dispDate,       // 出力日時
                        'url'           => $this->convertUrlToHtmlEntity($messageUrl)                   // メッセージのリンク先
                );
                $this->tmpl->addVars('loglist', $row);

diff --git a/widgets/admin_main/include/container/admin_mainWidgetContainer.php b/widgets/admin_main/include/container/admin_mainWidgetContainer.php
index cb7345f..f9e478a 100644 (file)
--- a/widgets/admin_main/include/container/admin_mainWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainWidgetContainer.php
@@ -309,7 +309,8 @@ class admin_mainWidgetContainer extends admin_mainBaseWidgetContainer
                        $this->SetMsg(self::MSG_APP_ERR, $this->_('Failed to login.'));                 // ログインに失敗しました
                        if (!empty($url)) $this->redirectUrl = $url;    // リダイレクト先が設定されている場合は再設定
                } else if ($retValue == 3){                     // パスワード送信のとき
-                       $this->setGuidanceMsg($this->_('Password sent.'));              // パスワードを送信しました
+//                     $this->setGuidanceMsg($this->_('Password sent.'));              // パスワードを送信しました
+                       $this->setSuccessMsg($this->_('Password sent.'));               // パスワードを送信しました
                }
                $request->unsetSessionValue(M3_SESSION_POST_TICKET);            // ハッシュ値クリア
                return true;
@@ -377,6 +378,7 @@ class admin_mainWidgetContainer extends admin_mainBaseWidgetContainer
                $localeText['label_account'] = $this->_('Account');             // アカウント
                $localeText['label_password'] = $this->_('Password');           // パスワード
                $localeText['label_password2'] = $this->_('Email');             // Eメール
+               $localeText['msg_input_email'] = $this->_('Input email address.');              // Eメールアドレスを入力してください。
                $this->setLocaleText($localeText);
        }
        /**

diff --git a/widgets/admin_main/include/locale/ja_JP.mo b/widgets/admin_main/include/locale/ja_JP.mo
index 3fe18bf..89d365c 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 ae0197c..07769a2 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: 2013-12-22 23:41+0900\n"
-"PO-Revision-Date: 2013-12-29 10:53+0900\n"
+"POT-Creation-Date: 2014-01-16 11:47+0900\n"
+"PO-Revision-Date: 2014-01-16 11:47+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -243,7 +243,7 @@ msgstr "追加CSSクラス"
 #: ../container/admin_mainEditmenuWidgetContainer.php:184
 #: ../container/admin_mainEditmenuWidgetContainer.php:202
 #: ../container/admin_mainMenudefWidgetContainer.php:158
-#: ../container/admin_mainOpelogWidgetContainer.php:192
+#: ../container/admin_mainOpelogWidgetContainer.php:193
 #: ../container/admin_mainPagedefWidgetContainer.php:435
 #: ../container/admin_mainSmenudefWidgetContainer.php:151
 #: ../container/admin_mainTemplistWidgetContainer.php:564
@@ -254,21 +254,21 @@ msgstr "更新"
 
 #: ../container/admin_mainAnalyzegraphWidgetContainer.php:86
 #: ../container/admin_mainLoginstatusWidgetContainer.php:148
-#: ../container/admin_mainOpelogWidgetContainer.php:210
+#: ../container/admin_mainOpelogWidgetContainer.php:211
 #: ../container/admin_mainUserlistWidgetContainer.php:161
 msgid "Range:"
 msgstr "範囲："
 
 #: ../container/admin_mainAnalyzegraphWidgetContainer.php:246
 #: ../container/admin_mainLoginstatusWidgetContainer.php:266
-#: ../container/admin_mainOpelogWidgetContainer.php:289
+#: ../container/admin_mainOpelogWidgetContainer.php:290
 #: ../container/admin_mainUserlistWidgetContainer.php:236
 #, php-format
 msgid "%d Total"
 msgstr "全 %d 件"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:138
-#: ../container/admin_mainOpelogWidgetContainer.php:340
+#: ../container/admin_mainOpelogWidgetContainer.php:341
 #: ../container/admin_mainPagedefWidgetContainer.php:333
 #: ../container/admin_mainPagedefWidgetContainer.php:337
 #: ../container/admin_mainPortalWidgetContainer.php:120
@@ -276,15 +276,16 @@ msgid "Failed in updating data."
 msgstr "データ更新に失敗しました"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:140
-#: ../container/admin_mainOpelogWidgetContainer.php:336
+#: ../container/admin_mainOpelogWidgetContainer.php:337
 #: ../container/admin_mainPagedefWidgetContainer.php:331
 #: ../container/admin_mainPortalWidgetContainer.php:118
 msgid "Data updated."
 msgstr "データを更新しました"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:151
+#: ../container/admin_mainWidgetContainer.php:381
 msgid "Input email address."
-msgstr "メールアドレスが設定されていません"
+msgstr "Eメールアドレスが設定されていません"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:154
 msgid "URL   :"
@@ -607,7 +608,7 @@ msgstr "運用ログを参照します。"
 
 #: ../container/admin_mainEditmenuWidgetContainer.php:104
 #: ../container/admin_mainLoginstatusWidgetContainer.php:147
-#: ../container/admin_mainOpelogWidgetContainer.php:207
+#: ../container/admin_mainOpelogWidgetContainer.php:208
 msgid "Access Log"
 msgstr "アクセスログ"
 
@@ -712,7 +713,7 @@ msgstr "管理メニューその他"
 #: ../container/admin_mainEditmenuWidgetContainer.php:181
 #: ../container/admin_mainLoginstatusWidgetContainer.php:149
 #: ../container/admin_mainMenudefWidgetContainer.php:140
-#: ../container/admin_mainOpelogWidgetContainer.php:184
+#: ../container/admin_mainOpelogWidgetContainer.php:185
 #: ../container/admin_mainPagedefWidgetContainer.php:114
 #: ../container/admin_mainSmenudefWidgetContainer.php:133
 #: ../container/admin_mainUserlistWidgetContainer.php:136
@@ -897,7 +898,7 @@ msgstr "削除"
 
 #: ../container/admin_mainFilebrowseWidgetContainer.php:200
 #: ../container/admin_mainMenudefWidgetContainer.php:172
-#: ../container/admin_mainOpelogWidgetContainer.php:204
+#: ../container/admin_mainOpelogWidgetContainer.php:205
 #: ../container/admin_mainSmenudefWidgetContainer.php:164
 #: ../container/admin_mainUserlistWidgetContainer.php:148
 msgid "Select"
@@ -966,7 +967,7 @@ msgid "Create"
 msgstr "作成"
 
 #: ../container/admin_mainLoginstatusWidgetContainer.php:44
-#: ../container/admin_mainWidgetContainer.php:375
+#: ../container/admin_mainWidgetContainer.php:376
 msgid "Login"
 msgstr "ログイン"
 
@@ -979,8 +980,8 @@ msgid "Login History"
 msgstr "ログイン履歴"
 
 #: ../container/admin_mainLoginstatusWidgetContainer.php:144
-#: ../container/admin_mainOpelogWidgetContainer.php:191
-#: ../container/admin_mainOpelogWidgetContainer.php:209
+#: ../container/admin_mainOpelogWidgetContainer.php:192
+#: ../container/admin_mainOpelogWidgetContainer.php:210
 msgid "Date"
 msgstr "日付"
 
@@ -1172,7 +1173,7 @@ msgid "Select menu item to delete."
 msgstr "削除する項目を選択してください"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:166
-#: ../container/admin_mainOpelogWidgetContainer.php:199
+#: ../container/admin_mainOpelogWidgetContainer.php:200
 #: ../container/admin_mainSmenudefWidgetContainer.php:159
 #: ../container/admin_mainUserlistWidgetContainer.php:146
 msgid "Delete selected item?"
@@ -1184,7 +1185,7 @@ msgid "Menu Item List"
 msgstr "メニュー項目一覧"
 
 #: ../container/admin_mainMenudefWidgetContainer.php:170
-#: ../container/admin_mainOpelogWidgetContainer.php:203
+#: ../container/admin_mainOpelogWidgetContainer.php:204
 #: ../container/admin_mainSmenudefWidgetContainer.php:162
 #: ../container/admin_mainUserlistWidgetContainer.php:159
 msgid "Edit"
@@ -1280,83 +1281,83 @@ msgstr "別"
 msgid "Edit Content"
 msgstr "コンテンツを編集"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:59
-#: ../container/admin_mainOpelogWidgetContainer.php:62
+#: ../container/admin_mainOpelogWidgetContainer.php:60
+#: ../container/admin_mainOpelogWidgetContainer.php:63
 #: ../container/admin_mainPagedefWidgetContainer.php:112
 msgid "All"
 msgstr "すべて"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:60
+#: ../container/admin_mainOpelogWidgetContainer.php:61
 msgid "Check Required"
 msgstr "要確認項目"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:63
+#: ../container/admin_mainOpelogWidgetContainer.php:64
 msgid "Unchecked"
 msgstr "未確認"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:64
-#: ../container/admin_mainOpelogWidgetContainer.php:186
-#: ../container/admin_mainOpelogWidgetContainer.php:208
+#: ../container/admin_mainOpelogWidgetContainer.php:65
+#: ../container/admin_mainOpelogWidgetContainer.php:187
+#: ../container/admin_mainOpelogWidgetContainer.php:209
 msgid "Checked"
 msgstr "確認済"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:147
+#: ../container/admin_mainOpelogWidgetContainer.php:148
 msgid "Could not connect to server."
 msgstr "サーバに接続できません"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:181
+#: ../container/admin_mainOpelogWidgetContainer.php:182
 msgid "Update item?"
 msgstr "項目を更新しますか?"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:182
+#: ../container/admin_mainOpelogWidgetContainer.php:183
 msgid "Delete item?"
 msgstr "項目を削除しますか?"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:183
+#: ../container/admin_mainOpelogWidgetContainer.php:184
 msgid "Operation Log Detail"
 msgstr "運用ログ詳細"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:185
-#: ../container/admin_mainOpelogWidgetContainer.php:205
+#: ../container/admin_mainOpelogWidgetContainer.php:186
+#: ../container/admin_mainOpelogWidgetContainer.php:206
 msgid "Type"
 msgstr "種別"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:187
-#: ../container/admin_mainOpelogWidgetContainer.php:206
+#: ../container/admin_mainOpelogWidgetContainer.php:188
+#: ../container/admin_mainOpelogWidgetContainer.php:207
 msgid "Message"
 msgstr "メッセージ"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:188
+#: ../container/admin_mainOpelogWidgetContainer.php:189
 msgid "Message Detail"
 msgstr "メッセージ詳細"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:189
+#: ../container/admin_mainOpelogWidgetContainer.php:190
 msgid "Message Code"
 msgstr "メッセージコード"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:190
+#: ../container/admin_mainOpelogWidgetContainer.php:191
 msgid "Access Log No"
 msgstr "アクセスログ番号"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:197
+#: ../container/admin_mainOpelogWidgetContainer.php:198
 #: ../container/admin_mainUserlistWidgetContainer.php:144
 msgid "Select item to edit."
 msgstr "編集する項目を選択してください"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:198
+#: ../container/admin_mainOpelogWidgetContainer.php:199
 #: ../container/admin_mainUserlistWidgetContainer.php:145
 msgid "Select item to delete."
 msgstr "削除する項目を選択してください"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:200
+#: ../container/admin_mainOpelogWidgetContainer.php:201
 msgid "Operation Log List"
 msgstr "運用ログ一覧"
 
-#: ../container/admin_mainOpelogWidgetContainer.php:201
+#: ../container/admin_mainOpelogWidgetContainer.php:202
 msgid "Level:"
 msgstr "レベル："
 
-#: ../container/admin_mainOpelogWidgetContainer.php:202
+#: ../container/admin_mainOpelogWidgetContainer.php:203
 msgid "Status:"
 msgstr "ステータス："
 
@@ -1768,7 +1769,7 @@ msgid "Login Account"
 msgstr "ログインアカウント"
 
 #: ../container/admin_mainUserlistWidgetContainer.php:123
-#: ../container/admin_mainWidgetContainer.php:378 ../help/help_userlist.php:43
+#: ../container/admin_mainWidgetContainer.php:379 ../help/help_userlist.php:43
 msgid "Password"
 msgstr "パスワード"
 
@@ -1793,7 +1794,7 @@ msgstr "有効期間"
 #: ../container/admin_mainUserlistWidgetContainer.php:156
 #: ../container/admin_mainUserlistWidgetContainer.php:306
 #: ../container/admin_mainUserlistWidgetContainer.php:374
-#: ../container/admin_mainWidgetContainer.php:379 ../help/help_userlist.php:51
+#: ../container/admin_mainWidgetContainer.php:380 ../help/help_userlist.php:51
 msgid "Email"
 msgstr "Eメール"
 
@@ -1870,15 +1871,15 @@ msgstr "アクセスできません"
 msgid "Failed to login."
 msgstr "ログインに失敗しました"
 
-#: ../container/admin_mainWidgetContainer.php:312
+#: ../container/admin_mainWidgetContainer.php:313
 msgid "Password sent."
 msgstr "パスワードを送信しました"
 
-#: ../container/admin_mainWidgetContainer.php:376
+#: ../container/admin_mainWidgetContainer.php:377
 msgid "Send Password"
 msgstr "パスワード送信"
 
-#: ../container/admin_mainWidgetContainer.php:377
+#: ../container/admin_mainWidgetContainer.php:378
 msgid "Account"
 msgstr "アカウント"
 

diff --git a/widgets/admin_main/include/template/userlogin.tmpl.html b/widgets/admin_main/include/template/userlogin.tmpl.html
index c04e817..757c511 100644 (file)
--- a/widgets/admin_main/include/template/userlogin.tmpl.html
+++ b/widgets/admin_main/include/template/userlogin.tmpl.html
@@ -5,9 +5,9 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2012 Magic3 Project.\r
+ * @copyright  Copyright 2006-2014 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
- * @version    SVN: $Id: userlogin.tmpl.html 5503 2013-01-02 11:22:58Z fishbone $\r
+ * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
  */\r
 <patTemplate:tmpl name="_widget">\r
@@ -15,7 +15,14 @@
 <script type="text/javascript">\r
 //<![CDATA[\r
 function loginUser(){\r
-       if (!document.login.act.value) document.login.password.value = hex_md5(document.login.pwd.value);\r
+       if (document.login.act.value){\r
+               if (!document.login.email.value){\r
+                       alert('{_LC_MSG_INPUT_EMAIL}');\r
+                       return false;\r
+               }\r
+       } else {\r
+               document.login.password.value = hex_md5(document.login.pwd.value);\r
+       }\r
        document.login.pwd_button.disabled = true;\r
        document.login.pwd.disabled = true;\r
        document.login.submit();\r
@@ -23,8 +30,8 @@ function loginUser(){
 }\r
 $(document).keyup(function(e){\r
        if (e.which == 27){\r
-               $('#email').toggle();\r
-               $('#pwd').toggle();\r
+               $('#pwd_area').toggle();\r
+               $('#email_area').toggle();\r
                if (document.login.act.value){\r
                        document.login.act.value = '';\r
                        $('#pwd_label').text('{_LC_LABEL_PASSWORD}');\r
@@ -45,31 +52,50 @@ $(function(){
 });\r
 //]]>\r
 </script>\r
-<div align="center">\r
-<br />\r
-<h2>{_LC_LABEL_LOGIN}</h2>\r
+<div class="login_box">\r
+<div class="row"><div class="col-md-offset-3 col-md-6">\r
 <!-- m3:ErrorMessage -->\r
-<form method="post" name="login" onsubmit="loginUser();">\r
+</div></div>\r
+<form method="post" name="login" class="form-horizontal" role="form" onsubmit="loginUser();return false;">\r
 <input type="hidden" name="cmd" value="login" />\r
 <input type="hidden" name="act" />\r
 <input type="hidden" name="password" />\r
 <input type="hidden" name="ticket" value="{TICKET}" />\r
 <patTemplate:tmpl name="redirect_url" visibility="hidden"><input type="hidden" name="url" value="{URL}" /></patTemplate:tmpl>\r
-<table class="simple-table">\r
-    <tbody>\r
-        <tr>\r
-       <td width="100" class="table-headside">{_LC_LABEL_ACCOUNT}</td>\r
-       <td width="130"><input type="text" id="account" name="account" style="width:100%;" /></td>\r
-       </tr>\r
-    <tr>\r
-       <td class="table-headside"><span id="pwd_label">{_LC_LABEL_PASSWORD}</span></td>\r
-       <td><input type="password" id="pwd" name="pwd" style="width:100%;" /><input type="text" id="email" name="email" style="width:100%;display:none;" /></td>\r
-       </tr>\r
-        <tr class="even">\r
-       <td colspan="2" style="text-align:right;"><input type="submit" id="pwd_button" name="pwd_button" class="button" value="{_LC_LABEL_LOGIN}" /></td>\r
-       </tr>\r
-    </tbody>\r
-</table>\r
+<div class="row"><div class="col-md-offset-4 col-md-4">\r
+<div class="panel panel-info">\r
+<div class="panel-heading "><h1 class="panel-title">{_LC_LABEL_LOGIN}</h1></div>\r
+<div class="panel-body">\r
+<div class="form-group">\r
+    <label for="account" class="col-md-4 control-label">{_LC_LABEL_ACCOUNT}</label>\r
+    <div class="col-md-7">\r
+        <div class="input-group">\r
+            <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>\r
+            <input type="text" id="account" name="account" class="form-control">\r
+        </div>\r
+    </div>\r
+</div>\r
+<div class="form-group">\r
+    <label for="pwd" class="col-md-4 control-label"><span id="pwd_label">{_LC_LABEL_PASSWORD}</span></label>\r
+    <div class="col-md-7">\r
+        <div id="pwd_area" class="input-group">\r
+            <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>\r
+            <input type="password" id="pwd" name="pwd" class="form-control">\r
+        </div>\r
+        <div id="email_area" class="input-group" style="display:none;">\r
+            <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>\r
+            <input type="text" id="email" name="email" class="form-control" />\r
+        </div>\r
+    </div>\r
+</div>\r
+<div class="form-group">\r
+    <div class="col-md-offset-4 col-md-2">\r
+        <input type="submit" id="pwd_button" name="pwd_button" class="btn btn-success" value="{_LC_LABEL_LOGIN}" />\r
+    </div>\r
+</div>\r
+</div>\r
+</div>\r
+</div></div>\r
 </form>\r
 </div>\r
 </patTemplate:tmpl>\r