From 4259de99f229b228134e7d674d237151f967b11e Mon Sep 17 00:00:00 2001
From: kelson42 <kelson42@users.sourceforge.net>
Date: Thu, 3 May 2012 10:11:05 +0000
Subject: [PATCH] + change HTML ids of kiwix taskbar

---
 src/common/resourceTools.h      | 88 +++++++++++++++++----------------
 static/server/taskbar.css       | 10 ++--
 static/server/taskbar.html.part | 10 ++--
 3 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/common/resourceTools.h b/src/common/resourceTools.h
index 2cf6ecf92..664796bc6 100644
--- a/src/common/resourceTools.h
+++ b/src/common/resourceTools.h
@@ -7,54 +7,56 @@
 std::string getResourceAsString(const std::string &name);
 
 const char server_taskbar_css[]=
-  "\x23\x74\x6f\x6f\x6c\x62\x61\x72\x20\x7b\x0a\x20\x20\x20\x20\x70\x6f\x73\x69\x74"
-  "\x69\x6f\x6e\x3a\x20\x66\x69\x78\x65\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64"
-  "\x69\x6e\x67\x3a\x20\x34\x70\x78\x20\x31\x35\x70\x78\x20\x35\x70\x78\x20\x31\x35"
-  "\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\x3a"
-  "\x20\x2d\x31\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x72"
-  "\x69\x67\x68\x74\x3a\x20\x2d\x31\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x6c\x65\x66"
-  "\x74\x3a\x30\x3b\x0a\x20\x20\x20\x20\x72\x69\x67\x68\x74\x3a\x30\x3b\x0a\x20\x20"
-  "\x20\x20\x74\x6f\x70\x3a\x20\x31\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x7a\x2d\x69"
-  "\x6e\x64\x65\x78\x3a\x31\x30\x30\x3b\x0a\x7d\x0a\x0a\x23\x68\x6f\x6d\x65\x20\x7b"
-  "\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x30\x70\x78\x3b\x0a\x20\x20"
-  "\x20\x20\x66\x6c\x6f\x61\x74\x3a\x20\x6c\x65\x66\x74\x3b\x0a\x7d\x0a\x0a\x23\x6c"
-  "\x69\x62\x72\x61\x72\x79\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a"
-  "\x20\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6c\x6f\x61\x74\x3a\x20\x6c\x65\x66"
-  "\x74\x3b\x0a\x7d\x0a\x0a\x23\x73\x65\x61\x72\x63\x68\x62\x6f\x78\x20\x7b\x0a\x20"
+  "\x23\x6b\x69\x77\x69\x78\x74\x6f\x6f\x6c\x62\x61\x72\x20\x7b\x0a\x20\x20\x20\x20"
+  "\x70\x6f\x73\x69\x74\x69\x6f\x6e\x3a\x20\x66\x69\x78\x65\x64\x3b\x0a\x20\x20\x20"
+  "\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x34\x70\x78\x20\x31\x35\x70\x78\x20\x35"
+  "\x70\x78\x20\x31\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d"
+  "\x6c\x65\x66\x74\x3a\x20\x2d\x31\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72"
+  "\x67\x69\x6e\x2d\x72\x69\x67\x68\x74\x3a\x20\x2d\x31\x30\x70\x78\x3b\x0a\x20\x20"
+  "\x20\x20\x6c\x65\x66\x74\x3a\x30\x3b\x0a\x20\x20\x20\x20\x72\x69\x67\x68\x74\x3a"
+  "\x30\x3b\x0a\x20\x20\x20\x20\x74\x6f\x70\x3a\x20\x31\x30\x70\x78\x3b\x0a\x20\x20"
+  "\x20\x20\x7a\x2d\x69\x6e\x64\x65\x78\x3a\x31\x30\x30\x3b\x0a\x7d\x0a\x0a\x23\x6b"
+  "\x69\x77\x69\x78\x68\x6f\x6d\x65\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69"
+  "\x6e\x3a\x20\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6c\x6f\x61\x74\x3a\x20\x6c"
+  "\x65\x66\x74\x3b\x0a\x7d\x0a\x0a\x23\x6b\x69\x77\x69\x78\x6c\x69\x62\x72\x61\x72"
+  "\x79\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x30\x70\x78\x3b"
+  "\x0a\x20\x20\x20\x20\x66\x6c\x6f\x61\x74\x3a\x20\x6c\x65\x66\x74\x3b\x0a\x7d\x0a"
+  "\x0a\x23\x6b\x69\x77\x69\x78\x73\x65\x61\x72\x63\x68\x62\x6f\x78\x20\x7b\x0a\x20"
   "\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x30\x70\x78\x3b\x0a\x20\x20\x20\x20"
