From ed40410044aac07bb6549b5d64196f3db5a3f79e Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Thu, 14 Jul 2016 13:58:42 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=83=A1?=
 =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E3=83=AD=E3=82=B0=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E7=AD=89=E3=82=92=E5=8F=B3=E3=81=AB=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Elements/common_header.ctp | 65 +++++++++++++++------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/View/Elements/common_header.ctp b/View/Elements/common_header.ctp
index 0d3db73d..64dc1c80 100644
--- a/View/Elements/common_header.ctp
+++ b/View/Elements/common_header.ctp
@@ -44,30 +44,27 @@ if (! isset($isSettingMode)) {
 						); ?>
 				<?php endif; ?>
 
-				<?php echo $this->NetCommonsHtml->link('NetCommons3',
+				<?php echo $this->NetCommonsHtml->link(SiteSettingUtil::read('App.site_name'),
 						NetCommonsUrl::actionUrl('/'), array('class' => 'navbar-brand')); ?>
 			</div>
 			<div class="navbar-collapse collapse">
-				<ul class="nav navbar-nav">
-					<li>
-						<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Home'),
-								NetCommonsUrl::actionUrl('/')); ?>
-					</li>
-					<?php if ($user = AuthComponent::user()) : ?>
-						<li>
-							<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Logout'),
-									NetCommonsUrl::actionUrl('/auth/logout')); ?>
+				<ul class="nav navbar-nav navbar-right">
+					<?php if (AuthComponent::user()) : ?>
+						<li class="visible-sm">
+							<?php echo $this->NetCommonsHtml->avatarLink(Current::read(), [], [], 'User.id'); ?>
 						</li>
-					<?php else: ?>
-						<?php if (! SiteSettingUtil::read('App.close_site') && SiteSettingUtil::read('AutoRegist.use_automatic_register', false)) : ?>
-							<li>
-								<?php echo $this->NetCommonsHtml->link(__d('auth', 'Sign up'),
-										NetCommonsUrl::actionUrl('/auth/auto_user_regist/request')); ?>
-							</li>
-						<?php endif; ?>
+						<li class="hidden-sm">
+							<?php echo $this->NetCommonsHtml->handleLink(Current::read(), ['avatar' => true], [], 'User'); ?>
+						</li>
+					<?php endif; ?>
+
+					<?php if (Current::hasSettingMode()) : ?>
 						<li>
-							<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Login'),
-									NetCommonsUrl::actionUrl('/auth/login')); ?>
+							<?php if (! $isSettingMode) : ?>
+								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode on'), NetCommonsUrl::backToPageUrl(true)); ?>
+							<?php else: ?>
+								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode off'), NetCommonsUrl::backToPageUrl()); ?>
+							<?php endif; ?>
 						</li>
 					<?php endif; ?>
 
@@ -82,16 +79,6 @@ if (! isset($isSettingMode)) {
 						</li>
 					<?php endif; ?>
 
-					<?php if (Current::hasSettingMode()) : ?>
-						<li>
-							<?php if (! $isSettingMode) : ?>
-								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode on'), NetCommonsUrl::backToPageUrl(true)); ?>
-							<?php else: ?>
-								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode off'), NetCommonsUrl::backToPageUrl()); ?>
-							<?php endif; ?>
-						</li>
-					<?php endif; ?>
-
 					<?php if (Current::hasControlPanel()) : ?>
 						<li>
 							<?php if (! Current::isControlPanel()): ?>
@@ -102,17 +89,25 @@ if (! isset($isSettingMode)) {
 							<?php endif; ?>
 						</li>
 					<?php endif; ?>
-				</ul>
 
-				<ul class="nav navbar-nav navbar-right">
 					<?php if (AuthComponent::user()) : ?>
-						<li class="visible-sm">
-							<?php echo $this->NetCommonsHtml->avatarLink(Current::read(), [], [], 'User.id'); ?>
+						<li>
+							<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Logout'),
+									NetCommonsUrl::actionUrl('/auth/logout')); ?>
 						</li>
-						<li class="hidden-sm">
-							<?php echo $this->NetCommonsHtml->handleLink(Current::read(), ['avatar' => true], [], 'User'); ?>
+					<?php else: ?>
+						<?php if (! SiteSettingUtil::read('App.close_site') && SiteSettingUtil::read('AutoRegist.use_automatic_register', false)) : ?>
+							<li>
+								<?php echo $this->NetCommonsHtml->link(__d('auth', 'Sign up'),
+										NetCommonsUrl::actionUrl('/auth/auto_user_regist/request')); ?>
+							</li>
+						<?php endif; ?>
+						<li>
+							<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Login'),
+									NetCommonsUrl::actionUrl('/auth/login')); ?>
 						</li>
 					<?php endif; ?>
+
 				</ul>
 			</div>
 		</div>