Change global document layout

Use a document-wide table for the main layout Signed-off-by: Lars Hjemli <larsh@slaptop.hjemli.net>
author: Lars Hjemli <larsh@slaptop.hjemli.net> 2007-01-28 10:33:55 (UTC)
committer: Lars Hjemli <larsh@slaptop.hjemli.net> 2007-01-28 10:33:55 (UTC)
commit: 8596cda71d04cd49cb983aee7968d14cc58c030d (patch) (unidiff)
tree: 6f8053d21fecd718d3493fe665240dc7892d44d2
parent: 4a9dea5c0104471324f01663420685e45fe3b480 (diff)
download: cgit-8596cda71d04cd49cb983aee7968d14cc58c030d.zip
cgit-8596cda71d04cd49cb983aee7968d14cc58c030d.tar.gz
cgit-8596cda71d04cd49cb983aee7968d14cc58c030d.tar.bz2
2 files changed, 16 insertions, 12 deletions
diff --git a/cgit.css b/cgit.css
index d2c0d0b..63acd78 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,122 +1,125 @@
 body {
        font-family: arial;
        font-size: normal;
        background: white;
        padding: 0em;
-        margin: 0.5em 1em;
+        margin: 0em;
 }
 h2 {
        font-size: 120%;
        font-weight: bold;
        margin-bottom: 0.5em;
 }
 a {
        color: blue;
        text-decoration: none;
 }
 a:hover {
        text-decoration: underline;
 }
 table.list {
        border: none;
        border-collapse: collapse;
 }
 table.list tr {
        background: white;
 }
 table.list tr:hover {
        background: #eee;
 }
 table.list tr.nohover:hover {
        background: white;
 }
 table.list th {
        font-weight: normal;
        border-bottom: solid 1px #777;
        padding: 0.1em 0.5em 0.1em 0.5em;
        vertical-align: baseline;
 }
 table.list td {
        border: none;
        padding: 0.1em 0.5em 0.1em 0.5em;
 }
 img {
        border: none;
 }
+table#layout {
-div#header {
+        width: 100%;
+        border-collapse: collapse;
+        margin: 0px;
+}
+td#header {
        background-color: #ddd;
        padding: 0.25em 0.25em 0.25em 0.5em;
        font-size: 150%;
        font-weight: bold;
-        border: solid 1px #aaa;
+        border-bottom: solid 1px #aaa;
        vertical-align: middle;
-        margin-bottom: 2em;
 }
-div#header img#logo {
+td#header img#logo {
        float: right;
 }
-div#header input {
+td#header input {
        float: right;
        margin: 0.25em 1em;
 }
-div#header a {
+td#header a {
        color: black;
 }