-  "\x66\x6c\x6f\x61\x74\x3a\x20\x72\x69\x67\x68\x74\x3b\x0a\x7d\x0a\x0a\x23\x73\x65"
-  "\x61\x72\x63\x68\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x30"
-  "\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6c\x6f\x61\x74\x3a\x20\x72\x69\x67\x68\x74"
-  "\x3b\x0a\x7d\x0a"
+  "\x66\x6c\x6f\x61\x74\x3a\x20\x72\x69\x67\x68\x74\x3b\x0a\x7d\x0a\x0a\x23\x6b\x69"
+  "\x77\x69\x78\x73\x65\x61\x72\x63\x68\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67"
+  "\x69\x6e\x3a\x20\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x66\x6c\x6f\x61\x74\x3a\x20"
+  "\x72\x69\x67\x68\x74\x3b\x0a\x7d\x0a"
   ;
 
 const char server_taskbar_html_part[]=
-  "\x3c\x73\x70\x61\x6e\x20\x69\x64\x3d\x22\x74\x6f\x6f\x6c\x62\x61\x72\x22\x20\x63"
-  "\x6c\x61\x73\x73\x3d\x22\x75\x69\x2d\x77\x69\x64\x67\x65\x74\x2d\x68\x65\x61\x64"
-  "\x65\x72\x20\x75\x69\x2d\x63\x6f\x72\x6e\x65\x72\x2d\x61\x6c\x6c\x22\x3e\x0a\x20"
-  "\x20\x3c\x62\x75\x74\x74\x6f\x6e\x20\x69\x64\x3d\x22\x6c\x69\x62\x72\x61\x72\x79"
-  "\x22\x20\x6f\x6e\x63\x6c\x69\x63\x6b\x3d\x22\x77\x69\x6e\x64\x6f\x77\x2e\x6c\x6f"
-  "\x63\x61\x74\x69\x6f\x6e\x2e\x68\x72\x65\x66\x3d\x27\x2f\x27\x3b\x22\x3e\x4c\x69"
-  "\x62\x72\x61\x72\x79\x3c\x2f\x62\x75\x74\x74\x6f\x6e\x3e\x0a\x20\x20\x3c\x62\x75"
-  "\x74\x74\x6f\x6e\x20\x69\x64\x3d\x22\x68\x6f\x6d\x65\x22\x20\x6f\x6e\x63\x6c\x69"
-  "\x63\x6b\x3d\x22\x77\x69\x6e\x64\x6f\x77\x2e\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e"
-  "\x68\x72\x65\x66\x3d\x27\x2f\x5f\x5f\x43\x4f\x4e\x54\x45\x4e\x54\x5f\x5f\x2f\x27"
-  "\x3b\x22\x3e\x48\x6f\x6d\x65\x3c\x2f\x62\x75\x74\x74\x6f\x6e\x3e\x0a\x20\x20\x3c"
-  "\x66\x6f\x72\x6d\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x47\x45\x54\x22\x20\x61\x63"
-  "\x74\x69\x6f\x6e\x3d\x22\x2f\x73\x65\x61\x72\x63\x68\x22\x20\x2f\x3e\x0a\x20\x20"
-  "\x20\x20\x3c\x69\x6e\x70\x75\x74\x20\x74\x79\x70\x65\x3d\x22\x73\x75\x62\x6d\x69"
-  "\x74\x22\x20\x69\x64\x3d\x22\x73\x65\x61\x72\x63\x68\x22\x20\x76\x61\x6c\x75\x65"
+  "\x3c\x73\x70\x61\x6e\x20\x69\x64\x3d\x22\x6b\x69\x77\x69\x78\x74\x6f\x6f\x6c\x62"
+  "\x61\x72\x22\x20\x63\x6c\x61\x73\x73\x3d\x22\x75\x69\x2d\x77\x69\x64\x67\x65\x74"
+  "\x2d\x68\x65\x61\x64\x65\x72\x20\x75\x69\x2d\x63\x6f\x72\x6e\x65\x72\x2d\x61\x6c"
+  "\x6c\x22\x3e\x0a\x20\x20\x3c\x62\x75\x74\x74\x6f\x6e\x20\x69\x64\x3d\x22\x6b\x69"
+  "\x77\x69\x78\x6c\x69\x62\x72\x61\x72\x79\x22\x20\x6f\x6e\x63\x6c\x69\x63\x6b\x3d"
+  "\x22\x77\x69\x6e\x64\x6f\x77\x2e\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e\x68\x72\x65"
+  "\x66\x3d\x27\x2f\x27\x3b\x22\x3e\x4c\x69\x62\x72\x61\x72\x79\x3c\x2f\x62\x75\x74"
+  "\x74\x6f\x6e\x3e\x0a\x20\x20\x3c\x62\x75\x74\x74\x6f\x6e\x20\x69\x64\x3d\x22\x6b"
+  "\x69\x77\x69\x78\x68\x6f\x6d\x65\x22\x20\x6f\x6e\x63\x6c\x69\x63\x6b\x3d\x22\x77"
+  "\x69\x6e\x64\x6f\x77\x2e\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e\x68\x72\x65\x66\x3d"
+  "\x27\x2f\x5f\x5f\x43\x4f\x4e\x54\x45\x4e\x54\x5f\x5f\x2f\x27\x3b\x22\x3e\x48\x6f"
+  "\x6d\x65\x3c\x2f\x62\x75\x74\x74\x6f\x6e\x3e\x0a\x20\x20\x3c\x66\x6f\x72\x6d\x20"
+  "\x6d\x65\x74\x68\x6f\x64\x3d\x22\x47\x45\x54\x22\x20\x61\x63\x74\x69\x6f\x6e\x3d"
+  "\x22\x2f\x73\x65\x61\x72\x63\x68\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x69\x6e"
+  "\x70\x75\x74\x20\x74\x79\x70\x65\x3d\x22\x73\x75\x62\x6d\x69\x74\x22\x20\x69\x64"
+  "\x3d\x22\x6b\x69\x77\x69\x78\x73\x65\x61\x72\x63\x68\x22\x20\x76\x61\x6c\x75\x65"
   "\x3d\x22\x53\x65\x61\x72\x63\x68\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x69\x6e"
