mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2024-11-25 08:41:51 +00:00
[svn] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8164 by aaron @ 1/17/2009 7:11 AM
This commit is contained in:
substantialnoninfringinguser
parent
f02c91901c
commit
b2366cfe11
@ -8,12 +8,15 @@ class RoleInline(admin.TabularInline):
|
||||
class SurvexBlockAdmin(admin.ModelAdmin):
|
||||
inlines = (RoleInline,)
|
||||
|
||||
class SurveyInline(admin.TabularInline):
|
||||
class ScannedImageInline(admin.TabularInline):
|
||||
model = ScannedImage
|
||||
extra = 4
|
||||
|
||||
class SurveyAdmin(admin.ModelAdmin):
|
||||
inlines = (SurveyInline,)
|
||||
inlines = (ScannedImageInline,)
|
||||
|
||||
class LogbookEntryAdmin(admin.ModelAdmin):
|
||||
search_fields = ('title',)
|
||||
|
||||
admin.site.register(Photo)
|
||||
admin.site.register(Cave)
|
||||
@ -28,7 +31,7 @@ admin.site.register(Person)
|
||||
admin.site.register(PersonRole)
|
||||
admin.site.register(PersonExpedition)
|
||||
admin.site.register(Role)
|
||||
admin.site.register(LogbookEntry)
|
||||
admin.site.register(LogbookEntry, LogbookEntryAdmin)
|
||||
admin.site.register(PersonTrip)
|
||||
admin.site.register(QM)
|
||||
admin.site.register(Survey, SurveyAdmin)
|
||||
|
||||
@ -4,7 +4,7 @@ import troggle.settings as settings
|
||||
from django import forms
|
||||
from django.db.models import Q
|
||||
import re
|
||||
#import randSent (it's not ready yet)
|
||||
import randSent
|
||||
|
||||
def stats(request):
|
||||
statsDict={}
|
||||
@ -14,6 +14,6 @@ def stats(request):
|
||||
statsDict['logbookEntryCount'] = int(LogbookEntry.objects.count())
|
||||
return render_to_response('statistics.html', statsDict)
|
||||
|
||||
#def frontPage(request):
|
||||
def frontPage(request):
|
||||
|
||||
# return render_to_response('index.html', {'randSent':randSent.randomLogbookSentence(),'settings':settings})
|
||||
return render_to_response('index.html', {'randSent':randSent.randomLogbookSentence(),'settings':settings})
|
||||
@ -3,27 +3,66 @@
|
||||
.plus2pt { font-size: 160%; }
|
||||
|
||||
body, td, center, ul, p, input {
|
||||
color: rgb(204, 204, 102);
|
||||
color: rgb(0, 0, 0);
|
||||
font-family: sans-serif;
|
||||
}
|
||||
body {
|
||||
background-color: #000;
|
||||
background-color: #FFFFFF;
|
||||
font: 100% Verdana, Arial, Helvetica, sans-serif;
|
||||
background: #666666;
|
||||
margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */
|
||||
padding: 0;
|
||||
text-align: center; /* this centers the container in IE 5* browsers. The text is then set to the left aligned default in the #container selector */
|
||||
color: #000000;
|
||||
}
|
||||
#expoHeader {
|
||||
position: relative;
|
||||
display: inline;
|
||||
top:60px;
|
||||
width:100%;
|
||||
position:relative;
|
||||
left:0;
|
||||
right:0;
|
||||
height:100px;
|
||||
}
|
||||
#currentLocation {
|
||||
float:right;
|
||||
background:#999;
|
||||
line-height: 80%;
|
||||
font-variant: small-caps;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
#expoHeaderText {
|
||||
background:#999;
|
||||
position:absolute;
|
||||
bottom:0px;
|
||||
clip:rect(10px auto auto auto)
|
||||
/* filter:alpha(opacity=90);
|
||||
-moz-opacity:.90;
|
||||
opacity:.90; */
|
||||
}
|
||||
|
||||
hr{
|
||||
margin:0;
|
||||
padding:0;
|
||||
height:1px;
|
||||
border:thin solid #000;
|
||||
border:#000;
|
||||
color:#000;
|
||||
background:#000;
|
||||
}
|
||||
|
||||
#expoHeader h1{
|
||||
position:relative;
|
||||
bottom:-8px;
|
||||
vertical-align:top;
|
||||
}
|
||||
|
||||
#expoFinalDate {
|
||||
display: inline;
|
||||
}
|
||||
h1 {
|
||||
display: inline;
|
||||
}
|
||||
a:link, a:visited { text-decoration: none; }
|
||||
|
||||
div.centre img { vertical-align: middle; }
|
||||
|
||||
h1 { text-align: center; font-size: 210%; opacity:0.7; filter:alpha(opacity=70);}
|
||||
h1 { text-align: center; font-size: 210%; display: inline;}
|
||||
h2 { color: #009900; }
|
||||
h3 { color: #2c105e; }
|
||||
h4 { color: #0d664c; }
|
||||
@ -105,3 +144,113 @@ table#cavepage th#status { text-align: right; width: 25%; }
|
||||
|
||||
.command { color: #FF0000; }
|
||||
.comment { color: #888888; font-style:italic;}
|
||||
|
||||
/* Fron dreamweaver template */
|
||||
body {
|
||||
|
||||
}
|
||||
.twoColHybLtHdr #container {
|
||||
width: 80%; /* this will create a container 80% of the browser width */
|
||||
background: #FFFFFF;
|
||||
margin: 0 auto; /* the auto margins (in conjunction with a width) center the page */
|
||||
border: 1px solid #000000;
|
||||
text-align: left; /* this overrides the text-align: center on the body element. */
|
||||
}
|
||||
.thumbnail {
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
table {
|
||||
border: thin solid silver;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
td {
|
||||
padding:0px;
|
||||
border: thin solid silver;
|
||||
}
|
||||
.twoColHybLtHdr #header h1 {
|
||||
margin: 0; /* zeroing the margin of the last element in the #header div will avoid margin collapse - an unexplainable space between divs. If the div has a border around it, this is not necessary as that also avoids the margin collapse */
|
||||
padding: 10px 0; /* using padding instead of margin will allow you to keep the element away from the edges of the div */
|
||||
}
|
||||
/* Tips for sidebar1:
|
||||
1. Since we are working in relative units, it's best not to use padding on the sidebar. It will be added to the overall width for standards compliant browsers creating an unknown actual width.
|
||||
2. Since em units are used for the sidebar value, be aware that its width will vary with different default text sizes.
|
||||
3. Space between the side of the div and the elements within it can be created by placing a left and right margin on those elements as seen in the ".twoColHybLtHdr #sidebar1 p" rule.
|
||||
*/
|
||||
.twoColHybLtHdr #sidebar1 {
|
||||
float: left;
|
||||
width: 12em; /* since this element is floated, a width must be given */
|
||||
background: #EBEBEB; /* the background color will be displayed for the length of the content in the column, but no further */
|
||||
padding: 15px 0; /* top and bottom padding create visual space within this div */
|
||||
}
|
||||
.twoColHybLtHdr #sidebar1 h3, .twoColHybLtHdr #sidebar1 p {
|
||||
margin-left: 10px; /* the left and right margin should be given to every element that will be placed in the side columns */
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.twoColHybLtHdr #mainContent {
|
||||
margin: 0 20px 0 13em; /* the right margin can be given in percentages or pixels. It creates the space down the right side of the page. */
|
||||
}
|
||||
.twoColHybLtHdr #footer {
|
||||
padding: 0 10px; /* this padding matches the left alignment of the elements in the divs that appear above it. */
|
||||
background:#DDDDDD;
|
||||
}
|
||||
.twoColHybLtHdr #footer p {
|
||||
margin: 0; /* zeroing the margins of the first element in the footer will avoid the possibility of margin collapse - a space between divs */
|
||||
padding: 10px 0; /* padding on this element will create space, just as the the margin would have, without the margin collapse issue */
|
||||
}
|
||||
/* Miscellaneous classes for reuse */
|
||||
.fltrt { /* this class can be used to float an element right in your page. The floated element must precede the element it should be next to on the page. */
|
||||
float: right;
|
||||
margin-left: 8px;
|
||||
}
|
||||
.fltlft { /* this class can be used to float an element left in your page */
|
||||
float: left;
|
||||
margin-right: 8px;
|
||||
}
|
||||
.clearfloat { /* this class should be placed on a div or break element and should be the final element before the close of a container that should fully contain a float */
|
||||
clear:both;
|
||||
height:0;
|
||||
font-size: 1px;
|
||||
line-height: 0px;
|
||||
}
|
||||
.menuBarItem {
|
||||
font-variant: small-caps;
|
||||
text-align: right;
|
||||
border-top-style: none;
|
||||
border-right-style: none;
|
||||
border-bottom-style: none;
|
||||
border-left-style: none;
|
||||
border-top-width: thin;
|
||||
border-right-width: thin;
|
||||
border-bottom-width: thin;
|
||||
border-left-width: thin;
|
||||
}
|
||||
.behind {
|
||||
display: none;
|
||||
}
|
||||
div.figure {
|
||||
float: left;
|
||||
width: 25%;
|
||||
border: thin silver solid;
|
||||
margin: 0.5em;
|
||||
padding: 0.5em;
|
||||
}
|
||||
div.figure p {
|
||||
text-align: left;
|
||||
font-size: smaller;
|
||||
text-indent: 0;
|
||||
}
|
||||
img.thumbnail {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
</style>
|
||||
[if IE]>
|
||||
<style type="text/css">
|
||||
/* place css fixes for all versions of IE in this conditional comment */
|
||||
.twoColHybLtHdr #sidebar1 { padding-top: 30px; }
|
||||
.twoColHybLtHdr #mainContent { zoom: 1; padding-top: 15px; }
|
||||
/* the above proprietary zoom property gives IE the hasLayout it may need to avoid several bugs */
|
||||
</style>
|
||||
<![endif]
|
||||
|
||||
@ -4,73 +4,38 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
|
||||
<title>{% block title %}{% endblock %}</title>
|
||||
<!-- script to toggle navbar -->
|
||||
|
||||
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
|
||||
{% block javascript %}{% endblock %}
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<body onLoad="fadeText()">
|
||||
<img src="{{ settings.MEDIA_URL }}loserBanner.jpg" style="width:100%;position:absolute; z-index:-4;width:100%;left:0;right:0;height:100px">
|
||||
<div id="expoHeader" style="display:inline;">
|
||||
<h1>CUCC Expeditions to Austria: 1976 - </h1>
|
||||
<div id="expoFinalDate" style="display:inline;" >
|
||||
<h1>1976</h1>
|
||||
<div style="float:none">
|
||||
<div id="expoHeader" style="background:#222"> <img src="{{ settings.MEDIA_URL }}loserBanner.jpg" style="position:relative;width:inherit;height:inherit;"/>
|
||||
<div id="expoHeaderText">
|
||||
<h1>CUCC Expeditions to Austria: 1976 - </h1>
|
||||
<div id="expoFinalDate" style="display:inline;" >
|
||||
<h1>1976</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
<div id="editLink" style="right:0px; top:0px; text-align: right; position: absolute; top:0; right:0; z-index:1; background:#999">
|
||||
{% block editLink %}
|
||||
not editable
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
<p> </p>
|
||||
<p> </p>
|
||||
<p> </p>
|
||||
<center><iframe src="{{ settings.MEDIA_URL }}intro.html" style="height:600px; width:800px; border:hidden"></iframe></center>
|
||||
<div id="nav" style="float:left; top:200; background:#999; width:200; height:100%"> {% block nav %}
|
||||
|
||||
{% endblock %} </div>
|
||||
|
||||
</body>
|
||||
|
||||
<div id="editLink" style="right:0px; top:0px; text-align: right; position: absolute; top:0; right:0; z-index:1">
|
||||
{% block editLink %}not editable
|
||||
{% endblock %}
|
||||
</div>
|
||||
<div id="bottomRight" style="position:absolute;right:0;bottom:0">
|
||||
<img src="{{ settings.MEDIA_URL }}SilkRoadsilouetteAndrew.png" id="bridge" style="position:absolute; right:60px; bottom:0;z-index:-1;">
|
||||
{% block lgbkQuote %}{% endblock %}
|
||||
</div>
|
||||
|
||||
<div id="headerBackBar" style="background-color:#CCCC66; position:absolute; left:0; right:0; z-index:-2; top:60px; opacity:0.7; filter:alpha(opacity=70);height:75px; color:#000000; text-indent:100px">
|
||||
<p>
|
||||
<br>
|
||||
<div id="currentLocation"> <br>
|
||||
{% block currentLocation %}
|
||||
Welcome to the website of the Cambridge University Caving Club's expeditions to Austria.
|
||||
{% endblock %}
|
||||
</p>
|
||||
</div>
|
||||
<div class="contents">
|
||||
<div class="main"> {% block content %}{% endblock %} </div>
|
||||
{% endblock %} </div>
|
||||
<div class="content"> {% block content %}
|
||||
{% endblock %} </div>
|
||||
{% block footer %}
|
||||
<div class="footer" id="footerHidden">
|
||||
<h4><a href="javascript:;" onMouseDown="showDiv('footerHidden','footerShowing');">[Show Troggle Navigation / Search]</a></h4>
|
||||
</div>
|
||||
<div class="footer" id="footerShowing" style="background-color:#CCC; display:none">
|
||||
<h4 class="navbar"> Troggle navigation <a href="javascript:;" onMouseDown="hideDiv('footerHidden','footerShowing');">[Hide]</a> or <a href="javascript:;" onMouseDown="makeDivTransparent('footerShowing');">[Make transparent]</a>
|
||||
</align>
|
||||
</h4>
|
||||
<table class="normal">
|
||||
<tr>
|
||||
<td rowspan="2"><a href="{{ settings.URL_ROOT }}cave">list caves</a> or
|
||||
<form name="input" action="{{ settings.URL_ROOT }}cavesearch" method="get">
|
||||
<input type="text" name="q" value="search caves">
|
||||
<input type="submit" value="Submit">
|
||||
</form></td>
|
||||
<td rowspan="2"><a href="{{ settings.URL_ROOT }}logbookentry">list logbook entries</a> or
|
||||
<form name="input" action="{{ settings.URL_ROOT }}logbooksearch" method="get">
|
||||
<input type="text" name="q" value="search logbooks">
|
||||
<input type="submit" value="Submit">
|
||||
</form></td>
|
||||
<td><a href="{{ settings.URL_ROOT }}person">list cavers</a></td>
|
||||
<td><a href="{{ settings.URL_ROOT }}statistics"> statistics</a></td>
|
||||
<tr>
|
||||
<td><a href="{{ settings.URL_ROOT }}photos">photos</a></td>
|
||||
<td><a href="{{ settings.URL_ROOT }}admin"> admin</a></td>
|
||||
</table>
|
||||
</div>
|
||||
<p>{% endblock %}</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -1,137 +1,19 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>Untitled Document</title>
|
||||
<style type="text/css">
|
||||
<!--
|
||||
body {
|
||||
font: 100% Verdana, Arial, Helvetica, sans-serif;
|
||||
background: #666666;
|
||||
margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */
|
||||
padding: 0;
|
||||
text-align: center; /* this centers the container in IE 5* browsers. The text is then set to the left aligned default in the #container selector */
|
||||
color: #000000;
|
||||
}
|
||||
.twoColHybLtHdr #container {
|
||||
width: 80%; /* this will create a container 80% of the browser width */
|
||||
background: #FFFFFF;
|
||||
margin: 0 auto; /* the auto margins (in conjunction with a width) center the page */
|
||||
border: 1px solid #000000;
|
||||
text-align: left; /* this overrides the text-align: center on the body element. */
|
||||
}
|
||||
.thumbnail {
|
||||
width: 300px;
|
||||
}
|
||||
.twoColHybLtHdr #header {
|
||||
background: #DDDDDD;
|
||||
padding: 0 10px; /* this padding matches the left alignment of the elements in the divs that appear beneath it. If an image is used in the #header instead of text, you may want to remove the padding. */
|
||||
}
|
||||
table {
|
||||
border: thin solid silver;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
td {
|
||||
padding:0px;
|
||||
border: thin solid silver;
|
||||
}
|
||||
.twoColHybLtHdr #header h1 {
|
||||
margin: 0; /* zeroing the margin of the last element in the #header div will avoid margin collapse - an unexplainable space between divs. If the div has a border around it, this is not necessary as that also avoids the margin collapse */
|
||||
padding: 10px 0; /* using padding instead of margin will allow you to keep the element away from the edges of the div */
|
||||
}
|
||||
/* Tips for sidebar1:
|
||||
1. Since we are working in relative units, it's best not to use padding on the sidebar. It will be added to the overall width for standards compliant browsers creating an unknown actual width.
|
||||
2. Since em units are used for the sidebar value, be aware that its width will vary with different default text sizes.
|
||||
3. Space between the side of the div and the elements within it can be created by placing a left and right margin on those elements as seen in the ".twoColHybLtHdr #sidebar1 p" rule.
|
||||
*/
|
||||
.twoColHybLtHdr #sidebar1 {
|
||||
float: left;
|
||||
width: 12em; /* since this element is floated, a width must be given */
|
||||
background: #EBEBEB; /* the background color will be displayed for the length of the content in the column, but no further */
|
||||
padding: 15px 0; /* top and bottom padding create visual space within this div */
|
||||
}
|
||||
.twoColHybLtHdr #sidebar1 h3, .twoColHybLtHdr #sidebar1 p {
|
||||
margin-left: 10px; /* the left and right margin should be given to every element that will be placed in the side columns */
|
||||
margin-right: 10px;
|
||||
}
|
||||
/* Tips for mainContent:
|
||||
1. The space between the mainContent and sidebar1 is created with the left margin on the mainContent div. No matter how much content the sidebar1 div contains, the column space will remain. You can remove this left margin if you want the #mainContent div's text to fill the #sidebar1 space when the content in #sidebar1 ends.
|
||||
2. Be aware it is possible to cause float drop (the dropping of the non-floated mainContent area below the sidebar) if an element wider than it can contain is placed within the mainContent div. WIth a hybrid layout (percentage-based overall width with em-based sidebar), it may not be possible to calculate the exact width available. If the user's text size is larger than average, you will have a wider sidebar div and thus, less room in the mainContent div. You should be aware of this limitation - especially if the client is adding content with Contribute.
|
||||
3. In the Internet Explorer Conditional Comment below, the zoom property is used to give the mainContent "hasLayout." This may help avoid several IE-specific bugs.
|
||||
*/
|
||||
.twoColHybLtHdr #mainContent {
|
||||
margin: 0 20px 0 13em; /* the right margin can be given in percentages or pixels. It creates the space down the right side of the page. */
|
||||
}
|
||||
.twoColHybLtHdr #footer {
|
||||
padding: 0 10px; /* this padding matches the left alignment of the elements in the divs that appear above it. */
|
||||
background:#DDDDDD;
|
||||
}
|
||||
.twoColHybLtHdr #footer p {
|
||||
margin: 0; /* zeroing the margins of the first element in the footer will avoid the possibility of margin collapse - a space between divs */
|
||||
padding: 10px 0; /* padding on this element will create space, just as the the margin would have, without the margin collapse issue */
|
||||
}
|
||||
/* Miscellaneous classes for reuse */
|
||||
.fltrt { /* this class can be used to float an element right in your page. The floated element must precede the element it should be next to on the page. */
|
||||
float: right;
|
||||
margin-left: 8px;
|
||||
}
|
||||
.fltlft { /* this class can be used to float an element left in your page */
|
||||
float: left;
|
||||
margin-right: 8px;
|
||||
}
|
||||
.clearfloat { /* this class should be placed on a div or break element and should be the final element before the close of a container that should fully contain a float */
|
||||
clear:both;
|
||||
height:0;
|
||||
font-size: 1px;
|
||||
line-height: 0px;
|
||||
}
|
||||
.menuBarItem {
|
||||
font-variant: small-caps;
|
||||
text-align: right;
|
||||
border-top-style: none;
|
||||
border-right-style: none;
|
||||
border-bottom-style: none;
|
||||
border-left-style: none;
|
||||
border-top-width: thin;
|
||||
border-right-width: thin;
|
||||
border-bottom-width: thin;
|
||||
border-left-width: thin;
|
||||
}
|
||||
.behind {
|
||||
display: none;
|
||||
}
|
||||
div.figure {
|
||||
float: left;
|
||||
width: 25%;
|
||||
border: thin silver solid;
|
||||
margin: 0.5em;
|
||||
padding: 0.5em;
|
||||
}
|
||||
div.figure p {
|
||||
text-align: left;
|
||||
font-size: smaller;
|
||||
text-indent: 0;
|
||||
}
|
||||
img.thumbnail {
|
||||
width: 100%;
|
||||
}
|
||||
-->
|
||||
</style>
|
||||
<!--[if IE]>
|
||||
<style type="text/css">
|
||||
/* place css fixes for all versions of IE in this conditional comment */
|
||||
.twoColHybLtHdr #sidebar1 { padding-top: 30px; }
|
||||
.twoColHybLtHdr #mainContent { zoom: 1; padding-top: 15px; }
|
||||
/* the above proprietary zoom property gives IE the hasLayout it may need to avoid several bugs */
|
||||
</style>
|
||||
<![endif]-->
|
||||
{% extends "base.html" %}
|
||||
{% load wiki_markup %}
|
||||
|
||||
|
||||
{% block title %}CUCC Virtual Survey Binder: {{ current_expedition }}{{ current_survey }}{%endblock%}
|
||||
{% block javascript %}
|
||||
|
||||
<script language="javascript">
|
||||
blankColor = "rgb(153, 153, 153)"
|
||||
highlightedColor = "rgb(125, 125, 125)"
|
||||
chosenColor = "rgb(102, 102, 102)"
|
||||
mnuItmLst=document.getElementsByClassName("menuBarItem")
|
||||
function highlight(div){
|
||||
for (var i = 0, divIter; divIter = mnuItmLst[i]; i++) {
|
||||
if (divIter.style.backgroundColor!="rgb(102, 102, 102)"){
|
||||
divIter.style.backgroundColor="#EBEBEB";
|
||||
divIter.style.backgroundColor=blankColor;
|
||||
}
|
||||
}
|
||||
if (div.style.backgroundColor!="rgb(102, 102, 102)"){
|
||||
@ -140,8 +22,8 @@ img.thumbnail {
|
||||
}
|
||||
|
||||
function unhighlight(div){
|
||||
if (div.style.backgroundColor=="#EBEBEB"){
|
||||
div.style.backgroundColor="#EBEBEB";
|
||||
if (div.style.backgroundColor!=blankColor){
|
||||
div.style.backgroundColor=blankColor;
|
||||
}
|
||||
}
|
||||
|
||||
@ -151,12 +33,13 @@ img.thumbnail {
|
||||
}
|
||||
document.getElementById(div.id+"Content").style.display="block";
|
||||
for (var i = 0, divIter; divIter = mnuItmLst[i]; i++) {
|
||||
document.getElementById(divIter.id).style.backgroundColor="#EBEBEB";
|
||||
document.getElementById(divIter.id).style.backgroundColor=blankColor;
|
||||
}
|
||||
div.style.backgroundColor="#666666";
|
||||
div.style.backgroundColor=chosenColor;
|
||||
document.getElementById(progressTableContent).style.display="none";
|
||||
}
|
||||
|
||||
function redirect(){
|
||||
function redirectSurvey(){
|
||||
window.location = "{{ settings.URL_ROOT }}/survey/" + document.getElementById("expeditionChooser").value + "%23" + document.getElementById("surveyChooser").value;
|
||||
document.getElementById("progressTableContent").style.display='hidden'
|
||||
}
|
||||
@ -164,46 +47,53 @@ img.thumbnail {
|
||||
function redirectYear(){
|
||||
window.location = "{{ settings.URL_ROOT }}/survey/" + document.getElementById("expeditionChooser").value + "%23"
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
</head>
|
||||
{% endblock %}
|
||||
|
||||
<body class="twoColHybLtHdr">
|
||||
<div id="header">
|
||||
<h1>CUCC Expo virtual survey binder</h1>
|
||||
<!-- end #header -->
|
||||
</div>
|
||||
{% block currentLocation %}
|
||||
CUCC Expo virtual survey binder:
|
||||
{% if current_survey %}
|
||||
{{current_survey}}
|
||||
{% else %}
|
||||
{{current_year }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block nav %}
|
||||
<div id="sidebar1">
|
||||
<h3>Survey Stages for {{ current_survey }}</h3>
|
||||
<br />
|
||||
|
||||
<select id="expeditionChooser" onchange="redirectYear()">
|
||||
{% for expedition in expeditions %}
|
||||
<option label="{{ expedition }}" value="{{ expedition }}"
|
||||
|
||||
{% for expedition in expeditions.reverse %}
|
||||
|
||||
<option label="{{ expedition }}" value="{{ expedition }}"
|
||||
{% ifequal expedition current_expedition %}
|
||||
selected
|
||||
{% endifequal %} >
|
||||
|
||||
{{ expedition }}
|
||||
|
||||
</option>
|
||||
|
||||
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
|
||||
</select>
|
||||
<select id="surveyChooser" onchange="redirectSurvey()">
|
||||
<option label="show all" value="">
|
||||
{% for survey in current_expedition.survey_set.all %}
|
||||
<option label="{{ survey }}" value="{{ survey.wallet_number }}"
|
||||
<option label="show all" value=""> {% for survey in current_expedition.survey_set.all %}
|
||||
<option label="{{ survey }}" value="{{ survey.wallet_number }}"
|
||||
{% ifequal survey current_survey %}
|
||||
selected
|
||||
{% endifequal %} >
|
||||
{{ survey }}
|
||||
</option>
|
||||
{{ survey }} </option>
|
||||
|
||||
|
||||
{% endfor %}
|
||||
<option label="add" value="add">
|
||||
|
||||
<option label="add" value="add">
|
||||
</select>
|
||||
|
||||
<div id="status">
|
||||
<div id="notes" class="menuBarItem" onmouseover="highlight(this)" onmouseout="unhighlight(this)" onclick="choose(this)"> {% if notes %}✓{% endif %}
|
||||
scanned notes </div>
|
||||
@ -216,137 +106,83 @@ img.thumbnail {
|
||||
<div id="tunnelXMLfile" class="menuBarItem" onmouseover="highlight(this)" onmouseout="unhighlight(this)" onclick="choose(this)">tunnel xml file</div>
|
||||
<div id="mainSketchIntegration" class="menuBarItem" onmouseover="highlight(this)" onmouseout="unhighlight(this)" onclick="choose(this)">add to main sketch</div>
|
||||
</div>
|
||||
|
||||
<!-- end #sidebar1 -->
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="mainContent">
|
||||
<div id="progressTableContent" class="behind" style="display:block;">
|
||||
<h3>
|
||||
Status of surveys from {{ current_expedition }}
|
||||
</h3>
|
||||
<table>
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
<div id="progressTableContent" class="behind" style="display:block;">
|
||||
<table>
|
||||
<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>
|
||||
</div>
|
||||
|
||||
<div id="notesContent" class="behind">
|
||||
<h3>Scanned notes for {{ current_survey }}.</h3>
|
||||
|
||||
{% for noteItem in notes %}
|
||||
<div class="figure">
|
||||
<p>
|
||||
<img src="{{ noteItem.correctURL }}" 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> (to be improved)
|
||||
|
||||
</div>
|
||||
<div id="notesContent" class="behind">
|
||||
<h3>Scanned notes for {{ current_survey }}.</h3>
|
||||
{% for noteItem in notes %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ noteItem.correctURL }}" 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> (to be improved) </div>
|
||||
</div>
|
||||
|
||||
<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.correctURL }}" 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 notes page.
|
||||
</a> (to be improved)
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<h3>Scanned plan sketch files for {{ current_survey }}.</h3>
|
||||
{% for sketchItem in planSketches %}
|
||||
<div class="figure">
|
||||
<p> <img src="{{ sketchItem.correctURL }}" 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 notes page. </a> (to be improved) </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" />
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
{% endblock %}
|
||||
Loading…
Reference in New Issue
Block a user