From b2b7877cc44bdbd130d16f7950bac507ac81bddc Mon Sep 17 00:00:00 2001 From: fbormann Date: Thu, 1 Sep 2016 12:16:53 -0300 Subject: [PATCH] Issue #10 Review --- core/templates/base.html | 88 ++++++++++++++++++++-------------------------------------------------------------------- core/templates/index.html | 169 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------ 2 files changed, 21 insertions(+), 236 deletions(-) diff --git a/core/templates/base.html b/core/templates/base.html index 1456a31..edd6a80 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -1,103 +1,55 @@ {% load static i18n %} - + - - Projeto Amadeus + {{ title }} - - + + {% block style %} {% endblock %} - + - + + + {% block javascript %} {% endblock %} - + {% block nav %} + + {% endblock %} +
{% block breadcrumbs %} {% endblock %}
-
+
{% block sidebar %} {% endblock %}
-
+
{% block content %} {% endblock %}
+
+ {% block rightbar %} + + {% endblock rightbar %} +
- -
- © Copyright Amadeus 2016. {% trans 'All rights reserved' %} -
- - +
\ No newline at end of file diff --git a/core/templates/index.html b/core/templates/index.html index 37f81f5..c6bbcc6 100644 --- a/core/templates/index.html +++ b/core/templates/index.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD {% extends 'base.html' %} {% load static i18n %} @@ -164,171 +163,5 @@
-======= -{% extends 'base.html' %} - -{% load static i18n %} -{% load widget_tweaks %} - -{% block sidebar %} -
- {% csrf_token %} - - {% for error in form.non_field_errors %} -
- {{ error }} -
- {% endfor %} - - {% for field in form %} -
- -
- {% render_field field class='form-control input-sm' %} - {% for error in field.errors %} - {{ error }} - {% endfor %} -
-
- {% endfor %} -
-
- -
-
-
-{% endblock %} - -{% block content %} -
-
-
-
-
- -
- -
-
-
- -
- -
- -
{% trans 'Most popular keywords:' %}
-
-
- -
-
-
-
->>>>>>> 52634c817a6e5f3201289c0605be8d94b3da6eb6 + {% endblock %} \ No newline at end of file -- libgit2 0.21.2