Commit Diff

Commit:
b4fba4482d92ba322d5d99ef73d99c0415c46005
From:
Tracey Emery <tracey@traceyemery.net>
Date:
Message:
move elements from gw_commits and gw_diff to their respective template files
Actions:
Patch | Tree
commit - a5594e371c087faf8fe261c5b9cf1dcb4d2ed7b3
commit + b4fba4482d92ba322d5d99ef73d99c0415c46005
blob - 12819268eddbfa9b3a5d68d8897c937bb20f7cd4
blob + ef504f03cfeb9e20af5a92e2c4d3801ee5cb9650
--- gotweb/files/cgi-bin/gw_tmpl/commit.tmpl
+++ 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>
blob - 12819268eddbfa9b3a5d68d8897c937bb20f7cd4
blob + 6a466f25e20dd30349a4913eab6019f62fbfe04a
--- gotweb/files/cgi-bin/gw_tmpl/diff.tmpl
+++ 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>
blob - ee44f7abf7c46a75a341d93e2dd8e7384c325355
blob + e05599b244c90e3d1a70b36f9596765c33a42aed
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
@@ -466,30 +466,8 @@ gw_diff(struct gw_trans *gw_trans)
 
 	error = gw_get_header(gw_trans, header, 1);
 	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);