SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Use Zurb Foundation as base front-end framework

pull/6/head
Marcio Mazza 10 years ago
parent
a00b41b0b4
commit
cf834f1d96
4 changed files with 57 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      requirements/requirements.txt
  2. 30
      sapl/layout.py
  3. 9
      sapl/settings.py
  4. 71
      templates/base.html

2
requirements/requirements.txt
View File

@ -1,8 +1,10 @@
crispy-forms-foundation
Django Django
django-admin-bootstrapped django-admin-bootstrapped
django-bootstrap3 django-bootstrap3
django-braces django-braces
django-crispy-forms django-crispy-forms
django-zurb-foundation
psycopg2 psycopg2
pytz pytz
PyYAML PyYAML

30
sapl/layout.py
View File

@ -1,5 +1,5 @@
from crispy_forms.bootstrap import FormActions from crispy_forms_foundation.layout import (
from crispy_forms.layout import Submit, Reset, Layout, Div, Fieldset Layout, Fieldset, Row, Column, ButtonGroup, Button, Submit)
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
@ -9,11 +9,11 @@ def to_column(name_span):
except: except:
return name_span return name_span
else: else:
return Div(fieldname, css_class='col-xs-%d' % span) return Column(fieldname, css_class='large-%d' % span)
def to_row(names_spans): def to_row(names_spans):
return Div(*list(map(to_column, names_spans)), css_class='row-fluid') return Row(*list(map(to_column, names_spans)))
def to_fieldsets(fields): def to_fieldsets(fields):
@ -29,9 +29,21 @@ def to_fieldsets(fields):
class SaplFormLayout(Layout): class SaplFormLayout(Layout):
def __init__(self, *fields): def __init__(self, *fields):
_fields = list(to_fieldsets(fields)) + [ _fields = list(to_fieldsets(fields)) + buttons_crispies()
FormActions(
Submit('save', _('Save'), css_class='btn btn-primary '),
Reset('reset', _('Cancel'), css_class='btn'))
]
super(SaplFormLayout, self).__init__(*_fields) super(SaplFormLayout, self).__init__(*_fields)
def buttons_crispies():
return [
Row(
Column(
ButtonGroup(
Submit('submit', _('Submit'), css_class='success'),
Button('cancel', _('Cancel')),
Button('dummy', _('Delete'), css_class='alert'),
css_class='radius right'
),
css_class='clearfix'
),
),
]

9
sapl/settings.py
View File

@ -54,6 +54,10 @@ INSTALLED_APPS = (
'django_extensions', 'django_extensions',
'bootstrap3', 'bootstrap3',
'crispy_forms', 'crispy_forms',
# zurb foundation
'foundation',
'crispy_forms_foundation',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
@ -118,9 +122,12 @@ LOCALE_PATHS = (
# https://docs.djangoproject.com/en/1.8/howto/static-files/ # https://docs.djangoproject.com/en/1.8/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATICFILES_DIRS = (
os.path.join(BASE_DIR, "static"),
)
DAB_FIELD_RENDERER = \ DAB_FIELD_RENDERER = \
'django_admin_bootstrapped.renderers.BootstrapFieldRenderer' 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer'
CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_TEMPLATE_PACK = 'foundation-5'
CRISPY_FAIL_SILENTLY = not DEBUG CRISPY_FAIL_SILENTLY = not DEBUG

71
templates/base.html
View File

@ -1,67 +1,48 @@
{% load bootstrap3 %}
{% load i18n %} {% load i18n %}
{% load static from staticfiles %} {% load staticfiles %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}> <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head> <head>
<title>{% block title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %}</title> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <title>{% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
{% block header_content %}
<link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet"/> <link rel="stylesheet" href="{% static 'foundation/css/foundation.min.css' %}">
<style type="text/css"> <script type="text/javascript" src="{% static 'foundation/js/vendor/modernizr.js' %}"></script>
body { <script type="text/javascript" src="{% static 'foundation/js/vendor/jquery.js' %}"></script>
padding: 10px 20px 40px; <script type="text/javascript" src="{% static 'foundation/js/vendor/fastclick.js' %}"></script>
} <script type="text/javascript" src="{% static 'foundation/js/foundation.min.js' %}"></script>
</style> {% endblock %}
<link href="{% static "bootstrap/css/bootstrap-theme.min.css" %}" rel="stylesheet"/>
{# TODO review these js dependencies #}
<script src="{% static "admin/js/jquery-1.9.1.min.js" %}"></script>
<script src="{% static "admin/js/jquery-migrate-1.2.1.min.js" %}"></script>
<script src="{% static "bootstrap/js/bootstrap.min.js" %}"></script>
<script type="text/javascript">
//<![CDATA[
(function($) {
$(document).ready(function() {
$('input[type="submit"]').addClass('btn');
$('[title]').tooltip();
});
}(jQuery));
//]]>
</script>
{% block extrahead %}{% endblock %}
</head> </head>
<body> <body>
<!-- Container -->
<div class="container-fluid">
<header> <header>
... header ... ... header ...
<hr/> <hr/>
</header> </header>
<!-- Content --> <!-- Content -->
<div id="content" class="{% block coltype %}colM{% endblock %}"> {% block content_container %}
{# FIXME: row class is not for that: replace it keeping the layout (notice width) #}
{% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %} <div id="body_content" class="row">
{% bootstrap_messages %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% endblock %}
<!-- END Content --> <!-- END Content -->
<footer id="footer"> <footer id="footer">
<hr/> <hr/>
... footer... ... footer...
</footer> </footer>
</div>
<!-- END Container -->
{% block foot_more_js %}{% endblock %}
{# Init Foundation #}
{% block foundation_js_init %}
<script>
$(document).foundation();
</script>
{% endblock foundation_js_init %}
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save