Commit e3815ebc authored by Patrick's avatar Patrick

CSS review

parent 8b090037
This diff is collapsed.
{% load cms_tags sekizai_tags i18n l10n %}
{% if producer_set %}
<div class="btn-group dropup">
<button type="button" class="btn btn-primary" data-toggle="dropdown">
<button type="button" class="btn btn-default" data-toggle="dropdown">
&nbsp;&nbsp;&nbsp;&nbsp;{% trans " P " %}&nbsp;&nbsp;&nbsp;&nbsp;
<span class="caret"></span>
</button>
......@@ -15,7 +15,7 @@
{% endif %}
{% if departementforcustomer_set %}
<div class="btn-group dropup">
<button type="button" class="btn btn-primary" data-toggle="dropdown">
<button type="button" class="btn btn-default" data-toggle="dropdown">
&nbsp;&nbsp;&nbsp;&nbsp;{% trans " D " %}&nbsp;&nbsp;&nbsp;&nbsp;
<span class="caret"></span>
</button>
......
......@@ -5,7 +5,7 @@
{% if update == "Nok" %}<div class="has-error"><span class="help-block"><strong>{% trans "Update not done." %}</strong></span></div>{% endif %}
<form name="{{ form.form_name }}" method="post" action="." validate>
{% csrf_token %}
<div class="form-group"><button type="submit" ng-disabled="{{ form.form_name }}.$invalid" class="btn btn-primary pull-right">{% trans "Update" %}</button></div>
<div class="form-group"><button type="submit" ng-disabled="{{ form.form_name }}.$invalid" class="btn btn-default pull-right">{% trans "Update" %}</button></div>
{% trans "All informations bellow are visible to all members except your phone and email. You have the choice to specify if your phone and/or mail are visible to others members." %}
<p>{% if membership_fee_valid_until %}<i>{% trans "Your membership fee is valid until" %} : <u>{{ membership_fee_valid_until }}</u></i>{% endif %}</p>
{{ form.as_div }}
......
......@@ -7,11 +7,11 @@
<div class="panel panel-primary">
<div class="panel-body">
<div class="col-xs-3">
<a href="{% url "login_form" %}?next={% url 'order_delivery_view' permanence.id delivery_id %}" class="btn btn-primary">{% trans "Login me" %}</a>
<a href="{% url "login_form" %}?next={% url 'order_delivery_view' permanence.id delivery_id %}" class="btn btn-default">{% trans "Login me" %}</a>
</div>
<div class="col-xs-9">
<div class="accordion-toggle collapsed" data-toggle="collapse" data-target="#collapse">
<span class="btn btn-primary">{% trans "Create an account" %}</span>
<span class="btn btn-info">{% trans "Create an account" %}</span>
</div>
<div id="collapse" class="panel-collapse collapse">
{{ how_to_register }}
......@@ -293,7 +293,7 @@
{{ permanence.cache_part_d | safe }}
{% if box_set %}
<div class="btn-group dropup">
<button type="button" class="btn btn-primary" data-toggle="dropdown">
<button type="button" class="btn btn-default" data-toggle="dropdown">
&nbsp;&nbsp;&nbsp;&nbsp;📦&nbsp;&nbsp;&nbsp;&nbsp;
<span class="caret"></span>
</button>
......@@ -307,10 +307,10 @@
</div>
{% endif %}
<div class="btn-group">
<a href="{% url "order_delivery_view" permanence.id delivery_id %}?producer=all&departementforcustomer={{ departementforcustomer_id }}" class="btn btn-primary">{% trans "All" %}</a>
<a href="{% url "order_delivery_view" permanence.id delivery_id %}?producer=all&departementforcustomer={{ departementforcustomer_id }}" class="btn btn-default">{% trans "All" %}</a>
</div>
<div class="btn-group">
<a href="{% url "basket_delivery_view" permanence.id delivery_id %}" class="btn btn-primary">
<a href="{% url "basket_delivery_view" permanence.id delivery_id %}" class="btn btn-default">
<span id="prepared_amount_visible_xs"></span></a>
</div>
</div>
......
......@@ -236,7 +236,7 @@
{% endwith %}
</div>
<div class="modal-footer">
<input name="submit" value="{% trans "Add" %}" class="btn btn-primary" id="submit-id-submit" type="submit">
<input name="submit" value="{% trans "Add" %}" class="btn btn-default" id="submit-id-submit" type="submit">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">{% trans "Cancel" %}</button>
</div>
</form>
......
......@@ -232,7 +232,7 @@
{% endwith %}
</div>
<div class="modal-footer">
<input name="submit" value="{% trans "Update" %}" class="btn btn-primary" id="submit-id-submit" type="submit">
<input name="submit" value="{% trans "Update" %}" class="btn btn-default" id="submit-id-submit" type="submit">
{% if update %}
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">{% trans "Close" %}</button>
<script>
......
......@@ -9,8 +9,8 @@
</div>
<div class="modal-body">
{% blocktrans %}You are now disconnected. You can go right now on the
<a href="/repanier/go_repanier/" class="btn btn-primary">login page</a> or on the
<a href="/" class="btn btn-primary">home page</a>.{% endblocktrans %}
<a href="/repanier/go_repanier/" class="btn btn-default">login page</a> or on the
<a href="/" class="btn btn-default">home page</a>.{% endblocktrans %}
</div><!-- /form -->
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
......
......@@ -45,7 +45,7 @@
<p></p>
<div class="form-group">
<div class="accordion-toggle collapsed" data-toggle="collapse" data-target="#collapse">
<span class="btn btn-primary">{% trans "Create an account" %}</span>
<span class="btn btn-info">{% trans "Create an account" %}</span>
</div>
<div id="collapse" class="panel-collapse collapse">
{{ how_to_register }}
......@@ -54,8 +54,8 @@
</div>
<div class="modal-footer">
<div class="form-group">
<button class="btn btn-primary" type="submit">{% trans "Login" %}</button>
&nbsp;&nbsp;&nbsp;&nbsp;<a href="{% url "admin_password_reset" %}" class="btn btn-primary">{% trans "Password reset" %}</a>
<button class="btn btn-default" type="submit">{% trans "Login" %}</button>
&nbsp;&nbsp;&nbsp;&nbsp;<a href="{% url "admin_password_reset" %}" class="btn btn-default">{% trans "Password reset" %}</a>
</div>
</div>
</form>
......
......@@ -10,7 +10,7 @@
</div>
<div class="modal-body">
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
<a href="{% url "login_form" %}" class="btn btn-primary">{% trans 'Log in' %}</a>
<a href="{% url "login_form" %}" class="btn btn-default">{% trans 'Log in' %}</a>
</div><!-- /form -->
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
......
......@@ -51,7 +51,7 @@
</div>
<div class="modal-footer">
</br>
<button class="btn btn-primary" type="submit">{% trans "Change my password" %}</button>
<button class="btn btn-default" type="submit">{% trans "Change my password" %}</button>
</div>
</form>
......
......@@ -18,7 +18,7 @@
<input id="id_email" name="email" type="text" class="textinput textInput form-control"/>
</p>
</div>
<button class="btn btn-primary" type="submit">{% trans "Reset my password" %}</button>
<button class="btn btn-default" type="submit">{% trans "Reset my password" %}</button>
</form>
</div><!-- /form -->
</div><!-- /.modal-content -->
......
......@@ -5,7 +5,7 @@
<form name="{{ form.form_name }}" method="post" action="." validate>
{% csrf_token %}
{% if update != '2' %}
<div class="form-group"><button type="submit" ng-disabled="{{ form.form_name }}.$invalid" class="btn btn-primary pull-right">{% trans "Send e-mail" %}</button></div>
<div class="form-group"><button type="submit" ng-disabled="{{ form.form_name }}.$invalid" class="btn btn-default pull-right">{% trans "Send e-mail" %}</button></div>
{% endif %}
{% if coordinator %}
<div class="bg-danger">
......
......@@ -6,7 +6,7 @@
<form name="{{ form.form_name }}" method="post" action="." validate>
{% csrf_token %}
{% if update != '2' %}
<div class="form-group"><button type="submit" ng-disabled="{{ form.form_name }}.$invalid" class="btn btn-primary pull-right">{% trans "Send e-mail" %}</button></div>
<div class="form-group"><button type="submit" ng-disabled="{{ form.form_name }}.$invalid" class="btn btn-default pull-right">{% trans "Send e-mail" %}</button></div>
{% endif %}
<b>{% trans "This message will be send only to coordinators you have selected." %}</b><p></p>
{{ form.as_div }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment