diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 13 | ||||
| -rw-r--r-- | templates/personexpedition.html | 2 | ||||
| -rw-r--r-- | templates/survexblock.html | 2 | ||||
| -rw-r--r-- | templates/svxcavesingle.html | 79 | ||||
| -rw-r--r-- | templates/svxfile.html | 20 | ||||
| -rw-r--r-- | templates/svxfilecavelist.html | 45 |
6 files changed, 139 insertions, 22 deletions
diff --git a/templates/base.html b/templates/base.html index b0c986c..3c519d2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -31,6 +31,15 @@ {% endblock %}
</div>
</div>
+<div class="toolbarlinks">
+ <a href="{% url survexcaveslist %}">Cave Survex</a> |
+ <a href="{% url survexcavessingle 161 %}">161</a> |
+ <a href="{% url survexcavessingle 204 %}">204</a> |
+ <a href="{% url survexcavessingle 258 %}">258</a> |
+ <a href="{% url expedition 2008 %}">Expo2008</a> |
+ <a href="{% url expedition 2009 %}">Expo2009</a> |
+ <a href="/admin">Django admin</a>
+</div>
<div id="nav">
{% block nav %}
@@ -60,7 +69,7 @@ </div>
-
+ <div class="footer">
<ul class="dropdown" id="footerLinks">
<li><a href="#">External links</a>
@@ -93,6 +102,6 @@ <li class="toggleMenu"><a href="#">hide menu</a></li>
</ul>
- <div class="toggleMenu" style="display:none; position:fixed; bottom:0; right:130px"><a href="#">Show menu</a></li>
+ </div>
</body>
</html>
diff --git a/templates/personexpedition.html b/templates/personexpedition.html index cd9cd97..ac6c902 100644 --- a/templates/personexpedition.html +++ b/templates/personexpedition.html @@ -43,7 +43,7 @@ <td class="survexblock"><a href="{% url survexblock persondate.2.0 %}">{{persondate.2.0}}</a></td>
<td class="roles">{{persondate.2.1}}</td>
{% else %}
- <td colspan="2"> </td>
+ <td colspan="2"> </td>
{% endif %}
</tr>
diff --git a/templates/survexblock.html b/templates/survexblock.html index 6757437..ef355eb 100644 --- a/templates/survexblock.html +++ b/templates/survexblock.html @@ -8,7 +8,7 @@ {% block content %}
<h2>Survex Block {{survexblock.survexpath}}</h2>
-<p>Link to <a href="{% url svx survexblock.filewithoutsvx %}">{{survexblock.begin_file}}</a></p>
+<p>Link to <a href="{% url svx survexblock.survexfile.path %}">{{survexblock.survexfile.path}}</a></p>
<p>Needs duplicates removed from right hand column</p>
<p>Needs links to survex file presentation</p>
diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html new file mode 100644 index 0000000..1b7b350 --- /dev/null +++ b/templates/svxcavesingle.html @@ -0,0 +1,79 @@ +{% extends "base.html" %}
+{% load wiki_markup %}
+{% load link %}
+
+{% block title %}List of survex files{% endblock %}
+
+{% block content %}
+
+<h1>Surveys for {{cave}}</h1>
+
+<p>
+{% for survexdirectory in cave.survexdirectory_set.all %}
+ <a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a>
+{% endfor %}
+</p>
+
+{% for survexdirectory in cave.survexdirectory_set.all %}
+<h3 id="T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</h3>
+
+<table>
+<tr><th>Survex file</th><th>Block</th><th>Date</th><th>Explorers</th><th>Titles</th><th>Scans</th></tr>
+
+{% for survexfile in survexdirectory.survexfile_set.all %}
+<tr>
+ {% if survexfile.exists %}
+ <td rowspan="{{survexfile.survexblock_set.all|length|plusone}}">
+ {% else %}
+ <td class="survexnewfile" rowspan="{{survexfile.survexblock_set.all|length|plusone}}">
+ {% endif %}
+
+ {% ifequal survexfile survexdirectory.primarysurvexfile %}
+ <a href="{% url svx survexfile.path %}"><b>{{survexfile.path}}</b></a>
+ {% else %}
+ <a href="{% url svx survexfile.path %}">{{survexfile.path}}</a>
+ {% endifequal %}
+ </td>
+</tr>
+
+{% for survexblock in survexfile.survexblock_set.all %}
+<tr>
+ <td>{{survexblock.name}}</td>
+ <td>
+ {% if survexblock.expedition %}
+ <a href="{{survexblock.expedition.get_absolute_url}}">{{survexblock.date}}</a>
+ {% else %}
+ {{survexblock.date}}
+ {% endif %}
+ </td>
+
+ <td>
+ {% for personrole in survexblock.personrole_set.all %}
+ {% if personrole.personexpedition %}
+ <a href="{{personrole.personexpedition.get_absolute_url}}">{{personrole.personname}}</a>
+ {% else %}
+ {{personrole.personname}}
+ {% endif %}
+ {% endfor %}
+ </td>
+
+ <td>
+ {% for survextitle in survexblock.survextitle_set.all %}
+ {{survextitle.title}}
+ {% endfor %}
+ </td>
+
+ <td>
+ {% if survexblock.refscandir %}
+ <b>{{survexblock.refscandir}}</b>
+ {% endif %}
+ </td>
+</tr>
+{% endfor %}
+{% endfor %}
+</table>
+
+{% endfor %}
+
+{% endblock %}
+
diff --git a/templates/svxfile.html b/templates/svxfile.html index d8413e3..90dc0e2 100644 --- a/templates/svxfile.html +++ b/templates/svxfile.html @@ -18,7 +18,7 @@ $(document).ready(function() stylesheet: "{{settings.MEDIA_URL}}CodeMirror-0.62/css/survexcolors.css",
path: "{{settings.MEDIA_URL}}CodeMirror-0.62/js/",
textWrapping: false,
- lineNumbers: true,
+ lineNumbers: false,
indentUnit: 4,
tabMode: "spaces"
});
@@ -36,7 +36,15 @@ $(document).ready(function() {% endblock %}
{% block content %}
-<h1>Survex File: {{ title }} .svx</h1>
+<h1>Survex File: {{ title }}</h1>
+
+{% if svxincludes %}
+<p><b>Included files:</b>
+{% for svxinclude in svxincludes %}
+ <a href="{{svxinclude}}.svx">{{svxinclude}}</a>
+{% endfor %}
+</p>
+{% endif %}
<form id="codewikiform" action="" method="POST">
<div class="codeframebit">{{form.code}}</div>
@@ -66,12 +74,4 @@ LOGMESSAGES {% endif %}
</div>
-{% if svxincludes %}
-<p><b>Included files:</b>
-{% for svxinclude in svxincludes %}
- <a href="{{svxinclude}}.svx">{{svxinclude}}</a>
-{% endfor %}
-</p>
-{% endif %}
-
{% endblock %}
diff --git a/templates/svxfilecavelist.html b/templates/svxfilecavelist.html index b8ef5b6..e44fb85 100644 --- a/templates/svxfilecavelist.html +++ b/templates/svxfilecavelist.html @@ -5,27 +5,56 @@ {% block title %}List of survex files{% endblock %}
{% block content %}
-<h1>List of survex directories</h1>
+<p><a href="#cdir">caves with subdirectories</a> | <a href="#cmult">caves with multiple files</a> | <a href="#csing">caves with single files</a></p>
-<p>{{message}}</p>
+<h2 id="cdir">Caves with subdirectories</h2>
-<h2>Caves of multiple files</h2>
+{% for subdircave, cavefiles, subsurvdirs in subdircaves %}
+<h3>{{cavefiles.0.1}} - <a href="{% url survexcavessingle cavefiles.0.1 %}">dates and explorers</a></h3>
+<table>
+<tr>
+ <td><b><a href="{% url svx cavefiles.0.0 %}">{{cavefiles.0.1}}</a></b></td>
+ <td>
+ {% for cavepath, cavename in cavefiles.1 %}
+ <a href="{% url svx cavepath %}">{{cavename}}</a>
+ {% endfor %}
+ </td>
+</tr>
+
+{% for primarycavefile, subcavefiles in subsurvdirs %}
+<tr>
+ <td><a href="{% url svx primarycavefile.0 %}">{{primarycavefile.1}}</a></td>
+ <td>
+ {% for cavepath, cavename in subcavefiles %}
+ <a href="{% url svx cavepath %}">{{cavename}}</a>
+ {% endfor %}
+ </td>
+</tr>
+{% endfor %}
+</table>
+
+{% endfor %}
+
+<h2 id="cmult">Caves of multiple files</h2>
<table>
-<tr><th>Primary file</th><th>Survex files</th></tr>
+<tr><th>Dates and explorers</th><th>Survex files</th></tr>
{% for primarycavefile, subcavefiles in multifilecaves %}
- <tr>
- <td><a href="{% url svx primarycavefile.0 %}">{{primarycavefile.1}}</a></td>
+<tr>
+ <td>
+ <a href="{% url survexcavessingle primarycavefile.1 %}">{{primarycavefile.1}}</a>
+ </td>
<td>
+ <a href="{% url svx primarycavefile.0 %}">{{primarycavefile.1}}</a> -
{% for cavepath, cavename in subcavefiles %}
<a href="{% url svx cavepath %}">{{cavename}}</a>
{% endfor %}
</td>
- </tr>
+</tr>
{% endfor %}
</table>
-<h2>Caves of one file</h2>
+<h2 id="csing">Caves of one file</h2>
<p>
{% for cavepath, cavename in onefilecaves %}
<a href="{% url svx cavepath %}">{{cavename}}</a>
|