aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--schema.sql3
-rw-r--r--static/style.css18
-rw-r--r--templates/layout.html44
-rw-r--r--templates/user/edit.html7
4 files changed, 47 insertions, 25 deletions
diff --git a/schema.sql b/schema.sql
index e0668c6..6c8c721 100644
--- a/schema.sql
+++ b/schema.sql
@@ -11,7 +11,8 @@ create table users (
phone string,
address_line1,
address_line2,
- address_city_line
+ address_city_line,
+ kado string
);
drop table if exists news;
diff --git a/static/style.css b/static/style.css
index a5ad5e0..1e60c12 100644
--- a/static/style.css
+++ b/static/style.css
@@ -159,7 +159,7 @@ background-color : #B9CEFF;
input[type=button],[type=submit]{
background-color : #B9CEFF;
color : black;
--moz-border-radius : 5px;
+-moz-border-radius : 5px;
}
textarea{
@@ -505,7 +505,17 @@ margin-right : auto;
font-weight : bold;
}
+p.kadoscope{
+ opacity : 0;
+ text-align : center;
+ color : #E61000;
+ font-size : 20px;
+ font-weight : bold;
+}
-
-
-
+#kadobutton{
+ background-image : url('gfx/gift.png');
+ background-repeat : no-repeat;
+ background-position : center;
+ height : 130px;
+}
diff --git a/templates/layout.html b/templates/layout.html
index dc9be11..709daef 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -3,8 +3,9 @@
<head>
<title>{% block title %}Site de la famille{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="stylesheet" media="screen" type="text/css" href="{{ url_for('static', filename = 'style.css') }}" />
- <!-- <link rel="alternate" type="application/rss+xml" title="Les actualités" href="rss.xml" /> -->
+ <link rel="stylesheet" media="screen" type="text/css"
+ href="{{ url_for('static', filename = 'style.css') }}" />
+ <link rel="alternate" type="application/rss+xml" title="Les actualités" href='rss.xml' />
</head>
<body>
{% block body %}
@@ -12,23 +13,28 @@
<div class="sheet">
<div class="top">
<p><strong>{{session['user_name']}}</strong>
- (<a href="/user/edit">Mon compte</a> | <a href="/logout">Se déconnecter</a>)</p>
- </div>
- <div class="main_menu">
- <table>
- <tr>
- <td><a href="/">Accueil</a></td>
- <td><a href="/article/">Articles</a></td>
- <td><a href="/user/">Famille</a></td>
- <td><a href="/system/">Système</a></td>
- </tr>
- </table>
- </div>
- <div class="main">
- {% block content %}{% endblock %}
+ (<a href="/user/edit">Mon compte</a> |
+ <a href="/logout">Se déconnecter</a>)</p>
+ </div>
+ <div class="main_menu">
+ <table>
+ <tr>
+ <td><a href="/">Accueil</a></td>
+ <td><a href="/article/">Articles</a></td>
+ <td><a href="/user/">Famille</a></td>
+ <td><a href="/system/">Système</a></td>
+ </tr>
+ </table>
+ </div>
+ <div class="main">
+ {% block content %}{% endblock %}
+ </div>
</div>
</div>
- </div>
- {% endblock body %}
-</body>
+ {% endblock body %}
+ <script type="text/javascript"
+ src="{{ url_for('static', filename='jquery.js')}}"></script>
+ <script type="text/javascript"
+ src="{{ url_for('static', filename='famille.js')}}"></script>
+ </body>
</html>
diff --git a/templates/user/edit.html b/templates/user/edit.html
index e9d151a..b85f7b2 100644
--- a/templates/user/edit.html
+++ b/templates/user/edit.html
@@ -1,6 +1,11 @@
{% extends 'layout.html' %}
{% block content %}
+<h2>Kadoscope</h2>
+<p>Cliquer sur le cadeau ci-dessous pour découvrir le nom de l'heureux élu qui recevra un cadeau de votre part.</p>
+<p class="kadoscope">{{user.kado}}</p>
+<p id="kadobutton"></p>
+<h2>Paramètres du Compte</h2>
<form method="post" action="{{url_for('edit_user')}}" class="userform">
<fieldset>
<legend>Paramètres</legend>
@@ -51,7 +56,7 @@
</p>
</fieldset>
<p class="submit"><input type="submit" id="submit" value="Enregistrer"/></p>
-</form>
+</form>
{% endblock %}