Fossil SCM

Merge the fork in trunk.

drh 2013-08-08 14:00 trunk merge
Commit 0e822db7f125e1ec35353346263a5606976c863f
1 file changed +2 -2
+2 -2
--- src/timeline.c
+++ src/timeline.c
@@ -2073,11 +2073,11 @@
20732073
if(!nCount) continue /* arguable! Possible? */;
20742074
rowClass = ++nRowNumber % 2;
20752075
nEventTotal += nCount;
20762076
@<tr class='row%d(rowClass)'>
20772077
@ <td>
2078
- @ <a href="?view=bymonth&user=%h(zUser)" target="_new">%h(zUser)</a>
2078
+ @ <a href="?view=bymonth&user=%h(zUser)">%h(zUser)</a>
20792079
@ </td><td>%d(nCount)</td>
20802080
@ <td>
20812081
@ <div class='statistics-report-graph-line'
20822082
@ style='height:16px;width:%d(nSize)%%;'>
20832083
@ </div></td>
@@ -2223,11 +2223,11 @@
22232223
void stats_report_page(){
22242224
HQuery url; /* URL for various branch links */
22252225
const char * zView = P("view"); /* Which view/report to show. */
22262226
const char *zUserName = P("user");
22272227
if(!zUserName) zUserName = P("u");
2228
- url_initialize(&url, "stats_report");
2228
+ url_initialize(&url, "reports");
22292229
22302230
if(zUserName && *zUserName){
22312231
url_add_parameter(&url,"user", zUserName);
22322232
timeline_submenu(&url, "(Remove User Flag)", "view", zView, "user");
22332233
}
22342234
--- src/timeline.c
+++ src/timeline.c
@@ -2073,11 +2073,11 @@
2073 if(!nCount) continue /* arguable! Possible? */;
2074 rowClass = ++nRowNumber % 2;
2075 nEventTotal += nCount;
2076 @<tr class='row%d(rowClass)'>
2077 @ <td>
2078 @ <a href="?view=bymonth&user=%h(zUser)" target="_new">%h(zUser)</a>
2079 @ </td><td>%d(nCount)</td>
2080 @ <td>
2081 @ <div class='statistics-report-graph-line'
2082 @ style='height:16px;width:%d(nSize)%%;'>
2083 @ </div></td>
@@ -2223,11 +2223,11 @@
2223 void stats_report_page(){
2224 HQuery url; /* URL for various branch links */
2225 const char * zView = P("view"); /* Which view/report to show. */
2226 const char *zUserName = P("user");
2227 if(!zUserName) zUserName = P("u");
2228 url_initialize(&url, "stats_report");
2229
2230 if(zUserName && *zUserName){
2231 url_add_parameter(&url,"user", zUserName);
2232 timeline_submenu(&url, "(Remove User Flag)", "view", zView, "user");
2233 }
2234
--- src/timeline.c
+++ src/timeline.c
@@ -2073,11 +2073,11 @@
2073 if(!nCount) continue /* arguable! Possible? */;
2074 rowClass = ++nRowNumber % 2;
2075 nEventTotal += nCount;
2076 @<tr class='row%d(rowClass)'>
2077 @ <td>
2078 @ <a href="?view=bymonth&user=%h(zUser)">%h(zUser)</a>
2079 @ </td><td>%d(nCount)</td>
2080 @ <td>
2081 @ <div class='statistics-report-graph-line'
2082 @ style='height:16px;width:%d(nSize)%%;'>
2083 @ </div></td>
@@ -2223,11 +2223,11 @@
2223 void stats_report_page(){
2224 HQuery url; /* URL for various branch links */
2225 const char * zView = P("view"); /* Which view/report to show. */
2226 const char *zUserName = P("user");
2227 if(!zUserName) zUserName = P("u");
2228 url_initialize(&url, "reports");
2229
2230 if(zUserName && *zUserName){
2231 url_add_parameter(&url,"user", zUserName);
2232 timeline_submenu(&url, "(Remove User Flag)", "view", zView, "user");
2233 }
2234

Keyboard Shortcuts

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