diff --git a/base/templatetags/menus.py b/base/templatetags/menus.py new file mode 100644 index 000000000..2c9f00fb9 --- /dev/null +++ b/base/templatetags/menus.py @@ -0,0 +1,39 @@ +import os + +import yaml +from django import template +from django.core.urlresolvers import reverse +from sapl.settings import BASE_DIR + +register = template.Library() +TEMPLATES_DIR = BASE_DIR.child("templates") + + +@register.inclusion_tag('menus/subnav.html', takes_context=True) +def subnav(context, path=None): + """Renders a subnavigation for views of a certain object. + + If not provided, path defaults to /subnav.yaml + """ + # TODO: 118n !!!!!!!!!!!!!! + # How to internationalize yaml files???? + menu = None + if 'object' in context: + obj = context['object'] + default_path = '%s/subnav.yaml' % obj.__class__._meta.app_label + path = os.path.join(TEMPLATES_DIR, path or default_path) + if os.path.exists(path): + menu = yaml.load(open(path, 'r')) + resolve_urls_inplace(menu, obj.pk) + return dict(menu=menu) + + +def resolve_urls_inplace(menu, pk): + if isinstance(menu, list): + for item in menu: + resolve_urls_inplace(item, pk) + else: + if 'url' in menu: + menu['url'] = reverse(menu['url'], kwargs={'pk': pk}) + if 'children' in menu: + resolve_urls_inplace(menu['children'], pk) diff --git a/base/views.py b/base/views.py index a17146596..5f7247d09 100644 --- a/base/views.py +++ b/base/views.py @@ -2,7 +2,7 @@ import os from functools import lru_cache from crispy_forms.helper import FormHelper -from crispy_forms.layout import HTML, ButtonHolder, Fieldset, Layout, Submit +from crispy_forms.layout import HTML, Fieldset, Layout from django import forms from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse @@ -12,6 +12,7 @@ from django.views.generic.edit import FormMixin from vanilla import GenericView import sapl +from sapl.layout import form_actions from .models import CasaLegislativa @@ -160,10 +161,7 @@ class CasaLegislativaTabelaAuxForm(ModelForm): row6, row7, row8, - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(CasaLegislativaTabelaAuxForm, self).__init__(*args, **kwargs) diff --git a/comissoes/views.py b/comissoes/views.py index 9268d6794..c530fd10b 100644 --- a/comissoes/views.py +++ b/comissoes/views.py @@ -1,5 +1,5 @@ from crispy_forms.helper import FormHelper -from crispy_forms.layout import ButtonHolder, Fieldset, Layout, Submit +from crispy_forms.layout import Fieldset, Layout from django import forms from django.contrib import messages from django.core.urlresolvers import reverse @@ -10,6 +10,7 @@ from django.views.generic.edit import FormMixin from vanilla import GenericView import sapl +from sapl.layout import form_actions from materia.models import Tramitacao from parlamentares.models import Filiacao from sapl.crud import build_crud @@ -154,10 +155,7 @@ class CadastrarComissaoForm(ModelForm): row7, row8 ), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(CadastrarComissaoForm, self).__init__(*args, **kwargs) @@ -215,7 +213,7 @@ class ComposicaoView(FormMixin, GenericView): 'composicao_id': composicao_id, 'form': form, 'pk': self.kwargs['pk'], - 'comissao': Comissao.objects.get(id=self.kwargs['pk'])}) + 'object': Comissao.objects.get(id=self.kwargs['pk'])}) def post(self, request, *args, **kwargs): form = ComposicaoForm(request.POST) @@ -230,7 +228,7 @@ class ComposicaoView(FormMixin, GenericView): 'composicao_id': int(form.data['periodo']), 'form': form, 'pk': self.kwargs['pk'], - 'comissao': Comissao.objects.get(id=self.kwargs['pk'])}) + 'object': Comissao.objects.get(id=self.kwargs['pk'])}) class MateriasView(comissao_crud.CrudDetailView): @@ -302,10 +300,7 @@ class ParticipacaoCadastroForm(ModelForm): 'Formulário de Cadastro', row1, row2, row3, row4 ), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) super(ParticipacaoCadastroForm, self).__init__(*args, **kwargs) @@ -416,5 +411,5 @@ class MateriasTramitacaoListView(ListView): def get_context_data(self, **kwargs): context = super( MateriasTramitacaoListView, self).get_context_data(**kwargs) - context['comissao'] = Comissao.objects.get(id=self.kwargs['pk']) + context['object'] = Comissao.objects.get(id=self.kwargs['pk']) return context diff --git a/compilacao/forms.py b/compilacao/forms.py index c3f1afdf7..c84bb224e 100644 --- a/compilacao/forms.py +++ b/compilacao/forms.py @@ -65,7 +65,7 @@ class TipoTaForm(ModelForm): self.helper = FormHelper() self.helper.layout = SaplFormLayout( Fieldset(_('Identificação Básica'), - row1, css_class="large-12")) + row1, css_class="col-md-12")) super(TipoTaForm, self).__init__(*args, **kwargs) @@ -131,13 +131,13 @@ class TaForm(ModelForm): self.helper = FormHelper() self.helper.layout = SaplFormLayout( - Fieldset(_('Identificação Básica'), row1, css_class="large-12"), + Fieldset(_('Identificação Básica'), row1, css_class="col-md-12"), Fieldset( TextoArticulado._meta.get_field('ementa').verbose_name, - Column('ementa'), css_class="large-12"), + Column('ementa'), css_class="col-md-12"), Fieldset( TextoArticulado._meta.get_field('observacao').verbose_name, - Column('observacao'), css_class="large-12"), + Column('observacao'), css_class="col-md-12"), ) @@ -222,14 +222,14 @@ class NotaForm(ModelForm): 'titulo', placeholder=_('Título da Nota (opcional)') ), - css_class='columns large-8')) + css_class='col-md-8')) row3 = to_row([ ('publicidade', 3), ('publicacao', 3), ('efetividade', 3), (Button('submit', _('Salvar'), - css_class='button primary radius'), 3) + css_class='btn btn-primary'), 3) ]) self.helper = FormHelper() @@ -313,7 +313,7 @@ class VideForm(ModelForm): Button( 'submit', 'Salvar', - css_class='button primary radius'), 12))) + css_class='btn btn-primary'), 12))) ), 4)), to_column(( Div( @@ -331,7 +331,7 @@ class VideForm(ModelForm): Button( 'buscar', 'Buscar', - css_class='button btn-busca radius'), 2)) + css_class='btn btn-primary btn-busca'), 2)) ), to_column( @@ -431,7 +431,7 @@ class PublicacaoForm(ModelForm): self.helper = FormHelper() self.helper.layout = SaplFormLayout( Fieldset(Publicacao._meta.verbose_name, - row1, row2, row3, css_class="large-12")) + row1, row2, row3, css_class="col-md-12")) super(PublicacaoForm, self).__init__(*args, **kwargs) pass diff --git a/materia/views.py b/materia/views.py index 48c887aab..63ec76b23 100644 --- a/materia/views.py +++ b/materia/views.py @@ -2,7 +2,7 @@ from datetime import date, datetime from re import sub from crispy_forms.helper import FormHelper -from crispy_forms.layout import ButtonHolder, Column, Fieldset, Layout, Submit +from crispy_forms.layout import Column, Fieldset, Layout from django import forms from django.contrib import messages from django.core.exceptions import ObjectDoesNotExist @@ -18,6 +18,7 @@ from django.views.generic.edit import FormMixin from vanilla.views import GenericView import sapl +from sapl.layout import form_actions from comissoes.models import Comissao, Composicao from compilacao.views import IntegracaoTaView from norma.models import LegislacaoCitada, NormaJuridica, TipoNormaJuridica @@ -297,10 +298,7 @@ class FormularioSimplificadoForm(ModelForm): 'Identificação Básica', row1, row2, row3, row4 ), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(FormularioSimplificadoForm, self).__init__(*args, **kwargs) @@ -376,10 +374,7 @@ class FormularioCadastroForm(ModelForm): 'indexacao', 'observacao' ), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(FormularioCadastroForm, self).__init__(*args, **kwargs) @@ -473,10 +468,7 @@ class MateriaAnexadaForm(ModelForm): Fieldset( 'Anexar Matéria', row1, row2, - ButtonHolder( - Submit('submit', 'Anexar', - css_class='button primary') - ) + form_actions() ) ) super(MateriaAnexadaForm, self).__init__( @@ -493,7 +485,7 @@ class MateriaAnexadaView(FormMixin, GenericView): anexadas = Anexada.objects.filter( materia_principal_id=kwargs['pk']) - return self.render_to_response({'materialegislativa': materia, + return self.render_to_response({'object': materia, 'anexadas': anexadas, 'form': form}) @@ -575,7 +567,7 @@ class MateriaAnexadaEditView(FormMixin, GenericView): form = MateriaAnexadaForm(initial=data) return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'data': data, 'get_tipos_materia': TipoMateriaLegislativa.objects.all()}) @@ -655,10 +647,7 @@ class DespachoInicialFom(ModelForm): Fieldset( 'Adicionar Despacho Inicial', 'comissao', - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(DespachoInicialFom, self).__init__(*args, **kwargs) @@ -673,7 +662,7 @@ class DespachoInicialView(FormMixin, GenericView): form = DespachoInicialFom() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'despachos': despacho}) @@ -690,7 +679,7 @@ class DespachoInicialView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'despachos': despacho}) def get_success_url(self): @@ -707,7 +696,7 @@ class DespachoInicialEditView(FormMixin, GenericView): form = DespachoInicialFom() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'despacho': despacho, 'comissoes': Comissao.objects.all()}) @@ -728,7 +717,7 @@ class DespachoInicialEditView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'despacho': despacho, 'comissoes': Comissao.objects.all()}) @@ -824,10 +813,7 @@ class LegislacaoCitadaForm(ModelForm): Fieldset( 'Incluir Legislação Citada', row1, row2, row3, row4, - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(LegislacaoCitadaForm, self).__init__(*args, **kwargs) @@ -842,7 +828,7 @@ class LegislacaoCitadaView(FormMixin, GenericView): form = LegislacaoCitadaForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'legislacao': legislacao}) @@ -864,7 +850,7 @@ class LegislacaoCitadaView(FormMixin, GenericView): msg = 'Norma Juridica não existe.' messages.add_message(request, messages.INFO, msg) return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'legislacao': legislacao_list}) legislacao.materia = materia legislacao.norma = norma @@ -885,7 +871,7 @@ class LegislacaoCitadaView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'legislacao': legislacao_list}) def get_success_url(self): @@ -906,7 +892,7 @@ class LegislacaoCitadaEditView(FormMixin, GenericView): form = LegislacaoCitadaForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'legislacao': legislacao, 'tipos_norma': TipoNormaJuridica.objects.all()}) @@ -931,7 +917,7 @@ class LegislacaoCitadaEditView(FormMixin, GenericView): messages.add_message(request, messages.INFO, msg) return self.render_to_response( {'form': form, - 'materialegislativa': materia, + 'object': materia, 'legislacao': legislacao, 'tipos_norma': TipoNormaJuridica.objects.all()}) legislacao.materia = materia @@ -954,7 +940,7 @@ class LegislacaoCitadaEditView(FormMixin, GenericView): else: return self.render_to_response( {'form': form, - 'materialegislativa': materia}) + 'object': materia}) class NumeracaoForm(ModelForm): @@ -1002,10 +988,7 @@ class NumeracaoForm(ModelForm): Fieldset( 'Incluir Numeração', row1, row2, - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(NumeracaoForm, self).__init__(*args, **kwargs) @@ -1020,7 +1003,7 @@ class NumeracaoView(FormMixin, GenericView): form = NumeracaoForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'numeracao': numeracao}) @@ -1045,7 +1028,7 @@ class NumeracaoView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'numeracao': numeracao_list}) def get_success_url(self): @@ -1062,7 +1045,7 @@ class NumeracaoEditView(FormMixin, GenericView): form = NumeracaoForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'numeracao': numeracao, 'tipos': TipoMateriaLegislativa.objects.all()}) @@ -1089,7 +1072,7 @@ class NumeracaoEditView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'numeracao': numeracao}) def get_success_url(self): @@ -1147,10 +1130,7 @@ class DocumentoAcessorioForm(ModelForm): Fieldset( 'Incluir Documento Acessório', row1, row2, row3, - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(DocumentoAcessorioForm, self).__init__(*args, **kwargs) @@ -1165,7 +1145,7 @@ class DocumentoAcessorioView(FormMixin, GenericView): form = DocumentoAcessorioForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'docs': docs}) @@ -1191,7 +1171,7 @@ class DocumentoAcessorioView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'docs': docs_list}) def get_success_url(self): @@ -1208,7 +1188,7 @@ class DocumentoAcessorioEditView(FormMixin, GenericView): form = DocumentoAcessorioForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'doc': documento, 'tipos': TipoDocumento.objects.all()}) @@ -1235,7 +1215,7 @@ class DocumentoAcessorioEditView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'doc': documento}) def get_success_url(self): @@ -1287,7 +1267,7 @@ class RelatoriaEditView(FormMixin, GenericView): parlamentares = composicao.participacao_set.all() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'relatoria': relatoria, 'tipo_fim_relatorias': TipoFimRelatoria.objects.all(), @@ -1319,7 +1299,7 @@ class RelatoriaEditView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'relatoria': relatoria, 'tipo_fim_relatorias': TipoFimRelatoria.objects.all(), @@ -1355,7 +1335,7 @@ class RelatoriaView(FormMixin, GenericView): parlamentares = composicao.participacao_set.all() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'relatorias': relatorias, 'comissao': comissao, @@ -1378,14 +1358,14 @@ class RelatoriaView(FormMixin, GenericView): msg = 'O local atual deve ser uma Comissão!' messages.add_message(request, messages.INFO, msg) return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'relatorias': relatorias}) else: composicao = Composicao.objects.filter(comissao=comissao).last() parlamentares = composicao.participacao_set.all() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'relatorias': relatorias, 'comissao': comissao, @@ -1453,10 +1433,7 @@ class TramitacaoForm(ModelForm): Fieldset('Incluir Tramitação', row1, row2, row3, row4, row5, ), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) super(TramitacaoForm, self).__init__( *args, **kwargs) @@ -1472,7 +1449,7 @@ class TramitacaoView(FormMixin, GenericView): form = TramitacaoForm return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'tramitacoes': tramitacoes}) @@ -1498,7 +1475,7 @@ class TramitacaoView(FormMixin, GenericView): messages.add_message(request, messages.INFO, msg) return self.render_to_response( {'form': form, - 'materialegislativa': materia, + 'object': materia, 'tramitacoes': tramitacoes_list}) corpo_email = ('A tramitação da matéria %s foi alterada.' % materia @@ -1514,7 +1491,7 @@ class TramitacaoView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response({'form': form, - 'materialegislativa': materia, + 'object': materia, 'tramitacoes': tramitacoes_list}) def get_success_url(self): @@ -1531,7 +1508,7 @@ class TramitacaoEditView(FormMixin, GenericView): form = TramitacaoForm return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'tramitacao': tramitacao, 'turno': Tramitacao.TURNO_CHOICES, @@ -1554,7 +1531,7 @@ class TramitacaoEditView(FormMixin, GenericView): deletada!' messages.add_message(request, messages.INFO, msg) return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'tramitacao': tramitacao, 'turno': Tramitacao.TURNO_CHOICES, @@ -1576,7 +1553,7 @@ class TramitacaoEditView(FormMixin, GenericView): return self.form_valid(form) else: return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'tramitacao': tramitacao, 'turno': Tramitacao.TURNO_CHOICES, @@ -1603,7 +1580,7 @@ class AutoriaView(GenericView): form = AutoriaForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1638,7 +1615,7 @@ class AutoriaView(GenericView): autoria.save() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1648,7 +1625,7 @@ class AutoriaView(GenericView): msg = 'Essa autoria já foi adicionada!' messages.add_message(request, messages.INFO, msg) return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1656,7 +1633,7 @@ class AutoriaView(GenericView): 'tipo_autor_id': int(form.data['tipo_autor'])}) else: return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1678,7 +1655,7 @@ class AutoriaEditView(GenericView): form = AutoriaForm() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1714,7 +1691,7 @@ class AutoriaEditView(GenericView): autoria.save() return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1724,7 +1701,7 @@ class AutoriaEditView(GenericView): msg = 'Essa autoria já foi adicionada!' messages.add_message(request, messages.INFO, msg) return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1732,7 +1709,7 @@ class AutoriaEditView(GenericView): 'tipo_autor_id': int(form.data['tipo_autor'])}) else: return self.render_to_response( - {'materialegislativa': materia, + {'object': materia, 'form': form, 'autorias': autorias, 'tipo_autores': TipoAutor.objects.all(), @@ -1792,11 +1769,7 @@ class ProposicaoForm(ModelForm): [('texto_original', 10)]) row4.append( - Column( - ButtonHolder( - Submit('sumbmit', 'Salvar', - css_class='button primary') - ), css_class='columns large-2')) + Column(form_actions(), css_class='col-md-2')) self.helper = FormHelper() self.helper.layout = Layout( @@ -1971,10 +1944,7 @@ class MateriaLegislativaPesquisaForm(forms.Form): self.helper.layout = Layout( Fieldset('Pesquisa Básica', row1, row2, row3, row4, row5, row6, row7), - ButtonHolder( - Submit('submit', 'Pesquisar', - css_class='button primary') - ) + form_actions(save_label='Pesquisar') ) super(MateriaLegislativaPesquisaForm, self).__init__( *args, **kwargs) diff --git a/norma/views.py b/norma/views.py index 655b8e89a..627fdcab0 100644 --- a/norma/views.py +++ b/norma/views.py @@ -2,7 +2,7 @@ from datetime import datetime from re import sub from crispy_forms.helper import FormHelper -from crispy_forms.layout import ButtonHolder, Fieldset, Layout, Submit +from crispy_forms.layout import Fieldset, Layout from django import forms from django.core.exceptions import ObjectDoesNotExist from django.forms import ModelForm @@ -13,6 +13,7 @@ from django.views.generic.edit import FormMixin from vanilla.views import GenericView import sapl +from sapl.layout import form_actions from compilacao.views import IntegracaoTaView from materia.models import MateriaLegislativa, TipoMateriaLegislativa from sapl.crud import build_crud @@ -163,9 +164,7 @@ class NormaJuridicaForm(ModelForm): Fieldset('Cadastro de Norma Jurídica', Fieldset('Identificação Básica', row1, row2, row3, row4, row5, row6, row7, row8), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary')) + form_actions() ) ) super(NormaJuridicaForm, self).__init__(*args, **kwargs) diff --git a/parlamentares/views.py b/parlamentares/views.py index 51b785678..3391ac1b0 100644 --- a/parlamentares/views.py +++ b/parlamentares/views.py @@ -2,7 +2,7 @@ import os from re import sub from crispy_forms.helper import FormHelper -from crispy_forms.layout import HTML, ButtonHolder, Fieldset, Layout, Submit +from crispy_forms.layout import HTML, Fieldset, Layout, Submit from django import forms from django.contrib import messages from django.core.urlresolvers import reverse @@ -14,6 +14,7 @@ from django.views.generic.edit import FormMixin from vanilla import GenericView import sapl +from sapl.layout import form_actions from sapl.crud import build_crud from .models import (CargoMesa, Coligacao, ComposicaoMesa, Dependente, @@ -383,10 +384,7 @@ class ParlamentaresForm (ModelForm): value="Remover Foto"/> {% endif %}""", ), row14, - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary'), - )) + form_actions()) ) super(ParlamentaresForm, self).__init__( @@ -399,12 +397,10 @@ class ParlamentaresEditForm(ParlamentaresForm): super(ParlamentaresEditForm, self).__init__( *args, **kwargs) - self.helper.layout[0][-1:] = ButtonHolder( - Submit('salvar', 'Salvar', - css_class='button primary'), + self.helper.layout[0][-1:] = form_actions(more=[ HTML(' '), Submit('excluir', 'Excluir', - css_class='button primary'),) + css_class='btn btn-primary')]) class ParlamentaresCadastroView(FormMixin, GenericView): @@ -454,7 +450,7 @@ class ParlamentaresEditarView(FormMixin, GenericView): parlamentar = Parlamentar.objects.get(pk=pk) form = ParlamentaresEditForm(instance=parlamentar) return self.render_to_response( - {'form': form, 'parlamentar': parlamentar}) + {'form': form, 'object': parlamentar}) def post(self, request, *args, **kwargs): pk = kwargs['pk'] @@ -518,10 +514,7 @@ class DependenteForm(ModelForm): self.helper.layout = Layout( Fieldset('Cadastro de Dependentes', row1, row2, row3, - ButtonHolder( - Submit('Salvar', 'Salvar', - css_class='button primary'), - )) + form_actions()) ) super(DependenteForm, self).__init__( @@ -534,12 +527,10 @@ class DependenteEditForm(DependenteForm): super(DependenteEditForm, self).__init__( *args, **kwargs) - self.helper.layout[0][-1:] = ButtonHolder( - Submit('Salvar', 'Salvar', - css_class='button primary'), + self.helper.layout[0][-1:] = form_actions(more=[ HTML(' '), - Submit('Excluir', 'Excluir', - css_class='button primary'),) + Submit('excluir', 'Excluir', + css_class='btn btn-primary')]) class ParlamentaresDependentesView(FormMixin, GenericView): @@ -559,7 +550,7 @@ class ParlamentaresDependentesView(FormMixin, GenericView): form = DependenteForm() return self.render_to_response( - {'parlamentar': parlamentar, + {'object': parlamentar, 'dependentes': dependentes, 'form': form, 'legislatura_id': parlamentar.mandato_set.last().legislatura.id}) @@ -583,7 +574,7 @@ class ParlamentaresDependentesView(FormMixin, GenericView): parlamentar=parlamentar).order_by('nome', 'tipo') return self.render_to_response( - {'parlamentar': parlamentar, + {'object': parlamentar, 'dependentes': dependentes, 'form': form, 'legislatura_id': parlamentar.mandato_set.last( @@ -603,7 +594,7 @@ class ParlamentaresDependentesEditView(FormMixin, GenericView): form = DependenteEditForm(instance=dependente) return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': dependente.parlamentar.mandato_set.last( ).legislatura_id}) @@ -621,7 +612,7 @@ class ParlamentaresDependentesEditView(FormMixin, GenericView): else: return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': dependente.parlamentar.mandato_set.last( ).legislatura_id}) @@ -640,10 +631,10 @@ class MesaDiretoraView(FormMixin, GenericView): messages.add_message(request, messages.INFO, mensagem) return self.render_to_response( - {'legislaturas': Legislatura.objects.all( - ).order_by('-data_inicio'), - 'legislatura_selecionada': Legislatura.objects.last(), - 'cargos_vagos': CargoMesa.objects.all()}) + {'legislaturas': Legislatura.objects.all( + ).order_by('-data_inicio'), + 'legislatura_selecionada': Legislatura.objects.last(), + 'cargos_vagos': CargoMesa.objects.all()}) def get(self, request, *args, **kwargs): @@ -668,16 +659,16 @@ class MesaDiretoraView(FormMixin, GenericView): return self.render_to_response( {'legislaturas': Legislatura.objects.all( - ).order_by('-data_inicio'), - 'legislatura_selecionada': Legislatura.objects.last(), - 'sessoes': SessaoLegislativa.objects.filter( - legislatura=Legislatura.objects.last()), - 'sessao_selecionada': SessaoLegislativa.objects.filter( - legislatura=Legislatura.objects.last()).first(), - 'composicao_mesa': mesa, - 'parlamentares': parlamentares_vagos, - 'cargos_vagos': cargos_vagos - }) + ).order_by('-data_inicio'), + 'legislatura_selecionada': Legislatura.objects.last(), + 'sessoes': SessaoLegislativa.objects.filter( + legislatura=Legislatura.objects.last()), + 'sessao_selecionada': SessaoLegislativa.objects.filter( + legislatura=Legislatura.objects.last()).first(), + 'composicao_mesa': mesa, + 'parlamentares': parlamentares_vagos, + 'cargos_vagos': cargos_vagos + }) def post(self, request, *args, **kwargs): if 'Incluir' in request.POST: @@ -705,10 +696,10 @@ class MesaDiretoraView(FormMixin, GenericView): if 'composicao_mesa' in request.POST: ids = request.POST['composicao_mesa'].split(':') composicao = ComposicaoMesa.objects.get( - sessao_legislativa_id=int(request.POST['sessao']), - parlamentar_id=int(ids[0]), - cargo_id=int(ids[1]) - ) + sessao_legislativa_id=int(request.POST['sessao']), + parlamentar_id=int(ids[0]), + cargo_id=int(ids[1]) + ) composicao.delete() return self.form_valid(form=None) else: @@ -728,17 +719,17 @@ class MesaDiretoraView(FormMixin, GenericView): parlamentares_ocupados)) return self.render_to_response( {'legislaturas': Legislatura.objects.all( - ).order_by('-data_inicio'), - 'legislatura_selecionada': Legislatura.objects.get( - id=int(request.POST['legislatura'])), - 'sessoes': SessaoLegislativa.objects.filter( - legislatura_id=int(request.POST['legislatura'])), - 'sessao_selecionada': SessaoLegislativa.objects.get( - id=int(request.POST['sessao'])), - 'composicao_mesa': mesa, - 'parlamentares': parlamentares_vagos, - 'cargos_vagos': cargos_vagos - }) + ).order_by('-data_inicio'), + 'legislatura_selecionada': Legislatura.objects.get( + id=int(request.POST['legislatura'])), + 'sessoes': SessaoLegislativa.objects.filter( + legislatura_id=int(request.POST['legislatura'])), + 'sessao_selecionada': SessaoLegislativa.objects.get( + id=int(request.POST['sessao'])), + 'composicao_mesa': mesa, + 'parlamentares': parlamentares_vagos, + 'cargos_vagos': cargos_vagos + }) class FiliacaoForm(ModelForm): @@ -759,10 +750,7 @@ class FiliacaoForm(ModelForm): self.helper = FormHelper() self.helper.layout = Layout( Fieldset('Adicionar Filiação', row1, - ButtonHolder( - Submit('Salvar', 'Salvar', - css_class='button primary'), - )) + form_actions()) ) super(FiliacaoForm, self).__init__( @@ -775,12 +763,10 @@ class FiliacaoEditForm(FiliacaoForm): super(FiliacaoEditForm, self).__init__( *args, **kwargs) - self.helper.layout[0][-1:] = ButtonHolder( - Submit('Salvar', 'Salvar', - css_class='button primary'), + self.helper.layout[0][-1:] = form_actions(more=[ HTML(' '), - Submit('Excluir', 'Excluir', - css_class='button primary'),) + Submit('excluir', 'Excluir', + css_class='btn btn-primary')]) class FiliacaoView(FormMixin, GenericView): @@ -799,7 +785,7 @@ class FiliacaoView(FormMixin, GenericView): form = FiliacaoForm() return self.render_to_response( - {'parlamentar': parlamentar, + {'object': parlamentar, 'filiacoes': filiacoes, 'form': form, 'legislatura_id': parlamentar.mandato_set.last().legislatura.id}) @@ -809,7 +795,7 @@ class FiliacaoView(FormMixin, GenericView): filiacoes = Filiacao.objects.filter(parlamentar=parlamentar) messages.add_message(request, messages.INFO, mensagem) return self.render_to_response( - {'parlamentar': parlamentar, + {'object': parlamentar, 'filiacoes': filiacoes, 'form': form, 'legislatura_id': parlamentar.mandato_set.last( @@ -915,7 +901,7 @@ class FiliacaoEditView(FormMixin, GenericView): form = FiliacaoEditForm(instance=filiacao) return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': parlamentar.mandato_set.last( ).legislatura_id}) @@ -923,7 +909,7 @@ class FiliacaoEditView(FormMixin, GenericView): messages.add_message(request, messages.INFO, mensagem) return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': parlamentar.mandato_set.last( ).legislatura_id}) @@ -1014,7 +1000,7 @@ class FiliacaoEditView(FormMixin, GenericView): else: return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': parlamentar.mandato_set.last( ).legislatura_id}) @@ -1047,10 +1033,7 @@ class MandatoForm(ModelForm): self.helper = FormHelper() self.helper.layout = Layout( Fieldset('Adicionar Mandato', row1, row2, row3, - ButtonHolder( - Submit('Salvar', 'Salvar', - css_class='button primary'), - )) + form_actions()) ) super(MandatoForm, self).__init__( @@ -1063,12 +1046,10 @@ class MandatoEditForm(MandatoForm): super(MandatoEditForm, self).__init__( *args, **kwargs) - self.helper.layout[0][-1:] = ButtonHolder( - Submit('Salvar', 'Salvar', - css_class='button primary'), + self.helper.layout[0][-1:] = form_actions(more=[ HTML(' '), - Submit('Excluir', 'Excluir', - css_class='button primary'),) + Submit('excluir', 'Excluir', + css_class='btn btn-primary')]) class MandatoView(FormMixin, GenericView): @@ -1087,7 +1068,7 @@ class MandatoView(FormMixin, GenericView): form = MandatoForm() return self.render_to_response( - {'parlamentar': parlamentar, + {'object': parlamentar, 'mandatos': mandatos, 'form': form, 'legislatura_id': parlamentar.mandato_set.last().legislatura.id}) @@ -1111,7 +1092,7 @@ class MandatoView(FormMixin, GenericView): parlamentar=parlamentar) return self.render_to_response( - {'parlamentar': parlamentar, + {'object': parlamentar, 'mandatos': mandatos, 'form': form, 'legislatura_id': parlamentar.mandato_set.last( @@ -1131,7 +1112,7 @@ class MandatoEditView(FormMixin, GenericView): form = MandatoEditForm(instance=mandato) return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': parlamentar.mandato_set.last( ).legislatura_id}) @@ -1149,6 +1130,6 @@ class MandatoEditView(FormMixin, GenericView): else: return self.render_to_response( {'form': form, - 'parlamentar': parlamentar, + 'object': parlamentar, 'legislatura_id': parlamentar.mandato_set.last( ).legislatura_id}) diff --git a/protocoloadm/views.py b/protocoloadm/views.py index cab17a4ab..b0c69bb1f 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -2,8 +2,7 @@ from datetime import date, datetime from re import sub from crispy_forms.helper import FormHelper -from crispy_forms.layout import (HTML, ButtonHolder, Field, Fieldset, Layout, - Submit) +from crispy_forms.layout import (HTML, Field, Fieldset, Layout) from django import forms from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse @@ -20,6 +19,7 @@ from django.views.generic.edit import FormMixin from vanilla import GenericView import sapl +from sapl.layout import form_actions from materia.models import Proposicao, TipoMateriaLegislativa from sapl.crud import build_crud @@ -330,10 +330,7 @@ class AnularProcoloAdmForm(forms.Form): row1, row2, HTML(" "), - ButtonHolder(Submit('submit', 'Anular', - css_class='button primary' - ) - ) + form_actions(save_label='Anular') ) ) super(AnularProcoloAdmForm, self).__init__( @@ -460,10 +457,7 @@ class ProtocoloDocumentForm(forms.Form): row5, row6, HTML(" "), - ButtonHolder(Submit('submit', 'Protocolar Documento', - css_class='button primary' - ) - ) + form_actions(save_label='Protocolar Documento') ) ) super(ProtocoloDocumentForm, self).__init__( @@ -580,10 +574,7 @@ class ProtocoloMateriaForm(forms.Form): row4, row5, HTML(" "), - ButtonHolder(Submit('submit', 'Protocolar Matéria', - css_class='button primary' - ) - ) + form_actions(save_label='Protocolar Matéria') ) ) super(ProtocoloMateriaForm, self).__init__( @@ -894,10 +885,7 @@ class ModelFormDocumentoAcessorioAdministrativo(ModelForm): 'autor', 'arquivo', 'assunto', - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(ModelFormDocumentoAcessorioAdministrativo, self).__init__( @@ -1009,10 +997,7 @@ class TramitacaoAdmForm(ModelForm): 'data_fim_prazo', 'texto'), Field('documento', type="hidden"), - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) super(TramitacaoAdmForm, self).__init__( *args, **kwargs) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4efd5154e..838f680d4 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,3 @@ -crispy-forms-foundation Django<1.9 djangorestframework django-admin-bootstrapped diff --git a/sapl/layout.py b/sapl/layout.py index cb08db49b..e085a0a1e 100644 --- a/sapl/layout.py +++ b/sapl/layout.py @@ -1,15 +1,15 @@ -from crispy_forms_foundation.layout import (HTML, Column, Div, Fieldset, - Layout, Row, Submit) +from crispy_forms.bootstrap import FormActions +from crispy_forms.layout import Submit, Layout, Div, Fieldset, HTML from django.utils.translation import ugettext as _ def to_column(name_span): fieldname, span = name_span - return Column(fieldname, css_class='large-%d' % span) + return Div(fieldname, css_class='col-md-%d' % span) def to_row(names_spans): - return Row(*list(map(to_column, names_spans))) + return Div(*map(to_column, names_spans), css_class='row-fluid') def to_fieldsets(fields): @@ -22,16 +22,15 @@ def to_fieldsets(fields): yield field +def form_actions(more=[], save_label=_('Salvar')): + return FormActions(Submit('save', save_label), *more) + + class SaplFormLayout(Layout): def __init__(self, *fields): - buttons = Div( + buttons = form_actions(more=[ HTML('%s' % _('Cancelar')), - Submit('submit', _('Enviar'), - css_class='button radius success right'), - css_class='radius clearfix' - ) - _fields = list(to_fieldsets(fields)) + \ - [Row(Column(buttons, css_class='clearfix'))] + ' class="btn btn-inverse">%s' % _('Cancelar'))]) + _fields = list(to_fieldsets(fields)) + [to_row([(buttons, 12)])] super(SaplFormLayout, self).__init__(*_fields) diff --git a/sapl/settings.py b/sapl/settings.py index e658fcfce..92a03d278 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -58,7 +58,6 @@ INSTALLED_APPS = ( 'djangobower', 'bootstrap3', # basically for django_admin_bootstrapped 'crispy_forms', - 'crispy_forms_foundation', 'sass_processor', ) @@ -159,28 +158,28 @@ MEDIA_URL = '/media/' DAB_FIELD_RENDERER = \ 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer' -CRISPY_TEMPLATE_PACK = 'foundation-5' -CRISPY_ALLOWED_TEMPLATE_PACKS = 'foundation-5' +CRISPY_TEMPLATE_PACK = 'bootstrap3' +CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = not DEBUG BOWER_COMPONENTS_ROOT = BASE_DIR.child("bower") BOWER_INSTALLED_APPS = ( - 'foundation', - 'foundation-datepicker', + 'bootstrap-sass', 'components-font-awesome', - 'foundation-icon-fonts', 'tinymce', 'jquery-ui', 'jquery-runner', 'jQuery-Mask-Plugin', 'jsdiff', + 'https://github.com/hoarrd/drunken-parrot-flat-ui.git', ) # Additional search paths for SASS files when using the @import statement -SASS_PROCESSOR_INCLUDE_DIRS = ( - BOWER_COMPONENTS_ROOT.child('bower_components', 'foundation', 'scss'), +SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child( + 'bower_components', 'bootstrap-sass', 'assets', 'stylesheets'), ) +# FIXME update cripy-forms and remove this # hack to suppress many annoying warnings from crispy_forms # see sapl.temp_suppress_crispy_form_warnings LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING diff --git a/sessao/views.py b/sessao/views.py index 6ab3e15fe..b19a2121c 100644 --- a/sessao/views.py +++ b/sessao/views.py @@ -2,7 +2,7 @@ from datetime import datetime from re import sub from crispy_forms.helper import FormHelper -from crispy_forms.layout import ButtonHolder, Column, Fieldset, Layout, Submit +from crispy_forms.layout import Column, Fieldset, Layout from django import forms from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse @@ -15,6 +15,7 @@ from django.views.generic.edit import FormMixin from rest_framework import generics import sapl +from sapl.layout import form_actions from materia.models import (Autoria, DocumentoAcessorio, TipoMateriaLegislativa, Tramitacao) from norma.models import NormaJuridica @@ -2410,10 +2411,7 @@ class SessaoForm(ModelForm): row3, row4, row5, - ButtonHolder( - Submit('submit', 'Salvar', - css_class='button primary') - ) + form_actions() ) ) super(SessaoForm, self).__init__(*args, **kwargs) @@ -2505,12 +2503,7 @@ class AcompanharMateriaForm(ModelForm): row1 = sapl.layout.to_row([('email', 10)]) row1.append( - Column( - ButtonHolder( - Submit('Submit', 'Cadastrar', - css_class='button primary') - ), css_class='columns-large-2' - ) + Column(form_actions(save_label='Cadastrar'), css_class='col-md-2') ) self.helper = FormHelper() diff --git a/static/styles/_header.scss b/static/styles/_header.scss new file mode 100644 index 000000000..e5fa310a3 --- /dev/null +++ b/static/styles/_header.scss @@ -0,0 +1,10 @@ + +$logo-height: 0.8 * $navbar-height; +$logo-margin: ($navbar-height - $logo-height) / 2; + +.logo img { + width: $logo-height; + height: $logo-height; + margin: $logo-margin $navbar-padding-horizontal; +} + diff --git a/static/styles/_settings.scss b/static/styles/_settings.scss deleted file mode 100644 index 3fcf083b3..000000000 --- a/static/styles/_settings.scss +++ /dev/null @@ -1,1485 +0,0 @@ -// Foundation by ZURB -// foundation.zurb.com -// Licensed under MIT Open Source - -// - -// Table of Contents -// Foundation Settings -// a. Base -// b. Grid -// c. Global -// d. Media Query Ranges -// e. Typography -// 01. Accordion -// 02. Alert Boxes -// 03. Block Grid -// 04. Breadcrumbs -// 05. Buttons -// 06. Button Groups -// 07. Clearing -// 08. Dropdown -// 09. Dropdown Buttons -// 10. Flex Video -// 11. Forms -// 12. Icon Bar -// 13. Inline Lists -// 14. Joyride -// 15. Keystrokes -// 16. Labels -// 17. Magellan -// 18. Off-canvas -// 19. Orbit -// 20. Pagination -// 21. Panels -// 22. Pricing Tables -// 23. Progress Bar -// 24. Range Slider -// 25. Reveal -// 26. Side Nav -// 27. Split Buttons -// 28. Sub Nav -// 29. Switch -// 30. Tables -// 31. Tabs -// 32. Thumbnails -// 33. Tooltips -// 34. Top Bar -// 36. Visibility Classes - -// a. Base -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// This is the default html and body font-size for the base rem value. -// $rem-base: 16px; - -// Allows the use of rem-calc() or lower-bound() in your settings -@import 'foundation/functions'; - -// The default font-size is set to 100% of the browser style sheet (usually 16px) -// for compatibility with browser-based text zoom or user-set defaults. - -// Since the typical default browser font-size is 16px, that makes the calculation for grid size. -// If you want your base font-size to be different and not have it affect the grid breakpoints, -// set $rem-base to $base-font-size and make sure $base-font-size is a px value. -// $base-font-size: 100%; - -// The $base-font-size is 100% while $base-line-height is 150% -// $base-line-height: 150%; - -// We use this to control whether or not CSS classes come through in the gem files. -$include-html-classes: true; -// $include-print-styles: true; -$include-html-global-classes: $include-html-classes; - -// b. Grid -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-grid-classes: $include-html-classes; -// $include-xl-html-grid-classes: false; - -// $row-width: rem-calc(1000); -// $total-columns: 12; -// $column-gutter: rem-calc(30); - -// c. Global -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// We use these to define default font stacks - $font-family-sans-serif: "Open Sans" "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; -// $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif; -// $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace; - -// We use these to define default font weights -// $font-weight-normal: normal; -// $font-weight-bold: bold; - -// $white : #FFFFFF; -// $ghost : #FAFAFA; -// $snow : #F9F9F9; -// $vapor : #F6F6F6; -// $white-smoke : #F5F5F5; -// $silver : #EFEFEF; -// $smoke : #EEEEEE; -// $gainsboro : #DDDDDD; -// $iron : #CCCCCC; -// $base : #AAAAAA; -// $aluminum : #999999; -// $jumbo : #888888; -// $monsoon : #777777; -// $steel : #666666; -// $charcoal : #555555; -// $tuatara : #444444; -// $oil : #333333; -// $jet : #222222; -// $black : #000000; - -// We use these as default colors throughout - $primary-color: #27AE60; - $secondary-color: #34495E; -// $alert-color: #f04124; -// $success-color: #43AC6A; -// $warning-color: #f08a24; -// $info-color: #a0d3e8; - -// We use these to control various global styles -// $body-bg: $white; -// $body-font-color: $jet; -// $body-font-family: $font-family-sans-serif; -// $body-font-weight: $font-weight-normal; -// $body-font-style: normal; - -// We use this to control font-smoothing -// $font-smoothing: antialiased; - -// We use these to control text direction settings -// $text-direction: ltr; -// $opposite-direction: right; -// $default-float: left; -// $last-child-float: $opposite-direction; - -// We use these to make sure border radius matches unless we want it different. - $global-radius: 4px; -// $global-rounded: 1000px; - -// We use these to control inset shadow shiny edges and depressions. -// $shiny-edge-size: 0 1px 0; -// $shiny-edge-color: rgba($white, .5); -// $shiny-edge-active-color: rgba($black, .2); - -// d. Media Query Ranges -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $small-breakpoint: em-calc(640); -// $medium-breakpoint: em-calc(1024); -// $large-breakpoint: em-calc(1440); -// $xlarge-breakpoint: em-calc(1920); - -// $small-range: (0, $small-breakpoint); -// $medium-range: ($small-breakpoint + em-calc(1), $medium-breakpoint); -// $large-range: ($medium-breakpoint + em-calc(1), $large-breakpoint); -// $xlarge-range: ($large-breakpoint + em-calc(1), $xlarge-breakpoint); -// $xxlarge-range: ($xlarge-breakpoint + em-calc(1), em-calc(99999999)); - -// $screen: "only screen"; - -// $landscape: "#{$screen} and (orientation: landscape)"; -// $portrait: "#{$screen} and (orientation: portrait)"; - -// $small-up: $screen; -// $small-only: "#{$screen} and (max-width: #{upper-bound($small-range)})"; - -// $medium-up: "#{$screen} and (min-width:#{lower-bound($medium-range)})"; -// $medium-only: "#{$screen} and (min-width:#{lower-bound($medium-range)}) and (max-width:#{upper-bound($medium-range)})"; - -// $large-up: "#{$screen} and (min-width:#{lower-bound($large-range)})"; -// $large-only: "#{$screen} and (min-width:#{lower-bound($large-range)}) and (max-width:#{upper-bound($large-range)})"; - -// $xlarge-up: "#{$screen} and (min-width:#{lower-bound($xlarge-range)})"; -// $xlarge-only: "#{$screen} and (min-width:#{lower-bound($xlarge-range)}) and (max-width:#{upper-bound($xlarge-range)})"; - -// $xxlarge-up: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)})"; -// $xxlarge-only: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)}) and (max-width:#{upper-bound($xxlarge-range)})"; - -// $retina: ( -// "#{$screen} and (-webkit-min-device-pixel-ratio: 2)", -// "#{$screen} and (min--moz-device-pixel-ratio: 2)", -// "#{$screen} and (-o-min-device-pixel-ratio: 2/1)", -// "#{$screen} and (min-device-pixel-ratio: 2)", -// "#{$screen} and (min-resolution: 192dpi)", -// "#{$screen} and (min-resolution: 2dppx)" -// ); - -// Legacy -// $small: $medium-up; -// $medium: $medium-up; -// $large: $large-up; - -// We use this as cursors values for enabling the option of having custom cursors in the whole site's stylesheet -// $cursor-crosshair-value: crosshair; -// $cursor-default-value: default; -// $cursor-disabled-value: not-allowed; -// $cursor-pointer-value: pointer; -// $cursor-help-value: help; -// $cursor-text-value: text; - -// e. Typography -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-type-classes: $include-html-classes; - -// We use these to control header font styles -// $header-font-family: $body-font-family; -// $header-font-weight: $font-weight-normal; -// $header-font-style: normal; -// $header-font-color: $jet; -// $header-line-height: 1.4; -// $header-top-margin: .2rem; -// $header-bottom-margin: .5rem; -// $header-text-rendering: optimizeLegibility; - -// We use these to control header font sizes -// $h1-font-size: rem-calc(44); -// $h2-font-size: rem-calc(37); -// $h3-font-size: rem-calc(27); -// $h4-font-size: rem-calc(23); -// $h5-font-size: rem-calc(18); -// $h6-font-size: 1rem; - -// We use these to control header size reduction on small screens -// $h1-font-reduction: rem-calc(10); -// $h2-font-reduction: rem-calc(10); -// $h3-font-reduction: rem-calc(5); -// $h4-font-reduction: rem-calc(5); -// $h5-font-reduction: 0; -// $h6-font-reduction: 0; - -// These control how subheaders are styled. -// $subheader-line-height: 1.4; -// $subheader-font-color: scale-color($header-font-color, $lightness: 35%); -// $subheader-font-weight: $font-weight-normal; -// $subheader-top-margin: .2rem; -// $subheader-bottom-margin: .5rem; - -// A general styling -// $small-font-size: 60%; -// $small-font-color: scale-color($header-font-color, $lightness: 35%); - -// We use these to style paragraphs -// $paragraph-font-family: inherit; -// $paragraph-font-weight: $font-weight-normal; -// $paragraph-font-size: 1rem; -// $paragraph-line-height: 1.6; -// $paragraph-margin-bottom: rem-calc(20); -// $paragraph-aside-font-size: rem-calc(14); -// $paragraph-aside-line-height: 1.35; -// $paragraph-aside-font-style: italic; -// $paragraph-text-rendering: optimizeLegibility; - -// We use these to style tags -// $code-color: $oil; -// $code-font-family: $font-family-monospace; -// $code-font-weight: $font-weight-normal; -// $code-background-color: scale-color($secondary-color, $lightness: 70%); -// $code-border-size: 1px; -// $code-border-style: solid; -// $code-border-color: scale-color($code-background-color, $lightness: -10%); -// $code-padding: rem-calc(2) rem-calc(5) rem-calc(1); - -// We use these to style anchors -// $anchor-text-decoration: none; -// $anchor-text-decoration-hover: none; -// $anchor-font-color: $primary-color; -// $anchor-font-color-hover: scale-color($anchor-font-color, $lightness: -14%); - -// We use these to style the
element -// $hr-border-width: 1px; -// $hr-border-style: solid; -// $hr-border-color: $gainsboro; -// $hr-margin: rem-calc(20); - -// We use these to style lists -// $list-font-family: $paragraph-font-family; -// $list-font-size: $paragraph-font-size; -// $list-line-height: $paragraph-line-height; -// $list-margin-bottom: $paragraph-margin-bottom; -// $list-style-position: outside; -// $list-side-margin: 1.1rem; -// $list-ordered-side-margin: 1.4rem; -// $list-side-margin-no-bullet: 0; -// $list-nested-margin: rem-calc(20); -// $definition-list-header-weight: $font-weight-bold; -// $definition-list-header-margin-bottom: .3rem; -// $definition-list-margin-bottom: rem-calc(12); - -// We use these to style blockquotes -// $blockquote-font-color: scale-color($header-font-color, $lightness: 35%); -// $blockquote-padding: rem-calc(9 20 0 19); -// $blockquote-border: 1px solid $gainsboro; -// $blockquote-cite-font-size: rem-calc(13); -// $blockquote-cite-font-color: scale-color($header-font-color, $lightness: 23%); -// $blockquote-cite-link-color: $blockquote-cite-font-color; - -// Acronym styles -// $acronym-underline: 1px dotted $gainsboro; - -// We use these to control padding and margin -// $microformat-padding: rem-calc(10 12); -// $microformat-margin: rem-calc(0 0 20 0); - -// We use these to control the border styles -// $microformat-border-width: 1px; -// $microformat-border-style: solid; -// $microformat-border-color: $gainsboro; - -// We use these to control full name font styles -// $microformat-fullname-font-weight: $font-weight-bold; -// $microformat-fullname-font-size: rem-calc(15); - -// We use this to control the summary font styles -// $microformat-summary-font-weight: $font-weight-bold; - -// We use this to control abbr padding -// $microformat-abbr-padding: rem-calc(0 1); - -// We use this to control abbr font styles -// $microformat-abbr-font-weight: $font-weight-bold; -// $microformat-abbr-font-decoration: none; - -// 01. Accordion -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-accordion-classes: $include-html-classes; - -// $accordion-navigation-padding: rem-calc(16); -// $accordion-navigation-bg-color: $silver; -// $accordion-navigation-hover-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -5%); -// $accordion-navigation-active-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -3%); -// $accordion-navigation-font-color: $jet; -// $accordion-navigation-font-size: rem-calc(16); -// $accordion-navigation-font-family: $body-font-family; - -// $accordion-content-padding: ($column-gutter/2); -// $accordion-content-active-bg-color: $white; - -// 02. Alert Boxes -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-alert-classes: $include-html-classes; - -// We use this to control alert padding. -// $alert-padding-top: rem-calc(14); -// $alert-padding-default-float: $alert-padding-top; -// $alert-padding-opposite-direction: $alert-padding-top + rem-calc(10); -// $alert-padding-bottom: $alert-padding-top; - -// We use these to control text style. -// $alert-font-weight: $font-weight-normal; -// $alert-font-size: rem-calc(13); -// $alert-font-color: $white; -// $alert-font-color-alt: scale-color($secondary-color, $lightness: -66%); - -// We use this for close hover effect. -// $alert-function-factor: -14%; - -// We use these to control border styles. -// $alert-border-style: solid; -// $alert-border-width: 1px; -// $alert-border-color: scale-color($primary-color, $lightness: $alert-function-factor); -// $alert-bottom-margin: rem-calc(20); - -// We use these to style the close buttons -// $alert-close-color: $oil; -// $alert-close-top: 50%; -// $alert-close-position: rem-calc(4); -// $alert-close-font-size: rem-calc(22); -// $alert-close-opacity: .3; -// $alert-close-opacity-hover: .5; -// $alert-close-padding: 9px 6px 4px; -// $alert-close-background: inherit; - -// We use this to control border radius -// $alert-radius: $global-radius; - -// $alert-transition-speed: 300ms; -// $alert-transition-ease: ease-out; - -// 03. Block Grid -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-block-grid-classes: $include-html-classes; -// $include-xl-html-block-grid-classes: false; - -// We use this to control the maximum number of block grid elements per row -// $block-grid-elements: 12; -// $block-grid-default-spacing: rem-calc(20); - -// $align-block-grid-to-grid: false; -// @if $align-block-grid-to-grid {$block-grid-default-spacing: $column-gutter;} - -// Enables media queries for block-grid classes. Set to false if writing semantic HTML. -// $block-grid-media-queries: true; - -// 04. Breadcrumbs -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-nav-classes: $include-html-classes; - -// We use this to set the background color for the breadcrumb container. -// $crumb-bg: scale-color($secondary-color, $lightness: 55%); - -// We use these to set the padding around the breadcrumbs. -// $crumb-padding: rem-calc(9 14 9); -// $crumb-side-padding: rem-calc(12); - -// We use these to control border styles. -// $crumb-function-factor: -10%; -// $crumb-border-size: 1px; -// $crumb-border-style: solid; -// $crumb-border-color: scale-color($crumb-bg, $lightness: $crumb-function-factor); -// $crumb-radius: $global-radius; - -// We use these to set various text styles for breadcrumbs. -// $crumb-font-size: rem-calc(11); -// $crumb-font-color: $primary-color; -// $crumb-font-color-current: $oil; -// $crumb-font-color-unavailable: $aluminum; -// $crumb-font-transform: uppercase; -// $crumb-link-decor: underline; - -// We use these to control the slash between breadcrumbs -// $crumb-slash-color: $base; -// $crumb-slash: "/"; - -// 05. Buttons -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// We use these to build padding for buttons. -// $button-tny: rem-calc(10); -// $button-sml: rem-calc(14); -// $button-med: rem-calc(16); -// $button-lrg: rem-calc(18); - -// We use this to control the display property. -// $button-display: inline-block; -// $button-margin-bottom: rem-calc(20); - -// We use these to control button text styles. -// $button-font-family: $body-font-family; -// $button-font-color: $white; -// $button-font-color-alt: $oil; -// $button-font-tny: rem-calc(11); -// $button-font-sml: rem-calc(13); -// $button-font-med: rem-calc(16); -// $button-font-lrg: rem-calc(20); -// $button-font-weight: $font-weight-normal; -// $button-font-align: center; - -// We use these to control various hover effects. -// $button-function-factor: -20%; - -// We use these to control button border styles. -// $button-border-width: 0; -// $button-border-style: solid; -// $button-bg-color: $primary-color; -// $button-bg-hover: scale-color($button-bg-color, $lightness: $button-function-factor); -// $button-border-color: $button-bg-hover; -// $secondary-button-bg-hover: scale-color($secondary-color, $lightness: $button-function-factor); -// $secondary-button-border-color: $secondary-button-bg-hover; -// $success-button-bg-hover: scale-color($success-color, $lightness: $button-function-factor); -// $success-button-border-color: $success-button-bg-hover; -// $alert-button-bg-hover: scale-color($alert-color, $lightness: $button-function-factor); -// $alert-button-border-color: $alert-button-bg-hover; -// $warning-button-bg-hover: scale-color($warning-color, $lightness: $button-function-factor); -// $warning-button-border-color: $warning-button-bg-hover; -// $info-button-bg-hover: scale-color($info-color, $lightness: $button-function-factor); -// $info-button-border-color: $info-button-bg-hover; - -// We use this to set the default radius used throughout the core. -// $button-radius: $global-radius; -// $button-round: $global-rounded; - -// We use this to set default opacity and cursor for disabled buttons. -// $button-disabled-opacity: .7; -// $button-disabled-cursor: $cursor-default-value; - -// 06. Button Groups -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// Sets the margin for the right side by default, and the left margin if right-to-left direction is used -// $button-bar-margin-opposite: rem-calc(10); -// $button-group-border-width: 1px; - -// 07. Clearing -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-clearing-classes: $include-html-classes; - -// We use these to set the background colors for parts of Clearing. -// $clearing-bg: $oil; -// $clearing-caption-bg: $clearing-bg; -// $clearing-carousel-bg: rgba(51,51,51,0.8); -// $clearing-img-bg: $clearing-bg; - -// We use these to style the close button -// $clearing-close-color: $iron; -// $clearing-close-size: 30px; - -// We use these to style the arrows -// $clearing-arrow-size: 12px; -// $clearing-arrow-color: $clearing-close-color; - -// We use these to style captions -// $clearing-caption-font-color: $iron; -// $clearing-caption-font-size: .875em; -// $clearing-caption-padding: 10px 30px 20px; - -// We use these to make the image and carousel height and style -// $clearing-active-img-height: 85%; -// $clearing-carousel-height: 120px; -// $clearing-carousel-thumb-width: 120px; -// $clearing-carousel-thumb-active-border: 1px solid rgb(255,255,255); - -// 08. Dropdown -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-dropdown-classes: $include-html-classes; - -// We use these to controls height and width styles. -// $f-dropdown-max-width: 200px; -// $f-dropdown-height: auto; -// $f-dropdown-max-height: none; - -// Used for bottom position - $f-dropdown-margin-top: 0px; - -// Used for right position - $f-dropdown-margin-left: 5px; - -// Used for left position -// $f-dropdown-margin-right: $f-dropdown-margin-top; - -// Used for top position -// $f-dropdown-margin-bottom: $f-dropdown-margin-top; - -// We use this to control the background color -// $f-dropdown-bg: $white; - -// We use this to set the border styles for dropdowns. -// $f-dropdown-border-style: solid; -// $f-dropdown-border-width: 1px; -// $f-dropdown-border-color: scale-color($white, $lightness: -20%); - -// We use these to style the triangle pip. -// $f-dropdown-triangle-size: 6px; -// $f-dropdown-triangle-color: $white; -// $f-dropdown-triangle-side-offset: 10px; - -// We use these to control styles for the list elements. -// $f-dropdown-list-style: none; -// $f-dropdown-font-color: $charcoal; -// $f-dropdown-font-size: rem-calc(14); -// $f-dropdown-list-padding: rem-calc(5, 10); -// $f-dropdown-line-height: rem-calc(18); -// $f-dropdown-list-hover-bg: $smoke; -// $dropdown-mobile-default-float: 0; - -// We use this to control the styles for when the dropdown has custom content. -// $f-dropdown-content-padding: rem-calc(20); - -// Default radius for dropdown. -// $f-dropdown-radius: $global-radius; - - -// 09. Dropdown Buttons -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// We use these to set the color of the pip in dropdown buttons -// $dropdown-button-pip-color: $white; -// $dropdown-button-pip-color-alt: $oil; - -// We use these to set the size of the pip in dropdown buttons -// $button-pip-tny: rem-calc(6); -// $button-pip-sml: rem-calc(7); -// $button-pip-med: rem-calc(9); -// $button-pip-lrg: rem-calc(11); - -// We use these to style tiny dropdown buttons -// $dropdown-button-padding-tny: $button-pip-tny * 7; -// $dropdown-button-pip-size-tny: $button-pip-tny; -// $dropdown-button-pip-opposite-tny: $button-pip-tny * 3; -// $dropdown-button-pip-top-tny: (-$button-pip-tny / 2) + rem-calc(1); - -// We use these to style small dropdown buttons -// $dropdown-button-padding-sml: $button-pip-sml * 7; -// $dropdown-button-pip-size-sml: $button-pip-sml; -// $dropdown-button-pip-opposite-sml: $button-pip-sml * 3; -// $dropdown-button-pip-top-sml: (-$button-pip-sml / 2) + rem-calc(1); - -// We use these to style medium dropdown buttons -// $dropdown-button-padding-med: $button-pip-med * 6 + rem-calc(3); -// $dropdown-button-pip-size-med: $button-pip-med - rem-calc(3); -// $dropdown-button-pip-opposite-med: $button-pip-med * 2.5; -// $dropdown-button-pip-top-med: (-$button-pip-med / 2) + rem-calc(2); - -// We use these to style large dropdown buttons -// $dropdown-button-padding-lrg: $button-pip-lrg * 5 + rem-calc(3); -// $dropdown-button-pip-size-lrg: $button-pip-lrg - rem-calc(6); -// $dropdown-button-pip-opposite-lrg: $button-pip-lrg * 2.5; -// $dropdown-button-pip-top-lrg: (-$button-pip-lrg / 2) + rem-calc(3); - -// 10. Flex Video -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-media-classes: $include-html-classes; - -// We use these to control video container padding and margins -// $flex-video-padding-top: rem-calc(25); -// $flex-video-padding-bottom: 67.5%; -// $flex-video-margin-bottom: rem-calc(16); - -// We use this to control widescreen bottom padding -// $flex-video-widescreen-padding-bottom: 56.34%; - -// 11. Forms -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-form-classes: $include-html-classes; - -// We use this to set the base for lots of form spacing and positioning styles -// $form-spacing: rem-calc(16); - -// We use these to style the labels in different ways -// $form-label-pointer: pointer; -// $form-label-font-size: rem-calc(14); -// $form-label-font-weight: $font-weight-normal; -// $form-label-line-height: 1.5; -// $form-label-font-color: scale-color($black, $lightness: 30%); -// $form-label-small-transform: capitalize; -// $form-label-bottom-margin: 0; -// $input-font-family: inherit; -// $input-font-color: rgba(0,0,0,0.75); -// $input-font-size: rem-calc(14); -// $input-bg-color: $white; -// $input-focus-bg-color: scale-color($white, $lightness: -2%); -// $input-border-color: scale-color($white, $lightness: -20%); -// $input-focus-border-color: scale-color($white, $lightness: -40%); -// $input-border-style: solid; -// $input-border-width: 1px; -// $input-border-radius: $global-radius; -// $input-disabled-bg: $gainsboro; -// $input-disabled-cursor: $cursor-default-value; -// $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); -// $input-include-glowing-effect: false; - -// We use these to style the fieldset border and spacing. -// $fieldset-border-style: solid; -// $fieldset-border-width: 1px; -// $fieldset-border-color: $gainsboro; -// $fieldset-padding: rem-calc(20); -// $fieldset-margin: rem-calc(18 0); - -// We use these to style the legends when you use them -// $legend-bg: $white; -// $legend-font-weight: $font-weight-bold; -// $legend-padding: rem-calc(0 3); - -// We use these to style the prefix and postfix input elements -// $input-prefix-bg: scale-color($white, $lightness: -5%); -// $input-prefix-border-color: scale-color($white, $lightness: -20%); -// $input-prefix-border-size: 1px; -// $input-prefix-border-type: solid; -// $input-prefix-overflow: hidden; -// $input-prefix-font-color: $oil; -// $input-prefix-font-color-alt: $white; - -// We use this setting to turn on/off HTML5 number spinners (the up/down arrows) -// $input-number-spinners: true; - -// We use these to style the error states for inputs and labels -// $input-error-message-padding: rem-calc(6 9 9); -// $input-error-message-top: -1px; -// $input-error-message-font-size: rem-calc(12); -// $input-error-message-font-weight: $font-weight-normal; -// $input-error-message-font-style: italic; -// $input-error-message-font-color: $white; -// $input-error-message-bg-color: $alert-color; -// $input-error-message-font-color-alt: $oil; - -// We use this to style the glowing effect of inputs when focused -// $glowing-effect-fade-time: .45s; -// $glowing-effect-color: $input-focus-border-color; - -// We use this to style the transition when inputs are focused and when the glowing effect is disabled. -// $input-transition-fade-time: 0.15s; -// $input-transition-fade-timing-function: linear; - -// Select variables -// $select-bg-color: $ghost; -// $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%); - - -// 12. Icon Bar -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// We use these to style the icon-bar and items - $icon-bar-bg: $secondary-color; -// $icon-bar-font-color: $white; -// $icon-bar-font-color-hover: $icon-bar-font-color; -// $icon-bar-font-size: 0; - $icon-bar-hover-color: darken($secondary-color, 5%); -// $icon-bar-icon-color: $white; -// $icon-bar-icon-color-hover: $icon-bar-icon-color; -// $icon-bar-icon-size: 1rem; - $icon-bar-image-width: 1rem; - $icon-bar-image-height: 1rem; -// $icon-bar-active-color: $primary-color; - $icon-bar-item-padding: 0.75rem; - -// We use this to set default opacity and cursor for disabled icons. -// $icon-bar-disabled-opacity: .7; - -// 13. Inline Lists -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-inline-list-classes: $include-html-classes; - -// We use this to control the margins and padding of the inline list. -// $inline-list-top-margin: 0; -// $inline-list-opposite-margin: 0; -// $inline-list-bottom-margin: rem-calc(17); -// $inline-list-default-float-margin: rem-calc(-22); -// $inline-list-default-float-list-margin: rem-calc(22); - -// $inline-list-padding: 0; - -// We use this to control the overflow of the inline list. -// $inline-list-overflow: hidden; - -// We use this to control the list items -// $inline-list-display: block; - -// We use this to control any elements within list items -// $inline-list-children-display: block; - -// 14. Joyride -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-joyride-classes: $include-html-classes; - -// Controlling default Joyride styles -// $joyride-tip-bg: $oil; -// $joyride-tip-default-width: 300px; -// $joyride-tip-padding: rem-calc(18 20 24); -// $joyride-tip-border: solid 1px $charcoal; -// $joyride-tip-radius: 4px; -// $joyride-tip-position-offset: 22px; - -// Here, we're setting the tip font styles -// $joyride-tip-font-color: $white; -// $joyride-tip-font-size: rem-calc(14); -// $joyride-tip-header-weight: $font-weight-bold; - -// This changes the nub size -// $joyride-tip-nub-size: 10px; - -// This adjusts the styles for the timer when its enabled -// $joyride-tip-timer-width: 50px; -// $joyride-tip-timer-height: 3px; -// $joyride-tip-timer-color: $steel; - -// This changes up the styles for the close button -// $joyride-tip-close-color: $monsoon; -// $joyride-tip-close-size: 24px; -// $joyride-tip-close-weight: $font-weight-normal; - -// When Joyride is filling the screen, we use this style for the bg -// $joyride-screenfill: rgba(0,0,0,0.5); - -// 15. Keystrokes -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-keystroke-classes: $include-html-classes; - -// We use these to control text styles. -// $keystroke-font: "Consolas", "Menlo", "Courier", monospace; -// $keystroke-font-size: inherit; -// $keystroke-font-color: $jet; -// $keystroke-font-color-alt: $white; -// $keystroke-function-factor: -7%; - -// We use this to control keystroke padding. -// $keystroke-padding: rem-calc(2 4 0); - -// We use these to control background and border styles. -// $keystroke-bg: scale-color($white, $lightness: $keystroke-function-factor); -// $keystroke-border-style: solid; -// $keystroke-border-width: 1px; -// $keystroke-border-color: scale-color($keystroke-bg, $lightness: $keystroke-function-factor); -// $keystroke-radius: $global-radius; - -// 16. Labels -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-label-classes: $include-html-classes; - -// We use these to style the labels -// $label-padding: rem-calc(4 8 4); -// $label-radius: $global-radius; - -// We use these to style the label text -// $label-font-sizing: rem-calc(11); -// $label-font-weight: $font-weight-normal; -// $label-font-color: $oil; -// $label-font-color-alt: $white; -// $label-font-family: $body-font-family; - -// 17. Magellan -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-magellan-classes: $include-html-classes; - -// $magellan-bg: $white; -// $magellan-padding: 10px; - -// 18. Off-canvas -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// Off Canvas Tab Bar Variables -// $include-html-off-canvas-classes: $include-html-classes; - -// $tabbar-bg: $oil; -// $tabbar-height: rem-calc(45); -// $tabbar-icon-width: $tabbar-height; -// $tabbar-line-height: $tabbar-height; -// $tabbar-color: $white; -// $tabbar-middle-padding: 0 rem-calc(10); - -// Off Canvas Divider Styles -// $tabbar-left-section-border: solid 1px scale-color($tabbar-bg, $lightness: -50%); -// $tabbar-right-section-border: $tabbar-left-section-border; - - -// Off Canvas Tab Bar Headers -// $tabbar-header-color: $white; -// $tabbar-header-weight: $font-weight-bold; -// $tabbar-header-line-height: $tabbar-height; -// $tabbar-header-margin: 0; - -// Off Canvas Menu Variables -// $off-canvas-width: rem-calc(250); -// $off-canvas-bg: $oil; -// $off-canvas-bg-hover: scale-color($tabbar-bg, $lightness: -30%); -// $off-canvas-bg-active: scale-color($tabbar-bg, $lightness: -30%); - -// Off Canvas Menu List Variables -// $off-canvas-label-padding: .3rem rem-calc(15); -// $off-canvas-label-color: $aluminum; -// $off-canvas-label-text-transform: uppercase; -// $off-canvas-label-font-size: rem-calc(12); -// $off-canvas-label-font-weight: $font-weight-bold; -// $off-canvas-label-bg: $tuatara; -// $off-canvas-label-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%); -// $off-canvas-label-border-bottom: none; -// $off-canvas-label-margin:0; -// $off-canvas-link-padding: rem-calc(10, 15); -// $off-canvas-link-color: rgba($white, .7); -// $off-canvas-link-border-bottom: 1px solid scale-color($off-canvas-bg, $lightness: -25%); -// $off-canvas-back-bg: #444; -// $off-canvas-back-border-top: $off-canvas-label-border-top; -// $off-canvas-back-border-bottom: $off-canvas-label-border-bottom; -// $off-canvas-back-hover-bg: scale-color($off-canvas-back-bg, $lightness: -30%); -// $off-canvas-back-hover-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%); -// $off-canvas-back-hover-border-bottom: none; - -// Off Canvas Menu Icon Variables -// $tabbar-menu-icon-color: $white; -// $tabbar-menu-icon-hover: scale-color($tabbar-menu-icon-color, $lightness: -30%); - -// $tabbar-menu-icon-text-indent: rem-calc(35); -// $tabbar-menu-icon-width: $tabbar-icon-width; -// $tabbar-menu-icon-height: $tabbar-height; -// $tabbar-menu-icon-padding: 0; - -// $tabbar-hamburger-icon-width: rem-calc(16); -// $tabbar-hamburger-icon-left: false; -// $tabbar-hamburger-icon-top: false; -// $tabbar-hamburger-icon-thickness: 1px; -// $tabbar-hamburger-icon-gap: 6px; - -// Off Canvas Back-Link Overlay -// $off-canvas-overlay-transition: background 300ms ease; -// $off-canvas-overlay-cursor: pointer; -// $off-canvas-overlay-box-shadow: -4px 0 4px rgba($black, .5), 4px 0 4px rgba($black, .5); -// $off-canvas-overlay-background: rgba($white, .2); -// $off-canvas-overlay-background-hover: rgba($white, .05); - -// Transition Variables -// $menu-slide: "transform 500ms ease"; - -// 19. Orbit -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-orbit-classes: $include-html-classes; - -// We use these to control the caption styles -// $orbit-container-bg: none; -// $orbit-caption-bg: rgba(51,51,51, .8); -// $orbit-caption-font-color: $white; -// $orbit-caption-font-size: rem-calc(14); -// $orbit-caption-position: "bottom"; // Supported values: "bottom", "under" -// $orbit-caption-padding: rem-calc(10 14); -// $orbit-caption-height: auto; - -// We use these to control the left/right nav styles -// $orbit-nav-bg: transparent; -// $orbit-nav-bg-hover: rgba(0,0,0,0.3); -// $orbit-nav-arrow-color: $white; -// $orbit-nav-arrow-color-hover: $white; - -// We use these to control the timer styles -// $orbit-timer-bg: rgba(255,255,255,0.3); -// $orbit-timer-show-progress-bar: true; - -// We use these to control the bullet nav styles -// $orbit-bullet-nav-color: $iron; -// $orbit-bullet-nav-color-active: $aluminum; -// $orbit-bullet-radius: rem-calc(9); - -// We use these to controls the style of slide numbers -// $orbit-slide-number-bg: rgba(0,0,0,0); -// $orbit-slide-number-font-color: $white; -// $orbit-slide-number-padding: rem-calc(5); - -// Graceful Loading Wrapper and preloader -// $wrapper-class: "slideshow-wrapper"; -// $preloader-class: "preloader"; - -// Hide controls on small -// $orbit-nav-hide-for-small: true; -// $orbit-bullet-hide-for-small: true; -// $orbit-timer-hide-for-small: true; - -// 20. Pagination -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-pagination-classes: $include-html-classes; - -// We use these to control the pagination container -// $pagination-height: rem-calc(24); -// $pagination-margin: rem-calc(-5); - -// We use these to set the list-item properties -// $pagination-li-float: $default-float; -// $pagination-li-height: rem-calc(24); -// $pagination-li-font-color: $jet; -// $pagination-li-font-size: rem-calc(14); -// $pagination-li-margin: rem-calc(5); - -// We use these for the pagination anchor links -// $pagination-link-pad: rem-calc(1 10 1); -// $pagination-link-font-color: $aluminum; -// $pagination-link-active-bg: scale-color($white, $lightness: -10%); - -// We use these for disabled anchor links -// $pagination-link-unavailable-cursor: default; -// $pagination-link-unavailable-font-color: $aluminum; -// $pagination-link-unavailable-bg-active: transparent; - -// We use these for currently selected anchor links -// $pagination-link-current-background: $primary-color; -// $pagination-link-current-font-color: $white; -// $pagination-link-current-font-weight: $font-weight-bold; -// $pagination-link-current-cursor: default; -// $pagination-link-current-active-bg: $primary-color; - -// 21. Panels -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-panel-classes: $include-html-classes; - -// We use these to control the background and border styles -// $panel-bg: scale-color($white, $lightness: -5%); -// $panel-border-style: solid; -// $panel-border-size: 1px; -// $callout-panel-bg: scale-color($primary-color, $lightness: 94%); - -// We use this % to control how much we darken things on hover -// $panel-border-color: scale-color($panel-bg, $lightness: -11%); - -// We use these to set default inner padding and bottom margin -// $panel-margin-bottom: rem-calc(20); -// $panel-padding: rem-calc(20); - -// We use these to set default font colors -// $panel-font-color: $oil; -// $panel-font-color-alt: $white; - -// $panel-header-adjust: true; -// $callout-panel-link-color: $primary-color; -// $callout-panel-link-color-hover: scale-color($callout-panel-link-color, $lightness: -14%); - -// 22. Pricing Tables -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-pricing-classes: $include-html-classes; - -// We use this to control the border color -// $price-table-border: solid 1px $gainsboro; - -// We use this to control the bottom margin of the pricing table -// $price-table-margin-bottom: rem-calc(20); - -// We use these to control the title styles -// $price-title-bg: $oil; -// $price-title-padding: rem-calc(15 20); -// $price-title-align: center; -// $price-title-color: $smoke; -// $price-title-weight: $font-weight-normal; -// $price-title-size: rem-calc(16); -// $price-title-font-family: $body-font-family; - -// We use these to control the price styles -// $price-money-bg: $vapor; -// $price-money-padding: rem-calc(15 20); -// $price-money-align: center; -// $price-money-color: $oil; -// $price-money-weight: $font-weight-normal; -// $price-money-size: rem-calc(32); -// $price-money-font-family: $body-font-family; - - -// We use these to control the description styles -// $price-bg: $white; -// $price-desc-color: $monsoon; -// $price-desc-padding: rem-calc(15); -// $price-desc-align: center; -// $price-desc-font-size: rem-calc(12); -// $price-desc-weight: $font-weight-normal; -// $price-desc-line-height: 1.4; -// $price-desc-bottom-border: dotted 1px $gainsboro; - -// We use these to control the list item styles -// $price-item-color: $oil; -// $price-item-padding: rem-calc(15); -// $price-item-align: center; -// $price-item-font-size: rem-calc(14); -// $price-item-weight: $font-weight-normal; -// $price-item-bottom-border: dotted 1px $gainsboro; - -// We use these to control the CTA area styles -// $price-cta-bg: $white; -// $price-cta-align: center; -// $price-cta-padding: rem-calc(20 20 0); - -// 23. Progress Bar -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-media-classes: $include-html-classes; - -// We use this to set the progress bar height -// $progress-bar-height: rem-calc(25); -// $progress-bar-color: $vapor; - -// We use these to control the border styles -// $progress-bar-border-color: scale-color($white, $lightness: 20%); -// $progress-bar-border-size: 1px; -// $progress-bar-border-style: solid; -// $progress-bar-border-radius: $global-radius; - -// We use these to control the margin & padding -// $progress-bar-margin-bottom: rem-calc(10); - -// We use these to set the meter colors -// $progress-meter-color: $primary-color; -// $progress-meter-secondary-color: $secondary-color; -// $progress-meter-success-color: $success-color; -// $progress-meter-alert-color: $alert-color; - -// 24. Range Slider -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-range-slider-classes: $include-html-classes; - -// These variables define the slider bar styles -// $range-slider-bar-width: 100%; -// $range-slider-bar-height: rem-calc(16); - -// $range-slider-bar-border-width: 1px; -// $range-slider-bar-border-style: solid; -// $range-slider-bar-border-color: $gainsboro; -// $range-slider-radius: $global-radius; -// $range-slider-round: $global-rounded; -// $range-slider-bar-bg-color: $ghost; -// $range-slider-active-segment-bg-color: scale-color($secondary-color, $lightness: -1%); - -// Vertical bar styles -// $range-slider-vertical-bar-width: rem-calc(16); -// $range-slider-vertical-bar-height: rem-calc(200); - -// These variabels define the slider handle styles -// $range-slider-handle-width: rem-calc(32); -// $range-slider-handle-height: rem-calc(22); -// $range-slider-handle-position-top: rem-calc(-5); -// $range-slider-handle-bg-color: $primary-color; -// $range-slider-handle-border-width: 1px; -// $range-slider-handle-border-style: solid; -// $range-slider-handle-border-color: none; -// $range-slider-handle-radius: $global-radius; -// $range-slider-handle-round: $global-rounded; -// $range-slider-handle-bg-hover-color: scale-color($primary-color, $lightness: -12%); -// $range-slider-handle-cursor: pointer; - -// $range-slider-disabled-opacity: .7; -// $range-slider-disabled-cursor: $cursor-disabled-value; - -// 25. Reveal -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-reveal-classes: $include-html-classes; - -// We use these to control the style of the reveal overlay. -// $reveal-overlay-bg: rgba($black, .45); -// $reveal-overlay-bg-old: $black; - -// We use these to control the style of the modal itself. -// $reveal-modal-bg: $white; -// $reveal-position-top: rem-calc(100); -// $reveal-default-width: 80%; -// $reveal-max-width: $row-width; -// $reveal-modal-padding: rem-calc(20); -// $reveal-box-shadow: 0 0 10px rgba($black,.4); - -// We use these to style the reveal close button -// $reveal-close-font-size: rem-calc(40); -// $reveal-close-top: rem-calc(10); -// $reveal-close-side: rem-calc(22); -// $reveal-close-color: $base; -// $reveal-close-weight: $font-weight-bold; - -// We use this to set the default radius used throughout the core. -// $reveal-radius: $global-radius; -// $reveal-round: $global-rounded; - -// We use these to control the modal border -// $reveal-border-style: solid; -// $reveal-border-width: 1px; -// $reveal-border-color: $steel; - -// $reveal-modal-class: "reveal-modal"; -// $close-reveal-modal-class: "close-reveal-modal"; - -// 26. Side Nav -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-nav-classes: $include-html-classes; - -// We use this to control padding. -// $side-nav-padding: rem-calc(14 0); - -// We use these to control list styles. -// $side-nav-list-type: none; -// $side-nav-list-position: outside; -// $side-nav-list-margin: rem-calc(0 0 7 0); - -// We use these to control link styles. -// $side-nav-link-color: $primary-color; -// $side-nav-link-color-active: scale-color($side-nav-link-color, $lightness: 30%); -// $side-nav-link-color-hover: scale-color($side-nav-link-color, $lightness: 30%); -// $side-nav-link-bg-hover: hsla(0, 0, 0, .025); -// $side-nav-link-margin: 0; -// $side-nav-link-padding: rem-calc(7 14); -// $side-nav-font-size: rem-calc(14); -// $side-nav-font-weight: $font-weight-normal; -// $side-nav-font-weight-active: $side-nav-font-weight; -// $side-nav-font-family: $body-font-family; -// $side-nav-font-family-active: $side-nav-font-family; - -// We use these to control heading styles. -// $side-nav-heading-color: $side-nav-link-color; -// $side-nav-heading-font-size: $side-nav-font-size; -// $side-nav-heading-font-weight: bold; -// $side-nav-heading-text-transform: uppercase; - -// We use these to control border styles -// $side-nav-divider-size: 1px; -// $side-nav-divider-style: solid; -// $side-nav-divider-color: scale-color($white, $lightness: 10%); - -// 27. Split Buttons -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// We use these to control different shared styles for Split Buttons -// $split-button-function-factor: 10%; -// $split-button-pip-color: $white; -// $split-button-span-border-color: rgba(255,255,255,0.5); -// $split-button-pip-color-alt: $oil; -// $split-button-active-bg-tint: rgba(0,0,0,0.1); - -// We use these to control tiny split buttons -// $split-button-padding-tny: $button-pip-tny * 10; -// $split-button-span-width-tny: $button-pip-tny * 6; -// $split-button-pip-size-tny: $button-pip-tny; -// $split-button-pip-top-tny: $button-pip-tny * 2; -// $split-button-pip-default-float-tny: rem-calc(-6); - -// We use these to control small split buttons -// $split-button-padding-sml: $button-pip-sml * 10; -// $split-button-span-width-sml: $button-pip-sml * 6; -// $split-button-pip-size-sml: $button-pip-sml; -// $split-button-pip-top-sml: $button-pip-sml * 1.5; -// $split-button-pip-default-float-sml: rem-calc(-6); - -// We use these to control medium split buttons -// $split-button-padding-med: $button-pip-med * 9; -// $split-button-span-width-med: $button-pip-med * 5.5; -// $split-button-pip-size-med: $button-pip-med - rem-calc(3); -// $split-button-pip-top-med: $button-pip-med * 1.5; -// $split-button-pip-default-float-med: rem-calc(-6); - -// We use these to control large split buttons -// $split-button-padding-lrg: $button-pip-lrg * 8; -// $split-button-span-width-lrg: $button-pip-lrg * 5; -// $split-button-pip-size-lrg: $button-pip-lrg - rem-calc(6); -// $split-button-pip-top-lrg: $button-pip-lrg + rem-calc(5); -// $split-button-pip-default-float-lrg: rem-calc(-6); - -// 28. Sub Nav -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-nav-classes: $include-html-classes; - -// We use these to control margin and padding -// $sub-nav-list-margin: rem-calc(-4 0 18); -// $sub-nav-list-padding-top: rem-calc(4); - -// We use this to control the definition -// $sub-nav-font-family: $body-font-family; -// $sub-nav-font-size: rem-calc(14); -// $sub-nav-font-color: $aluminum; -// $sub-nav-font-weight: $font-weight-normal; -// $sub-nav-text-decoration: none; -// $sub-nav-padding: rem-calc(3 16); -// $sub-nav-border-radius: 3px; -// $sub-nav-font-color-hover: scale-color($sub-nav-font-color, $lightness: -25%); - - -// We use these to control the active item styles - -// $sub-nav-active-font-weight: $font-weight-normal; -// $sub-nav-active-bg: $primary-color; -// $sub-nav-active-bg-hover: scale-color($sub-nav-active-bg, $lightness: -14%); -// $sub-nav-active-color: $white; -// $sub-nav-active-padding: $sub-nav-padding; -// $sub-nav-active-cursor: default; - -// $sub-nav-item-divider: ""; -// $sub-nav-item-divider-margin: rem-calc(12); - -// 29. Switch -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-form-classes: $include-html-classes; - -// Controlling background color for the switch container -// $switch-bg: $gainsboro; - -// We use these to control the switch heights for our default classes -// $switch-height-tny: 1.5rem; -// $switch-height-sml: 1.75rem; -// $switch-height-med: 2rem; -// $switch-height-lrg: 2.5rem; -// $switch-bottom-margin: 1.5rem; - -// We use these to style the switch-paddle -// $switch-paddle-bg: $white; -// $switch-paddle-transition-speed: .15s; -// $switch-paddle-transition-ease: ease-out; -// $switch-active-color: $primary-color; - -// 30. Tables -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-table-classes: $include-html-classes; - -// These control the background color for the table and even rows -// $table-bg: $white; -// $table-even-row-bg: $snow; - -// These control the table cell border style -// $table-border-style: solid; -// $table-border-size: 1px; -// $table-border-color: $gainsboro; - -// These control the table head styles -// $table-head-bg: $white-smoke; -// $table-head-font-size: rem-calc(14); -// $table-head-font-color: $jet; -// $table-head-font-weight: $font-weight-bold; -// $table-head-padding: rem-calc(8 10 10); - -// These control the table foot styles -// $table-foot-bg: $table-head-bg; -// $table-foot-font-size: $table-head-font-size; -// $table-foot-font-color: $table-head-font-color; -// $table-foot-font-weight: $table-head-font-weight; -// $table-foot-padding: $table-head-padding; - -// These control the caption -// table-caption-bg: transparent; -// $table-caption-font-color: $table-head-font-color; -// $table-caption-font-size: rem-calc(16); -// $table-caption-font-weight: bold; - -// These control the row padding and font styles -// $table-row-padding: rem-calc(9 10); -// $table-row-font-size: rem-calc(14); -// $table-row-font-color: $jet; -// $table-line-height: rem-calc(18); - -// These are for controlling the layout, display and margin of tables -// $table-layout: auto; -// $table-display: table-cell; -// $table-margin-bottom: rem-calc(20); - - -// 31. Tabs -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-tabs-classes: $include-html-classes; - -// $tabs-navigation-padding: rem-calc(16); -// $tabs-navigation-bg-color: $silver; -// $tabs-navigation-active-bg-color: $white; -// $tabs-navigation-hover-bg-color: scale-color($tabs-navigation-bg-color, $lightness: -6%); -// $tabs-navigation-font-color: $jet; -// $tabs-navigation-active-font-color: $tabs-navigation-font-color; -// $tabs-navigation-font-size: rem-calc(16); -// $tabs-navigation-font-family: $body-font-family; - -// $tabs-content-margin-bottom: rem-calc(24); -// $tabs-content-padding: ($column-gutter/2); - -// $tabs-vertical-navigation-margin-bottom: 1.25rem; - -// 32. Thumbnails -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-media-classes: $include-html-classes; - -// We use these to control border styles -// $thumb-border-style: solid; -// $thumb-border-width: 4px; -// $thumb-border-color: $white; -// $thumb-box-shadow: 0 0 0 1px rgba($black,.2); -// $thumb-box-shadow-hover: 0 0 6px 1px rgba($primary-color,0.5); - -// Radius and transition speed for thumbs -// $thumb-radius: $global-radius; -// $thumb-transition-speed: 200ms; - -// 33. Tooltips -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-tooltip-classes: $include-html-classes; - -// $has-tip-border-bottom: dotted 1px $iron; -// $has-tip-font-weight: $font-weight-bold; -// $has-tip-font-color: $oil; -// $has-tip-border-bottom-hover: dotted 1px scale-color($primary-color, $lightness: -55%); -// $has-tip-font-color-hover: $primary-color; -// $has-tip-cursor-type: help; - -// $tooltip-padding: rem-calc(12); -// $tooltip-bg: $oil; -// $tooltip-font-size: rem-calc(14); -// $tooltip-font-weight: $font-weight-normal; -// $tooltip-font-color: $white; -// $tooltip-line-height: 1.3; -// $tooltip-close-font-size: rem-calc(10); -// $tooltip-close-font-weight: $font-weight-normal; -// $tooltip-close-font-color: $monsoon; -// $tooltip-font-size-sml: rem-calc(14); -// $tooltip-radius: $global-radius; -// $tooltip-rounded: $global-rounded; -// $tooltip-pip-size: 5px; -// $tooltip-max-width: 300px; - -// 34. Top Bar -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-top-bar-classes: $include-html-classes; - -// Background color for the top bar - $topbar-bg-color: $secondary-color; - $topbar-bg: $topbar-bg-color; - -// Height and margin - $topbar-height: rem-calc(40); -// $topbar-margin-bottom: 0; - -// Controlling the styles for the title in the top bar -// $topbar-title-weight: $font-weight-normal; -// $topbar-title-font-size: rem-calc(17); - -// Set the link colors and styles for top-level nav -// $topbar-link-color: $white; -// $topbar-link-color-hover: $white; -// $topbar-link-color-active: $white; -// $topbar-link-color-active-hover: $white; - $topbar-link-weight: bold; - $topbar-link-font-size: rem-calc(12px); -// $topbar-link-hover-lightness: -10%; // Darken by 10% -// $topbar-link-bg: $topbar-bg; - $topbar-link-bg-hover: darken($topbar-bg, 5%); -// $topbar-link-bg-color-hover: $charcoal; -// $topbar-link-bg-active: $primary-color; -// $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%); -// $topbar-link-font-family: $body-font-family; -// $topbar-link-text-transform: none; -// $topbar-link-padding: ($topbar-height / 3); -// $topbar-back-link-size: rem-calc(18); -// $topbar-link-dropdown-padding: rem-calc(20); -// $topbar-button-font-size: .75rem; -// $topbar-button-top: 7px; - -// Style the top bar dropdown elements - $topbar-dropdown-bg: $primary-color; -// $topbar-dropdown-link-color: $white; -// $topbar-dropdown-link-color-hover: $topbar-link-color-hover; - $topbar-dropdown-link-bg: $topbar-dropdown-bg; - $topbar-dropdown-link-bg-hover: darken($topbar-dropdown-bg, 5%); - $topbar-dropdown-link-weight: bold; -// $topbar-dropdown-toggle-size: 5px; -// $topbar-dropdown-toggle-color: $white; -// $topbar-dropdown-toggle-alpha: .4; - -// $topbar-dropdown-label-color: $monsoon; -// $topbar-dropdown-label-text-transform: uppercase; -// $topbar-dropdown-label-font-weight: $font-weight-bold; -// $topbar-dropdown-label-font-size: rem-calc(10); -// $topbar-dropdown-label-bg: $oil; - -// Top menu icon styles -// $topbar-menu-link-transform: uppercase; -// $topbar-menu-link-font-size: rem-calc(13); -// $topbar-menu-link-weight: $font-weight-bold; -// $topbar-menu-link-color: $white; -// $topbar-menu-icon-color: $white; -// $topbar-menu-link-color-toggled: $jumbo; -// $topbar-menu-icon-color-toggled: $jumbo; -// $topbar-menu-icon-position: $opposite-direction; // Change to $default-float for a left menu icon - -// Transitions and breakpoint styles -// $topbar-transition-speed: 300ms; -// Using rem-calc for the below breakpoint causes issues with top bar -// $topbar-breakpoint: #{lower-bound($medium-range)}; // Change to 9999px for always mobile layout -// $topbar-media-query: "#{$screen} and (min-width:#{lower-bound($topbar-breakpoint)})"; - -// Top-bar input styles -// $topbar-input-height: rem-calc(28); - -// Divider Styles -// $topbar-divider-border-bottom: solid 1px scale-color($topbar-bg-color, $lightness: 13%); -// $topbar-divider-border-top: solid 1px scale-color($topbar-bg-color, $lightness: -50%); - -// Sticky Class -// $topbar-sticky-class: ".sticky"; - $topbar-arrows: false; //Set false to remove the triangle icon from the menu item -// $topbar-dropdown-arrows: true; //Set false to remove the \00bb >> text from dropdown subnavigation li// - -// 36. Visibility Classes -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-visibility-classes: $include-html-classes; -// $include-accessibility-classes: true; -// $include-table-visibility-classes: true; -// $include-legacy-visibility-classes: true; diff --git a/static/styles/app.scss b/static/styles/app.scss index a05b4c9f3..0ebef1a65 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -1,432 +1,111 @@ -@import "settings"; -@import "normalize"; -@import "foundation"; -@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic); +@import "bootstrap/variables.scss"; +@import "header"; -$top-bar-dropdown-radius: $global-radius; - -// Foundation Restyling -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// Moving the mobile menu icon to the right -.title-area.left { - .toggle-topbar { - right: initial; - } - // Making sure dropdowns on mobile are not rendered on top of the top bar. - @media #{$small-only} { - ~ .top-bar-section { - .has-dropdown.moved > .dropdown, - .dropdown { - top: $topbar-height; - } - } - } -} - -// Restyles to foundation top bar menu, in order to behave aesthetically different -/* -XXX -Is there a better way to implement these styles using best practices without the -need to override this much of foundation? Or at least avoid too much nesting and -specificity (better use of BEM and ITCSS)? -*/ - -.nav { - @media #{$topbar-media-query} { - .has-dropdown { - // Default values for dropdowns, while also being hidden. - .dropdown { - // Border-radius for the first and last dropdown items. We don't style the parent dropdown, as the items overflows it. - @include radius(rem-calc($top-bar-dropdown-radius)); - // Second child here actually targets the first item, since Foundation JS injects a hidden li before it for a mobile back button. - > li:nth-child(2), > li:nth-child(2) > a { - @include side-radius(top, rem-calc($top-bar-dropdown-radius)); - } - > li:last-child, li:last-child > a { - @include side-radius(bottom, rem-calc($top-bar-dropdown-radius)); - } - box-shadow: 0 10px 18px rgba(0, 0, 0, 0.19), - 0 2px 6px rgba(0, 0, 0, 0.23); - // For the transition effect. - opacity: 0; - // Show the dropdown accurately while it animates. - width: auto; - // This will allow the triangle pip to be visible above the dropdown. - overflow: visible; - // This ensures we won't accidentally trigger the dropdown if we hover on it, while the animation to default values is run. - pointer-events: none; - transform: translateY(rem-calc(25px)); - // This transition is actually for when we hover-out of the dropdown. - transition: transform 0.1s linear, - opacity 0.1s linear, - clip 0s 0.3s; - // The triangle pip - &::before { - @include css-triangle(rem-calc(6px), $topbar-dropdown-bg, bottom); - position: absolute; - top: rem-calc(-12px); - left: rem-calc(15px); - } - // This bridges the gap between the top bar and a dropdown. - &::after { - content: ""; - position: absolute; - z-index: -1; - left: 0; - top: rem-calc(-25px); - height: rem-calc(25px); - width: 100%; - // This transition is for hover-on. - transition: all 0.3s cubic-bezier(0.55,0,0.1,1); - } - } - // When hovering - &.hover, &.not-click:hover { - > .dropdown { - opacity: 1; - // Here we override the default clip value ("auto") for an arbitrary large size that fits any dropdown, - // as this now makes it possible to apply a transition effect for it. - clip: rect(-100px, 2000px, 2000px, -100px); - transform: translateY(rem-calc(10px)); - // Reverting back our pointer-events. - pointer-events: auto; - // Animating with a beautiful cubic-bezier curve, or Google's "Swift out" easing :) - transition: transform 0.3s cubic-bezier(0.55,0,0.1,1), - opacity 0.3s cubic-bezier(0.55,0,0.1,1), - // Here we make sure the clipping is set before any other transition. - clip 0s 0s; - // Don't forget to properly animate our bridge, so it keeps only between our gap. - &::after { - top: rem-calc(-10px); - } - } - } - } - } -} - - - -// Our app -// - - - - - - - - - - - - - - - - - - - - - - - - - - -@-webkit-keyframes fadeIn { - 0% {opacity: 0;} - 100% {opacity: 1;} -} -@keyframes fadeIn { - 0% {opacity: 0;} - 100% {opacity: 1;} -} - -html, body { - margin: 0; - padding: 0; - height: 100%; -} - -h1, h2, h3, h4, h5, h6, form, dl, dt, dd, p, div, img, a { - margin: 0; - padding: 0; -} - -img { - border: none; -} - -a { - background-color: transparent; - color: $primary-color; - text-decoration: none; - transition: 0.2s; -} - -h1 { - color: $primary-color; - font-size: 120%; -} - -h2 { - color: $primary-color; - font-size: 110%; -} - -h1 a, h2 a, h3 a, h1 a:hover, h2 a:hover, h3 a:hover { - color: $primary-color; -} - -.fadein { - -webkit-animation: fadeIn 0.25s ease-in-out; - -moz-animation: fadeIn 0.25s ease-in-out; - -o-animation: fadeIn 0.25s ease-in-out; -} - -.container { - position: relative; - margin: 0 auto; - padding: 20px; - max-width: 960px; -} - -.page { - position: relative; - display: table; - width: 100%; - height: 100%; - background-color: #fafafa; - color: #444444; +.vcenter { + display: inline-block; + vertical-align: middle; + float: none; } -.page__row { - display: table-row; - box-sizing: content-box; +.masthead { + padding: 10px; + .nav { + margin-top: 65px; + } + .navbar-brand { + color: $headings-color; + font-size: 24px; + img { + margin-right: $navbar-padding-horizontal; + } + small { + color: #93A4AA; + font-size: 75%; + line-height: 25px; + } + } } -/* XXX find a better way to fix main layout box-sizing */ -.page__row > .container > *{ - box-sizing: border-box; +.navbar { + margin-bottom: 0; } -.navigation { - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 1px 4px rgba(0, 0, 0, 0.23); +.navbar-brand { + padding: 0px; } -.navigation > .container { - padding: 0px; - max-width: 960px; +// ADJUST DRUNKEN PARROT STYLES ######################################## +h1, .h1 { + font-size: 30px; } - -.icon-bar { - vertical-align: top; +h2, .h2 { + font-size: 24px; } - -.masthead .container { - padding: 10px 0; - background-color: #e3e3e3; +h3, .h3 { + font-size: 20px; } - -.masthead > .container { - padding: 0px; - max-width: none; - border-bottom: 1px solid $primary-color; +h4, .h4 { + font-size: 16px; } - -.masthead__logo { - display: inline-block; - vertical-align: middle; +h5, .h5 { + font-size: 14px; } - -.masthead__logo a { - display: block; +h6, .h6 { + font-size: 12px; } -.masthead__logo img { - width: auto; - height: 85px; +.page-header { + margin: 20px 0px 10px; } -.masthead__heading { - display: inline-block; - margin-left: 10px; - margin-top:10px; - vertical-align: top; +// #### CRUD DETAIL ######################################## +p.control-label { + font-weight: bold; } -.masthead__heading h1 { - color: #333333; - text-shadow: 1px 1px 3px #dadada; - font-size: 130%; -} +// copied from bootstrap _forms.scss legend +// using @extend would require importing parts of bootstrap again and overriding drunken parrot css +// @import "bootstrap/mixins.scss"; +// @import "bootstrap/forms.scss"; -.masthead__heading h2 { - padding-left: 2px; - color: #444444; - text-shadow: 1px 1px 3px #dadada; - font-weight: normal; - font-size: 90%; +.legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: $line-height-computed; + font-size: ($font-size-base * 1.5); + line-height: inherit; + color: $legend-color; + border: 0; + border-bottom: 1px solid $legend-border-color; } +// #### footer ########################################### +// based on http://getbootstrap.com/examples/sticky-footer -.masthead .sub-nav { - display: block; - overflow: visible; - padding-top: 0.25rem; - width: auto; - position: absolute; - bottom: -1px; - margin: 0; - right: 0.5em; - - - dd { - margin: 0; - border: 1px solid transparent; - border-bottom: 1px solid $primary-color; - border-top: 2px solid transparent; - border-radius: 5px 5px 0px 0px; - transition: all 0.5s cubic-bezier(0.55,0,0.1,1); - - ul { - margin-right: -3px; - &::after, &::before { - border: 0px; - } - li { - margin: 0; - display: block; - padding: 0.3rem; - color: #555555; - width: 100%; - a { - display: block; - } - - &:hover, &.active { - background: #eee; - - } - } - } - - a { - color: #18577A; - background-color: transparent; - display: inline-block; - padding: 2px 6px 0; - position: relative; - font-size: 90%; - &:hover { - color: #444; - background-color: transparent; - } - } - - &:hover, &.active { - background: #fff; - border: 1px solid $primary-color; - border-bottom: 1px solid #fff; - border-top: 2px solid $primary-color; - transition: all 0.5s cubic-bezier(0.55,0,0.1,1); - - } - } +$footer-height : 140px; +html { + position: relative; + min-height: 100%; } - -.content { - position: relative; - display: table-cell; - overflow: hidden; - height: 100%; - text-align: left; - font-size: 100%; -} - -.content > .container { - height: 100%; - background-color: #ffffff; +body { + margin-bottom: $footer-height + 20px; } -/* Layout */ - .footer { - width: 100%; - background-color: $secondary-color; - color: #ffffff; - text-align: center; -} - -.footer__block { - position: relative; - display: inline-block; - margin: 5px 0; - padding: 0 20px; - vertical-align: middle; - font-size: 70%; -} - -.footer__block a { - color: rgb(255, 255, 255); - font-weight: 600; -} - -.footer__block a:hover { - text-decoration: underline; -} - -.footer__block small { - font-size: 100%; -} - -.footer__logo { - display: block; - font-size: 0; - margin-bottom: 10px; -} - -.footer__logo > img { - height: 32px; -} - -.footer__block--about { - padding-left: 0; - max-width: 195px; -} - -.footer__block--license { - max-width: 285px; -} - -.footer__block--parliament-info { - border: 0; - padding-right: 0; - max-width: 385px; -} - -.footer__block--parliament-info > abbr { - border: 0; - font-size: inherit; - cursor: inherit; - color: inherit; -} - -.footer__block--separator::after { - content: ''; - position: absolute; - top: 0; - bottom: 0; - right: 0; - margin: auto; - height: 50px; - width: 1px; - background-color: white; -} - -@media (max-width: 480px) { - - .masthead { - text-align: center - } - - .masthead__logo { - display: block; - margin: 10px; - } - - .masthead__heading { - margin-left: 0; - } - - .masthead__logo > img{ - height: 80px; - } - - .masthead__heading h1 { - font-size: 90%; - } - - .masthead__heading h2 { - font-size: 70%; - } - + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: $footer-height; + background: #364347 none repeat scroll 0% 0%; + color: white; + text-align: center; + p { + color: white; + margin-top: 10px; + } + .container { + padding-top: 25px; + } } diff --git a/templates/base.html b/templates/base.html index 9c84d5c98..8fff5ecea 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,4 @@ -{% load i18n %} -{% load staticfiles %} -{% load sass_tags %} +{% load i18n staticfiles sass_tags menus %} @@ -15,17 +13,14 @@ {# Styles #} - - + + + {# Scripts #} {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} - - - - {% endblock %} @@ -34,49 +29,44 @@
- {# Navigation #} {% block navigation %} -
+ {% endblock navigation %} {# Header #} {% block main_header %} -
-
-
- -
- {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} -

{{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }}

-

{% trans 'Sistema de Apoio ao Processo Legislativo' %}

-
- - - {% block sections_nav %} - {% endblock sections_nav %} - - -
-
-
+
+
+
+ + Logo + + {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} + {{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }} +
{% trans 'Sistema de Apoio ao Processo Legislativo' %} + + +
+ {% block sections_nav %} {% subnav %} {% endblock sections_nav %} +
+
{% endblock main_header %} {# Main content #} {% block content_container %}
+
{# Feedback messages #} {% for message in messages %} -
+ {% endfor %} @@ -166,7 +156,7 @@ {% block title %} {% if view.title %} -

{{ view.title|linebreaksbr }}

+

{{ view.title|linebreaksbr }}

{% endif %} {% endblock %} @@ -174,8 +164,7 @@ {% endblock base_header %} {# Content per se #} - {% block base_content %} - {% endblock base_content %} + {% block base_content %}{% endblock %}
@@ -184,50 +173,58 @@ {% block foot_js %} - - - - + + + + + - - - {% block extra_js %} - {% endblock %} + {% block extra_js %}{% endblock %} {% endblock foot_js %} diff --git a/templates/comissoes/comissao_detail.html b/templates/comissoes/comissao_detail.html deleted file mode 100644 index e301b7223..000000000 --- a/templates/comissoes/comissao_detail.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n %} -{% block sections_nav %} -
-
{% trans 'Início' %}
-
{% trans 'Composição' %}
-
{% trans 'Matérias em Tramitação' %}
-
-{% endblock sections_nav %} diff --git a/templates/comissoes/comissao_list.html b/templates/comissoes/comissao_list.html index 9fe9f75e8..24cae06ef 100644 --- a/templates/comissoes/comissao_list.html +++ b/templates/comissoes/comissao_list.html @@ -3,11 +3,11 @@ {% load crispy_forms_tags %} {% block base_content %} -
-
- {% blocktrans with verbose_name=view.verbose_name %} Adicionar Comissão {% endblocktrans %} -
-
+
+ + {% blocktrans with verbose_name=view.verbose_name %} Adicionar Comissão {% endblocktrans %} + +
{% block detail_content %} diff --git a/templates/comissoes/subnav.yaml b/templates/comissoes/subnav.yaml new file mode 100644 index 000000000..bfcefee34 --- /dev/null +++ b/templates/comissoes/subnav.yaml @@ -0,0 +1,6 @@ +- title: Início + url: comissao:detail +- title: Composição + url: comissao:composicao +- title: Matérias em Tramitação + url: comissao:materias_em_tramitacao diff --git a/templates/compilacao/publicacao_detail.html b/templates/compilacao/publicacao_detail.html index c4b3e8991..c7e5a9ea1 100644 --- a/templates/compilacao/publicacao_detail.html +++ b/templates/compilacao/publicacao_detail.html @@ -9,10 +9,10 @@
  • {% trans 'Excluir' %}
    • {% endblock actions %} -
    - {% block sections_nav %} - {% endblock %} -
    +
    + {% block sections_nav %} + {% endblock %} +
    {% block detail_content %} {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #} @@ -20,19 +20,19 @@ {%trans 'Identificação Básica'%}
    -
    +

    {{ object.tipo_publicacao}}

    -
    +

    {{ object.veiculo_publicacao}}

    -
    +

    {{ object.ano}}

    @@ -40,25 +40,25 @@
    -
    +

    {{ object.data}}

    -
    +

    {{ object.hora|time:"H:i:s"}}

    -
    +

    {{ object.numero|default:''}}

    -
    +

    {{ object.edicao|default:''}}

    @@ -66,25 +66,25 @@
    -
    +

    {{ object.pagina_inicio|default:''}}

    -
    +

    {{ object.pagina_fim|default:''}}

    -
    +

    {{ object.url_externa|default:''}}

    - +
    {% endblock detail_content %} diff --git a/templates/compilacao/publicacao_list.html b/templates/compilacao/publicacao_list.html index f0472f4ce..abcb696d0 100644 --- a/templates/compilacao/publicacao_list.html +++ b/templates/compilacao/publicacao_list.html @@ -5,15 +5,15 @@ {% block base_content %} -
    -
    - {% trans 'Adicionar'%} {%model_verbose_name 'compilacao.models.Publicacao'%} -
    +
    + + {% trans 'Adicionar'%} {%model_verbose_name 'compilacao.models.Publicacao'%} + {% block more_buttons %} -
    {% trans 'Voltar' %}
    + {% trans 'Voltar' %} {% endblock more_buttons %} -
    +
    {% if not object_list %}

    {{ NO_ENTRIES_MSG }}

    diff --git a/templates/compilacao/textoarticulado_detail.html b/templates/compilacao/textoarticulado_detail.html index e638b3881..7c8e834ce 100644 --- a/templates/compilacao/textoarticulado_detail.html +++ b/templates/compilacao/textoarticulado_detail.html @@ -5,18 +5,18 @@ {% block sections_nav %} {%if object %} -
    - {% if object.content_object%} -
    Início
    - {%else%} -
    {% trans 'Início' %}
    - {%endif%} - -
    {% model_verbose_name_plural 'compilacao.models.Publicacao' %}
    +
    + {% if object.content_object%} + Início + {%else%} + {% trans 'Início' %} + {%endif%} + + {% model_verbose_name_plural 'compilacao.models.Publicacao' %} -
    {% trans 'Texto' %}
    -
    {% trans 'Edição do Texto' %}
    -
    + {% trans 'Texto' %} + {% trans 'Edição do Texto' %} +
    {%endif %} {% endblock %} @@ -24,7 +24,7 @@
    {% block actions %}
      - + {%if object %}
    • {% trans 'Edição dos Metadados do Texto Articulado' %}
    • {% trans 'Excluir' %}
      • @@ -50,7 +50,7 @@
      -
      +

      {{ object.tipo_ta}}

      @@ -58,7 +58,7 @@
      {% if object.content_object and object.content_object.tipo%} -
      +

      {{ object.content_object.tipo}}

      @@ -66,21 +66,21 @@
      {%endif%} -
      +

      {{ object.numero}}

      -
      +

      {{ object.ano}}

      -
      +

      {{ object.data}}

      @@ -89,7 +89,7 @@

      -
      +

      {{ object.ementa|safe}}

      diff --git a/templates/compilacao/textoarticulado_list.html b/templates/compilacao/textoarticulado_list.html index f471d8e44..7df007eb7 100644 --- a/templates/compilacao/textoarticulado_list.html +++ b/templates/compilacao/textoarticulado_list.html @@ -5,23 +5,22 @@ {% block base_content %} {% block actions %}{{block.super}} - + {% endblock actions %} -{% block detail_content %} -{% endblock detail_content %} -
      -
      +{% block detail_content %} +{% endblock detail_content %} +
      + {% trans 'Adicionar'%} {%model_verbose_name 'compilacao.models.TextoArticulado'%} - -
      + {% block more_buttons %} {% endblock more_buttons %} -
      +
      -
    +
    diff --git a/templates/compilacao/tipotextoarticulado_detail.html b/templates/compilacao/tipotextoarticulado_detail.html index da03e5676..02807e505 100644 --- a/templates/compilacao/tipotextoarticulado_detail.html +++ b/templates/compilacao/tipotextoarticulado_detail.html @@ -21,27 +21,27 @@
    -
    +

    {{ object.sigla}}

    -
    +

    {{ object.descricao}}

    -
    +

    {{ object.content_type|default:""}}

    -
    +

    {{ object.get_participacao_social_display}}

    diff --git a/templates/compilacao/tipotextoarticulado_list.html b/templates/compilacao/tipotextoarticulado_list.html index d472b30dd..d8f89d7ad 100644 --- a/templates/compilacao/tipotextoarticulado_list.html +++ b/templates/compilacao/tipotextoarticulado_list.html @@ -5,19 +5,19 @@ {% block base_content %} -
    -
    - {% trans 'Adicionar'%} {%model_verbose_name 'compilacao.models.TipoTextoArticulado'%} -
    +
    + + {% trans 'Adicionar'%} {%model_verbose_name 'compilacao.models.TipoTextoArticulado'%} + {% block more_buttons %} {% endblock more_buttons %} -
    +
    {% if not object_list %}

    {{ NO_ENTRIES_MSG }}

    {% else %} -
    {% fieldclass_verbose_name 'compilacao.models.TextoArticulado' 'tipo_ta' %}
    +
    diff --git a/templates/crud/detail.html b/templates/crud/detail.html index b0fc0c6ce..b88bfef72 100644 --- a/templates/crud/detail.html +++ b/templates/crud/detail.html @@ -6,32 +6,31 @@ {# FIXME is this the best markup to use? #}
    {% block actions %} -
    -
    {% trans 'Editar' %}
    -
    {% trans 'Excluir' %}
    -
    +
    + {% trans 'Editar' %} + {% trans 'Excluir' %} +
    {% endblock actions %} -
    {% block detail_content %} {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #} {% for fieldset in view.fieldsets %} -
    - {{ fieldset.legend }} - {% for row in fieldset.rows %} -
    - {% for column in row %} -
    -
    - {# TODO replace labels, probably (are they correct here?) #} -

    {{ column.text }}

    -
    +

    {{ fieldset.legend }}

    + {% for row in fieldset.rows %} +
    + {% for column in row %} +
    +
    +

    {{ column.verbose_name }}

    +
    +

    {{ column.text }}

    - {% endfor %} +
    {% endfor %} -
    + + {% endfor %} {% endfor %} {% endblock detail_content %} diff --git a/templates/crud/list.html b/templates/crud/list.html index 97a1aa34b..f7100fff7 100644 --- a/templates/crud/list.html +++ b/templates/crud/list.html @@ -4,20 +4,20 @@ {% block base_content %} {# FIXME is this the best markup to use? #} -
    -
    +
    + {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} -
    + - {% block more_buttons %} + {% block more_buttons %} {% endblock more_buttons %} -
    + {% if not rows %}

    {{ NO_ENTRIES_MSG }}

    {% else %} -
    {% fieldclass_verbose_name 'compilacao.models.TipoTextoArticulado' 'sigla' %}
    +
    {% for name in headers %} diff --git a/templates/materia/autoria.html b/templates/materia/autoria.html index e8f483bc1..cb1a619a1 100644 --- a/templates/materia/autoria.html +++ b/templates/materia/autoria.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Autorias @@ -32,44 +32,44 @@
    Adicionar Autoria -
      -
    • Tipo do Autor
      • -
    • Nome Autor
      • -
    • Primeiro Autor
      • -
    +
    +
    Tipo do Autor
    +
    Nome Autor
    +
    Primeiro Autor
    +
    {% csrf_token %} -
      -
    • - -
      • +
      +
      + +
      -
    • - -
      • +
      + +
      -
    • - -
      • -
    +
    + +
    +
    diff --git a/templates/materia/autoria_edit.html b/templates/materia/autoria_edit.html index ca9219171..cf236b668 100644 --- a/templates/materia/autoria_edit.html +++ b/templates/materia/autoria_edit.html @@ -5,53 +5,53 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Editar Autoria -
      -
    • Tipo do Autor
      • -
    • Nome Autor
      • -
    • Primeiro Autor
      • -
    +
    +
    Tipo do Autor
    +
    Nome Autor
    +
    Primeiro Autor
    +
    {% csrf_token %} -
      -
    • - -
      • +
      +
      + +
      -
    • - -
      • +
      + +
      -
    • - -
      • -
    +
    + +
    +
    diff --git a/templates/materia/despacho_inicial.html b/templates/materia/despacho_inicial.html index e8dca82b2..bec784ea8 100644 --- a/templates/materia/despacho_inicial.html +++ b/templates/materia/despacho_inicial.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Despachos diff --git a/templates/materia/despacho_inicial_edit.html b/templates/materia/despacho_inicial_edit.html index 8b9d0da73..05b76eeee 100644 --- a/templates/materia/despacho_inicial_edit.html +++ b/templates/materia/despacho_inicial_edit.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    {% csrf_token %} @@ -23,7 +23,7 @@ - +
    diff --git a/templates/materia/documento_acessorio.html b/templates/materia/documento_acessorio.html index d5e707f01..790a5f4dc 100644 --- a/templates/materia/documento_acessorio.html +++ b/templates/materia/documento_acessorio.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Documentos Acessório diff --git a/templates/materia/documento_acessorio_edit.html b/templates/materia/documento_acessorio_edit.html index 7e772c407..14dcbb95a 100644 --- a/templates/materia/documento_acessorio_edit.html +++ b/templates/materia/documento_acessorio_edit.html @@ -5,53 +5,53 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Editar Documento Acessório
    {% csrf_token %} -
      -
    • - Tipo* - -
      • +
      +
      + Tipo* + +
      -
    • - Data - -
      • +
      + Data + +
      -
    • - Nome* - -
      • -
    +
    + Nome* + +
    + -
      -
    • - Autor* - -
      • - -
    • - Ementa* - -
      • -
    +
    +
    + Autor* + +
    + +
    + Ementa* + +
    +
    - +
    diff --git a/templates/materia/legislacao_citada.html b/templates/materia/legislacao_citada.html index 444b98263..c1774edcc 100644 --- a/templates/materia/legislacao_citada.html +++ b/templates/materia/legislacao_citada.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Legislação Citada diff --git a/templates/materia/legislacao_citada_edit.html b/templates/materia/legislacao_citada_edit.html index 43cd425c4..7debed516 100644 --- a/templates/materia/legislacao_citada_edit.html +++ b/templates/materia/legislacao_citada_edit.html @@ -5,92 +5,92 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Editar Legislação Citada
    {% csrf_token %} -
      -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    -
      -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    -
      -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    -
      -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    - diff --git a/templates/materia/materia_anexada.html b/templates/materia/materia_anexada.html index 720c37719..88a28690e 100644 --- a/templates/materia/materia_anexada.html +++ b/templates/materia/materia_anexada.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Matérias Anexadas diff --git a/templates/materia/materia_anexada_edit.html b/templates/materia/materia_anexada_edit.html index e69ff4a55..3e59117f5 100644 --- a/templates/materia/materia_anexada_edit.html +++ b/templates/materia/materia_anexada_edit.html @@ -5,50 +5,50 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Editar Matéria Anexada -
    + {% csrf_token %} -
      -
    • - - -
      • +
      +
      + + +
      -
    • - - -
      • +
      + + +
      -
    • - - -
      • -
    +
    + + +
    + -
      -
    • - - -
      • +
      +
      + + +
      -
    • - - -
      • -
    +
    + + +
    + - +
    diff --git a/templates/materia/materialegislativa_detail.html b/templates/materia/materialegislativa_detail.html index aaa0a1bcd..73a083226 100644 --- a/templates/materia/materialegislativa_detail.html +++ b/templates/materia/materialegislativa_detail.html @@ -1,24 +1 @@ {% extends "crud/detail.html" %} -{% load i18n %} - -{% block sections_nav %} -
    -
    {% trans 'Início' %}
    -
    {% trans 'Anexada' %}
    -
    {% trans 'Autoria' %}
    -
    {% trans 'Despacho Inicial' %}
    -
    {% trans 'Documento Acessório' %}
    -
    {% trans 'Legislação Citada' %}
    -
    {% trans 'Numeração' %}
    -
    {% trans 'Tramitação' %}
    -
    {% trans 'Relatoria' %}
    - - {% comment %} - Opção adicionada para chamar o TextoArticulado da matéria. - para integração foram necessárias apenas criar a url materia_ta em urls.py - e a view MateriaTaView(IntegracaoTaView) em views.py - Em nada mais a integração interfere em MateriaLegislativa - {% endcomment %} -
    {% trans 'Texto' %}
    -
    -{% endblock sections_nav %} diff --git a/templates/materia/numeracao.html b/templates/materia/numeracao.html index a8c6177f1..3c9513895 100644 --- a/templates/materia/numeracao.html +++ b/templates/materia/numeracao.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Numeração diff --git a/templates/materia/numeracao_edit.html b/templates/materia/numeracao_edit.html index c4eb313fe..949f28612 100644 --- a/templates/materia/numeracao_edit.html +++ b/templates/materia/numeracao_edit.html @@ -5,47 +5,47 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Editar Numeração
    {% csrf_token %} -
      -
    • - - -
      • -
    +
    +
    + + +
    +
    -
      -
    • -
      • -
    • - - -
      • -
    • - - -
      • +
      +
      +
      +
      + + +
      +
      + + +
        - +
    diff --git a/templates/materia/proposicao_list.html b/templates/materia/proposicao_list.html index 391a44662..7aa17bd35 100644 --- a/templates/materia/proposicao_list.html +++ b/templates/materia/proposicao_list.html @@ -7,9 +7,9 @@ {% block sections_nav %}

    Proposições


    -
    -
    Nova Proposição
    -
    +
    + Nova Proposição +
    {% endblock %} {% block detail_content %} @@ -20,7 +20,7 @@
    - + {% for proposicao in page_obj %} {% if proposicao.data_envio %} diff --git a/templates/materia/relatoria.html b/templates/materia/relatoria.html index 6e1337218..788d5becb 100644 --- a/templates/materia/relatoria.html +++ b/templates/materia/relatoria.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Relatorias @@ -29,48 +29,48 @@ {% endfor %}
    Descrição Incorporada?
    - +
    Adicionar Relator
    {% csrf_token %} -
      -
    • - Localização Atual - -
      • -
    -
      -
    • - Data Designação* - -
      • -
    • - Data Destituição - -
      • -
    -
      -
    • - Parlamentar* - -
      • -
    • - Motivo Fim Relatoria - -
      • -
    +
    +
    + Localização Atual + +
    +
    +
    +
    + Data Designação* + +
    +
    + Data Destituição + +
    +
    +
    +
    + Parlamentar* + +
    +
    + Motivo Fim Relatoria + +
    +
    diff --git a/templates/materia/relatoria_edit.html b/templates/materia/relatoria_edit.html index 9d835df41..787d3f6f2 100644 --- a/templates/materia/relatoria_edit.html +++ b/templates/materia/relatoria_edit.html @@ -5,58 +5,58 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} - +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}} +
    Editar Relator
    {% csrf_token %} - -
      -
    • - Localização Atual - -
      • -
    -
      -
    • - Data Designação* - -
      • -
    • - Data Destituição - -
      • -
    -
      -
    • - Parlamentar* - -
      • -
    • - Motivo Fim Relatoria - -
      • -
    + +
    +
    + Localização Atual + +
    +
    +
    +
    + Data Designação* + +
    +
    + Data Destituição + +
    +
    +
    +
    + Parlamentar* + +
    +
    + Motivo Fim Relatoria + +
    +
    diff --git a/templates/materia/subnav.yaml b/templates/materia/subnav.yaml new file mode 100644 index 000000000..5aca57c4b --- /dev/null +++ b/templates/materia/subnav.yaml @@ -0,0 +1,25 @@ +- title: Início + url: materialegislativa:detail +- title: Anexada + url: materia_anexada +- title: Autoria + url: autoria +- title: Despacho Inicial + url: despacho_inicial +- title: Documento Acessório + url: documento_acessorio +- title: Legislação Citada + url: legislacao_citada +- title: Numeração + url: numeracao +- title: Tramitação + url: tramitacao_materia +- title: Relatoria + url: relatoria + +# Opção adicionada para chamar o TextoArticulado da matéria. +# para integração foram necessárias apenas criar a url materia_ta em urls.py +# e a view MateriaTaView(IntegracaoTaView) em views.py +# Em nada mais a integração interfere em MateriaLegislativa +- title: Texto + url: materia_ta diff --git a/templates/materia/tramitacao.html b/templates/materia/tramitacao.html index 0b7b52837..f0f017f7d 100644 --- a/templates/materia/tramitacao.html +++ b/templates/materia/tramitacao.html @@ -5,12 +5,12 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Tramitações diff --git a/templates/materia/tramitacao_edit.html b/templates/materia/tramitacao_edit.html index 83b1094ff..dac27bad0 100644 --- a/templates/materia/tramitacao_edit.html +++ b/templates/materia/tramitacao_edit.html @@ -5,85 +5,85 @@ {% block detail_content %}
    Matéria Legislativa -
      -
    • Tipo: {{materialegislativa.tipo.sigla}}
      • -
    • Número: {{materialegislativa.numero}}
      • -
    • Ano: {{materialegislativa.ano}}
      • -
    - Ementa: {{materialegislativa.ementa}} +
    +
    Tipo: {{object.tipo.sigla}}
    +
    Número: {{object.numero}}
    +
    Ano: {{object.ano}}
    +
    + Ementa: {{object.ementa}}
    Editar Tramitação
    {% csrf_token %} -
      -
    • - - -
      • -
    • - - -
      • -
    +
    +
    + + +
    +
    + + +
    +
    -
      -
    • - - -
      • -
    • - - -
      • -
    • - Urgente ?
      -
      • -
    +
    +
    + + +
    +
    + + +
    +
    + Urgente ?
    +
    +
    -
      -
    • - - -
      • -
    +
    +
    + + +
    +
    -
      -
    • - - -
      • -
    • - - -
      • -
    +
    +
    + + +
    +
    + + +
    +
    -
      -
    • - - -
      • -
    +
    +
    + + +
    +
    - +
    diff --git a/templates/menus/subnav.html b/templates/menus/subnav.html new file mode 100644 index 000000000..85fdecb83 --- /dev/null +++ b/templates/menus/subnav.html @@ -0,0 +1,23 @@ +{% load i18n %} + +{% if menu %} + +{% endif %} diff --git a/templates/mesa_diretora/mesa_diretora.html b/templates/mesa_diretora/mesa_diretora.html index 531f5633a..a156aac07 100644 --- a/templates/mesa_diretora/mesa_diretora.html +++ b/templates/mesa_diretora/mesa_diretora.html @@ -7,70 +7,70 @@ {% csrf_token %}
    Escolha da Legislatura e da Sessão Legislativa - -
      -
    • - - -
      • -
    • - - -
      • -
    + +
    +
    + + +
    +
    + + +
    +
    Escolha da Composição da Mesa Diretora -
      -
    • - - -
      • +
      +
      + + +
      -
    • - {% if cargos_vagos %} {% endif %} -
      -
      - -
      • +
      + {% if cargos_vagos %} {% endif %} +
      +
      + +
      - {% if cargos_vagos %} -
    • - - + {% if cargos_vagos %} +
      + + - -
      • - {% endif %} + +
      + {% endif %} -
    +
    {% endblock detail_content %} \ No newline at end of file diff --git a/templates/norma/normajuridica_detail.html b/templates/norma/normajuridica_detail.html index 27205d1a5..70e5131c1 100644 --- a/templates/norma/normajuridica_detail.html +++ b/templates/norma/normajuridica_detail.html @@ -1,16 +1,16 @@ {% extends "crud/detail.html" %} {% load i18n %} {% block sections_nav %} -
    -
    {% trans 'Início' %}
    +
    + {% trans 'Início' %} - {% comment %} - Opção adicionada para chamar o TextoArticulado da norma. - para integração foram necessárias apenas criar a url norma_ta em urls.py - e a view NormaTa(IntegracaoTaView) em views.py - Em nada mais a integração interfere em Norma Jurídica - {% endcomment %} -
    {% trans 'Texto' %}
    -
    + {% comment %} + Opção adicionada para chamar o TextoArticulado da norma. + para integração foram necessárias apenas criar a url norma_ta em urls.py + e a view NormaTa(IntegracaoTaView) em views.py + Em nada mais a integração interfere em Norma Jurídica + {% endcomment %} + {% trans 'Texto' %} + {% endblock sections_nav %} diff --git a/templates/parlamentares/parlamentares_dependentes.html b/templates/parlamentares/parlamentares_dependentes.html index 2508cf0fb..505fe71f3 100644 --- a/templates/parlamentares/parlamentares_dependentes.html +++ b/templates/parlamentares/parlamentares_dependentes.html @@ -3,7 +3,7 @@ {% load crispy_forms_tags %} {% block actions %}{% endblock %} {% block detail_content %} - + Parlamentar: {{ parlamentar.nome_parlamentar }}
    @@ -17,7 +17,7 @@ {% for d in dependentes %} - {{d.nome}} + {{d.nome}} {{d.tipo }} {{d.data_nascimento|default_if_none:""}} diff --git a/templates/parlamentares/parlamentares_detail.html b/templates/parlamentares/parlamentares_detail.html index 705eb03d9..d9a9da7da 100644 --- a/templates/parlamentares/parlamentares_detail.html +++ b/templates/parlamentares/parlamentares_detail.html @@ -1,19 +1,9 @@ {% extends "crud/detail.html" %} {% load i18n %} {% block actions %} -
    +
    {% if legislatura_id != 0 %} -
    {% trans 'Incluir Parlamentar' %}
    + {% trans 'Incluir Parlamentar' %} {% endif %} -
    -{% endblock actions %} -{% block sections_nav %} -
    - {% if parlamentar %} -
    {% trans 'Inicio' %}
    -
    {% trans 'Mandatos' %}
    -
    {% trans 'Filiações Partidárias' %}
    -
    {% trans 'Dependentes' %}
    - {% endif %} -
    -{% endblock sections_nav %} \ No newline at end of file + +{% endblock actions %} \ No newline at end of file diff --git a/templates/parlamentares/parlamentares_filiacao.html b/templates/parlamentares/parlamentares_filiacao.html index d70ffb46c..3741b1b43 100644 --- a/templates/parlamentares/parlamentares_filiacao.html +++ b/templates/parlamentares/parlamentares_filiacao.html @@ -3,7 +3,7 @@ {% load crispy_forms_tags %} {% block actions %}{% endblock %} {% block detail_content %} - + Parlamentar: {{ parlamentar.nome_parlamentar }}
    @@ -17,7 +17,7 @@ {% for f in filiacoes %} - {{f.partido.sigla}} + {{f.partido.sigla}} {{f.data}} {{f.data_desfiliacao|default_if_none:""}} diff --git a/templates/parlamentares/parlamentares_mandato.html b/templates/parlamentares/parlamentares_mandato.html index b78451e52..bdc7ddad4 100644 --- a/templates/parlamentares/parlamentares_mandato.html +++ b/templates/parlamentares/parlamentares_mandato.html @@ -3,7 +3,7 @@ {% load crispy_forms_tags %} {% block actions %}{% endblock %} {% block detail_content %} - + Parlamentar: {{ parlamentar.nome_parlamentar }}
    @@ -20,7 +20,7 @@ {% for m in mandatos %} - {{m.legislatura}} + {{m.legislatura}} {{m.coligacao|default_if_none:""}} {{m.data_fim_mandato|default_if_none:""}} {{m.data_expedicao_diploma|default_if_none:""}} diff --git a/templates/parlamentares/subnav.yaml b/templates/parlamentares/subnav.yaml new file mode 100644 index 000000000..bfef5bc0d --- /dev/null +++ b/templates/parlamentares/subnav.yaml @@ -0,0 +1,8 @@ +- title: Início + url: parlamentares_editar +- title: Mandatos + url: parlamentares_mandato +- title: Filiações Partidárias + url: parlamentares_filiacao +- title: Dependentes + url: parlamentares_dependentes diff --git a/templates/protocoloadm/detail_doc_adm.html b/templates/protocoloadm/detail_doc_adm.html index 498794253..e615cc3e8 100644 --- a/templates/protocoloadm/detail_doc_adm.html +++ b/templates/protocoloadm/detail_doc_adm.html @@ -9,68 +9,68 @@ {% csrf_token %}
    Identificação Básica -
      -
    • Tipo Documento
      • -
    • Número
      • -
    • Ano
      • -
    -
      -
    • - -
      • -
      • -
      • -
    -
      -
    • Data
      • -
    • Núm. Protocolo
      • -
    -
      -
      • -
      • -
    -
      -
    • Assunto
      • -
    -
      -
      • -
    -
      -
    • Interessado
      • -
    • Em Tramitação?
      • -
    -
      -
      • -
    • - -
      • -
    +
    +
    Tipo Documento
    +
    Número
    +
    Ano
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    Data
    +
    Núm. Protocolo
    +
    +
    +
    +
    +
    +
    +
    Assunto
    +
    +
    +
    +
    +
    +
    Interessado
    +
    Em Tramitação?
    +
    +
    +
    +
    + +
    +
    Outras Informações -
      -
    • Dias Prazo
      • -
    • Data Fim Prazo
      • -
    -
      -
      • -
      • -
    -
      -
    • Obervação
      • -
    -
      -
      • -
    +
    +
    Dias Prazo
    +
    Data Fim Prazo
    +
    +
    +
    +
    +
    +
    +
    Obervação
    +
    +
    +
    +
    diff --git a/templates/protocoloadm/detail_doc_detail.html b/templates/protocoloadm/detail_doc_detail.html index 48cd9b73e..59c9ac660 100644 --- a/templates/protocoloadm/detail_doc_detail.html +++ b/templates/protocoloadm/detail_doc_detail.html @@ -2,8 +2,9 @@ {% load i18n %} {% block sections_nav %} -
    -
    {% trans 'Inicio' %}
    -
    {% trans 'Documento Acessório' %}
    -
    {% trans 'Tramitação' %}
    +
    + {% trans 'Inicio' %} + {% trans 'Documento Acessório' %} + {% trans 'Tramitação' %} +
    {% endblock sections_nav %} diff --git a/templates/protocoloadm/documento_acessorio_administrativo.html b/templates/protocoloadm/documento_acessorio_administrativo.html index f51645212..d143ac8af 100644 --- a/templates/protocoloadm/documento_acessorio_administrativo.html +++ b/templates/protocoloadm/documento_acessorio_administrativo.html @@ -5,11 +5,11 @@ {% block detail_content %}
    Documento Administrativo -
      -
    • Tipo: {{doc.tipo.sigla}}
      • -
    • Número: {{doc.numero}}
      • -
    • Ano: {{doc.ano}}
      • -
    +
    +
    Tipo: {{doc.tipo.sigla}}
    +
    Número: {{doc.numero}}
    +
    Ano: {{doc.ano}}
    +
    Assunto: {{doc.assunto}}
    diff --git a/templates/protocoloadm/pesquisa_documento_detail.html b/templates/protocoloadm/pesquisa_documento_detail.html index ad7650165..9e4a5ebb4 100644 --- a/templates/protocoloadm/pesquisa_documento_detail.html +++ b/templates/protocoloadm/pesquisa_documento_detail.html @@ -2,7 +2,7 @@ {% load i18n %} {% block sections_nav %} -
    -
    {% trans 'Incluir Documento' %}
    -
    +
    + {% trans 'Incluir Documento' %} +
    {% endblock sections_nav %} diff --git a/templates/protocoloadm/proposicoes_detail.html b/templates/protocoloadm/proposicoes_detail.html index 570231d95..f0b3b2eab 100644 --- a/templates/protocoloadm/proposicoes_detail.html +++ b/templates/protocoloadm/proposicoes_detail.html @@ -2,10 +2,10 @@ {% load i18n %} {% block sections_nav %} -
    -
    {% trans 'Incorporar Proposições' %}
    -
    {% trans 'Proposições Não Recebidas' %}
    -
    {% trans 'Proposições Não Incorporadas' %}
    -
    {% trans 'Proposições Incorporadas' %}
    -
    +
    + {% trans 'Incorporar Proposições' %} + {% trans 'Proposições Não Recebidas' %} + {% trans 'Proposições Não Incorporadas' %} + {% trans 'Proposições Incorporadas' %} +
    {% endblock sections_nav %} diff --git a/templates/protocoloadm/protocoloadm_detail.html b/templates/protocoloadm/protocoloadm_detail.html index ecce99fce..ea65da477 100644 --- a/templates/protocoloadm/protocoloadm_detail.html +++ b/templates/protocoloadm/protocoloadm_detail.html @@ -2,10 +2,10 @@ {% load i18n %} {% block actions %}{% endblock %} {% block sections_nav %} -
    -
    {% trans 'Pesquisa Protocolo' %}
    -
    {% trans 'Protocolar Documento' %}
    -
    {% trans 'Protocolar Matéria' %}
    -
    {% trans 'Anular Protocolo' %}
    -
    +
    + {% trans 'Pesquisa Protocolo' %} + {% trans 'Protocolar Documento' %} + {% trans 'Protocolar Matéria' %} + {% trans 'Anular Protocolo' %} +
    {% endblock sections_nav %} diff --git a/templates/sessao/edit_explicacao.html b/templates/sessao/edit_explicacao.html index b7b426d70..9e2b7ae92 100644 --- a/templates/sessao/edit_explicacao.html +++ b/templates/sessao/edit_explicacao.html @@ -21,16 +21,16 @@
    {% csrf_token %} -
      -
    • Ordem de pronunciamento
      • -
    • Parlamentar
      • -
    • URL Discurso
      • -
    -
      -
      • -
      • -
      • -
    +
    +
    Ordem de pronunciamento
    +
    Parlamentar
    +
    URL Discurso
    +
    +
    +
    +
    +
    +
    diff --git a/templates/sessao/edit_orador.html b/templates/sessao/edit_orador.html index d3ec153bf..415291726 100644 --- a/templates/sessao/edit_orador.html +++ b/templates/sessao/edit_orador.html @@ -21,16 +21,16 @@
    {% csrf_token %} -
      -
    • Ordem de pronunciamento
      • -
    • Parlamentar
      • -
    • URL Discurso
      • -
    -
      -
      • -
      • -
      • -
    +
    +
    Ordem de pronunciamento
    +
    Parlamentar
    +
    URL Discurso
    +
    +
    +
    +
    +
    +
    diff --git a/templates/sessao/expediente_ordemdia_list.html b/templates/sessao/expediente_ordemdia_list.html index 0348ecffd..1f01ab689 100644 --- a/templates/sessao/expediente_ordemdia_list.html +++ b/templates/sessao/expediente_ordemdia_list.html @@ -20,51 +20,51 @@ Matérias do Expediente -
      -
    • Matéria
      • -
    • Ementa
      • -
    • Resultado da Votação
      • -
    -
      - {% for m in materias_ordem %} -
    • - {{m.numero}} - {{m.titulo}} -   -
      - Autor{{m.autor|length|pluralize:"es"}}: {{m.autor|join:', '}} -
      • -
    • {{m.ementa|safe}}
      • -
    • - {% if m.resultado %} - {% if m.tipo_votacao == 1 %} - {{m.resultado}} - {% elif m.tipo_votacao == 2 %} - {{m.resultado}} - {% elif m.tipo_votacao == 3%} - {{m.resultado}} - {% endif %} - {% else %} - Matéria não votada
      - {% if m.votacao_aberta %} - {% if m.tipo_votacao == 1 %} - Registrar Votação - {% elif m.tipo_votacao == 2 %} - Registrar Votação - {% elif m.tipo_votacao == 3%} - Registrar Votação - {% endif %} - {% else %} -
      - {% csrf_token %} - - - -
      - {% endif %} - {% endif %} -
      • - {% endfor %} -
    +
    +
    Matéria
    +
    Ementa
    +
    Resultado da Votação
    +
    +
    + {% for m in materias_ordem %} +
    + {{m.numero}} - {{m.titulo}} +   +
    + Autor{{m.autor|length|pluralize:"es"}}: {{m.autor|join:', '}} +
    +
    {{m.ementa|safe}}
    +
    + {% if m.resultado %} + {% if m.tipo_votacao == 1 %} + {{m.resultado}} + {% elif m.tipo_votacao == 2 %} + {{m.resultado}} + {% elif m.tipo_votacao == 3%} + {{m.resultado}} + {% endif %} + {% else %} + Matéria não votada
    + {% if m.votacao_aberta %} + {% if m.tipo_votacao == 1 %} + Registrar Votação + {% elif m.tipo_votacao == 2 %} + Registrar Votação + {% elif m.tipo_votacao == 3%} + Registrar Votação + {% endif %} + {% else %} +
    + {% csrf_token %} + + + +
    + {% endif %} + {% endif %} +
    + {% endfor %} +

    diff --git a/templates/sessao/explicacao.html b/templates/sessao/explicacao.html index 5301ededd..d046c510e 100644 --- a/templates/sessao/explicacao.html +++ b/templates/sessao/explicacao.html @@ -6,22 +6,22 @@
    Oradores das Explicações Pessoais -
      -
    • Ordem de pronunciamento
      • -
    • Parlamentar
      • -
    • URL Discurso
      • -
    • Editar/Excluir
      • -
    +
    +
    Ordem de pronunciamento
    +
    Parlamentar
    +
    URL Discurso
    +
    Editar/Excluir
    +
    {% for numero_ordem, url_discurso, parlamentar in view.get_oradores %} -     +
    +
    {{numero_ordem}}
    +
    {{parlamentar.nome_parlamentar }}
    +
    {% if not url_discurso %}Orador sem discurso cadastrado{% else %}{{url_discurso}}{% endif %}
    +
    + Editar + / Excluir +
    +
    {% endfor %}
    @@ -42,22 +42,22 @@
    {% csrf_token %} -
      -
    • Ordem de pronunciamento
      • -
    • Parlamentar
      • -
    • URL Discurso
      • -
    - -
      -
      • +
      +
      Ordem de pronunciamento
      +
      Parlamentar
      +
      URL Discurso
      +
      -
      • -
      • -
    +
    +
    + +
    +
    +
    diff --git a/templates/sessao/materia_ordemdia.html b/templates/sessao/materia_ordemdia.html index b02ccbc0c..d60083ab0 100644 --- a/templates/sessao/materia_ordemdia.html +++ b/templates/sessao/materia_ordemdia.html @@ -26,49 +26,49 @@
    {% csrf_token %} -
      -
    • Data da Sessão:
      • - -
    • - Tipo da Sessão: -
      • -
    • Número Ordem:
      • -
    +
    +
    Data da Sessão:
    + +
    + Tipo da Sessão: +
    +
    Número Ordem:
    +
    -
      -
    • - Tipo Matéria: - -
      • -
    • Número Matéria:
      • -
    • Ano Matéria:
      • -
    +
    +
    + Tipo Matéria: + +
    +
    Número Matéria:
    +
    Ano Matéria:
    +
    -
      -
    • - Tipo Votação: - -
      • -
    - -
      -
    • Ementa:
      • -
    +
    +
    + Tipo Votação: + +
    +
    + +
    +
    Ementa:
    +
    diff --git a/templates/sessao/materia_ordemdia_edit.html b/templates/sessao/materia_ordemdia_edit.html index 660a58291..c8d607b8c 100644 --- a/templates/sessao/materia_ordemdia_edit.html +++ b/templates/sessao/materia_ordemdia_edit.html @@ -21,50 +21,50 @@ {% csrf_token %} - -
      -
    • Data da Sessão:
      • - -
    • - Tipo da Sessão: -
      • -
    • Número Ordem:
      • -
    -
      -
    • - Tipo Matéria: - -
      • -
    • Número Matéria:
      • -
    • Ano Matéria:
      • -
    +
    +
    Data da Sessão:
    + +
    + Tipo da Sessão: +
    +
    Número Ordem:
    +
    -
      -
    • - Tipo Votação: - -
      • -
    - -
      -
    • Ementa:
      • -
    +
    +
    + Tipo Matéria: + +
    +
    Número Matéria:
    +
    Ano Matéria:
    +
    + +
    +
    + Tipo Votação: + +
    +
    + +
    +
    Ementa:
    +
    diff --git a/templates/sessao/materia_ordemdia_list.html b/templates/sessao/materia_ordemdia_list.html index cb92f23f0..ee78966d2 100644 --- a/templates/sessao/materia_ordemdia_list.html +++ b/templates/sessao/materia_ordemdia_list.html @@ -19,50 +19,50 @@ {% endif %} Matérias da Ordem do Dia -
      -
    • Matéria
      • -
    • Ementa
      • -
    • Resultado da Votação
      • -
    -
      - {% for m in materias_ordem %} -
    • - {{m.numero}} - {{m.titulo}} -   -
      - Autor{{m.autor|length|pluralize:"es"}}: {{m.autor|join:', '}} -
      • -
    • {{m.ementa|safe}}
      • -
    • - {% if m.resultado %} - {% if m.tipo_votacao == 1 %} - {{m.resultado}} - {% elif m.tipo_votacao == 2 %} - {{m.resultado}} - {% elif m.tipo_votacao == 3%} - {{m.resultado}} - {% endif %} - {% else %} - Matéria não votada
      - {% if m.votacao_aberta %} - {% if m.tipo_votacao == 1 %} - Registrar Votação - {% elif m.tipo_votacao == 2 %} - Registrar Votação - {% elif m.tipo_votacao == 3%} - Registrar Votação - {% endif %} - {% else %} - - {% csrf_token %} - - -
      • - {% endif %} - {% endif %} - - {% endfor %} -
    +
    +
    Matéria
    +
    Ementa
    +
    Resultado da Votação
    +
    +
    + {% for m in materias_ordem %} +
    + {{m.numero}} - {{m.titulo}} +   +
    + Autor{{m.autor|length|pluralize:"es"}}: {{m.autor|join:', '}} +
    +
    {{m.ementa|safe}}
    +
    + {% if m.resultado %} + {% if m.tipo_votacao == 1 %} + {{m.resultado}} + {% elif m.tipo_votacao == 2 %} + {{m.resultado}} + {% elif m.tipo_votacao == 3%} + {{m.resultado}} + {% endif %} + {% else %} + Matéria não votada
    + {% if m.votacao_aberta %} + {% if m.tipo_votacao == 1 %} + Registrar Votação + {% elif m.tipo_votacao == 2 %} + Registrar Votação + {% elif m.tipo_votacao == 3%} + Registrar Votação + {% endif %} + {% else %} +
    + {% csrf_token %} + + +
    + {% endif %} + {% endif %} +
    + {% endfor %} +

    diff --git a/templates/sessao/mesa.html b/templates/sessao/mesa.html index 14334d945..180f0bcb8 100644 --- a/templates/sessao/mesa.html +++ b/templates/sessao/mesa.html @@ -7,38 +7,38 @@
    {% csrf_token %} -
      -
    • - -
      • - -
    • - {% if view.get_cargos_mesa %}{% endif %} -
      -
      - -
      • - {% if view.get_cargos_mesa %} -
    • - - -
      • - {% endif %} -
    +
    +
    + +
    + +
    + {% if view.get_cargos_mesa %}{% endif %} +
    +
    + +
    + {% if view.get_cargos_mesa %} +
    + + +
    + {% endif %} +
    {% endblock detail_content %} diff --git a/templates/sessao/orador_expediente.html b/templates/sessao/orador_expediente.html index f4366ea0b..b4b3c4185 100644 --- a/templates/sessao/orador_expediente.html +++ b/templates/sessao/orador_expediente.html @@ -6,22 +6,22 @@
    Oradores do Expediente -
      -
    • Ordem de pronunciamento
      • -
    • Parlamentar
      • -
    • URL Discurso
      • -
    • Editar/Excluir
      • -
    +
    +
    Ordem de pronunciamento
    +
    Parlamentar
    +
    URL Discurso
    +
    Editar/Excluir
    +
    {% for numero_ordem, url_discurso, parlamentar in view.get_oradores %} -     +
    +
    {{numero_ordem}}
    +
    {{parlamentar.nome_parlamentar }}
    +
    {% if not url_discurso %}Orador sem discurso cadastrado{% else %}{{url_discurso}}{% endif %}
    +
    + Editar + / Excluir +
    +
    {% endfor %}
    @@ -42,22 +42,22 @@
    {% csrf_token %} -
      -
    • Ordem de pronunciamento
      • -
    • Parlamentar
      • -
    • URL Discurso
      • -
    - -
      -
      • +
      +
      Ordem de pronunciamento
      +
      Parlamentar
      +
      URL Discurso
      +
      -
      • -
      • -
    +
    +
    + +
    +
    +
    diff --git a/templates/sessao/painel.html b/templates/sessao/painel.html index 35c4f0589..985d54e5f 100644 --- a/templates/sessao/painel.html +++ b/templates/sessao/painel.html @@ -5,56 +5,56 @@ {% block detail_content %} - +
    + +
    Iniciar painel completo
    + +
    Controlador Painel
    +

    Operação do Painel Eletrônico


    -
      -
    • Cronômetro do Discurso
      • -
    +
    +
    Cronômetro do Discurso
    +
    -
      -
      • -
    +
    +
    +
    -
      -
      • -
      • -
    +
    +
    +
    +
    -
      -
    • Cronômetro do Aparte
      • -
    +
    +
    Cronômetro do Aparte
    +
    -
      -
      • -
    +
    +
    +
    -
      -
      • -
      • -
    +
    +
    +
    +
    -
      -
    • Cronômetro da Questão de Ordem
      • -
    +
    +
    Cronômetro da Questão de Ordem
    +
    -
      -
      • -
    +
    +
    +
    -
      -
      • -
      • -
    +
    +
    +
    +
    {% endblock detail_content %} @@ -95,11 +95,11 @@ $(function() { stopAt: 0, milliseconds: false }).on('runnerFinish', function(eventObject, info){ - audioAlertFinish.play(); + audioAlertFinish.play(); }); $('#discursoStart').click(function() { - + if ($('#discursoStart').text() == 'Iniciar'){ $.get('/painel/cronometro', { tipo: 'discurso', action: 'start' } ); diff --git a/templates/sessao/pauta/acompanhar_materia.html b/templates/sessao/pauta/acompanhar_materia.html index 672e952ec..491259e09 100644 --- a/templates/sessao/pauta/acompanhar_materia.html +++ b/templates/sessao/pauta/acompanhar_materia.html @@ -6,15 +6,15 @@

    Acompanhamento de Matéria

    -
      -
    • Tipo: {{materia.tipo.sigla}} - {{materia.tipo.descricao}}
      • -
    • Número: {{materia.numero}}
      • -
    • Ano: {{materia.ano}}
      • +
      +
      Tipo: {{materia.tipo.sigla}} - {{materia.tipo.descricao}}
      +
      Número: {{materia.numero}}
      +
      Ano: {{materia.ano}}
      -
    -
      -
    • Ementa: {{materia.ementa|safe}}
      • -
    + +
    +
    Ementa: {{materia.ementa|safe}}
    +
    {% if error %}
    {{ error }}
    {% endif %} {% crispy form %} diff --git a/templates/sessao/pauta_sessao_detail.html b/templates/sessao/pauta_sessao_detail.html index f2944b1e6..e66ead50c 100644 --- a/templates/sessao/pauta_sessao_detail.html +++ b/templates/sessao/pauta_sessao_detail.html @@ -9,78 +9,78 @@
    Pauta da Sessão
    {{ sessaoplenaria }}
    - +
    Identificação Básica -
      - {% for b in basica %} -
    • {{b}}
      • - {% endfor %} -
    +
    + {% for b in basica %} +
    {{b}}
    + {% endfor %} +
    Expedientes -
      - {% for e in expedientes %} -
    • {{e.tipo}}:
      • -
    • {{e.conteudo|safe}}
      • - {% endfor %} -
    +
    + {% for e in expedientes %} +
    {{e.tipo}}:
    +
    {{e.conteudo|safe}}
    + {% endfor %} +
    Matérias do Expediente -
      -
    • Matéria
      • -
    • Ementa
      • -
    • Resultado da Votação
      • -
    -
      - {% for m in materia_expediente %} -
    • - {{m.numero}} - {{m.titulo}} -
      - Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} -
      • -
    • {{m.ementa|safe}}
      • -
    • {{m.situacao}}
      • - {% endfor %} -
    +
    +
    Matéria
    +
    Ementa
    +
    Resultado da Votação
    +
    +
    + {% for m in materia_expediente %} +
    + {{m.numero}} - {{m.titulo}} +
    + Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} +
    +
    {{m.ementa|safe}}
    +
    {{m.situacao}}
    + {% endfor %} +
    Oradores do Expediente -
      -
    • Parlamentar
      • -
    • Discurso
      • -
    -
      - {% for o in oradores %} -
    • {{o.numero_ordem}} - {{o.parlamentar}}
      • -
    • {{o.url_discurso}}
      • - {% endfor %} -
    +
    +
    Parlamentar
    +
    Discurso
    +
    +
    + {% for o in oradores %} +
    {{o.numero_ordem}} - {{o.parlamentar}}
    +
    {{o.url_discurso}}
    + {% endfor %} +
    Matérias da Ordem do Dia -
      -
    • Matéria
      • -
    • Ementa
      • -
    • Resultado da Votação
      • -
    -
      - {% for m in materias_ordem %} -
    • - {{m.numero}} - {{m.titulo}} -
      - Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} -
      • -
    • {{m.ementa|safe}}
      • -
    • {{m.situacao}}
      • - {% endfor %} -
    +
    +
    Matéria
    +
    Ementa
    +
    Resultado da Votação
    +
    +
    + {% for m in materias_ordem %} +
    + {{m.numero}} - {{m.titulo}} +
    + Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} +
    +
    {{m.ementa|safe}}
    +
    {{m.situacao}}
    + {% endfor %} +
    diff --git a/templates/sessao/presenca.html b/templates/sessao/presenca.html index bef8f8c1f..718b9562a 100644 --- a/templates/sessao/presenca.html +++ b/templates/sessao/presenca.html @@ -5,20 +5,20 @@
    {% csrf_token %} -
      -
    • Presença
      • -
    • Parlamentar
      • -
    +
    +
    Presença
    +
    Parlamentar
    +
    -
      -
    • Marcar/Desmarcar Todos
      • -
    +
    +
    Marcar/Desmarcar Todos
    +
    {% for parlamentar, check in view.get_parlamentares %} -
      -
      • -
      • -
    +
    +
    +
    +
    {% endfor %}
    diff --git a/templates/sessao/presenca_ordemdia.html b/templates/sessao/presenca_ordemdia.html index bef8f8c1f..718b9562a 100644 --- a/templates/sessao/presenca_ordemdia.html +++ b/templates/sessao/presenca_ordemdia.html @@ -5,20 +5,20 @@ {% csrf_token %} -
      -
    • Presença
      • -
    • Parlamentar
      • -
    +
    +
    Presença
    +
    Parlamentar
    +
    -
      -
    • Marcar/Desmarcar Todos
      • -
    +
    +
    Marcar/Desmarcar Todos
    +
    {% for parlamentar, check in view.get_parlamentares %} -
      -
      • -
      • -
    +
    +
    +
    +
    {% endfor %}
    diff --git a/templates/sessao/resumo.html b/templates/sessao/resumo.html index 1163c4684..f2cb53959 100644 --- a/templates/sessao/resumo.html +++ b/templates/sessao/resumo.html @@ -5,116 +5,116 @@ {% block detail_content %}
    Resumo - +
    Identificação Básica -
      - {% for b in basica %} -
    • {{b}}
      • - {% endfor %} -
    +
    + {% for b in basica %} +
    {{b}}
    + {% endfor %} +
    Conteúdo Multimídia -
      -
    • {{multimidia_audio}}
      • -
    • {{multimidia_video}}
      • -
    +
    +
    {{multimidia_audio}}
    +
    {{multimidia_video}}
    +
    Mesa Diretora -
      - {% for m in mesa %} -
    • {{m.cargo}}: {{m.parlamentar.nome_parlamentar}}
      • - {% endfor %} -
    +
    + {% for m in mesa %} +
    {{m.cargo}}: {{m.parlamentar.nome_parlamentar}}
    + {% endfor %} +
    Lista de Presença na Sessão -
      - {% for p in presenca_sessao %} -
    • {{p}}
      • - {% endfor %} -
    +
    + {% for p in presenca_sessao %} +
    {{p}}
    + {% endfor %} +
    Expedientes -
      - {% for e in expedientes %} -
    • - {{e.tipo}}: -
      - {{e.conteudo|safe}} -
      • - {% endfor %} -
    +
    + {% for e in expedientes %} +
    + {{e.tipo}}: +
    + {{e.conteudo|safe}} +
    + {% endfor %} +
    Matérias do Expediente -
      -
    • Matéria
      • -
    • Ementa
      • -
    • Resultado da Votação
      • -
    -
      - {% for m in materia_expediente %} -
    • - {{m.numero}} - {{m.titulo}} -
      - Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} -
      • -
    • {{m.ementa|safe}}
      • -
    • {{m.resultado}}
      • - {% endfor %} -
    +
    +
    Matéria
    +
    Ementa
    +
    Resultado da Votação
    +
    +
    + {% for m in materia_expediente %} +
    + {{m.numero}} - {{m.titulo}} +
    + Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} +
    +
    {{m.ementa|safe}}
    +
    {{m.resultado}}
    + {% endfor %} +
    Oradores do Expediente -
      -
    • Parlamentar
      • -
    • Discurso
      • -
    -
      - {% for o in oradores %} -
    • {{o.numero_ordem}} - {{o.parlamentar}}
      • -
    • {{o.url_discurso}}
      • - {% endfor %} -
    +
    +
    Parlamentar
    +
    Discurso
    +
    +
    + {% for o in oradores %} +
    {{o.numero_ordem}} - {{o.parlamentar}}
    +
    {{o.url_discurso}}
    + {% endfor %} +
    Lista de Presença na Ordem do Dia -
      - {% for p in presenca_ordem %} -
    • {{p}}
      • - {% endfor %} -
    +
    + {% for p in presenca_ordem %} +
    {{p}}
    + {% endfor %} +
    Matérias da Ordem do Dia -
      -
    • Matéria
      • -
    • Ementa
      • -
    • Resultado da Votação
      • -
    -
      - {% for m in materias_ordem %} -
    • - {{m.numero}} - {{m.titulo}} -
      - Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} -
      • -
    • {{m.ementa|safe}}
      • -
    • {{m.resultado}}
      • - {% endfor %} -
    +
    +
    Matéria
    +
    Ementa
    +
    Resultado da Votação
    +
    +
    + {% for m in materias_ordem %} +
    + {{m.numero}} - {{m.titulo}} +
    + Autor{{ m.autor|length|pluralize:"es" }}: {{ m.autor|join:', ' }} +
    +
    {{m.ementa|safe}}
    +
    {{m.resultado}}
    + {% endfor %} +
    diff --git a/templates/sessao/sessao_list.html b/templates/sessao/sessao_list.html index 45c21698c..e005802a1 100644 --- a/templates/sessao/sessao_list.html +++ b/templates/sessao/sessao_list.html @@ -3,12 +3,12 @@ {% load crispy_forms_tags %} {% block base_content %} -
    -

    Sessões Plenárias

    -
    - {% blocktrans with verbose_name=view.verbose_name %} Adicionar Sessão Plenária {% endblocktrans %} -
    -
    +
    +

    Sessões Plenárias

    + + {% blocktrans with verbose_name=view.verbose_name %} Adicionar Sessão Plenária {% endblocktrans %} + +
    {% block detail_content %} {% for sessao in page_obj %} diff --git a/templates/sessao/sessaoplenaria_detail.html b/templates/sessao/sessaoplenaria_detail.html index 2bf47cbe3..1c03e9c25 100644 --- a/templates/sessao/sessaoplenaria_detail.html +++ b/templates/sessao/sessaoplenaria_detail.html @@ -1,29 +1,2 @@ {% extends "crud/detail.html" %} -{% load i18n %} -{% block actions %} {% endblock %} -{% block sections_nav %} -
    -
    -
    -
    {% trans 'Expedientes' %} -
    - -
    {% trans 'Ordem do Dia' %} -
    - -
    {% trans 'Painel Eletrônico' %}
    -
    {% trans 'Resumo' %}
    -
    -{% endblock sections_nav %} +{% block actions %}{% endblock %} diff --git a/templates/sessao/subnav.yaml b/templates/sessao/subnav.yaml new file mode 100644 index 000000000..09682f81a --- /dev/null +++ b/templates/sessao/subnav.yaml @@ -0,0 +1,32 @@ +- title: Abertura + children: + - title: Dados Básicos + url: sessaoplenaria:detail + - title: Mesa + url: sessaoplenaria:mesa + - title: Presença + url: sessaoplenaria:presenca + - title: Explicações Pessoais + url: sessaoplenaria:explicacao + +- title: Expedientes + children: + - title: Expediente Diversos + url: sessaoplenaria:expediente + - title: Matérias Expediente + url: sessaoplenaria:expedienteordemdia_list + - title: Oradores do Expediente + url: sessaoplenaria:oradorexpediente + +- title: Ordem do Dia + children: + - title: Matérias Ordem do Dia + url: sessaoplenaria:materiaordemdia_list + - title: Presença Ordem do Dia + url: sessaoplenaria:presencaordemdia + +- title: Painel Eletrônico + url: sessaoplenaria:painel + +- title: Resumo + url: sessaoplenaria:resumo diff --git a/templates/sessao/votacao/nominal.html b/templates/sessao/votacao/nominal.html index 19c93e853..bb8a92dcb 100644 --- a/templates/sessao/votacao/nominal.html +++ b/templates/sessao/votacao/nominal.html @@ -15,42 +15,42 @@
    Votos -
      - {% for parlamentar in view.get_parlamentares %} -
    • {{parlamentar.nome_parlamentar}}
      • -
    • - -
      • - {% endfor %} -
    +
    + {% for parlamentar in view.get_parlamentares %} +
    {{parlamentar.nome_parlamentar}}
    +
    + +
    + {% endfor %} +
    -
      -
    • - Resultado da Votação - -
      • -
    +
    +
    + Resultado da Votação + +
    +
    -
      -
    • - Observações - -
      • -
    +
    +
    + Observações + +
    +


    - + {% endblock detail_content %} \ No newline at end of file diff --git a/templates/sessao/votacao/nominal_edit.html b/templates/sessao/votacao/nominal_edit.html index 09dea6ef8..e0deef586 100644 --- a/templates/sessao/votacao/nominal_edit.html +++ b/templates/sessao/votacao/nominal_edit.html @@ -16,42 +16,42 @@
    Votos -
      - {% for v in votos %} -
    • {{v.parlamentar}}
      • -
    • {{v.voto}}
      • - {% endfor %} -
    +
    + {% for v in votos %} +
    {{v.parlamentar}}
    +
    {{v.voto}}
    + {% endfor %} +
    -
      -
    • - Anular Votação - -
      • -
    +
    +
    + Anular Votação + +
    +
    -
      -
    • - Resultado da Votação: - {% for tipo in view.get_tipos_votacao %} - {% if votacao.tipo_resultado == tipo.id %} - {{ tipo.nome }} - {% endif %} - {% endfor %} -
      • -
    +
    +
    + Resultado da Votação: + {% for tipo in view.get_tipos_votacao %} + {% if votacao.tipo_resultado == tipo.id %} + {{ tipo.nome }} + {% endif %} + {% endfor %} +
    +
    + +
    +
    + Observações + +
    +
    -
      -
    • - Observações - -
      • -
    -

    diff --git a/templates/sessao/votacao/votacao.html b/templates/sessao/votacao/votacao.html index ba43470ec..601347217 100644 --- a/templates/sessao/votacao/votacao.html +++ b/templates/sessao/votacao/votacao.html @@ -32,42 +32,42 @@

    Total presentes: {{total_presentes}} (com presidente) - +
    -
      -
    • Sim:
      • -
    • Não:
      • -
    • Abstenções:
      • -
    +
    +
    Sim:
    +
    Não:
    +
    Abstenções:
    +
    -
      -
    • - A totalização inclui o voto do Presidente? - -
      • +
      +
      + A totalização inclui o voto do Presidente? + +
      -
    • - Resultado da Votação - -
      • -
    +
    + Resultado da Votação + +
    + + +
    +
    + Observações + +
    +
    -
      -
    • - Observações - -
      • -
    -

    diff --git a/templates/sessao/votacao/votacao_edit.html b/templates/sessao/votacao/votacao_edit.html index 44367a98b..8494dd41e 100644 --- a/templates/sessao/votacao/votacao_edit.html +++ b/templates/sessao/votacao/votacao_edit.html @@ -14,34 +14,34 @@
    -
      -
    • - Anular Votação - -
      • -
    +
    +
    + Anular Votação + +
    +
    -
      -
    • - Resultado da Votação: - {% for tipo in view.get_tipos_votacao %} - {% if votacao.tipo_resultado == tipo.id %} - {{ tipo.nome }} - {% endif %} - {% endfor %} -
      • -
    +
    +
    + Resultado da Votação: + {% for tipo in view.get_tipos_votacao %} + {% if votacao.tipo_resultado == tipo.id %} + {{ tipo.nome }} + {% endif %} + {% endfor %} +
    +
    + +
    +
    + Observações + +
    +
    -
      -
    • - Observações - -
      • -
    -

    diff --git a/templates/sistema.html b/templates/sistema.html index dd9e650d2..458c2bdf9 100644 --- a/templates/sistema.html +++ b/templates/sistema.html @@ -1,102 +1,89 @@ {% extends "base.html" %} {% load i18n crispy_forms_tags %} -{% block head_content %} - {{ block.super }} - -{% endblock head_content %} - {% block base_content %} -
    Configuração Inicial
    - +

    Configuração Inicial

    +
    +
    Casa Legislativa
    +
    -
    Módulo Parlamentares
    - +

    Módulo Parlamentares

    +
    +
    Legislatura
    +
    Tipo de Afastamento
    +
    Tipo de Dependente
    +
    Tipo de Situação Militar
    +
    Nível de Intrução
    +
    Partido
    +
    Coligação
    +
    -
    Módulo Mesa Diretora
    - +

    Módulo Mesa Diretora

    +
    +
    Sessão Legislativa
    +
    Cargo da Mesa
    +
    -
    Módulo Comissões
    - +

    Módulo Comissões

    +
    +
    Cargo de Comissão
    +
    Período de Composição
    +
    Tipo de Composição
    +
    -
    Módulo Bancadas
    - +

    Módulo Bancadas

    +
    +
    Bancadas
    +
    Cargo de Bancada
    +
    -
    Módulo Proposições
    - +

    Módulo Proposições

    +
    +
    Tipo de Proposição
    +
    Autor
    +
    -
    Módulo Matéria Legislativa
    - +

    Módulo Matéria Legislativa

    +
    +
    Tipo de Matéria Legislativa
    +
    Regime de Tramitação
    +
    Tipo de Autor
    +
    Tipo de Documento
    +
    Tipo de fim de Relatoria
    +
    Unidade de Tramitação
    +
    Origem
    +
    Autor
    +
    Status da Tramitação
    +
    Órgão
    +
    -
    Módulo Normas Jurídicas
    - +

    Módulo Normas Jurídicas

    +
    +
    Tipo de Norma Jurídica
    +
    Assunto de Norma Jurídica
    +
    -
    Módulo Sessão Plenária
    - +

    Módulo Sessão Plenária

    +
    +
    Tipo de Sessão Plenária
    +
    Tipo de Resultado da Votação
    +
    Cadastro dos endereços dos computadores dos parlamentares
    +
    Tipo de Expediente
    +
    Propriedades do Painel Eletrônico
    +
    -
    Módulo LexML
    - +

    Módulo LexML

    +
    +
    Provedor
    +
    Publicador
    +
    -
    Módulo Administrativo
    - +

    Módulo Administrativo

    +
    +
    Tipo de Documento
    +
    Tipo de Instituição
    +
    Status de Tramitação
    +
    {% endblock base_content %}