aboutsummaryrefslogtreecommitdiff
path: root/dicoweb
diff options
context:
space:
mode:
authorWojciech Polak <polak@gnu.org>2010-05-23 18:30:08 +0200
committerWojciech Polak <polak@gnu.org>2010-05-23 18:30:08 +0200
commit96770e6e7026ccb54c53c904bb9a3e37102098db (patch)
tree88c0547d4df524446d737926a64e36edad33ae63 /dicoweb
parent603ded11428876f39f872767bfb78e40dcc14491 (diff)
downloaddico-96770e6e7026ccb54c53c904bb9a3e37102098db.tar.gz
dico-96770e6e7026ccb54c53c904bb9a3e37102098db.tar.bz2
Minor Dicoweb changes.
* dicoweb/settings.py: Rename to settings-sample.py * dicoweb/static/dicoweb.js: Bugfix. * dicoweb/static/dicoweb.css: Minor changes. * dicoweb/templates/base.html: Likewise. * dicoweb/templates/index.html: Likewise.
Diffstat (limited to 'dicoweb')
-rw-r--r--dicoweb/INSTALL7
-rw-r--r--dicoweb/settings-sample.py (renamed from dicoweb/settings.py)0
-rw-r--r--dicoweb/static/dicoweb.css20
-rw-r--r--dicoweb/static/dicoweb.js16
-rw-r--r--dicoweb/templates/base.html4
-rw-r--r--dicoweb/templates/index.html2
6 files changed, 30 insertions, 19 deletions
diff --git a/dicoweb/INSTALL b/dicoweb/INSTALL
index e213131..32dec64 100644
--- a/dicoweb/INSTALL
+++ b/dicoweb/INSTALL
@@ -1,10 +1,10 @@
GNU Dico - Dicoweb INSTALL
-Copyright (C) 2008, 2009 Wojciech Polak
+Copyright (C) 2008, 2009, 2010 Wojciech Polak
* Dicoweb requirements
======================
-- Django 1.0 -- a Python Web framework (http://www.djangoproject.com/)
+- Django 1.0+ -- a Python Web framework (http://www.djangoproject.com/)
- Memcached -- a distributed memory object caching system
(http://www.danga.com/memcached/) alongside python-memcached module.
- Wit -- a wiki translator distributed within GNU Dico.
@@ -13,7 +13,8 @@ Copyright (C) 2008, 2009 Wojciech Polak
* Installation instructions
===========================
-Edit your local Dicoweb settings in the file 'dicoweb/settings.py'.
+Rename 'settings-sample.py' to 'settings.py' and edit your
+local Dicoweb site configuration.
** The development/test server
diff --git a/dicoweb/settings.py b/dicoweb/settings-sample.py
index aeb8a8c..aeb8a8c 100644
--- a/dicoweb/settings.py
+++ b/dicoweb/settings-sample.py
diff --git a/dicoweb/static/dicoweb.css b/dicoweb/static/dicoweb.css
index 179a348..bca907e 100644
--- a/dicoweb/static/dicoweb.css
+++ b/dicoweb/static/dicoweb.css
@@ -1,6 +1,6 @@
/*
This file is part of GNU Dico.
- Copyright (C) 2008, 2009 Wojciech Polak
+ Copyright (C) 2008, 2009, 2010 Wojciech Polak
GNU Dico is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,10 +22,10 @@
}
body {
+ font-family: arial, sans-serif;
+ font-size: 95%;
background-color: white;
color: #585858;
- font-family: "Nimbus Sans L", Arial, sans-serif;
- font-size: 10pt;
}
h1, h2, h3 {
@@ -52,6 +52,10 @@ a:hover {
text-decoration: underline;
}
+input {
+ padding: 1px;
+}
+
ul {
margin-bottom: 1em;
}
@@ -64,9 +68,10 @@ p {
margin-bottom: 0.2em;
}
pre {
- padding: 1em;
- font-size: 9pt;
+ font-size: 95%;
white-space: normal;
+ line-height: 140%;
+ padding: 1em;
}
table {
border-spacing: 2px;
@@ -90,6 +95,9 @@ tr, th, td {
#logo a {
text-decoration: none;
}
+#logo img {
+ padding-left: 15px;
+}
#searchform {
width: 600px;
margin: 60px auto 0 auto;
@@ -116,7 +124,7 @@ a.link-lmr {
}
#footer {
- font-size: 9pt;
+ font-size: 80%;
width: 700px;
text-align: center;
border-top: dotted 1px #e1e1e1;
diff --git a/dicoweb/static/dicoweb.js b/dicoweb/static/dicoweb.js
index 7191632..8a94bd2 100644
--- a/dicoweb/static/dicoweb.js
+++ b/dicoweb/static/dicoweb.js
@@ -53,13 +53,15 @@ window.onload = function () {
return true;
};
- document.forms[0].server.onchange = function () {
- var q = GID ('q');
- var u = '?server=' + this.value;
- if (q && q.value != '')
- u += '&q=' + encodeURIComponent (q.value);
- window.location.replace (u);
- };
+ if (document.forms[0].server) {
+ document.forms[0].server.onchange = function () {
+ var q = GID ('q');
+ var u = '?server=' + this.value;
+ if (q && q.value != '')
+ u += '&q=' + encodeURIComponent (q.value);
+ window.location.replace (u);
+ };
+ }
var q = GID ('q');
if (q) {
diff --git a/dicoweb/templates/base.html b/dicoweb/templates/base.html
index 9333d74..4b6e08e 100644
--- a/dicoweb/templates/base.html
+++ b/dicoweb/templates/base.html
@@ -18,7 +18,7 @@
<tr>
<td>
<div id="logo">
- <h1><a href="./">GNU Dico</a></h1>
+ <h1><a href="{% url views.index %}" accesskey="1">GNU Dico</a></h1>
<img src="{% media_prefix %}/gnu-head-sm.jpg" width="129" height="122" alt="GNU" />
</div>
</td>
@@ -34,7 +34,7 @@
<div id="footer">
<a href="http://www.gnu.org/software/dico/">GNU Dico</a>
- Web interface. Copyright (C) 2008, 2009 GNU Dico Team.
+ Web interface. Copyright &copy; 2008-{% now "Y" %} GNU Dico Team.
</div>
</body>
diff --git a/dicoweb/templates/index.html b/dicoweb/templates/index.html
index a2aeaf8..1b92bc8 100644
--- a/dicoweb/templates/index.html
+++ b/dicoweb/templates/index.html
@@ -9,7 +9,7 @@
<table width="600">
<tbody>
<tr>
- <td align="right" style="width:20%">{% trans "Search term:" %}</td>
+ <td align="right" style="width:25%">{% trans "Search term:" %}</td>
<td>
<input type="text" id="q" name="q" size="35" value="{{ q|escape }}" />
<a href="./#" id="toggle_options">{% trans "more options" %}</a>

Return to:

Send suggestions and report system problems to the System administrator.