about summary refs log tree commit diff
path: root/ui-shared.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-shared.c')
-rw-r--r--ui-shared.c42
1 files changed, 23 insertions, 19 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 4944dfd2..3e13c86 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -356,18 +356,20 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
-	html("Content-Type: text/html; charset=utf-8\n");
+	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
 	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
 	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
 					 ttl_seconds(item->ttl)));
 	html("\n");
 	html(cgit_doctype);
-	html("<html>\n");
+	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
 	html("<head>\n");
 	html("<title>");
 	html_txt(title);
 	html("</title>\n");
 	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
+	if (cgit_robots && *cgit_robots)
+		htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
 	html("<link rel='stylesheet' type='text/css' href='");
 	html_attr(cgit_css);
 	html("'/>\n");
@@ -377,7 +379,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 
 void cgit_print_docend()
 {
-	html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
+	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
@@ -415,7 +417,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
 		hashcpy(fileid, sha1);
 	}
 	if (!*header) {
-		html("<p><h1>download</h1>");
+		html("<h1>download</h1>\n");
 		*header = 1;
 	}
 	url = cgit_pageurl(cgit_query_repo, "blob",
@@ -459,22 +461,24 @@ void cgit_print_pageheader(char *title, int show_search)
 	static const char *default_info = "This is cgit, a fast webinterface for git repositories";
 	int header = 0;
 
-	html("<div id='sidebar'>\n");
-	html("<a href='");
+	html("<table id='layout' summary=''>\n");
+	html("<tr><td id='sidebar'>\n");
+	html("<table class='sidebar' cellspacing='0' summary=''>\n");
+	html("<tr><td class='sidebar'>\n<a href='");
 	html_attr(cgit_rooturl());
-	htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n",
+	htmlf("'><img src='%s' alt='cgit'/></a>\n",
 	      cgit_logo);
-	html("<div class='infobox'>");
+	html("</td></tr>\n<tr><td class='sidebar'>\n");
 	if (cgit_query_repo) {
-		html("<h1>");
+		html("<h1 class='first'>");
 		html_txt(strrpart(cgit_repo->name, 20));
 		html("</h1>\n");
 		html_txt(cgit_repo->desc);
 		if (cgit_repo->owner) {
-			html("<p>\n<h1>owner</h1>\n");
+			html("<h1>owner</h1>\n");
 			html_txt(cgit_repo->owner);
 		}
-		html("<p>\n<h1>navigate</h1>\n");
+		html("<h1>navigate</h1>\n");
 		reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
 			    NULL, NULL);
 		cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
@@ -488,19 +492,19 @@ void cgit_print_pageheader(char *title, int show_search)
 
 		for_each_ref(print_archive_ref, &header);
 
-		html("<p>\n<h1>branch</h1>\n");
+		html("<h1>branch</h1>\n");
 		html("<form method='get' action=''>\n");
 		add_hidden_formfields(0, 1, cgit_query_page);
-		html("<table class='grid'><tr><td id='branch-dropdown-cell'>");
+//		html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
 		html("<select name='h' onchange='this.form.submit();'>\n");
 		for_each_branch_ref(print_branch_option, cgit_query_head);
 		html("</select>\n");
-		html("</td><td>");
-		html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n");
-		html("</td></tr></table>");
+//		html("</td><td>");
+		html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+//		html("</td></tr></table>");
 		html("</form>\n");
 
-		html("<p>\n<h1>search</h1>\n");
+		html("<h1>search</h1>\n");
 		html("<form method='get' action='");
 		if (cgit_virtual_root)
 			html_attr(cgit_fileurl(cgit_query_repo, "log",
@@ -521,9 +525,9 @@ void cgit_print_pageheader(char *title, int show_search)
 			html(default_info);
 	}
 
-	html("</div>\n");
+	html("</td></tr></table></td>\n");
 
-	html("</div>\n<table class='grid'><tr><td id='content'>\n");
+	html("<td id='content'>\n");
 }