contrib/hooks: add sample post-receive hook using agefile

[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index 6d3cfa9c5101c1d766795ff4cb2cc23a6ad06767..ac5a2871e3625fb3c4d6a5e1f30cb1bb65561022 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -11,7 +11,7 @@
  #include "cmd.h"
  #include "html.h"
  
-const char cgit_doctype[] =
+static const char cgit_doctype[] =
  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
  "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
  
@@ -69,7 +69,11 @@ const char *cgit_currenturl(void)
  {
         if (!ctx.qry.url)
                 return cgit_rooturl();
-       return ctx.qry.url;
+       const char *root = cgit_rooturl();
+       size_t len = strlen(root);
+       if (len && root[len - 1] == '/')
+               return fmtalloc("%s%s", root, ctx.qry.url);
+       return fmtalloc("%s/%s", root, ctx.qry.url);
  }
  
  const char *cgit_rooturl(void)
@@ -82,7 +86,7 @@ const char *cgit_rooturl(void)
  
  const char *cgit_loginurl(void)
  {
-       static const char *login_url = 0;
+       static const char *login_url;
         if (!login_url)
                 login_url = fmtalloc("%s?p=login", cgit_rooturl());
         return login_url;
@@ -119,7 +123,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
  char *cgit_pageurl(const char *reponame, const char *pagename,
                    const char *query)
  {
-       return cgit_fileurl(reponame, pagename, 0, query);
+       return cgit_fileurl(reponame, pagename, NULL, query);
  }
  
  const char *cgit_repobasename(const char *reponame)
@@ -555,25 +559,32 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                         item = lookup_path(list, path);
                 }
         }
-       html("<a ");
-       if (class)
-               htmlf("class='%s' ", class);
-       html("href='");
-       if (item) {
-               html_attrf(item->util, rev);
-       } else if (ctx.repo->module_link) {
-               dir = strrchr(path, '/');
-               if (dir)
-                       dir++;
-               else
-                       dir = path;
-               html_attrf(ctx.repo->module_link, dir, rev);
+       if (item || ctx.repo->module_link) {
+               html("<a ");
+               if (class)
+                       htmlf("class='%s' ", class);
+               html("href='");
+               if (item) {
+                       html_attrf(item->util, rev);
+               } else {
+                       dir = strrchr(path, '/');
+                       if (dir)
+                               dir++;
+                       else
+                               dir = path;
+                       html_attrf(ctx.repo->module_link, dir, rev);
+               }
+               html("'>");
+               html_txt(path);
+               html("</a>");
         } else {
-               html("#");
+               html("<span");
+               if (class)
+                       htmlf(" class='%s'", class);
+               html(">");
+               html_txt(path);
+               html("</span>");
         }
-       html("'>");
-       html_txt(path);
-       html("</a>");
         html_txtf(" @ %.7s", rev);
         if (item && tail)
                 path[len - 1] = tail;
@@ -884,6 +895,8 @@ static void print_header(void)
                         cgit_add_hidden_formfields(0, 1, ctx.qry.page);
                         html("<select name='h' onchange='this.form.submit();'>\n");
                         for_each_branch_ref(print_branch_option, ctx.qry.head);
+                       if (ctx.repo->enable_remote_branches)
+                               for_each_remote_ref(print_branch_option, ctx.qry.head);
                         html("</select> ");
                         html("<input type='submit' name='' value='switch'/>");
                         html("</form>");