-  "\x70\x75\x74\x20\x69\x64\x3d\x22\x73\x65\x61\x72\x63\x68\x62\x6f\x78\x22\x20\x74"
-  "\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x62\x6f\x78\x22\x20\x6e\x61\x6d\x65\x3d\x22"
-  "\x70\x61\x74\x74\x65\x72\x6e\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x69\x6e\x70"
-  "\x75\x74\x20\x74\x79\x70\x65\x3d\x22\x68\x69\x64\x64\x65\x6e\x22\x20\x6e\x61\x6d"
-  "\x65\x3d\x22\x63\x6f\x6e\x74\x65\x6e\x74\x22\x20\x76\x61\x6c\x75\x65\x3d\x22\x5f"
-  "\x5f\x43\x4f\x4e\x54\x45\x4e\x54\x5f\x5f\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x2f\x66"
-  "\x6f\x72\x6d\x3e\x0a\x3c\x2f\x73\x70\x61\x6e\x3e\x0a\x3c\x64\x69\x76\x20\x73\x74"
-  "\x79\x6c\x65\x3d\x22\x64\x69\x73\x70\x6c\x61\x79\x3a\x20\x62\x6c\x6f\x63\x6b\x3b"
-  "\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x34\x30\x70\x78\x3b\x22\x3e\x3c\x2f\x64\x69"
-  "\x76\x3e\x0a"
+  "\x70\x75\x74\x20\x69\x64\x3d\x22\x6b\x69\x77\x69\x78\x73\x65\x61\x72\x63\x68\x62"
+  "\x6f\x78\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x62\x6f\x78\x22\x20\x6e"
+  "\x61\x6d\x65\x3d\x22\x70\x61\x74\x74\x65\x72\x6e\x22\x20\x2f\x3e\x0a\x20\x20\x20"
+  "\x20\x3c\x69\x6e\x70\x75\x74\x20\x74\x79\x70\x65\x3d\x22\x68\x69\x64\x64\x65\x6e"
+  "\x22\x20\x6e\x61\x6d\x65\x3d\x22\x63\x6f\x6e\x74\x65\x6e\x74\x22\x20\x76\x61\x6c"
+  "\x75\x65\x3d\x22\x5f\x5f\x43\x4f\x4e\x54\x45\x4e\x54\x5f\x5f\x22\x20\x2f\x3e\x0a"
+  "\x20\x20\x3c\x2f\x66\x6f\x72\x6d\x3e\x0a\x3c\x2f\x73\x70\x61\x6e\x3e\x0a\x3c\x64"
+  "\x69\x76\x20\x73\x74\x79\x6c\x65\x3d\x22\x64\x69\x73\x70\x6c\x61\x79\x3a\x20\x62"
+  "\x6c\x6f\x63\x6b\x3b\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x34\x30\x70\x78\x3b\x22"
+  "\x3e\x3c\x2f\x64\x69\x76\x3e\x0a"
   ;
 
 const char server_home_html_tmpl[]=
