summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2013-08-26 12:50:17 (GMT)
committer Jaromil <jaromil@dyne.org>2013-08-26 12:50:17 (GMT)
commitd39dcf240badddbd22f8ddb258766c5481827177 (patch)
tree6a65adffcb940997311d5b8621bc00be4cc31c03
parentfd73f341d4b276e25ff69920905033e3b2c9f904 (diff)
some fixes and theme descriptions
-rwxr-xr-xconvert15
-rw-r--r--css/custom.css1
-rwxr-xr-xinit3
-rwxr-xr-xrender7
-rwxr-xr-xtheme18
5 files changed, 32 insertions, 12 deletions
diff --git a/convert b/convert
index 1a94d0a..7889fdd 100755
--- a/convert
+++ b/convert
@@ -28,17 +28,19 @@ CMD=`basename $0`
source ${DIR}/utils
+DEBUG=1
+
{ test "$3" = "" } && {
- error "usage: remaster [destination dir] [images dir] [commands]";
+ error "usage: $0 [destination dir] [images dir] [commands]";
act "commands are imagemagick's convert commands"
return 1 }
-dst="$1"; shift
-src="$1"; shift
+dst="$1"; shift 1
+src="$1"; shift 1
act "source: $src"
act "destination: $dst"
-act "convert args: ${=@}"
+act "convert args: ${@}"
images=()
@@ -53,8 +55,9 @@ for i in $images; do
destfile=`basename $i`
# escape all weird characters in filenames
destfile_sane=`print $destfile | sed -e "s@'@@g"`
- act -n "resizing $destfile_sane ... "
- convert $i ${=@} $dst/$destfile_sane
+ func "convert $i ${@} $dst/$destfile_sane (was $destfile)"
+ act -n "convert $destfile_sane ... "
+ convert $i ${@} $dst/$destfile_sane
if [ $? = 0 ]; then
results+=($dst/$destfile_sane)
print " done"
diff --git a/css/custom.css b/css/custom.css
new file mode 100644
index 0000000..52e325a
--- /dev/null
+++ b/css/custom.css
@@ -0,0 +1 @@
+/* Custom changes to stylesheet below */
diff --git a/init b/init
index b0af380..82a909e 100755
--- a/init
+++ b/init
@@ -30,7 +30,8 @@ CMD=`basename $0`
source $DIR/utils
-mkdir -p views
+mkdir -p views/js
+mkdir -p views/css
{ test -r views/index.html } || {
cat <<EOF > views/index.html
<h1>Hello world</h1>
diff --git a/render b/render
index bcaf964..5ab5f2b 100755
--- a/render
+++ b/render
@@ -68,9 +68,9 @@ render_header() {
<link href="css/bootstrap-responsive.min.css" rel="stylesheet" />
EOF
- { test -r views/css/style.css } && {
+ { test -r views/css/custom.css } && {
cat <<EOF
- <link href="css/style.css" rel="stylesheet" />
+ <link href="css/custom.css" rel="stylesheet" />
EOF
}
@@ -229,13 +229,12 @@ blueimp.Gallery(slides, {
carousel: true,
fullscreen: true,
closeOnEscape: true,
- closeOnSlideClick: true,
closeOnSwipeUpOrDown: true,
startSlideshow: true,
slideshowInterval: 4500,
});
EOF
-
+# closeOnSlideClick: true,
includejs=(js/jquery.min.js)
includejs+=(js/bootstrap.min.js)
diff --git a/theme b/theme
index 21e202c..0bb70f4 100755
--- a/theme
+++ b/theme
@@ -36,10 +36,26 @@ source ${DIR}/utils
####################################
+typeset -A themedesc
+
+themedesc[amelia]="colorful, blue background, red menu"
+themedesc[cerulean]="light, white background, blue menu"
+themedesc[readable]="light, white background, serif"
+themedesc[journal]="light, white background, uppercase sans"
+themedesc[cyborg]="dark, almost black, background"
+themedesc[slate]="dark gray background"
+themedesc[superhero]="dark blue background"
+themedesc[simplex]="light, white background, sans, red links"
+themedesc[spacelab]="light, white background, sans, gray widget menus"
+themedesc[spruce]="dark, gray background, serif"
+themedesc[united]="light, white background, sans, orange block menus"
+
+
+
{ test -z $1 } && {
notice "List of available themes:"
for i in `ls ${DIR}/themes`; do
- act "$i"
+ act "$i : ${themedesc[$i]}"
done
exit 0
}