[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r5273 - in trunk/www: utils utils/helpers web/project web/shared
|
From: |
jcater |
|
Subject: |
r5273 - in trunk/www: utils utils/helpers web/project web/shared |
|
Date: |
Tue, 9 Mar 2004 00:15:14 -0600 (CST) |
Author: jcater
Date: 2004-03-09 00:15:11 -0600 (Tue, 09 Mar 2004)
New Revision: 5273
Added:
trunk/www/web/project/_extra_menu.php
Modified:
trunk/www/utils/create-website
trunk/www/utils/helpers/files.py
trunk/www/utils/helpers/tools.py
trunk/www/web/project/index.php
trunk/www/web/shared/_footer.php
trunk/www/web/shared/_header.php
trunk/www/web/shared/_menu.php
trunk/www/web/shared/base.css
Log:
more work on web stuff
Modified: trunk/www/utils/create-website
===================================================================
--- trunk/www/utils/create-website 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/utils/create-website 2004-03-09 06:15:11 UTC (rev 5273)
@@ -96,6 +96,10 @@
if release != currentRelease:
html += '<p class="warn"><b>Please note:</b> This is an old version of
<i>%s</i>. The latest version is <a href="../%s/">%s</a>, released on
%s.</p>\n\n' % (name, currentRelease, currentRelease, currentReleaseDate)
+ html += '<h2>Release Notes</h2>\n<p>The following improvements appeared
in this release:</p>\n' + \
+ mod.releases.asHTML(release)
+
+
html += '<h2>Downloads</h2>\n' + \
"""<p>%s version %s can be downloaded in source form from:</p>
<ul><li><a
href="http://www.gnuenterprise.org/downloads/releases/%s-%s.tar.gz";>%s-%s.tar.gz</a></li>
@@ -104,13 +108,14 @@
package, release,
package, release,
package, release,
- package, release) + \
- '<h2>Changes</h2>\n<p>The following improvements appeared in
this release:</p>\n' + \
- mod.releases.asHTML(release) + \
- '<!-- <p>To see a complete change list for all releases, click
<a href="../docs/changes.php">here.</p> -->'
+ package, release)
- phpWrapper('tools/%s/%s/index.php' % (tool, release), html)
+ html += '<p>For more download options, including binary packages, please
visit the main download area at <a
href="http://www.gnuenterprise.org/downloads/";>http://www.gnuenterprise.org/downloads/</a>.</p>'
+
+ phpWrapper('tools/%s/%s/index.php' % (tool, release), html,
+ name + " " + currentRelease)
+
#
# Add tool to module menu
#
@@ -123,34 +128,65 @@
descr = descr.replace(name,'<a href="%s/">%s</a>' % (tool, name))
toolHomePageHtml += ('<h2><a href="%s/">' % tool) + name.replace('GNUe
','') + '</a></h2>\n' + descr
- #
- # Create tool's homepage
- #
+ ### ###
+ ### Create tool's homepage ###
+ ### ###
img = os.path.join(DEST,'tools',tool,'product.png')
if os.path.isfile(img):
- html = """<img style=" float: right; margin: 6px 6px 10px 10px; border:
1px solid #666;" alt="" src="product.png"/>\n"""
+ html = """<img class="productGraphic" alt="" src="product.png"/>\n"""
+## html = """<img style=" float: right; margin: 6px 6px 10px 10px;
border: 1px solid #666;" alt="" src="product.png"/>\n"""
else:
html = ""
html += "<h1>%s</h1>\n" % (name)
+ ##
+ ## Introduction
+ ##
+
html +=
addToolLinks(mod.readme.asHTML('Introduction'),toolUrlHints,'..',tool)
- html += '<h2>Documentation</h2>\n'
- #TODO
+
+ if currentRelease:
+ html += '<p>The current version of %s is <a href="%s/">%s</a>. Release
notes and downloads are available <a href="%s/">here</a>.</p>' % (
+ name, currentRelease,currentRelease,currentRelease)
+ #
+ ## Dependencies
+ ##
+ html += '<h2>Dependencies</h2>\n'
+ html += '<ul><li><a href="../common/">GNUe Common</a></li></ul>\n'
+
+
+ ##
+ ## Translations
+ ##
+ html += '<h2>International Support</h2>\n'
+ if mod.translations.trans:
+ html += "<p>The following languages have translations for this
tool:</p>"
+ html += mod.translations.asHTML()
+ else:
+ html += "<p>No translations are currently available for this tool.</p>"
+
+ ##
+ ## Documentation
+ ##
+ html += '<h2>Documentation</h2>\n' #TODO
html += '<ul><li><a href="docs/faq.php">Frequently Asked
Questions</a></li></ul>\n'
+ ##
+ ## Release History
+ ##
html += '<h2>Release History</h2>\n'
if mod.releases.releaseOrder:
html += '<ul>\n'
- for ver in mod.releases.releaseOrder[:6]:
+ for ver in mod.releases.releaseOrder[:5]:
html += """<li>Version <a href="%s/">%s</a> released on %s</li>\n""" %
(
ver, ver, mod.releases.getReleaseDate(ver, "%B %d, %Y"))
else:
html += '<p>This tool has no official releases.</p>'
# Create the historical release index if needed
- if len(mod.releases.releaseOrder) > 6:
+ if len(mod.releases.releaseOrder) > 5:
html += """<li><a href="old_releases.php">Older releases...</a></li>\n"""
html2 = '<h1>%s Release History</h1>\n' % name
@@ -158,12 +194,12 @@
for ver2 in mod.releases.releaseOrder:
html2 += """<li>Version <a href="%s/">%s</a> released on %s</li>\n"""
% (
ver2, ver2, mod.releases.getReleaseDate(ver2, "%B %d, %Y"))
- phpWrapper('tools/%s/old_releases.php' % tool, html2 + "</ul>")
+ phpWrapper('tools/%s/old_releases.php' % tool, html2 + "</ul>", name + "
Release History")
if mod.releases.releaseOrder:
html += '</ul>\n'
- phpWrapper('tools/%s/index.php' % tool, html + "</ul>")
+ phpWrapper('tools/%s/index.php' % tool, html, name)
##
# Write out tool's FAQ
@@ -180,12 +216,25 @@
html += "<h2>%s</h2>" % section
html += mod.faq.asHTML(section)
- phpWrapper('tools/%s/docs/faq.php' % tool, html)
+ phpWrapper('tools/%s/docs/faq.php' % tool, html, name + " FAQ")
+ ##
+ # Write out tool's extra menu
+ html = '<h3><a href="<?php print "$BASEDIR"; ?>/tools/%s" >%s</a></h3>' %
(tool, name)
+ html += """
+ <ul>
+ <li><a href="<?php print "$BASEDIR"; ?>/tools/%s/">Overview</a></li>
+ <li><a href="<?php print "$BASEDIR";
?>/tools/%s/docs/roadmap/">Roadmap</a></li>
+ <li><a href="<?php print "$BASEDIR";
?>/screenshots/%s/">Screenshots</a></li>
+ <li><a href="<?php print "$BASEDIR"; ?>/tools/%s/bugs.php">Bug
Reports</a></li>
+ </ul>""" % (tool,tool,tool,tool)
+
+ staticFile('tools/%s/_extra_menu.php'%tool, html)
+
##
# Write out tools/_module_menu.php
#
- staticFile('tools/_module_menu.php', moduleMenuHtml)
+ staticFile('tools/_module_menu.php', moduleMenuHtml + "</ul>")
##
# Write out tool/ home page
@@ -199,22 +248,23 @@
databases, such as the free PostgreSQL, MySQL, Firebird, and SQLite
databases, as well as the commercial Oracle, DB2, Sybase,etc,
databases.</p>
- """ + toolHomePageHtml )
+ """ + toolHomePageHtml , "Developer Tools")
######################################################################
#
#
-def phpWrapper(file, html):
+def phpWrapper(file, html, title=""):
out = open(os.path.join(DEST, file),'w')
path = file.split('/')
out.write("""\
<?php $BASEDIR="%s";
$MODULE="%s";
+ $TITLE="%s";
include ("$BASEDIR/shared/_header.php"); ?>
<div id="body">
-""" % (string.join([".."]*(len(path)-1),'/'), path[0]))
+""" % (string.join([".."]*(len(path)-1),'/'), path[0], title))
out.write(html)
out.write("""
Modified: trunk/www/utils/helpers/files.py
===================================================================
--- trunk/www/utils/helpers/files.py 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/utils/helpers/files.py 2004-03-09 06:15:11 UTC (rev 5273)
@@ -1,4 +1,5 @@
import sys, os, string
+from xml.sax.saxutils import escape
SVN_BASE=os.path.abspath(os.path.join(os.path.dirname(__file__),'../../..'))
@@ -77,7 +78,7 @@
return string.join(self.sections[section.upper()],'\n').strip()
def asHTML(self, section):
- return '<p>' + self.asText(section).replace('\n\n','</p>\n<p>') + '</p>'
+ return '<p>' + escape(self.asText(section)).replace('\n\n','</p>\n<p>') +
'</p>'
def firstParaAsHTML(self, section):
text =
string.join(self.sections[section.upper()],'\n').strip().split('\n\n')[0]
Modified: trunk/www/utils/helpers/tools.py
===================================================================
--- trunk/www/utils/helpers/tools.py 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/utils/helpers/tools.py 2004-03-09 06:15:11 UTC (rev 5273)
@@ -185,7 +185,7 @@
pct = "%d%%" % (translated/total*100)
else:
pct = "0%"
- vals.append('<li>%s: %s</li>' % (iso_codes.description(lang), pct))
+ vals.append('<li>%s <i>(%s completed)</i></li>' %
(iso_codes.description(lang), pct))
if vals:
vals.sort()
@@ -203,7 +203,7 @@
pct = "%d%%" % (translated*1.0/total*100.0)
else:
pct = "0%"
- vals.append('%s: %s' % (iso_codes.description(lang), pct))
+ vals.append('%s (%s completed)' % (iso_codes.description(lang), pct))
if vals:
vals.sort()
Added: trunk/www/web/project/_extra_menu.php
===================================================================
--- trunk/www/web/project/_extra_menu.php 2004-03-09 00:03:15 UTC (rev
5272)
+++ trunk/www/web/project/_extra_menu.php 2004-03-09 06:15:11 UTC (rev
5273)
@@ -0,0 +1,6 @@
+ <h3><a href="<?php print "$BASEDIR"; ?>/project/" >Sub-Projects</a></h3>
+ <ul>
+ <li><a href="<?php print "$BASEDIR"; ?>/tools/" >Developer
Tools</a></li>
+ <li><a href="<?php print "$BASEDIR"; ?>/packages/" >ERP
Packages</a></li>
+ <li><a href="<?php print "$BASEDIR"; ?>/contrib/" >Other
Projects</a></li>
+ </ul>
Modified: trunk/www/web/project/index.php
===================================================================
--- trunk/www/web/project/index.php 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/web/project/index.php 2004-03-09 06:15:11 UTC (rev 5273)
@@ -1,5 +1,6 @@
<?php $BASEDIR="..";
$MODULE="project";
+ $TITLE="";
include "$BASEDIR/shared/_header.php"; ?>
<div id="body">
@@ -14,7 +15,7 @@
software.
GNUe is itself comprised of several subprojects:</p>
- <h2>Developer Tools</h2>
+ <h2><a href="../tools/">Developer Tools</a></h2>
<p>
Firstly, GNUe is a set of <a href="../tools/">tools</a>, such as a
data-aware user forms interface, a reporting system and an
@@ -28,7 +29,7 @@
GNUe supports multi-language interfaces and non-ASCII character sets.
</p>
- <h2>ERP Packages</h2>
+ <h2><a href="../packages/">ERP Packages</a></h2>
<p>
GNUe is also a set of <a href="../packages/">packages</a> written
using the tools, to implement a full Enterprise Resource Planning
@@ -62,67 +63,4 @@
</div>
- <!--
- <div id="newsItems">
- <h1 class="newsItem">GNUe News</h1>
-
- <div class="newsItem">
- <h2 class="newsItem">New Releases of GNUe Tools (0.5.2)</h2>
-
- <span class="newsDate">22 October 2003</span>
-
- <p class="newsItem">
- The GNU Enterprise team is proud to announce a new release of
- it's enterprise application development suite. This release
- includes:
- <ul>
- <li> GNUe Forms 0.5.2
- <li> GNUe Reports 0.1.3
- <li> GNUe Designer 0.5.2
- <li> GNUe Navigator 0.0.6
- <li> GNUe AppServer 0.0.5
- <li> GNUe Common 0.5.2
- </ul>
-
- <a href="../news/news136.html">More ...</a></p>
- </p>
- </div>
-
- <div class="newsItem">
- <h2 class="newsItem">New Releases of GNUe Tools (0.5.2)</h2>
-
- <span class="newsDate">22 October 2003</span>
-
- <p class="newsItem">
- The GNU Enterprise team is proud to announce a new release of
- it's enterprise application development suite. This release
- includes:
- <ul>
- <li> GNUe Forms 0.5.2
- <li> GNUe Reports 0.1.3
- <li> GNUe Designer 0.5.2
- <li> GNUe Navigator 0.0.6
- <li> GNUe AppServer 0.0.5
- <li> GNUe Common 0.5.2
- </ul>
-
- <a href="../news/news136.html">More ...</a></p>
- </p>
- </div>
-
- </div>
- -->
-
- <!-- <div id="copyrightFooter">
- <p>
- News items are the property of their posters.
- All the rest © 1999, 2001 - 2004 by Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111, USA <br>
-
- Verbatim copying and distribution of this entire article is permitted in
any
- medium, provided this notice is preserved.
- </p>
- </div> -->
-
-
<?php include "$BASEDIR/shared/_footer.php"; ?>
Modified: trunk/www/web/shared/_footer.php
===================================================================
--- trunk/www/web/shared/_footer.php 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/web/shared/_footer.php 2004-03-09 06:15:11 UTC (rev 5273)
@@ -1,3 +1,4 @@
+<br/>
<?php include "$BASEDIR/shared/_menu.php" ?>
<br/>
</div>
Modified: trunk/www/web/shared/_header.php
===================================================================
--- trunk/www/web/shared/_header.php 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/web/shared/_header.php 2004-03-09 06:15:11 UTC (rev 5273)
@@ -4,12 +4,12 @@
<head>
<meta http-equiv="content-type" content="text/html;
charset=iso-8859-1" />
<meta name="author" content="GNU Enterprise" />
- <meta NAME="COPYRIGHT" CONTENT="Copyright (c) 2001-2004 Free Software
Foundation">
- <meta NAME="KEYWORDS" CONTENT="Free Software, FreeSoftware,
Freesoftware, free software, GNU, gnu, GPL, gpl, Unix, UNIX, *nix, unix, MySQL,
mysql, SQL, sql, Database, DataBase, database, gnue, enterprise software,
corba, supply chain, accounting, erp, crm,E-Commerce, GNU
Enterprise,Application Service Providers, Business 2 Business, Customer
Relationship Managment, Enterprise Application Integration, eai, E-Commerce,
Middleware, postgresql, AP, AR, GL, xml, CORBA ">
-<META NAME="DESCRIPTION" CONTENT="Free software for your business">
+ <meta name="COPYRIGHT" content="Copyright (c) 2001-2004 Free Software
Foundation"/>
+ <meta name="KEYWORDS" content="Free Software, FreeSoftware,
Freesoftware, free software, GNU, gnu, GPL, gpl, Unix, UNIX, *nix, unix, MySQL,
mysql, SQL, sql, Database, DataBase, database, gnue, enterprise software,
corba, supply chain, accounting, erp, crm,E-Commerce, GNU
Enterprise,Application Service Providers, Business 2 Business, Customer
Relationship Managment, Enterprise Application Integration, eai, E-Commerce,
Middleware, postgresql, AP, AR, GL, xml, CORBA "/>
+<meta name="DESCRIPTION" content="Free software for your business"/>
<meta name="robots" content="all" />
- <title>GNU Enterprise</title>
+ <title><?php if ($TITLE != "") print "$TITLE - "; ; ?>GNU
Enterprise</title>
<!-- to correct the unsightly Flash of Unstyled Content.
http://www.bluerobot.com/web/css/fouc.asp -->
<script type="text/javascript"></script>
Modified: trunk/www/web/shared/_menu.php
===================================================================
--- trunk/www/web/shared/_menu.php 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/web/shared/_menu.php 2004-03-09 06:15:11 UTC (rev 5273)
@@ -2,27 +2,20 @@
<h3><a href="<?php print "$BASEDIR"; ?>/project/" >GNUe Home</a></h3>
<ul>
- <li><a href="<?php print "$BASEDIR"; ?>/project/news/" >News</a><br>
- <li><a href="http://www.gnuenterprise.org/downloads/downloads.php";
>Downloads</a><br>
- <li><a href="<?php print "$BASEDIR"; ?>/docs/" >Documentation</a><br>
- <li><a href="<?php print "$BASEDIR"; ?>/project/screenshots.html"
>Screenshots</a><br>
+ <li><a href="<?php print "$BASEDIR"; ?>/project/news/" >Project
News</a></li>
+ <li><a href="http://www.gnuenterprise.org/downloads/downloads.php";
>Downloads</a></li>
+ <li><a href="<?php print "$BASEDIR"; ?>/docs/" >Documentation</a></li>
+ <li><a href="<?php print "$BASEDIR"; ?>/project/screenshots.html"
>Screenshots</a></li>
<li><a href="<?php print "$BASEDIR"; ?>/project/bugs.html" >Bug
Tracking</a></li>
- <li><a href="<?php print "$BASEDIR"; ?>/project/media.html" >Media
Resources</a><br>
+ <li><a href="<?php print "$BASEDIR"; ?>/project/media.html" >Media
Resources</a></li>
<li><a href="<?php print "$BASEDIR"; ?>/developers/" >Developer's
Corner</a></li>
<li><a href="<?php print "$BASEDIR"; ?>/project/involve.html" >Get
Involved!</a></li>
+ <li><a href="<?php print "$BASEDIR"; ?>/project/search/"
>Search</a></li>
</ul>
- <?php @include("$BASEDIR/$MODULE/_module_menu.php")?>
-
-
- <h3><a href="<?php print "$BASEDIR"; ?>/project/" >GNUe Projects</a></h3>
- <ul>
- <li><a href="<?php print "$BASEDIR"; ?>/tools/" >Developer
Tools</a></li>
- <li><a href="<?php print "$BASEDIR"; ?>/packages/" >ERP
Packages</a></li>
- <li><a href="<?php print "$BASEDIR"; ?>/contrib/" >Other
Projects</a></li>
- </ul>
-
<?php @include("_extra_menu.php") ?>
+ <?php @include("$BASEDIR/$MODULE/_module_menu.php")?>
+
</div>
Modified: trunk/www/web/shared/base.css
===================================================================
--- trunk/www/web/shared/base.css 2004-03-09 00:03:15 UTC (rev 5272)
+++ trunk/www/web/shared/base.css 2004-03-09 06:15:11 UTC (rev 5273)
@@ -1,7 +1,7 @@
.productGraphic {
float: right;
- margin: 0 0 10px 10px;
+ margin: 6px 6px 10px 10px;
border: 1px solid #666;
}
@@ -50,7 +50,6 @@
}
#leftMenuList h3 a {
- c2olor: #99CCFF;
color: #0099ff;
}
@@ -135,11 +134,14 @@
ul,li,ol {
font-size: 11px;
}
+ul,ol {
+ margin: 5px 0 0 0;
+}
p {
font-size: 12px;
- margin-top: 4px;
- margin-bottom: 12px;
+ margin-top: 8px;
+ margin-bottom: 4px;
}
p.warn {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r5273 - in trunk/www: utils utils/helpers web/project web/shared,
jcater <=