s4

changeset 838:985ee9a09783

find changesets by author, revision, files, or words in the commit message
Hyperlinks in TITLE cannot be used..
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 25 Jun 2020 16:25:57 +0900
parents a6462eea48be
children 388cbc079ba5
files examples/common/default/form+dump-whead.m4.html s4-blog.sh
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/examples/common/default/form+dump-whead.m4.html	Thu Jun 25 15:50:16 2020 +0900
     1.2 +++ b/examples/common/default/form+dump-whead.m4.html	Thu Jun 25 16:25:57 2020 +0900
     1.3 @@ -1,4 +1,4 @@
     1.4 -<h1 id="title">_TITLE_</h1>
     1.5 +<h1 id="title">_H1_</h1>
     1.6  <h2>_FORMHEAD_</h2>
     1.7  _FORM_
     1.8  <h2>_DUMPHEAD_</h2>

     2.1 --- a/s4-blog.sh	Thu Jun 25 15:50:16 2020 +0900
     2.2 +++ b/s4-blog.sh	Thu Jun 25 16:25:57 2020 +0900
     2.3 @@ -620,6 +620,7 @@
     2.4    echo "$time [$title]@$htmlowner" > $fh
     2.5    lshandoutsub "$owner" "$@" \
     2.6        |_m4 -D_TITLE_="提出状況" \
     2.7 +	   -D_H1_="提出状況" \
     2.8  	   -D_FORMHEAD_="syscmd(cat $fh)" \
     2.9  	   -D_FORM_="syscmd(cat)" -D_DUMPHEAD_= -D_DUMPTABLE_= \
    2.10  	   $layout/html.m4.html $layout/form+dump-whead.m4.html
    2.11 @@ -1254,9 +1255,10 @@
    2.12        qgrp=`sqlquote "$owner"`	# Inefficient...
    2.13        grprowid=`query "SELECT rowid FROM grp WHERE gname=$qgrp;"`
    2.14      fi
    2.15 -    groupmode=1 listing=$owner guide="[`linkhome $grprowid`]" GF_OWNER=$owner
    2.16 +    groupmode=1 listing=$owner GF_OWNER=$owner
    2.17 +    titleguide="[$owner]" guide="[`linkhome $grprowid`]" 
    2.18    else
    2.19 -    usermode=1 listing=$user guide="[個人]"
    2.20 +    usermode=1 listing=$user guide="[個人]" titleguide=$guide
    2.21    fi
    2.22  
    2.23    if [ -n "`getpar title`" ]; then
    2.24 @@ -1292,10 +1294,12 @@
    2.25        return
    2.26      fi
    2.27    fi
    2.28 -  echo "${guide}新規話題作成"	> $tmpd/title.$$
    2.29 +  echo "${titleguide}新規話題作成"	> $tmpd/title.$$
    2.30 +  echo "${guide}新規話題作成"		> $tmpd/h1.$$
    2.31    listblog "$listing"		> $tmpd/listblog.$$
    2.32    genform $formdir/blog.def \
    2.33        | _m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" \
    2.34 +	    -D_H1_="spaste(\`$tmpd/h1.$$')" \
    2.35  	    -D_FORMHEAD_="序文は簡単に詳しくはコメントに" \
    2.36  	    -D_DUMPHEAD_="これまでの蓄積" \
    2.37  	    -D_FORM_="syscmd(\`cat')" \
    2.38 @@ -1387,6 +1391,7 @@
    2.39    echo "$subtitle$frozen_flag" > $tmpd/subtitle.$$
    2.40    ${BLOG_SHOW:-blog_showentry} blog $rowid "$2" \
    2.41        | _m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" \
    2.42 +	    -D_H1_="spaste(\`$tmpd/title.$$')" \
    2.43  	    -D_BODYCLASS_=general"${memclass:+ $memclass}" \
    2.44  	    -D_FORMHEAD_="spaste(\`$tmpd/subtitle.$$')" \
    2.45  	    -D_FORM_='' \