]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-shared.c
projects / ps-cgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix html error detected by test-suite
[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 1d6694041baac51f214477a803a8c9360fe31347..9ec646be6423579484d1972076be62f4cdc0f09f 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -60,19 +60,21 @@ char *cgit_repourl(const char *reponame)
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
+       char *tmp;
+       char *delim;
+
        if (cgit_virtual_root) {
-               if (query)
-                       return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
-                                  pagename, filename?filename:"", query);
-               else
-                       return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
-                                  pagename);
+               tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
+                         pagename, (filename ? filename:""));
+               delim = "?";
        } else {
-               if (query)
-                       return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
-               else
-                       return fmt("?r=%s&p=%s", reponame, pagename);
+               tmp = fmt("?url=%s/%s/%s", reponame, pagename,
+                         (filename ? filename : ""));
+               delim = "&";
        }
+       if (query)
+               tmp = fmt("%s%s%s", tmp, delim, query);
+       return tmp;
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
@@ -194,7 +196,7 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path, int ofs)
+                  char *rev, char *path, int ofs, char *grep, char *pattern)
 {
        char *delim;
 
@@ -205,6 +207,15 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
                html_attr(rev);
                delim = "&";
        }
+       if (grep && pattern) {
+               html(delim);
+               html("qt=");
+               html_attr(grep);
+               delim = "&";
+               html(delim);
+               html("q=");
+               html_attr(pattern);
+       }
        if (ofs > 0) {
                html(delim);
                html("ofs=");
@@ -341,13 +352,13 @@ 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);
@@ -362,7 +373,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,
@@ -412,13 +423,15 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
-void add_hidden_formfields(int incl_head, int incl_search)
+void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
+       char *url;
+
        if (!cgit_virtual_root) {
-               if (cgit_query_repo)
-                       html_hidden("r", cgit_query_repo);
-               if (cgit_query_page)
-                       html_hidden("p", cgit_query_page);
+               url = fmt("%s/%s", cgit_query_repo, page);
+               if (cgit_query_path)
+                       url = fmt("%s/%s", url, cgit_query_path);
+               html_hidden("url", url);
        }
 
        if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
@@ -443,48 +456,53 @@ void cgit_print_pageheader(char *title, int show_search)
        int header = 0;
 
        html("<div id='sidebar'>\n");
-       html("<a href='");
+       html("<div id='logo'><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></div>\n",
              cgit_logo);
        html("<div class='infobox'>");
        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,
-                             cgit_query_sha1, cgit_query_path, 0);
+               cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
+                             0, NULL, NULL);
                cgit_tree_link("tree", NULL, "menu", cgit_query_head,
                               cgit_query_sha1, NULL);
                cgit_commit_link("commit", NULL, "menu", cgit_query_head,
                              cgit_query_sha1);
                cgit_diff_link("diff", NULL, "menu", cgit_query_head,
-                              cgit_query_sha1, cgit_query_sha2,
-                              cgit_query_path);
+                              cgit_query_sha1, cgit_query_sha2, NULL);
 
                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);
+               add_hidden_formfields(0, 1, cgit_query_page);
+               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("</form>\n");
 
-               html("<p>\n<h1>search</h1>\n");
+               html("<h1>search</h1>\n");
                html("<form method='get' action='");
-               html_attr(cgit_pageurl(cgit_query_repo, "log", NULL));
+               if (cgit_virtual_root)
+                       html_attr(cgit_fileurl(cgit_query_repo, "log",
+                                              cgit_query_path, NULL));
                html("'>\n");
-               add_hidden_formfields(1, 0);
+               add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html_option("grep", "log msg", cgit_query_grep);
                html_option("author", "author", cgit_query_grep);
@@ -501,7 +519,7 @@ void cgit_print_pageheader(char *title, int show_search)
 
        html("</div>\n");
 
-       html("</div>\n<table class='grid'><tr><td id='content'>\n");
+       html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n");
 }
 
 
Unnamed repository; edit this file 'description' to name the repository.