[ScryMUD] SVN Commit Info r837 - in trunk/tools/python: . html_help_includes scrymud
scrymud at wanfear.com
scrymud at wanfear.com
Sat Jul 1 00:33:23 PDT 2006
Author: eroper
Date: 2006-07-01 00:33:22 -0700 (Sat, 01 Jul 2006)
New Revision: 837
Modified:
trunk/tools/python/html_help.py
trunk/tools/python/html_help_includes/foot.html
trunk/tools/python/html_help_includes/head.html
trunk/tools/python/scrymud/help.py
Log:
See Also: references from non-imm -> imm help pages now link properly.
Fixed some relative links that didn't work in the head/foot templates.
Modified: trunk/tools/python/html_help.py
===================================================================
--- trunk/tools/python/html_help.py 2006-07-01 06:40:27 UTC (rev 836)
+++ trunk/tools/python/html_help.py 2006-07-01 07:33:22 UTC (rev 837)
@@ -83,7 +83,7 @@
return
-def toHtml(doc):
+def toHtml(doc,lib):
def para(m): return "<p>%s</p>"%(m.group(1))
@@ -99,10 +99,13 @@
for p in scrymud.util.paragraphs(doc.body):
ret_val += "<p>%s</p>" %(p)
- ret_val += '</div><div id="see_also"'
+ ret_val += '</div><div id="see_also">'
for link in doc.see_also:
- ret_val += "<a href=\"%s.html\">%s</a> " %(link, link)
+ t = lib.by_name(link)
+ if ( not t ): continue
+ if ( t.imm ): ret_val += "<a href=\"imm/%s.html\">%s</a> " %(link, link)
+ else: ret_val += "<a href=\"%s.html\">%s</a> " %(link, link)
ret_val += '</div>'
@@ -121,7 +124,7 @@
ret_val += ("<div class=\"help_index_section\">\n<a name=\"%s\" /><div class=\"help_index_sortkey\">%s</div>\n" %(k,k))
ret_val += ("<ul class=\"help_index\">\n")
for entry in idx[k]:
- ret_val += ("<li><a href=\"%s.html\">%s</a></li>\n" %(entry,entry))
+ ret_val += ("<li><a href=\"%s.html\">%s</a></li>\n" %(entry,entry))
ret_val += ("</ul></div>\n")
return(ret_val)
@@ -154,17 +157,17 @@
for doc in lib.all(sort=True):
if ( doc.imm ):
- f = open("%s/imm/%s.html" %(config.output_dir, doc.name), 'w')
- try: imm_idx[doc.name[:1].upper()].append(doc.name)
- except KeyError, e: imm_idx[doc.name[:1].upper()] = [doc.name]
-
+ f = open("%s/imm/%s.html" %(config.output_dir, doc.name), 'w')
+ try: imm_idx[doc.name[:1].upper()].append(doc.name)
+ except KeyError, e: imm_idx[doc.name[:1].upper()] = [doc.name]
+
else:
- f = open("%s/%s.html" %(config.output_dir, doc.name), 'w')
- try: idx[doc.name[:1].upper()].append(doc.name)
- except KeyError, e: idx[doc.name[:1].upper()] = [doc.name]
+ f = open("%s/%s.html" %(config.output_dir, doc.name), 'w')
+ try: idx[doc.name[:1].upper()].append(doc.name)
+ except KeyError, e: idx[doc.name[:1].upper()] = [doc.name]
f.write(hh)
- f.write(toHtml(doc))
+ f.write(toHtml(doc,lib))
f.write(hf)
f.close()
Modified: trunk/tools/python/html_help_includes/foot.html
===================================================================
--- trunk/tools/python/html_help_includes/foot.html 2006-07-01 06:40:27 UTC (rev 836)
+++ trunk/tools/python/html_help_includes/foot.html 2006-07-01 07:33:22 UTC (rev 837)
@@ -1,8 +1,8 @@
</div><!-- content -->
<div id="footer">
<p>The ScryMUD development team would like to thank our sponsors:</p>
-<a href="http://www.candelatech.com"><img src="images/candela_swirl_small.png" width="71" height="33"></a>
-<a href="http://cenqua.com/"><img src="images/cenquad.gif" width="89" height="33"></a>
+<a href="http://www.candelatech.com"><img src="/images/candela_swirl_small.png" width="71" height="33"></a>
+<a href="http://cenqua.com/"><img src="/images/cenquad.gif" width="89" height="33"></a>
</div>
<p id="copyright">Copyright © 2006, Edward Roper. All rights reserved.</p>
Modified: trunk/tools/python/html_help_includes/head.html
===================================================================
--- trunk/tools/python/html_help_includes/head.html 2006-07-01 06:40:27 UTC (rev 836)
+++ trunk/tools/python/html_help_includes/head.html 2006-07-01 07:33:22 UTC (rev 837)
@@ -31,7 +31,7 @@
<ul class="nav">
<li><a href="/playerguide.html">New player guide</a></li>
<li><a href="/cartography.html">Cartography</a></li>
- <li><a href="/commands.html">Commands</a></li>
+ <li><a href="/help/">Commands</a></li>
<li><a href="/ss.html">Skills/Spells</a></li>
</ul>
Modified: trunk/tools/python/scrymud/help.py
===================================================================
--- trunk/tools/python/scrymud/help.py 2006-07-01 06:40:27 UTC (rev 836)
+++ trunk/tools/python/scrymud/help.py 2006-07-01 07:33:22 UTC (rev 837)
@@ -39,6 +39,14 @@
newDoc = helpDoc(self.path+"/"+f)
self.docs.append(newDoc)
+ def by_name(self, name):
+ """
+ Returns a document object by name
+ """
+ for doc in self.docs:
+ if ( doc.name.lower() == name.lower() ): return doc
+ return None
+
def all(self, sort=False):
"""
Returns an optionally sorted list of all help documents
@@ -47,7 +55,7 @@
self.docs.sort()
return self.docs
- def imm(self, sort=False):
+ def imm_list(self, sort=False):
"""
Returns an optionally sorted list of all IMM help documents
"""
@@ -57,7 +65,7 @@
if ( sort ): ret_val.sort()
return ret_val
- def player(self, sort=False):
+ def player_list(self, sort=False):
"""
Returns an optionally sorted list of all player help documents
"""
@@ -118,7 +126,7 @@
elif ( type == 'example:' ):
self.example += m.group(2).lstrip()
elif ( type == 'see also:' ):
- new_refs = m.group(2).strip().split(',')
+ new_refs = m.group(2).strip().replace(',','').split(' ')
for new_ref in new_refs:
self.see_also.append(new_ref.strip())
else:
More information about the ScryMUD
mailing list