Fossil SCM

Improved page titles when editing wiki about branches, checkins, and tags. Honor the wiki-about flag.

drh 2018-12-30 23:27 UTC describe-objects-using-wiki
Commit 32d9be6d719b60d10e97909d78bd4e4ce4272309221e84494ca6cba40f91eb50
Parent 42327c67cc6983a…
3 files changed +1 -1 +1 -1 +24 -1
~ src/info.c ~ src/setup.c ~ src/wiki.c
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -816,11 +816,11 @@
816816
 @ <tr><th>Received&nbsp;From:</th>
817817
 @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
818818
 }
819819
 db_finalize(&q2);
820820
 }
821
- if( g.perm.WrWiki ){
821
+ if( g.perm.WrWiki && db_get_boolean("wiki-about",1) ){
822822
 @ <tr><th>Edit&nbsp;Wiki:</th>
823823
 @ <td>%z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>
824824
 @ %b(&wiki_edit_links)</td>
825825
 }
826826
 if( g.perm.Hyperlink ){
827827
--- src/info.c
+++ src/info.c
@@ -816,11 +816,11 @@
816 @ <tr><th>Received&nbsp;From:</th>
817 @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
818 }
819 db_finalize(&q2);
820 }
821 if( g.perm.WrWiki ){
822 @ <tr><th>Edit&nbsp;Wiki:</th>
823 @ <td>%z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>
824 @ %b(&wiki_edit_links)</td>
825 }
826 if( g.perm.Hyperlink ){
827
--- src/info.c
+++ src/info.c
@@ -816,11 +816,11 @@
816 @ <tr><th>Received&nbsp;From:</th>
817 @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
818 }
819 db_finalize(&q2);
820 }
821 if( g.perm.WrWiki && db_get_boolean("wiki-about",1) ){
822 @ <tr><th>Edit&nbsp;Wiki:</th>
823 @ <td>%z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>
824 @ %b(&wiki_edit_links)</td>
825 }
826 if( g.perm.Hyperlink ){
827
M src/setup.c
+1 -1
--- src/setup.c
+++ src/setup.c
@@ -938,11 +938,11 @@
938938
 return;
939939
 }
940940
941941
 style_header("Wiki Configuration");
942942
 db_begin_transaction();
943
- @ <form action="%s(g.zTop)/setup_config" method="post"><div>
943
+ @ <form action="%s(g.zTop)/setup_wiki" method="post"><div>
944944
 login_insert_csrf_secret();
945945
 @ <input type="submit" name="submit" value="Apply Changes" /></p>
946946
 @ <hr />
947947
 onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
948948
 "wiki-about", "wiki-about", 1, 0);
949949
--- src/setup.c
+++ src/setup.c
@@ -938,11 +938,11 @@
938 return;
939 }
940
941 style_header("Wiki Configuration");
942 db_begin_transaction();
943 @ <form action="%s(g.zTop)/setup_config" method="post"><div>
944 login_insert_csrf_secret();
945 @ <input type="submit" name="submit" value="Apply Changes" /></p>
946 @ <hr />
947 onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
948 "wiki-about", "wiki-about", 1, 0);
949
--- src/setup.c
+++ src/setup.c
@@ -938,11 +938,11 @@
938 return;
939 }
940
941 style_header("Wiki Configuration");
942 db_begin_transaction();
943 @ <form action="%s(g.zTop)/setup_wiki" method="post"><div>
944 login_insert_csrf_secret();
945 @ <input type="submit" name="submit" value="Apply Changes" /></p>
946 @ <hr />
947 onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
948 "wiki-about", "wiki-about", 1, 0);
949
M src/wiki.c
+24 -1
--- src/wiki.c
+++ src/wiki.c
@@ -579,11 +579,33 @@
579579
 }
580580
 if( zBody==0 ){
581581
 zBody = mprintf("<i>Empty Page</i>");
582582
 }
583583
 style_set_current_page("%T?name=%T", g.zPath, zPageName);
