Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
repanier
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chris
repanier
Commits
dccc35c6
Commit
dccc35c6
authored
May 01, 2017
by
Patrick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Css change for small devices
parent
dce5a9d3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
11 deletions
+12
-11
repanier/locale/fr/LC_MESSAGES/django.mo
repanier/locale/fr/LC_MESSAGES/django.mo
+0
-0
repanier/locale/fr/LC_MESSAGES/django.po
repanier/locale/fr/LC_MESSAGES/django.po
+2
-2
repanier/templates/repanier/order_form.html
repanier/templates/repanier/order_form.html
+8
-6
repanier/templates/repanier/registration/login.html
repanier/templates/repanier/registration/login.html
+1
-2
repanier/views/home_info_ajax.py
repanier/views/home_info_ajax.py
+1
-1
No files found.
repanier/locale/fr/LC_MESSAGES/django.mo
View file @
dccc35c6
No preview for this file type
repanier/locale/fr/LC_MESSAGES/django.po
View file @
dccc35c6
...
...
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Repanier\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-01 10:05+0200\n"
"PO-Revision-Date: 2017-05-01 1
0:06
+0100\n"
"PO-Revision-Date: 2017-05-01 1
8:15
+0100\n"
"Last-Translator: Patrick Colmant <pcolmant@gmail.com>\n"
"Language-Team: Patrick Colmant <pcolmant@gmail.com>\n"
"Language: fr\n"
...
...
@@ -3726,7 +3726,7 @@ msgstr "Mot de passe"
#: templates/repanier/registration/password_reset_form.html:2
#: templates/repanier/registration/password_reset_form.html:9
msgid "Password reset"
msgstr "
Réinitialisation d
u mot de passe"
msgstr "
Nouvea
u mot de passe"
#: templates/repanier/registration/password_change_done.html:3
#: templates/repanier/registration/password_change_form.html:4
...
...
repanier/templates/repanier/order_form.html
View file @
dccc35c6
...
...
@@ -22,11 +22,11 @@
<div
class=
"panel-group"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-body"
>
<div
class=
"col-
xs
-3"
>
<div
class=
"col-
sm
-3"
>
<a
href=
"{% url "
login_form
"
%}?
next=
{%
url
'
order_delivery_view
'
permanence.id
delivery_id
%}"
class=
"btn btn-default"
>
{% trans "Login me" %}
</a>
</div>
{% if how_to_register %}
<div
class=
"col-
xs
-9"
>
<div
class=
"col-
sm
-9"
>
<div
class=
"accordion-toggle collapsed"
data-toggle=
"collapse"
data-target=
"#collapse"
>
<span
class=
"btn btn-info"
>
{% trans "Create an account" %}
</span>
</div>
...
...
@@ -327,10 +327,12 @@
<div
class=
"btn-group"
>
<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-default"
>
<span
id=
"prepared_amount_visible_xs"
></span></a>
</div>
{% if not is_anonymous %}
<div
class=
"btn-group"
>
<a
href=
"{% url "
basket_delivery_view
"
permanence.id
delivery_id
%}"
class=
"btn btn-default"
>
<span
id=
"prepared_amount_visible_xs"
></span></a>
</div>
{% endif %}
</div>
{% if offeritem_list %}
<span
id=
"span_btn_confirm_order"
></span>
...
...
repanier/templates/repanier/registration/login.html
View file @
dccc35c6
...
...
@@ -56,8 +56,7 @@
{% endif %}
<div
class=
"modal-footer"
>
<div
class=
"form-group"
>
<button
class=
"btn btn-default"
type=
"submit"
>
{% trans "Login" %}
</button>
<a
href=
"{% url "
admin_password_reset
"
%}"
class=
"btn btn-default"
>
{% trans "Password reset" %}
</a>
<button
class=
"btn btn-default"
type=
"submit"
>
{% trans "Login" %}
</button><a
href=
"{% url "
admin_password_reset
"
%}"
class=
"btn btn-default"
>
{% trans "Password reset" %}
</a>
</div>
</div>
</form>
...
...
repanier/views/home_info_ajax.py
View file @
dccc35c6
...
...
@@ -36,7 +36,7 @@ def home_info_ajax(request):
if
permanence
.
picture
:
permanences
.
append
(
format_html
(
'<div class="panel-body"><div class="col-xs-12"><img class="img-r
ounded" style="float: left; margin: 5px;" alt="{}" title="{}" src="{}{}"/
>{}</div></div>'
,
'<div class="panel-body"><div class="col-xs-12"><img class="img-r
esponsive img-rounded " style="float: left; margin: 5px;" alt="{}" title="{}" src="{}{}"/><div class="clearfix visible-xs-block visible-sm-block"></div
>{}</div></div>'
,
permanence
.
get_permanence_customer_display
(),
permanence
.
get_permanence_customer_display
(),
settings
.
MEDIA_URL
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment