aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2006-12-28 10:01:49 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2006-12-28 10:01:49 (JST)
commite39d738c39d37cdef115c145027f3eec85a62272 (patch)
treebe60a07674a0d118d42f572a35b62ada9529a6bd
parent27cd3b2a700e1cc46cd0393ddea48c07b62ee3a6 (diff)
downloadcgit-e39d738c39d37cdef115c145027f3eec85a62272.zip
cgit-e39d738c39d37cdef115c145027f3eec85a62272.tar.gz
Add generic support for search box in page header
This adds the ability to show a search box in any pageheader with correct href and hidden form data, but does not enable the box on any pages. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.c4
-rw-r--r--cgit.css5
-rw-r--r--cgit.h4
-rw-r--r--html.c10
-rw-r--r--shared.c3
-rw-r--r--ui-repolist.c2
-rw-r--r--ui-shared.c28
7 files changed, 51 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c
index ac43441..277b849 100644
--- a/cgit.c
+++ b/cgit.c
@@ -16,7 +16,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
16 cgit_read_config("info/cgit", cgit_repo_config_cb)) { 16 cgit_read_config("info/cgit", cgit_repo_config_cb)) {
17 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 17 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
18 cgit_print_docstart(title, item); 18 cgit_print_docstart(title, item);
19 cgit_print_pageheader(title); 19 cgit_print_pageheader(title, 0);
20 cgit_print_error(fmt("Unable to scan repository: %s", 20 cgit_print_error(fmt("Unable to scan repository: %s",
21 strerror(errno))); 21 strerror(errno)));
22 cgit_print_docend(); 22 cgit_print_docend();
@@ -25,7 +25,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
25 setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); 25 setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
26 char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); 26 char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
27 cgit_print_docstart(title, item); 27 cgit_print_docstart(title, item);
28 cgit_print_pageheader(title); 28 cgit_print_pageheader(title, 0);
29 if (!cgit_query_page) { 29 if (!cgit_query_page) {
30 cgit_print_summary(); 30 cgit_print_summary();
31 } else if (!strcmp(cgit_query_page, "log")) { 31 } else if (!strcmp(cgit_query_page, "log")) {
diff --git a/cgit.css b/cgit.css
index 459dca7..9112bfe 100644
--- a/cgit.css
+++ b/cgit.css
@@ -61,6 +61,11 @@ div#header {
61div#header img#logo { 61div#header img#logo {
62 float: right; 62 float: right;
63} 63}
64
65div#header input {
66 float: right;
67 margin: 0.25em 1em;
68}
64div#header a { 69div#header a {
65 color: black; 70 color: black;
66} 71}
diff --git a/cgit.h b/cgit.h
index 362b435..e114a50 100644
--- a/cgit.h
+++ b/cgit.h
@@ -55,6 +55,7 @@ extern int cgit_query_has_sha1;
55extern char *cgit_querystring; 55extern char *cgit_querystring;
56extern char *cgit_query_repo; 56extern char *cgit_query_repo;
57extern char *cgit_query_page; 57extern char *cgit_query_page;
58extern char *cgit_query_search;
58extern char *cgit_query_head; 59extern char *cgit_query_head;
59extern char *cgit_query_sha1; 60extern char *cgit_query_sha1;
60extern char *cgit_query_sha2; 61extern char *cgit_query_sha2;
@@ -75,6 +76,7 @@ extern void htmlf(const char *format,...);
75extern void html_txt(char *txt); 76extern void html_txt(char *txt);
76extern void html_ntxt(int len, char *txt); 77extern void html_ntxt(int len, char *txt);
77extern void html_attr(char *txt); 78extern void html_attr(char *txt);
79extern void html_hidden(char *name, char *value);
78extern void html_link_open(char *url, char *title, char *class); 80extern void html_link_open(char *url, char *title, char *class);
79extern void html_link_close(void); 81extern void html_link_close(void);
80extern void html_filemode(unsigned short mode); 82extern void html_filemode(unsigned short mode);
@@ -98,7 +100,7 @@ extern void cgit_print_error(char *msg);
98extern void cgit_print_date(unsigned long secs); 100extern void cgit_print_date(unsigned long secs);
99extern void cgit_print_docstart(char *title, struct cacheitem *item); 101extern void cgit_print_docstart(char *title, struct cacheitem *item);
100extern void cgit_print_docend(); 102extern void cgit_print_docend();
101extern void cgit_print_pageheader(char *title); 103extern void cgit_print_pageheader(char *title, int show_search);
102 104
103extern void cgit_print_repolist(struct cacheitem *item); 105extern void cgit_print_repolist(struct cacheitem *item);
104extern void cgit_print_summary(); 106extern void cgit_print_summary();
diff --git a/html.c b/html.c
index 3a5d28d..c0b2ed4 100644
--- a/html.c
+++ b/html.c
@@ -117,6 +117,15 @@ void html_attr(char *txt)
117 html(txt); 117 html(txt);
118} 118}
119 119
120void html_hidden(char *name, char *value)
121{
122 html("<input type='hidden' name='");
123 html_attr(name);
124 html("' value='");
125 html_attr(value);
126 html("'/>");
127}
128
120void html_link_open(char *url, char *title, char *class) 129void html_link_open(char *url, char *title, char *class)
121{ 130{
122 html("<a href='"); 131 html("<a href='");
@@ -155,3 +164,4 @@ void html_filemode(unsigned short mode)
155 html_fileperm(mode >> 3); 164 html_fileperm(mode >> 3);
156 html_fileperm(mode); 165 html_fileperm(mode);
157} 166}
167
diff --git a/shared.c b/shared.c
index 18b795b..7def51a 100644
--- a/shared.c
+++ b/shared.c
@@ -36,6 +36,7 @@ char *cgit_querystring = NULL;
36char *cgit_query_repo = NULL; 36char *cgit_query_repo = NULL;
37char *cgit_query_page = NULL; 37char *cgit_query_page = NULL;
38char *cgit_query_head = NULL; 38char *cgit_query_head = NULL;
39char *cgit_query_search = NULL;
39char *cgit_query_sha1 = NULL; 40char *cgit_query_sha1 = NULL;
40char *cgit_query_sha2 = NULL; 41char *cgit_query_sha2 = NULL;
41int cgit_query_ofs = 0; 42int cgit_query_ofs = 0;
@@ -86,6 +87,8 @@ void cgit_querystring_cb(const char *name, const char *value)
86 cgit_query_repo = xstrdup(value); 87 cgit_query_repo = xstrdup(value);
87 } else if (!strcmp(name, "p")) { 88 } else if (!strcmp(name, "p")) {
88 cgit_query_page = xstrdup(value); 89 cgit_query_page = xstrdup(value);
90 } else if (!strcmp(name, "q")) {
91 cgit_query_search = xstrdup(value);
89 } else if (!strcmp(name, "h")) { 92 } else if (!strcmp(name, "h")) {
90 cgit_query_head = xstrdup(value); 93 cgit_query_head = xstrdup(value);
91 cgit_query_has_symref = 1; 94 cgit_query_has_symref = 1;
diff --git a/ui-repolist.c b/ui-repolist.c
index 7090c12..9f12b18 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -17,7 +17,7 @@ void cgit_print_repolist(struct cacheitem *item)
17 17
18 chdir(cgit_root); 18 chdir(cgit_root);
19 cgit_print_docstart(cgit_root_title, item); 19 cgit_print_docstart(cgit_root_title, item);
20 cgit_print_pageheader(cgit_root_title); 20 cgit_print_pageheader(cgit_root_title, 0);
21 21
22 if (!(d = opendir("."))) { 22 if (!(d = opendir("."))) {
23 cgit_print_error(fmt("Unable to scan repository directory: %s", 23 cgit_print_error(fmt("Unable to scan repository directory: %s",
diff --git a/ui-shared.c b/ui-shared.c
index 9ec4be8..b9c1243 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -60,6 +60,18 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
60 } 60 }
61} 61}
62 62
63char *cgit_currurl()
64{
65 if (!cgit_virtual_root)
66 return "./cgit.cgi";
67 else if (cgit_query_page)
68 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
69 else if (cgit_query_repo)
70 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
71 else
72 return fmt("%s/", cgit_virtual_root);
73}
74
63 75
64void cgit_print_date(unsigned long secs) 76void cgit_print_date(unsigned long secs)
65{ 77{
@@ -98,12 +110,26 @@ void cgit_print_docend()
98 html("</body>\n</html>\n"); 110 html("</body>\n</html>\n");
99} 111}
100 112
101void cgit_print_pageheader(char *title) 113void cgit_print_pageheader(char *title, int show_search)
102{ 114{
103 html("<div id='header'>"); 115 html("<div id='header'>");
104 htmlf("<a href='%s'>", cgit_logo_link); 116 htmlf("<a href='%s'>", cgit_logo_link);
105 htmlf("<img id='logo' src='%s'/>\n", cgit_logo); 117 htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
106 htmlf("</a>"); 118 htmlf("</a>");
119 if (show_search) {
120 html("<form method='get' href='");
121 html_attr(cgit_currurl());
122 html("'>");
123 if (cgit_query_head)
124 html_hidden("h", cgit_query_head);
125 if (cgit_query_sha1)
126 html_hidden("id", cgit_query_sha1);
127 if (cgit_query_sha2)
128 html_hidden("id2", cgit_query_sha2);
129 html("<input type='text' name='q' value='");
130 html_attr(cgit_query_search);
131 html("'/></form>");
132 }
107 if (cgit_query_repo) 133 if (cgit_query_repo)
108 htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo)); 134 htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
109 html_txt(title); 135 html_txt(title);