Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions _core/lib/ar2e/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
$INDEX->param(typeName => 'キャラ');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/blp/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
$INDEX->param(modeMylist => 1) if $mode eq 'mylist';

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/dx3/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
$INDEX->param(modeMylist => 1) if $mode eq 'mylist';

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/gc/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
$INDEX->param(typeName => 'キャラ');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/gc/list-country.pl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
$INDEX->param(typeName => '国管理');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/gs/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
$INDEX->param(typeName => 'キャラ');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/info.pl
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
$INDEX->param(modeInfo => 1);

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/kiz/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
$INDEX->param(modeMylist => 1) if $mode eq 'mylist';

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/ms/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
$INDEX->param(typeName => '都民');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/ms/list-clan.pl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
$INDEX->param(typeName => 'クラン');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
8 changes: 8 additions & 0 deletions _core/lib/subroutine.pl
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ sub getplayername {
}


### メールアドレス設定の有無を判定 --------------------------------------------------
sub emailRegistered {
my $login_id = shift;
my $email = (getplayername($login_id))[1];
return $email ne '' ? 1 : 0;
}


### 編集保護設定取得 --------------------------------------------------
sub getProtectType {
my $file = shift;
Expand Down
1 change: 1 addition & 0 deletions _core/lib/sw2/list-arts.pl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
$INDEX->param(typeName => '魔法');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/sw2/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
$INDEX->param(typeName => 'キャラ');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/sw2/list-item.pl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
$INDEX->param(typeName => 'アイテム');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/sw2/list-making.pl
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
$INDEX->param(name => (getplayername($LOGIN_ID))[0]);

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/sw2/list-mons.pl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
$INDEX->param(typeName => '魔物');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
1 change: 1 addition & 0 deletions _core/lib/vc/list-chara.pl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
$INDEX->param(typeName => 'キャラ');

$INDEX->param(LOGIN_ID => $LOGIN_ID);
$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID));
$INDEX->param(OAUTH_MODE => $set::oauth_service);
$INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url);

Expand Down
70 changes: 70 additions & 0 deletions _core/skin/_common/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,16 @@ header {
> b {
font-size: 110%;
}

&.email-registered {
&::before {
content: '\e86c';
font-family: "Material Symbols Outlined", sans-serif;
font-variation-settings: 'FILL' 0;
position: relative;
top: 0.1em;
}
}
}
}
}
Expand Down Expand Up @@ -393,6 +403,66 @@ main {
@media print {
border-width: 0;
}

.notice-list {
grid-column: 2 / 3;
grid-row: 2 / 3;
margin: 5rem 0 0 0;
padding: 0 3em;

@media screen and (width <= 735px) {
margin-top: 10rem;
}

@media print {
display: none;
}

&:not(:has(li)) {
display: none;
}

> li {
margin: 2em auto;
padding: 1em;
border: 3px dashed #e70;
border-radius: 0.75em;
background-color: #f504;
width: max-content;

> p {
margin: 0;
padding: 0;
}

&[data-mode] {
display: grid;
grid-template-columns: max-content 1fr;

&::before {
font-family: "Material Symbols Outlined", sans-serif;
font-variation-settings: 'FILL' 0;
grid-column: 1 / 2;
grid-row: 1 / -1;
font-size: 200%;
margin-right: 0.25em;
color: #e70;
}

> p {
grid-column: 2 / -1;
grid-row: auto;
display: flex;
justify-content: center;
align-items: center;
}

&[data-mode="important"]::before {
content: "\e000";
}
}
}
}
}

article{
Expand Down
1 change: 1 addition & 0 deletions _core/skin/_common/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ <h2>ユーザー設定</h2>
</dl>
</section>
<section class="form">
<a id="account"></a>
<h2>アカウント情報</h2>
<form method="post" action="./">
<input type="hidden" name="mode" value="option">
Expand Down
1 change: 1 addition & 0 deletions _core/skin/_common/login-state.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span><TMPL_UNLESS EMAIL_NOT_REGISTERED><span class="email-registered">メールアドレス設定済み</span></TMPL_UNLESS></div></TMPL_IF>
11 changes: 11 additions & 0 deletions _core/skin/_common/notice.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<ul class="notice-list">
<TMPL_IF LOGIN_ID>
<TMPL_IF EMAIL_NOT_REGISTERED>
<li data-mode="important">
<p>
メールアドレスが設定されていません。(<a href="./?mode=option#account" target="_blank">設定する</a>)
</p>
</li>
</TMPL_IF>
</TMPL_IF>
</ul>
2 changes: 1 addition & 1 deletion _core/skin/ar2e/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/blp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/dx3/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/gc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/gs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/kiz/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/ms/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down
3 changes: 2 additions & 1 deletion _core/skin/sw2/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
<header>
<h1><a href="./<TMPL_IF isMakingResult>?mode=making</TMPL_IF>"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
<TMPL_INCLUDE NAME="skin-add/main-header.html">
<TMPL_INCLUDE NAME="../_common/notice.html">
<nav>
<ul>
<li class="<TMPL_IF modeMaking>current</TMPL_IF>"><a href="./?mode=making<TMPL_IF modeMylist>&mylist=1</TMPL_IF><TMPL_IF tag>&tag=<TMPL_VAR tag></TMPL_IF>">能力値作成</a></li>
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/vc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header>
<h1><a href="./"><TMPL_VAR title></a></h1>
<nav><TMPL_INCLUDE NAME="../_common/index-menu.html"></nav>
<TMPL_IF LOGIN_ID><div class="login-user"><span>ログイン中: <b><TMPL_VAR LOGIN_ID></b></span></div></TMPL_IF>
<TMPL_INCLUDE NAME="../_common/login-state.html">
</header>

<main>
Expand Down