diff --git a/lib/CProject.php b/lib/CProject.php index 0c0730a..3a3a393 100644 --- a/lib/CProject.php +++ b/lib/CProject.php @@ -117,7 +117,7 @@ class CProject { // Generate image thumbnails foreach($this->images as $idx => $image) { - $outfile = BASEDIR.'wwwroot/srv/'.$this->projname.'_'.$idx; + $outfile = BASEDIR.'wwwroot/img/'.$this->projname.'_'.$idx; copy($this->dir.$image, $outfile.'.'.str_ext($image)); mkthumbnail($outfile.'.'.str_ext($image), $outfile.'_thumb.jpg', PAGE_THUMB_W, PAGE_THUMB_H); diff --git a/lib/template.php b/lib/template.php index 96a1f56..61f23f7 100644 --- a/lib/template.php +++ b/lib/template.php @@ -9,9 +9,9 @@ function template($title, $content) { - - - + + + <?=hesc($title)?> diff --git a/rebuild.sh b/rebuild.sh index 2661cff..e82b518 100644 --- a/rebuild.sh +++ b/rebuild.sh @@ -19,15 +19,15 @@ buildsite() { if [[ -d wwwroot ]] ; then rm -r wwwroot fi - mkdir -p wwwroot/srv + mkdir -p wwwroot/{img,srv,static} echo "Copying static resources..." if [[ ! -d static ]] ; then mkdir static fi - cp "${APP_DIR}/static/"* wwwroot || true - cp static/* wwwroot || true + cp "${APP_DIR}/static/"* wwwroot/static || true + cp static/* wwwroot/static || true for htm in footer header homepage_blurb ; do if [[ ! -f "${htm}.htm" ]] ; then