From 08027c28247101620649e8ca0b7d367e51035176 Mon Sep 17 00:00:00 2001
From: Ailson da Cruz <acgt@cin.ufpe.br>
Date: Tue, 6 Sep 2016 00:08:13 -0300
Subject: [PATCH] Register user #22

---
 amadeus/settings.py               |  7 -------
 core/static/css/base/amadeus.css  |  4 ++++
 core/templates/base.html          |  6 +++---
 core/templates/register_user.html | 75 ++++++++++++++++++++++++++++++++++++++++++++-------------------------------
 db.sqlite3                        | Bin 59392 -> 0 bytes
 logs/log_file_05-09-2016.txt      |  2 ++
 logs/log_file_06-09-2016.txt      |  2 ++
 7 files changed, 55 insertions(+), 41 deletions(-)
 create mode 100644 logs/log_file_06-09-2016.txt

diff --git a/amadeus/settings.py b/amadeus/settings.py
index 640fb63..42ad897 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -95,13 +95,6 @@ DATABASES = {
     }
 }
 
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.sqlite3',
-#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-#     }
-# }
-
 #superuser: admin pass: amadeus2358
 
 # Password validation
diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 9e12b60..c35eb37 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -39,3 +39,7 @@ h5{
     text-align: center;
 }
 
+#logo{
+    margin-top: 2em;
+    margin-bottom: 2em;
+}
diff --git a/core/templates/base.html b/core/templates/base.html
index 1e13a76..92abe7f 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -17,9 +17,6 @@
 	<link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
     <link rel="stylesheet" type="text/css" href="{% static 'css/base/header.css' %}">
     <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
-    <script>
-    	$.material.init();
-    </script>
 	<!--CSS block for specific-app ones -->
 	{% block style %}
 	{% endblock %}
@@ -30,6 +27,9 @@
 	<script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.min.js' %}"></script>
 	<script src="{% static 'material/js/material.min.js' %}"></script>
     <script src="{% static 'material/js/ripples.min.js' %}"></script>
+	<script>
+    	$.material.init();
+    </script>
 	<!--Javascript block for specific-app ones -->
 	{% block javascript %}
 
diff --git a/core/templates/register_user.html b/core/templates/register_user.html
index b12f67a..ff00b0d 100644
--- a/core/templates/register_user.html
+++ b/core/templates/register_user.html
@@ -1,20 +1,11 @@
-{% extends 'app/base.html' %}
+{% extends 'base.html' %}
 
 {% load static i18n %}
 {% load widget_tweaks %}
 
-{% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Register' %}</li>
-	</ol>
+{% block nav %}
 {% endblock %}
 
-{% block sidebar %}
-	<div class="list-group">
-	  	
-	</div>
-{% endblock %}
 
 {% block content %}
 	{% if message %}
@@ -22,30 +13,52 @@
 			{{message}}
 		</div>
 	{% endif %}
+	<div class="row logo-row">
+        <div class="col-lg-offset-4 col-md-4">
+            <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus" id="logo">
+        </div>
+    </div>
 
-	<form method="post" action="" enctype="multipart/form-data">
-		{% csrf_token %}
-		{% for field in form %}
-			<div class="form-group{% if form.has_error %} has-error {% endif %}">
-				<label for="{{ field.auto_id }}" class="clearfix">{{ field.label }}</label>
-				{% render_field field class='form-control input-sm' %}
-				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-				{% if field.errors %}
-					<div class="alert alert-danger alert-dismissible" role="alert">
-	  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-	  						<span aria-hidden="true">&times;</span>
-  						</button>
-						<ul>
-							{% for error in field.errors %}
-								<li>{{ error }}</li>
+	<div class="row">
+		<div class="">
+			<div class="card">
+				<div class="card-content">
+					<div class="card-body">
+						<form class="form-horizontal" name="registerForm" method="post" action="" enctype="multipart/form-data">
+						{% csrf_token %}
+							<legend>{% trans 'User Register' %}</legend>
+							{% for field in form %}
+							<div class="form-group is-empy{% if form.has_error %} has-error {% endif %}">
+								<label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}</label>
+								<div class="col-md-8">
+									{% render_field field class='form-control input-sm' %}
+									<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+								</div>
+								
+								{% if field.errors %}
+								<div class="alert alert-danger alert-dismissible col-md-offset-4 col-md-8" role="alert">
+				  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+				  						<span aria-hidden="true">&times;</span>
+			  						</button>
+									<ul>
+										{% for error in field.errors %}
+											<li>{{ error }}</li>
+										{% endfor %}
+									</ul>
+								</div>
+								{% endif %}
+							</div>
 							{% endfor %}
-						</ul>
+							<div class="col-md-offset-4">
+								<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />	
+							</div>
+							
+						</form>
 					</div>
 				</div>
-				{% endif %}
 			</div>
-		{% endfor %}
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
-	</form>
+		</div>
+	</div>
+	
 	<br clear="all" />
 {% endblock %}
diff --git a/db.sqlite3 b/db.sqlite3
index fcbadb2..8a6aa23 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/logs/log_file_05-09-2016.txt b/logs/log_file_05-09-2016.txt
index 959f1b3..28d4516 100644
--- a/logs/log_file_05-09-2016.txt
+++ b/logs/log_file_05-09-2016.txt
@@ -50,3 +50,5 @@
 05/09/2016 15:04:41 - ailson - Acessou home
 05/09/2016 15:16:39 - ailson - Acessou home
 05/09/2016 15:41:52 - ailson - Acessou home
+05/09/2016 16:08:38 - ailson - Entrou no sistema
+05/09/2016 16:08:38 - ailson - Acessou home
diff --git a/logs/log_file_06-09-2016.txt b/logs/log_file_06-09-2016.txt
new file mode 100644
index 0000000..2668bf6
--- /dev/null
+++ b/logs/log_file_06-09-2016.txt
@@ -0,0 +1,2 @@
+06/09/2016 00:07:02 - teste - Entrou no sistema
+06/09/2016 00:07:02 - teste - Acessou home
--
libgit2 0.21.2