diff --git a/static/server/taskbar.css b/static/server/taskbar.css
index b14312192..f0b17a2a2 100644
--- a/static/server/taskbar.css
+++ b/static/server/taskbar.css
@@ -1,4 +1,4 @@
-#toolbar {
+#kiwixtoolbar {
     position: fixed;
     padding: 4px 15px 5px 15px;
     margin-left: -10px;
@@ -9,22 +9,22 @@
     z-index:100;
 }
 
-#home {
+#kiwixhome {
     margin: 0px;
     float: left;
 }
 
-#library {
+#kiwixlibrary {
     margin: 0px;
     float: left;
 }
 
-#searchbox {
+#kiwixsearchbox {
     margin: 0px;
     float: right;
 }
 
-#search {
+#kiwixsearch {
     margin: 0px;
     float: right;
 }
diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part
index 98d9ed625..2f30941d4 100644
--- a/static/server/taskbar.html.part
+++ b/static/server/taskbar.html.part
@@ -1,9 +1,9 @@
-<span id="toolbar" class="ui-widget-header ui-corner-all">
-  <button id="library" onclick="window.location.href='/';">Library</button>
-  <button id="home" onclick="window.location.href='/__CONTENT__/';">Home</button>
+<span id="kiwixtoolbar" class="ui-widget-header ui-corner-all">
+  <button id="kiwixlibrary" onclick="window.location.href='/';">Library</button>
+  <button id="kiwixhome" onclick="window.location.href='/__CONTENT__/';">Home</button>
   <form method="GET" action="/search" />
-    <input type="submit" id="search" value="Search" />
-    <input id="searchbox" type="textbox" name="pattern" />
+    <input type="submit" id="kiwixsearch" value="Search" />
+    <input id="kiwixsearchbox" type="textbox" name="pattern" />
     <input type="hidden" name="content" value="__CONTENT__" />
   </form>
 </span>