From 22aa9990a5944230223f3724fa48d68cfeae8435 Mon Sep 17 00:00:00 2001
From: martin speleo <martin.speleo@gmail.com>
Date: Sun, 28 Jun 2009 22:23:56 +0100
Subject: [PATCH] [svn] Have different css for plain and eye candy views.
---
media/css/mainplain.css | 408 ++++++++++++++++++++++++++++++++++++++++
media/js/base.js | 19 +-
templates/base.html | 3 +-
3 files changed, 426 insertions(+), 4 deletions(-)
create mode 100644 media/css/mainplain.css
diff --git a/media/css/mainplain.css b/media/css/mainplain.css
new file mode 100644
index 0000000..38eef59
--- /dev/null
+++ b/media/css/mainplain.css
@@ -0,0 +1,408 @@
+html, body {
+ height: 100%;
+}
+
+
+.caption { font-size: 8pt; margin-bottom: 0pt; }
+.centre { text-align: center; }
+.plus2pt { font-size: 160%; }
+
+ul
+{
+ list-style: none;
+}
+
+div.logbookentry
+{
+ text-align:left;
+}
+div.logbookentry ul.cavers
+{
+ float:left;
+ padding-left:20px;
+ padding-right:10px;
+ margin-top:0px;
+}
+td.author
+{
+ background-color:yellow;
+}
+
+div.logbookentry p
+{
+ margin:10px;
+}
+
+
+div#content div#col2
+{
+ float:right;
+ width:33%;
+ background-color:#feeeed;
+}
+
+div#content h2
+{
+ text-align:center;
+ font-size:200%;
+ padding-bottom:30px;
+}
+
+table.prevnextexpeditions
+{
+ width:100%;
+}
+
+table.prevnextexpeditions td
+{
+ padding: 2px;
+}
+
+table.expeditionpersonlist
+{
+ width:100%;
+}
+
+table.expeditionpersonlist td
+{
+ padding: 2px;
+}
+
+div#content div#col1
+{
+ width:66%;
+}
+table.expeditionlogbooks td
+{
+ padding: 2px;
+}
+
+ul#expeditionlist
+{
+ width: 300px
+}
+
+div.survexblock
+{
+ width:50%;
+ background-color:#e0e0e0;
+}
+p.indent
+{
+ margin-left:10px;
+}
+
+
+#currentLocation {
+ float:right;
+ background:#999;
+ line-height: 80%;
+ font-variant: small-caps;
+ margin: 0px;
+ padding: 0px;
+}
+
+
+
+hr{
+ margin:0;
+ padding:0;
+ height:1px;
+ border:thin solid #000;
+ border:#000;
+ color:#000;
+ background:#000;
+}
+
+div.centre img { vertical-align: middle; }
+
+h1 { text-align: center; font-size: 210%; display: inline;}
+h2 { }
+h3 { color: #000 text-align:left; border-bottom:thin solid black; margin-bottom:1em; margin-top:1em; font-weight:bold}
+h4 { color: #0d664c; }
+h4.navbar {line-height: 0px;}
+img.onright, div.onright { vertical-align: top; float: right;
+ margin-left: 10pt; margin-bottom: 10pt;
+ margin-right: 8pt; }
+img.onleft, div.onleft { vertical-align: top; float: left;
+ margin-right: 10pt; margin-bottom: 10pt;
+ margin-left: 8pt; }
+img.icon { vertical-align: middle; }
+img.aligntop { vertical-align: top; }
+blockquote {
+ font: Georgia, "Times New Roman", Times, serif;
+ font-weight:bold;
+ font-variant:small-caps;
+ width: 400px;
+ background: url(../close-quote.gif) no-repeat right bottom;
+ padding-left: 25px;
+ text-indent: -25px;
+ text-align: right;
+ vertical-align:bottom;
+ color:#CCCC66;
+}
+blockquote:first-letter {
+ background: url(../open-quote.gif) no-repeat left top;
+ padding-left: 40px;
+ font: italic 1.4em Georgia, "Times New Roman", Times, serif;
+}
+table.imgtable { margin-left: auto; margin-right: auto; }
+table.imgtable td { vertical-align: middle; text-align: center;
+ padding: 10px; }
+
+table.normal { border: thin; border-top:solid ; border-left:dotted ; border-bottom:dotted; border-right:hidden ; border-width:1px;}
+table.normal td { border: thin; border-right:dotted ; border-width:1px; border-spacing:0px }
+table.normal th { border-left:thin ; border-right:thin ; text-align: left}
+
+/* "Traditional" table with borders.*/
+table.trad { margin: 0pt; border: 1px solid #000;
+ border-color: #c0c0c0 #8d8d8d #8d8d8d #c0c0c0; }
+table.bigfatborder { border-width: 6px; }
+table.trad td, table.trad th { margin: 0pt; border: 1px solid #aaa;
+ border-color: #8d8d8d #c0c0c0 #c0c0c0 #8d8d8d; }
+
+
+/* You are not expected to understand this. It is necessary. */
+/* The above is the most fucktarded comment I have ever read :-) AC, 24 APR 2009 */
+table.centre { margin-left: auto; margin-right: auto; }
+table.centre td { text-align: left; }
+
+h2#tophead { text-align: center; margin-bottom: -10pt; }
+table#cavepage { width: 100%; font-size: 160%; }
+table#cavepage th#kat_no { text-align: left; width: 25%; }
+table#cavepage th#name { text-align: center; width: 50%; }
+table#cavepage th#status { text-align: right; width: 25%; }
+
+.command { color: #FF0000; }
+.comment { color: #888888; font-style:italic;}
+
+.thumbnail {
+ width: 300px;
+}
+
+table {
+ border: thin solid silver;
+ border-collapse: collapse;
+}
+td {
+ padding:0px;
+ border: thin solid silver;
+}
+
+
+.redtext{
+ color:#F00;
+ }
+
+a.redtext:link {
+ color:#F00;
+
+}
+
+
+
+
+.behind {
+ display: none;
+}
+div.figure {
+ width: 20%;
+ border: thin white solid;
+ margin: 0.5em;
+ padding: 0.5em;
+ display: inline;
+ float: left;
+}
+div.figure p {
+ text-align: left;
+ font-size: smaller;
+ text-indent: 0;
+}
+img.thumbnail {
+ width: 100%;
+}
+
+#error {
+ color: red;
+}
+
+div#header {
+ position:absolute;
+ left:100px;
+ right:100px;
+ top:0;
+ margin-left:auto;
+ margin-right:auto;
+ height:50px;
+ background-image: url( ../204plan.gif);
+ border-bottom:thin solid #000;
+ font-family: Arial, Helvetica, sans-serif;
+ font-variant: normal;
+}
+
+
+div#editLinks {
+ position:absolute;
+ background: #999;
+ bottom:0px;
+ right:0px;
+ font-family: "Courier New", Courier, monospace;
+ filter:alpha(opacity=75);
+ -moz-opacity:.75;
+ opacity:.75;
+}
+
+div#editLinks a{
+ color:#FFF;
+}
+
+div#content {
+ margin-top: 50px;
+ margin-left: 20px;
+ margin-right: 20px;
+ padding-top: 10px;
+ padding-left: 5em;
+ padding-right: 5em;
+ padding-bottom:5em;
+ background:#fff;
+}
+
+
+.footer {
+ /*position:fixed;*/
+ width:100%;
+ bottom:0;
+ left:0;
+}
+
+body {
+ background-color:#fff;
+ padding-bottom:100px;
+
+}
+
+h1 {
+ margin-top:0;
+ margin-left:10px;
+ vertical-align:top;
+}
+
+#footerLinks{
+ /*position:fixed;*/
+ bottom:0px;
+ padding: 0px;
+ margin-left: 30px;
+ margin-right: 30px;
+ margin-bottom: 0px;
+
+}
+
+/*.fadeIn {
+ display: none;
+}*/
+
+#timeMachine {
+ width:auto;
+ right:0;
+ left:auto;
+}
+
+#surveyHover {
+ width:auto;
+ right:auto;
+ left:auto;
+}
+
+#col1 {
+ width:60%
+}
+
+#quicksearch {
+ margin-left:40px;
+}
+
+.noticeBox {
+ border:thin black solid; width: 40%; color:#F00; margin-left:auto; margin-right:auto
+}
+
+div.codeframebit
+{
+ border:thin black solid;
+ background-color: #ffffdf;
+}
+CodeMirror-line-numbers
+{
+ background-color: #bbb;
+}
+div#difflistajax
+{
+ margin-left: 5px;
+ background-color: #dfffdf;
+ border: thin green solid;
+}
+
+}
+
+/*The below are stolen from django admin css*/
+.addlink {
+ background:transparent url("../icon_addlink.gif") no-repeat scroll 0 0.2em;
+ padding-left:12px;
+}
+
+.quiet, a.quiet:link, a.quiet:visited {
+ color:#999999 !important;
+ font-weight:normal !important;
+}
+
+.mini {
+ font-size:9px;
+}
+
+/*this is for the related objects box on the right hand side, formerly called "col2." transition is in progress.*/
+
+ul.actionlist li
+{
+ list-style-type:none;
+}
+
+div#related h2
+{
+ padding-bottom:0px;
+ font-size:100%;
+ text-align:left;
+ background:#EEEEEE url(../nav-bg.gif) repeat-x scroll left bottom;
+ color:#666666;
+ margin: 0px;
+}
+
+div#related
+{
+ width:200px;
+ float:right;
+ border: thin solid black;
+ background:#EEEEEE;
+ color:#666666;
+}
+
+.addlink {
+ padding-left: 12px;
+ background: url(../icon_addlink.gif) 0 .2em no-repeat;
+}
+
+.changelink {
+ padding-left: 12px;
+ background: url(../icon_changelink.gif) 0 .2em no-repeat;
+}
+
+.deletelink {
+ padding-left: 12px;
+ background: url(../icon_deletelink.gif) 0 .25em no-repeat;
+}
+
+a.deletelink:link, a.deletelink:visited {
+ color: #CC3434;
+}
+
+a.deletelink:hover {
+ color: #993333;
+}
\ No newline at end of file
diff --git a/media/js/base.js b/media/js/base.js
index 91305a2..df9b0f4 100644
--- a/media/js/base.js
+++ b/media/js/base.js
@@ -79,7 +79,8 @@ $(hoverLink).bind('mouseout',
};
-function showEyeCandy(){
+function showEyeCandy(){
+switchStylestyle("eyeCandy");
$("#eyeCandyFooterPopUps").load("/eyecandy");
$(".leftMargin,.rightMargin").show();
$(".showEyeCandy").hide();
@@ -90,13 +91,15 @@ linkHover("#surveyBinderLink","#surveyHover");
linkHover("#troggle","#timeMachine");};
function killEyeCandy(){
+switchStylestyle("plain");
$(".leftMargin,.rightMargin").hide();
$(".showEyeCandy").show();
$(".killEyeCandy").hide();
$("#cavesLink").unbind('mouseover').unbind('mouseout');
$("#caversLink").unbind('mouseover').unbind('mouseout');
$("#surveyBinderLink").unbind('mouseover').unbind('mouseout');
-$("#troggle").unbind('mouseover').unbind('mouseout');};
+$("#troggle").unbind('mouseover').unbind('mouseout');
+};
if (getCookie("eyeCandy") == "False")
{killEyeCandy();}
@@ -144,4 +147,14 @@ if (document.cookie.length>0)
}
}
return "";
-};
\ No newline at end of file
+};
+
+/* Style Sheet Switcher */
+ function switchStylestyle(styleName)
+ {
+ $('link[@rel*=style][title]').each(function(i)
+ {
+ this.disabled = true;
+ if (this.getAttribute('title') == styleName) this.disabled = false;
+ });
+ }
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 6fc3e30..b34df33 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,7 +2,8 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" />
+<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
+<link rel="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>