-div#content {
+td#content {
-        margin: 0.5em 0.5em;
+        padding: 1em 0.5em;
 }
 div#blob {
        border: solid 1px black;
 }
 div.error {
        color: red;
        font-weight: bold;
        margin: 1em 2em;
 }
 div.ls-blob, div.ls-dir {
        font-family: monospace;
 }
 div.ls-dir a {
        font-weight: bold;
 }
 th.filesize, td.filesize {
        text-align: right;
 }
 td.filesize {
        font-family: monospace;
 }
 td.filemode {
        font-family: monospace;
 }
 td.blob {
        white-space: pre;
        font-family: monospace;
        background-color: white;
 }
 table.nowrap td {
        white-space: nowrap;
 }
 table.commit-info {
        border-collapse: collapse;
        margin-top: 1.5em;
 }
 table.commit-info th {
        text-align: left;
        font-weight: normal;
        padding: 0.1em 1em 0.1em 0.1em;
 }
 table.commit-info td {
        font-weight: normal;
diff --git a/ui-shared.c b/ui-shared.c
index bebd3e0..6300516 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -62,78 +62,79 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
 char *cgit_currurl()
 {
        if (!cgit_virtual_root)
                return "./cgit.cgi";
        else if (cgit_query_page)
                return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
        else if (cgit_query_repo)
                return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
        else
                return fmt("%s/", cgit_virtual_root);
 }
 void cgit_print_date(unsigned long secs)
 {
        char buf[32];
        struct tm *time;
        time = gmtime(&secs);
        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
        html_txt(buf);
        
 }
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
        html("Content-Type: text/html; charset=utf-8\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("<head>\n");
        html("<title>");
        html_txt(title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
+        html("</td></tr></table>");
        html("</body>\n</html>\n");
 }
 void cgit_print_pageheader(char *title, int show_search)
 {
-        html("<div id='header'>");
+        html("<table id='layout'><tr><td id='header'>");
        htmlf("<a href='%s'>", cgit_logo_link);
        htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
        htmlf("</a>");
        if (show_search) {
                html("<form method='get' href='");
                html_attr(cgit_currurl());
                html("'>");
                if (cgit_query_head)
                        html_hidden("h", cgit_query_head);
                if (cgit_query_sha1)
                        html_hidden("id", cgit_query_sha1);
                if (cgit_query_sha2)
                        html_hidden("id2", cgit_query_sha2);
                html("<input type='text' name='q' value='");
                html_attr(cgit_query_search);
                html("'/></form>");
        }
        if (cgit_query_repo)
                htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
        html_txt(title);
        if (cgit_query_repo)
                html("</a>");
-        html("</div>");
+        html("</td></tr><tr><td id='content'>");
 }
author	Lars Hjemli <larsh@slaptop.hjemli.net>	2007-01-28 10:33:55 (UTC)
committer	Lars Hjemli <larsh@slaptop.hjemli.net>	2007-01-28 10:33:55 (UTC)
commit	8596cda71d04cd49cb983aee7968d14cc58c030d (patch) (unidiff)
tree	6f8053d21fecd718d3493fe665240dc7892d44d2
parent	4a9dea5c0104471324f01663420685e45fe3b480 (diff)
download	cgit-8596cda71d04cd49cb983aee7968d14cc58c030d.zip cgit-8596cda71d04cd49cb983aee7968d14cc58c030d.tar.gz cgit-8596cda71d04cd49cb983aee7968d14cc58c030d.tar.bz2

diff --git a/cgit.css b/cgit.css index d2c0d0b..63acd78 100644 --- a/cgit.css +++ b/cgit.css
@@ -1,122 +1,125 @@
1	body {	1	body {
2	font-family: arial;	2	font-family: arial;
3	font-size: normal;	3	font-size: normal;
4	background: white;	4	background: white;
5	padding: 0em;	5	padding: 0em;
6	margin: 0.5em 1em;	6	margin: 0em;
7	}	7	}
8		8
9		9
10	h2 {	10	h2 {
11	font-size: 120%;	11	font-size: 120%;
12	font-weight: bold;	12	font-weight: bold;
13	margin-bottom: 0.5em;	13	margin-bottom: 0.5em;
14	}	14	}
15		15
16	a {	16	a {
17	color: blue;	17	color: blue;
18	text-decoration: none;	18	text-decoration: none;
19	}	19	}
20		20
21	a:hover {	21	a:hover {
22	text-decoration: underline;	22	text-decoration: underline;
23	}	23	}
24		24
25	table.list {	25	table.list {
26	border: none;	26	border: none;
27	border-collapse: collapse;	27	border-collapse: collapse;
28	}	28	}
29	table.list tr {	29	table.list tr {
30	background: white;	30	background: white;
31	}	31	}
32	table.list tr:hover {	32	table.list tr:hover {
33	background: #eee;	33	background: #eee;
34	}	34	}
35	table.list tr.nohover:hover {	35	table.list tr.nohover:hover {
36	background: white;	36	background: white;
37	}	37	}
38	table.list th {	38	table.list th {
39	font-weight: normal;	39	font-weight: normal;
40	border-bottom: solid 1px #777;	40	border-bottom: solid 1px #777;
41	padding: 0.1em 0.5em 0.1em 0.5em;	41	padding: 0.1em 0.5em 0.1em 0.5em;
42	vertical-align: baseline;	42	vertical-align: baseline;
43	}	43	}
44	table.list td {	44	table.list td {
45	border: none;	45	border: none;
46	padding: 0.1em 0.5em 0.1em 0.5em;	46	padding: 0.1em 0.5em 0.1em 0.5em;
47	}	47	}
48	img {	48	img {
49	border: none;	49	border: none;
50	}	50	}
51		51	table#layout {
52	div#header {	52	width: 100%;
		53	border-collapse: collapse;
		54	margin: 0px;
		55	}
		56	td#header {
53	background-color: #ddd;	57	background-color: #ddd;
54	padding: 0.25em 0.25em 0.25em 0.5em;	58	padding: 0.25em 0.25em 0.25em 0.5em;
55	font-size: 150%;	59	font-size: 150%;
56	font-weight: bold;	60	font-weight: bold;
57	border: solid 1px #aaa;	61	border-bottom: solid 1px #aaa;
58	vertical-align: middle;	62	vertical-align: middle;
59	margin-bottom: 2em;
60	}	63	}
61	div#header img#logo {	64	td#header img#logo {
62	float: right;	65	float: right;
63	}	66	}
64		67
65	div#header input {	68	td#header input {
66	float: right;	69	float: right;
67	margin: 0.25em 1em;	70	margin: 0.25em 1em;
68	}	71	}
69	div#header a {	72	td#header a {
70	color: black;	73	color: black;
71	}	74	}
72		75
73	div#content {	76	td#content {
74	margin: 0.5em 0.5em;	77	padding: 1em 0.5em;
75	}	78	}
76		79
77	div#blob {	80	div#blob {
78	border: solid 1px black;	81	border: solid 1px black;
79	}	82	}
80		83
81	div.error {	84	div.error {
82	color: red;	85	color: red;
83	font-weight: bold;	86	font-weight: bold;
84	margin: 1em 2em;	87	margin: 1em 2em;
85	}	88	}
86	div.ls-blob, div.ls-dir {	89	div.ls-blob, div.ls-dir {
87	font-family: monospace;	90	font-family: monospace;
88	}	91	}
89	div.ls-dir a {	92	div.ls-dir a {
90	font-weight: bold;	93	font-weight: bold;
91	}	94	}
92	th.filesize, td.filesize {	95	th.filesize, td.filesize {
93	text-align: right;	96	text-align: right;
94	}	97	}
95	td.filesize {	98	td.filesize {
96	font-family: monospace;	99	font-family: monospace;
97	}	100	}
98	td.filemode {	101	td.filemode {
99	font-family: monospace;	102	font-family: monospace;
100	}	103	}
101		104
102	td.blob {	105	td.blob {
103	white-space: pre;	106	white-space: pre;
104	font-family: monospace;	107	font-family: monospace;
105	background-color: white;	108	background-color: white;
106	}	109	}
107		110
108	table.nowrap td {	111	table.nowrap td {
109	white-space: nowrap;	112	white-space: nowrap;
110	}	113	}
111		114
112	table.commit-info {	115	table.commit-info {
113	border-collapse: collapse;	116	border-collapse: collapse;
114	margin-top: 1.5em;	117	margin-top: 1.5em;
115	}	118	}
116	table.commit-info th {	119	table.commit-info th {
117	text-align: left;	120	text-align: left;
118	font-weight: normal;	121	font-weight: normal;
119	padding: 0.1em 1em 0.1em 0.1em;	122	padding: 0.1em 1em 0.1em 0.1em;
120	}	123	}
121	table.commit-info td {	124	table.commit-info td {
122	font-weight: normal;	125	font-weight: normal;


diff --git a/ui-shared.c b/ui-shared.c index bebd3e0..6300516 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -62,78 +62,79 @@ char cgit_pageurl(const char reponame, const char *pagename,
62		62
63	char *cgit_currurl()	63	char *cgit_currurl()
64	{	64	{
65	if (!cgit_virtual_root)	65	if (!cgit_virtual_root)
66	return "./cgit.cgi";	66	return "./cgit.cgi";
67	else if (cgit_query_page)	67	else if (cgit_query_page)
68	return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);	68	return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
69	else if (cgit_query_repo)	69	else if (cgit_query_repo)
70	return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);	70	return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
71	else	71	else
72	return fmt("%s/", cgit_virtual_root);	72	return fmt("%s/", cgit_virtual_root);
73	}	73	}
74		74
75		75
76	void cgit_print_date(unsigned long secs)	76	void cgit_print_date(unsigned long secs)
77	{	77	{
78	char buf[32];	78	char buf[32];
79	struct tm *time;	79	struct tm *time;
80		80
81	time = gmtime(&secs);	81	time = gmtime(&secs);
82	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);	82	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
83	html_txt(buf);	83	html_txt(buf);
84		84
85	}	85	}
86		86
87	void cgit_print_docstart(char title, struct cacheitem item)	87	void cgit_print_docstart(char title, struct cacheitem item)
88	{	88	{
89	html("Content-Type: text/html; charset=utf-8\n");	89	html("Content-Type: text/html; charset=utf-8\n");
90	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));	90	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
91	htmlf("Expires: %s\n", http_date(item->st.st_mtime +	91	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
92	ttl_seconds(item->ttl)));	92	ttl_seconds(item->ttl)));
93	html("\n");	93	html("\n");
94	html(cgit_doctype);	94	html(cgit_doctype);
95	html("<html>\n");	95	html("<html>\n");
96	html("<head>\n");	96	html("<head>\n");
97	html("<title>");	97	html("<title>");
98	html_txt(title);	98	html_txt(title);
99	html("</title>\n");	99	html("</title>\n");
100	htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);	100	htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
101	html("<link rel='stylesheet' type='text/css' href='");	101	html("<link rel='stylesheet' type='text/css' href='");
102	html_attr(cgit_css);	102	html_attr(cgit_css);
103	html("'/>\n");	103	html("'/>\n");
104	html("</head>\n");	104	html("</head>\n");
105	html("<body>\n");	105	html("<body>\n");
106	}	106	}
107		107
108	void cgit_print_docend()	108	void cgit_print_docend()
109	{	109	{
		110	html("</td></tr></table>");
110	html("</body>\n</html>\n");	111	html("</body>\n</html>\n");
111	}	112	}
112		113
113	void cgit_print_pageheader(char *title, int show_search)	114	void cgit_print_pageheader(char *title, int show_search)
114	{	115	{
115	html("<div id='header'>");	116	html("<table id='layout'><tr><td id='header'>");
116	htmlf("<a href='%s'>", cgit_logo_link);	117	htmlf("<a href='%s'>", cgit_logo_link);
117	htmlf("<img id='logo' src='%s'/>\n", cgit_logo);	118	htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
118	htmlf("</a>");	119	htmlf("</a>");
119	if (show_search) {	120	if (show_search) {
120	html("<form method='get' href='");	121	html("<form method='get' href='");
121	html_attr(cgit_currurl());	122	html_attr(cgit_currurl());
122	html("'>");	123	html("'>");
123	if (cgit_query_head)	124	if (cgit_query_head)
124	html_hidden("h", cgit_query_head);	125	html_hidden("h", cgit_query_head);
125	if (cgit_query_sha1)	126	if (cgit_query_sha1)
126	html_hidden("id", cgit_query_sha1);	127	html_hidden("id", cgit_query_sha1);
127	if (cgit_query_sha2)	128	if (cgit_query_sha2)
128	html_hidden("id2", cgit_query_sha2);	129	html_hidden("id2", cgit_query_sha2);
129	html("<input type='text' name='q' value='");	130	html("<input type='text' name='q' value='");
130	html_attr(cgit_query_search);	131	html_attr(cgit_query_search);
131	html("'/></form>");	132	html("'/></form>");
132	}	133	}
133	if (cgit_query_repo)	134	if (cgit_query_repo)
134	htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));	135	htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
135	html_txt(title);	136	html_txt(title);
136	if (cgit_query_repo)	137	if (cgit_query_repo)
137	html("</a>");	138	html("</a>");
138	html("</div>");	139	html("</td></tr><tr><td id='content'>");
139	}	140	}