Fossil SCM

On the /ci_edit page, in preview, show the correct background color as determined by reasonable_bg_color() or hash_color(), as appropriate.

drh 2025-03-26 15:20 trunk
Commit 8dbe5dd38ae54a189337cd26bf43511f89cae3d43b8f9c82af932635d1985b42
Parent d098711dfa3ee41…
1 file changed +11 -5
~ src/info.c
M src/info.c
+11 -5
--- src/info.c
+++ src/info.c
@@ -3633,10 +3633,11 @@
36333633
 zNewColorFlag = P("newclr") ? " checked" : "";
36343634
 zNewTagFlag = P("newtag") ? " checked" : "";
36353635
 zNewTag = PDT("tagname","");
36363636
 zNewBrFlag = P("newbr") ? " checked" : "";
36373637
 zNewBranch = PDT("brname","");
3638
+ zBranchName = branch_of_rid(rid);
36383639
 zCloseFlag = P("close") ? " checked" : "";
36393640
 zHideFlag = P("hide") ? " checked" : "";
36403641
 if( P("apply") && cgi_csrf_safe(2) ){
36413642
 Blob ctrl;
36423643
 char *zNow;
@@ -3680,17 +3681,25 @@
36803681
 zUuid[10] = 0;
36813682
 style_header("Edit Check-in [%s]", zUuid);
36823683
 if( P("preview") ){
36833684
 Blob suffix;
36843685
 int nTag = 0;
3686
+ const char *zDplyBr; /* Branch name used to determine BG color */
3687
+ if( zNewBrFlag[0] && zNewBranch[0] ){
3688
+ zDplyBr = zNewBranch;
3689
+ }else{
3690
+ zDplyBr = zBranchName;
3691
+ }
36853692
 @ <b>Preview:</b>
36863693
 @ <blockquote>
36873694
 @ <table border=0>
36883695
 if( zNewColorFlag[0] && zNewColor && zNewColor[0] ){
3689
- @ <tr><td style="background-color: %h(zNewColor);">
3696
+ @ <tr><td style="background-color:%h(reasonable_bg_color(zNewColor,0));">
36903697
 }else if( zColor[0] ){
3691
- @ <tr><td style="background-color: %h(zColor);">
3698
+ @ <tr><td style="background-color:%h(reasonable_bg_color(zColor,0));">
3699
+ }else if( zDplyBr && fossil_strcmp(zDplyBr,"trunk")!=0 ){
3700
+ @ <tr><td style="background-color:%h(hash_color(zDplyBr));">
36923701
 }else{
36933702
 @ <tr><td>
36943703
 }
36953704
 @ %!W(blob_str(&comment))
36963705
 blob_zero(&suffix);
@@ -3771,13 +3780,10 @@
37713780
 @ <tr><th align="right" valign="top">Tags:</th>
37723781
 @ <td valign="top">
37733782
 @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag)>
37743783
 @ Add the following new tag name to this check-in:</label>
37753784
 @ <input size="15" name="tagname" id="tagname" value="%h(zNewTag)">
3776
- zBranchName = db_text(0, "SELECT value FROM tagxref, tag"
3777
- " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
3778
- " AND tagxref.tagid=%d", rid, TAG_BRANCH);
37793785
 db_prepare(&q,
37803786
 "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag"
37813787
 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
37823788
 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
37833789
 " ELSE tagname END /*sort*/",
37843790
--- src/info.c
+++ src/info.c
@@ -3633,10 +3633,11 @@
3633 zNewColorFlag = P("newclr") ? " checked" : "";
3634 zNewTagFlag = P("newtag") ? " checked" : "";
3635 zNewTag = PDT("tagname","");
3636 zNewBrFlag = P("newbr") ? " checked" : "";
3637 zNewBranch = PDT("brname","");
 
3638 zCloseFlag = P("close") ? " checked" : "";
3639 zHideFlag = P("hide") ? " checked" : "";
3640 if( P("apply") && cgi_csrf_safe(2) ){
3641 Blob ctrl;
3642 char *zNow;
@@ -3680,17 +3681,25 @@
3680 zUuid[10] = 0;
3681 style_header("Edit Check-in [%s]", zUuid);
3682 if( P("preview") ){
3683 Blob suffix;
3684 int nTag = 0;
 
 
 
 
 
 
3685 @ <b>Preview:</b>
3686 @ <blockquote>
3687 @ <table border=0>
3688 if( zNewColorFlag[0] && zNewColor && zNewColor[0] ){
3689 @ <tr><td style="background-color: %h(zNewColor);">
3690 }else if( zColor[0] ){
3691 @ <tr><td style="background-color: %h(zColor);">
 
 
3692 }else{
3693 @ <tr><td>
3694 }
3695 @ %!W(blob_str(&comment))
3696 blob_zero(&suffix);
@@ -3771,13 +3780,10 @@
3771 @ <tr><th align="right" valign="top">Tags:</th>
3772 @ <td valign="top">
3773 @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag)>
3774 @ Add the following new tag name to this check-in:</label>
3775 @ <input size="15" name="tagname" id="tagname" value="%h(zNewTag)">
3776 zBranchName = db_text(0, "SELECT value FROM tagxref, tag"
3777 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
3778 " AND tagxref.tagid=%d", rid, TAG_BRANCH);
3779 db_prepare(&q,
3780 "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag"
3781 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
3782 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
3783 " ELSE tagname END /*sort*/",
3784
--- src/info.c
+++ src/info.c
@@ -3633,10 +3633,11 @@
3633 zNewColorFlag = P("newclr") ? " checked" : "";
3634 zNewTagFlag = P("newtag") ? " checked" : "";
3635 zNewTag = PDT("tagname","");
3636 zNewBrFlag = P("newbr") ? " checked" : "";
3637 zNewBranch = PDT("brname","");
3638 zBranchName = branch_of_rid(rid);
3639 zCloseFlag = P("close") ? " checked" : "";
3640 zHideFlag = P("hide") ? " checked" : "";
3641 if( P("apply") && cgi_csrf_safe(2) ){
3642 Blob ctrl;
3643 char *zNow;
@@ -3680,17 +3681,25 @@
3681 zUuid[10] = 0;
3682 style_header("Edit Check-in [%s]", zUuid);
3683 if( P("preview") ){
3684 Blob suffix;
3685 int nTag = 0;
3686 const char *zDplyBr; /* Branch name used to determine BG color */
3687 if( zNewBrFlag[0] && zNewBranch[0] ){
3688 zDplyBr = zNewBranch;
3689 }else{
3690 zDplyBr = zBranchName;
3691 }
3692 @ <b>Preview:</b>
3693 @ <blockquote>
3694 @ <table border=0>
3695 if( zNewColorFlag[0] && zNewColor && zNewColor[0] ){
3696 @ <tr><td style="background-color:%h(reasonable_bg_color(zNewColor,0));">
3697 }else if( zColor[0] ){
3698 @ <tr><td style="background-color:%h(reasonable_bg_color(zColor,0));">
3699 }else if( zDplyBr && fossil_strcmp(zDplyBr,"trunk")!=0 ){
3700 @ <tr><td style="background-color:%h(hash_color(zDplyBr));">
3701 }else{
3702 @ <tr><td>
3703 }
3704 @ %!W(blob_str(&comment))
3705 blob_zero(&suffix);
@@ -3771,13 +3780,10 @@
3780 @ <tr><th align="right" valign="top">Tags:</th>
3781 @ <td valign="top">
3782 @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag)>
3783 @ Add the following new tag name to this check-in:</label>
3784 @ <input size="15" name="tagname" id="tagname" value="%h(zNewTag)">
 
 
 
3785 db_prepare(&q,
3786 "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag"
3787 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
3788 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
3789 " ELSE tagname END /*sort*/",
3790

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button