s4

changeset 787:c5b61d23052b feature-world

find changesets by author, revision, files, or words in the commit message
Display WORLD name in HTML header
author HIROSE Yuuji <yuuji@gentei.org>
date Sat, 13 Jun 2020 13:19:57 +0900
parents 809caeb20758
children b71489b6ee05
files examples/common/default/html.m4.html s4-funcs.sh
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/examples/common/default/html.m4.html	Sat Jun 13 13:19:07 2020 +0900
     1.2 +++ b/examples/common/default/html.m4.html	Sat Jun 13 13:19:57 2020 +0900
     1.3 @@ -7,7 +7,7 @@
     1.4  `<meta name="theme-color" content="_S4COLOR_">',
     1.5  `<meta name="theme-color" content="#8ea">')
     1.6  <meta name="viewport" content="width=device-width,initial-scale=0.5">
     1.7 -<title>_TITLE_|ifdef(`_S4NAME_',`_S4NAME_',s4)</title>
     1.8 +<title>_TITLE_|ifdef(`_S4WORLD_',`{_S4WORLD_}')ifdef(`_S4NAME_',`_S4NAME_',s4)</title>
     1.9  <link rel="stylesheet" type="text/css" href="templ/default/default.css">
    1.10  <script type="text/javascript" src="s4-main.js" charset="utf-8"></script>
    1.11  ifdef(`_S4CSS_',
    1.12 @@ -19,7 +19,7 @@
    1.13  <div class="topmenu">
    1.14  <ul>
    1.15   <li class="casmenu"><a href="?home" accesskey="1" title="Shortcut: 1
    1.16 -Home">ホーム</a>_S4WORLDS_</li>
    1.17 +Home">ホーム</a>ifdef(`_S4WORLDS_',`_S4WORLDS_')</li>
    1.18   <!-- <li><a href="?blog">話題作成</a></li> -->
    1.19   <li><a href="?mems" accesskey="2" title="Shortcut: 2
    1.20  Members">参加者一覧</a></li>

     2.1 --- a/s4-funcs.sh	Sat Jun 13 13:19:07 2020 +0900
     2.2 +++ b/s4-funcs.sh	Sat Jun 13 13:19:57 2020 +0900
     2.3 @@ -492,7 +492,8 @@
     2.4  _m4() {
     2.5    #S4NAME=f,f,f
     2.6    m4 ${S4NAME:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} \
     2.7 -     -D_S4WORLDS_="$S4WORLDS" "$@"
     2.8 +     ${S4WORLD:+-D_S4WORLD_="$S4WORLD"} \
     2.9 +     ${S4WORLDS:+-D_S4WORLDS_="$S4WORLDS"} "$@"
    2.10  }
    2.11  ismember() {
    2.12    # $1=user, $2=group