mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app

Browse Source
This commit is contained in:
www-data 2017-10-28 01:00:41 +02:00
commit 25dbd643dd
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ofu_app/ofu_app/settings.py
View File

@ -39,6 +39,7 @@ INSTALLED_APPS = [
'apps.events', 'apps.events',
'apps.donar', 'apps.donar',
'rest_framework', 'rest_framework',
'analytical',
] ]
REST_FRAMEWORK = { REST_FRAMEWORK = {
@ -160,3 +161,6 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
# Media files should be stored here # Media files should be stored here
MEDIA_ROOT = os.path.join(BASE_DIR, "media") MEDIA_ROOT = os.path.join(BASE_DIR, "media")
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
PIWIK_DOMAIN_PATH = 'mg-server.ddns.net/piwik'
PIWIK_SITE_ID = '1'

19
ofu_app/templates/base.jinja
View File

@ -15,6 +15,25 @@
<link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}"> <link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}">
<link rel="stylesheet" href="{{ static('css/nav.css') }}"> <link rel="stylesheet" href="{{ static('css/nav.css') }}">
{% block css_extra %}{% endblock %} {% block css_extra %}{% endblock %}
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function () {
var u = "//mg-server.ddns.net/piwik/";
_paq.push(['setTrackerUrl', u + 'piwik.php']);
_paq.push(['setSiteId', '1']);
var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
g.type = 'text/javascript';
g.async = true;
g.defer = true;
g.src = u + 'piwik.js';
s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Piwik Code -->
</head> </head>
{# ===== Body ===== #} {# ===== Body ===== #}

15
ofu_app/templates/macros/food_macros.jinja
View File

@ -46,21 +46,22 @@
{% if single_food.price_student %} {% if single_food.price_student %}
<div class="col-4"><span class="float-right">{{ single_food.price_student }}</span></div> <div class="col-4"><span class="float-right">{{ single_food.price_student }}</span></div>
{% endif %} {% endif %}
{# <div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="" width="1024" {#<div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="" width="1024"
height="800"><i class="img-placeholder fa fa-cutlery text-right"></i></div> #} height="800"><i
class="img-placeholder fa fa-cutlery text-right"></i></div>#}
</div> </div>
<div class="row"> <div class="row">
<div class="rating-wrapper col-6 text-left"></div> <div class="rating-wrapper col-6 text-left"></div>
<div class="col-6 text-right"> {# <div class="col-6 text-right">
{# <label for="pic-upload-{{ single_food.id }}" class="custom-pic-upload"> <label for="pic-upload-{{ single_food.id }}" class="custom-pic-upload">
<i class="fa fa-camera" aria-hidden="true"></i> <i class="fa fa-camera" aria-hidden="true"></i>
</label> </label>
<div class="pic-input-wrapper"> <div class="pic-input-wrapper">
TODO: extract style to external css file #}{# TODO: extract style to external css file#}{#
<input id="pic-upload-{{ single_food.id }}" class="pic-upload" type="file" name="photo" <input id="pic-upload-{{ single_food.id }}" class="pic-upload" type="file" name="photo"
id="upload-photo" style="display: none !important;"/> id="upload-photo" style="display: none !important;"/>
</div> #} </div>
</div> </div>#}
</div> </div>
</li> </li>
{% endfor %} {% endfor %}