nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nitpick: do not warn in not explicitly required modules
[nit.git]
/
src
/
nitcatalog.nit
diff --git
a/src/nitcatalog.nit
b/src/nitcatalog.nit
index
42dc5dd
..
629222a
100644
(file)
--- a/
src/nitcatalog.nit
+++ b/
src/nitcatalog.nit
@@
-187,7
+187,7
@@
redef class Catalog
do
# Register `self` to the global NitdocDecorator
# FIXME this is ugly. But no better idea at the moment.
do
# Register `self` to the global NitdocDecorator
# FIXME this is ugly. But no better idea at the moment.
- modelbuilder.model.nitdoc_md_processor.emitter.decorator.as(NitdocDecorator).catalog = self
+ modelbuilder.model.nitdoc_md_processor.decorator.as(NitdocDecorator).catalog = self
end
# The output directory where to generate pages
end
# The output directory where to generate pages
@@
-232,12
+232,19
@@
redef class Catalog
var name = mpackage.name.html_escape
res.more_head.add """<title>{{{name}}}</title>"""
var name = mpackage.name.html_escape
res.more_head.add """<title>{{{name}}}</title>"""
- res.add """
-<div class="content">
-<h1 class="package-name">{{{name}}}</h1>
-"""
+ res.add """<div class="content">"""
+
var mdoc = mpackage.mdoc_or_fallback
var mdoc = mpackage.mdoc_or_fallback
- if mdoc != null then res.add mdoc.html_documentation
+ if mdoc == null then
+ res.add """<h1 class="package-name">{{{name}}}</h1>"""
+ else
+ res.add """
+<div style="float: left">
+ <h1 class="package-name">{{{name}}} - </h1>
+</div>
+"""
+ res.add mdoc.html_documentation
+ end
res.add "<h2>Content</h2>"
var ot = new OrderedTree[MConcern]
res.add "<h2>Content</h2>"
var ot = new OrderedTree[MConcern]
@@
-260,12
+267,12
@@
redef class Catalog
<div class="sidebar">
<ul class="box">
"""
<div class="sidebar">
<ul class="box">
"""
- var tryit = mpackage.metadata("upstream.tryit")
+ var tryit = mpackage.metadata.metadata("upstream.tryit")
if tryit != null then
var e = tryit.html_escape
res.add "<li><a href=\"{e}\">Try<span style=\"color:white\">n</span>it!</a></li>\n"
end
if tryit != null then
var e = tryit.html_escape
res.add "<li><a href=\"{e}\">Try<span style=\"color:white\">n</span>it!</a></li>\n"
end
- var apk = mpackage.metadata("upstream.apk")
+ var apk = mpackage.metadata.metadata("upstream.apk")
if apk != null then
var e = apk.html_escape
res.add "<li><a href=\"{e}\">Android apk</a></li>\n"
if apk != null then
var e = apk.html_escape
res.add "<li><a href=\"{e}\">Android apk</a></li>\n"
@@
-273,15
+280,15
@@
redef class Catalog
res.add """</ul>\n<ul class="box">\n"""
res.add """</ul>\n<ul class="box">\n"""
- var homepage = mpackage.metadata("upstream.homepage")
+ var homepage = mpackage.metadata.metadata("upstream.homepage")
if homepage != null then
var e = homepage.html_escape
res.add "<li><a href=\"{e}\">{e}</a></li>\n"
end
if homepage != null then
var e = homepage.html_escape
res.add "<li><a href=\"{e}\">{e}</a></li>\n"
end
- for maintainer in mpackage.maintainers do
+ for maintainer in mpackage.metadata.maintainers do
res.add "<li>{maintainer.to_html}</li>"
end
res.add "<li>{maintainer.to_html}</li>"
end
- var license = mpackage.metadata("package.license")
+ var license = mpackage.metadata.metadata("package.license")
if license != null then
var e = license.html_escape
res.add "<li><a href=\"http://opensource.org/licenses/{e}\">{e}</a> license</li>\n"
if license != null then
var e = license.html_escape
res.add "<li><a href=\"http://opensource.org/licenses/{e}\">{e}</a> license</li>\n"
@@
-289,22
+296,22
@@
redef class Catalog
res.add "</ul>\n"
res.add "<h3>Source Code</h3>\n<ul class=\"box\">\n"
res.add "</ul>\n"
res.add "<h3>Source Code</h3>\n<ul class=\"box\">\n"
- var browse = mpackage.metadata("upstream.browse")
+ var browse = mpackage.metadata.metadata("upstream.browse")
if browse != null then
var e = browse.html_escape
res.add "<li><a href=\"{e}\">{e}</a></li>\n"
end
if browse != null then
var e = browse.html_escape
res.add "<li><a href=\"{e}\">{e}</a></li>\n"
end
- var git = mpackage.metadata("upstream.git")
+ var git = mpackage.metadata.metadata("upstream.git")
if git != null then
var e = git.html_escape
res.add "<li><tt>{e}</tt></li>\n"
end
if git != null then
var e = git.html_escape
res.add "<li><tt>{e}</tt></li>\n"
end
- var last_date = mpackage.last_date
+ var last_date = mpackage.metadata.last_date
if last_date != null then
var e = last_date.html_escape
res.add "<li>most recent commit: {e}</li>\n"
end
if last_date != null then
var e = last_date.html_escape
res.add "<li>most recent commit: {e}</li>\n"
end
- var first_date = mpackage.first_date
+ var first_date = mpackage.metadata.first_date
if first_date != null then
var e = first_date.html_escape
res.add "<li>oldest commit: {e}</li>\n"
if first_date != null then
var e = first_date.html_escape
res.add "<li>oldest commit: {e}</li>\n"
@@
-326,7
+333,7
@@
redef class Catalog
res.add "<h3>Tags</h3>\n"
var ts2 = new Array[String]
res.add "<h3>Tags</h3>\n"
var ts2 = new Array[String]
- for t in mpackage.tags do
+ for t in mpackage.metadata.tags do
t = t.html_escape
ts2.add "<a href=\"../index.html#tag_{t}\">{t}</a>"
end
t = t.html_escape
ts2.add "<a href=\"../index.html#tag_{t}\">{t}</a>"
end
@@
-374,7
+381,7
@@
redef class Catalog
end
end
end
end
- var contributors = mpackage.contributors
+ var contributors = mpackage.metadata.contributors
if not contributors.is_empty then
res.add "<h3>Contributors</h3>\n<ul class=\"box\">"
for c in contributors do
if not contributors.is_empty then
res.add "<h3>Contributors</h3>\n<ul class=\"box\">"
for c in contributors do
@@
-492,9
+499,9
@@
redef class Catalog
res.add "<tr>"
res.add "<td><a href=\"p/{p.name}.html\">{p.name}</a></td>"
var maint = "?"
res.add "<tr>"
res.add "<td><a href=\"p/{p.name}.html\">{p.name}</a></td>"
var maint = "?"
- if p.maintainers.not_empty then maint = p.maintainers.first.name.html_escape
+ if p.metadata.maintainers.not_empty then maint = p.metadata.maintainers.first.name.html_escape
res.add "<td>{maint}</td>"
res.add "<td>{maint}</td>"
- res.add "<td>{p.contributors.length}</td>"
+ res.add "<td>{p.metadata.contributors.length}</td>"
if deps.not_empty then
res.add "<td>{deps[p].greaters.length-1}</td>"
res.add "<td>{deps[p].direct_greaters.length}</td>"
if deps.not_empty then
res.add "<td>{deps[p].greaters.length-1}</td>"
res.add "<td>{deps[p].direct_greaters.length}</td>"