From 7ea36c899372e8e113935ff036e992a819d786b6 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Wed, 28 May 2014 11:04:37 -0400 Subject: Revert previous commit to re-apply with the schema change in a separate commit. This reverts commit b6b83df873a1509797235738e00f9e6307eca876. --- template/en/default/admin/params/admin.html.tmpl | 7 ++----- template/en/default/bug/show-header.html.tmpl | 5 ----- template/en/default/global/field-descs.none.tmpl | 1 - template/en/default/global/user-error.html.tmpl | 5 ----- 4 files changed, 2 insertions(+), 16 deletions(-) (limited to 'template/en') diff --git a/template/en/default/admin/params/admin.html.tmpl b/template/en/default/admin/params/admin.html.tmpl index f84dbc701..dd83ebb2e 100644 --- a/template/en/default/admin/params/admin.html.tmpl +++ b/template/en/default/admin/params/admin.html.tmpl @@ -37,8 +37,5 @@ "$terms.Bugzilla will issue a warning in case you'd run into inconsistencies " _ "when you're about to do so, but such deletions remain kinda scary. " _ "So, you have to turn on this option before any such deletions " _ - "will ever happen." - - last_visit_keep_days => "This option controls how many days $terms.Bugzilla will " _ - "remember when users visit specific ${terms.bugs}."} -%] + "will ever happen." } +%] \ No newline at end of file diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl index 306407a65..9f2127d23 100644 --- a/template/en/default/bug/show-header.html.tmpl +++ b/template/en/default/bug/show-header.html.tmpl @@ -41,7 +41,6 @@ [% yui = ['autocomplete', 'calendar'] %] [% yui.push('container') IF user.can_tag_comments %] [% javascript_urls = [ "js/util.js", "js/field.js" ] %] -[% javascript_urls.push("js/bug.js") IF user.id %] [% javascript_urls.push('js/comment-tagging.js') IF user.id && Param('comment_taggers_group') %] [% IF bug.defined %] @@ -66,10 +65,6 @@ } YAHOO.util.Event.onDOMReady(function() { initDirtyFieldTracking(); - - [% IF user.id AND user.is_involved_in_bug(bug) %] - YAHOO.bugzilla.bugUserLastVisit.update([% bug.bug_id FILTER none %]); - [% END %] }); [% javascript FILTER none %] [% END %] diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 721e1dc49..731ba37ef 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -111,7 +111,6 @@ "everconfirmed" => "Ever confirmed", "flagtypes.name" => "Flags", "keywords" => "Keywords", - "last_visit_ts" => "Last Visit", "longdesc" => "Comment", "longdescs.count" => "Number of Comments", "longdescs.isprivate" => "Comment is private", diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index b04deb4d6..54d0f696a 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1817,11 +1817,6 @@ Sorry, but you are not allowed to (un)mark comments or attachments as private. - [% ELSIF error == "user_not_involved" %] - [% title = "User Not Involved with $terms.Bug" %] - Sorry, but you are not involved with [% terms.Bug %] [%+ - bug_id FILTER bug_link(bug_id) FILTER none %]. - [% ELSIF error == "webdot_too_large" %] [% title = "Dependency Graph Too Large" %] The dependency graph contains too many [% terms.bugs %] to display (more -- cgit v1.2.3-24-g4f1b