From c74bb9c9394aca09cedffcf63b55260e8bd42107 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Thu, 15 Nov 2012 13:51:33 +0000 Subject: [PATCH] + better html conformance for static pages --- src/common/resourceTools.h | 68 +++++++++++++++++++----------------- static/server/home.html.tmpl | 3 +- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/common/resourceTools.h b/src/common/resourceTools.h index 1b409050c..9a704c15f 100644 --- a/src/common/resourceTools.h +++ b/src/common/resourceTools.h @@ -21486,38 +21486,42 @@ const unsigned char server_taskbar_css[]={ }; const unsigned char server_home_html_tmpl[]={ - 0x3c,0x68,0x74,0x6d,0x6c,0x3e,0x0a,0x3c,0x68,0x65,0x61,0x64,0x3e,0x0a,0x20,0x20, - 0x3c,0x6d,0x65,0x74,0x61,0x20,0x63,0x68,0x61,0x72,0x73,0x65,0x74,0x3d,0x22,0x55, - 0x54,0x46,0x2d,0x38,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x74,0x69,0x74,0x6c, - 0x65,0x3e,0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x4b,0x69,0x77, - 0x69,0x78,0x20,0x53,0x65,0x72,0x76,0x65,0x72,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65, - 0x3e,0x0a,0x20,0x20,0x3c,0x6c,0x69,0x6e,0x6b,0x20,0x74,0x79,0x70,0x65,0x3d,0x22, - 0x74,0x65,0x78,0x74,0x2f,0x63,0x73,0x73,0x22,0x20,0x68,0x72,0x65,0x66,0x3d,0x22, - 0x2f,0x73,0x6b,0x69,0x6e,0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x75,0x69,0x2f,0x63, - 0x73,0x73,0x2f,0x73,0x6d,0x6f,0x6f,0x74,0x68,0x6e,0x65,0x73,0x73,0x2f,0x6a,0x71, - 0x75,0x65,0x72,0x79,0x2d,0x75,0x69,0x2e,0x63,0x75,0x73,0x74,0x6f,0x6d,0x2e,0x63, - 0x73,0x73,0x22,0x20,0x72,0x65,0x6c,0x3d,0x22,0x53,0x74,0x79,0x6c,0x65,0x73,0x68, - 0x65,0x65,0x74,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x73,0x63,0x72,0x69,0x70, - 0x74,0x20,0x74,0x79,0x70,0x65,0x3d,0x22,0x74,0x65,0x78,0x74,0x2f,0x6a,0x61,0x76, - 0x61,0x73,0x63,0x72,0x69,0x70,0x74,0x22,0x20,0x73,0x72,0x63,0x3d,0x22,0x2f,0x73, - 0x6b,0x69,0x6e,0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x75,0x69,0x2f,0x6a,0x73,0x2f, - 0x6a,0x71,0x75,0x65,0x72,0x79,0x2e,0x6d,0x69,0x6e,0x2e,0x6a,0x73,0x22,0x3e,0x3c, - 0x2f,0x73,0x63,0x72,0x69,0x70,0x74,0x3e,0x0a,0x20,0x20,0x3c,0x73,0x63,0x72,0x69, - 0x70,0x74,0x20,0x74,0x79,0x70,0x65,0x3d,0x22,0x74,0x65,0x78,0x74,0x2f,0x6a,0x61, - 0x76,0x61,0x73,0x63,0x72,0x69,0x70,0x74,0x22,0x20,0x73,0x72,0x63,0x3d,0x22,0x2f, - 0x73,0x6b,0x69,0x6e,0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x75,0x69,0x2f,0x6a,0x73, - 0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x2d,0x75,0x69,0x2e,0x63,0x75,0x73,0x74,0x6f, - 0x6d,0x2e,0x6d,0x69,0x6e,0x2e,0x6a,0x73,0x22,0x3e,0x3c,0x2f,0x73,0x63,0x72,0x69, - 0x70,0x74,0x3e,0x0a,0x3c,0x73,0x63,0x72,0x69,0x70,0x74,0x3e,0x0a,0x24,0x28,0x66, - 0x75,0x6e,0x63,0x74,0x69,0x6f,0x6e,0x28,0x29,0x20,0x7b,0x0a,0x24,0x28,0x20,0x22, - 0x23,0x61,0x63,0x63,0x6f,0x72,0x64,0x69,0x6f,0x6e,0x22,0x20,0x29,0x2e,0x61,0x63, - 0x63,0x6f,0x72,0x64,0x69,0x6f,0x6e,0x28,0x29,0x3b,0x0a,0x7d,0x29,0x3b,0x0a,0x3c, - 0x2f,0x73,0x63,0x72,0x69,0x70,0x74,0x3e,0x0a,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e, - 0x0a,0x3c,0x62,0x6f,0x64,0x79,0x3e,0x0a,0x0a,0x3c,0x64,0x69,0x76,0x20,0x69,0x64, - 0x3d,0x22,0x61,0x63,0x63,0x6f,0x72,0x64,0x69,0x6f,0x6e,0x22,0x3e,0x0a,0x20,0x20, - 0x5f,0x5f,0x42,0x4f,0x4f,0x4b,0x53,0x5f,0x5f,0x0a,0x3c,0x2f,0x64,0x69,0x76,0x3e, - 0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0a,0x3c,0x2f,0x68,0x74,0x6d,0x6c,0x3e, - 0x0a + 0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31, + 0x2e,0x30,0x22,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,0x55,0x54, + 0x46,0x2d,0x38,0x22,0x20,0x3f,0x3e,0x0a,0x3c,0x68,0x74,0x6d,0x6c,0x20,0x78,0x6d, + 0x6c,0x6e,0x73,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e, + 0x77,0x33,0x2e,0x6f,0x72,0x67,0x2f,0x31,0x39,0x39,0x39,0x2f,0x78,0x68,0x74,0x6d, + 0x6c,0x22,0x3e,0x0a,0x3c,0x68,0x65,0x61,0x64,0x3e,0x0a,0x20,0x20,0x3c,0x6d,0x65, + 0x74,0x61,0x20,0x63,0x68,0x61,0x72,0x73,0x65,0x74,0x3d,0x22,0x55,0x54,0x46,0x2d, + 0x38,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x74,0x69,0x74,0x6c,0x65,0x3e,0x57, + 0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x4b,0x69,0x77,0x69,0x78,0x20, + 0x53,0x65,0x72,0x76,0x65,0x72,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0a,0x20, + 0x20,0x3c,0x6c,0x69,0x6e,0x6b,0x20,0x74,0x79,0x70,0x65,0x3d,0x22,0x74,0x65,0x78, + 0x74,0x2f,0x63,0x73,0x73,0x22,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x2f,0x73,0x6b, + 0x69,0x6e,0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x75,0x69,0x2f,0x63,0x73,0x73,0x2f, + 0x73,0x6d,0x6f,0x6f,0x74,0x68,0x6e,0x65,0x73,0x73,0x2f,0x6a,0x71,0x75,0x65,0x72, + 0x79,0x2d,0x75,0x69,0x2e,0x63,0x75,0x73,0x74,0x6f,0x6d,0x2e,0x63,0x73,0x73,0x22, + 0x20,0x72,0x65,0x6c,0x3d,0x22,0x53,0x74,0x79,0x6c,0x65,0x73,0x68,0x65,0x65,0x74, + 0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x73,0x63,0x72,0x69,0x70,0x74,0x20,0x74, + 0x79,0x70,0x65,0x3d,0x22,0x74,0x65,0x78,0x74,0x2f,0x6a,0x61,0x76,0x61,0x73,0x63, + 0x72,0x69,0x70,0x74,0x22,0x20,0x73,0x72,0x63,0x3d,0x22,0x2f,0x73,0x6b,0x69,0x6e, + 0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x75,0x69,0x2f,0x6a,0x73,0x2f,0x6a,0x71,0x75, + 0x65,0x72,0x79,0x2e,0x6d,0x69,0x6e,0x2e,0x6a,0x73,0x22,0x3e,0x3c,0x2f,0x73,0x63, + 0x72,0x69,0x70,0x74,0x3e,0x0a,0x20,0x20,0x3c,0x73,0x63,0x72,0x69,0x70,0x74,0x20, + 0x74,0x79,0x70,0x65,0x3d,0x22,0x74,0x65,0x78,0x74,0x2f,0x6a,0x61,0x76,0x61,0x73, + 0x63,0x72,0x69,0x70,0x74,0x22,0x20,0x73,0x72,0x63,0x3d,0x22,0x2f,0x73,0x6b,0x69, + 0x6e,0x2f,0x6a,0x71,0x75,0x65,0x72,0x79,0x75,0x69,0x2f,0x6a,0x73,0x2f,0x6a,0x71, + 0x75,0x65,0x72,0x79,0x2d,0x75,0x69,0x2e,0x63,0x75,0x73,0x74,0x6f,0x6d,0x2e,0x6d, + 0x69,0x6e,0x2e,0x6a,0x73,0x22,0x3e,0x3c,0x2f,0x73,0x63,0x72,0x69,0x70,0x74,0x3e, + 0x0a,0x3c,0x73,0x63,0x72,0x69,0x70,0x74,0x3e,0x0a,0x24,0x28,0x66,0x75,0x6e,0x63, + 0x74,0x69,0x6f,0x6e,0x28,0x29,0x20,0x7b,0x0a,0x24,0x28,0x20,0x22,0x23,0x61,0x63, + 0x63,0x6f,0x72,0x64,0x69,0x6f,0x6e,0x22,0x20,0x29,0x2e,0x61,0x63,0x63,0x6f,0x72, + 0x64,0x69,0x6f,0x6e,0x28,0x29,0x3b,0x0a,0x7d,0x29,0x3b,0x0a,0x3c,0x2f,0x73,0x63, + 0x72,0x69,0x70,0x74,0x3e,0x0a,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0a,0x3c,0x62, + 0x6f,0x64,0x79,0x3e,0x0a,0x0a,0x3c,0x64,0x69,0x76,0x20,0x69,0x64,0x3d,0x22,0x61, + 0x63,0x63,0x6f,0x72,0x64,0x69,0x6f,0x6e,0x22,0x3e,0x0a,0x20,0x20,0x5f,0x5f,0x42, + 0x4f,0x4f,0x4b,0x53,0x5f,0x5f,0x0a,0x3c,0x2f,0x64,0x69,0x76,0x3e,0x0a,0x3c,0x2f, + 0x62,0x6f,0x64,0x79,0x3e,0x0a,0x3c,0x2f,0x68,0x74,0x6d,0x6c,0x3e,0x0a }; const unsigned char server_taskbar_html_part[]={ diff --git a/static/server/home.html.tmpl b/static/server/home.html.tmpl index 5647c2bb5..7191df921 100644 --- a/static/server/home.html.tmpl +++ b/static/server/home.html.tmpl @@ -1,4 +1,5 @@ - + + Welcome to Kiwix Server