put form steps in the right column (#8419)

This commit is contained in:
Frédéric Péters 2015-10-06 13:14:02 +02:00
parent db07b152f7
commit dd77204e09
6 changed files with 23 additions and 13 deletions

View File

@ -534,7 +534,6 @@ form .submit-button, form .cancel-button, #rub_service form .submit-button, #rub
text-align: right;
}
#steps {
float: left;
width: 100%;
}
.steplist > .panel {

View File

@ -31,7 +31,6 @@ form {
.steplist {
margin: 0px;
padding-top: 0px;
margin-top: -20px;
padding-right: 15px;
}

View File

@ -30,12 +30,6 @@ class RemoteTemplate(object):
r = requests.get(theme_skeleton_url, params={'source': self.source, 'format': 'ezt'})
body = """
[if-any gauche]
<div id="gauche">
[gauche]
</div>
[end]
[if-any bigdiv]<div id="[bigdiv]" [if-any breadcrumb]class="has-breadcrumb"[end]>[end]
[if-any title]<h2>[title]</h2>[end]
@ -67,6 +61,15 @@ class RemoteTemplate(object):
[end]
"""
right_column = """ [if-any gauche]
<div class="steplist"><div class="panel panel-defaults">
<div class="panel-body">
[gauche]
</div>
</div></div>
[end]"""
custom_breadcrumb = ''
from quixote import get_response, get_publisher
from quixote.html import htmlescape
@ -96,6 +99,8 @@ class RemoteTemplate(object):
template_content = template_content.replace('[if-any extra-head][extra-head][end]', extra_head)
template_content = template_content.replace('[if-any left-menu-links][left-menu-links][end]', left_menu_links)
template_content = template_content.replace('[if-any user-name][user-name][end]', user_name)
template_content = template_content.replace(
'[if-any right-column][right-column][end]', right_column)
self.cache(template_content)
return template_content

View File

@ -27,3 +27,8 @@
{% endblock %}
{% endblock %}
{% endblock %}
{% block right-column %}
{% skeleton_extra_placeholder right-column %}
{% end_skeleton_extra_placeholder %}
{% endblock %}

View File

@ -1,6 +1,4 @@
{% load blurp_tags %}
<div id="col-right" class="col-md-3 hidden-xs hidden-sm">
<div class="row">
{% blurp "agenda" %}
<div class="col-sm-16 col-md-16" id="events">
<div class="events_single box box-full">
@ -74,8 +72,6 @@
</a>
{% endblurp %}
</div>
</div>
</div>
</div>

View File

@ -184,7 +184,13 @@
</div> <!-- content -->
</div> <!-- main content -->
<!-- right colonne -->
{% include "right-col.html" %}
<div id="col-right" class="col-md-3 hidden-xs hidden-sm">
<div class="row">
{% block right-column %}
{% endblock %}
{% include "right-col.html" %}
</div>
</div>
</div> <!-- #main-content-wrapper -->
</div></div>
<div id="footer" class="footer hidden-print">