From 44acb4196a6e0bed7de44292804c34b7722b6b3e Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sat, 13 Jul 2013 11:26:12 +0000 Subject: Add stylesheet and mageia navigation bar --- Makefile | 6 +++++- NEWS | 1 + mgapeople.conf | 2 ++ static/people.css | 12 ++++++++++++ tmpl/body_top.html | 5 +++++ tmpl/group.html | 20 ++++++++++++-------- tmpl/groupindex.html | 16 ++++++++++------ tmpl/head.html | 3 +++ tmpl/index.html | 12 ++++++++---- tmpl/user.html | 52 ++++++++++++++++++++++++++++------------------------ tmpl/userindex.html | 16 ++++++++++------ 11 files changed, 96 insertions(+), 49 deletions(-) create mode 100644 static/people.css create mode 100644 tmpl/body_top.html create mode 100644 tmpl/head.html diff --git a/Makefile b/Makefile index 82f2fc3..2908ee6 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,21 @@ VERSION=0.4 BINFILES=mkpeople CFGFILES=mgapeople.conf TMPLFILES=tmpl/*.html tmpl/*.txt +STATICFILES=static/* sysconfdir=/etc bindir=/usr/bin sharedir=/usr/share tmpldir=$(sharedir)/mgapeople/tmpl +staticdir=$(sharedir)/mgapeople/static install: - install -d $(DESTDIR)$(tmpldir) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir) + install -d $(DESTDIR)$(tmpldir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(sysconfdir) $(DESTDIR)$(staticdir) install -m 755 $(BINFILES) $(DESTDIR)$(bindir) install -m 644 $(CFGFILES) $(DESTDIR)$(sysconfdir) install -m 644 $(TMPLFILES) $(DESTDIR)$(tmpldir) + install -m 644 $(STATICFILES) $(DESTDIR)$(staticdir) tar: git archive --format=tar --prefix mgapeople-$(VERSION)/ HEAD | xz > mgapeople-$(VERSION).tar.xz diff --git a/NEWS b/NEWS index 1ac7d66..943d4cc 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ +- add stylesheet and mageia navigation bar - tmpl/userindex.txt: remove empty line at end of file Version 0.4 diff --git a/mgapeople.conf b/mgapeople.conf index 592df4e..dad791e 100644 --- a/mgapeople.conf +++ b/mgapeople.conf @@ -9,3 +9,5 @@ output_format: tmpl_dir: /usr/share/mgapeople/tmpl maintdburl: http://pkgsubmit.mageia.org/data/maintdb.txt sitename: people.mageia.org +staticdir_url: //people.mageia.org/static +links_protocol: // diff --git a/static/people.css b/static/people.css new file mode 100644 index 0000000..462a148 --- /dev/null +++ b/static/people.css @@ -0,0 +1,12 @@ +.content { + background: #fff; + padding: 1em 2em; + text-align: left; + float: left; + min-width: 60%; +} + +.section { + padding-top: 1em; + padding-bottom: 1em; +} diff --git a/tmpl/body_top.html b/tmpl/body_top.html new file mode 100644 index 0000000..2b726f1 --- /dev/null +++ b/tmpl/body_top.html @@ -0,0 +1,5 @@ +
+ + diff --git a/tmpl/group.html b/tmpl/group.html index 1a414a4..c61f620 100644 --- a/tmpl/group.html +++ b/tmpl/group.html @@ -2,17 +2,21 @@ [% config.sitename %]: g/[% groups.$group.cn.0 %] + [%- INCLUDE head.html -%] -

[% groups.$group.cn.0 %]

+ [%- INCLUDE body_top.html -%] +

[% config.sitename %] » groups » [% groups.$group.cn.0 %]

-

[% groups.$group.description.0 %]

+
+

[% groups.$group.description.0 %]

- Members: - + Members: + +
diff --git a/tmpl/groupindex.html b/tmpl/groupindex.html index 4489883..4549801 100644 --- a/tmpl/groupindex.html +++ b/tmpl/groupindex.html @@ -2,13 +2,17 @@ [% config.sitename %]: g + [%- INCLUDE head.html -%] -

groups

- + [%- INCLUDE body_top.html -%] +

[% config.sitename %] » groups

+
+ +
diff --git a/tmpl/head.html b/tmpl/head.html new file mode 100644 index 0000000..f8e649e --- /dev/null +++ b/tmpl/head.html @@ -0,0 +1,3 @@ + + + diff --git a/tmpl/index.html b/tmpl/index.html index dada85f..bc433c1 100644 --- a/tmpl/index.html +++ b/tmpl/index.html @@ -2,14 +2,18 @@ [% config.sitename %] + [%- INCLUDE head.html -%] -

[% config.sitename %]

+ [%- INCLUDE body_top.html -%] +

[% config.sitename %]

-

Groups

+
+

Groups

-

Users

+

Users

- Source code for this website is available on svn://svn.mageia.org/svn/soft/mgapeople/. + Source code for this website is available on svn://svn.mageia.org/svn/soft/mgapeople/. +
diff --git a/tmpl/user.html b/tmpl/user.html index d334738..789069e 100644 --- a/tmpl/user.html +++ b/tmpl/user.html @@ -3,32 +3,36 @@ [% config.sitename %]: u/[% login %] + [%- INCLUDE head.html -%] -

[% login %]

- - [% IF maintdb.$login %] -

[% users.$user.cn.0 %] is maintaining [% maintdb.$login.size %] packages

- - [% END %] + diff --git a/tmpl/userindex.html b/tmpl/userindex.html index 23c28aa..3288c01 100644 --- a/tmpl/userindex.html +++ b/tmpl/userindex.html @@ -2,13 +2,17 @@ [% config.sitename %]: u + [%- INCLUDE head.html -%] -

Users

- + [%- INCLUDE body_top.html -%] +

[% config.sitename %] » users

+
+ +
-- cgit v1.2.1