mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2026-02-14 16:19:46 +00:00
remove all the DOS linefeeds
This commit is contained in:
Wookey
@@ -1,10 +1,10 @@
|
||||
{% extends "admin/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{{ title }} | {% trans 'Troggle site admin' %}{% endblock %}
|
||||
|
||||
{% block branding %}
|
||||
<h1 id="site-name">{% trans 'Troggle administration' %}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block nav-global %}{% endblock %}
|
||||
{% extends "admin/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{{ title }} | {% trans 'Troggle site admin' %}{% endblock %}
|
||||
|
||||
{% block branding %}
|
||||
<h1 id="site-name">{% trans 'Troggle administration' %}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block nav-global %}{% endblock %}
|
||||
|
||||
@@ -1,111 +1,111 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
|
||||
<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
|
||||
<title>{% block title %}Troggle{% endblock %}</title>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.dropdownPlain.js" type="text/javascript"></script>
|
||||
|
||||
{% block head %}{% endblock %}
|
||||
</head>
|
||||
<body onLoad="contentHeight();">
|
||||
|
||||
<div id="header">
|
||||
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
|
||||
<div id="editLinks"> {% block loginInfo %}
|
||||
<a href="{{ settings.EXPOWEB_URL }}/index.htm">ExpoWeb</a> |
|
||||
<a href="{{ settings.URL_ROOT }}">Home</a> |
|
||||
{% if user.username %}
|
||||
You are logged in as {{ user.username }}
|
||||
{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
|
||||
{% else %}<a href={% url profiles_select_profile %}>sort your profile</a>
|
||||
{% endif %}.
|
||||
| <a href="{% url auth_logout %}">Log out</a> {% else %} <a href="{% url registration_register %}">Sign up</a> | <a href="{% url auth_login %}">Log in</a> {% endif %}
|
||||
{% endblock%}
|
||||
{% block editLink %}
|
||||
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolbarlinks">
|
||||
<a href="{% url survexcaveslist %}">All Survex</a> |
|
||||
<a href="{% url surveyscansfolders %}">Scans</a> |
|
||||
<a href="{% url tunneldata %}">Tunneldata</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 2009 %}">Expo2009</a> |
|
||||
<a href="{% url expedition 2010 %}">Expo2010</a> |
|
||||
<a href="{% url expedition 2011 %}">Expo2011</a> |
|
||||
<a href="/admin">Django admin</a>
|
||||
</div>
|
||||
|
||||
<div id="nav">
|
||||
|
||||
{% block nav %}
|
||||
<!-- Use id="nav" for the left side menu -->
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div id="content" >
|
||||
|
||||
{% block contentheader %}
|
||||
{% endblock %}
|
||||
|
||||
<div id="related">
|
||||
{% block related %}
|
||||
<script language="javascript">
|
||||
$('#related').remove()
|
||||
/*This is a hack to stop a line appearing because of the empty div border*/
|
||||
</script>
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
{% block content %}
|
||||
REPLACE : The content
|
||||
{% endblock %}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<ul class="dropdown" id="footerLinks">
|
||||
|
||||
<li><a href="#">External links</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
|
||||
<li><a id="expoWebsiteLink" href="http://cucc.survex.com/expo">Expedition website</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="{% url frontpage %}">Troggle front page</a></li>
|
||||
<li><a id="cavesLink" href="{% url caveindex %}">caves</a></li>
|
||||
<li><a id="caversLink" href="{% url personindex %}">cavers</a></li>
|
||||
<li><a href="#">expeditions</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a id="expeditionsLink" href="{{ Expedition.objects.latest.get_absolute_url }}">newest</a></li>
|
||||
<li><a id="expeditionsLink" href="{% url expeditions %}">list all</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a id="surveyBinderLink" href="{% url survey %}">survey binder</a></li>
|
||||
<li><a href="#">diversions</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a href="{% url stats %}">statistics</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="#">admin</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a id="cuccLink" href="{% url controlpanel %}">Import / export data</a></li>
|
||||
<li><a id="expoWebsiteLink" href="{{ settings.URL_ROOT }}admin">Troggle administration pages</a></li>
|
||||
</ul>
|
||||
<li class="toggleMenu"><a href="#">hide menu</a></li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
|
||||
<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
|
||||
<title>{% block title %}Troggle{% endblock %}</title>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.dropdownPlain.js" type="text/javascript"></script>
|
||||
|
||||
{% block head %}{% endblock %}
|
||||
</head>
|
||||
<body onLoad="contentHeight();">
|
||||
|
||||
<div id="header">
|
||||
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
|
||||
<div id="editLinks"> {% block loginInfo %}
|
||||
<a href="{{ settings.EXPOWEB_URL }}/index.htm">ExpoWeb</a> |
|
||||
<a href="{{ settings.URL_ROOT }}">Home</a> |
|
||||
{% if user.username %}
|
||||
You are logged in as {{ user.username }}
|
||||
{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
|
||||
{% else %}<a href={% url profiles_select_profile %}>sort your profile</a>
|
||||
{% endif %}.
|
||||
| <a href="{% url auth_logout %}">Log out</a> {% else %} <a href="{% url registration_register %}">Sign up</a> | <a href="{% url auth_login %}">Log in</a> {% endif %}
|
||||
{% endblock%}
|
||||
{% block editLink %}
|
||||
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolbarlinks">
|
||||
<a href="{% url survexcaveslist %}">All Survex</a> |
|
||||
<a href="{% url surveyscansfolders %}">Scans</a> |
|
||||
<a href="{% url tunneldata %}">Tunneldata</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 2009 %}">Expo2009</a> |
|
||||
<a href="{% url expedition 2010 %}">Expo2010</a> |
|
||||
<a href="{% url expedition 2011 %}">Expo2011</a> |
|
||||
<a href="/admin">Django admin</a>
|
||||
</div>
|
||||
|
||||
<div id="nav">
|
||||
|
||||
{% block nav %}
|
||||
<!-- Use id="nav" for the left side menu -->
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div id="content" >
|
||||
|
||||
{% block contentheader %}
|
||||
{% endblock %}
|
||||
|
||||
<div id="related">
|
||||
{% block related %}
|
||||
<script language="javascript">
|
||||
$('#related').remove()
|
||||
/*This is a hack to stop a line appearing because of the empty div border*/
|
||||
</script>
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
{% block content %}
|
||||
REPLACE : The content
|
||||
{% endblock %}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<ul class="dropdown" id="footerLinks">
|
||||
|
||||
<li><a href="#">External links</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
|
||||
<li><a id="expoWebsiteLink" href="http://cucc.survex.com/expo">Expedition website</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="{% url frontpage %}">Troggle front page</a></li>
|
||||
<li><a id="cavesLink" href="{% url caveindex %}">caves</a></li>
|
||||
<li><a id="caversLink" href="{% url personindex %}">cavers</a></li>
|
||||
<li><a href="#">expeditions</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a id="expeditionsLink" href="{{ Expedition.objects.latest.get_absolute_url }}">newest</a></li>
|
||||
<li><a id="expeditionsLink" href="{% url expeditions %}">list all</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a id="surveyBinderLink" href="{% url survey %}">survey binder</a></li>
|
||||
<li><a href="#">diversions</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a href="{% url stats %}">statistics</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="#">admin</a>
|
||||
<ul class="sub_menu">
|
||||
<li><a id="cuccLink" href="{% url controlpanel %}">Import / export data</a></li>
|
||||
<li><a id="expoWebsiteLink" href="{{ settings.URL_ROOT }}admin">Troggle administration pages</a></li>
|
||||
</ul>
|
||||
<li class="toggleMenu"><a href="#">hide menu</a></li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,43 +1,43 @@
|
||||
{% extends "cavebase.html" %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
{% block contentheader %}
|
||||
<table id="cavepage">
|
||||
<tr>
|
||||
<th id="kat_no">
|
||||
{% if cave.kataster_number %}
|
||||
{{ cave.kataster_number|safe }}
|
||||
{% if cave.entrancelist %}
|
||||
- {{ cave.entrancelist|safe }}
|
||||
{% endif %}
|
||||
{% if cave.unofficial_number %}
|
||||
<br />({{ cave.unofficial_number|safe }})
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
<th id="name">
|
||||
{{ cave.official_name|safe }}
|
||||
</th>
|
||||
<th id="status">
|
||||
{{ cave.kataster_code|safe }}
|
||||
</th>
|
||||
</tr>
|
||||
</table>
|
||||
{% block related %}
|
||||
{% endblock %}{% endblock %}
|
||||
|
||||
<div id="tabs">
|
||||
<ul>
|
||||
<li><a href="/cave/description/{{cave.slug}}">Description</a></li>
|
||||
<li><a href="/cave/entrance/{{cave.slug}}">Entrances</a></li>
|
||||
<li><a href="/cave/logbook/{{cave.slug}}">Logbook</a></li>
|
||||
<li><a href="/cave/qms/{{cave.slug}}">QMs</a></li>
|
||||
</ul>
|
||||
<div id="qms">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
{% extends "cavebase.html" %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
{% block contentheader %}
|
||||
<table id="cavepage">
|
||||
<tr>
|
||||
<th id="kat_no">
|
||||
{% if cave.kataster_number %}
|
||||
{{ cave.kataster_number|safe }}
|
||||
{% if cave.entrancelist %}
|
||||
- {{ cave.entrancelist|safe }}
|
||||
{% endif %}
|
||||
{% if cave.unofficial_number %}
|
||||
<br />({{ cave.unofficial_number|safe }})
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
<th id="name">
|
||||
{{ cave.official_name|safe }}
|
||||
</th>
|
||||
<th id="status">
|
||||
{{ cave.kataster_code|safe }}
|
||||
</th>
|
||||
</tr>
|
||||
</table>
|
||||
{% block related %}
|
||||
{% endblock %}{% endblock %}
|
||||
|
||||
<div id="tabs">
|
||||
<ul>
|
||||
<li><a href="/cave/description/{{cave.slug}}">Description</a></li>
|
||||
<li><a href="/cave/entrance/{{cave.slug}}">Entrances</a></li>
|
||||
<li><a href="/cave/logbook/{{cave.slug}}">Logbook</a></li>
|
||||
<li><a href="/cave/qms/{{cave.slug}}">QMs</a></li>
|
||||
</ul>
|
||||
<div id="qms">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
{% extends "cavebase.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% block title %} {{cave_description}} {% endblock title %}
|
||||
{% block editLink %}<a href={{cave_description.get_admin_url}}>Edit description {{cave_description}}</a>{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
{{cave_description.long_name}}
|
||||
{% endblock contentheader %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{{cave_description.long_name}}</h1>
|
||||
<p>
|
||||
{{cave_description.description|wiki_to_html}}
|
||||
</p>
|
||||
|
||||
{% extends "cavebase.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% block title %} {{cave_description}} {% endblock title %}
|
||||
{% block editLink %}<a href={{cave_description.get_admin_url}}>Edit description {{cave_description}}</a>{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
{{cave_description.long_name}}
|
||||
{% endblock contentheader %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{{cave_description.long_name}}</h1>
|
||||
<p>
|
||||
{{cave_description.description|wiki_to_html}}
|
||||
</p>
|
||||
|
||||
{% endblock content %}
|
||||
@@ -1,26 +1,26 @@
|
||||
<html>
|
||||
<head>
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<title>{% block title %}{{ cave.official_name|safe }}{% endblock %}
|
||||
</title>
|
||||
<link rel="stylesheet" type="text/css" href="/css/main2.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/redmond/jquery-ui-1.8.14.custom.css" />
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.14.custom.min.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$( "#tabs" ).tabs();
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
{% block content %}{% endblock %}
|
||||
{% block menu %}
|
||||
<ul id="links">
|
||||
<li>Back to <a href="/index.htm">Expedition home page</a></li>
|
||||
<li>Back to <a href="http://cucc.survex.com/">CUCC home page</a></li>
|
||||
</ul>
|
||||
{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
<html>
|
||||
<head>
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<title>{% block title %}{{ cave.official_name|safe }}{% endblock %}
|
||||
</title>
|
||||
<link rel="stylesheet" type="text/css" href="/css/main2.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/redmond/jquery-ui-1.8.14.custom.css" />
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.14.custom.min.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$( "#tabs" ).tabs();
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
{% block content %}{% endblock %}
|
||||
{% block menu %}
|
||||
<ul id="links">
|
||||
<li>Back to <a href="/index.htm">Expedition home page</a></li>
|
||||
<li>Back to <a href="http://cucc.survex.com/">CUCC home page</a></li>
|
||||
</ul>
|
||||
{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
{% extends "cavebase.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cave Index{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>Cave Index</h1>
|
||||
|
||||
<h3>Notable caves</h3>
|
||||
<ul>
|
||||
{% for cave in notablecaves %}
|
||||
<li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>1623</h3>
|
||||
|
||||
<ul class="searchable">
|
||||
{% for cave in caves1623 %}
|
||||
|
||||
<li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
|
||||
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>1626</h3>
|
||||
|
||||
<ul class="searchable">
|
||||
{% for cave in caves1626 %}
|
||||
|
||||
<li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
|
||||
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "cavebase.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cave Index{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>Cave Index</h1>
|
||||
|
||||
<h3>Notable caves</h3>
|
||||
<ul>
|
||||
{% for cave in notablecaves %}
|
||||
<li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>1623</h3>
|
||||
|
||||
<ul class="searchable">
|
||||
{% for cave in caves1623 %}
|
||||
|
||||
<li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
|
||||
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>1626</h3>
|
||||
|
||||
<ul class="searchable">
|
||||
{% for cave in caves1626 %}
|
||||
|
||||
<li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li>
|
||||
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,157 +1,157 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
|
||||
{% if jobs_completed %}
|
||||
<div class="noticeBox">
|
||||
Just finished running:
|
||||
<ul>
|
||||
{% for job in jobs_completed %}
|
||||
<li>{{ job }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% if settings.LOGFILE %}See the logfile at {{settings.LOGFILE}} for more information.{% endif %}
|
||||
<a href="#" class="closeDiv">dismiss this message</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if error %}
|
||||
<div class="noticeBox">
|
||||
{{ error }}
|
||||
<a href="#" class="closeDiv">dismiss this message</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
<form name="reset" method="post" action="">
|
||||
<h3>Wipe:</h3>
|
||||
|
||||
<table>
|
||||
<tr><td>Wipe entire database and recreate tables: </td><td><input type="checkbox" name="reload_db" /></td><td> <input type="submit" id="Import" value="I really want to delete all information in troggle, and accept all responsibility."></td></tr>
|
||||
</table>
|
||||
</form>
|
||||
<h3>Import (non-destructive):</h3>
|
||||
<form name="import" method="post" action="">
|
||||
<table>
|
||||
<tr><td>people from folk.csv using parsers\people.py</td><td><input type="checkbox" name="import_people"/></td></tr>
|
||||
<tr><td>caves from cavetab2.csv using parsers\cavetab.py</td><td> <input type="checkbox" class="parser" name="import_cavetab"/></td></tr>
|
||||
<tr><td>logbook entries using parsers\logbooks.py</td><td><input type="checkbox" name="import_logbooks"/></td></tr>
|
||||
<tr><td>QMs using parsers\QMs.py</td><td><input type="checkbox" name="import_QMs" /></td></tr>
|
||||
<tr><td>survey scans using parsers\surveys.py</td><td><input type="checkbox" name="import_surveys" /></td></tr>
|
||||
<tr><td>survex data using parsers\survex.py</td><td><input type="checkbox" name="import_survex" /></td></tr>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
<p>
|
||||
<input type="submit" id="Import" value="Import">
|
||||
|
||||
<input type="submit" name="check_all_import" id="check_all_import" value="Check all" disabled >
|
||||
</p>
|
||||
</form>
|
||||
|
||||
|
||||
<h3>Export to legacy formats:</h3>
|
||||
<table>
|
||||
|
||||
<th>
|
||||
<td>Export onto server</td>
|
||||
<td>Export and Download</td>
|
||||
</th>
|
||||
<tr>
|
||||
<td>
|
||||
caves to cavetab2.csv
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="post" action="">
|
||||
<p>Overwrite the existing CAVETAB2.CSV file with one generated by Troggle.</p>
|
||||
<input name="export_cavetab" type="submit" value="Update {{settings.EXPOWEB}}noinfo/CAVETAB2.CSV" />
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="get" action="{% url downloadcavetab %}">
|
||||
<p>Download a CAVETAB2.CSV file which is dynamically generated by Troggle.</p>
|
||||
<input name="download_cavetab" type="submit" value="Download CAVETAB2.CSV" />
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
surveys to Surveys.csv
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="get" action={% url downloadlogbook %}>
|
||||
<p>Download a logbook file which is dynamically generated by Troggle.</p>
|
||||
|
||||
<p>
|
||||
Expedition year:
|
||||
<select name="year">
|
||||
{% for expedition in expeditions %}
|
||||
<option value="{{expedition}}"> {{expedition}} </option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Output style:
|
||||
<select name="extension">
|
||||
<option value="txt">.txt file with MediaWiki markup - 2008 style</option>
|
||||
<option value="html">.html file - 2005 style</option>
|
||||
</select>
|
||||
</p>
|
||||
<p>
|
||||
<input name="download_logbook" type="submit" value="Download logbook" />
|
||||
</p>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
surveys to Surveys.csv
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="post" action="">
|
||||
<p>Overwrite the existing Surveys.csv file with one generated by Troggle.</p>
|
||||
<input disabled name="export_surveys" type="submit" value="Update {{settings.SURVEYS}}noinfo/Surveys.csv" />
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="get" action={% url downloadsurveys %}>
|
||||
<p>Download a Surveys.csv file which is dynamically generated by Troggle.</p>
|
||||
<input disabled name="download_surveys" type="submit" value="Download Surveys.csv" />
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>qms to qms.csv</td><td>
|
||||
<form name="export_qms" method="get" action="downloadqms">
|
||||
|
||||
<!--This is for choosing caves by area (drilldown).
|
||||
|
||||
<select id="qmcaveareachooser" class="searchable" >
|
||||
</select>
|
||||
|
||||
-->
|
||||
|
||||
Choose a cave.
|
||||
<select name="cave_id" id="qmcavechooser">
|
||||
|
||||
{% for cave in caves %}
|
||||
<option value="{{cave.kataster_number}}">{{cave}}
|
||||
</option>
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
|
||||
<input type="submit" value="Download"/>
|
||||
</form>
|
||||
</td></tr>
|
||||
</table>
|
||||
</form>
|
||||
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
|
||||
{% if jobs_completed %}
|
||||
<div class="noticeBox">
|
||||
Just finished running:
|
||||
<ul>
|
||||
{% for job in jobs_completed %}
|
||||
<li>{{ job }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% if settings.LOGFILE %}See the logfile at {{settings.LOGFILE}} for more information.{% endif %}
|
||||
<a href="#" class="closeDiv">dismiss this message</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if error %}
|
||||
<div class="noticeBox">
|
||||
{{ error }}
|
||||
<a href="#" class="closeDiv">dismiss this message</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
<form name="reset" method="post" action="">
|
||||
<h3>Wipe:</h3>
|
||||
|
||||
<table>
|
||||
<tr><td>Wipe entire database and recreate tables: </td><td><input type="checkbox" name="reload_db" /></td><td> <input type="submit" id="Import" value="I really want to delete all information in troggle, and accept all responsibility."></td></tr>
|
||||
</table>
|
||||
</form>
|
||||
<h3>Import (non-destructive):</h3>
|
||||
<form name="import" method="post" action="">
|
||||
<table>
|
||||
<tr><td>people from folk.csv using parsers\people.py</td><td><input type="checkbox" name="import_people"/></td></tr>
|
||||
<tr><td>caves from cavetab2.csv using parsers\cavetab.py</td><td> <input type="checkbox" class="parser" name="import_cavetab"/></td></tr>
|
||||
<tr><td>logbook entries using parsers\logbooks.py</td><td><input type="checkbox" name="import_logbooks"/></td></tr>
|
||||
<tr><td>QMs using parsers\QMs.py</td><td><input type="checkbox" name="import_QMs" /></td></tr>
|
||||
<tr><td>survey scans using parsers\surveys.py</td><td><input type="checkbox" name="import_surveys" /></td></tr>
|
||||
<tr><td>survex data using parsers\survex.py</td><td><input type="checkbox" name="import_survex" /></td></tr>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
<p>
|
||||
<input type="submit" id="Import" value="Import">
|
||||
|
||||
<input type="submit" name="check_all_import" id="check_all_import" value="Check all" disabled >
|
||||
</p>
|
||||
</form>
|
||||
|
||||
|
||||
<h3>Export to legacy formats:</h3>
|
||||
<table>
|
||||
|
||||
<th>
|
||||
<td>Export onto server</td>
|
||||
<td>Export and Download</td>
|
||||
</th>
|
||||
<tr>
|
||||
<td>
|
||||
caves to cavetab2.csv
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="post" action="">
|
||||
<p>Overwrite the existing CAVETAB2.CSV file with one generated by Troggle.</p>
|
||||
<input name="export_cavetab" type="submit" value="Update {{settings.EXPOWEB}}noinfo/CAVETAB2.CSV" />
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="get" action="{% url downloadcavetab %}">
|
||||
<p>Download a CAVETAB2.CSV file which is dynamically generated by Troggle.</p>
|
||||
<input name="download_cavetab" type="submit" value="Download CAVETAB2.CSV" />
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
surveys to Surveys.csv
|
||||
</td>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="get" action={% url downloadlogbook %}>
|
||||
<p>Download a logbook file which is dynamically generated by Troggle.</p>
|
||||
|
||||
<p>
|
||||
Expedition year:
|
||||
<select name="year">
|
||||
{% for expedition in expeditions %}
|
||||
<option value="{{expedition}}"> {{expedition}} </option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Output style:
|
||||
<select name="extension">
|
||||
<option value="txt">.txt file with MediaWiki markup - 2008 style</option>
|
||||
<option value="html">.html file - 2005 style</option>
|
||||
</select>
|
||||
</p>
|
||||
<p>
|
||||
<input name="download_logbook" type="submit" value="Download logbook" />
|
||||
</p>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
surveys to Surveys.csv
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="post" action="">
|
||||
<p>Overwrite the existing Surveys.csv file with one generated by Troggle.</p>
|
||||
<input disabled name="export_surveys" type="submit" value="Update {{settings.SURVEYS}}noinfo/Surveys.csv" />
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form name="export" method="get" action={% url downloadsurveys %}>
|
||||
<p>Download a Surveys.csv file which is dynamically generated by Troggle.</p>
|
||||
<input disabled name="download_surveys" type="submit" value="Download Surveys.csv" />
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>qms to qms.csv</td><td>
|
||||
<form name="export_qms" method="get" action="downloadqms">
|
||||
|
||||
<!--This is for choosing caves by area (drilldown).
|
||||
|
||||
<select id="qmcaveareachooser" class="searchable" >
|
||||
</select>
|
||||
|
||||
-->
|
||||
|
||||
Choose a cave.
|
||||
<select name="cave_id" id="qmcavechooser">
|
||||
|
||||
{% for cave in caves %}
|
||||
<option value="{{cave.kataster_number}}">{{cave}}
|
||||
</option>
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
|
||||
<input type="submit" value="Download"/>
|
||||
</form>
|
||||
</td></tr>
|
||||
</table>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,96 +1,96 @@
|
||||
{% extends "base.html" %}
|
||||
{% load csrffaker %}
|
||||
{% block title %}File{% endblock %}
|
||||
{% block head %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#id_date").datepicker({dateFormat: "yy-mm-dd"});
|
||||
$("#id_cave").change(function() {
|
||||
$('#id_entrance').load('{% url get_entrances caveslug="" %}' + this.value);
|
||||
});
|
||||
$("#id_cave").change(function() {
|
||||
$('#id_qm').load('{% url get_qms caveslug="" %}' + this.value);
|
||||
});
|
||||
$("#id_expedition").change(function() {
|
||||
$('#id_logbookentry').load('{% url get_logbook_entries expeditionslug="" %}' + this.value);
|
||||
});
|
||||
$("#id_expedition").change(function() {
|
||||
$('#id_person').load('{% url get_people expeditionslug="" %}' + this.value);
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" />
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
|
||||
{{ fileForm.media }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
<form action="" method="post">{% csrf_token %}
|
||||
{{ fileForm.non_field_errors }}
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.title.errors }}
|
||||
<label for="id_title">Title:</label>
|
||||
{{ fileForm.title }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.slug.errors }}
|
||||
<label for="id_slug">Slug:</label>
|
||||
{{ fileForm.slug }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.date.errors }}
|
||||
<label for="id_date">Date:</label>
|
||||
{{ fileForm.date }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="lon_utm">
|
||||
{{ fileForm.lon_utm.errors }}
|
||||
<label for="id_lon_utm">Longitude:</label>
|
||||
{{ fileForm.lon_utm }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="lat_utm">
|
||||
{{ fileForm.lat_utm.errors }}
|
||||
<label for="id_lat_utm">Latitude:</label>
|
||||
{{ fileForm.lat_utm }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="cave">
|
||||
{{ fileForm.cave.errors }}
|
||||
<label for="id_cave">Cave:</label>
|
||||
{{ fileForm.cave }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="entrance">
|
||||
{{ fileForm.entrance.errors }}
|
||||
<label for="id_entrance">Entrance:</label>
|
||||
{{ fileForm.entrance }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="qm">
|
||||
{{ fileForm.qm.errors }}
|
||||
<label for="id_cavem">QM:</label>
|
||||
{{ fileForm.qm }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="expedition">
|
||||
{{ fileForm.expedition.errors }}
|
||||
<label for="id_expediton">Expedition:</label>
|
||||
{{ fileForm.expedition }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="logbookentry">
|
||||
{{ fileForm.logbookentry.errors }}
|
||||
<label for="id_logbookentry">Logbook Entry:</label>
|
||||
{{ fileForm.logbookentry }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="person">
|
||||
{{ fileForm.person.errors }}
|
||||
<label for="id_expediton">Person:</label>
|
||||
{{ fileForm.person }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.html.errors }}
|
||||
<label for="id_date">Content:</label>
|
||||
{{ fileForm.html }}
|
||||
</div>
|
||||
<p><input type="submit" value="Sumbit Trip Report" /></p>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load csrffaker %}
|
||||
{% block title %}File{% endblock %}
|
||||
{% block head %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#id_date").datepicker({dateFormat: "yy-mm-dd"});
|
||||
$("#id_cave").change(function() {
|
||||
$('#id_entrance').load('{% url get_entrances caveslug="" %}' + this.value);
|
||||
});
|
||||
$("#id_cave").change(function() {
|
||||
$('#id_qm').load('{% url get_qms caveslug="" %}' + this.value);
|
||||
});
|
||||
$("#id_expedition").change(function() {
|
||||
$('#id_logbookentry').load('{% url get_logbook_entries expeditionslug="" %}' + this.value);
|
||||
});
|
||||
$("#id_expedition").change(function() {
|
||||
$('#id_person').load('{% url get_people expeditionslug="" %}' + this.value);
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" />
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
|
||||
{{ fileForm.media }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
<form action="" method="post">{% csrf_token %}
|
||||
{{ fileForm.non_field_errors }}
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.title.errors }}
|
||||
<label for="id_title">Title:</label>
|
||||
{{ fileForm.title }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.slug.errors }}
|
||||
<label for="id_slug">Slug:</label>
|
||||
{{ fileForm.slug }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.date.errors }}
|
||||
<label for="id_date">Date:</label>
|
||||
{{ fileForm.date }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="lon_utm">
|
||||
{{ fileForm.lon_utm.errors }}
|
||||
<label for="id_lon_utm">Longitude:</label>
|
||||
{{ fileForm.lon_utm }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="lat_utm">
|
||||
{{ fileForm.lat_utm.errors }}
|
||||
<label for="id_lat_utm">Latitude:</label>
|
||||
{{ fileForm.lat_utm }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="cave">
|
||||
{{ fileForm.cave.errors }}
|
||||
<label for="id_cave">Cave:</label>
|
||||
{{ fileForm.cave }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="entrance">
|
||||
{{ fileForm.entrance.errors }}
|
||||
<label for="id_entrance">Entrance:</label>
|
||||
{{ fileForm.entrance }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="qm">
|
||||
{{ fileForm.qm.errors }}
|
||||
<label for="id_cavem">QM:</label>
|
||||
{{ fileForm.qm }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="expedition">
|
||||
{{ fileForm.expedition.errors }}
|
||||
<label for="id_expediton">Expedition:</label>
|
||||
{{ fileForm.expedition }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="logbookentry">
|
||||
{{ fileForm.logbookentry.errors }}
|
||||
<label for="id_logbookentry">Logbook Entry:</label>
|
||||
{{ fileForm.logbookentry }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="person">
|
||||
{{ fileForm.person.errors }}
|
||||
<label for="id_expediton">Person:</label>
|
||||
{{ fileForm.person }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ fileForm.html.errors }}
|
||||
<label for="id_date">Content:</label>
|
||||
{{ fileForm.html }}
|
||||
</div>
|
||||
<p><input type="submit" value="Sumbit Trip Report" /></p>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,80 +1,80 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
|
||||
{% block title %}{{ cave.official_name|wiki_to_html }} - {{ entrance_letter|wiki_to_html }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<table id="cavepage">
|
||||
<tr>
|
||||
<th id="kat_no">
|
||||
{% if cave.kataster_number %}
|
||||
{{ cave.kataster_number|wiki_to_html }}{{ letter|wiki_to_html }}
|
||||
{% if cave.unofficial_number %}
|
||||
<br />({{ cave.unofficial_number|wiki_to_html }})
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
<th id="name">
|
||||
{% if entrance.name %}
|
||||
{{ entrance.name|wiki_to_html }}
|
||||
{% else %}
|
||||
Unnamed
|
||||
{% endif %} - {{ cave.official_name|wiki_to_html }}
|
||||
</th>
|
||||
<th id="status">
|
||||
{{ cave.kataster_code|wiki_to_html }}
|
||||
</th>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
{% if entrance.entrance_description %}
|
||||
<h2>Entrance Description</h2>
|
||||
{{ entrance.entrance_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.explorers %}
|
||||
<h2>Explorers</h2>
|
||||
{{ entrance.explorers|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.map_description %}
|
||||
<h2>Map</h2>
|
||||
{{ entrance.map_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.explorers %}
|
||||
<h2>Entrance Description</h2>
|
||||
{{ entrance.entrance_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.location_description %}
|
||||
<h2>Location Description</h2>
|
||||
{{ entrance.location_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.approach %}
|
||||
<h2>Approach</h2>
|
||||
{{ entrance.approach|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.underground_description %}
|
||||
<h2>Underground Description</h2>
|
||||
{{ entrance.underground_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.photo %}
|
||||
<h2>Photo</h2>
|
||||
{{ entrance.photo|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.marking %}
|
||||
<h2>Marking - {{ entrance.marking_val|wiki_to_html }}</h2>
|
||||
{% if entrance.marking_comment %}
|
||||
{{ entrance.marking_comment|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if entrance.findability %}
|
||||
<h2>Findability - {{ entrance.findability_val|wiki_to_html }}</h2>
|
||||
{% if entrance.findability_description %}
|
||||
{{ entrance.findability_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if entrance.bearings %}
|
||||
<h2>Bearings</h2>
|
||||
{{ entrance.bearings|wiki_to_html }}
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
|
||||
{% block title %}{{ cave.official_name|wiki_to_html }} - {{ entrance_letter|wiki_to_html }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<table id="cavepage">
|
||||
<tr>
|
||||
<th id="kat_no">
|
||||
{% if cave.kataster_number %}
|
||||
{{ cave.kataster_number|wiki_to_html }}{{ letter|wiki_to_html }}
|
||||
{% if cave.unofficial_number %}
|
||||
<br />({{ cave.unofficial_number|wiki_to_html }})
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</th>
|
||||
<th id="name">
|
||||
{% if entrance.name %}
|
||||
{{ entrance.name|wiki_to_html }}
|
||||
{% else %}
|
||||
Unnamed
|
||||
{% endif %} - {{ cave.official_name|wiki_to_html }}
|
||||
</th>
|
||||
<th id="status">
|
||||
{{ cave.kataster_code|wiki_to_html }}
|
||||
</th>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
{% if entrance.entrance_description %}
|
||||
<h2>Entrance Description</h2>
|
||||
{{ entrance.entrance_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.explorers %}
|
||||
<h2>Explorers</h2>
|
||||
{{ entrance.explorers|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.map_description %}
|
||||
<h2>Map</h2>
|
||||
{{ entrance.map_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.explorers %}
|
||||
<h2>Entrance Description</h2>
|
||||
{{ entrance.entrance_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.location_description %}
|
||||
<h2>Location Description</h2>
|
||||
{{ entrance.location_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.approach %}
|
||||
<h2>Approach</h2>
|
||||
{{ entrance.approach|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.underground_description %}
|
||||
<h2>Underground Description</h2>
|
||||
{{ entrance.underground_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.photo %}
|
||||
<h2>Photo</h2>
|
||||
{{ entrance.photo|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% if entrance.marking %}
|
||||
<h2>Marking - {{ entrance.marking_val|wiki_to_html }}</h2>
|
||||
{% if entrance.marking_comment %}
|
||||
{{ entrance.marking_comment|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if entrance.findability %}
|
||||
<h2>Findability - {{ entrance.findability_val|wiki_to_html }}</h2>
|
||||
{% if entrance.findability_description %}
|
||||
{{ entrance.findability_description|wiki_to_html }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if entrance.bearings %}
|
||||
<h2>Bearings</h2>
|
||||
{{ entrance.bearings|wiki_to_html }}
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,87 +1,87 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}Expedition {{expedition.name}}{% endblock %}
|
||||
{% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
{% block related %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if message %}
|
||||
<p>debug message: {{message}}</p>
|
||||
{% endif %}
|
||||
|
||||
<h2>{{expedition.name}}</h2>
|
||||
|
||||
<p><b>Other years:</b>
|
||||
{% for otherexpedition in expeditions %}
|
||||
{% ifequal otherexpedition expedition %}
|
||||
| <b>{{otherexpedition.year}}</b>
|
||||
{% else %}
|
||||
| <a href="{{otherexpedition.get_absolute_url}}">{{ otherexpedition.year }}</a>
|
||||
{% endifequal %}
|
||||
{% endfor %}
|
||||
</p>
|
||||
|
||||
<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.
|
||||
The columns are the date in the month (July or August), with a "T" for a logbook entry, and
|
||||
an "S" for a survey trip. The colours are the same for people on the same trip.</p>
|
||||
|
||||
<table class="expeditionpersonlist">
|
||||
<tr>
|
||||
<th>Caver</th>
|
||||
{% for expeditionday in expedition.expeditionday_set.all %}
|
||||
<th>
|
||||
{{expeditionday.date.day}}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% for personexpeditionday in personexpeditiondays %}
|
||||
<tr>
|
||||
<td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person}}</a></td>
|
||||
{% for persondayactivities in personexpeditionday.personrow %}
|
||||
|
||||
{% if persondayactivities.persontrips or persondayactivities.survexblocks %}
|
||||
<td class="persondayactivity">
|
||||
{% for persontrip in persondayactivities.persontrips %}
|
||||
<a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-{{persontrip.logbook_entry.DayIndex}}">T</a>
|
||||
{% endfor %}
|
||||
<br/>
|
||||
{% for survexblock in persondayactivities.survexblocks %}
|
||||
<a href="{% url svx survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
{% else %}
|
||||
<td class="persondayactivity-nothing">
|
||||
</td>
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
|
||||
|
||||
<h3>Logbooks and survey trips per day</h3>
|
||||
<a href="{% url newLogBookEntry expeditionyear=expedition.year %}">New logbook entry</a>
|
||||
<table class="expeditionlogbooks">
|
||||
<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
|
||||
{% regroup dateditems|dictsort:"date" by date as dates %}
|
||||
{% for date in dates %}
|
||||
<tr>
|
||||
<td>{{date.grouper}}</td>
|
||||
<td>{% for item in date.list %}
|
||||
{% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %}
|
||||
{% endfor %}</td>
|
||||
<td>{% for item in date.list %}
|
||||
{% if item.isSurvexBlock %}<a href="{% url svx item.survexfile.path %}">{{item.name}}</a><br/>{% endif %}
|
||||
{% endfor %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}Expedition {{expedition.name}}{% endblock %}
|
||||
{% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
{% block related %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if message %}
|
||||
<p>debug message: {{message}}</p>
|
||||
{% endif %}
|
||||
|
||||
<h2>{{expedition.name}}</h2>
|
||||
|
||||
<p><b>Other years:</b>
|
||||
{% for otherexpedition in expeditions %}
|
||||
{% ifequal otherexpedition expedition %}
|
||||
| <b>{{otherexpedition.year}}</b>
|
||||
{% else %}
|
||||
| <a href="{{otherexpedition.get_absolute_url}}">{{ otherexpedition.year }}</a>
|
||||
{% endifequal %}
|
||||
{% endfor %}
|
||||
</p>
|
||||
|
||||
<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.
|
||||
The columns are the date in the month (July or August), with a "T" for a logbook entry, and
|
||||
an "S" for a survey trip. The colours are the same for people on the same trip.</p>
|
||||
|
||||
<table class="expeditionpersonlist">
|
||||
<tr>
|
||||
<th>Caver</th>
|
||||
{% for expeditionday in expedition.expeditionday_set.all %}
|
||||
<th>
|
||||
{{expeditionday.date.day}}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% for personexpeditionday in personexpeditiondays %}
|
||||
<tr>
|
||||
<td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person}}</a></td>
|
||||
{% for persondayactivities in personexpeditionday.personrow %}
|
||||
|
||||
{% if persondayactivities.persontrips or persondayactivities.survexblocks %}
|
||||
<td class="persondayactivity">
|
||||
{% for persontrip in persondayactivities.persontrips %}
|
||||
<a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-{{persontrip.logbook_entry.DayIndex}}">T</a>
|
||||
{% endfor %}
|
||||
<br/>
|
||||
{% for survexblock in persondayactivities.survexblocks %}
|
||||
<a href="{% url svx survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
{% else %}
|
||||
<td class="persondayactivity-nothing">
|
||||
</td>
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
|
||||
|
||||
<h3>Logbooks and survey trips per day</h3>
|
||||
<a href="{% url newLogBookEntry expeditionyear=expedition.year %}">New logbook entry</a>
|
||||
<table class="expeditionlogbooks">
|
||||
<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
|
||||
{% regroup dateditems|dictsort:"date" by date as dates %}
|
||||
{% for date in dates %}
|
||||
<tr>
|
||||
<td>{{date.grouper}}</td>
|
||||
<td>{% for item in date.list %}
|
||||
{% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %}
|
||||
{% endfor %}</td>
|
||||
<td>{% for item in date.list %}
|
||||
{% if item.isSurvexBlock %}<a href="{% url svx item.survexfile.path %}">{{item.name}}</a><br/>{% endif %}
|
||||
{% endfor %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<img id="richardBanner" class="footer" src="{{ settings.MEDIA_URL }}expoBanner.gif" style="display: none;"/>
|
||||
<img id="timeMachine" class="footer" src="{{ settings.MEDIA_URL }}timemachine.gif" style="display: none;"/>
|
||||
<img id="richardBanner" class="footer" src="{{ settings.MEDIA_URL }}expoBanner.gif" style="display: none;"/>
|
||||
<img id="timeMachine" class="footer" src="{{ settings.MEDIA_URL }}timemachine.gif" style="display: none;"/>
|
||||
<img id="surveyHover" class="footer" src="{{ settings.MEDIA_URL }}surveyHover.gif" style="display: none;"/>
|
||||
@@ -1,18 +1,18 @@
|
||||
<h2>Fileupload</h2>
|
||||
|
||||
<ul>
|
||||
{% for fileuploaded in filesuploaded %}
|
||||
<li>UPLOADEDFILE: {{fileuploaded}}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<p>MESSAGE: {{message}}
|
||||
</p>
|
||||
|
||||
{% if not filesuploaded %}
|
||||
<form action="" method="POST">
|
||||
<p>file to upload</p>
|
||||
<p><input type="file" name="file1"/></p>
|
||||
<p><input type="submit" name="submit" value="Submit" /></p>
|
||||
</form>
|
||||
{% endif %}
|
||||
<h2>Fileupload</h2>
|
||||
|
||||
<ul>
|
||||
{% for fileuploaded in filesuploaded %}
|
||||
<li>UPLOADEDFILE: {{fileuploaded}}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<p>MESSAGE: {{message}}
|
||||
</p>
|
||||
|
||||
{% if not filesuploaded %}
|
||||
<form action="" method="POST">
|
||||
<p>file to upload</p>
|
||||
<p><input type="file" name="file1"/></p>
|
||||
<p><input type="submit" name="submit" value="Submit" /></p>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
@@ -1,68 +1,68 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block related %}
|
||||
<h2>Recent Actions</h2>
|
||||
{% load log %}
|
||||
{% get_admin_log 10 as admin_log %}
|
||||
{% if not admin_log %}
|
||||
<p>No recent actions</p>
|
||||
{% else %}
|
||||
<ul class="actionlist">
|
||||
{% for entry in admin_log %}
|
||||
<li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
|
||||
{% if entry.is_deletion %}
|
||||
{{ entry.object_repr }}
|
||||
{% else %}
|
||||
<a href="admin/{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
{% if entry.content_type %}
|
||||
<span class="mini quiet">{% filter capfirst %}{{entry.content_type.name}}{% endfilter %}</span>
|
||||
{% else %}
|
||||
<span class="mini quiet">Unknown content</span>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="col1">
|
||||
<h3>Welcome</h3>
|
||||
<p class="indent">
|
||||
This is Troggle, the information portal for Cambridge University Caving Club's Expeditions to Austria.
|
||||
</p>
|
||||
|
||||
<p class="indent">
|
||||
Here you will find information about the {{expedition.objects.count}} expeditions the club has undertaken since 1976. Browse survey information, photos, and description wikis for {{cave.objects.count}} caves, {{subcave.objects.count}} areas within those caves, and {{extantqms.count}} going leads yet to be explored. We have {{photo.objects.count}} photos and {{logbookentry.objects.count}} logbook entries.
|
||||
</p>
|
||||
|
||||
<p class="indent">
|
||||
If you are an expedition member, please sign up using the link to the top right and begin editing.
|
||||
</p>
|
||||
|
||||
<h3>News</h3>
|
||||
|
||||
<p class="indent">
|
||||
Everyone is gearing up for the 2009 expedition; please see the link below for the main expedition website.
|
||||
</p>
|
||||
|
||||
<h3>Troggle development</h3>
|
||||
<p class="indent">
|
||||
Troggle is still under development. Check out the <a href="http://troggle.googlecode.com">development page</a> on google code, where you can file bug reports, make suggestions, and help develop the code. There is also an old todo list at <a href="{%url todo%}">here</a>.
|
||||
</p>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
|
||||
{% block margins %}
|
||||
<img class="leftMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}eieshole.jpg">
|
||||
<img class="rightMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}goesser.jpg">
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block related %}
|
||||
<h2>Recent Actions</h2>
|
||||
{% load log %}
|
||||
{% get_admin_log 10 as admin_log %}
|
||||
{% if not admin_log %}
|
||||
<p>No recent actions</p>
|
||||
{% else %}
|
||||
<ul class="actionlist">
|
||||
{% for entry in admin_log %}
|
||||
<li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
|
||||
{% if entry.is_deletion %}
|
||||
{{ entry.object_repr }}
|
||||
{% else %}
|
||||
<a href="admin/{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
{% if entry.content_type %}
|
||||
<span class="mini quiet">{% filter capfirst %}{{entry.content_type.name}}{% endfilter %}</span>
|
||||
{% else %}
|
||||
<span class="mini quiet">Unknown content</span>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="col1">
|
||||
<h3>Welcome</h3>
|
||||
<p class="indent">
|
||||
This is Troggle, the information portal for Cambridge University Caving Club's Expeditions to Austria.
|
||||
</p>
|
||||
|
||||
<p class="indent">
|
||||
Here you will find information about the {{expedition.objects.count}} expeditions the club has undertaken since 1976. Browse survey information, photos, and description wikis for {{cave.objects.count}} caves, {{subcave.objects.count}} areas within those caves, and {{extantqms.count}} going leads yet to be explored. We have {{photo.objects.count}} photos and {{logbookentry.objects.count}} logbook entries.
|
||||
</p>
|
||||
|
||||
<p class="indent">
|
||||
If you are an expedition member, please sign up using the link to the top right and begin editing.
|
||||
</p>
|
||||
|
||||
<h3>News</h3>
|
||||
|
||||
<p class="indent">
|
||||
Everyone is gearing up for the 2009 expedition; please see the link below for the main expedition website.
|
||||
</p>
|
||||
|
||||
<h3>Troggle development</h3>
|
||||
<p class="indent">
|
||||
Troggle is still under development. Check out the <a href="http://troggle.googlecode.com">development page</a> on google code, where you can file bug reports, make suggestions, and help develop the code. There is also an old todo list at <a href="{%url todo%}">here</a>.
|
||||
</p>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
|
||||
{% block margins %}
|
||||
<img class="leftMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}eieshole.jpg">
|
||||
<img class="rightMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}goesser.jpg">
|
||||
{% endblock margins %}
|
||||
@@ -1,59 +1,59 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>The unfinished front page</h2>
|
||||
<ul>
|
||||
<li><b>About {{totallogbookentries}} logbook entries have been loaded</b></li>
|
||||
<li><b><a href="{% url personindex %}">List of People</a></b></li>
|
||||
<li><b><a href="{% url caveindex %}">List of Caves</a></b></li>
|
||||
<li><a href="{% url jgtfile aaaa %}">JGT list of files</a> (temporary simple file list and tunnel use)</li>
|
||||
<li><a href="{% url survey %}">Survey files</a></li>
|
||||
<li><a href="{% url svx all %}">Survex directory</a></li>
|
||||
<li><a href="{% url expedition 2008 %}">Expedition 2008</a></li>
|
||||
<li><a href="{% url expedition 2007 %}">Expedition 2007</a></li>
|
||||
<li><a href="{% url expedition 1992 %}">Expedition 1992</a> (earliest parsed)</li>
|
||||
</ul>
|
||||
|
||||
<h2>Further work</h2>
|
||||
|
||||
<p>Julian's work:
|
||||
<p>parse 1976-1991 logbooks; (esp top 161)</p>
|
||||
<p>detect T/U on log entries; </p>
|
||||
<p>name matching and spelling in survex files; </p>
|
||||
<p>Improve logbook wikihtml text</p>
|
||||
|
||||
<p>Other work:</p>
|
||||
<p>surf through the tunnel sketches and images</p>
|
||||
<p>bugs with all.svx block (double dot)
|
||||
<p>render bitmap view of every survex block as a thumbnail</p>
|
||||
<p>upload tunnel images and tunnel sketches</p>
|
||||
<p>where are the subcaves; </p>
|
||||
<p>cave section entrance match for logbook entries</p>
|
||||
<p>simplify the survex parsing code (if necessary); </p>
|
||||
<p>wiki survex stop linegap between comment lins</p>
|
||||
<p>links between logbooks and survex blocks to cave things; </p>
|
||||
<p>mini-tree of survexblocks; </p>
|
||||
<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
|
||||
<p>all images to start appearing in pages; and so on</p>
|
||||
|
||||
<h3>{{message}}</h3>
|
||||
|
||||
<form action="" method="GET">
|
||||
<input type="submit" name="reloadexpos" value="Reload Expos">
|
||||
<input type="submit" name="reloadsurvex" value="Reload Survex">
|
||||
</form>
|
||||
|
||||
<ul id="expeditionlist">
|
||||
{% for expedition in expeditions %}
|
||||
<li>
|
||||
<a href="{% url expedition expedition.year %}">{{expedition.name}}</a>
|
||||
- <b>{{expedition.logbookentry_set.count}}</b> logbook entries
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>The unfinished front page</h2>
|
||||
<ul>
|
||||
<li><b>About {{totallogbookentries}} logbook entries have been loaded</b></li>
|
||||
<li><b><a href="{% url personindex %}">List of People</a></b></li>
|
||||
<li><b><a href="{% url caveindex %}">List of Caves</a></b></li>
|
||||
<li><a href="{% url jgtfile aaaa %}">JGT list of files</a> (temporary simple file list and tunnel use)</li>
|
||||
<li><a href="{% url survey %}">Survey files</a></li>
|
||||
<li><a href="{% url svx all %}">Survex directory</a></li>
|
||||
<li><a href="{% url expedition 2008 %}">Expedition 2008</a></li>
|
||||
<li><a href="{% url expedition 2007 %}">Expedition 2007</a></li>
|
||||
<li><a href="{% url expedition 1992 %}">Expedition 1992</a> (earliest parsed)</li>
|
||||
</ul>
|
||||
|
||||
<h2>Further work</h2>
|
||||
|
||||
<p>Julian's work:
|
||||
<p>parse 1976-1991 logbooks; (esp top 161)</p>
|
||||
<p>detect T/U on log entries; </p>
|
||||
<p>name matching and spelling in survex files; </p>
|
||||
<p>Improve logbook wikihtml text</p>
|
||||
|
||||
<p>Other work:</p>
|
||||
<p>surf through the tunnel sketches and images</p>
|
||||
<p>bugs with all.svx block (double dot)
|
||||
<p>render bitmap view of every survex block as a thumbnail</p>
|
||||
<p>upload tunnel images and tunnel sketches</p>
|
||||
<p>where are the subcaves; </p>
|
||||
<p>cave section entrance match for logbook entries</p>
|
||||
<p>simplify the survex parsing code (if necessary); </p>
|
||||
<p>wiki survex stop linegap between comment lins</p>
|
||||
<p>links between logbooks and survex blocks to cave things; </p>
|
||||
<p>mini-tree of survexblocks; </p>
|
||||
<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
|
||||
<p>all images to start appearing in pages; and so on</p>
|
||||
|
||||
<h3>{{message}}</h3>
|
||||
|
||||
<form action="" method="GET">
|
||||
<input type="submit" name="reloadexpos" value="Reload Expos">
|
||||
<input type="submit" name="reloadsurvex" value="Reload Survex">
|
||||
</form>
|
||||
|
||||
<ul id="expeditionlist">
|
||||
{% for expedition in expeditions %}
|
||||
<li>
|
||||
<a href="{% url expedition expedition.year %}">{{expedition.name}}</a>
|
||||
- <b>{{expedition.logbookentry_set.count}}</b> logbook entries
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
<h2>List file :{{file}}:</h2>
|
||||
|
||||
<h3>Files</h3>
|
||||
<ul>
|
||||
{% for lf in listdirfiles %}
|
||||
<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a> ({{lf.2}} bytes)</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>Upperdirectories</h3>
|
||||
<ul>
|
||||
{% for lf in upperdirs %}
|
||||
<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>Subdirectories</h3>
|
||||
<ul>
|
||||
{% for lf in listdirdirs %}
|
||||
<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a> ({{lf.2}} files)</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<h2>List file :{{file}}:</h2>
|
||||
|
||||
<h3>Files</h3>
|
||||
<ul>
|
||||
{% for lf in listdirfiles %}
|
||||
<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a> ({{lf.2}} bytes)</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>Upperdirectories</h3>
|
||||
<ul>
|
||||
{% for lf in upperdirs %}
|
||||
<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>Subdirectories</h3>
|
||||
<ul>
|
||||
{% for lf in listdirdirs %}
|
||||
<li><a href="{% url jgtfile lf.0 %}">{{lf.1}}</a> ({{lf.2}} files)</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
<html>
|
||||
<head><title>{{logbook_entries.0.expedition}} Expo Logbook</title></head>
|
||||
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
|
||||
<style type="text/css">
|
||||
.tripdate { float: left;}
|
||||
.trippeople { float: right;}
|
||||
.triptitle { font-size: 120%; text-align: center; font-weight: bold; clear: both }
|
||||
.timeug { text-align: right; font-weight: bold }
|
||||
p { clear: both }
|
||||
</style>
|
||||
<body>
|
||||
|
||||
<h1>Expo {{logbook_entries.0.expedition}}</h1>
|
||||
|
||||
{%for logbook_entry in logbook_entries%}
|
||||
<hr />
|
||||
|
||||
<div class="tripdate" id="t{{logbook_entry.date}}A">{{logbook_entry.date}}</div>
|
||||
<div class="trippeople"><u>{{logbook_entry.author.person}}</u>
|
||||
{% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.personexpedition.person }} {{ persontrip.personexpedition.time_underground }}, {% endfor %}
|
||||
</div>
|
||||
|
||||
<div class="triptitle">{{logbook_entry.place}} - {{logbook_entry.title}}</div>
|
||||
|
||||
{{logbook_entry.text|safe}}
|
||||
{% endfor %}
|
||||
<html>
|
||||
<head><title>{{logbook_entries.0.expedition}} Expo Logbook</title></head>
|
||||
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
|
||||
<style type="text/css">
|
||||
.tripdate { float: left;}
|
||||
.trippeople { float: right;}
|
||||
.triptitle { font-size: 120%; text-align: center; font-weight: bold; clear: both }
|
||||
.timeug { text-align: right; font-weight: bold }
|
||||
p { clear: both }
|
||||
</style>
|
||||
<body>
|
||||
|
||||
<h1>Expo {{logbook_entries.0.expedition}}</h1>
|
||||
|
||||
{%for logbook_entry in logbook_entries%}
|
||||
<hr />
|
||||
|
||||
<div class="tripdate" id="t{{logbook_entry.date}}A">{{logbook_entry.date}}</div>
|
||||
<div class="trippeople"><u>{{logbook_entry.author.person}}</u>
|
||||
{% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.personexpedition.person }} {{ persontrip.personexpedition.time_underground }}, {% endfor %}
|
||||
</div>
|
||||
|
||||
<div class="triptitle">{{logbook_entry.place}} - {{logbook_entry.title}}</div>
|
||||
|
||||
{{logbook_entry.text|safe}}
|
||||
{% endfor %}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
=Expo {{logbook_entries.0.expedition}} logbook ==
|
||||
{%for logbook_entry in logbook_entries%}
|
||||
==={{logbook_entry.date}} | {{logbook_entry.place}} - {{logbook_entry.title}} | {% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.person_expedition.person }} {{ persontrip.person_expedition.time_underground }}, {% endfor %}===
|
||||
|
||||
{{logbook_entry.text|safe}}
|
||||
=Expo {{logbook_entries.0.expedition}} logbook ==
|
||||
{%for logbook_entry in logbook_entries%}
|
||||
==={{logbook_entry.date}} | {{logbook_entry.place}} - {{logbook_entry.title}} | {% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.person_expedition.person }} {{ persontrip.person_expedition.time_underground }}, {% endfor %}===
|
||||
|
||||
{{logbook_entry.text|safe}}
|
||||
{% endfor %}
|
||||
@@ -1,77 +1,77 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Logbook {{logbookentry.id}}{% endblock %}
|
||||
{% block editLink %}<a href={{logbookentry.get_admin_url}}>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
{% block related %}{% endblock %}
|
||||
{% block nav %}{% endblock %}
|
||||
<h2>{{logbookentry.title}}</h2>
|
||||
|
||||
<div id="related">
|
||||
<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p>
|
||||
|
||||
{% if logbookentry.cave %}
|
||||
<p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</p>
|
||||
{% else %}
|
||||
<p>{{logbookentry.place}}</p>
|
||||
{% endif %}
|
||||
|
||||
<p>
|
||||
{% if logbookentry.get_previous_by_date %}
|
||||
<a href="{{ logbookentry.get_previous_by_date.get_absolute_url }}">{{logbookentry.get_previous_by_date.date}}</a>
|
||||
{% endif %}
|
||||
{% if logbookentry.get_next_by_date %}
|
||||
<a href="{{ logbookentry.get_next_by_date.get_absolute_url }}">{{logbookentry.get_next_by_date.date}}</a>
|
||||
{% endif %}
|
||||
</p>
|
||||
|
||||
<table class="cavers">
|
||||
<tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
|
||||
{% for persontrip in logbookentry.persontrip_set.all %}
|
||||
<tr>
|
||||
{% ifequal persontrip.personexpedition logbookentry.author %}
|
||||
<td class="author">
|
||||
{% else %}
|
||||
<td>
|
||||
{% endifequal %}
|
||||
<a href="{{ persontrip.personexpedition.get_absolute_url }}">{{persontrip.personexpedition.person}}</a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if persontrip.timeunderground %}
|
||||
- T/U {{persontrip.timeunderground}}</p>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if persontrip.persontrip_prev %}
|
||||
<a href="{{ persontrip.persontrip_prev.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_prev.logbook_entry.date}}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if persontrip.persontrip_next %}
|
||||
<a href="{{ persontrip.persontrip_next.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_next.logbook_entry.date}}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
{% if newQMlink %}
|
||||
<a href="{{newQMlink}}">Add QM found on this trip</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div id="col1">
|
||||
<div class="logbookentry">
|
||||
<b>{{logbookentry.date}}</b>
|
||||
{{logbookentry.text|wiki_to_html}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if logbookentry.filename %}<a href="{% url editLogBookEntry expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url deleteLogBookEntry expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%}
|
||||
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Logbook {{logbookentry.id}}{% endblock %}
|
||||
{% block editLink %}<a href={{logbookentry.get_admin_url}}>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
{% block related %}{% endblock %}
|
||||
{% block nav %}{% endblock %}
|
||||
<h2>{{logbookentry.title}}</h2>
|
||||
|
||||
<div id="related">
|
||||
<p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p>
|
||||
|
||||
{% if logbookentry.cave %}
|
||||
<p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</p>
|
||||
{% else %}
|
||||
<p>{{logbookentry.place}}</p>
|
||||
{% endif %}
|
||||
|
||||
<p>
|
||||
{% if logbookentry.get_previous_by_date %}
|
||||
<a href="{{ logbookentry.get_previous_by_date.get_absolute_url }}">{{logbookentry.get_previous_by_date.date}}</a>
|
||||
{% endif %}
|
||||
{% if logbookentry.get_next_by_date %}
|
||||
<a href="{{ logbookentry.get_next_by_date.get_absolute_url }}">{{logbookentry.get_next_by_date.date}}</a>
|
||||
{% endif %}
|
||||
</p>
|
||||
|
||||
<table class="cavers">
|
||||
<tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
|
||||
{% for persontrip in logbookentry.persontrip_set.all %}
|
||||
<tr>
|
||||
{% ifequal persontrip.personexpedition logbookentry.author %}
|
||||
<td class="author">
|
||||
{% else %}
|
||||
<td>
|
||||
{% endifequal %}
|
||||
<a href="{{ persontrip.personexpedition.get_absolute_url }}">{{persontrip.personexpedition.person}}</a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if persontrip.timeunderground %}
|
||||
- T/U {{persontrip.timeunderground}}</p>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if persontrip.persontrip_prev %}
|
||||
<a href="{{ persontrip.persontrip_prev.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_prev.logbook_entry.date}}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if persontrip.persontrip_next %}
|
||||
<a href="{{ persontrip.persontrip_next.logbook_entry.get_absolute_url }}">{{persontrip.persontrip_next.logbook_entry.date}}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
{% if newQMlink %}
|
||||
<a href="{{newQMlink}}">Add QM found on this trip</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div id="col1">
|
||||
<div class="logbookentry">
|
||||
<b>{{logbookentry.date}}</b>
|
||||
{{logbookentry.text|wiki_to_html}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if logbookentry.filename %}<a href="{% url editLogBookEntry expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url deleteLogBookEntry expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%}
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,83 +1,83 @@
|
||||
{% extends "base.html" %}
|
||||
{% load csrffaker %}
|
||||
{% block title %}Logbook {{logbookentry.id}}{% endblock %}
|
||||
{% block head %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#id_date").datepicker({dateFormat: "yy-mm-dd"});
|
||||
$('.persontrips tbody tr').formset();
|
||||
$(":radio[name*='caveOrLocation']").change(setLocationType);
|
||||
$(setLocationType());
|
||||
function setLocationType () {
|
||||
$("#cave").hide();
|
||||
$("#location").hide();
|
||||
$("#" + $(":radio[name*='caveOrLocation']:checked")[0].value).show();
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" />
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
|
||||
{{ tripForm.media }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
<form action="" method="post">{% csrf_token %}
|
||||
{{ tripForm.non_field_errors }}
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.title.errors }}
|
||||
<label for="id_title">Title:</label>
|
||||
{{ tripForm.title }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.date.errors }}
|
||||
<label for="id_date">Date:</label>
|
||||
{{ tripForm.date }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.caveOrLocation.errors }}
|
||||
<label for="id_caveOrLocation">Location Type:</label>
|
||||
{{ tripForm.caveOrLocation }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="cave">
|
||||
{{ tripForm.cave.errors }}
|
||||
<label for="id_cave">Cave:</label>
|
||||
{{ tripForm.cave }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="location">
|
||||
{{ tripForm.location.errors }}
|
||||
<label for="id_location">Location:</label>
|
||||
{{ tripForm.location }}
|
||||
</div>
|
||||
<table class="persontrips" border="0" cellpadding="0" cellspacing="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>Person</th>
|
||||
<th>TU /hours</th>
|
||||
<th>Author</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
{% for form in personTripFormSet.forms %}
|
||||
<tr>
|
||||
<td>{{ form.name.errors }}{{ form.name }}</td>
|
||||
<td>{{ form.TU.errors }}{{ form.TU }}</td>
|
||||
<td>{{ form.author.errors }}{{ form.author }}</td>
|
||||
<td></td>
|
||||
{{ form.non_field_errors }}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{{ personTripFormSet.management_form }}
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.html.errors }}
|
||||
<label for="id_date">Content:</label>
|
||||
{{ tripForm.html }}
|
||||
</div>
|
||||
<p><input type="submit" value="Sumbit Trip Report" /></p>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load csrffaker %}
|
||||
{% block title %}Logbook {{logbookentry.id}}{% endblock %}
|
||||
{% block head %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#id_date").datepicker({dateFormat: "yy-mm-dd"});
|
||||
$('.persontrips tbody tr').formset();
|
||||
$(":radio[name*='caveOrLocation']").change(setLocationType);
|
||||
$(setLocationType());
|
||||
function setLocationType () {
|
||||
$("#cave").hide();
|
||||
$("#location").hide();
|
||||
$("#" + $(":radio[name*='caveOrLocation']:checked")[0].value).show();
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" />
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
|
||||
<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
|
||||
{{ tripForm.media }}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
<form action="" method="post">{% csrf_token %}
|
||||
{{ tripForm.non_field_errors }}
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.title.errors }}
|
||||
<label for="id_title">Title:</label>
|
||||
{{ tripForm.title }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.date.errors }}
|
||||
<label for="id_date">Date:</label>
|
||||
{{ tripForm.date }}
|
||||
</div>
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.caveOrLocation.errors }}
|
||||
<label for="id_caveOrLocation">Location Type:</label>
|
||||
{{ tripForm.caveOrLocation }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="cave">
|
||||
{{ tripForm.cave.errors }}
|
||||
<label for="id_cave">Cave:</label>
|
||||
{{ tripForm.cave }}
|
||||
</div>
|
||||
<div class="fieldWrapper" id="location">
|
||||
{{ tripForm.location.errors }}
|
||||
<label for="id_location">Location:</label>
|
||||
{{ tripForm.location }}
|
||||
</div>
|
||||
<table class="persontrips" border="0" cellpadding="0" cellspacing="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>Person</th>
|
||||
<th>TU /hours</th>
|
||||
<th>Author</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
{% for form in personTripFormSet.forms %}
|
||||
<tr>
|
||||
<td>{{ form.name.errors }}{{ form.name }}</td>
|
||||
<td>{{ form.TU.errors }}{{ form.TU }}</td>
|
||||
<td>{{ form.author.errors }}{{ form.author }}</td>
|
||||
<td></td>
|
||||
{{ form.non_field_errors }}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{{ personTripFormSet.management_form }}
|
||||
<div class="fieldWrapper">
|
||||
{{ tripForm.html.errors }}
|
||||
<label for="id_date">Content:</label>
|
||||
{{ tripForm.html }}
|
||||
</div>
|
||||
<p><input type="submit" value="Sumbit Trip Report" /></p>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}
|
||||
{{instance}} is non-public
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h3>Non-public object requested by anonymous user</h3>
|
||||
The object you requested, {{instance}}, is only viewable for logged-in users. This may be due to copyright or privacy concerns.
|
||||
{% extends "base.html" %}
|
||||
{% block title %}
|
||||
{{instance}} is non-public
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h3>Non-public object requested by anonymous user</h3>
|
||||
The object you requested, {{instance}}, is only viewable for logged-in users. This may be due to copyright or privacy concerns.
|
||||
{% endblock %}
|
||||
@@ -1,15 +1,15 @@
|
||||
{% extends "base.html" %}
|
||||
{% load link %}
|
||||
{% block title %}Troggle: {{object_list.1.meta.object_name}} objects{%endblock%}
|
||||
|
||||
{% block contentheader %}
|
||||
<h1>{{object_list.0.object_name}} objects</h1>
|
||||
{% endblock contentheader %}
|
||||
|
||||
{% block content %}
|
||||
<ul>
|
||||
{% for object in object_list %}
|
||||
| {{ object|link }}
|
||||
{% endfor %} |
|
||||
</ul>
|
||||
{% extends "base.html" %}
|
||||
{% load link %}
|
||||
{% block title %}Troggle: {{object_list.1.meta.object_name}} objects{%endblock%}
|
||||
|
||||
{% block contentheader %}
|
||||
<h1>{{object_list.0.object_name}} objects</h1>
|
||||
{% endblock contentheader %}
|
||||
|
||||
{% block content %}
|
||||
<ul>
|
||||
{% for object in object_list %}
|
||||
| {{ object|link }}
|
||||
{% endfor %} |
|
||||
</ul>
|
||||
{% endblock content %}
|
||||
@@ -1,43 +1,43 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Person {{person|wiki_to_html_short}}{% endblock %}
|
||||
|
||||
{% block editLink %}| <a href={{person.get_admin_url}}>Edit person {{person|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
<h2> {{person|wiki_to_html_short}} </h2>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if person.blurb %}
|
||||
{{person.blurb|safe}}
|
||||
{% endif %}
|
||||
|
||||
{% for pic in person.photo_set.all %}
|
||||
{% if pic.is_mugshot %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ pic.thumbnail_image.url }}" class="thumbnail" />
|
||||
<p> {{ pic.caption }}</p>
|
||||
<p> <a href="{{ pic.get_admin_url }}">edit {{pic}}</a> </>
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<br class="clearfloat" />
|
||||
|
||||
<h3>{{person|wiki_to_html_short}} has been on expo in the following years:</h3>
|
||||
<p>
|
||||
<ul>
|
||||
{% for personexpedition in person.personexpedition_set.all %}
|
||||
<li> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
|
||||
<span style="padding-left:{{personexpedition.persontrip_set.all|length}}0px; background-color:red"></span>
|
||||
{{personexpedition.persontrip_set.all|length}} trips
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Person {{person|wiki_to_html_short}}{% endblock %}
|
||||
|
||||
{% block editLink %}| <a href={{person.get_admin_url}}>Edit person {{person|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
<h2> {{person|wiki_to_html_short}} </h2>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if person.blurb %}
|
||||
{{person.blurb|safe}}
|
||||
{% endif %}
|
||||
|
||||
{% for pic in person.photo_set.all %}
|
||||
{% if pic.is_mugshot %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ pic.thumbnail_image.url }}" class="thumbnail" />
|
||||
<p> {{ pic.caption }}</p>
|
||||
<p> <a href="{{ pic.get_admin_url }}">edit {{pic}}</a> </>
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<br class="clearfloat" />
|
||||
|
||||
<h3>{{person|wiki_to_html_short}} has been on expo in the following years:</h3>
|
||||
<p>
|
||||
<ul>
|
||||
{% for personexpedition in person.personexpedition_set.all %}
|
||||
<li> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
|
||||
<span style="padding-left:{{personexpedition.persontrip_set.all|length}}0px; background-color:red"></span>
|
||||
{{personexpedition.persontrip_set.all|length}} trips
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
|
||||
{{ form }}
|
||||
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
|
||||
{{ form }}
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,57 +1,57 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<h1>
|
||||
<a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person}}</a> :
|
||||
<a href="{{personexpedition.expedition.get_absolute_url}}">{{personexpedition.expedition}}</a>
|
||||
</h1>
|
||||
|
||||
<p>{{message}}</p>
|
||||
|
||||
<p><b>Other years:</b>
|
||||
{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %}
|
||||
{% ifequal otherpersonexpedition personexpedition %}
|
||||
| <b>{{otherpersonexpedition.expedition.year}}</b>
|
||||
{% else %}
|
||||
| <a href="{{otherpersonexpedition.get_absolute_url}}">{{ otherpersonexpedition.expedition.year }}</a>
|
||||
{% endifequal %}
|
||||
{% endfor %}
|
||||
</p>
|
||||
|
||||
<h3>Table of all trips and surveys aligned by date</h3>
|
||||
<div>
|
||||
<table class="survexcontibutions">
|
||||
<tr><th>Date</th><th colspan="2">Trips</th><th colspan="2">Surveys</th></tr>
|
||||
{% for persondate in personchronology %}
|
||||
<tr>
|
||||
<td class="date">{{persondate.0}}</td>
|
||||
|
||||
{% if persondate.1 %}
|
||||
<td class="trip"><a href="{{ persondate.1.logbook_entry.get_absolute_url }}">{{persondate.1.logbook_entry.title|safe}}</a></td>
|
||||
<td><a href="{{ persondate.1.logbook_entry.cave.get_absolute_url }}">{{persondate.1.place|safe}}</a></td>
|
||||
{% else %}
|
||||
<td colspan="2"> </td>
|
||||
{% endif %}
|
||||
|
||||
{% if persondate.2 %}
|
||||
<td class="survexblock"><a href="{% url svx persondate.2.survexfile.path %}">{{persondate.2}}</a></td>
|
||||
<td class="roles">
|
||||
{% for survexpersonrole in persondate.2.survexpersonrole_set.all %}
|
||||
{{survexpersonrole.nrole}}
|
||||
{% endfor %}
|
||||
</td>
|
||||
{% else %}
|
||||
<td colspan="2"> </td>
|
||||
{% endif %}
|
||||
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}Person {{personexpedition.person|wiki_to_html_short}} for {{personexpedition.expedition}}{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<h1>
|
||||
<a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person}}</a> :
|
||||
<a href="{{personexpedition.expedition.get_absolute_url}}">{{personexpedition.expedition}}</a>
|
||||
</h1>
|
||||
|
||||
<p>{{message}}</p>
|
||||
|
||||
<p><b>Other years:</b>
|
||||
{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %}
|
||||
{% ifequal otherpersonexpedition personexpedition %}
|
||||
| <b>{{otherpersonexpedition.expedition.year}}</b>
|
||||
{% else %}
|
||||
| <a href="{{otherpersonexpedition.get_absolute_url}}">{{ otherpersonexpedition.expedition.year }}</a>
|
||||
{% endifequal %}
|
||||
{% endfor %}
|
||||
</p>
|
||||
|
||||
<h3>Table of all trips and surveys aligned by date</h3>
|
||||
<div>
|
||||
<table class="survexcontibutions">
|
||||
<tr><th>Date</th><th colspan="2">Trips</th><th colspan="2">Surveys</th></tr>
|
||||
{% for persondate in personchronology %}
|
||||
<tr>
|
||||
<td class="date">{{persondate.0}}</td>
|
||||
|
||||
{% if persondate.1 %}
|
||||
<td class="trip"><a href="{{ persondate.1.logbook_entry.get_absolute_url }}">{{persondate.1.logbook_entry.title|safe}}</a></td>
|
||||
<td><a href="{{ persondate.1.logbook_entry.cave.get_absolute_url }}">{{persondate.1.place|safe}}</a></td>
|
||||
{% else %}
|
||||
<td colspan="2"> </td>
|
||||
{% endif %}
|
||||
|
||||
{% if persondate.2 %}
|
||||
<td class="survexblock"><a href="{% url svx persondate.2.survexfile.path %}">{{persondate.2}}</a></td>
|
||||
<td class="roles">
|
||||
{% for survexpersonrole in persondate.2.survexpersonrole_set.all %}
|
||||
{{survexpersonrole.nrole}}
|
||||
{% endfor %}
|
||||
</td>
|
||||
{% else %}
|
||||
<td colspan="2"> </td>
|
||||
{% endif %}
|
||||
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Person Index{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>Notable expoers</h2>
|
||||
<table class="searchable">
|
||||
<tr><th>Person</th><th>First</th><th>Last</th><th>Notability</th></tr>
|
||||
{% for person in notablepersons %}
|
||||
<tr>
|
||||
<td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
|
||||
<td><a href="{{ person.first.get_absolute_url }}">{{ person.first.expedition.year }}</a></td>
|
||||
<td><a href="{{ person.last.get_absolute_url }}">{{ person.last.expedition.year }}</a></td>
|
||||
<td>{{person.notability}}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
|
||||
<h2>All expoers</h2>
|
||||
<table class="searchable">
|
||||
<tr>
|
||||
{% for persons in personss %}
|
||||
<td>
|
||||
|
||||
<table>
|
||||
<tr><th>Person</th><th>First</th><th>Last</th><th>Surveyed length</th></tr>
|
||||
{% for person in persons %}
|
||||
<tr>
|
||||
<td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
|
||||
<td><a href="{{ person.first.get_absolute_url }}">{{person.first.expedition.year}}</a></td>
|
||||
<td><a href="{{ person.last.get_absolute_url }}">{{person.last.expedition.year}}</a></td>
|
||||
<td>{{ person.surveyedleglength }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Person Index{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>Notable expoers</h2>
|
||||
<table class="searchable">
|
||||
<tr><th>Person</th><th>First</th><th>Last</th><th>Notability</th></tr>
|
||||
{% for person in notablepersons %}
|
||||
<tr>
|
||||
<td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
|
||||
<td><a href="{{ person.first.get_absolute_url }}">{{ person.first.expedition.year }}</a></td>
|
||||
<td><a href="{{ person.last.get_absolute_url }}">{{ person.last.expedition.year }}</a></td>
|
||||
<td>{{person.notability}}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
|
||||
<h2>All expoers</h2>
|
||||
<table class="searchable">
|
||||
<tr>
|
||||
{% for persons in personss %}
|
||||
<td>
|
||||
|
||||
<table>
|
||||
<tr><th>Person</th><th>First</th><th>Last</th><th>Surveyed length</th></tr>
|
||||
{% for person in persons %}
|
||||
<tr>
|
||||
<td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
|
||||
<td><a href="{{ person.first.get_absolute_url }}">{{person.first.expedition.year}}</a></td>
|
||||
<td><a href="{{ person.last.get_absolute_url }}">{{person.last.expedition.year}}</a></td>
|
||||
<td>{{ person.surveyedleglength }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<form method="post">
|
||||
{{ form.as_p }}
|
||||
<input type="submit" />
|
||||
</form>
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<form method="post">
|
||||
{{ form.as_p }}
|
||||
<input type="submit" />
|
||||
</form>
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,13 +1,13 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<form method="post">
|
||||
{{ form.as_p }}
|
||||
<input type="submit" />
|
||||
</form>
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<form method="post">
|
||||
{{ form.as_p }}
|
||||
<input type="submit" />
|
||||
</form>
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,14 +1,14 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block contentheader %}
|
||||
<h1>Profile for {{ profile }}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{{ profile }}
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block contentheader %}
|
||||
<h1>Profile for {{ profile }}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{{ profile }}
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,40 +1,40 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>Troggle profile selection page</h2>
|
||||
|
||||
Hello, {{ user }}.
|
||||
|
||||
<br /><br />
|
||||
|
||||
{% if user.person %}
|
||||
This is where you go to associate a new user account with a pre-existing profile from old expo data.
|
||||
|
||||
<br /><br />
|
||||
|
||||
However, you already have a profile- your name should be {{user.person.first_name}} {{user.person.last_name}}. If you don't believe me, go see it at: <br /><br /> <a href= {{ user.person.get_absolute_url }}> {{ user.person.get_absolute_url }} </a> <br /><br /> or edit it at:
|
||||
<br /><br /> <a href= {{ user.person.get_admin_url }}> {{ user.person.get_admin_url }} </a>.<br /><br />
|
||||
|
||||
If your account is associated with the wrong person's profile due to inebriation or incompetance during account setup, click <a href="{{ user.person.get_absolute_url }}/?clear_profile=True">here</a> to dissasociate your profile from your user account.
|
||||
|
||||
{% else %}
|
||||
|
||||
You have an account in the system, but no profile. If you have been on expo before, please choose yourself from the list below.
|
||||
<br /><br />
|
||||
|
||||
<form method="post">
|
||||
{{ form.as_p }}
|
||||
<input name="" type="submit" value="This is me!" />
|
||||
</form>
|
||||
<br />
|
||||
|
||||
Yes, you could choose the wrong person if you want. That would be lame. Instead, do something that's actually funny. For example, fry a random object or maybe take some mac and cheese somewhere it doesn't usually get to go. Perhaps you can start a new tradition of laminating the expo leader.
|
||||
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>Troggle profile selection page</h2>
|
||||
|
||||
Hello, {{ user }}.
|
||||
|
||||
<br /><br />
|
||||
|
||||
{% if user.person %}
|
||||
This is where you go to associate a new user account with a pre-existing profile from old expo data.
|
||||
|
||||
<br /><br />
|
||||
|
||||
However, you already have a profile- your name should be {{user.person.first_name}} {{user.person.last_name}}. If you don't believe me, go see it at: <br /><br /> <a href= {{ user.person.get_absolute_url }}> {{ user.person.get_absolute_url }} </a> <br /><br /> or edit it at:
|
||||
<br /><br /> <a href= {{ user.person.get_admin_url }}> {{ user.person.get_admin_url }} </a>.<br /><br />
|
||||
|
||||
If your account is associated with the wrong person's profile due to inebriation or incompetance during account setup, click <a href="{{ user.person.get_absolute_url }}/?clear_profile=True">here</a> to dissasociate your profile from your user account.
|
||||
|
||||
{% else %}
|
||||
|
||||
You have an account in the system, but no profile. If you have been on expo before, please choose yourself from the list below.
|
||||
<br /><br />
|
||||
|
||||
<form method="post">
|
||||
{{ form.as_p }}
|
||||
<input name="" type="submit" value="This is me!" />
|
||||
</form>
|
||||
<br />
|
||||
|
||||
Yes, you could choose the wrong person if you want. That would be lame. Instead, do something that's actually funny. For example, fry a random object or maybe take some mac and cheese somewhere it doesn't usually get to go. Perhaps you can start a new tradition of laminating the expo leader.
|
||||
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if form.errors %}
|
||||
<p class="errornote">Please correct the errors below</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,49 +1,49 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %} QM: {{qm|wiki_to_html_short}} {% endblock %}
|
||||
|
||||
{% block editLink %}| <a href={{qm.get_admin_url}}>Edit QM {{qm|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
|
||||
|
||||
{% block contentheader %}
|
||||
<table id="cavepage">
|
||||
<tr>
|
||||
<th id="kat_no"><a href="{{qm.get_previous_by_id.get_absolute_url}}">Previous</a></th>
|
||||
<th id="name">{{qm|wiki_to_html_short}}</th>
|
||||
<th id="status"><a href="{{qm.get_next_by_id.get_absolute_url}}">Next</a></th>
|
||||
</tr>
|
||||
</table>
|
||||
{% endblock %}
|
||||
|
||||
{% block related %}
|
||||
|
||||
{% endblock %}
|
||||
<h2>Related items</h2>
|
||||
|
||||
Parent cave: {{qm.found_by.cave|link}}
|
||||
(todo: add parent survey and parent subcave)
|
||||
{% block content %}
|
||||
|
||||
<h3>Location</h3>
|
||||
{{qm.location_description}}
|
||||
|
||||
|
||||
<h3>Creation</h3>
|
||||
Found by <a href="{{qm.found_by.get_absolute_url}}">{{qm.found_by}}</a> on {{qm.found_by.date}}.
|
||||
|
||||
<h3>Completion</h3>
|
||||
{% if ticked_off_by %}
|
||||
{{qm.completion_description}}
|
||||
Ticked off by: <a href="{{qm.ticked_off_by.get_absolute_url}}">{{qm.ticked_off_by}}</a><br />
|
||||
Description: {{qm.completion_description}}
|
||||
{% else %}
|
||||
None yet- STILL EXTANT.
|
||||
{% endif %}
|
||||
|
||||
<h3>Comment</h3>
|
||||
{{qm.comment}}
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %} QM: {{qm|wiki_to_html_short}} {% endblock %}
|
||||
|
||||
{% block editLink %}| <a href={{qm.get_admin_url}}>Edit QM {{qm|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
|
||||
|
||||
{% block contentheader %}
|
||||
<table id="cavepage">
|
||||
<tr>
|
||||
<th id="kat_no"><a href="{{qm.get_previous_by_id.get_absolute_url}}">Previous</a></th>
|
||||
<th id="name">{{qm|wiki_to_html_short}}</th>
|
||||
<th id="status"><a href="{{qm.get_next_by_id.get_absolute_url}}">Next</a></th>
|
||||
</tr>
|
||||
</table>
|
||||
{% endblock %}
|
||||
|
||||
{% block related %}
|
||||
|
||||
{% endblock %}
|
||||
<h2>Related items</h2>
|
||||
|
||||
Parent cave: {{qm.found_by.cave|link}}
|
||||
(todo: add parent survey and parent subcave)
|
||||
{% block content %}
|
||||
|
||||
<h3>Location</h3>
|
||||
{{qm.location_description}}
|
||||
|
||||
|
||||
<h3>Creation</h3>
|
||||
Found by <a href="{{qm.found_by.get_absolute_url}}">{{qm.found_by}}</a> on {{qm.found_by.date}}.
|
||||
|
||||
<h3>Completion</h3>
|
||||
{% if ticked_off_by %}
|
||||
{{qm.completion_description}}
|
||||
Ticked off by: <a href="{{qm.ticked_off_by.get_absolute_url}}">{{qm.ticked_off_by}}</a><br />
|
||||
Description: {{qm.completion_description}}
|
||||
{% else %}
|
||||
None yet- STILL EXTANT.
|
||||
{% endif %}
|
||||
|
||||
<h3>Comment</h3>
|
||||
{{qm.comment}}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}
|
||||
New troggle account registered
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
<h1>activate.html</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if account %}
|
||||
<p>
|
||||
Hello, {{ account }}! Your account is now activated. Now you can <a href="{%url auth_login%}">log in</a> with the password you chose. Use the links in the upper right to control this in the future.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>.
|
||||
</p>
|
||||
{% else %}
|
||||
|
||||
The activation key you entered has already been used or was invalid.
|
||||
{% endif %}
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}
|
||||
New troggle account registered
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
<h1>activate.html</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if account %}
|
||||
<p>
|
||||
Hello, {{ account }}! Your account is now activated. Now you can <a href="{%url auth_login%}">log in</a> with the password you chose. Use the links in the upper right to control this in the future.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>.
|
||||
</p>
|
||||
{% else %}
|
||||
|
||||
The activation key you entered has already been used or was invalid.
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<P>Hello {{ form.user }},</P>
|
||||
|
||||
<P>Glad you're joining the CUCC EXPO team! Please go to</P>
|
||||
|
||||
<P><a href="{{ site }}{% url registration_activate activation_key %}">{{ site }}{% url registration_activate activation_key %}</a></P>
|
||||
|
||||
<P>to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.</P>
|
||||
|
||||
<P>Yours,<BR>
|
||||
The magical troggle</P>
|
||||
<P>Hello {{ form.user }},</P>
|
||||
|
||||
<P>Glad you're joining the CUCC EXPO team! Please go to</P>
|
||||
|
||||
<P><a href="{{ site }}{% url registration_activate activation_key %}">{{ site }}{% url registration_activate activation_key %}</a></P>
|
||||
|
||||
<P>to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.</P>
|
||||
|
||||
<P>Yours,<BR>
|
||||
The magical troggle</P>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
Hello {{ form.user }},
|
||||
|
||||
Glad you're joining the CUCC EXPO team! Please go to
|
||||
|
||||
{{ site }}{% url registration_activate activation_key %}
|
||||
|
||||
to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.
|
||||
|
||||
Yours,
|
||||
Hello {{ form.user }},
|
||||
|
||||
Glad you're joining the CUCC EXPO team! Please go to
|
||||
|
||||
{{ site }}{% url registration_activate activation_key %}
|
||||
|
||||
to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.
|
||||
|
||||
Yours,
|
||||
The magical troggle
|
||||
@@ -1,20 +1,20 @@
|
||||
{% extends "base.html" %}
|
||||
{% load csrffaker %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if form.errors %}
|
||||
<p>Your username and password didn't match. Please try again.</p>
|
||||
{% endif %}
|
||||
|
||||
<form method="post" action=".">{% csrf_token %}
|
||||
<table>
|
||||
<tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
|
||||
<tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
|
||||
</table>
|
||||
|
||||
<input type="submit" value="login" />
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load csrffaker %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if form.errors %}
|
||||
<p>Your username and password didn't match. Please try again.</p>
|
||||
{% endif %}
|
||||
|
||||
<form method="post" action=".">{% csrf_token %}
|
||||
<table>
|
||||
<tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
|
||||
<tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
|
||||
</table>
|
||||
|
||||
<input type="submit" value="login" />
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
You have been logged out.
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
You have been logged out.
|
||||
{% endblock %}
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends “base.html” %}
|
||||
{% block body %}
|
||||
Hello {{ account }}!
|
||||
|
||||
Check your email to confirm the activation. There are {{ expiration_days }} days left to do it.
|
||||
{% extends “base.html” %}
|
||||
{% block body %}
|
||||
Hello {{ account }}!
|
||||
|
||||
Check your email to confirm the activation. There are {{ expiration_days }} days left to do it.
|
||||
{% endblock %}
|
||||
@@ -1,13 +1,13 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}
|
||||
{{ block.super }}: registration complete
|
||||
{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
<h1>Registration Complete</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<p>Thank you for signing up. An email with the activation code has been sent to your inbox. </p>
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}
|
||||
{{ block.super }}: registration complete
|
||||
{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
<h1>Registration Complete</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<p>Thank you for signing up. An email with the activation code has been sent to your inbox. </p>
|
||||
{% endblock %}
|
||||
@@ -1,8 +1,8 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Database statistics{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
Over the course of {{ expoCount }} expeditions, {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries.
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Database statistics{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
Over the course of {{ expoCount }} expeditions, {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries.
|
||||
{% endblock %}
|
||||
@@ -1,59 +1,59 @@
|
||||
{% extends "cavebase.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load mptt_tags %}
|
||||
{% block title %} Subcave {{subcave}} {% endblock title %}
|
||||
{% block editLink %}<a href={{subcave.get_admin_url}}>Edit subcave {{subcave|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
{{subcave.title}}
|
||||
{% endblock contentheader %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
{% block related %}
|
||||
|
||||
<h2>Related places</h2>
|
||||
|
||||
<h3>Parent</h3>
|
||||
|
||||
<ul>
|
||||
{% if subcave.parent %}
|
||||
<li><a href="{{subcave.parent.get_absolute_url}}">{{subcave.parent}}</a></li>
|
||||
{% else %}
|
||||
<li><a href="{{subcave.cave.get_absolute_url}}">{{subcave.cave}}</a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
<h3>Connected subareas</h3>
|
||||
|
||||
<ul>
|
||||
{% for sibling in subcave.adjoining.all%}
|
||||
<li><a href="{{sibling.get_absolute_url}}">{{silbling}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>Children</h3>
|
||||
|
||||
<ul>
|
||||
{% for child in subcave.children.all %}
|
||||
<li><a href="{{child.get_absolute_url}}">{{child}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
ok here comes the drilldown<br />
|
||||
{% drilldown_tree_for_node subcave as drilldown %}
|
||||
{% for each in drilldown %}
|
||||
{{ each }}>
|
||||
{% endfor %}
|
||||
|
||||
|
||||
<h2>{{subcave}}</h2>
|
||||
<p>
|
||||
{{subcave.description}}
|
||||
</p>
|
||||
|
||||
{% extends "cavebase.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load mptt_tags %}
|
||||
{% block title %} Subcave {{subcave}} {% endblock title %}
|
||||
{% block editLink %}<a href={{subcave.get_admin_url}}>Edit subcave {{subcave|wiki_to_html_short}}</a>{% endblock %}
|
||||
|
||||
{% block contentheader %}
|
||||
{{subcave.title}}
|
||||
{% endblock contentheader %}
|
||||
|
||||
|
||||
|
||||
{% block content %}
|
||||
{% block related %}
|
||||
|
||||
<h2>Related places</h2>
|
||||
|
||||
<h3>Parent</h3>
|
||||
|
||||
<ul>
|
||||
{% if subcave.parent %}
|
||||
<li><a href="{{subcave.parent.get_absolute_url}}">{{subcave.parent}}</a></li>
|
||||
{% else %}
|
||||
<li><a href="{{subcave.cave.get_absolute_url}}">{{subcave.cave}}</a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
<h3>Connected subareas</h3>
|
||||
|
||||
<ul>
|
||||
{% for sibling in subcave.adjoining.all%}
|
||||
<li><a href="{{sibling.get_absolute_url}}">{{silbling}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3>Children</h3>
|
||||
|
||||
<ul>
|
||||
{% for child in subcave.children.all %}
|
||||
<li><a href="{{child.get_absolute_url}}">{{child}}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
ok here comes the drilldown<br />
|
||||
{% drilldown_tree_for_node subcave as drilldown %}
|
||||
{% for each in drilldown %}
|
||||
{{ each }}>
|
||||
{% endfor %}
|
||||
|
||||
|
||||
<h2>{{subcave}}</h2>
|
||||
<p>
|
||||
{{subcave.description}}
|
||||
</p>
|
||||
|
||||
{% endblock content %}
|
||||
@@ -1,49 +1,49 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
|
||||
{% block title %}Survex Block{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Survex Block {{survexblock.survexpath}}</h2>
|
||||
|
||||
<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>
|
||||
<p>Needs to start dealing with misspellings of names (prob by editing the originals)</p>
|
||||
|
||||
<div id="col2">
|
||||
|
||||
{% if survexblock.parent %}
|
||||
<p>Survey block above:</p>
|
||||
<p class="indent"><a href="{% url survexblock survexblock.parent.survexpath %}">{{survexblock.parent.survexpath}}</a></p>
|
||||
{% endif %}
|
||||
|
||||
{% if survexblock.survexblock_set.all %}
|
||||
<p>Survey blocks below:</p>
|
||||
{% for survexblockdown in survexblock.survexblock_set.all %}
|
||||
<p class="indent"><a href="{% url survexblock survexblockdown.survexpath %}">{{survexblockdown.survexpath}}</a></p>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<p>Date: {{survexblock.date}}</p>
|
||||
|
||||
<table>
|
||||
{% for personrole in survexblock.GetPersonroles %}
|
||||
<tr>
|
||||
<td><a href="{{personrole.person.get_absolute_url}}">{{personrole.person}}</a></td>
|
||||
<td>{{personrole.roles}}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="survexblock">
|
||||
{{ftext|survex_to_html}}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
|
||||
{% block title %}Survex Block{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Survex Block {{survexblock.survexpath}}</h2>
|
||||
|
||||
<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>
|
||||
<p>Needs to start dealing with misspellings of names (prob by editing the originals)</p>
|
||||
|
||||
<div id="col2">
|
||||
|
||||
{% if survexblock.parent %}
|
||||
<p>Survey block above:</p>
|
||||
<p class="indent"><a href="{% url survexblock survexblock.parent.survexpath %}">{{survexblock.parent.survexpath}}</a></p>
|
||||
{% endif %}
|
||||
|
||||
{% if survexblock.survexblock_set.all %}
|
||||
<p>Survey blocks below:</p>
|
||||
{% for survexblockdown in survexblock.survexblock_set.all %}
|
||||
<p class="indent"><a href="{% url survexblock survexblockdown.survexpath %}">{{survexblockdown.survexpath}}</a></p>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<p>Date: {{survexblock.date}}</p>
|
||||
|
||||
<table>
|
||||
{% for personrole in survexblock.GetPersonroles %}
|
||||
<tr>
|
||||
<td><a href="{{personrole.person.get_absolute_url}}">{{personrole.person}}</a></td>
|
||||
<td>{{personrole.roles}}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="survexblock">
|
||||
{{ftext|survex_to_html}}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,33 +1,33 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}Survex Scans Folder{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>Survex Scans in: {{survexscansfolder.walletname}}</h3>
|
||||
<table>
|
||||
{% for survexscansingle in survexscansfolder.survexscansingle_set.all %}
|
||||
<tr>
|
||||
<td class="survexscansingle"><a href="{{survexscansingle.get_absolute_url}}">{{survexscansingle.name}}</a></td>
|
||||
<td>
|
||||
{% for survexblock in survexscansingle.survexblock_set.all %}
|
||||
{{survexblock}}
|
||||
{% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<h3>Surveys referring to this wallet</h3>
|
||||
|
||||
<table>
|
||||
{% for survexblock in survexscansfolder.survexblock_set.all %}
|
||||
<tr>
|
||||
<td><a href="{% url svx survexblock.survexfile.path %}">{{survexblock}}</a></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}Survex Scans Folder{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>Survex Scans in: {{survexscansfolder.walletname}}</h3>
|
||||
<table>
|
||||
{% for survexscansingle in survexscansfolder.survexscansingle_set.all %}
|
||||
<tr>
|
||||
<td class="survexscansingle"><a href="{{survexscansingle.get_absolute_url}}">{{survexscansingle.name}}</a></td>
|
||||
<td>
|
||||
{% for survexblock in survexscansingle.survexblock_set.all %}
|
||||
{{survexblock}}
|
||||
{% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<h3>Surveys referring to this wallet</h3>
|
||||
|
||||
<table>
|
||||
{% for survexblock in survexscansfolder.survexblock_set.all %}
|
||||
<tr>
|
||||
<td><a href="{% url svx survexblock.survexfile.path %}">{{survexblock}}</a></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}All Survex scans folders{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>All Survex scans folders</h3>
|
||||
<table>
|
||||
<tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th></tr>
|
||||
{% for survexscansfolder in survexscansfolders %}
|
||||
<tr>
|
||||
<td><a href="{{survexscansfolder.get_absolute_url}}">{{survexscansfolder.walletname}}</a></td>
|
||||
<td>{{survexscansfolder.survexscansingle_set.all|length}}</td>
|
||||
<td>
|
||||
{% for survexblock in survexscansfolder.survexblock_set.all %}
|
||||
<a href="{% url svx survexblock.survexfile.path %}">{{survexblock}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}All Survex scans folders{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>All Survex scans folders</h3>
|
||||
<table>
|
||||
<tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th></tr>
|
||||
{% for survexscansfolder in survexscansfolders %}
|
||||
<tr>
|
||||
<td><a href="{{survexscansfolder.get_absolute_url}}">{{survexscansfolder.walletname}}</a></td>
|
||||
<td>{{survexscansfolder.survexscansingle_set.all|length}}</td>
|
||||
<td>
|
||||
{% for survexblock in survexscansfolder.survexblock_set.all %}
|
||||
<a href="{% url svx survexblock.survexfile.path %}">{{survexblock}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,193 +1,193 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
|
||||
{% block title %}CUCC Virtual Survey Binder: {{ current_expedition }}{{ current_survey }}{%endblock%}
|
||||
{% block head %}
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/nav.css" />
|
||||
|
||||
<script language="javascript">
|
||||
blankColor = "rgb(153, 153, 153)"
|
||||
highlightedColor = "rgb(125, 125, 125)"
|
||||
chosenColor = "rgb(255, 255, 255)"
|
||||
|
||||
$(document).ready(function() {
|
||||
$(".menuBarItem").click(function() {
|
||||
$("#"+this.id+"Content").toggle();
|
||||
if ($(this).hasClass('on')){
|
||||
$(this).removeClass('on');}
|
||||
else {
|
||||
$(this).addClass('on');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function redirectSurvey(){
|
||||
window.location = "{% url survey %}" + '/' + document.getElementById("expeditionChooser").value + "%23" + document.getElementById("surveyChooser").value;
|
||||
}
|
||||
|
||||
function redirectYear(){
|
||||
window.location = "{% url survey %}" + '/' + document.getElementById("expeditionChooser").value + "%23";
|
||||
}
|
||||
</script>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
<div id="currentLocation">
|
||||
CUCC Expo virtual survey binder:
|
||||
{% if current_survey %}
|
||||
{{current_survey}}
|
||||
{% else %}
|
||||
{{current_expedition}}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% block nav %}
|
||||
<br />
|
||||
|
||||
<h3>Choose a year</h3>
|
||||
<center>
|
||||
<select id="expeditionChooser" class="centre" onChange="redirectYear()">
|
||||
|
||||
<option value=""/>
|
||||
{% for expedition in expeditions %}
|
||||
<option label="{{ expedition }}" value="{{ expedition }}" {% ifequal expedition current_expedition %}selected{% endifequal %}>
|
||||
|
||||
{{ expedition }}
|
||||
|
||||
</option>
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
</center>
|
||||
|
||||
<div>
|
||||
<!-- <h4>Click to toggle:</h4>-->
|
||||
<div id="progressTable" class="menuBarItem"> {% if current_expedition.survey_set.all %}✓{% endif %}
|
||||
survey progress table </div>
|
||||
</div>
|
||||
{% if current_expedition %}
|
||||
<h3>Choose a wallet number </h3>
|
||||
<center>
|
||||
<select id="surveyChooser" class="centre" onChange="redirectSurvey()">
|
||||
<option label="show all" value="">
|
||||
|
||||
</option>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
|
||||
<option label="{{ survey }}" value="{{ survey.wallet_number }}"
|
||||
{% ifequal survey current_survey %}
|
||||
selected
|
||||
{% endifequal %}>
|
||||
{{ survey }}
|
||||
</option>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
<option label="add" value="add">
|
||||
</select>
|
||||
|
||||
</center>
|
||||
<h4>Click to toggle:</h4>
|
||||
<div id="surveyWalletNav">
|
||||
<div id="notes" class="menuBarItem"> {% if notes %}✓{% endif %}
|
||||
scanned notes </div>
|
||||
<div id="survexFile" class="menuBarItem"> {% if current_survey.survex_file %}✓{% endif %}
|
||||
survex file </div>
|
||||
<div id="printedCentreline" class="menuBarItem"> {% if current_survey.centreline_printed_on %}✓{% endif %}
|
||||
printed centreline </div>
|
||||
<div id="scannedPassageSketch" class="menuBarItem"> {% if planSketches %}✓{% endif %}
|
||||
scanned passage sketch </div>
|
||||
<div id="tunnelXMLfile" class="menuBarItem">tunnel xml file</div>
|
||||
<div id="mainSketchIntegration" class="menuBarItem">add to main sketch</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div id="mainContent" style="background:white">
|
||||
|
||||
<div id="progressTableContent" class="behind">
|
||||
<h3>Survey progress table for {{ current_expedition }}</h3>
|
||||
{% if current_expedition.survey_set.all %} <!-- if there are any surveys in the expedition, make the table -->
|
||||
<table class="centre">
|
||||
<tr>
|
||||
<th> </th>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<th> {{ survey.wallet_number }} </th>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Notes </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.notes %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Survex file </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.survex_file %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Plans </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.plans %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Elevations </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.elevations %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
</table>
|
||||
{% else %}
|
||||
<center>[ There are no surveys in the database for this year. Put link in to add one. ]</center>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div id="notesContent" class="behind" >
|
||||
<h3>Scanned notes for {{ current_survey }}.</h3>
|
||||
{% for noteItem in notes %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ noteItem.thumbnail_image.url }}" class="thumbnail">
|
||||
<p> File at: <a href="{{ noteItem.correctURL }}"> {{ noteItem.file.name }} </a> <br />
|
||||
Scanned by: {{ noteItem.scanned_by }} <br />
|
||||
On: {{ noteItem.scanned_on }} <br />
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="figure"> <a href="{{ settings.URL_ROOT }}/admin/expo/scannedimage/add/"> <img src="{{ settings.URL_ROOT }}{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_addlink.gif" /> Add a new scanned notes page. </a> </div>
|
||||
</div>
|
||||
<br class="clearfloat" />
|
||||
<div id="survexFileContent" class="behind"> survex file editor, keeping file in original structure <br />
|
||||
who entered by </div>
|
||||
<div id="printedCentrelineContent" class="behind"> centreline </div>
|
||||
<div id="scannedPassageSketchContent" class="behind">
|
||||
<h3>Scanned plan sketch files for {{ current_survey }}.</h3>
|
||||
{% for sketchItem in planSketches %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ sketchItem.thumbnail_image.url }}" class="thumbnail" />
|
||||
<p> File at: <a href="{{ sketchItem.correctURL }}"> {{ sketchItem.file.name }} </a> <br />
|
||||
Scanned by: {{ sketchItem.scanned_by }} <br />
|
||||
On: {{ sketchItem.scanned_on }} <br />
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="figure"> <a href="{{ settings.URL_ROOT }}/admin/expo/scannedimage/add/"> <img src="{{ settings.URL_ROOT }}{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_addlink.gif" /> Add a new scanned sketch. </a> </div>
|
||||
</div>
|
||||
<div id="tunnelXMLfileContent" class="behind"> link to tunnel xml file. potentially instance of tunnel applet... </div>
|
||||
<div id="mainSketchIntegrationContent" class="behind"> link to main sketch file </div>
|
||||
<!-- end #mainContent -->
|
||||
</div>
|
||||
<br class="clearfloat" />
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
|
||||
{% block title %}CUCC Virtual Survey Binder: {{ current_expedition }}{{ current_survey }}{%endblock%}
|
||||
{% block head %}
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/nav.css" />
|
||||
|
||||
<script language="javascript">
|
||||
blankColor = "rgb(153, 153, 153)"
|
||||
highlightedColor = "rgb(125, 125, 125)"
|
||||
chosenColor = "rgb(255, 255, 255)"
|
||||
|
||||
$(document).ready(function() {
|
||||
$(".menuBarItem").click(function() {
|
||||
$("#"+this.id+"Content").toggle();
|
||||
if ($(this).hasClass('on')){
|
||||
$(this).removeClass('on');}
|
||||
else {
|
||||
$(this).addClass('on');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function redirectSurvey(){
|
||||
window.location = "{% url survey %}" + '/' + document.getElementById("expeditionChooser").value + "%23" + document.getElementById("surveyChooser").value;
|
||||
}
|
||||
|
||||
function redirectYear(){
|
||||
window.location = "{% url survey %}" + '/' + document.getElementById("expeditionChooser").value + "%23";
|
||||
}
|
||||
</script>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
<div id="currentLocation">
|
||||
CUCC Expo virtual survey binder:
|
||||
{% if current_survey %}
|
||||
{{current_survey}}
|
||||
{% else %}
|
||||
{{current_expedition}}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% block nav %}
|
||||
<br />
|
||||
|
||||
<h3>Choose a year</h3>
|
||||
<center>
|
||||
<select id="expeditionChooser" class="centre" onChange="redirectYear()">
|
||||
|
||||
<option value=""/>
|
||||
{% for expedition in expeditions %}
|
||||
<option label="{{ expedition }}" value="{{ expedition }}" {% ifequal expedition current_expedition %}selected{% endifequal %}>
|
||||
|
||||
{{ expedition }}
|
||||
|
||||
</option>
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
</center>
|
||||
|
||||
<div>
|
||||
<!-- <h4>Click to toggle:</h4>-->
|
||||
<div id="progressTable" class="menuBarItem"> {% if current_expedition.survey_set.all %}✓{% endif %}
|
||||
survey progress table </div>
|
||||
</div>
|
||||
{% if current_expedition %}
|
||||
<h3>Choose a wallet number </h3>
|
||||
<center>
|
||||
<select id="surveyChooser" class="centre" onChange="redirectSurvey()">
|
||||
<option label="show all" value="">
|
||||
|
||||
</option>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
|
||||
<option label="{{ survey }}" value="{{ survey.wallet_number }}"
|
||||
{% ifequal survey current_survey %}
|
||||
selected
|
||||
{% endifequal %}>
|
||||
{{ survey }}
|
||||
</option>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
<option label="add" value="add">
|
||||
</select>
|
||||
|
||||
</center>
|
||||
<h4>Click to toggle:</h4>
|
||||
<div id="surveyWalletNav">
|
||||
<div id="notes" class="menuBarItem"> {% if notes %}✓{% endif %}
|
||||
scanned notes </div>
|
||||
<div id="survexFile" class="menuBarItem"> {% if current_survey.survex_file %}✓{% endif %}
|
||||
survex file </div>
|
||||
<div id="printedCentreline" class="menuBarItem"> {% if current_survey.centreline_printed_on %}✓{% endif %}
|
||||
printed centreline </div>
|
||||
<div id="scannedPassageSketch" class="menuBarItem"> {% if planSketches %}✓{% endif %}
|
||||
scanned passage sketch </div>
|
||||
<div id="tunnelXMLfile" class="menuBarItem">tunnel xml file</div>
|
||||
<div id="mainSketchIntegration" class="menuBarItem">add to main sketch</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div id="mainContent" style="background:white">
|
||||
|
||||
<div id="progressTableContent" class="behind">
|
||||
<h3>Survey progress table for {{ current_expedition }}</h3>
|
||||
{% if current_expedition.survey_set.all %} <!-- if there are any surveys in the expedition, make the table -->
|
||||
<table class="centre">
|
||||
<tr>
|
||||
<th> </th>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<th> {{ survey.wallet_number }} </th>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Notes </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.notes %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Survex file </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.survex_file %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Plans </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.plans %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
<tr>
|
||||
<td> Elevations </td>
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<td> {% if survey.elevations %}
|
||||
✓
|
||||
{% endif %} </td>
|
||||
{% endfor %} </tr>
|
||||
</table>
|
||||
{% else %}
|
||||
<center>[ There are no surveys in the database for this year. Put link in to add one. ]</center>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div id="notesContent" class="behind" >
|
||||
<h3>Scanned notes for {{ current_survey }}.</h3>
|
||||
{% for noteItem in notes %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ noteItem.thumbnail_image.url }}" class="thumbnail">
|
||||
<p> File at: <a href="{{ noteItem.correctURL }}"> {{ noteItem.file.name }} </a> <br />
|
||||
Scanned by: {{ noteItem.scanned_by }} <br />
|
||||
On: {{ noteItem.scanned_on }} <br />
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="figure"> <a href="{{ settings.URL_ROOT }}/admin/expo/scannedimage/add/"> <img src="{{ settings.URL_ROOT }}{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_addlink.gif" /> Add a new scanned notes page. </a> </div>
|
||||
</div>
|
||||
<br class="clearfloat" />
|
||||
<div id="survexFileContent" class="behind"> survex file editor, keeping file in original structure <br />
|
||||
who entered by </div>
|
||||
<div id="printedCentrelineContent" class="behind"> centreline </div>
|
||||
<div id="scannedPassageSketchContent" class="behind">
|
||||
<h3>Scanned plan sketch files for {{ current_survey }}.</h3>
|
||||
{% for sketchItem in planSketches %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ sketchItem.thumbnail_image.url }}" class="thumbnail" />
|
||||
<p> File at: <a href="{{ sketchItem.correctURL }}"> {{ sketchItem.file.name }} </a> <br />
|
||||
Scanned by: {{ sketchItem.scanned_by }} <br />
|
||||
On: {{ sketchItem.scanned_on }} <br />
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="figure"> <a href="{{ settings.URL_ROOT }}/admin/expo/scannedimage/add/"> <img src="{{ settings.URL_ROOT }}{{ settings.ADMIN_MEDIA_PREFIX }}img/admin/icon_addlink.gif" /> Add a new scanned sketch. </a> </div>
|
||||
</div>
|
||||
<div id="tunnelXMLfileContent" class="behind"> link to tunnel xml file. potentially instance of tunnel applet... </div>
|
||||
<div id="mainSketchIntegrationContent" class="behind"> link to main sketch file </div>
|
||||
<!-- end #mainContent -->
|
||||
</div>
|
||||
<br class="clearfloat" />
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,81 +1,81 @@
|
||||
{% 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>length</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>{{survexblock.totalleglength}}</td>
|
||||
|
||||
<td>
|
||||
{% for survextitle in survexblock.survextitle_set.all %}
|
||||
{{survextitle.title}}
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if survexblock.survexscansfolder %}
|
||||
<b><a href="{{survexblock.survexscansfolder.get_absolute_url}}">{{survexblock.survexscansfolder.walletname}}</a></b>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% 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>length</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>{{survexblock.totalleglength}}</td>
|
||||
|
||||
<td>
|
||||
{% for survextitle in survexblock.survextitle_set.all %}
|
||||
{{survextitle.title}}
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if survexblock.survexscansfolder %}
|
||||
<b><a href="{{survexblock.survexscansfolder.get_absolute_url}}">{{survexblock.survexscansfolder.walletname}}</a></b>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -1,76 +1,76 @@
|
||||
{% extends "base.html" %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}{{ title }}{% endblock %}
|
||||
|
||||
{% block head %}
|
||||
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="{{settings.MEDIA_URL}}js/jquery.form.js"></script>
|
||||
<script type="text/javascript" src="{{settings.MEDIA_URL}}CodeMirror-0.62/js/codemirror.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var codeeditor;
|
||||
$(document).ready(function()
|
||||
{
|
||||
codeeditor = CodeMirror.fromTextArea("id_code",
|
||||
{
|
||||
parserfile: ["parsesurvex.js"],
|
||||
stylesheet: "{{settings.MEDIA_URL}}CodeMirror-0.62/css/survexcolors.css",
|
||||
path: "{{settings.MEDIA_URL}}CodeMirror-0.62/js/",
|
||||
textWrapping: false,
|
||||
lineNumbers: false,
|
||||
indentUnit: 4,
|
||||
tabMode: "spaces"
|
||||
});
|
||||
$("#id_outputtype").val("ajax");
|
||||
var options =
|
||||
{
|
||||
target: '#difflistajax',
|
||||
beforeSubmit: function() { $("textarea#id_code").value = codeeditor.getCode().length; },
|
||||
success: function() { codeeditor.focus(); }
|
||||
};
|
||||
$('#codewikiform').ajaxForm(options); // bind form using 'ajaxForm'
|
||||
});
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<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>
|
||||
<div style="display:none">{{form.filename}} {{form.dirname}} {{form.datetime}} {{form.outputtype}}</div>
|
||||
<input type="submit" name="diff" value="Diffy" />
|
||||
<input type="submit" name="save" value="Save"/>
|
||||
<input type="submit" name="process" value="Process" title="executes cavern"/>
|
||||
</form>
|
||||
|
||||
<div id="difflistajax">
|
||||
<pre>
|
||||
{% for diffline in difflist %}{{diffline}}
|
||||
{% endfor %}
|
||||
</pre>
|
||||
|
||||
{% if logmessage %}
|
||||
{% if has_3d %}
|
||||
<p><a href="{% url threed title %}">3d file</a></p>
|
||||
{% else %}
|
||||
<p><b>No 3d file</b></p>
|
||||
{% endif %}
|
||||
<pre>
|
||||
LOGMESSAGES
|
||||
{{logmessage}}
|
||||
</pre>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}{{ title }}{% endblock %}
|
||||
|
||||
{% block head %}
|
||||
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="{{settings.MEDIA_URL}}js/jquery.form.js"></script>
|
||||
<script type="text/javascript" src="{{settings.MEDIA_URL}}CodeMirror-0.62/js/codemirror.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var codeeditor;
|
||||
$(document).ready(function()
|
||||
{
|
||||
codeeditor = CodeMirror.fromTextArea("id_code",
|
||||
{
|
||||
parserfile: ["parsesurvex.js"],
|
||||
stylesheet: "{{settings.MEDIA_URL}}CodeMirror-0.62/css/survexcolors.css",
|
||||
path: "{{settings.MEDIA_URL}}CodeMirror-0.62/js/",
|
||||
textWrapping: false,
|
||||
lineNumbers: false,
|
||||
indentUnit: 4,
|
||||
tabMode: "spaces"
|
||||
});
|
||||
$("#id_outputtype").val("ajax");
|
||||
var options =
|
||||
{
|
||||
target: '#difflistajax',
|
||||
beforeSubmit: function() { $("textarea#id_code").value = codeeditor.getCode().length; },
|
||||
success: function() { codeeditor.focus(); }
|
||||
};
|
||||
$('#codewikiform').ajaxForm(options); // bind form using 'ajaxForm'
|
||||
});
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<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>
|
||||
<div style="display:none">{{form.filename}} {{form.dirname}} {{form.datetime}} {{form.outputtype}}</div>
|
||||
<input type="submit" name="diff" value="Diffy" />
|
||||
<input type="submit" name="save" value="Save"/>
|
||||
<input type="submit" name="process" value="Process" title="executes cavern"/>
|
||||
</form>
|
||||
|
||||
<div id="difflistajax">
|
||||
<pre>
|
||||
{% for diffline in difflist %}{{diffline}}
|
||||
{% endfor %}
|
||||
</pre>
|
||||
|
||||
{% if logmessage %}
|
||||
{% if has_3d %}
|
||||
<p><a href="{% url threed title %}">3d file</a></p>
|
||||
{% else %}
|
||||
<p><b>No 3d file</b></p>
|
||||
{% endif %}
|
||||
<pre>
|
||||
LOGMESSAGES
|
||||
{{logmessage}}
|
||||
</pre>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,66 +1,66 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}List of survex files{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<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>
|
||||
|
||||
<h3><a href="/survexfile/all.svx">Link to all.svx for processing</a></h3>
|
||||
|
||||
<h2 id="cdir">Caves with subdirectories</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>Dates and explorers</th><th>Survex files</th></tr>
|
||||
{% for primarycavefile, subcavefiles in multifilecaves %}
|
||||
<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>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<h2 id="csing">Caves of one file</h2>
|
||||
<p>
|
||||
{% for cavepath, cavename in onefilecaves %}
|
||||
<a href="{% url svx cavepath %}">{{cavename}}</a>
|
||||
{% endfor %}
|
||||
</p>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}List of survex files{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<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>
|
||||
|
||||
<h3><a href="/survexfile/all.svx">Link to all.svx for processing</a></h3>
|
||||
|
||||
<h2 id="cdir">Caves with subdirectories</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>Dates and explorers</th><th>Survex files</th></tr>
|
||||
{% for primarycavefile, subcavefiles in multifilecaves %}
|
||||
<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>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<h2 id="csing">Caves of one file</h2>
|
||||
<p>
|
||||
{% for cavepath, cavename in onefilecaves %}
|
||||
<a href="{% url svx cavepath %}">{{cavename}}</a>
|
||||
{% endfor %}
|
||||
</p>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
<pre>
|
||||
using difflistonly.html
|
||||
{% for diffline in difflist %}{{diffline}}
|
||||
{% endfor %}
|
||||
</pre>
|
||||
|
||||
{% if logmessage %}
|
||||
{% if has_3d %}
|
||||
<p><a href="{% url threed title %}">3d file</a></p>
|
||||
{% else %}
|
||||
<p><b>No 3d file</b></p>
|
||||
{% endif %}
|
||||
<pre>
|
||||
LOGMESSAGES
|
||||
{{logmessage}}
|
||||
</pre>
|
||||
{% endif %}
|
||||
|
||||
<pre>
|
||||
using difflistonly.html
|
||||
{% for diffline in difflist %}{{diffline}}
|
||||
{% endfor %}
|
||||
</pre>
|
||||
|
||||
{% if logmessage %}
|
||||
{% if has_3d %}
|
||||
<p><a href="{% url threed title %}">3d file</a></p>
|
||||
{% else %}
|
||||
<p><b>No 3d file</b></p>
|
||||
{% endif %}
|
||||
<pre>
|
||||
LOGMESSAGES
|
||||
{{logmessage}}
|
||||
</pre>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -1,39 +1,39 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Expo member tasks</h2>
|
||||
|
||||
<h3>Add new data</h3>
|
||||
|
||||
<li><a href="">Upload a photo</a></li>
|
||||
<li><a href="">Record a new trip</a></li>
|
||||
|
||||
<h3>Your unfinished business</h3>
|
||||
{% for survey in surveys_unfinished %}
|
||||
<li>{{survey|link}}</li>
|
||||
{% endfor %}
|
||||
|
||||
<h3>General unfinished business</h3>
|
||||
add wikilinks
|
||||
|
||||
<h3>Caving recommendations</h3>
|
||||
{% for qm in qms_recommended %}
|
||||
<li>{{qm|link}}</li>
|
||||
{% endfor %}
|
||||
|
||||
<h3>Profile tasks</h3>
|
||||
|
||||
<li>Dates present on expo</li>
|
||||
<li>Mugshot</li>
|
||||
<li>Blurb</li>
|
||||
|
||||
{% endblock content %}
|
||||
|
||||
{% block margins %}
|
||||
<img class="leftMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}eieshole.jpg">
|
||||
<img class="rightMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}goesser.jpg">
|
||||
{% endblock margins %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load link %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Expo member tasks</h2>
|
||||
|
||||
<h3>Add new data</h3>
|
||||
|
||||
<li><a href="">Upload a photo</a></li>
|
||||
<li><a href="">Record a new trip</a></li>
|
||||
|
||||
<h3>Your unfinished business</h3>
|
||||
{% for survey in surveys_unfinished %}
|
||||
<li>{{survey|link}}</li>
|
||||
{% endfor %}
|
||||
|
||||
<h3>General unfinished business</h3>
|
||||
add wikilinks
|
||||
|
||||
<h3>Caving recommendations</h3>
|
||||
{% for qm in qms_recommended %}
|
||||
<li>{{qm|link}}</li>
|
||||
{% endfor %}
|
||||
|
||||
<h3>Profile tasks</h3>
|
||||
|
||||
<li>Dates present on expo</li>
|
||||
<li>Mugshot</li>
|
||||
<li>Blurb</li>
|
||||
|
||||
{% endblock content %}
|
||||
|
||||
{% block margins %}
|
||||
<img class="leftMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}eieshole.jpg">
|
||||
<img class="rightMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}goesser.jpg">
|
||||
{% endblock margins %}
|
||||
|
||||
@@ -1,61 +1,61 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>The unfinished front page</h2>
|
||||
<ul>
|
||||
<li><b>About {{totallogbookentries}} logbook entries have been loaded</b></li>
|
||||
<li><b><a href="{% url personindex %}">List of People</a></b></li>
|
||||
<li><b><a href="{% url caveindex %}">List of Caves</a></b></li>
|
||||
<li><a href="{% url jgtfile aaaa %}">JGT list of files</a> (temporary simple file list and tunnel use)</li>
|
||||
<li><a href="{% url survey %}">Survey files</a></li>
|
||||
<li><a href="{% url survexindex all %}">Survex directory</a></li>
|
||||
<li><a href="{% url expedition 2008 %}">Expedition 2008</a></li>
|
||||
<li><a href="{% url expedition 2007 %}">Expedition 2007</a></li>
|
||||
<li><a href="{% url expedition 1993 %}">Expedition 1993</a> (earliest parsed)</li>
|
||||
</ul>
|
||||
|
||||
<h2>Further work</h2>
|
||||
|
||||
<p>Please see the <a href="http://code.google.com/p/troggle/issues/list">issues</a> tracker on google code. You can contribute new feature requests and bug reports.</p>
|
||||
|
||||
<p>Julian's work:
|
||||
<p>parse 1992-1976 logbooks; (esp top 161)</p>
|
||||
<p>detect T/U on log entries; </p>
|
||||
<p>name matching and spelling in survex files; </p>
|
||||
<p>Improve logbook wikihtml text</p>
|
||||
|
||||
<p>Other work:</p>
|
||||
<p>surf through the tunnel sketches and images</p>
|
||||
<p>bugs with all.svx block (double dot)
|
||||
<p>render bitmap view of every survex block as a thumbnail</p>
|
||||
<p>upload tunnel images and tunnel sketches</p>
|
||||
<p>where are the subcaves; </p>
|
||||
<p>cave section entrance match for logbook entries</p>
|
||||
<p>simplify the survex parsing code (if necessary); </p>
|
||||
<p>wiki survex stop linegap between comment lins</p>
|
||||
<p>links between logbooks and survex blocks to cave things; </p>
|
||||
<p>mini-tree of survexblocks; </p>
|
||||
<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
|
||||
<p>all images to start appearing in pages; and so on</p>
|
||||
|
||||
<h3>{{message}}</h3>
|
||||
|
||||
<form action="" method="GET">
|
||||
<input type="submit" name="reloadexpos" value="Reload Expos">
|
||||
<input type="submit" name="reloadsurvex" value="Reload Survex">
|
||||
</form>
|
||||
|
||||
<ul id="expeditionlist">
|
||||
{% for expedition in expeditions %}
|
||||
<li>
|
||||
<a href="{% url expedition expedition.year %}">{{expedition.name}}</a>
|
||||
- <b>{{expedition.logbookentry_set.count}}</b> logbook entries
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
{% block title %}Cambridge Expeditions to Austria{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h2>The unfinished front page</h2>
|
||||
<ul>
|
||||
<li><b>About {{totallogbookentries}} logbook entries have been loaded</b></li>
|
||||
<li><b><a href="{% url personindex %}">List of People</a></b></li>
|
||||
<li><b><a href="{% url caveindex %}">List of Caves</a></b></li>
|
||||
<li><a href="{% url jgtfile aaaa %}">JGT list of files</a> (temporary simple file list and tunnel use)</li>
|
||||
<li><a href="{% url survey %}">Survey files</a></li>
|
||||
<li><a href="{% url survexindex all %}">Survex directory</a></li>
|
||||
<li><a href="{% url expedition 2008 %}">Expedition 2008</a></li>
|
||||
<li><a href="{% url expedition 2007 %}">Expedition 2007</a></li>
|
||||
<li><a href="{% url expedition 1993 %}">Expedition 1993</a> (earliest parsed)</li>
|
||||
</ul>
|
||||
|
||||
<h2>Further work</h2>
|
||||
|
||||
<p>Please see the <a href="http://code.google.com/p/troggle/issues/list">issues</a> tracker on google code. You can contribute new feature requests and bug reports.</p>
|
||||
|
||||
<p>Julian's work:
|
||||
<p>parse 1992-1976 logbooks; (esp top 161)</p>
|
||||
<p>detect T/U on log entries; </p>
|
||||
<p>name matching and spelling in survex files; </p>
|
||||
<p>Improve logbook wikihtml text</p>
|
||||
|
||||
<p>Other work:</p>
|
||||
<p>surf through the tunnel sketches and images</p>
|
||||
<p>bugs with all.svx block (double dot)
|
||||
<p>render bitmap view of every survex block as a thumbnail</p>
|
||||
<p>upload tunnel images and tunnel sketches</p>
|
||||
<p>where are the subcaves; </p>
|
||||
<p>cave section entrance match for logbook entries</p>
|
||||
<p>simplify the survex parsing code (if necessary); </p>
|
||||
<p>wiki survex stop linegap between comment lins</p>
|
||||
<p>links between logbooks and survex blocks to cave things; </p>
|
||||
<p>mini-tree of survexblocks; </p>
|
||||
<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
|
||||
<p>all images to start appearing in pages; and so on</p>
|
||||
|
||||
<h3>{{message}}</h3>
|
||||
|
||||
<form action="" method="GET">
|
||||
<input type="submit" name="reloadexpos" value="Reload Expos">
|
||||
<input type="submit" name="reloadsurvex" value="Reload Survex">
|
||||
</form>
|
||||
|
||||
<ul id="expeditionlist">
|
||||
{% for expedition in expeditions %}
|
||||
<li>
|
||||
<a href="{% url expedition expedition.year %}">{{expedition.name}}</a>
|
||||
- <b>{{expedition.logbookentry_set.count}}</b> logbook entries
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,43 +1,43 @@
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}Tunnel files{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>All Tunnel files</h3>
|
||||
<table>
|
||||
<tr><th>File</th><th>Font</th><th>SurvexBlocks</th><th>Size</th><th>Paths</th><th>Scans folder</th><th>Scan files</th><th>Frames</th></tr>
|
||||
{% for tunnelfile in tunnelfiles %}
|
||||
<tr>
|
||||
<td><a href="{% url tunnelfile tunnelfile.tunnelpath %}">{{tunnelfile.tunnelpath}}</a></td>
|
||||
<td>{{tunnelfile.bfontcolours}}</td>
|
||||
<td></td>
|
||||
<td>{{tunnelfile.filesize}}</td>
|
||||
<td>{{tunnelfile.npaths}}</td>
|
||||
|
||||
<td>
|
||||
{% for survexscansfolder in tunnelfile.survexscansfolders.all %}
|
||||
<a href="{{survexscansfolder.get_absolute_url}}">{{survexscansfolder.walletname}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% for survexscansingle in tunnelfile.survexscans.all %}
|
||||
<a href="{{survexscansingle.get_absolute_url}}">{{survexscansingle.name}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% for rtunnelfile in tunnelfile.tunnelcontains.all %}
|
||||
<a href="{% url tunnelfile rtunnelfile.tunnelpath %}">{{rtunnelfile.tunnelpath}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
{% load survex_markup %}
|
||||
|
||||
{% block title %}Tunnel files{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>All Tunnel files</h3>
|
||||
<table>
|
||||
<tr><th>File</th><th>Font</th><th>SurvexBlocks</th><th>Size</th><th>Paths</th><th>Scans folder</th><th>Scan files</th><th>Frames</th></tr>
|
||||
{% for tunnelfile in tunnelfiles %}
|
||||
<tr>
|
||||
<td><a href="{% url tunnelfile tunnelfile.tunnelpath %}">{{tunnelfile.tunnelpath}}</a></td>
|
||||
<td>{{tunnelfile.bfontcolours}}</td>
|
||||
<td></td>
|
||||
<td>{{tunnelfile.filesize}}</td>
|
||||
<td>{{tunnelfile.npaths}}</td>
|
||||
|
||||
<td>
|
||||
{% for survexscansfolder in tunnelfile.survexscansfolders.all %}
|
||||
<a href="{{survexscansfolder.get_absolute_url}}">{{survexscansfolder.walletname}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% for survexscansingle in tunnelfile.survexscans.all %}
|
||||
<a href="{{survexscansingle.get_absolute_url}}">{{survexscansingle.name}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% for rtunnelfile in tunnelfile.tunnelcontains.all %}
|
||||
<a href="{% url tunnelfile rtunnelfile.tunnelpath %}">{{rtunnelfile.tunnelpath}}</a>
|
||||
{% endfor %}
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user