2:04 p.m.
commit 9fc01d9977b60ad79cadc389f5cb4cf4272442be
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 2 14:21:56 2016 +0100
Add rf templates version
files/hotfix/fas/error.html | 25 +++++++++++++++++++++++++
files/hotfix/fas/home.html | 33 +++++++++++++++++++++++++++++++++
files/hotfix/fas/login.html | 15 +++++++++++++++
files/hotfix/fas/welcome.html | 27 +++++++++++++++++++++++++++
4 files changed, 100 insertions(+), 0 deletions(-)
---
diff --git a/files/hotfix/fas/error.html b/files/hotfix/fas/error.html
new file mode 100644
index 0000000..044ebfa
--- /dev/null
+++ b/files/hotfix/fas/error.html
@@ -0,0 +1,25 @@
+<!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"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="master.html" />
+ <head>
+ <title>${_('RPM Fusion Accounts System')}</title>
+ <style type="text/css">
+ #content ul
+ {
+ list-style: square;
+ margin: 1ex 3ex;
+ }
+ </style>
+ </head>
+ <body>
+ <h2>${_('Error!')}</h2>
+ <p>${_('The following error(s) have occurred with your
request:')}</p>
+ <ul>
+ <li py:for="field, error in tg_errors.items()">
+ ${field}: ${error}
+ </li>
+ </ul>
+ </body>
+</html>
diff --git a/files/hotfix/fas/home.html b/files/hotfix/fas/home.html
new file mode 100644
index 0000000..6d6843f
--- /dev/null
+++ b/files/hotfix/fas/home.html
@@ -0,0 +1,33 @@
+<!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"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="master.html" />
+ <head>
+ <title>${_('RPM Fusion Accounts System')}</title>
+ </head>
+ <body>
+ <?python
+ from fas import auth
+ from fas.model import People?>
+ <h2>${_('To do queue:')}</h2>
+ <ul class="queue">
+ <li py:if="not cla"
class="unapproved">${Markup(_('FPCA not completed. To become a full RPM
Fusion Contributor please <a href="%s">complete the
FPCA</a>.') % tg.url('/fpca/'))}</li>
+ <li py:if="not person.ssh_key">${Markup(_('You have not
submitted an SSH key, some RPM Fusion resources require an SSH key. Please submit yours
by editing <a href="%s">My Account</a>') %
tg.url('/user/edit'))}</li>
+ </ul>
+ <py:for each="group in sorted(memberships)">
+ <py:if
test="auth.can_sponsor_group(People.by_username(person['username']), group)
and group.unapproved_roles">
+ <ul class="queue">
+ <li py:for="role in group.unapproved_roles[:5]">
+ ${Markup(_('<strong><a
href="%(userview)s">%(user)s
(%(email)s)</a></strong> requests approval to join <a
href="%(groupview)s">%(group)s</a>.') %
+ {'userview': tg.url('/user/view/%s') % role.member.username,
+ 'groupview': tg.url('/group/view/%s') % group.name,
+ 'user': role.member.username,
+ 'email': role.member.email,
+ 'group': group.name})}
+ </li>
+ </ul>
+ </py:if>
+ </py:for>
+ </body>
+</html>
diff --git a/files/hotfix/fas/login.html b/files/hotfix/fas/login.html
new file mode 100644
index 0000000..29746b0
--- /dev/null
+++ b/files/hotfix/fas/login.html
@@ -0,0 +1,15 @@
+<!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"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="master.html" />
+ <xi:include href="${tg.fedora_template('login.html')}" />
+
+ <head>
+ <title>${_('Login to the RPM Fusion Accounts System')}</title>
+ </head>
+
+ <body>
+ <loginform>${message}</loginform>
+ </body>
+</html>
diff --git a/files/hotfix/fas/welcome.html b/files/hotfix/fas/welcome.html
new file mode 100644
index 0000000..deaec7b
--- /dev/null
+++ b/files/hotfix/fas/welcome.html
@@ -0,0 +1,27 @@
+<!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"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="master.html" />
+ <head>
+ <title>${_('Welcome to FAS2')}</title>
+ <style type="text/css">
+ #content ul
+ {
+ list-style: square;
+ margin: 1ex 3ex;
+ }
+ </style>
+ </head>
+ <body>
+ <p>
+ ${Markup(_('Welcome to the RPM Fusion Accounts System. Please submit bugs to
<a
href="https://fedorahosted.org/fas/">https://fedorahoste...
or stop by #fedora-admin on irc.freenode.net.'))}
+ </p>
+ <ul>
+ <li><a href="${tg.url('/login')}">${_('Log
In')}</a></li>
+ <li><a
href="${tg.url('/user/resetpass')}">${_('Forgot
Password?')}</a></li>
+ <li><a href="${tg.url('/user/new')}">${_('New
Account')}</a></li>
+ <li><a href="http://rpmfusion.org/Contributors">${_('Why
Join?')}</a></li>
+ </ul>
+ </body>
+</html>