584
- style_header("Edit: %s", zPageName);
584
+
585
+ if( db_get_boolean("wiki-about",1)==0 ){
586
+ style_header("Edit: %s", zPageName);
587
+ }else
588
+ if( sqlite3_strglob("checkin/*", zPageName)==0
589
+ && db_exists("SELECT 1 FROM blob WHERE uuid=%Q",zPageName+8)
590
+ ){
591
+ style_header("Notes About Checkin %S", zPageName + 8);
592
+ style_submenu_element("Checkin Timeline","%R/timeline?f=%s",zPageName + 8);
593
+ style_submenu_element("Checkin Info","%R/info/%s",zPageName + 8);
594
+ }else
595
+ if( sqlite3_strglob("branch/*", zPageName)==0 ){
596
+ style_header("Notes About Branch %h", zPageName + 7);
597
+ style_submenu_element("Branch Timeline","%R/timeline?r=%t",zPageName + 7);
598
+ }else
599
+ if( sqlite3_strglob("tag/*", zPageName)==0 ){
600
+ style_header("Notes About Tag %h", zPageName + 4);
601
+ style_submenu_element("Tag Timeline","%R/timeline?t=%t",zPageName + 4);
602
+ }
603
+ else{
604
+ style_header("Edit: %s", zPageName);
605
+ }
606
+
585607
 if( rid && !isSandbox && g.perm.ApndWiki ){
586608
 if( g.perm.Attach ){
587609
 style_submenu_element("Attach",
588610
 "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
589611
 g.zTop, zPageName, g.zTop, zPageName);
@@ -1530,10 +1552,11 @@
15301552
 const char *zName, /* Name of the object */
15311553
 unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
15321554
 ){
15331555
 int rid;
15341556
 Manifest *pWiki;
1557
+ if( !db_get_boolean("wiki-about",1) ) return 0;
15351558
 rid = db_int(0,
15361559
 "SELECT rid FROM tagxref"
15371560
 " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')"
15381561
 " ORDER BY mtime DESC LIMIT 1",
15391562
 zPrefix, zName
15401563
--- src/wiki.c
+++ src/wiki.c
@@ -579,11 +579,33 @@
579 }
580 if( zBody==0 ){
581 zBody = mprintf("<i>Empty Page</i>");
582 }
583 style_set_current_page("%T?name=%T", g.zPath, zPageName);
584 style_header("Edit: %s", zPageName);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
585 if( rid && !isSandbox && g.perm.ApndWiki ){
586 if( g.perm.Attach ){
587 style_submenu_element("Attach",
588 "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
589 g.zTop, zPageName, g.zTop, zPageName);
@@ -1530,10 +1552,11 @@
1530 const char *zName, /* Name of the object */
1531 unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
1532 ){
1533 int rid;
1534 Manifest *pWiki;
 
1535 rid = db_int(0,
1536 "SELECT rid FROM tagxref"
1537 " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')"
1538 " ORDER BY mtime DESC LIMIT 1",
1539 zPrefix, zName
1540
--- src/wiki.c
+++ src/wiki.c
@@ -579,11 +579,33 @@
579 }
580 if( zBody==0 ){
581 zBody = mprintf("<i>Empty Page</i>");
582 }
583 style_set_current_page("%T?name=%T", g.zPath, zPageName);
584
585 if( db_get_boolean("wiki-about",1)==0 ){
586 style_header("Edit: %s", zPageName);
587 }else
588 if( sqlite3_strglob("checkin/*", zPageName)==0
589 && db_exists("SELECT 1 FROM blob WHERE uuid=%Q",zPageName+8)
590 ){
591 style_header("Notes About Checkin %S", zPageName + 8);
592 style_submenu_element("Checkin Timeline","%R/timeline?f=%s",zPageName + 8);
593 style_submenu_element("Checkin Info","%R/info/%s",zPageName + 8);
594 }else
595 if( sqlite3_strglob("branch/*", zPageName)==0 ){
596 style_header("Notes About Branch %h", zPageName + 7);
597 style_submenu_element("Branch Timeline","%R/timeline?r=%t",zPageName + 7);
598 }else
599 if( sqlite3_strglob("tag/*", zPageName)==0 ){
600 style_header("Notes About Tag %h", zPageName + 4);
601 style_submenu_element("Tag Timeline","%R/timeline?t=%t",zPageName + 4);
602 }
603 else{
604 style_header("Edit: %s", zPageName);
605 }
606
607 if( rid && !isSandbox && g.perm.ApndWiki ){
608 if( g.perm.Attach ){
609 style_submenu_element("Attach",
610 "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
611 g.zTop, zPageName, g.zTop, zPageName);
@@ -1530,10 +1552,11 @@
1552 const char *zName, /* Name of the object */
1553 unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
1554 ){
1555 int rid;
1556 Manifest *pWiki;
1557 if( !db_get_boolean("wiki-about",1) ) return 0;
1558 rid = db_int(0,
1559 "SELECT rid FROM tagxref"
1560 " WHERE tagid=(SELECT tagid FROM tag WHERE tagname='wiki-%q/%q')"
1561 " ORDER BY mtime DESC LIMIT 1",
1562 zPrefix, zName
1563

Keyboard Shortcuts

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