Thread: [Openfirst-cvscommit] www/htdocs/bugzilla config.js.tmpl,NONE,1.1 config.rdf.tmpl,NONE,1.1 filterexc

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/openfirst/www/htdocs/bugzilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397

Modified Files:
	filterexceptions.pl index.html.tmpl sidebar.xul.tmpl 
Added Files:
	config.js.tmpl config.rdf.tmpl 
Log Message:
Bring templates up to date for Bugzilla 2.18.1

Index: sidebar.xul.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/sidebar.xul.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sidebar.xul.tmpl	28 Jun 2004 00:39:51 -0000	1.1
--- sidebar.xul.tmpl	15 May 2005 14:38:18 -0000	1.2
***************
*** 18,25 ****
    # Rights Reserved.
    #
!   # Contributor(s): Jacob Steenhagen <ja...@ac...>
    #                 Scott Collins <sc...@mo...>
    #                 Christopher A. Aillon <chr...@ai...>
    #%]
  <?xml version="1.0"?>
  <!-- [% template_version %] -->
--- 18,28 ----
    # Rights Reserved.
    #
!   # Contributor(s): Jacob Steenhagen <ja...@bu...>
    #                 Scott Collins <sc...@mo...>
    #                 Christopher A. Aillon <chr...@ai...>
    #%]
+ 
+ [% PROCESS global/variables.none.tmpl %]
+ 
  <?xml version="1.0"?>
  <!-- [% template_version %] -->
***************
*** 40,43 ****
--- 43,50 ----
  var sidebar = 1;

+ function load_absolute_url( aAbsoluteURL ) {
+     content.location = aAbsoluteURL;
+ }
+ 
  function load_relative_url( aRelativeURL ) {
      aRelativeURL = '[% Param('urlbase') %]' + aRelativeURL;
***************
*** 58,62 ****
  ]]></script>

! <textbox id="query-field" class="descriptive-content" value="enter query" onfocus="this.setSelectionRange(0,this.value.length)"/>

    <separator class="groove"/>
--- 65,69 ----
  ]]></script>

! <textbox id="query-field" class="descriptive-content" value="enter search" onfocus="this.setSelectionRange(0,this.value.length)"/>

    <separator class="groove"/>
***************
*** 64,96 ****
    <box autostretch="never" valign="top">
      <box orient="vertical" flex="1">
!       <text class="text-link" onclick="load_relative_url('query.cgi')" value="new query"/>
!       <text class="text-link" onclick="load_relative_url('reports.cgi')" value="reports"/>
!       <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="new bug"/>
        <separator class="thin"/>

! [% IF username %]
        <text class="text-link" onclick="load_relative_url('userprefs.cgi')" value="edit prefs"/>
!   [%- IF UserInGroup('tweakparams') %]
        <text class="text-link" onclick="load_relative_url('editparams.cgi')" value="edit params"/>
    [%- END %]
!   [%- IF UserInGroup('editusers') || blessgroupset %]
        <text class="text-link" onclick="load_relative_url('editusers.cgi')" value="edit users"/>
    [%- END %]
!   [%- IF UserInGroup('editcomponents') %]
        <text class="text-link" onclick="load_relative_url('editcomponents.cgi')" value="edit components"/>
    [%- END %]
!   [%- IF UserInGroup('creategroups') %]
        <text class="text-link" onclick="load_relative_url('editgroups.cgi')" value="edit groups"/>
    [%- END %]
!   [%- IF UserInGroup('editkeywords') %]
        <text class="text-link" onclick="load_relative_url('editkeywords.cgi')" value="edit keywords"/>
    [%- END %]
!   [%- IF UserInGroup('tweakparams') %]
        <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="sanity check"/>
    [%- END %]
!       <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="logout [% username FILTER html %]"/>
        <separator class="thin"/>
!   [%- IF mybugsurl %]
!       <text class="text-link" onclick="load_relative_url('[% mybugsurl FILTER html %]')" value="my bugs"/>
    [%- END %]
    [%- IF Param('usevotes') %]
--- 71,104 ----
    <box autostretch="never" valign="top">
      <box orient="vertical" flex="1">
!       <text class="text-link" onclick="load_relative_url('query.cgi')" value="new search"/>
!       <text class="text-link" onclick="load_relative_url('report.cgi')" value="reports"/>
!       <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="new [% terms.bug %]"/>
        <separator class="thin"/>

! [% IF user %]
        <text class="text-link" onclick="load_relative_url('userprefs.cgi')" value="edit prefs"/>
!   [%- IF user.groups.tweakparams %]
        <text class="text-link" onclick="load_relative_url('editparams.cgi')" value="edit params"/>
    [%- END %]
!   [%- IF user.groups.editusers || user.can_bless %]
        <text class="text-link" onclick="load_relative_url('editusers.cgi')" value="edit users"/>
    [%- END %]
!   [%- IF user.groups.editcomponents %]
        <text class="text-link" onclick="load_relative_url('editcomponents.cgi')" value="edit components"/>
    [%- END %]
!   [%- IF user.groups.creategroups %]
        <text class="text-link" onclick="load_relative_url('editgroups.cgi')" value="edit groups"/>
    [%- END %]
!   [%- IF user.groups.editkeywords %]
        <text class="text-link" onclick="load_relative_url('editkeywords.cgi')" value="edit keywords"/>
    [%- END %]
!   [%- IF user.groups.tweakparams %]
        <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="sanity check"/>
    [%- END %]
!       <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="logout [% user.login FILTER html %]"/>
        <separator class="thin"/>
