Commit b4fba4482d92ba322d5d99ef73d99c0415c46005
2020-02-05T17:07:01
move elements from gw_commits and gw_diff to their respective template files
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/gotweb/files/cgi-bin/gw_tmpl/commit.tmpl b/gotweb/files/cgi-bin/gw_tmpl/commit.tmpl
index 1281926..ef504f0 100644
--- a/gotweb/files/cgi-bin/gw_tmpl/commit.tmpl
+++ b/gotweb/files/cgi-bin/gw_tmpl/commit.tmpl
@@ -14,7 +14,12 @@
@@search@@
</div>
<div id="content">
- @@content@@
+ <div id='commits_title_wrapper'>
+ <div id='commits_title'>Commits</div>
+ </div>
+ <div id='commits_content'>
+ @@content@@
+ </div>
</div>
@@siteowner@@
</div>
diff --git a/gotweb/files/cgi-bin/gw_tmpl/diff.tmpl b/gotweb/files/cgi-bin/gw_tmpl/diff.tmpl
index 1281926..6a466f2 100644
--- a/gotweb/files/cgi-bin/gw_tmpl/diff.tmpl
+++ b/gotweb/files/cgi-bin/gw_tmpl/diff.tmpl
@@ -14,7 +14,12 @@
@@search@@
</div>
<div id="content">
- @@content@@
+ <div id='diff_title_wrapper'>
+ <div id='diff_title'>Commit Diff</div>
+ </div>
+ <div id='diff_content'>
+ @@content@@
+ </div>
</div>
@@siteowner@@
</div>
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index ee44f7a..e05599b 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -468,28 +468,6 @@ gw_diff(struct gw_trans *gw_trans)
if (error)
goto done;
- /* diff title */
- kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
- "diff_title_wrapper", KATTR__MAX);
- if (kerr != KCGI_OK)
- goto done;
- kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
- "diff_title", KATTR__MAX);
- if (kerr != KCGI_OK)
- goto done;
- kerr = khtml_puts(gw_trans->gw_html_req, "Commit Diff");
- if (kerr != KCGI_OK)
- goto done;
- kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
- if (kerr != KCGI_OK)
- goto done;
-
- /* diff content */
- kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
- "diff_content", KATTR__MAX);
- if (kerr != KCGI_OK)
- goto done;
-
/* diff header */
kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
"diff_header_wrapper", KATTR__MAX);
@@ -554,7 +532,7 @@ gw_diff(struct gw_trans *gw_trans)
goto done;
/* diff content close */
- kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
if (kerr != KCGI_OK)
goto done;
done:
@@ -725,27 +703,7 @@ gw_commits(struct gw_trans *gw_trans)
if (error)
goto done;
- /* commit briefs header */
- kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
- "commits_title_wrapper", KATTR__MAX);
- if (kerr != KCGI_OK)
- goto done;
- kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
- "commits_title", KATTR__MAX);
- if (kerr != KCGI_OK)
- goto done;
- kerr = khtml_puts(gw_trans->gw_html_req, "Commits");
- if (kerr != KCGI_OK)
- goto done;
- kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
- if (kerr != KCGI_OK)
- goto done;
-
/* commit content */
- kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
- "commits_content", KATTR__MAX);
- if (kerr != KCGI_OK)
- goto done;
TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry) {
/* commit line */
kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
@@ -857,7 +815,7 @@ gw_commits(struct gw_trans *gw_trans)
"solid_line", KATTR__MAX);
if (kerr != KCGI_OK)
goto done;
- kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
if (kerr != KCGI_OK)
goto done;
@@ -866,7 +824,6 @@ gw_commits(struct gw_trans *gw_trans)
free(escaped_commit_msg);
escaped_commit_msg = NULL;
}
- kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
done:
got_ref_list_free(&header->refs);
gw_free_headers(header);