Fossil SCM

Rename the "vinfo" page to "ci" and the "vedit" page to "ci_edit".

drh 2009-01-25 20:13 trunk
Commit 9be1b00392a940fcb4401a298e9393b82174301f
Parent eb8223e16458140…
4 files changed +14 -14 +2 -2 +1 -1 +1 -1
~ src/info.c ~ src/rss.c ~ src/style.c ~ src/timeline.c
M src/info.c
+14 -14
--- src/info.c
+++ src/info.c
@@ -324,16 +324,16 @@
324324
 }
325325
 }
326326
327327
328328
 /*
329
-** WEBPAGE: vinfo
330
-** URL: /vinfo?name=RID|ARTIFACTID
329
+** WEBPAGE: ci
330
+** URL: /ci?name=RID|ARTIFACTID
331331
 **
332332
 ** Return information about a baseline
333333
 */
334
-void vinfo_page(void){
334
+void ci_page(void){
335335
 Stmt q;
336336
 int rid;
337337
 int isLeaf;
338338
339339
 login_check_credentials();
@@ -429,11 +429,11 @@
429429
 @ <a href="%s(g.zBaseURL)/vdiff/%d(rid)">diff</a>
430430
 @ | <a href="%s(g.zBaseURL)/zip/%s(zProjName)-%s(zShortUuid).zip?uuid=%s(zUuid)">
431431
 @ ZIP archive</a>
432432
 @ | <a href="%s(g.zBaseURL)/artifact/%d(rid)">manifest</a>
433433
 if( g.okWrite ){
434
- @ | <a href="%s(g.zBaseURL)/vedit?r=%d(rid)">edit</a>
434
+ @ | <a href="%s(g.zBaseURL)/ci_edit?r=%d(rid)">edit</a>
435435
 }
436436
 @ </td>
437437
 @ </tr>
438438
 free(zShortUuid);
439439
 }
@@ -1140,11 +1140,11 @@
11401140
 @ <p>No such object: %h(zName)</p>
11411141
 style_footer();
11421142
 return;
11431143
 }
11441144
 if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
1145
- vinfo_page();
1145
+ ci_page();
11461146
 }else
11471147
 if( db_exists("SELECT 1 FROM tagxref JOIN tag USING(tagid)"
11481148
 " WHERE rid=%d AND tagname LIKE 'wiki-%%'", rid) ){
11491149
 winfo_page();
11501150
 }else
@@ -1151,31 +1151,31 @@
11511151
 if( db_exists("SELECT 1 FROM tagxref JOIN tag USING(tagid)"
11521152
 " WHERE rid=%d AND tagname LIKE 'tkt-%%'", rid) ){
11531153
 tinfo_page();
11541154
 }else
11551155
 if( db_exists("SELECT 1 FROM plink WHERE cid=%d", rid) ){
1156
- vinfo_page();
1156
+ ci_page();
11571157
 }else
11581158
 if( db_exists("SELECT 1 FROM plink WHERE pid=%d", rid) ){
1159
- vinfo_page();
1159
+ ci_page();
11601160
 }else
11611161
 {
11621162
 artifact_page();
11631163
 }
11641164
 }
11651165
11661166
 /*
1167
-** WEBPAGE: vedit
1168
-** URL: vedit?r=RID&c=NEWCOMMENT&u=NEWUSER
1167
+** WEBPAGE: ci_edit
1168
+** URL: ci_edit?r=RID&c=NEWCOMMENT&u=NEWUSER
11691169
 **
11701170
 ** Present a dialog for updating properties of a baseline:
11711171
 **
11721172
 ** * The check-in user
11731173
 ** * The check-in comment
11741174
 ** * The background color.
11751175
 */