!   [%- IF user.showmybugslink %]
!       [% filtered_username = user.login FILTER url_quote %]
!       <text class="text-link" onclick="load_relative_url('[% Param('mybugstemplate').replace('%userid%', filtered_username) FILTER js FILTER html %]')" value="my [% terms.bugs %]"/>
    [%- END %]
    [%- IF Param('usevotes') %]
***************
*** 98,103 ****
    [%- END %]

!   [%- FOREACH name = namedqueries %]
!       <text class="text-link" onclick="load_relative_url('buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% name FILTER url_quote %]')" value="[% name FILTER html %]"/>
    [% END %]

--- 106,111 ----
    [%- END %]

!   [%- FOREACH q = user.queries %]
!       <text class="text-link" onclick="load_relative_url('buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER url_quote %]')" value="[% q.name FILTER html %]"/>
    [% END %]

Index: filterexceptions.pl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/filterexceptions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** filterexceptions.pl	28 Jun 2004 00:39:51 -0000	1.1
--- filterexceptions.pl	15 May 2005 14:38:18 -0000	1.2
***************
*** 34,48 ****
  # TT loop variables               - [% loop.count %]
  # Already-filtered stuff          - [% wibble FILTER html %]
! #   where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml
! 
! # Key:
! #
! # "#": directive should be filtered, but not doing so is not a security hole
! # The plan is to come back and add filtering for all those marked "#" after
! # the security release.
! #
! # "# Email": as above; but noting that it's an email address.
! # Other sorts of comments denote cleanups noticed while doing this work;
! # they should be fixed in the very short term.

  %::safe = (
--- 34,38 ----
  # TT loop variables               - [% loop.count %]
  # Already-filtered stuff          - [% wibble FILTER html %]
! #   where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml|none

  %::safe = (
***************
*** 52,67 ****
  ],

  'search/boolean-charts.html.tmpl' => [
!   '"field${chartnum}-${rownum}-${colnum}"',
!   '"value${chartnum}-${rownum}-${colnum}"',
!   '"type${chartnum}-${rownum}-${colnum}"',
!   'field.name',
!   'field.description',
!   'type.name',
!   'type.description',
!   '"${chartnum}-${rownum}-${newor}"',
!   '"${chartnum}-${newand}-0"',
    'newchart',
!   '$jsmagic', #
  ],

--- 42,63 ----
  ],

+ 'flag/list.html.tmpl' => [
+   'flag.id', 
+   'flag.status', 
+   'type.id', 
+ ],
+ 
  'search/boolean-charts.html.tmpl' => [
!   '"field${chartnum}-${rownum}-${colnum}"', 
!   '"value${chartnum}-${rownum}-${colnum}"', 
!   '"type${chartnum}-${rownum}-${colnum}"', 
!   'field.name', 
!   'field.description', 
!   'type.name', 
!   'type.description', 
!   '"${chartnum}-${rownum}-${newor}"', 
!   '"${chartnum}-${newand}-0"', 
    'newchart',
!   'jsmagic',
  ],

***************
*** 72,115 ****
    'field.name',
    'field.description',
    'sel.name',
!   'button_name', #
  ],

! 'search/knob.html.tmpl' => [
!   'button_name', #
  ],

! 'reports/components.html.tmpl' => [
!   'numcols',
!   'numcols - 1',
!   'comp.description',
!   'comp.initialowner', # email address
!   'comp.initialqacontact', # email address
  ],

! 'reports/duplicates-simple.html.tmpl' => [
!   'title', #
  ],

  'reports/duplicates-table.html.tmpl' => [
!   '"&maxrows=$maxrows" IF maxrows',
!   '"&changedsince=$changedsince" IF changedsince',
!   '"&product=$product" IF product', #
!   '"&format=$format" IF format', #
!   '"&bug_id=$bug_ids_string&sortvisible=1" IF sortvisible',
!   'column.name',
    'column.description',
!   'vis_bug_ids.push(bug.id)',
!   'bug.id',
!   'bug.count',
!   'bug.delta',
!   'bug.component', #
!   'bug.bug_severity', #
!   'bug.op_sys', #
!   'bug.target_milestone', #
  ],

  'reports/duplicates.html.tmpl' => [
!   'bug_ids_string',
    'maxrows',
    'changedsince',
--- 68,113 ----
    'field.name',
    'field.description',
+   'field.accesskey',
    'sel.name',
!   'sel.accesskey',
  ],

! 'search/search-specific.html.tmpl' => [
!   's',
  ],

! 'search/tabs.html.tmpl' => [
!   'tab.name',
!   'tab.description',
  ],

