From b36ca5bcc0287addc810375792f1c825b16bd0b0 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Sun, 4 Dec 2016 16:39:42 +0100 Subject: [PATCH] bug fix --- sys/css/lightbox.min.css | 3 --- sys/gulpfile.js | 16 ++++++++-------- sys/style.tpl.html | 2 ++ sys/tex2html.sh | 15 +++++++++++---- 4 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 sys/css/lightbox.min.css create mode 100644 sys/style.tpl.html diff --git a/sys/css/lightbox.min.css b/sys/css/lightbox.min.css deleted file mode 100644 index 4e71b9c..0000000 --- a/sys/css/lightbox.min.css +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/sys/gulpfile.js b/sys/gulpfile.js index a1f26b1..3c11d8d 100644 --- a/sys/gulpfile.js +++ b/sys/gulpfile.js @@ -24,17 +24,17 @@ gulp.task('scss', function() { .pipe(wrap('')) .pipe(gulp.dest('css')); }); - -gulp.task('wrap', function(){ - return gulp.src( 'bower_components/lightbox2/dist/css/lightbox.min.css') - .pipe(wrap('')) - .pipe(gulp.dest('css')); -}) +// +// gulp.task('wrap', function(){ +// return gulp.src( 'bower_components/lightbox2/dist/css/lightbox.min.css') +// .pipe(wrap('')) +// .pipe(gulp.dest('css')); +// }) // Watch Files For Changes gulp.task('dev-watch', function() { - gulp.watch( 'scss/*.scss', ['scss', 'wrap']); + gulp.watch( 'scss/*.scss', ['scss']); }); // Default Task -gulp.task('default', ['scss', 'wrap']); +gulp.task('default', ['scss']); diff --git a/sys/style.tpl.html b/sys/style.tpl.html new file mode 100644 index 0000000..c9c1562 --- /dev/null +++ b/sys/style.tpl.html @@ -0,0 +1,2 @@ + + diff --git a/sys/tex2html.sh b/sys/tex2html.sh index ea62156..64c2d1a 100755 --- a/sys/tex2html.sh +++ b/sys/tex2html.sh @@ -4,6 +4,7 @@ echo "generating complete file" +echo "creating folders" if [ ! -d ../output/images ]; then mkdir ../output/images fi @@ -23,6 +24,7 @@ touch content.textile echo "" > /tmp/summary +echo "reading content" # _ _ # | | | | # ___ ___ _ __ | |_ ___ _ __ | |_ @@ -32,12 +34,13 @@ echo "" > /tmp/summary echo "
" >> content.textile for i in ../content/*; do # if folder if not sys if not modele - if [ -d "$i" ] && [ "$i" != "../model" ]; then + if [ -d "$i" ] && [[ ! "$i" =~ "model" ]]; then # if readme exists if [ -f "$i/readme.textile" ]; then # user name # record readme content on variable cont=$(cat "$i/readme.textile") + echo " $i" # echo "$cont" # user=$(grep "h1\.\s*.+" "$i/readme.textile") @@ -69,6 +72,7 @@ for i in ../content/*; do # |_|_| |_| |_|\__,_|\__, |\___||___/ # __/ | # |___/ + echo " images" images="" l=0 echo "
"$'\n' >> content.textile @@ -109,6 +113,7 @@ for i in ../content/*; do # (__ ) /_/ / /_/ / / / /__/ __(__ ) # /____/\____/\__,_/_/ \___/\___/____/ # + echo " sources" echo "
"$'\n' >> content.textile for src in $i/sources/*; do # echo "patch : $src" @@ -141,6 +146,7 @@ echo "
" >> content.textile # | '_ \ / _ \/ _` |/ _` |/ _ \ '__| # | | | | __/ (_| | (_| | __/ | # |_| |_|\___|\__,_|\__,_|\___|_| +echo "header" touch /tmp/header echo "" >> /tmp/header cat /tmp/header|cat - content.textile > /tmp/out && mv /tmp/out content.textile - +echo "Pandoc" pandoc -s \ -f textile \ -t html5 -o ../output/index.html \ - -H css/lightbox.min.css \ - -H css/main.css \ + -H style.tpl.html \ -A script.tpl.html \ content.textile + # -H css/main.css \ +cp -r css ../output/ cp -r fonts ../output/ cp -r bower_components ../output/