From: soren h. <ha...@us...> - 2006-09-13 22:38:14
|
Update of /cvsroot/octave/octave-forge/www In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5071 Modified Files: FAQ.in Makefile archive.in bugs.in build-www.py developers.in docs.in index.in links.in macros.m4 octave-forge.css Removed Files: packages.in Log Message: Removed packages.in because it gets generated --- packages.in DELETED --- Index: bugs.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/bugs.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bugs.in 10 Sep 2006 17:53:09 -0000 1.1 +++ bugs.in 13 Sep 2006 22:38:09 -0000 1.2 @@ -1,4 +1,4 @@ -__HEADER__(`Bugs') +__HEADER__([[[Bugs]]]) <p>If you think you have found a bug in one of the Octave-Forge packages, please report it, by sending a message to the Index: FAQ.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/FAQ.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- FAQ.in 10 Sep 2006 17:53:09 -0000 1.1 +++ FAQ.in 13 Sep 2006 22:38:09 -0000 1.2 @@ -1,4 +1,4 @@ -__HEADER__(`Frequently Asked Questions') +__HEADER__([[[Frequently Asked Questions]]]) <p> The following page contains some questions often asked by users and developers along Index: index.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/index.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.in 10 Sep 2006 17:53:09 -0000 1.1 +++ index.in 13 Sep 2006 22:38:09 -0000 1.2 @@ -1,4 +1,4 @@ -__HEADER__(`Octave-Forge') +__HEADER__([[[Octave-Forge]]]) <p> Octave-Forge is a central location for the collaborative Index: Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/www/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 12 Sep 2006 20:18:53 -0000 1.6 +++ Makefile 13 Sep 2006 22:38:09 -0000 1.7 @@ -3,19 +3,24 @@ HTML_SRC = $(shell find . | grep "\.in") IMG_HTML = $(HTML_SRC:.in=.html) -all: build-www developers.html +all: build-www doc developers.html make $(IMG_HTML) build-www: ./build-www.py -developers.html: +developers.html: ../admin/template.ndev wd=`pwd` cd ../admin && ./get_contents cd $(wd) cp ../doc/new_developer.html ./developers.in $(M4) $(MACRO_FILE) developers.in > developers.html +doc: + wd=`pwd` + cd .. && admin/make_index + cd $(wd) + %.html : %.in $(M4) $(MACRO_FILE) $< > $@ Index: octave-forge.css =================================================================== RCS file: /cvsroot/octave/octave-forge/www/octave-forge.css,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- octave-forge.css 10 Sep 2006 17:53:09 -0000 1.1 +++ octave-forge.css 13 Sep 2006 22:38:09 -0000 1.2 @@ -29,7 +29,7 @@ font-size: 0.8em; margin: 1em 0 0 1em; padding: 0; - position: fixed; + //position: fixed; text-align: left; width: 10em; } @@ -51,9 +51,17 @@ /* the page content */ +div#alphabetical { + display: block; + margin-left: 11em; + margin-top: 1em; + text-align: center; +} + div#content { -display: block; -margin-left: 11em; + display: block; + margin-left: 11em; + margin-top: 1em; } div.section { @@ -131,14 +139,16 @@ margin-top: 5px; } +/* code { - padding: 5px; + padding: 1px; margin-left: 1em; border: 1px solid; border-color: #babdb6; background-color: #d3d7cf; color: black; } +*/ table#main_package_table { margin-top: 1em; Index: links.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/links.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- links.in 10 Sep 2006 17:53:09 -0000 1.1 +++ links.in 13 Sep 2006 22:38:09 -0000 1.2 @@ -1,4 +1,4 @@ -__HEADER__(`Links') +__HEADER__([[[Links]]]) <p>This page contains a list of links that are somehow interesting for Octave users.</p> Index: developers.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/developers.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- developers.in 11 Sep 2006 21:30:03 -0000 1.3 +++ developers.in 13 Sep 2006 22:38:09 -0000 1.4 @@ -1,4 +1,4 @@ -__HEADER__(`Developer's Notes') +__HEADER__([[[Developer's Notes]]]) <h2>Contributing Code to the Gnu Octave Repository</h2> Index: macros.m4 =================================================================== RCS file: /cvsroot/octave/octave-forge/www/macros.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- macros.m4 11 Sep 2006 17:45:39 -0000 1.1 +++ macros.m4 13 Sep 2006 22:38:09 -0000 1.2 @@ -95,6 +95,25 @@ dnl dnl dnl +define(`__DOC_HEADER__', `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<meta http-equiv="content-type" content="text/html; charset=utf-8"> +<head> +<title>$1</title> +<link rel="stylesheet" type="text/css" href="__BASE_ADDRESS__/octave-forge.css" /> +</head> +<body> +<div id="title"><h1>$1</h1></div> +<div id="nav"> +include([[[doc/menu.include]]]) +</div> +include([[[doc/alphabetic.include]]]) +<div id="content"> +')dnl +dnl +dnl +dnl define(`__BIG_HEADER__', `__HEADER__($1) <p> ifdef(`__TEXT_MODE__', @@ -257,3 +276,7 @@ `__GRAPHICS_DOWNLOAD_INFO__($@)') </p> ')dnl +dnl +dnl +dnl +changequote([[[, ]]]) Index: archive.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/archive.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- archive.in 10 Sep 2006 17:53:09 -0000 1.1 +++ archive.in 13 Sep 2006 22:38:09 -0000 1.2 @@ -1,4 +1,4 @@ -__HEADER__(`Mailing list') +__HEADER__([[[Mailing list]]]) <p>Bugs, enhancements, and other stuff are debated on the Octave-Forge mailing list. It's a fairly low-trafic list, and you are most welcome Index: build-www.py =================================================================== RCS file: /cvsroot/octave/octave-forge/www/build-www.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- build-www.py 11 Sep 2006 22:23:36 -0000 1.4 +++ build-www.py 13 Sep 2006 22:38:09 -0000 1.5 @@ -48,7 +48,7 @@ ## Write header fid = open(outdir + "/index.in", "w"); - fid.write("__HEADER__(`The " + desc['name'] + " package')"); + fid.write("__HEADER__([[[The " + desc['name'] + " package]]])"); ## Write important data fid.write(' <table id="main_package_table">\n'); @@ -114,7 +114,7 @@ ## Write output fid = open(outdir + "/license.in", "w"); - fid.write("__HEADER__(`The " + package_name + " package')\n"); + fid.write("__HEADER__([[[The " + package_name + " package]]])\n"); fid.write("<h3>The license terms for the " + package_name + " package are as follows</h3>\n"); fid.write('<p><textarea rows="20" cols="80" readonly>'); for c in license: @@ -153,7 +153,7 @@ def main(): ## Start the package file index = open("packages.in", "w"); - index.write("__HEADER__(`Packages')"); + index.write("__HEADER__([[[Packages]]])"); index.write('<p>The following packages are currently available in the repository.\n'); index.write("If you don't know how to install the packages please read the\n"); index.write('relevant part of the <a href="FAQ.html#install">FAQ</a>.\n</p>'); @@ -184,7 +184,10 @@ desc = handle_package(packdir, outdir); index.write('<div class="package">\n'); index.write(' <b>' + desc['name'] + '</b>\n'); - index.write('<p>' + desc['description'][:100] + '...</p>\n'); + index.write('<p>' + desc['description'][:100]); + if (len(desc['description']) > 100): + index.write('...'); + index.write('</p>\n'); index.write('<p class="package_link">» <a href="' + outdir + '/index.html">details</a> | '); index.write('<a href="' + outdir + '/index.html">download</a></p>\n'); index.write('</div>\n'); Index: docs.in =================================================================== RCS file: /cvsroot/octave/octave-forge/www/docs.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- docs.in 10 Sep 2006 17:53:09 -0000 1.1 +++ docs.in 13 Sep 2006 22:38:09 -0000 1.2 @@ -1,4 +1,4 @@ -__HEADER__(`Documentation') +__HEADER__([[[Documentation]]]) <p>On this page you'll find various kinds of documentation. If you need documentation on individual packages, see the package page.</p> @@ -6,6 +6,9 @@ <h2>User Questions</h2> <p>Most questions asked by users are answers in the <a href="FAQ.html">FAQ</a>.</p> +<h2>Function Reference</h2> +<p>Documentation for individual functions can be found <a href="doc/index.html">here</a>.</p> + <h2>Developers Documents</h2> <ul> <li> |