! 'request/queue.html.tmpl' => [
!   'column_headers.$group_field', 
!   'column_headers.$column', 
!   'request.status', 
!   'request.bug_id', 
!   'request.attach_id', 
! ],
! 
! 'reports/components.html.tmpl' => [
!   'numcols',
!   'comp.description', 
  ],

  'reports/duplicates-table.html.tmpl' => [
!   '"&amp;maxrows=$maxrows" IF maxrows',
!   '"&amp;changedsince=$changedsince" IF changedsince',
!   '"&amp;bug_id=$bug_ids_string&amp;sortvisible=1" 
!                                                             IF sortvisible',
!   'column.name', 
    'column.description',
!   'vis_bug_ids.push(bug.id)', 
!   'bug.id', 
!   'bug.count', 
!   'bug.delta', 
  ],

  'reports/duplicates.html.tmpl' => [
!   'bug_ids_string', 
    'maxrows',
    'changedsince',
***************
*** 118,210 ****

  'reports/keywords.html.tmpl' => [
!   'keyword.description',
!   'keyword.bugcount',
  ],

  'list/change-columns.html.tmpl' => [
!   'column',
!   'desc.${column}', #
  ],

  'list/edit-multiple.html.tmpl' => [
!   'group.bit',
    'group.description',
!   'group.description FILTER strike',
!   'knum',
!   'menuname',
!   'selected IF resolution == "FIXED"', #
! ],
! 
! 'list/list-rdf.rdf.tmpl' => [
!   'template_version',
!   'bug.id',
!   'column',
  ],

  'list/list-simple.html.tmpl' => [
!   'title',
  ],

  'list/list.html.tmpl' => [
!   'currenttime', #
!   'buglist',
!   'bugowners', # email address
  ],

  'list/table.html.tmpl' => [
-   'id',
-   'splitheader ? 2 : 1',
-   'abbrev.$id.title || column.title', #
    'tableheader',
!   'bug.severity', #
!   'bug.priority', #
!   'bug.id',
  ],

! 'global/choose-product.html.tmpl' => [
!   'target',
!   'proddesc.$p',
  ],

! 'global/code-error.html.tmpl' => [
!   'error',
  ],

! 'global/footer.html.tmpl' => [
!   'CALL SyncAnyPendingShadowChanges() IF SyncAnyPendingShadowChanges',
  ],

  'global/header.html.tmpl' => [
!   'header_html',
!   'javascript',
!   'style',
!   'style_url',
!   'bgcolor',
    'onload',
    'h1',
    'h2',
!   'message',
  ],

! 'global/hidden-fields.html.tmpl' => [
!   'mvalue | html | html_linebreak', # Need to eliminate | usage
!   'field.value | html | html_linebreak',
  ],

  'global/select-menu.html.tmpl' => [
    'options', 
  ],

  'global/useful-links.html.tmpl' => [
!   'user.login', # Email address
  ],

  'global/user-error.html.tmpl' => [
!   'error', # can contain HTML in 2.16.x
  ],

  'bug/comments.html.tmpl' => [
!   'comment.time',
!   'quoteUrls(comment.body)',
  ],

--- 116,304 ----

  'reports/keywords.html.tmpl' => [
!   'keyword.description', 
!   'keyword.bugcount', 
! ],
! 
! 'reports/report-table.csv.tmpl' => [
!   'num_bugs',
!   'data.$tbl.$col.$row',
!   'title',
!   '', # This is not a bug in the filter exceptions - this template has an 
!       # empty directive which is necessary for it to work properly.
! ],
! 
! 'reports/report-table.html.tmpl' => [
!   'buglistbase', 
!   '"&amp;$tbl_vals" IF tbl_vals', 
!   '"&amp;$col_vals" IF col_vals', 
!   '"&amp;$row_vals" IF row_vals', 
!   'classes.$row_idx.$col_idx', 
!   'urlbase', 
!   'data.$tbl.$col.$row', 
!   'row_total',
!   'col_totals.$col',
!   'grand_total', 
! ],
! 
! 'reports/report.html.tmpl' => [
!   'imagebase', 
!   'width', 
!   'height', 
!   'imageurl', 
!   'formaturl', 
!   'other_format.name', 
!   'sizeurl', 
!   'switchbase',
!   'format',
!   'cumulate',
! ],
! 
! 'reports/duplicates.rdf.tmpl' => [
!   'template_version', 
!   'bug.id', 
!   'bug.count', 
!   'bug.delta', 
! ],
! 
! 'reports/chart.html.tmpl' => [
!   'width', 
!   'height', 
!   'imageurl', 
!   'sizeurl', 
!   'height + 100', 
!   'height - 100', 
!   'width + 100', 
!   'width - 100', 
! ],
! 
! 'reports/series-common.html.tmpl' => [
!   'sel.name', 
!   'sel.accesskey', 
!   '"onchange=\"$sel.onchange\"" IF sel.onchange', 
! ],
! 
! 'reports/chart.csv.tmpl' => [
!   'data.$j.$i', 
! ],
! 
! 'reports/create-chart.html.tmpl' => [
!   'series.series_id', 
!   'newidx',
! ],
! 
! 'reports/edit-series.html.tmpl' => [
!   'default.series_id', 
  ],

  'list/change-columns.html.tmpl' => [
!   'column', 
  ],

  'list/edit-multiple.html.tmpl' => [
!   'group.id', 
    'group.description',
!   'group.description FILTER inactive', 
!   'knum', 
!   'menuname', 
  ],

  'list/list-simple.html.tmpl' => [
!   'title', 
  ],

  'list/list.html.tmpl' => [
!   'buglist', 
! ],
! 
! 'list/list.rdf.tmpl' => [
!   'template_version', 
!   'bug.bug_id', 
!   'column', 
  ],

  'list/table.html.tmpl' => [
    'tableheader',
!   'bug.bug_id', 
!   'abbrev.$id.title || field_descs.$id || column.title',
  ],

! 'list/list.csv.tmpl' => [
!   'bug.bug_id', 
  ],

! 'list/list.js.tmpl' => [
!   'bug.bug_id', 
  ],

! 'global/help.html.tmpl' => [
!   'h.id', 
!   'h.html', 
! ],
! 
! 'global/banner.html.tmpl' => [
!   'VERSION', 
! ],
! 
! 'global/choose-product.html.tmpl' => [
!   'target',
!   'proddesc.$p', 
  ],

+ # You are not permitted to add any values here. Everything in this file should 
+ # be filtered unless there's an extremely good reason why not, in which case,
+ # use the "none" dummy filter.
+ 'global/code-error.html.tmpl' => [
+ ],
+  
  'global/header.html.tmpl' => [
!   'javascript', 
!   'style', 
!   'style_url', 
!   'bgcolor', 
    'onload',
+   'bodyattrs', 
    'h1',
    'h2',
!   'h3', 
!   'message', 
  ],

! 'global/messages.html.tmpl' => [
!   'message_tag', 
!   'series.frequency * 2',
  ],

  'global/select-menu.html.tmpl' => [
    'options', 
+   'size', 
  ],

  'global/useful-links.html.tmpl' => [
!   'email', 
  ],

+ # You are not permitted to add any values here. Everything in this file should 
+ # be filtered unless there's an extremely good reason why not, in which case,
+ # use the "none" dummy filter.
  'global/user-error.html.tmpl' => [
! ],
! 
! 'global/confirm-user-match.html.tmpl' => [
!   'script',
!   'fields.${field_name}.flag_type.name',
! ],
! 
! 'global/site-navigation.html.tmpl' => [
!   'bug_list.first', 
!   'bug_list.$prev_bug', 
!   'bug_list.$next_bug', 
!   'bug_list.last', 
!   'bug.bug_id', 
!   'bug.votes', 
  ],

  'bug/comments.html.tmpl' => [
!   'comment.isprivate', 
!   'comment.when', 
  ],

***************
*** 217,309 ****

  'bug/dependency-tree.html.tmpl' => [
-   'hide_resolved ? "Open b" : "B"', 
    'bugid', 
    'maxdepth', 
    'dependson_ids.join(",")', 
!   'blocked_ids.join(",")',
!   'dep_id',
!   'hide_resolved ? 0 : 1',
!   'hide_resolved ? "Show" : "Hide"',
!   'realdepth < 2 || maxdepth == 1 ? "disabled" : ""',
!   'hide_resolved',
!   'realdepth < 2 ? "disabled" : ""',
!   'maxdepth + 1',
!   'maxdepth == 0 || maxdepth == realdepth ? "disabled" : ""',
!   'realdepth < 2 || ( maxdepth && maxdepth < 2 ) ? "disabled" : ""',
    'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""',
!   'maxdepth == 1 ? 1 
                         : ( maxdepth ? maxdepth - 1 : realdepth - 1 )',
-   'realdepth < 2 || ! maxdepth || maxdepth >= realdepth ?
-             "disabled" : ""',
  ],

  'bug/edit.html.tmpl' => [
!   'bug.delta_ts',
!   'bug.bug_id',
!   'bug.votes',
!   'group.bit',
!   'group.description',
!   'knum',
!   'dep.title',
!   'dep.fieldname',
!   'bug.${dep.fieldname}.join(\', \')',
    'selname',
!   'bug.longdesclength',
!   'bug.creation_ts',
  ],

  'bug/navigate.html.tmpl' => [
!   'this_bug_idx + 1',
!   'bug_list.first',
!   'bug_list.last',
!   'bug_list.$prev_bug',
!   'bug_list.$next_bug',
  ],

  'bug/show-multiple.html.tmpl' => [
!   'bug.bug_id',
!   'bug.component', #
!   'attr.description', #
  ],

  'bug/votes/list-for-bug.html.tmpl' => [
!   'voter.count',
!   'total',
  ],

  'bug/votes/list-for-user.html.tmpl' => [
!   'product.maxperbug',
!   'bug.id',
!   'bug.count',
!   'product.total',
!   'product.maxvotes',
  ],
- # h2 = voting_user.name # Email

  'bug/process/confirm-duplicate.html.tmpl' => [
!   'original_bug_id',
!   'duplicate_bug_id',
  ],

  'bug/process/midair.html.tmpl' => [
!   'bug_id',
  ],

  'bug/process/next.html.tmpl' => [
!   'next_id',
  ],

  'bug/process/results.html.tmpl' => [
!   'title.$type',
!   'id',
!   'mail',
  ],

! 'bug/process/verify-new-product.html.tmpl' => [
!   'form.product', # 
  ],

  'bug/create/create.html.tmpl' => [
-   'default.bug_status', #
    'g.bit',
    'g.description',
--- 311,407 ----

  'bug/dependency-tree.html.tmpl' => [
    'bugid', 
    'maxdepth', 
    'dependson_ids.join(",")', 
!   'blocked_ids.join(",")', 
!   'dep_id', 
!   'hide_resolved', 
!   'maxdepth + 1', 
    'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""',
!   'maxdepth == 1 ? 1
                         : ( maxdepth ? maxdepth - 1 : realdepth - 1 )',
  ],

  'bug/edit.html.tmpl' => [
!   'bug.remaining_time', 
!   'bug.delta_ts', 
!   'bug.bug_id', 
!   'bug.votes', 
!   'group.bit', 
!   'group.description', 
!   'dep.title', 
!   'dep.fieldname', 
!   'accesskey', 
!   'bug.${dep.fieldname}.join(\', \')', 
    'selname',
!   'depbug FILTER bug_link(depbug)',
!   '"${bug.dup_id}" FILTER bug_link(bug.dup_id)',
! ],
! 
! 'bug/knob.html.tmpl' => [
!   'bug.bug_id', 
!   'knum', 
  ],

  'bug/navigate.html.tmpl' => [
!   'bug_list.first', 
!   'bug_list.last', 
!   'bug_list.$prev_bug', 
!   'bug_list.$next_bug', 
  ],

  'bug/show-multiple.html.tmpl' => [
!   'bug.bug_id', 
! ],
! 
! 'bug/show.xml.tmpl' => [
!   'VERSION', 
!   'a.attachid', 
!   'field', 
! ],
! 
! 'bug/time.html.tmpl' => [
!   'time_unit FILTER format(\'%.1f\')', 
!   'time_unit FILTER format(\'%.2f\')', 
!   '(act / (act + rem)) * 100 
!        FILTER format("%d")', 
  ],

  'bug/votes/list-for-bug.html.tmpl' => [
!   'voter.count', 
!   'total', 
  ],

  'bug/votes/list-for-user.html.tmpl' => [
!   'product.maxperbug', 
!   'bug.id', 
!   'bug.count', 
!   'product.total', 
!   'product.maxvotes', 
  ],

  'bug/process/confirm-duplicate.html.tmpl' => [
!   'original_bug_id', 
!   'duplicate_bug_id', 
  ],

  'bug/process/midair.html.tmpl' => [
!   'bug_id', 
  ],

  'bug/process/next.html.tmpl' => [
!   'bug.bug_id', 
  ],

  'bug/process/results.html.tmpl' => [
!   'title.$type', 
!   'id', 
  ],

! 'bug/create/comment.txt.tmpl' => [
!   'form.comment', 
  ],

  'bug/create/create.html.tmpl' => [
    'g.bit',
    'g.description',
***************
*** 312,406 ****
  ],

  'bug/activity/show.html.tmpl' => [
!   'bug_id',
  ],

  'bug/activity/table.html.tmpl' => [
!   'operation.who', # Email
!   'operation.when',
!   'change.attachid',
!   'change.field',
  ],

  'attachment/create.html.tmpl' => [
!   'bugid',
!   'attachment.id',
  ],

  'attachment/created.html.tmpl' => [
!   'attachid',
!   'bugid',
!   'contenttype',
!   'mailresults',
  ],

  'attachment/edit.html.tmpl' => [
!   'attachid',
!   'bugid',
!   'def.id',
!   'a',
  ],

  'attachment/list.html.tmpl' => [
!   'attachment.attachid',
!   'attachment.date',
    'bugid',
  ],

  'attachment/show-multiple.html.tmpl' => [
!   'a.attachid',
!   'a.date',
  ],

  'attachment/updated.html.tmpl' => [
    'attachid',
    'bugid',
!   'mailresults',
  ],

! 'admin/attachstatus/create.html.tmpl' => [
!   'id',
  ],

! 'admin/attachstatus/delete.html.tmpl' => [
!   'attachcount',
!   'id',
!   'name',
  ],

! 'admin/attachstatus/edit.html.tmpl' => [
!   'id',
!   'sortkey',
  ],

! 'admin/attachstatus/list.html.tmpl' => [
!   'statusdef.sortkey',
!   'statusdef.id',
!   'statusdef.attachcount',
  ],

! 'account/prefs/account.html.tmpl' => [
!   'login_change_date', #
  ],

  'account/prefs/email.html.tmpl' => [
!   'watchedusers', # Email
!   'useqacontact ? \'5\' : \'4\'',
!   'role',
!   'reason.name',
    'reason.description',
  ],

  'account/prefs/permissions.html.tmpl' => [
!   'bit_description',
  ],

  'account/prefs/prefs.html.tmpl' => [
!   'tab.name',
!   'tab.description',
!   'changes_saved',
!   'current_tab.name',
!   'current_tab.description',
!   'current_tab.description FILTER lower',
  ],

--- 410,550 ----
  ],

+ 'bug/create/create-guided.html.tmpl' => [
+   'matches.0', 
+   'tablecolour',
+   'buildid',
+   'sel', 
+ ],
+ 
  'bug/activity/show.html.tmpl' => [
!   'bug_id', 
  ],

  'bug/activity/table.html.tmpl' => [
!   'change.attachid', 
!   'change.field', 
  ],

  'attachment/create.html.tmpl' => [
!   'bugid', 
!   'attachment.id', 
  ],

  'attachment/created.html.tmpl' => [
!   'attachid', 
!   'bugid', 
!   'contenttype', 
  ],

  'attachment/edit.html.tmpl' => [
!   'attachid', 
!   'bugid', 
!   'a', 
  ],

  'attachment/list.html.tmpl' => [
!   'attachment.attachid', 
!   'flag.status',
    'bugid',
  ],

  'attachment/show-multiple.html.tmpl' => [
!   'a.attachid', 
!   'flag.status'
  ],

  'attachment/updated.html.tmpl' => [
+   'attachid', 
+   'bugid', 
+ ],
+ 
+ 'attachment/diff-header.html.tmpl' => [
    'attachid',
+   'id',
    'bugid',
!   'oldid',
!   'newid',
!   'style',
!   'javascript',
!   'patch.id',
  ],

! 'attachment/diff-file.html.tmpl' => [
!   'lxr_prefix',
!   'file.minus_lines',
!   'file.plus_lines',
!   'bonsai_prefix',
!   'section.old_start',
!   'section_num'
  ],

! 'admin/products/groupcontrol/confirm-edit.html.tmpl' => [
!   'group.count', 
  ],

! 'admin/products/groupcontrol/edit.html.tmpl' => [
!   'filt_product', 
!   'group.bugcount', 
!   'group.id', 
!   'const.CONTROLMAPNA', 
!   'const.CONTROLMAPSHOWN', 
!   'const.CONTROLMAPDEFAULT', 
!   'const.CONTROLMAPMANDATORY', 
  ],

! 'admin/keywords/list.html.tmpl' => [
!   'keyword.id',
!   'keyword.bug_count',
  ],

! 'admin/keywords/edit.html.tmpl' => [
!   'keyword_id',
!   'bug_count',
! ],
! 
! 'admin/keywords/confirm-delete.html.tmpl' => [
!   'keyword_id',
!   'bug_count',
! ],
! 
! 'admin/flag-type/confirm-delete.html.tmpl' => [
!   'flag_count', 
!   'flag_type.id', 
! ],
! 
! 'admin/flag-type/edit.html.tmpl' => [
!   'action', 
!   'type.id', 
!   'type.target_type', 
!   'type.sortkey || 1',
!   'typeLabelLowerPlural',
!   'typeLabelLowerSingular',
! ],
! 
! 'admin/flag-type/list.html.tmpl' => [
!   'type.id', 
!   'type.flag_count', 
! ],
! 
! 'account/login.html.tmpl' => [
!   'target', 
  ],

  'account/prefs/email.html.tmpl' => [
!   'role', 
!   'reason.name', 
    'reason.description',
  ],

  'account/prefs/permissions.html.tmpl' => [
!   'bit_description.name', 
!   'bit_description.desc', 
  ],

  'account/prefs/prefs.html.tmpl' => [
!   'tab.name', 
!   'tab.description', 
!   'current_tab.name', 
!   'current_tab.description', 
  ],

--- NEW FILE: config.js.tmpl ---
[%# 1....@bu... %]
[%# The contents of this file are subject to the Mozilla Public
  # License Version 1.1 (the "License"); you may not use this file
  # except in compliance with the License. You may obtain a copy of
  # the License at http://www.mozilla.org/MPL/
  #
  # Software distributed under the License is distributed on an "AS
  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
  # implied. See the License for the specific language governing
  # rights and limitations under the License.
  #
  # The Original Code is the Bugzilla Bug Tracking System.
  #
  # The Initial Developer of the Original Code is Netscape Communications
  # Corporation. Portions created by Netscape are
  # Copyright (C) 1998 Netscape Communications Corporation. All
  # Rights Reserved.
  #
  # Contributor(s): Myk Melez <my...@mo...>
  #%]
//
// This file contains the installation specific values for QuickSearch
// and other Bugzilla clients.  See quicksearch.js for more details.
//
// Note: this interface is experimental and under development.
// We may and probably will make breaking changes to it in the future.

// the global bugzilla url
var installation = {
  base_url        : '[% Param('urlbase') FILTER js %]',
  install_version : '[% VERSION FILTER js %]',
  maintainer      : '[% Param('maintainer') FILTER js %]'
};

// Status and Resolution
// =====================
var status        = [ [% FOREACH x = status %]'[% x FILTER js %]', [% END %] ];
var status_open   = [ [% FOREACH x = open_status %]'[% x FILTER js %]', [% END %] ];
var status_closed = [ [% FOREACH x = closed_status %]'[% x FILTER js %]', [% END %] ];
var resolution    = [ [% FOREACH x = resolution %]'[% x FILTER js %]', [% END %] ];

// Keywords
// ========

var keyword       = [ [% FOREACH x = keyword %]'[% x FILTER js %]', [% END %] ];

// Platforms
// =========

var platform      = [ [% FOREACH x = platform %]'[% x FILTER js %]', [% END %] ];

// Severities
// ==========

var severity      = [ [% FOREACH x = severity %]'[% x FILTER js %]', [% END %] ];

// Products and Components
// =======================
//
// It is not necessary to list all products and components here.
// Instead, you can define a "blacklist" for some commonly used words
// or word fragments that occur in a product or component name
// but should _not_ trigger product/component search.

// A list of all products and their components, versions, and target milestones:

var component = new Object();
var version = new Object();
var target_milestone = new Object();

[% FOREACH p = legal_products %]
  component['[% p FILTER js %]'] = [ [% FOREACH x = components_by_product.$p %]'[% x FILTER js %]', [% END %] ];
  version['[% p FILTER js %]'] = [ [% FOREACH x = versions_by_product.$p %]'[% x FILTER js %]', [% END %] ];
  target_milestone['[% p FILTER js %]'] = [ [% FOREACH x = milestones_by_product.$p %]'[% x FILTER js %]', [% END %] ];
[% END %]

// Product and Component Exceptions
// ================================
//
// A blacklist for some commonly used words or word fragments 
// that occur in a product or component name but should *not*
// trigger product/component search in QuickSearch.

var product_exceptions = new Array(
  // Example:
  //"row"   // [Browser]
  //        //   ^^^
  //,"new"  // [MailNews]
  //        //      ^^^
);

var component_exceptions = new Array(
  // Example:
  //"hang"  // [mozilla.org] Bugzilla: Component/Keyword Changes
  //        //                                            ^^^^
);

// Queryable Fields
// ================
[% PROCESS "global/field-descs.none.tmpl" %]
var field = [
[% FOREACH x = field %]
  { name:        '[% x.name FILTER js %]', 
    description: '[% (field_descs.${x.name} OR x.description) FILTER js %]' },
[% END %]
];

// Deprecated Variables
// ====================
//
// Other names for various variables.  These are deprecated
// and could go away at any time.  Use them at your own risk!

var bugzilla = installation.base_url;
var statuses = status;
var statuses_resolved = status_closed;
var resolutions = resolution;
var keywords = keyword;
var platforms = platform;
var severities = severity;
var cpts = component;
var vers = version;
var tms = target_milestone;

--- NEW FILE: config.rdf.tmpl ---
[% template_version = "1....@bu..." %]
[%# The contents of this file are subject to the Mozilla Public
  # License Version 1.1 (the "License"); you may not use this file
  # except in compliance with the License. You may obtain a copy of
  # the License at http://www.mozilla.org/MPL/
  #
  # Software distributed under the License is distributed on an "AS
  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
  # implied. See the License for the specific language governing
  # rights and limitations under the License.
  #
  # The Original Code is the Bugzilla Bug Tracking System.
  #
  # The Initial Developer of the Original Code is Netscape Communications
  # Corporation. Portions created by Netscape are
  # Copyright (C) 1998 Netscape Communications Corporation. All
  # Rights Reserved.
  #
  # Contributor(s): Myk Melez <my...@mo...>
  #%]

<?xml version="1.0"?>
<!-- Note: this interface is experimental and under development.
   - We may and probably will make breaking changes to it in the future. -->

<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:bz="http://www.bugzilla.org/rdf#">

<bz:installation rdf:about="[% Param('urlbase') FILTER html %]">
  <bz:install_version>[% VERSION FILTER html %]</bz:install_version>
  <bz:maintainer>[% Param('maintainer') FILTER html %]</bz:maintainer>

  <bz:status>
    <Seq>
      [% FOREACH item = status %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:status>

  <bz:status_open>
    <Seq>
      [% FOREACH item = open_status %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:status_open>

  <bz:status_closed>
    <Seq>
      [% FOREACH item = closed_status %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:status_closed>

  <bz:resolution>
    <Seq>
      [% FOREACH item = resolution %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:resolution>

  <bz:keyword>
    <Seq>
      [% FOREACH item = keyword %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:keyword>

  <bz:platform>
    <Seq>
      [% FOREACH item = platform %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:platform>

  <bz:op_sys>
    <Seq>
      [% FOREACH item = op_sys %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:op_sys>

  <bz:priority>
    <Seq>
      [% FOREACH item = priority %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:priority>

  <bz:severity>
    <Seq>
      [% FOREACH item = severity %]
        <li>[% item FILTER html %]</li>
      [% END %]
    </Seq>
  </bz:severity>

  <bz:products>
    <Seq>
      [% FOREACH product = legal_products %]
        <li>
          <bz:product rdf:about="[% Param('urlbase') %]product.cgi?name=[% product FILTER uri %]">
            <bz:name>[% product FILTER html %]</bz:name>

            <bz:components>
              <Seq>
                [% FOREACH component = components_by_product.$product %]
                  <li resource="[% Param('urlbase') %]component.cgi?name=[% component FILTER uri %]"/>
                [% END %]
              </Seq>
            </bz:components>

            <bz:versions>
              <Seq>
                [% FOREACH version = versions_by_product.$product %]
                  <li resource="[% Param('urlbase') %]version.cgi?name=[% version FILTER uri %]"/>
                [% END %]
              </Seq>
            </bz:versions>

            [% IF Param('usetargetmilestone') %]
              <bz:target_milestones>
                <Seq>
                  [% FOREACH milestone = milestones_by_product.$product %]
                    <li resource="[% Param('urlbase') %]milestone.cgi?name=[% milestone FILTER uri %]"/>
                  [% END %]
                </Seq>
              </bz:target_milestones>
            [% END %]

          </bz:product>
        </li>
      [% END %]
    </Seq>
  </bz:products>

  <bz:components>
    <Seq>
      [% FOREACH item = legal_components %]
        <li>
          <bz:component rdf:about="[% Param('urlbase') %]component.cgi?name=[% item FILTER uri %]">
            <bz:name>[% item FILTER html %]</bz:name>
          </bz:component>
        </li>
      [% END %]
    </Seq>
  </bz:components>

  <bz:versions>
    <Seq>
      [% FOREACH item = legal_versions %]
        <li>
          <bz:version rdf:about="[% Param('urlbase') %]version.cgi?name=[% item FILTER uri %]">
            <bz:name>[% item FILTER html %]</bz:name>
          </bz:version>
        </li>
      [% END %]
    </Seq>
  </bz:versions>

  [% IF Param('usetargetmilestone') %]
    <bz:target_milestones>
      <Seq>
        [% FOREACH item = legal_milestones %]
          <li>
            <bz:target_milestone rdf:about="[% Param('urlbase') %]milestone.cgi?name=[% item FILTER uri %]">
              <bz:name>[% item FILTER html %]</bz:name>
            </bz:target_milestone>
          </li>
        [% END %]
      </Seq>
    </bz:target_milestones>
  [% END %]

  <bz:fields>
    <Seq>
      [% PROCESS "global/field-descs.none.tmpl" %]
      [% FOREACH item = field %]
        <li>
          <bz:field rdf:about="[% Param('urlbase') %]field.cgi?name=[% item.name FILTER uri %]">
            <bz:name>[% item.name FILTER html %]</bz:name>
            <bz:description>[% (field_descs.${item.name} OR item.description) FILTER html %]</bz:description>
          </bz:field>
        </li>
      [% END %]
    </Seq>
  </bz:fields>
</bz:installation>

</RDF>

Index: index.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/index.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.html.tmpl	28 Jun 2004 00:39:51 -0000	1.1
--- index.html.tmpl	15 May 2005 14:38:18 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# -*- mode: html -*- %]
  [%# The contents of this file are subject to the Mozilla Public
--- 1,3 ----
! [%# 1....@bu... %]
  [%# -*- mode: html -*- %]
  [%# The contents of this file are subject to the Mozilla Public
***************
*** 19,47 ****
    #
    # Contributor(s): Terry Weissman <te...@mo...>
!   #                 Jacob Steenhagen <ja...@ac...>
    #%]

  [%# INTERFACE:
!   # username: string. The login name of the user, if any.
    #%]

! [% PROCESS global/header.html.tmpl
!   title = 'openFIRST Bugzilla System Main Page'
! %]

  <script type="text/javascript" language="JavaScript">
  <!--
  function addSidebar() {
!       if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function"))
!       {
!          window.sidebar.addPanel ("Bugzilla", "[% Param('urlbase') %]sidebar.cgi", "");
!       }
!       else
!       {
!          var rv = window.confirm ("This page is enhanced for use with Netscape 6.  " + "Would you like to upgrade now?");
!          if (rv)
!             document.location.href = "http://home.netscape.com/download/index.html";
!       }
!    }
  //-->
  </script>
--- 19,54 ----
    #
    # Contributor(s): Terry Weissman <te...@mo...>
!   #                 Jacob Steenhagen <ja...@bu...>
    #%]

  [%# INTERFACE:
!   # This template has no interface.
    #%]

! [% PROCESS global/variables.none.tmpl %]
! 
! [% title = BLOCK %]
! [% terms.Bugzilla %] Main Page
! [% END %]
! [% PROCESS global/header.html.tmpl %]
! 

  <script type="text/javascript" language="JavaScript">
  <!--
  function addSidebar() {
!   if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function"))
!   {
!     var sidebarname=window.location.host;
!     if (!/bug/i.test(sidebarname))
!       sidebarname="[% terms.Bugzilla %] "+sidebarname;
!     window.sidebar.addPanel (sidebarname, "[% Param('urlbase') %]sidebar.cgi", "");
!   }
!   else
!   {
!     var rv = window.confirm ("Your browser does not support the sidebar extension.  " + "Would you like to upgrade now?");
!     if (rv)
!       document.location.href = "http://www.mozilla.org/binaries.html";
!   }
! }
  //-->
  </script>
***************
*** 50,72 ****
  <table width="100%"><tr>
   <td>
!   <p>If you're an end user, without a bug to report (and aren't curious about what bugs exist) <a href="http://www.openfirst.org/">you probably want to be here 
! [openfirst.org] instead</a>.</p>

! The openFIRST bug reporting system is based on Bugzilla. There is a customised backend that automatically imports error reports from the openFIRST 
! software. Users and developers may also report bugs directly, here. The bugzilla.openfirst.org site is also where developers go to readabout 
! the bugs and their descriptions, in order to fix them. Statistics on bug use, which are displayed on the openfirst.org website, are created here.

-   While you're here, you have a choice of choice of:
    <p>
!   <a href="query.cgi">Query existing bug reports</a><br>
!   <a href="enter_bug.cgi">Enter a new bug report</a><br>
!   <a href="reports.cgi">Get summary reports</a><br>
    </p><p>
! [% IF username %]
    <a href="userprefs.cgi">Change password or user preferences</a><br>
!   <a href="relogin.cgi">Logout [% username FILTER html %]</a><br>
  [% ELSE %]
    <a href="query.cgi?GoAheadAndLogIn=1">Log in to an existing account</a><br>
!   <a href="createaccount.cgi">Open a new Bugzilla account</a><br>
  [% END %]
    </p><p>
--- 57,84 ----
  <table width="100%"><tr>
   <td>
!   <p>
! Welcome to the openFIRST [% terms.Bugzilla %] server.  If you are an 
! end user, and don't have a bug to report (and don't want to check up 
! on the status of bugs) you probably want to go to <a 
! href="http://www.openfirst/">the openFIRST Project Home Page</a>.
! </p>

! <p>This server is maintained by <a href="mailto: 
! ti...@op...">ti...@op...</a> on behalf of the openFIRST 
! project. </p>

    <p>
!   <a href="query.cgi">Search existing [% terms.bug %] reports</a><br>
!   <a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a><br>
!   <a href="report.cgi">Summary reports and charts</a><br>
    </p><p>
! [% IF user.id %]
    <a href="userprefs.cgi">Change password or user preferences</a><br>
!   <a href="relogin.cgi">Logout [% user.login FILTER html %]</a><br>
  [% ELSE %]
    <a href="query.cgi?GoAheadAndLogIn=1">Log in to an existing account</a><br>
!   [% IF Param('createemailregexp') %]
!     <a href="createaccount.cgi">Open a new [% terms.Bugzilla %] account</a><br>
!   [% END %]
  [% END %]
    </p><p>
***************
*** 74,80 ****
    </p>
    <form name="f" action="show_bug.cgi" method="get"
!       onsubmit="QuickSearch(f.id.value); return false;"> 
    <p>
!   Enter a bug # or some search terms:<br>
    <input type="text" name="id">
    <input type="submit" value="Show">
--- 86,92 ----
    </p>
    <form name="f" action="show_bug.cgi" method="get"
!       onsubmit="QuickSearch(f.id.value); return false;">
    <p>
!   Enter [% terms.abug %] # or some search terms:<br>
    <input type="text" name="id">
    <input type="submit" value="Show">
***************
*** 83,88 ****
    </form>
   </td>
!  <td align="right"><img src="openfirst.png" alt="openFIRST">
! <br><img src="ant.jpg" alt="Bugzilla Ant"></td>
  </tr></table>

--- 95,99 ----
    </form>
   </td>
!  <td align="right"><img src="ant.jpg" width="329" height="220" border="2" alt="ant.jpg [8.5k]"></td>
  </tr></table>

Thread: [Openfirst-cvscommit] www/htdocs/bugzilla config.js.tmpl,NONE,1.1 config.rdf.tmpl,NONE,1.1 filterexc

openfirst-cvscommit