Fossil SCM

Reinstate "Tags" on the main menu. Allow the new tagview page to hand over to the old (but no user interface for this yet).

eric 2008-11-25 21:56 trunk
Commit 10df4ff6037b80a1d712e9306a9fb3ca15eeb774
Parent f0720ef5f1b2901…
2 files changed +1 -1 +11 -5
~ src/style.c ~ src/tagview.c
M src/style.c
+1 -1
--- src/style.c
+++ src/style.c
@@ -193,11 +193,11 @@
193193
 @ html "<a href='$baseurl/dir'>Files</a>"
194194
 @ }
195195
 @ if {[hascap o]} {
196196
 @ html "<a href='$baseurl/leaves'>Leaves</a>"
197197
 @ html "<a href='$baseurl/timeline'>Timeline</a>"
198
-@ # html "<a href='$baseurl/tagview'>Tags</a>"
198
+@ html "<a href='$baseurl/tagview'>Tags</a>"
199199
 @ }
200200
 @ if {[hascap r]} {
201201
 @ html "<a href='$baseurl/reportlist'>Bugs</a>"
202202
 @ }
203203
 @ if {[hascap j]} {
204204
--- src/style.c
+++ src/style.c
@@ -193,11 +193,11 @@
193 @ html "<a href='$baseurl/dir'>Files</a>"
194 @ }
195 @ if {[hascap o]} {
196 @ html "<a href='$baseurl/leaves'>Leaves</a>"
197 @ html "<a href='$baseurl/timeline'>Timeline</a>"
198 @ # html "<a href='$baseurl/tagview'>Tags</a>"
199 @ }
200 @ if {[hascap r]} {
201 @ html "<a href='$baseurl/reportlist'>Bugs</a>"
202 @ }
203 @ if {[hascap j]} {
204
--- src/style.c
+++ src/style.c
@@ -193,11 +193,11 @@
193 @ html "<a href='$baseurl/dir'>Files</a>"
194 @ }
195 @ if {[hascap o]} {
196 @ html "<a href='$baseurl/leaves'>Leaves</a>"
197 @ html "<a href='$baseurl/timeline'>Timeline</a>"
198 @ html "<a href='$baseurl/tagview'>Tags</a>"
199 @ }
200 @ if {[hascap r]} {
201 @ html "<a href='$baseurl/reportlist'>Bugs</a>"
202 @ }
203 @ if {[hascap j]} {
204
M src/tagview.c
+11 -5
--- src/tagview.c
+++ src/tagview.c
@@ -28,11 +28,11 @@
2828
 #include <assert.h>
2929
 #include "config.h"
3030
 #include "tagview.h"
3131
3232
33
-#if 1
33
+#if 0
3434
 # define TAGVIEW_DEFAULT_FILTER "AND t.tagname NOT GLOB 'wiki-*' "
3535
 #else
3636
 # define TAGVIEW_DEFAULT_FILTER
3737
 #endif
3838
@@ -82,10 +82,11 @@
8282
 @ <div style='font-size:smaller'>
8383
 @ <form action='tagview' method='post'>
8484
 @ Search for tags:
8585
 @ <input type='text' name='like' value='%h((like?like:""))' size='10'/>
8686
 @ <input type='submit'/>
87
+ @ <input type='hidden' name='raw' value='y'/>
8788
 @ </form>
8889
 @ </div>
8990
 }
9091
9192
 /*
@@ -135,16 +136,17 @@
135136
 db_generic_query_view(zSql, 1);
136137
 free(zSql);
137138
 }
138139
139140
 /*
140
-** WEBP AGE: /tagview
141
+** Internal view of tags
141142
 */
