From 0a7345dfa8a6d061e13394fdbe31c77231f1847c Mon Sep 17 00:00:00 2001 From: Arne Georg Gleditsch Date: Thu, 22 Nov 2007 12:32:35 +0100 Subject: IE fixes, HTML fixes, ++ --- tmpl/content_dir.tt2 | 2 +- tmpl/footer.tt2 | 3 +++ tmpl/header.tt2 | 65 ++++++++++++++++++++++++++++--------------------- tmpl/popup_main.tt2 | 12 ++++----- tmpl/prefs.tt2 | 23 ++++++++--------- tmpl/prefs_set.tt2 | 8 +++--- tmpl/release_select.tt2 | 2 +- tmpl/tree_list.tt2 | 39 +++++++++++++++++++++++++++++ 8 files changed, 103 insertions(+), 51 deletions(-) create mode 100644 tmpl/tree_list.tt2 (limited to 'tmpl') diff --git a/tmpl/content_dir.tt2 b/tmpl/content_dir.tt2 index f5bab3f..b4a3f30 100644 --- a/tmpl/content_dir.tt2 +++ b/tmpl/content_dir.tt2 @@ -1,4 +1,4 @@ - +
[% FOREACH link = dir_listing %]
diff --git a/tmpl/footer.tt2 b/tmpl/footer.tt2 index 11a09ca..2c83414 100644 --- a/tmpl/footer.tt2 +++ b/tmpl/footer.tt2 @@ -1,3 +1,6 @@ +
+The original LXR software by the LXR community, this experimental version by lxr@linux.no. +
diff --git a/tmpl/header.tt2 b/tmpl/header.tt2 index 0b07111..12c2b8b 100644 --- a/tmpl/header.tt2 +++ b/tmpl/header.tt2 @@ -1,31 +1,34 @@ - - + + - - [% IF is_ajax %] + - [% ELSE %] - + [% IF !is_ajax %] + [% END %] - + [% javascript %] LXR [% context.tree -%]/ @@ -48,30 +51,36 @@ %]<a href="[% elem.path %]">[% elem.node %]</a>[% END %] </span> - <img src="../../gfx/rolldown.png" /> - <!-- TODO: appears to break w. ajax nav. --> - [% IF node.name.match('[^/]$') %] - <form action="+print=[% node.name %]" method="post"> - <button type="submit" class="print"><img src="../../gfx/print.png"></button> - </form> - [% END %] + <img src="../../gfx/rolldown.png" alt="History"> + <span id="lxr_print" + [% IF is_ajax || node.name.match('/$') %]style="display: none;"[% END %]> + <form action="+print=[% node.name %]" method="post" id="print_form"> + <button type="submit" class="print"> + <img src="../../gfx/print.png" alt="Print"> + </button> + </form> + </span> </span> <div class="lxr_menu"> <span class="lxr_version"> - <img src="../../gfx/left.png" alt="<<"/> + <a [% IF is_ajax %]href="#" onclick="return previous_version();"[% ELSE %] + href="../[% context.tree %]+[% ver_prev %]/[% node.name %]"[% END %]> + <img src="../../gfx/left.png" alt="<<"></a> <form action="[% node.name %]" method="get"> <span id="ver_select"> [% INCLUDE release_select.tt2, context = context %] </span> </form> - <img src="../../gfx/right.png" alt=">>"/> + <a [% IF is_ajax %]href="#" onclick="return next_version();"[% ELSE %] + href="../[% context.tree %]+[% ver_next %]/[% node.name %]"[% END %]> + <img src="../../gfx/right.png" alt=">>"></a> </span> <span class="lxr_search"> <form action="+search" method="post" onsubmit="return do_search(this);"> - <input type="hidden" name="navtarget" value="" /> - <input type="text" name="search" id="search" /> + <input type="hidden" name="navtarget" value=""> + <input type="text" name="search" id="search"> <button type="submit">Search</button> </form> </span> @@ -83,8 +92,8 @@ </a> </span> </div> - <form action="+ajax" method="post" onsubmit="return false;"> - <input type="hidden" name="ajax_lookup" id="ajax_lookup" value="" /> + <form action="ajax+*" method="post" onsubmit="return false;"> + <input type="hidden" name="ajax_lookup" id="ajax_lookup" value=""> </form> <div class="headingbottom"></div> diff --git a/tmpl/popup_main.tt2 b/tmpl/popup_main.tt2 index 5fa87a4..11cfc73 100644 --- a/tmpl/popup_main.tt2 +++ b/tmpl/popup_main.tt2 @@ -1,12 +1,12 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" +"http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> <head> - <base href="[% base_url %]" /> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <base href="[% base_url %]"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <script type="text/javascript" src="../../js/lxrng-funcs.js"></script> - <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng" /> + <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng"> <script type="text/javascript"> var use_ajax_navigation=[% IF is_ajax %]1[% ELSE %]0[% END %]; diff --git a/tmpl/prefs.tt2 b/tmpl/prefs.tt2 index 6246ac6..a7fc223 100644 --- a/tmpl/prefs.tt2 +++ b/tmpl/prefs.tt2 @@ -1,10 +1,10 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" +"http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <script type="text/javascript" src="../../js/lxrng-funcs.js"></script> - <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng" /> + <link rel="stylesheet" href="../../css/lxrng.css" type="text/css" title="LXRng"> <title id="title">LXR Preferences @@ -15,6 +15,7 @@ lxr + Personal preferences for this LXRng site
@@ -23,19 +24,18 @@
-
Personal preferences for this LXRng site
- +

- + Where do you want your search results to be displayed?
  1. + [% IF is_replace %]checked[% END %]> Replace the active source browsing window
  2. + [% IF is_popup %]checked[% END %]> Show them in a popup window (requires JavaScript enabled)
    If your browser limits the ability to @@ -46,11 +46,12 @@ behind other windows after use.
  3. + [% IF is_ajax %]checked[% END %]> Show them inside the active source browsing window (requires JavaScript enabled)
+

(Cookies need to be enabled for LXR preferences to take effect.)

diff --git a/tmpl/prefs_set.tt2 b/tmpl/prefs_set.tt2 index 735e700..47c82d0 100644 --- a/tmpl/prefs_set.tt2 +++ b/tmpl/prefs_set.tt2 @@ -1,8 +1,8 @@ - - + + - + Return to the source... diff --git a/tmpl/release_select.tt2 b/tmpl/release_select.tt2 index fc51500..2e12023 100644 --- a/tmpl/release_select.tt2 +++ b/tmpl/release_select.tt2 @@ -1,4 +1,4 @@ -