[Pkg-bugzilla-commits] r88 - in trunk/bugzilla-2.18: Bugzilla template/en/default

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-04-27 14:33:22 +0000 (Wed, 27 Apr 2005)
New Revision: 88

Modified:
   trunk/bugzilla-2.18/Bugzilla/Config.pm
   trunk/bugzilla-2.18/Bugzilla/Template.pm
   trunk/bugzilla-2.18/template/en/default/index.html.tmpl
   trunk/bugzilla-2.18/template/en/default/sidebar.xul.tmpl
Log:
coming back to original files

Modified: trunk/bugzilla-2.18/Bugzilla/Config.pm
===================================================================
--- trunk/bugzilla-2.18/Bugzilla/Config.pm	2005-04-27 13:46:25 UTC (rev 87)
+++ trunk/bugzilla-2.18/Bugzilla/Config.pm	2005-04-27 14:33:22 UTC (rev 88)
@@ -51,9 +51,9 @@
 # graphs (since the path will be wrong in the HTML). This will be fixed at
 # some point.
 
-our $libpath = '/usr/share/bugzilla';
-our $localconfig = "/etc/bugzilla/localconfig";
-our $datadir = "$libpath/web/data";
+our $libpath = '.';
+our $localconfig = "$libpath/localconfig";
+our $datadir = "$libpath/data";
 our $templatedir = "$libpath/template";
 our $webdotdir = "$datadir/webdot";
 
@@ -78,14 +78,10 @@
 # Bugzilla version
 $Bugzilla::Config::VERSION = "2.18";
 
-
 use Safe;
 
 use vars qw(@param_list);
 
-# This is for Debian compat, in order to be able to use [% webpath %] in templates.
-our $WEBPATH = "/bugzilla/";
-
 # Data::Dumper is required as needed, below. The problem is that then when
 # the code locally sets $Data::Dumper::Foo, this triggers 'used only once'
 # warnings.
@@ -131,7 +127,7 @@
 _load_datafiles();
 
 # Load in the param defintions
-unless (my $ret = do '/usr/share/bugzilla/defparams.pl') {
+unless (my $ret = do 'defparams.pl') {
     die "Couldn't parse defparams.pl: $@" if $@;
     die "Couldn't do defparams.pl: $!" unless defined $ret;
     die "Couldn't run defparams.pl" unless $ret;

Modified: trunk/bugzilla-2.18/Bugzilla/Template.pm
===================================================================
--- trunk/bugzilla-2.18/Bugzilla/Template.pm	2005-04-27 13:46:25 UTC (rev 87)
+++ trunk/bugzilla-2.18/Bugzilla/Template.pm	2005-04-27 14:33:22 UTC (rev 88)
@@ -380,9 +380,6 @@
             # Bugzilla version
             # This could be made a ref, or even a CONSTANT with TT2.08
             'VERSION' => $Bugzilla::Config::VERSION ,
-
-	    # This is for Debian compat, in order to be able to use [% webpath %] in templates.
-	    'webpath' => $Bugzilla::Config::WEBPATH,
         },
 
    }) || die("Template creation failed: " . $class->error());

Modified: trunk/bugzilla-2.18/template/en/default/index.html.tmpl
===================================================================
--- trunk/bugzilla-2.18/template/en/default/index.html.tmpl	2005-04-27 13:46:25 UTC (rev 87)
+++ trunk/bugzilla-2.18/template/en/default/index.html.tmpl	2005-04-27 14:33:22 UTC (rev 88)
@@ -86,11 +86,11 @@
   </p>
   </form>
  </td>
- <td align="right"><img src="[% webpath %]ant.jpg" width="329" height="220" border="2" alt="ant.jpg [8.5k]"></td>
+ <td align="right"><img src="ant.jpg" width="329" height="220" border="2" alt="ant.jpg [8.5k]"></td>
 </tr></table>
 
-<script type="text/javascript" language="JavaScript" src="[% webpath %]localconfig.js"></script>
-<script type="text/javascript" language="JavaScript" src="[% webpath %]quicksearch.js"></script>
+<script type="text/javascript" language="JavaScript" src="localconfig.js"></script>
+<script type="text/javascript" language="JavaScript" src="quicksearch.js"></script>
 <script type="text/javascript">
 <!--
 document.forms['f'].id.focus();

Modified: trunk/bugzilla-2.18/template/en/default/sidebar.xul.tmpl
===================================================================
--- trunk/bugzilla-2.18/template/en/default/sidebar.xul.tmpl	2005-04-27 13:46:25 UTC (rev 87)
+++ trunk/bugzilla-2.18/template/en/default/sidebar.xul.tmpl	2005-04-27 14:33:22 UTC (rev 88)
@@ -35,8 +35,8 @@
   onload="document.getElementById('query-field').addEventListener('keypress', initial_keypress_handler, true)">
 
 <!-- Load QuickSearch libraries -->
-<script type="application/x-javascript" src="[% webpath %]localconfig.js"/>
-<script type="application/x-javascript" src="[% webpath %]quicksearch.js"/>
+<script type="application/x-javascript" src="localconfig.js"/>
+<script type="application/x-javascript" src="quicksearch.js"/>
 <script type="application/x-javascript"><![CDATA[
 
 // Tell QuickSearch that the source of this is the sidebar