1176
-void vedit_page(void){
1176
+void ci_edit_page(void){
11771177
 int rid;
11781178
 const char *zComment;
11791179
 const char *zNewComment;
11801180
 const char *zUser;
11811181
 const char *zNewUser;
@@ -1216,11 +1216,11 @@
12161216
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
12171217
 zComment = db_text(0, "SELECT coalesce(ecomment,comment)"
12181218
 " FROM event WHERE objid=%d", rid);
12191219
 if( zComment==0 ) fossil_redirect_home();
12201220
 if( P("cancel") ){
1221
- cgi_redirectf("vinfo?name=%d", rid);
1221
+ cgi_redirectf("ci?name=%d", rid);
12221222
 }
12231223
 zNewComment = PD("c",zComment);
12241224
 zUser = db_text(0, "SELECT coalesce(euser,user)"
12251225
 " FROM event WHERE objid=%d", rid);
12261226
 if( zUser==0 ) fossil_redirect_home();
@@ -1320,11 +1320,11 @@
13201320
 db_begin_transaction();
13211321
 nrid = content_put(&ctrl, 0, 0);
13221322
 manifest_crosslink(nrid, &ctrl);
13231323
 db_end_transaction(0);
13241324
 }
1325
- cgi_redirectf("vinfo?name=%d", rid);
1325
+ cgi_redirectf("ci?name=%d", rid);
13261326
 }
13271327
 blob_zero(&comment);
13281328
 blob_append(&comment, zNewComment, -1);
13291329
 zUuid[10] = 0;
13301330
 style_header("Edit Check-in [%s]", zUuid);
@@ -1362,12 +1362,12 @@
13621362
 @ </blockquote>
13631363
 @ <hr>
13641364
 blob_reset(&suffix);
13651365
 }
13661366
 @ <p>Make changes to attributes of check-in
1367
- @ [<a href="vinfo?name=%d(rid)">%s(zUuid)</a>]:</p>
1368
- @ <form action="%s(g.zBaseURL)/vedit" method="POST">
1367
+ @ [<a href="ci?name=%d(rid)">%s(zUuid)</a>]:</p>
1368
+ @ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
13691369
 login_insert_csrf_secret();
13701370
 @ <input type="hidden" name="r" value="%d(rid)">
13711371
 @ <table border="0" cellspacing="10">
13721372
13731373
 @ <tr><td align="right" valign="top"><b>User:</b></td>
