Merge pull request #569 from amadeusproject/refactoring

Daily Update - 22_09_2017

Merge pull request #569 from amadeusproject/refactoring
Daily Update - 22_09_2017
Erik Zambom · GitHub
2 parents f9508fd1 0f20aeb7
Showing 4 changed files with 85 additions and 67 deletions Show diff stats
amadeus/static/css/base/amadeus_responsive.css
subjects/templates/subjects/home.html
users/locale/pt_BR/LC_MESSAGES/django.po
users/templates/users/register.html
@@ -276,12 +276,20 @@
     p{
     	margin: 10px;
     }
+	.slide_toggle{
+		visibility: hidden;
+	}
+	.carousel-caption{
+		position: static;
+		text-align: center;
+		font-size: 1em;
+	}
 }
 @media(max-width:610px){
 	.outside-title{
 		font-size:1.5em;
 	}
-	
+
 	.container-fluid {
     	padding-left: 10px;
     	padding-right: 10px;
@@ -290,4 +298,15 @@
     p{
     	margin: 10px;
     }
+		.carousel-caption{
+			position: static;
+			text-align: center;
+			font-size: 1em;
+		}
 }
+
+@media(min-width: 500px) {
+	.dropdown-menu{
+		margin-left: 100px;
+	}
+}
 \ No newline at end of file
@@ -24,10 +24,10 @@
 	<div id="myCarousel" class="carousel slide " data-ride="carousel">
   <!-- Indicators -->
   <ol class="carousel-indicators">
-		<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+		<li class="slide_toggle" data-target="#myCarousel" data-slide-to="0" class="active"></li>
 		{% for new in news %}
 				{% if forloop.counter != news.count %}
-				    <li data-target="#myCarousel" data-slide-to="{{forloop.counter}}"></li>
+				    <li class="slide_toggle" data-target="#myCarousel" data-slide-to="{{forloop.counter}}"></li>
 				{% endif %}
 		{% endfor %}
   </ol>
@@ -259,8 +259,6 @@ msgid &quot;No users found&quot;
 msgstr "Nenhum usuário encontrado"
 #: users/templates/users/login.html:43
-#, fuzzy
-#| msgid "Sign in with your account to continue"
 msgid "Sign in with your account"
 msgstr "Entre com a sua conta"
@@ -48,73 +48,74 @@
 					<form class="{% if form.has_error %} has-error {% endif %} form-horizontal is-fileinput" method="post" enctype="multipart/form-data" id="user-form">
 						{% csrf_token %}
 						{% for field in form %}
-							<div class="col-lg-12 col-md-12 col-sm-12">
-								<div class="form-group form-group-md">
-									<div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
-										{% if field.auto_id == 'id_image' %}
-											<label for="{{ field.auto_id }}">{{ field.label }}</label>
-											
+						{% if field.auto_id == 'id_show_email' %}
+						{% elif field.auto_id == 'id_x' %}
+								<input class="form-control" id="id_x" name="x" type="hidden">
+						{% elif field.auto_id == 'id_y' %}
+								<input class="form-control" id="id_y" name="y" type="hidden">
+					  {% elif field.auto_id == 'id_width' %}
+								<input class="form-control" id="id_width" name="width" type="hidden">
+						{% elif field.auto_id == 'id_height' %}
+								<input class="form-control" id="id_height" name="height" type="hidden">
+						{% else %}
+								<div class="col-lg-12 col-md-12 col-sm-12">
+									<div class="form-group form-group-md">
+										<div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
+											{% if field.auto_id == 'id_image' %}
+												<label for="{{ field.auto_id }}">{{ field.label }}</label>
 											{% render_field field class='form-control file-selector' %}
-											
-											<div class="input-group common-file-input">
-										      	<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
-										      	<span class="input-group-btn input-group-sm">
-										        	<button type="button" class="btn btn-fab btn-fab-mini">
-										        		<i class="material-icons">attach_file</i>
-										       		</button>
-										      	</span>
-										    </div>
-
-										    <div class="filedrag">
-										    	{% if acc.image %}
-										    		<i class="fa fa-file-archive-o"></i> <br />
-
-										    		<small>{{ acc.image.path }}</small>
-										    	{% else %}
-										      		{% trans 'Click or drop the file here' %}<br />
-										      		
-										      		<small>{% trans 'The photo could not exceed 2MB.' %}</small>
-										      	{% endif %}
-									  		</div>
-							            {% else %}
-							            	{% if field.auto_id == 'id_show_email' %}
-														{% else %}
-															{% render_field field class='form-control' %}
-							            	{% endif %}
-
-
+												<div class="input-group common-file-input">
+											      	<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
+											      	<span class="input-group-btn input-group-sm">
+											        	<button type="button" class="btn btn-fab btn-fab-mini">
+											        		<i class="material-icons">attach_file</i>
+											       		</button>
+											      	</span>
+											   </div>
+													    	<div class="filedrag">
+													    		{% if acc.image %}
+														    		<i class="fa fa-file-archive-o"></i> <br />
+														    		<small>{{ acc.image.path }}</small>
+														    	{% else %}
+														      		{% trans 'Click or drop the file here' %}<br />
+														      		<small>{% trans 'The photo could not exceed 2MB.' %}</small>
+														      {% endif %}
+												  			</div>
+								         {% else %}
+																{% render_field field class='form-control' %}
+											{% endif %}
+
+											<span class="help-block">{{ field.help_text }}</span>
+										</div>
+										{% if field.errors %}
+											<div class="row">
+												<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>
+														{% endfor %}
+													</ul>
+												</div>
+											</div>
 										{% endif %}
-										<span class="help-block">{{ field.help_text }}</span>
-									</div>
-									
-									{% if field.errors %}
-										<div class="row">
-											<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>
+
+										{% if field.auto_id == 'id_image' %}
+											<div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" 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 %}
+													<li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
+													<li class="format" style="display:none">{% trans 'File not supported.' %}</li>
 												</ul>
 											</div>
-										</div>
-									{% endif %}
-
-									{% if field.auto_id == 'id_image' %}
-										<div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" role="alert">
-												<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-													<span aria-hidden="true">&times;</span>
-												</button>
-											<ul>
-												<li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
-												<li class="format" style="display:none">{% trans 'File not supported.' %}</li>
-											</ul>
-										</div>
-									{% endif %}
+										{% endif %}
+									</div>
 								</div>
-							</div>
+								{% endif %}
 						{% endfor %}
 						<div class="row">
 							<div class="col-lg-12 col-md-12 col-sm-12">
@@ -146,7 +147,7 @@ function Init() {
 	var small = $(".file-selector"),
 		filedrag = $(".filedrag"),
 		common = $(".common-file-input");
-		
+
 	// file select
 	small.on("change", FileSelectHandler);
	@@ -276,12 +276,20 @@		@@ -276,12 +276,20 @@
276	p{	276	p{
277	margin: 10px;	277	margin: 10px;
278	}	278	}
		279	+ .slide_toggle{
		280	+ visibility: hidden;
		281	+ }
		282	+ .carousel-caption{
		283	+ position: static;
		284	+ text-align: center;
		285	+ font-size: 1em;
		286	+ }
279	}	287	}
280	@media(max-width:610px){	288	@media(max-width:610px){
281	.outside-title{	289	.outside-title{
282	font-size:1.5em;	290	font-size:1.5em;
283	}	291	}
284	-	292	+
285	.container-fluid {	293	.container-fluid {
286	padding-left: 10px;	294	padding-left: 10px;
287	padding-right: 10px;	295	padding-right: 10px;
	@@ -290,4 +298,15 @@		@@ -290,4 +298,15 @@
290	p{	298	p{
291	margin: 10px;	299	margin: 10px;
292	}	300	}
		301	+ .carousel-caption{
		302	+ position: static;
		303	+ text-align: center;
		304	+ font-size: 1em;
		305	+ }
293	}	306	}
		307	+
		308	+@media(min-width: 500px) {
		309	+ .dropdown-menu{
		310	+ margin-left: 100px;
		311	+ }
		312	+}
294	\ No newline at end of file	313	\ No newline at end of file
	@@ -24,10 +24,10 @@		@@ -24,10 +24,10 @@
24	<div id="myCarousel" class="carousel slide " data-ride="carousel">	24	<div id="myCarousel" class="carousel slide " data-ride="carousel">
25	<!-- Indicators -->	25	<!-- Indicators -->
26	<ol class="carousel-indicators">	26	<ol class="carousel-indicators">
27	- <li data-target="#myCarousel" data-slide-to="0" class="active"></li>	27	+ <li class="slide_toggle" data-target="#myCarousel" data-slide-to="0" class="active"></li>
28	{% for new in news %}	28	{% for new in news %}
29	{% if forloop.counter != news.count %}	29	{% if forloop.counter != news.count %}
30	- <li data-target="#myCarousel" data-slide-to="{{forloop.counter}}"></li>	30	+ <li class="slide_toggle" data-target="#myCarousel" data-slide-to="{{forloop.counter}}"></li>
31	{% endif %}	31	{% endif %}
32	{% endfor %}	32	{% endfor %}
33	</ol>	33	</ol>
	@@ -259,8 +259,6 @@ msgid "No users found"		@@ -259,8 +259,6 @@ msgid "No users found"
259	msgstr "Nenhum usuário encontrado"	259	msgstr "Nenhum usuário encontrado"
260		260
261	#: users/templates/users/login.html:43	261	#: users/templates/users/login.html:43
262	-#, fuzzy
263	-#\| msgid "Sign in with your account to continue"
264	msgid "Sign in with your account"	262	msgid "Sign in with your account"
265	msgstr "Entre com a sua conta"	263	msgstr "Entre com a sua conta"
266		264