@@ -288,14 +288,13 @@ def generate_index
288
288
289
289
out_file = @base_dir + @options . op_dir + 'index.html'
290
290
rel_prefix = @outputdir . relative_path_from out_file . dirname
291
- asset_rel_prefix = rel_prefix + @asset_rel_path
292
291
293
292
@title = @options . title
294
293
@main_page = @files . find { |f | f . full_name == @options . main_page }
295
294
296
295
render_template template_file , out_file : out_file , locals : {
297
296
rel_prefix : rel_prefix ,
298
- asset_rel_prefix : asset_rel_prefix ,
297
+ asset_rel_prefix : rel_prefix + @asset_rel_path ,
299
298
target : @main_page ,
300
299
}
301
300
rescue => e
@@ -320,8 +319,6 @@ def generate_class klass, template_file = nil
320
319
out_file = @outputdir + klass . path
321
320
rel_prefix = @outputdir . relative_path_from out_file . dirname
322
321
323
- asset_rel_prefix = rel_prefix + @asset_rel_path
324
-
325
322
breadcrumb = generate_nesting_namespaces_breadcrumb ( target , rel_prefix )
326
323
327
324
@title = "#{ klass . type } #{ klass . full_name } - #{ @options . title } "
@@ -334,7 +331,7 @@ def generate_class klass, template_file = nil
334
331
335
332
debug_msg " rendering #{ out_file } "
336
333
render_template template_file , out_file : out_file , locals : {
337
- asset_rel_prefix : asset_rel_prefix ,
334
+ asset_rel_prefix : rel_prefix + @asset_rel_path ,
338
335
rel_prefix : rel_prefix ,
339
336
target : target ,
340
337
klass : klass ,
@@ -408,8 +405,6 @@ def generate_file_files
408
405
debug_msg " working on %s (%s)" % [ file . full_name , out_file ]
409
406
rel_prefix = @outputdir . relative_path_from out_file . dirname
410
407
411
- asset_rel_prefix = rel_prefix + @asset_rel_path
412
-
413
408
unless filepage_file then
414
409
if file . text? then
415
410
next unless page_file . exist?
@@ -427,7 +422,7 @@ def generate_file_files
427
422
428
423
render_template template_file , out_file : out_file , locals : {
429
424
rel_prefix : rel_prefix ,
430
- asset_rel_prefix : asset_rel_prefix ,
425
+ asset_rel_prefix : rel_prefix + @asset_rel_path ,
431
426
file : file ,
432
427
target : target ,
433
428
}
@@ -453,15 +448,14 @@ def generate_page file
453
448
rel_prefix = @outputdir . relative_path_from out_file . dirname
454
449
455
450
target = file
456
- asset_rel_prefix = rel_prefix + @asset_rel_path
457
451
458
452
@title = "#{ file . page_name } - #{ @options . title } "
459
453
460
454
debug_msg " rendering #{ out_file } "
461
455
render_template template_file , out_file : out_file , locals : {
462
456
file : file ,
463
457
target : target ,
464
- asset_rel_prefix : asset_rel_prefix ,
458
+ asset_rel_prefix : rel_prefix + @asset_rel_path ,
465
459
rel_prefix : rel_prefix ,
466
460
}
467
461
end
@@ -477,15 +471,11 @@ def generate_servlet_not_found message
477
471
478
472
debug_msg "Rendering the servlet 404 Not Found page..."
479
473
480
- rel_prefix = rel_prefix = ''
481
-
482
- asset_rel_prefix = ''
483
-
484
474
@title = 'Not Found'
485
475
486
476
render_template template_file , locals : {
487
- asset_rel_prefix : asset_rel_prefix ,
488
- rel_prefix : rel_prefix ,
477
+ asset_rel_prefix : '' ,
478
+ rel_prefix : '' ,
489
479
}
490
480
rescue => e
491
481
error = RDoc ::Error . new \
@@ -506,14 +496,11 @@ def generate_servlet_root installed
506
496
507
497
debug_msg 'Rendering the servlet root page...'
508
498
509
- rel_prefix = '.'
510
- asset_rel_prefix = rel_prefix
511
-
512
499
@title = 'Local RDoc Documentation'
513
500
514
501
render_template template_file , locals : {
515
- asset_rel_prefix : asset_rel_prefix ,
516
- rel_prefix : rel_prefix ,
502
+ asset_rel_prefix : '.' ,
503
+ rel_prefix : '.' ,
517
504
}
518
505
rescue => e
519
506
error = RDoc ::Error . new \
@@ -537,13 +524,11 @@ def generate_table_of_contents
537
524
out_file = @outputdir + 'table_of_contents.html'
538
525
rel_prefix = @outputdir . relative_path_from out_file . dirname
539
526
540
- asset_rel_prefix = rel_prefix + @asset_rel_path
541
-
542
527
@title = "Table of Contents - #{ @options . title } "
543
528
544
529
render_template template_file , out_file : out_file , locals : {
545
530
rel_prefix : rel_prefix ,
546
- asset_rel_prefix : asset_rel_prefix ,
531
+ asset_rel_prefix : rel_prefix + @asset_rel_path ,
547
532
}
548
533
rescue => e
549
534
error = RDoc ::Error . new \
0 commit comments