Add gui and minor fixes
Peter Palfrader

Peter Palfrader commited on 2006-01-27 00:34:44
Zeige 10 geänderte Dateien mit 593 Einfügungen und 4 Löschungen.

... ...
@@ -11,12 +11,14 @@ TORCVSHEAD = ../tor-head
11 11
 #TORCVSHEAD = /home/arma/work/onion/cvs/tor
12 12
 
13 13
 WMLBASE = .
14
-SUBDIRS=eff
14
+SUBDIRS=eff gui
15 15
 
16 16
 include $(WMLBASE)/Makefile.common
17 17
 all: $(SUBDIRS)
18 18
 
19 19
 eff:
20 20
 	$(MAKE) -C "$@" WMLBASE=../$(WMLBASE)
21
+gui:
22
+	$(MAKE) -C "$@" WMLBASE=../$(WMLBASE)
21 23
 
22
-.PHONY: eff
24
+.PHONY: eff gui
... ...
@@ -0,0 +1,7 @@
1
+.deps
2
+categories.html.en
3
+criteria.html.en
4
+index.html.en
5
+legal.html.en
6
+submit.html.en
7
+technotes.html.en
... ...
@@ -0,0 +1 @@
1
+include $(WMLBASE)/Makefile.common
... ...
@@ -0,0 +1,121 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor: GUI Competition"
5
+
6
+<div class="main-column">
7
+
8
+<!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
9
+<div class="guileft">
10
+<div class="guimenu">
11
+  
12
+  <div class="curveleft">
13
+  <div class="curveright">
14
+  &nbsp;
15
+  </div>
16
+  </div>
17
+
18
+<div class="guimenuinner">
19
+<h1>Tor GUI Competition</h1>
20
+
21
+<a href="index.html">Overview &amp; Goals</a>
22
+<a class="on" href="categories.html">What to Submit</a>
23
+<a href="submit.html">How to Submit</a>
24
+<a href="criteria.html">Judging &amp; Timeline</a>
25
+<a href="technotes.html">Technical Notes</a>
26
+<a href="legal.html">Licensing</a>
27
+<h1>&nbsp;</h1>
28
+<a class="wiki" href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
29
+</div>
30
+
31
+  <div class="curvebottomleft">
32
+  <div class="curvebottomright">
33
+  &nbsp;
34
+  </div>
35
+  </div>
36
+
37
+</div>
38
+</div>
39
+
40
+<h2>Categories</h2>
41
+<p>
42
+The design competition will proceed in two phases: first sketches and then
43
+working code. You are invited to submit to either phase, or both phases.
44
+For each phase, our panel of judges will recognize the
45
+best submissions.
46
+</p>
47
+
48
+<p>
49
+All qualifying entries will receive an <b>EFF Tor T-shirt</b>
50
+(subject to availability). The best sketches and working implementations
51
+will be published on the Tor website.
52
+</p>
53
+
54
+<p><b>Sketches:</b>
55
+the goal of this phase is to produce a mock-up of a functioning interface.
56
+This should include design documents describing how the interface should
57
+function. If you want, it should also include graphical elements that
58
+can be used by programmers.
59
+</p>
60
+
61
+<p>
62
+A qualifying sketch will present an informal specification for a
63
+design. That is, it will present with some degree of thoroughness all
64
+of the major interfaces that we might expect to encounter, all of the
65
+major functionality for the interface, and a reasonable story about
66
+how it would be integrated into currently-existing tools (if, indeed,
67
+it would be). One example, with more detail than we would require, is
68
+<a href="http://ui.netbeans.org/docs/ui/junits/promo_f.html">the NetBeans
69
+UI for JUnit</a>. Note that it walks through multiple interfaces,
70
+highlighting the features and functions of the various buttons.
71
+</p>
72
+
73
+<ul>
74
+<li><b>Most featureful interface</b> will be awarded to the graphic design
75
+that would provide usable, clear access to the most aspects of the Tor
76
+system, covering many or most of the categories on the "useful features"
77
+list.</li>
78
+<li><b>Most usable experience</b> will be awarded to the graphic
79
+design that would provide the most unobtrusive Tor experience while still
80
+covering all criteria (working, perhaps, on the "no news is good news"
81
+theory).</li>
82
+<li><b>Clearest implementation guidance</b> will be awarded to the
83
+graphic design that provides the cleanest package of graphic elements
84
+and design documentation to aid would-be implementers.</li>
85
+</ul>
86
+
87
+<p><b>Code:</b> the goal of this phase is to produce a working
88
+implementation. You may use any of the sketches, graphics, or ideas from
89
+the first phase (with appropriate credit to
90
+their authors), or you can make your own. See the <a
91
+href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestSamples">Competition
92
+Samples</a> wiki page for some other images you can reuse.
93
+</p>
94
+
95
+<p>
96
+An acceptable entry will be a package of free software that builds and
97
+runs. It can be a stand-alone application, or it can act as an extension
98
+or plugin to other broadly-available free software. The entry will
99
+demonstrate the points in the Goals section: that is, it will be able
100
+to control, display, and maintain awareness as discussed above.
101
+</p>
102
+
103
+<ul>
104
+<li><b>Most featureful interface</b> will be awarded to the application
105
+that provides usable, clear access to the most aspects of the Tor system,
106
+covering many or most of the categories on the "additional" list.</li>
107
+<li><b>Most usable experience</b> will be awarded to the
108
+application that provides the most unobtrusive Tor experience while
109
+still covering all criteria (working, perhaps, on the "no news is good
110
+news" theory).</li>
111
+<li><b>Most flexible</b> will be awarded to the best system that runs
112
+smoothly on all three of Windows, Linux, and OS&nbsp;X; extra points will be
113
+awarded for additional systems.</li>
114
+</ul>
115
+
116
+<p>We reserve the right to award other awards as the entries deserve.</p>
117
+
118
+
119
+ </div><!-- #main -->
120
+
121
+#include <foot.wmi>
... ...
@@ -0,0 +1,88 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor: GUI Competition"
5
+
6
+<div class="main-column">
7
+
8
+<!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
9
+<div class="guileft">
10
+<div class="guimenu">
11
+  
12
+  <div class="curveleft">
13
+  <div class="curveright">
14
+  &nbsp;
15
+  </div>
16
+  </div>
17
+
18
+<div class="guimenuinner">
19
+<h1>Tor GUI Competition</h1>
20
+
21
+
22
+<a href="index.html">Overview &amp; Goals</a>
23
+<a href="categories.html">What to Submit</a>
24
+<a href="submit.html">How to Submit</a>
25
+<a class="on" href="criteria.html">Judging &amp; Timeline</a>
26
+<a href="technotes.html">Technical Notes</a>
27
+<a href="legal.html">Licensing</a>
28
+<h1>&nbsp;</h1>
29
+<a class="wiki" href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
30
+</div>
31
+
32
+  <div class="curvebottomleft">
33
+  <div class="curvebottomright">
34
+  &nbsp;
35
+  </div>
36
+  </div>
37
+
38
+</div>
39
+</div>
40
+
41
+<h2>Criteria</h2>
42
+
43
+<p>Awards will be granted on the basis of (in rough preference order):</p>
44
+
45
+<ul>
46
+<li>Usability (<a
47
+href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ#DefineUsable">what
48
+does this mean?</a>)</li>
49
+<li>Informativeness: can the user learn what they need to know, both in terms
50
+of using the network and also in terms of security decisions?</li>
51
+<li>Total user experience</li>
52
+<li>Aesthetics</li>
53
+<li>Responsiveness</li>
54
+<li>Stability and robustness</li>
55
+<li>Internationalization (multiple language support)</li>
56
+<li>Installation experience</li>
57
+</ul>
58
+<br />
59
+<h2>Judges</h2>
60
+
61
+<p>Judging will be led by a panel of prominent specialists in usability
62
+and security, including:</p>
63
+<ul>
64
+<li>Patrick Ball, Director, Human Rights Program, The Benetech
65
+Initiative</li>
66
+<li>Simson Garfinkel, Center for Research on Computation and Society,
67
+Harvard University</li>
68
+<li>Bruce Schneier, Counterpane Internet Security</li>
69
+<li>Adam Shostack, Informed Security</li>
70
+<li>Edward Tufte</li>
71
+<li>Ka-Ping Yee, University of California, Berkeley</li>
72
+</ul>
73
+
74
+<h2>Timeline</h2>
75
+
76
+<ul>
77
+<li>Phase 1 deadline (sketches): November 30, 2005.</li>
78
+<li>Phase 2 deadline (code): February 28, 2006.</li>
79
+</ul>
80
+
81
+<p>Winners will be announced on the webpage and also at the SOUPS 2006
82
+conference. (Here's a suggestion on one approach to <a
83
+href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ#AcademicResearch">academic
84
+usability research on Tor</a>.)</p>
85
+
86
+ </div><!-- #main -->
87
+
88
+#include <foot.wmi>
... ...
@@ -0,0 +1,161 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor: GUI Competition"
5
+
6
+<div class="main-column">
7
+
8
+<!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
9
+<div class="guileft">
10
+<div class="guimenu">
11
+  
12
+  <div class="curveleft">
13
+  <div class="curveright">
14
+  &nbsp;
15
+  </div>
16
+  </div>
17
+
18
+<div class="guimenuinner">
19
+<h1>Tor GUI Competition</h1>
20
+
21
+
22
+<a class="on" href="index.html">Overview &amp; Goals</a>
23
+<a href="categories.html">What to Submit</a>
24
+<a href="submit.html">How to Submit</a>
25
+<a href="criteria.html">Judging &amp; Timeline</a>
26
+<a href="technotes.html">Technical Notes</a>
27
+<a href="legal.html">Licensing</a>
28
+<h1>&nbsp;</h1>
29
+<a class="wiki" href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
30
+</div>
31
+
32
+  <div class="curvebottomleft">
33
+  <div class="curvebottomright">
34
+  &nbsp;
35
+  </div>
36
+  </div>
37
+
38
+</div>
39
+</div>
40
+
41
+<h2>News:</h2>
42
+
43
+<p>The <a
44
+href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestEntries">phase
45
+one submissions</a> are in! Our judges are starting to review them now.</p>
46
+
47
+<p>Due to volume of interest, we've decided to push back the deadlines
48
+for the GUI competition by 4 weeks: so the first deadline is Nov 30 2005,
49
+and the second deadline is Feb 28 2006.</p>
50
+
51
+<p>
52
+We're excited to have just added <a href="criteria.html">Edward Tufte
53
+and Bruce Schneier</a> to our already impressive list of judges. And don't
54
+forget the free T-shirt for every submission!
55
+</p>
56
+
57
+<h2>Tor: GUI Competition Overview</h2>
58
+
59
+<p>
60
+Tor is a decentralized network of computers on the Internet that increases
61
+privacy in Web browsing, instant messaging, and other applications. We
62
+estimate there are some 50,000 Tor users currently, routing their traffic
63
+through about 250 volunteer Tor servers on six continents. However, Tor's
64
+current user interface approach &mdash; running as a service in the background
65
+&mdash; does a poor job of communicating network status and security levels
66
+to the user.
67
+</p>
68
+
69
+<p>
70
+The Tor project, affiliated with the
71
+<a href="http://www.eff.org/">Electronic Frontier Foundation</a>, is
72
+running a <b>GUI competition</b> to develop a vision of how Tor can
73
+work in a user's everyday anonymous browsing experience. Some of the
74
+challenges include how to make alerts and error conditions visible on
75
+screen; how to let the user configure Tor to use or avoid certain routes
76
+or nodes; how to learn about the current state of a Tor connection,
77
+including which servers it uses; and how to find out whether (and which)
78
+applications are using Tor safely.
79
+</p>
80
+<br />
81
+
82
+<h2>Goals</h2>
83
+<p>Submitters will produce either sketches for a suggested user interface,
84
+or a work of <a
85
+href="http://www.opensource.org/">Open Source Software</a>
86
+that will provide a user interface to the Tor system by way of the
87
+<a href="/cvs/control/doc/howto.txt">Tor Controller Protocol</a>.</p>
88
+
89
+<p>We are looking for a vision of how Tor can work in a user's everyday
90
+anonymous browsing experience.</p>
91
+
92
+<p>Entries will:</p>
93
+<ul>
94
+<li>Allow the user to fully configure Tor rather than manually searching
95
+for and opening text files.</li>
96
+<li>Let users learn about the current state of their Tor connection
97
+(for example, how well the current Tor connection is working),
98
+and find out whether any of their applications are using it.</li>
99
+<li>Make alerts and error conditions visible to the user.</li>
100
+<li>Run on at least one of Windows, Linux, and OS&nbsp;X, on a
101
+not-unusually-configured consumer-level machine.</li>
102
+</ul>
103
+
104
+<p>In addition, they may:</p>
105
+<ul>
106
+<li>Provide detailed information about which
107
+applications, ports, or packets are (or are not!) passing through Tor,
108
+including accounting for both Tor- and non-Tor traffic.</li>
109
+<li>Provide
110
+additional statistics about the Tor connection.</li>
111
+<li>Give users more control over how their Tor behaves at certain times
112
+of day or in other contexts (like operating as a server).</li>
113
+</ul>
114
+
115
+<p>Some examples of useful features include:</p>
116
+<ul>
117
+<li>How much bandwidth is Tor using? How does this compare
118
+to the overall network traffic to/from the computer?</li>
119
+<li>Is there network traffic from ports or applications that the user
120
+intended to be anonymized?</li>
121
+<li>What Tor servers does the user know about on the network? Where are
122
+they? How available are they?</li>
123
+<li>An interface for displaying or controlling Tor paths:
124
+"show me the network from Africa by way of Asia". Think of the global
125
+satellite map from the movie <i>Sneakers</i>.</li>
126
+<li>Configure other running applications to use Tor (for example,
127
+by modifying or working through the network stack, and/or by altering
128
+application configurations).</li>
129
+<li>Provide an elegant installer for Tor, your GUI submission, and
130
+other supporting applications.</li>
131
+<li>Make your GUI manage the Tor process and other supporting applications
132
+-- start them, stop them, realize when they've died.</li>
133
+<li>Provide meaningful defaults for a good Tor experience.</li>
134
+<li>Provide application-level anonymity -- that is, not just paying
135
+attention to transport anonymity on the level of Tor, but also paying
136
+attention to the anonymity of the http headers, cookies, etc.</li>
137
+<li>Let the user specify different Tor config option sets depending on
138
+time of day (e.g. daytime vs. nighttime).</li>
139
+<li>Provide useful controller functions for Tor servers too --
140
+for example, walk the user through recommended bandwidth configurations
141
+and exit policies.</li>
142
+<li>Have a "minimized view" of your GUI for common use, and then a more
143
+detailed view or set of windows when the user wants more detail.</li>
144
+<li>Provide a button or some automatically updating interface to let
145
+the user learn whether Tor is working currently, perhaps by accessing an
146
+external what's-my-IP site and seeing if it thinks you're a Tor server;
147
+and give useful messages and recommendations if it doesn't seem to
148
+be working.</li>
149
+<li>Provide a way to automatically configure local firewalls (ipchains,
150
+Windows firewalls, etc) to let Tor traffic out (and in, for Tor
151
+servers). As a bonus, configure it to prevent non-Tor traffic from
152
+leaving (and notify when it tries).</li>
153
+</ul>
154
+
155
+<p>We're interested to see submissions that don't achieve all of the
156
+above goals -- if it's useful to Tor or Tor users in any way, please
157
+submit it!</p>
158
+
159
+ </div><!-- #main -->
160
+
161
+#include <foot.wmi>
... ...
@@ -0,0 +1,69 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor: GUI Competition"
5
+
6
+<div class="main-column">
7
+
8
+<!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
9
+<div class="guileft">
10
+<div class="guimenu">
11
+  
12
+  <div class="curveleft">
13
+  <div class="curveright">
14
+  &nbsp;
15
+  </div>
16
+  </div>
17
+
18
+<div class="guimenuinner">
19
+<h1>Tor GUI Competition</h1>
20
+
21
+
22
+<a href="index.html">Overview &amp; Goals</a>
23
+<a href="categories.html">What to Submit</a>
24
+<a href="submit.html">How to Submit</a>
25
+<a href="criteria.html">Judging &amp; Timeline</a>
26
+<a href="technotes.html">Technical Notes</a>
27
+<a class="on" href="legal.html">Licensing</a>
28
+<h1>&nbsp;</h1>
29
+<a class="wiki" href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
30
+</div>
31
+
32
+  <div class="curvebottomleft">
33
+  <div class="curvebottomright">
34
+  &nbsp;
35
+  </div>
36
+  </div>
37
+
38
+</div>
39
+</div>
40
+
41
+<h2>Legal Notes</h2>
42
+
43
+<p>By submitting your entry to be considered in the Tor GUI competition, you
44
+hereby:</p>
45
+<p>
46
+<b>(A)</b> represent and warrant that (1) the entry was created by you and
47
+that you own all rights to the entry or have the authorized rights to
48
+submit such entry and grant the licenses below; and (2) that the
49
+entry does not infringe on any third party copyright or other
50
+intellectual property rights; AND
51
+</p><p>
52
+<b>(B)</b> EITHER (1) grant us a worldwide, royalty-free, non-exclusive,
53
+perpetual license to reproduce, edit, perform, display, publish, make
54
+derivative works, and otherwise use the entry as we see fit,
55
+including without limitation, incorporating (in whole or in part)
56
+into the Tor software, and to sublicense such rights; OR, (2)
57
+provide the entry pursuant to a license that complies with the
58
+<a href="http://www.opensource.org/docs/definition.php">Open
59
+Source Definition</a>, such as the 3-clause BSD, MIT, or
60
+GPL licenses, or (where applicable) provide the entry licensed under
61
+the <a href="http://creativecommons.org/licenses/by/2.5/">Creative
62
+Commons Attribution</a> license. If you provide the entry pursuant to
63
+such a license, you must include the applicable information in your
64
+submission.
65
+</p>
66
+
67
+ </div><!-- #main -->
68
+
69
+#include <foot.wmi>
... ...
@@ -0,0 +1,81 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor: GUI Competition"
5
+
6
+<div class="main-column">
7
+
8
+<!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
9
+<div class="guileft">
10
+<div class="guimenu">
11
+  
12
+  <div class="curveleft">
13
+  <div class="curveright">
14
+  &nbsp;
15
+  </div>
16
+  </div>
17
+
18
+<div class="guimenuinner">
19
+<h1>Tor GUI Competition</h1>
20
+
21
+
22
+<a href="index.html">Overview &amp; Goals</a>
23
+<a href="categories.html">What to Submit</a>
24
+<a class="on" href="submit.html">How to Submit</a>
25
+<a href="criteria.html">Judging &amp; Timeline</a>
26
+<a href="technotes.html">Technical Notes</a>
27
+<a href="legal.html">Licensing</a>
28
+<h1>&nbsp;</h1>
29
+<a class="wiki" href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
30
+</div>
31
+
32
+  <div class="curvebottomleft">
33
+  <div class="curvebottomright">
34
+  &nbsp;
35
+  </div>
36
+  </div>
37
+
38
+</div>
39
+</div>
40
+
41
+<h2>How to Submit an Entry</h2>
42
+
43
+<p>Submissions for phase one (sketches) should come as:</p>
44
+<ul>
45
+<li>Images in an html page. The images must be able to be viewed on an
46
+ordinary browser, e.g. Firefox. (You can submit proprietary formats too,
47
+but if you do then you need to also export them to something we can
48
+all read.) Must be licensed under a <a href="legal.html">free license</a>.</li>
49
+<li>A design document (txt, html, pdf, or ps) as described in the
50
+<a href="categories.html">Submission Categories</a> section.</li>
51
+</ul>
52
+
53
+<p>Submissions for phase two (code) should come as:</p>
54
+
55
+<ul>
56
+<li>Source code, with appropriate makefiles or documentation explaining
57
+how to build it. Must be licensed under a free/open source license, as
58
+defined by <a href="http://www.opensource.org/licenses/">OSI</a>. See <a
59
+href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ#DefineFree">this
60
+FAQ entry</a> for clarification.</li>
61
+<li>Compiled binaries or bytecodes for at least one platform of choice.</li>
62
+<li>A design document (txt, html, pdf, or ps) providing an overview of
63
+what major functions to look for and what functions were implemented.</li>
64
+</ul>
65
+
66
+<p>To submit your entry, make a web page with
67
+all your materials on it, then add a line to <a
68
+href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestEntries">The
69
+GUI Competition Entries Wiki</a>. (If you don't have a web page of
70
+your own to put your entry on, find a friend who does, or mail <a
71
+href="mailto:tor-gui@freehaven.net">tor-gui@freehaven.net</a> and we'll
72
+put it up on a temporary page.</p>
73
+
74
+<p>If you put it up on your own site, you can continue to update and
75
+modify it. Remember that submitting early means you can get feedback
76
+from Tor users and make it into a better submission!</p>
77
+
78
+
79
+ </div><!-- #main -->
80
+
81
+#include <foot.wmi>
... ...
@@ -0,0 +1,59 @@
1
+## translation metadata
2
+# Revision: $Revision$
3
+
4
+#include "head.wmi" TITLE="Tor: GUI Competition"
5
+
6
+<div class="main-column">
7
+
8
+<!-- LEFT HAND MENU FOR GUI CONTEST PAGES -->
9
+<div class="guileft">
10
+<div class="guimenu">
11
+  
12
+  <div class="curveleft">
13
+  <div class="curveright">
14
+  &nbsp;
15
+  </div>
16
+  </div>
17
+
18
+<div class="guimenuinner">
19
+<h1>Tor GUI Competition</h1>
20
+
21
+
22
+<a href="index.html">Overview &amp; Goals</a>
23
+<a href="categories.html">What to Submit</a>
24
+<a href="submit.html">How to Submit</a>
25
+<a href="criteria.html">Judging &amp; Timeline</a>
26
+<a class="on" href="technotes.html">Technical Notes</a>
27
+<a href="legal.html">Licensing</a>
28
+<h1>&nbsp;</h1>
29
+<a class="wiki" href="http://wiki.noreply.org/noreply/TheOnionRouter/ContestFAQ">Wiki/FAQ</a>
30
+</div>
31
+
32
+  <div class="curvebottomleft">
33
+  <div class="curvebottomright">
34
+  &nbsp;
35
+  </div>
36
+  </div>
37
+
38
+</div>
39
+</div>
40
+
41
+<h2>Technical Notes</h2>
42
+
43
+
44
+<p>Shortly before phase two begins, the Tor developers will release
45
+a canonical version of Tor. This is the version that will be used for
46
+judging the competition; please ensure that you use this version. Bugfixes
47
+to this version of Tor will be announced to the competition web site.</p>
48
+
49
+<p>The Tor developers will also release test rigs (libraries) in both Java
50
+and Python that demonstrate Tor's controller protocol. Code submissions
51
+may be able to save a lot of time by using this code as a skeleton. You
52
+can check out the <a href="http://tor.eff.org/cvs/control/">development
53
+versions of these libraries</a> now.
54
+</p>
55
+
56
+
57
+ </div><!-- #main -->
58
+
59
+#include <foot.wmi>
... ...
@@ -38,7 +38,7 @@
38 38
 	      my $page = $WML_SRC_FILENAME;
39 39
 	      $page =~ s/\.wml//;
40 40
 	      if ($page ne $key) {
41
-	        if (-e "$(LANG)/$key.wml") {
41
+	        if (-e "$(DOCROOT)/$(LANG)/$key.wml") {
42 42
 	          printf '<a href="$(DOCROOT)/%s.html.$(LANG)">%s</a>'."\n",
43 43
 	                 $key, $navigation{$key};
44 44
 	        } else {
... ...
@@ -61,7 +61,7 @@
61 61
 	      if ($dir eq '$(LANG)') {
62 62
 	        printf('<img src="$(IMGROOT)/%s.png" alt="%s" /> ', $dir, $LANGUAGES{$dir});
63 63
 	      } else {
64
-	        printf('<a href="$(DOCROOT)/%s.html.%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></a> ', $page, $dir, $dir, $LANGUAGES{$dir});
64
+	        printf('<a href="%s.html.%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></a> ', $page, $dir, $dir, $LANGUAGES{$dir});
65 65
 	      };
66 66
 	    } else {
67 67
 	      printf('<img src="$(IMGROOT)/green-flagspace.png"/> ');
68 68