Skip to content

複数のバグ修正 #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 11, 2016
Merged

複数のバグ修正 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
647f237
マージン修正
s-nakajima Aug 9, 2016
69159f8
キャビネットのフォルダ作成、ファイル追加ボタンに対して、スマホにした場合、フォルダ・ファイルアイコンが消えないように修正
s-nakajima Aug 10, 2016
0202e66
ヘッダーメニューの各項目の並びを修正
s-nakajima Aug 10, 2016
5e8621b
Not foundのマージン修正
s-nakajima Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions View/Elements/common_header.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,13 @@ if (! isset($isSettingMode)) {
</div>
<div class="navbar-collapse collapse">
<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>
<li class="hidden-sm">
<?php echo $this->NetCommonsHtml->handleLink(Current::read(), ['avatar' => true], [], 'User'); ?>
</li>
<?php endif; ?>

<?php if (Current::hasSettingMode()) : ?>
<?php if (Current::hasControlPanel()) : ?>
<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 if (! Current::isControlPanel()): ?>
<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Control Panel'),
array('plugin' => 'control_panel', 'controller' => 'control_panel', 'action' => 'index')); ?>
<?php else : ?>
<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Back to the Rooms'), NetCommonsUrl::backToPageUrl()); ?>
<?php endif; ?>
</li>
<?php endif; ?>
Expand All @@ -78,17 +70,25 @@ if (! isset($isSettingMode)) {
</li>
<?php endif; ?>

<?php if (Current::hasControlPanel()) : ?>
<?php if (Current::hasSettingMode()) : ?>
<li>
<?php if (! Current::isControlPanel()): ?>
<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Control Panel'),
array('plugin' => 'control_panel', 'controller' => 'control_panel', 'action' => 'index')); ?>
<?php else : ?>
<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Back to the Rooms'), NetCommonsUrl::backToPageUrl()); ?>
<?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 (AuthComponent::user()) : ?>
<li class="visible-sm">
<?php echo $this->NetCommonsHtml->avatarLink(Current::read(), [], [], 'User.id'); ?>
</li>
<li class="hidden-sm">
<?php echo $this->NetCommonsHtml->handleLink(Current::read(), ['avatar' => true], [], 'User'); ?>
</li>
<?php endif; ?>

<?php if (AuthComponent::user()) : ?>
<li>
<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Logout'), '/auth/logout'); ?>
Expand All @@ -112,4 +112,4 @@ if (! isset($isSettingMode)) {

<?php
echo $this->Session->read('appendHtml');
CakeSession::delete('appendHtml');
CakeSession::delete('appendHtml');
18 changes: 16 additions & 2 deletions View/Helper/LinkButtonHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,22 @@ private function __getLinkHtml($title, $url, $options) {
} else {
$title = '<span class="hidden-xs">' . $title . '</span>';
}
$glyphicon = 'glyphicon glyphicon-' . h($options['icon']);
$title = '<span ' . 'class="' . $glyphicon . '"' . $ariaHidden . '></span> ' . $title;
if (substr($options['icon'], 0, strlen('glyphicon-')) === 'glyphicon-') {
$glyphicon = 'glyphicon ' . h($options['icon']);
} else {
$glyphicon = 'glyphicon glyphicon-' . h($options['icon']);
}

$iconTag = '<span ' . 'class="' . $glyphicon . '"' . $ariaHidden . '></span> ';
if (Hash::get($options, 'addIcon')) {
if (substr($options['addIcon'], 0, strlen('glyphicon-')) === 'glyphicon-') {
$glyphicon = 'glyphicon ' . h($options['addIcon']);
} else {
$glyphicon = 'glyphicon glyphicon-' . h($options['addIcon']);
}
$iconTag .= '<span ' . 'class="' . $glyphicon . '"' . $ariaHidden . '></span> ';
}
$title = $iconTag . $title;
unset($options['icon']);

//ボタンサイズ
Expand Down
8 changes: 8 additions & 0 deletions webroot/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,17 @@ ul.nav-pills {
margin-bottom: 8px;
}

.nc-not-found {
margin-top: 20px;
margin-bottom: 4px;
}

/**
* コンテンツリストの各コンテンツのスタイル
*/
.frame .nc-content-list > article:first-child {
margin-top: 24px;
}
.frame .nc-content-list > article {
border-bottom: 1px solid #ccc;
padding-bottom: 8px;
Expand Down