Merge pull request #69 from uzulla/fix/61-add-title-to-admin-login-page

fc2dev · web-flow · commit 22e993c0c7f4 · 2020-08-17T20:13:58.000+08:00
(68後にマージください)Fix/61 管理画面ログインページのタイトルタグ指定
diff --git a/app/locale/en_US.UTF-8/LC_MESSAGES/messages.mo b/app/locale/en_US.UTF-8/LC_MESSAGES/messages.mo
diff --git a/app/locale/en_US.UTF-8/LC_MESSAGES/messages.po b/app/locale/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -2464,3 +2464,6 @@ msgstr "{%displayNone}"
 
 #~ msgid "system-date-format"
 #~ msgstr "dd/mm/yy"
+
+msgid "Login to Administration page"
+msgstr ""
diff --git a/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.mo b/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.mo
diff --git a/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.po b/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.po
@@ -2511,3 +2511,6 @@ msgstr "さん"
 
 #~ msgid "Midway"
 #~ msgstr "ミッドウェー島"
+
+msgid "Login to Administration page"
+msgstr "管理画面へログイン"
diff --git a/app/src/Web/Controller/Admin/UsersController.php b/app/src/Web/Controller/Admin/UsersController.php
@@ -137,6 +137,7 @@ public function login()
     }
 
     $request = Request::getInstance();
+    $this->set('html_title', __('Login to Administration page'));
 
     // 初期表示時
     if (!$request->get('user')) {
diff --git a/app/view/admin/layouts/default.html b/app/view/admin/layouts/default.html
@@ -3,7 +3,7 @@
 <html lang="<?php echo \Fc2blog\Config::get('LANG'); ?>">
 <head>
   <meta charset="utf-8">
-  <title><?php echo \Fc2blog\Web\Session::get('blog_id'); ?></title>
+  <title><?php if(isset($html_title)) {echo h($html_title);} else {echo h(\Fc2blog\Web\Session::get('blog_id'));} ?></title>
   <link rel="icon" href="https://static.fc2.com/share/image/favicon.ico">
   <link rel="stylesheet" href="/css/normalize.css" type="text/css" media="all">
   <link rel="stylesheet" href="/css/admin-fc2.css" type="text/css" media="all">

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ public function login()`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`$request = Request::getInstance();`
	`140`	`+ $this->set('html_title', __('Login to Administration page'));`
`140`	`141`
`141`	`142`	`// 初期表示時`
`142`	`143`	`if (!$request->get('user')) {`