142
-void old_tagview_page(void){
143
+void raw_tagview_page(void){
143144
 char const * check = 0;
144145
 login_check_credentials();
145
- if( !g.okRdWiki ){
146
+ /* if( !g.okRdWiki ){ */
147
+ if( !g.okAdmin ){
146148
 login_needed();
147149
 }
148150
 style_header("Tags");
149151
 login_anonymous_available();
150152
 tagview_page_search_miniform();
@@ -189,15 +191,19 @@
189191
 char const *zName = 0;
190192
 int nTag = 0;
191193
 login_check_credentials();
192194
 if( !g.okRead ){
193195
 login_needed();
196
+ }
197
+ if ( P("tagid") || P("like") || P("raw") ) {
198
+ raw_tagview_page();
199
+ return;
194200
 }
195201
 login_anonymous_available();
196202
 if( 0 != (zName = P("name")) ){
197203
 Blob uuid;
198
- style_header("Tagged Baselines");
204
+ style_header("Tagged Artifacts");
199205
 @ <h2>%s(zName):</h2>
200206
 if( sym_tag_to_uuid(zName, &uuid) > 0){
201207
 tagview_print_timeline(zName, "sym-");
202208
 }else if( tag_to_uuid(zName, &uuid, "") > 0){
203209
 tagview_print_timeline(zName, "");
204210
--- src/tagview.c
+++ src/tagview.c
@@ -28,11 +28,11 @@
28 #include <assert.h>
29 #include "config.h"
30 #include "tagview.h"
31
32
33 #if 1
34 # define TAGVIEW_DEFAULT_FILTER "AND t.tagname NOT GLOB 'wiki-*' "
35 #else
36 # define TAGVIEW_DEFAULT_FILTER
37 #endif
38
@@ -82,10 +82,11 @@
82 @ <div style='font-size:smaller'>
83 @ <form action='tagview' method='post'>
84 @ Search for tags:
85 @ <input type='text' name='like' value='%h((like?like:""))' size='10'/>
86 @ <input type='submit'/>
 
87 @ </form>
88 @ </div>
89 }
90
91 /*
@@ -135,16 +136,17 @@
135 db_generic_query_view(zSql, 1);
136 free(zSql);
137 }
138
139 /*
140 ** WEBP AGE: /tagview
141 */
142 void old_tagview_page(void){
143 char const * check = 0;
144 login_check_credentials();
145 if( !g.okRdWiki ){
 
146 login_needed();
147 }
148 style_header("Tags");
149 login_anonymous_available();
150 tagview_page_search_miniform();
@@ -189,15 +191,19 @@
189 char const *zName = 0;
190 int nTag = 0;
191 login_check_credentials();
192 if( !g.okRead ){
193 login_needed();
 
 
 
 
194 }
195 login_anonymous_available();
196 if( 0 != (zName = P("name")) ){
197 Blob uuid;
198 style_header("Tagged Baselines");
199 @ <h2>%s(zName):</h2>
200 if( sym_tag_to_uuid(zName, &uuid) > 0){
201 tagview_print_timeline(zName, "sym-");
202 }else if( tag_to_uuid(zName, &uuid, "") > 0){
203 tagview_print_timeline(zName, "");
204
--- src/tagview.c
+++ src/tagview.c
@@ -28,11 +28,11 @@
28 #include <assert.h>
29 #include "config.h"
30 #include "tagview.h"
31
32
33 #if 0
34 # define TAGVIEW_DEFAULT_FILTER "AND t.tagname NOT GLOB 'wiki-*' "
35 #else
36 # define TAGVIEW_DEFAULT_FILTER
37 #endif
38
@@ -82,10 +82,11 @@
82 @ <div style='font-size:smaller'>
83 @ <form action='tagview' method='post'>
84 @ Search for tags:
85 @ <input type='text' name='like' value='%h((like?like:""))' size='10'/>
86 @ <input type='submit'/>
87 @ <input type='hidden' name='raw' value='y'/>
88 @ </form>
89 @ </div>
90 }
91
92 /*
@@ -135,16 +136,17 @@
136 db_generic_query_view(zSql, 1);
137 free(zSql);
138 }
139
140 /*
141 ** Internal view of tags
142 */
143 void raw_tagview_page(void){
144 char const * check = 0;
145 login_check_credentials();
146 /* if( !g.okRdWiki ){ */
147 if( !g.okAdmin ){
148 login_needed();
149 }
150 style_header("Tags");
151 login_anonymous_available();
152 tagview_page_search_miniform();
@@ -189,15 +191,19 @@
191 char const *zName = 0;
192 int nTag = 0;
193 login_check_credentials();
194 if( !g.okRead ){
195 login_needed();
196 }
197 if ( P("tagid") || P("like") || P("raw") ) {
198 raw_tagview_page();
199 return;
200 }
201 login_anonymous_available();
202 if( 0 != (zName = P("name")) ){
203 Blob uuid;
204 style_header("Tagged Artifacts");
205 @ <h2>%s(zName):</h2>
206 if( sym_tag_to_uuid(zName, &uuid) > 0){
207 tagview_print_timeline(zName, "sym-");
208 }else if( tag_to_uuid(zName, &uuid, "") > 0){
209 tagview_print_timeline(zName, "");
210

Keyboard Shortcuts

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