handle templating
This commit is contained in:
parent
98306c05b8
commit
a69323f936
|
@ -1,3 +1,8 @@
|
|||
templates/authentic2
|
||||
templates/combo
|
||||
templates/includes
|
||||
templates/qommon
|
||||
templates/theme.html
|
||||
/sdist/
|
||||
/static/*/style.css
|
||||
/static/*/style.css.map
|
||||
|
|
12
Makefile
12
Makefile
|
@ -19,7 +19,7 @@ clean:
|
|||
|
||||
DIST_FILES = \
|
||||
Makefile static\
|
||||
themes.json \
|
||||
templates themes.json \
|
||||
publik-base-theme
|
||||
|
||||
dist: clean
|
||||
|
@ -31,11 +31,15 @@ dist: clean
|
|||
done
|
||||
|
||||
install:
|
||||
mkdir -p $(DESTDIR)$(prefix)/share/publik/themes/rouen
|
||||
cp -r static themes.json $(DESTDIR)$(prefix)/share/publik/themes/rouen
|
||||
mkdir -p $(DESTDIR)$(prefix)/share/publik/themes/rouen/
|
||||
cp -r static templates themes.json $(DESTDIR)$(prefix)/share/publik/themes/rouen
|
||||
ln -s $(prefix)/share/publik/themes/publik-base/templates/authentic2 $(DESTDIR)$(prefix)/share/publik/themes/rouen/templates/authentic2
|
||||
ln -s $(prefix)/share/publik/themes/publik-base/templates/combo $(DESTDIR)$(prefix)/share/publik/themes/rouen/templates/combo
|
||||
ln -s $(prefix)/share/publik/themes/publik-base/templates/qommon $(DESTDIR)$(prefix)/share/publik/themes/rouen/templates/qommon
|
||||
ln -s $(prefix)/share/publik/themes/publik-base/templates/theme.html $(DESTDIR)$(prefix)/share/publik/themes/rouen/templates/theme.html
|
||||
ln -s $(prefix)/share/publik/themes/publik-base/templates/includes $(DESTDIR)$(prefix)/share/publik/themes/rouen/templates/includes
|
||||
|
||||
dist-bzip2: dist
|
||||
-mkdir sdist
|
||||
cd sdist && tar cfj ../sdist/$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
|
||||
|
||||
version:
|
||||
|
|
|
@ -2,13 +2,13 @@ Source: rouen-publik-theme
|
|||
Section: web
|
||||
Priority: optional
|
||||
Maintainer: Emmanuel Cazenave <ecazenave@entrouvert.com>
|
||||
Build-Depends: debhelper (>= 8.0.0), ruby-sass (>= 3.4.23), inkscape
|
||||
Build-Depends: debhelper (>= 8.0.0), ruby-sass (>= 3.4.23), inkscape, publik-base-theme
|
||||
Standards-Version: 3.9.4
|
||||
Homepage: http://git.entrouvert.org/rouen-publik-theme.git
|
||||
|
||||
Package: rouen-publik-theme
|
||||
Architecture: all
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, python-xstatic-abrilfatface
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, publik-base-theme
|
||||
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0)
|
||||
Breaks: combo (< 0.7.1)
|
||||
Description: Rouen Publik Theme
|
||||
|
|
|
@ -240,6 +240,13 @@ form.quixote div.title label{
|
|||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
div#content div.buttons.submit {
|
||||
@include flexbox();
|
||||
& div.submit-button {
|
||||
order: 1;
|
||||
}
|
||||
}
|
||||
|
||||
div#content div.SubmitWidget {
|
||||
button[name=submit][value=Suivant], button[name=submit][value=Valider], button[name=previous] {
|
||||
background-color: $primary-color;
|
||||
|
@ -351,6 +358,9 @@ div#tracking-code {
|
|||
div#steps ol {
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
li.first.last::after {
|
||||
background: none;
|
||||
}
|
||||
li {
|
||||
position: relative;
|
||||
-ms-flex: 1;
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
{% extends "../../authentic2/accounts.html" %}
|
||||
|
||||
{% block user-info %}
|
||||
{% if user.is_authenticated %}
|
||||
<a accesskey="o" class="logout" href="{% url 'auth_logout' %}"><div class="logtext">Déconnexion</div><div class="logicon"></div></a>
|
||||
{% if idp_account_url %}<a class="registration" href="{{idp_account_url}}">{% endif %}
|
||||
<span>{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}
|
||||
{% else %}
|
||||
{% if idp_registration_url %}
|
||||
<a accesskey="2" class="login" href="{% url 'auth_login' %}"><div class="logtext">Connexion</div><div class="logicon"></div></a>
|
||||
<a class="registration" href="{{idp_registration_url}}"><span class="pre-register">Pas de compte ?</span><span class="register">Enregistrez-vous !</span></a>
|
||||
{% else %}
|
||||
<a accesskey="2" class="registration" href="{% url 'auth_login' %}">Connexion <span class="sep">/</span> Inscription</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
|
@ -0,0 +1,19 @@
|
|||
{% extends "../../combo/page_template.html" %}
|
||||
{% load combo %}
|
||||
|
||||
{% block user-info %}
|
||||
{% skeleton_extra_placeholder user-info %}
|
||||
{% if user.is_authenticated %}
|
||||
<a accesskey="o" class="logout" href="{% url 'auth_logout' %}"><div class="logtext">Déconnexion</div><div class="logicon"></div></a>
|
||||
{% if idp_account_url %}<a class="registration" href="{{idp_account_url}}">{% endif %}
|
||||
<span>{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}
|
||||
{% else %}
|
||||
{% if idp_registration_url %}
|
||||
<a accesskey="2" class="login" href="{% url 'auth_login' %}"><div class="logtext">Connexion</div><div class="logicon"></div></a>
|
||||
<a class="registration" href="{{idp_registration_url}}"><span class="pre-register">Pas de compte ?</span><span class="register">Enregistrez-vous !</span></a>
|
||||
{% else %}
|
||||
<a accesskey="2" class="registration" href="{% url 'auth_login' %}">Connexion <span class="sep">/</span> Inscription</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% end_skeleton_extra_placeholder %}
|
||||
{% endblock %}
|
|
@ -0,0 +1,5 @@
|
|||
{% extends "qommon/forms/widget.html" %}
|
||||
{% block widget-control %}
|
||||
{% if request.quixote_request.is_in_backoffice %}{{ block.super }}{% else %}
|
||||
<label>{{widget.render_content|safe}}<span></span></label>{% endif %}
|
||||
{% endblock %}
|
Reference in New Issue