13741374
--- src/info.c
+++ src/info.c
@@ -324,16 +324,16 @@
324 }
325 }
326
327
328 /*
329 ** WEBPAGE: vinfo
330 ** URL: /vinfo?name=RID|ARTIFACTID
331 **
332 ** Return information about a baseline
333 */
334 void vinfo_page(void){
335 Stmt q;
336 int rid;
337 int isLeaf;
338
339 login_check_credentials();
@@ -429,11 +429,11 @@
429 @ <a href="%s(g.zBaseURL)/vdiff/%d(rid)">diff</a>
430 @ | <a href="%s(g.zBaseURL)/zip/%s(zProjName)-%s(zShortUuid).zip?uuid=%s(zUuid)">
431 @ ZIP archive</a>
432 @ | <a href="%s(g.zBaseURL)/artifact/%d(rid)">manifest</a>
433 if( g.okWrite ){
434 @ | <a href="%s(g.zBaseURL)/vedit?r=%d(rid)">edit</a>
435 }
436 @ </td>
437 @ </tr>
438 free(zShortUuid);
439 }
@@ -1140,11 +1140,11 @@
1140 @ <p>No such object: %h(zName)</p>
1141 style_footer();
1142 return;
1143 }
1144 if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
1145 vinfo_page();
1146 }else
1147 if( db_exists("SELECT 1 FROM tagxref JOIN tag USING(tagid)"
1148 " WHERE rid=%d AND tagname LIKE 'wiki-%%'", rid) ){
1149 winfo_page();
1150 }else
@@ -1151,31 +1151,31 @@
1151 if( db_exists("SELECT 1 FROM tagxref JOIN tag USING(tagid)"
1152 " WHERE rid=%d AND tagname LIKE 'tkt-%%'", rid) ){
1153 tinfo_page();
1154 }else
1155 if( db_exists("SELECT 1 FROM plink WHERE cid=%d", rid) ){
1156 vinfo_page();
1157 }else
1158 if( db_exists("SELECT 1 FROM plink WHERE pid=%d", rid) ){
1159 vinfo_page();
1160 }else
1161 {
1162 artifact_page();
1163 }
1164 }
1165
1166 /*
1167 ** WEBPAGE: vedit
1168 ** URL: vedit?r=RID&c=NEWCOMMENT&u=NEWUSER
1169 **
1170 ** Present a dialog for updating properties of a baseline:
1171 **
1172 ** * The check-in user
1173 ** * The check-in comment
1174 ** * The background color.
1175 */
1176 void vedit_page(void){
1177 int rid;
1178 const char *zComment;
1179 const char *zNewComment;
1180 const char *zUser;
1181 const char *zNewUser;
@@ -1216,11 +1216,11 @@
1216 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
1217 zComment = db_text(0, "SELECT coalesce(ecomment,comment)"
1218 " FROM event WHERE objid=%d", rid);
1219 if( zComment==0 ) fossil_redirect_home();
1220 if( P("cancel") ){
1221 cgi_redirectf("vinfo?name=%d", rid);
1222 }
1223 zNewComment = PD("c",zComment);
1224 zUser = db_text(0, "SELECT coalesce(euser,user)"
1225 " FROM event WHERE objid=%d", rid);
1226 if( zUser==0 ) fossil_redirect_home();
@@ -1320,11 +1320,11 @@
1320 db_begin_transaction();
1321 nrid = content_put(&ctrl, 0, 0);
1322 manifest_crosslink(nrid, &ctrl);
1323 db_end_transaction(0);
1324 }
1325 cgi_redirectf("vinfo?name=%d", rid);
1326 }
1327 blob_zero(&comment);
1328 blob_append(&comment, zNewComment, -1);
1329 zUuid[10] = 0;
1330 style_header("Edit Check-in [%s]", zUuid);
@@ -1362,12 +1362,12 @@
1362 @ </blockquote>
1363 @ <hr>
1364 blob_reset(&suffix);
1365 }
1366 @ <p>Make changes to attributes of check-in
1367 @ [<a href="vinfo?name=%d(rid)">%s(zUuid)</a>]:</p>
1368 @ <form action="%s(g.zBaseURL)/vedit" method="POST">
1369 login_insert_csrf_secret();
1370 @ <input type="hidden" name="r" value="%d(rid)">
1371 @ <table border="0" cellspacing="10">
1372
1373 @ <tr><td align="right" valign="top"><b>User:</b></td>
1374
--- src/info.c
+++ src/info.c
@@ -324,16 +324,16 @@
324 }
325 }
326
327
328 /*
329 ** WEBPAGE: ci
330 ** URL: /ci?name=RID|ARTIFACTID
331 **
332 ** Return information about a baseline
333 */
334 void ci_page(void){
335 Stmt q;
336 int rid;
337 int isLeaf;
338
339 login_check_credentials();
@@ -429,11 +429,11 @@
429 @ <a href="%s(g.zBaseURL)/vdiff/%d(rid)">diff</a>
430 @ | <a href="%s(g.zBaseURL)/zip/%s(zProjName)-%s(zShortUuid).zip?uuid=%s(zUuid)">
431 @ ZIP archive</a>
432 @ | <a href="%s(g.zBaseURL)/artifact/%d(rid)">manifest</a>
433 if( g.okWrite ){
434 @ | <a href="%s(g.zBaseURL)/ci_edit?r=%d(rid)">edit</a>
435 }
436 @ </td>
437 @ </tr>
438 free(zShortUuid);
439 }
@@ -1140,11 +1140,11 @@
1140 @ <p>No such object: %h(zName)</p>
1141 style_footer();
1142 return;
1143 }
1144 if( db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
1145 ci_page();
1146 }else
1147 if( db_exists("SELECT 1 FROM tagxref JOIN tag USING(tagid)"
1148 " WHERE rid=%d AND tagname LIKE 'wiki-%%'", rid) ){
1149 winfo_page();
1150 }else
@@ -1151,31 +1151,31 @@
1151 if( db_exists("SELECT 1 FROM tagxref JOIN tag USING(tagid)"
1152 " WHERE rid=%d AND tagname LIKE 'tkt-%%'", rid) ){
1153 tinfo_page();
1154 }else
1155 if( db_exists("SELECT 1 FROM plink WHERE cid=%d", rid) ){
1156 ci_page();
1157 }else
1158 if( db_exists("SELECT 1 FROM plink WHERE pid=%d", rid) ){
1159 ci_page();
1160 }else
1161 {
1162 artifact_page();
1163 }
1164 }
1165
1166 /*
1167 ** WEBPAGE: ci_edit
1168 ** URL: ci_edit?r=RID&c=NEWCOMMENT&u=NEWUSER
1169 **
1170 ** Present a dialog for updating properties of a baseline:
1171 **
1172 ** * The check-in user
1173 ** * The check-in comment
1174 ** * The background color.
1175 */
1176 void ci_edit_page(void){
1177 int rid;
1178 const char *zComment;
1179 const char *zNewComment;
1180 const char *zUser;
1181 const char *zNewUser;
@@ -1216,11 +1216,11 @@
1216 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
1217 zComment = db_text(0, "SELECT coalesce(ecomment,comment)"
1218 " FROM event WHERE objid=%d", rid);
1219 if( zComment==0 ) fossil_redirect_home();
1220 if( P("cancel") ){
1221 cgi_redirectf("ci?name=%d", rid);
1222 }
1223 zNewComment = PD("c",zComment);
1224 zUser = db_text(0, "SELECT coalesce(euser,user)"
1225 " FROM event WHERE objid=%d", rid);
1226 if( zUser==0 ) fossil_redirect_home();
@@ -1320,11 +1320,11 @@
1320 db_begin_transaction();
1321 nrid = content_put(&ctrl, 0, 0);
1322 manifest_crosslink(nrid, &ctrl);
1323 db_end_transaction(0);
1324 }
1325 cgi_redirectf("ci?name=%d", rid);
1326 }
1327 blob_zero(&comment);
1328 blob_append(&comment, zNewComment, -1);
1329 zUuid[10] = 0;
1330 style_header("Edit Check-in [%s]", zUuid);
@@ -1362,12 +1362,12 @@
1362 @ </blockquote>
1363 @ <hr>
1364 blob_reset(&suffix);
1365 }
1366 @ <p>Make changes to attributes of check-in
1367 @ [<a href="ci?name=%d(rid)">%s(zUuid)</a>]:</p>
1368 @ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
1369 login_insert_csrf_secret();
1370 @ <input type="hidden" name="r" value="%d(rid)">
1371 @ <table border="0" cellspacing="10">
1372
1373 @ <tr><td align="right" valign="top"><b>User:</b></td>
1374
M src/rss.c
+2 -2
--- src/rss.c
+++ src/rss.c
@@ -115,15 +115,15 @@
115115
 zPrefix = "*FORK* ";
116116
 }
117117
118118
 @ <item>
119119
 @ <title>%s(zPrefix)%s(zCom)</title>
120
- @ <link>%s(g.zBaseURL)/vinfo/%s(zId)</link>
120
+ @ <link>%s(g.zBaseURL)/ci/%s(zId)</link>
121121
 @ <description>%s(zPrefix)%s(zCom)</description>
122122
 @ <pubDate>%s(zDate)</pubDate>
123123
 @ <author>%s(zAuthor)</author>
124
- @ <guid>%s(g.zBaseURL)/vinfo/%s(zId)</guid>
124
+ @ <guid>%s(g.zBaseURL)/ci/%s(zId)</guid>
125125
 @ </item>
126126
 nLine++;
127127
 }
128128
129129
 db_finalize(&q);
130130
--- src/rss.c
+++ src/rss.c
@@ -115,15 +115,15 @@
115 zPrefix = "*FORK* ";
116 }
117
118 @ <item>
119 @ <title>%s(zPrefix)%s(zCom)</title>
120 @ <link>%s(g.zBaseURL)/vinfo/%s(zId)</link>
121 @ <description>%s(zPrefix)%s(zCom)</description>
122 @ <pubDate>%s(zDate)</pubDate>
123 @ <author>%s(zAuthor)</author>
124 @ <guid>%s(g.zBaseURL)/vinfo/%s(zId)</guid>
125 @ </item>
126 nLine++;
127 }
128
129 db_finalize(&q);
130
--- src/rss.c
+++ src/rss.c
@@ -115,15 +115,15 @@
115 zPrefix = "*FORK* ";
116 }
117
118 @ <item>
119 @ <title>%s(zPrefix)%s(zCom)</title>
120 @ <link>%s(g.zBaseURL)/ci/%s(zId)</link>
121 @ <description>%s(zPrefix)%s(zCom)</description>
122 @ <pubDate>%s(zDate)</pubDate>
123 @ <author>%s(zAuthor)</author>
124 @ <guid>%s(g.zBaseURL)/ci/%s(zId)</guid>
125 @ </item>
126 nLine++;
127 }
128
129 db_finalize(&q);
130
M src/style.c
+1 -1
--- src/style.c
+++ src/style.c
@@ -371,11 +371,11 @@
371371
 @ pre.verbatim {
372372
 @ background-color: #f5f5f5;
373373
 @ padding: 0.5em;
374374
 @}
375375
 @
376
-@ /* The label/value pairs on (for example) the vinfo page */
376
+@ /* The label/value pairs on (for example) the ci page */
377377
 @ table.label-value th {
378378
 @ vertical-align: top;
379379
 @ text-align: right;
380380
 @ padding: 0.2ex 2ex;
381381
 @ }
382382
--- src/style.c
+++ src/style.c
@@ -371,11 +371,11 @@
371 @ pre.verbatim {
372 @ background-color: #f5f5f5;
373 @ padding: 0.5em;
374 @}
375 @
376 @ /* The label/value pairs on (for example) the vinfo page */
377 @ table.label-value th {
378 @ vertical-align: top;
379 @ text-align: right;
380 @ padding: 0.2ex 2ex;
381 @ }
382
--- src/style.c
+++ src/style.c
@@ -371,11 +371,11 @@
371 @ pre.verbatim {
372 @ background-color: #f5f5f5;
373 @ padding: 0.5em;
374 @}
375 @
376 @ /* The label/value pairs on (for example) the ci page */
377 @ table.label-value th {
378 @ vertical-align: top;
379 @ text-align: right;
380 @ padding: 0.2ex 2ex;
381 @ }
382
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -54,11 +54,11 @@
5454
 ){
5555
 char zShortUuid[UUID_SIZE+1];
5656
 sprintf(zShortUuid, "%.10s", zUuid);
5757
 if( g.okHistory ){
5858
 @ <a onmouseover='%s(zIn)("m%d(id)")' onmouseout='%s(zOut)("m%d(id)")'
59
- @ href="%s(g.zBaseURL)/vinfo/%s(zUuid)">[%s(zShortUuid)]</a>
59
+ @ href="%s(g.zBaseURL)/ci/%s(zUuid)">[%s(zShortUuid)]</a>
6060
 }else{
6161
 @ <b onmouseover='%s(zIn)("m%d(id)")' onmouseout='%s(zOut)("m%d(id)")'>
6262
 @ [%s(zShortUuid)]</b>
6363
 }
6464
 }
6565
--- src/timeline.c
+++ src/timeline.c
@@ -54,11 +54,11 @@
54 ){
55 char zShortUuid[UUID_SIZE+1];
56 sprintf(zShortUuid, "%.10s", zUuid);
57 if( g.okHistory ){
58 @ <a onmouseover='%s(zIn)("m%d(id)")' onmouseout='%s(zOut)("m%d(id)")'
59 @ href="%s(g.zBaseURL)/vinfo/%s(zUuid)">[%s(zShortUuid)]</a>
60 }else{
61 @ <b onmouseover='%s(zIn)("m%d(id)")' onmouseout='%s(zOut)("m%d(id)")'>
62 @ [%s(zShortUuid)]</b>
63 }
64 }
65
--- src/timeline.c
+++ src/timeline.c
@@ -54,11 +54,11 @@
54 ){
55 char zShortUuid[UUID_SIZE+1];
56 sprintf(zShortUuid, "%.10s", zUuid);
57 if( g.okHistory ){
58 @ <a onmouseover='%s(zIn)("m%d(id)")' onmouseout='%s(zOut)("m%d(id)")'
59 @ href="%s(g.zBaseURL)/ci/%s(zUuid)">[%s(zShortUuid)]</a>
60 }else{
61 @ <b onmouseover='%s(zIn)("m%d(id)")' onmouseout='%s(zOut)("m%d(id)")'>
62 @ [%s(zShortUuid)]</b>
63 }
64 }
65

Keyboard Shortcuts

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