Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
AE
Sith
Commits
200af579
Commit
200af579
authored
May 09, 2017
by
Sli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put scss in renderer
parent
f87ec1e3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
38 deletions
+7
-38
core/templates/core/base.jinja
core/templates/core/base.jinja
+0
-1
core/templatetags/renderer.py
core/templatetags/renderer.py
+6
-1
core/templatetags/scss.py
core/templatetags/scss.py
+0
-35
sith/settings.py
sith/settings.py
+1
-1
No files found.
core/templates/core/base.jinja
View file @
200af579
...
...
@@ -8,7 +8,6 @@
<link
rel=
"stylesheet"
href=
"
{{
static
(
'core/jquery.datetimepicker.min.css'
)
}}
"
>
<link
rel=
"stylesheet"
href=
"
{{
static
(
'core/js/ui/jquery-ui.min.css'
)
}}
"
>
<link
rel=
"stylesheet"
href=
"
{{
static
(
'ajax_select/css/ajax_select.css'
)
}}
"
>
{# <link href="{% sass_src 'core/style.scss' %}" rel="stylesheet" type="text/css" /> #}
<link
href=
"
{{
scss
(
'core/style.scss'
)
}}
"
rel=
"stylesheet"
type=
"text/css"
/>
{%
endblock
%}
</head>
...
...
core/templatetags/renderer.py
View file @
200af579
...
...
@@ -2,6 +2,7 @@
#
# Copyright 2016,2017
# - Skia <skia@libskia.so>
# - Sli <antoine@bartuccio.fr>
#
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr.
...
...
@@ -25,6 +26,7 @@
from
django
import
template
from
django.template.defaultfilters
import
stringfilter
from
django.utils.safestring
import
mark_safe
from
core.scss.processor
import
ScssProcessor
from
django.utils.html
import
escape
from
core.markdown
import
markdown
as
md
...
...
@@ -49,4 +51,7 @@ def datetime_format_python_to_PHP(python_format_string):
php_format_string
=
php_format_string
.
replace
(
py
,
php
)
return
php_format_string
@
register
.
simple_tag
()
def
scss
(
path
):
processor
=
ScssProcessor
(
path
)
return
processor
.
get_converted_scss
()
\ No newline at end of file
core/templatetags/scss.py
deleted
100644 → 0
View file @
f87ec1e3
#!/usr/bin/env python3
# -*- coding:utf-8 -*
#
# Copyright 2017
# - Sli <antoine@bartuccio.fr>
#
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License a published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
from
django
import
template
from
core.scss.processor
import
ScssProcessor
register
=
template
.
Library
()
@
register
.
simple_tag
()
def
scss
(
path
):
processor
=
ScssProcessor
(
path
)
return
processor
.
get_converted_scss
()
sith/settings.py
View file @
200af579
...
...
@@ -147,7 +147,7 @@ TEMPLATES = [
"ProductType"
:
"counter.models.ProductType"
,
"timezone"
:
"django.utils.timezone"
,
"get_sith"
:
"com.views.sith"
,
"scss"
:
"core.templatetags.
scss
.scss"
,
"scss"
:
"core.templatetags.
renderer
.scss"
,
},
"bytecode_cache"
:
{
"name"
:
"default"
,
...
...
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