tazweb rev 111 1.6

New icon and better home page integration
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 24 15:38:05 2012 +0100 (2012-03-24)
parents 8d65e3eb767d
children 2ee839364c5b
files AUTHORS Makefile data/home.en.html data/tazweb-icon.png data/tazweb-logo.png src/main.c
line diff
     1.1 --- a/AUTHORS	Wed Mar 21 03:15:33 2012 -0300
     1.2 +++ b/AUTHORS	Sat Mar 24 15:38:05 2012 +0100
     1.3 @@ -2,3 +2,5 @@
     1.4  Paul Issot <paul@slitaz.org>
     1.5  Christopher Rogers <godane@slitaz.org>
     1.6  Pascal Bellard <pascal.bellard@slitaz.org>
     1.7 +Claudinei Pereira <claudinei@slitaz.org>
     1.8 +Aleksej Bobylev <al.bobylev@gmail.com>
     2.1 --- a/Makefile	Wed Mar 21 03:15:33 2012 -0300
     2.2 +++ b/Makefile	Sat Mar 24 15:38:05 2012 +0100
     2.3 @@ -5,7 +5,7 @@
     2.4  DESTDIR?=
     2.5  
     2.6  PACKAGE=tazweb
     2.7 -VERSION=1.2
     2.8 +VERSION=1.5
     2.9  
    2.10  all:
    2.11  	gcc src/main.c -o $(PACKAGE) \
    2.12 @@ -21,16 +21,11 @@
    2.13  		$(DESTDIR)$(PREFIX)/share/applications
    2.14  	install -m 0755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin
    2.15  	cp -d doc/* $(DESTDIR)$(DOCDIR)/$(PACKAGE)
    2.16 -	install -m 0644 data/tazweb-icon.png \
    2.17 -		$(DESTDIR)$(PREFIX)/share/pixmaps/tazweb.png
    2.18 +	install -m 0644 data/tazweb.png \
    2.19 +		$(DESTDIR)$(PREFIX)/share/pixmaps
    2.20  	install -m 0644 data/tazweb.desktop \
    2.21  		$(DESTDIR)$(PREFIX)/share/applications
    2.22 -	install -m 0644 data/home.en.html \
    2.23 -		$(DESTDIR)$(PREFIX)/share/tazweb
    2.24 -	install -m 0644 data/home.ru.html \
    2.25 -		$(DESTDIR)$(PREFIX)/share/tazweb
    2.26 -	install -m 0644 data/home.html \
    2.27 -		$(DESTDIR)$(PREFIX)/share/tazweb
    2.28 +	cp -a data/*.html $(DESTDIR)$(PREFIX)/share/tazweb
    2.29  	install -m 0644 data/style.css \
    2.30  		$(DESTDIR)$(PREFIX)/share/tazweb
    2.31  
     3.1 --- a/data/home.en.html	Wed Mar 21 03:15:33 2012 -0300
     3.2 +++ b/data/home.en.html	Sat Mar 24 15:38:05 2012 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  <!DOCTYPE html>
     3.5  <html xmlns="http://www.w3.org/1999/xhtml">
     3.6  <head>
     3.7 -	<title>My Web Page</title>
     3.8 +	<title>My Web Home</title>
     3.9  	<meta charset="utf-8" />
    3.10  	<link rel="stylesheet" type="text/css" href="style.css" />
    3.11  </head>
     4.1 Binary file data/tazweb-icon.png has changed
     5.1 Binary file data/tazweb-logo.png has changed
     6.1 --- a/src/main.c	Wed Mar 21 03:15:33 2012 -0300
     6.2 +++ b/src/main.c	Sat Mar 24 15:38:05 2012 +0100
     6.3 @@ -490,8 +490,11 @@
     6.4  		g_thread_init(NULL);
     6.5  
     6.6  	/* Get a default home.html if missing */
     6.7 -	if (! g_file_test(CONFIG, G_FILE_TEST_EXISTS))
     6.8 -		system("cp -r /usr/share/tazweb $HOME/.config/tazweb");
     6.9 +	if (! g_file_test(CONFIG, G_FILE_TEST_EXISTS)) {
    6.10 +		system("mkdir -p $HOME/.config/tazweb");
    6.11 +		system("cp /usr/share/tazweb/home.html $HOME/.config/tazweb");
    6.12 +		system("cp /usr/share/tazweb/style.css $HOME/.config/tazweb");
    6.13 +	}
    6.14  
    6.15  	/* Load the start page file or the url in argument */
    6.16  	uri =(char*)(argc > 1 ? argv[1] : START);