diff --git a/sys/css/main.css b/sys/css/main.css index cd97df4..d471273 100644 --- a/sys/css/main.css +++ b/sys/css/main.css @@ -86,7 +86,8 @@ div.user { position: relative; width: 55%; max-width: 800px; - margin: 0 auto 5rem auto; } + margin: 0 auto 5rem auto; + overflow-x: hidden; } div.user header { min-height: 200px; } div.user .content { diff --git a/sys/export-deamon.sh b/sys/export-deamon.sh index 8c7fafb..6b587a9 100755 --- a/sys/export-deamon.sh +++ b/sys/export-deamon.sh @@ -3,6 +3,6 @@ while true; do now=$(date +"%Y-%m-%d--%T") echo "export contents -- $now" ./tex2html.sh - echo "sleep 30sec for new export" - sleep 30s + echo "sleep 15sec for new export" + sleep 15s done diff --git a/sys/scss/main.scss b/sys/scss/main.scss index a7e1959..d97055b 100644 --- a/sys/scss/main.scss +++ b/sys/scss/main.scss @@ -130,6 +130,8 @@ div.user{ width: 55%; max-width: 800px; margin:0 auto 5rem auto; + overflow-x: hidden; + // outline: 1px solid red; header{ min-height: 200px; @@ -158,6 +160,12 @@ div.user{ border:none; } } + + video{ + max-width: 100%; + max-height: 600px; + } + } @media print { diff --git a/sys/tex2html.sh b/sys/tex2html.sh index 2ecdc94..bc85a66 100755 --- a/sys/tex2html.sh +++ b/sys/tex2html.sh @@ -46,7 +46,7 @@ for i in ../content/*; do # user name # record readme content on variable cont=$(cat "$i/readme.textile") - echo " $i" + echo "$i" # echo "$cont" # user=$(grep "h1\.\s*.+" "$i/readme.textile") @@ -57,10 +57,12 @@ for i in ../content/*; do u=${i/..\//} # record link for menu # echo "
  • $u
  • " >> tmp/summary - echo "* \"$u\":#$u" >> tmp/summary + u=${u/content//} + id=${u:2} + echo "* \"$id\":#$id" >> tmp/summary # right html and contents on main tmp/content.textile - echo "
    " >> tmp/content.textile + echo "
    " >> tmp/content.textile # add user content to main content echo "
    "$'\n' >> tmp/content.textile # add content to main tmp/content.textile @@ -98,7 +100,8 @@ for i in ../content/*; do convert ../output/images/$fimg -resize 800x800\> ../output/thumbs/$fimg # replace image name in main tmp/content.textile file # pandoc can't render textile links - sed -i "s/!images\/$fn!/!thumbs\/$fimg!<\/a>/g" tmp/content.textile + sed -i \ + "s/!images\/$fn!/!thumbs\/$fimg!<\/a>/g" tmp/content.textile # sed -i "s/!images\/$fn!/thumbs\/$fimg/g" tmp/content.textile @@ -143,6 +146,58 @@ for i in ../content/*; do fi done + + +# ____ __ +# / __ \____ _____/ / +# / /_/ / __ `/ __ / +# / ____/ /_/ / /_/ / +# /_/ \__,_/\__,_/ + +curl http://pads.osp.kitchen/p/ola-workshop/export/txt -o tmp/pad.md + +echo "* \"Pad\":#pad" >> tmp/summary + +# right html and contents on main tmp/content.textile +echo "
    " >> tmp/content.textile +echo "

    Pad

    " >> tmp/content.textile +# add user content to main content +echo "
    "$'\n' >> tmp/content.textile +# add content to main tmp/content.textile +pandoc -f markdown -t textile -o tmp/pad.textile tmp/pad.md +cat tmp/pad.textile >> tmp/content.textile +echo $'\n'"
    " >> tmp/content.textile +echo "
    " >> tmp/content.textile + +echo '
    ' >> tmp/content.textile + +# ______ __ ____ __ +# / ____/___ ____ / /__/ __ )____ ____ / /__ +# / / / __ \/ __ \/ //_/ __ / __ \/ __ \/ //_/ +# / /___/ /_/ / /_/ / ,< / /_/ / /_/ / /_/ / ,< +# \____/\____/\____/_/|_/_____/\____/\____/_/|_| + +curl http://pads.osp.kitchen/p/ola-cookbook/export/txt -o tmp/cookbook.md + +echo "* \"CookBook\":#cookbook" >> tmp/summary + +# right html and contents on main tmp/content.textile +echo "
    " >> tmp/content.textile +echo "

    CookBook

    " >> tmp/content.textile +# add user content to main content +echo "
    "$'\n' >> tmp/content.textile +# add content to main tmp/content.textile +pandoc -f markdown -t textile -o tmp/cookbook.textile tmp/cookbook.md +cat tmp/cookbook.textile >> tmp/content.textile +echo $'\n'"
    " >> tmp/content.textile +echo "
    " >> tmp/content.textile + +echo '
    ' >> tmp/content.textile + + + + + # end main section echo "
    " >> tmp/content.textile