summaryrefslogtreecommitdiff
path: root/template/help.st
diff options
context:
space:
mode:
authortim b <timb@camcompu.home>2010-04-07 18:59:50 -0700
committertim b <timb@camcompu.home>2010-04-07 18:59:50 -0700
commit6440348618ade4fbcb541c40473074833a47d198 (patch)
tree537ab7e4f0af7deba51bbfb360fe490968d651f8 /template/help.st
parent4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff)
parent42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff)
fixing merge conflicts
Diffstat (limited to 'template/help.st')
-rw-r--r--template/help.st13
1 files changed, 7 insertions, 6 deletions
diff --git a/template/help.st b/template/help.st
index 24285d6..d1a999c 100644
--- a/template/help.st
+++ b/template/help.st
@@ -3,7 +3,7 @@
<link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen"/>
<link href="/static/css/win.css" rel="stylesheet" type="text/css" media="screen"/>
<script type="text/javascript" src="/static/js/win.js"></script>
- <script type="text/javascript" src="/static/jquery.em.js"></script>
+
<script type="text/javascript">
jQuery(function()
@@ -19,11 +19,12 @@ jQuery(function()
</head>
<body style="font-family: Arial, Helvetica, sans-serif;
background-color:#ffffee;
- background-image:url(/static/chanbg.png);
+ background-image:url(/static/img/chanbg.png);
background-repeat:repeat-x;
background-position:1 10;
background-attachment:fixed;" onload="
javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 30, 115);
+
javascript:CreateDropdownWindow('frequently asked questions', '520px', true, 'archive', 440, 60);
@@ -36,18 +37,18 @@ background-attachment:fixed;" onload="
<div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
<div style="padding:0px;" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/dumpclouds.png"><br><br>
+<img src="/static/img/dumpclouds.png"><br><br>
<h5>
&#169;2010 All Rights Reserved<br><br>
<a href="mailto:info@dump.fm"> info@dump.fm</a>
</center><br></div></h5>
</div></div>
-
+
<div style="display:none;"id="archive">
<div style="padding:0px" id="content" name="content">
- <iframe src="/static/help.html" style="overflow-x:hidden; padding:5;background-image:url(/static/hearts.gif);background-repeat:repeat;" width="510px" height="500px"></iframe>
+ <iframe src="/static/html/help.html" style="overflow-x:hidden; padding:5;background-image:url(/static/img/hearts.gif);background-repeat:repeat;" width="510px" height="500px"name="iframe"></iframe>
</div>
</div>
<div style="display:none;"id="link">
@@ -60,7 +61,7 @@ background-attachment:fixed;" onload="
</div>
</div>
</div>
-<div id="hugescreen"><img src="/static/hugescreen.png"></div>
+<div id="hugescreen"><img src="/static/img/hugescreen.png"></div>
<div id="footer">