From e0d5e2f8d3e208c76f67074d23d72363852bd1a0 Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Thu, 20 Oct 2016 10:33:03 -0300
Subject: [PATCH] modifying menu student #205

---
 app/templates/home.html             | 98 ++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
 app/templates/home_student.html     |  2 +-
 core/templates/base.html            |  4 ++--
 courses/templates/course/index.html | 22 +++++++++++-----------
 4 files changed, 52 insertions(+), 74 deletions(-)

diff --git a/app/templates/home.html b/app/templates/home.html
index 1bc176e..bebde44 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -31,11 +31,11 @@
 		    // Configure the url we're about to hit
 		    setTimeout(function (){
 			    $.ajax({
-			        url: baseUrl, 
+			        url: baseUrl,
 			        data: {'page': pageNum},
 			        success: function(data) {
 			            $("#loading").hide();
-			            
+
 			            $("#timeline").append(data);
 			        },
 			        complete: function(data, textStatus){
@@ -46,7 +46,7 @@
 		    }, 1000)
 		};
 
-		$(document).ready(function(){     
+		$(document).ready(function(){
 		   $(window).bind('scroll', loadOnScroll);
 		});
 	</script>
@@ -62,70 +62,48 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="panel panel-primary">
+    <div class="panel panel-primary navigation">
         <div class="panel-heading">
-          	<img src="{{ user.image_url }}" id="img" class="img-rounded">
-          	<p></p>
-          	<div class="row">
-            	<div class="col-xs-3 col-md-3">
-            		<i class="fa fa-facebook-official fa-2x" aria-hidden="true"></i>
-        		</div>
-                <div class="col-xs-3 col-md-3">
-                	<i class="fa fa-twitter fa-2x" aria-hidden="true"></i>
-            	</div>
-                <div class="col-xs-3 col-md-3">
-                	<i class="fa fa-linkedin-square fa-2x" aria-hidden="true"></i>
-            	</div>
-                <div class="col-xs-3 col-md-3">
-                	<i class="fa fa-google-plus-official fa-2x" aria-hidden="true"></i>
-            	</div>
-          	</div>
-    	</div>
-    	<div class="panel-body">
-          	<ul class="nav nav-pills nav-stacked">
-            	<li> <a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-                <li> <a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li> <a href="#">{% trans 'Pending Tasks' %}</a></li>
-                {% if user|has_role:'student' and not user.is_staff %}
-                	<li> <a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-            	{% endif %}
-            	{% if user|has_role:'system_admin' %}
-            		<li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-            	{% endif %}
-            	{% if user|has_role:'system_admin' or user|has_role:'professor' %}
-            		<li> 
-            			<a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
-
-						<div id="courses_list" class="collapse">
-							<ul class="nav nav-pill nav-stacked accordion_list">
-								{% for course in courses_list %}
-									<li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-								{% endfor %}
-							</ul>
-						</div>
-					</li>
-            	{% endif %}
-          	</ul>
-    	</div>
-  	</div>
+            <h4>Menu</h4>
+        </div>
+        <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+                <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                {% if user|has_role:'student' or not user.is_staff %}
+                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
+                {% endif %}
+                {% if user|has_role:'system_admin' %}
+                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+                {% endif %}
+                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
+                    <li>
+                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
+                        <div id="courses_list" class="collapse">
+                            <ul class="nav nav-pill nav-stacked accordion_list">
+                            {% for course in courses_list %}
+                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+                            {% endfor %}
+                            </ul>
+                        </div>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+    </div>
 {% endblock %}
 
 {% block content %}
 	{% if user|has_role:'system_admin' %}
-		<h3>{% trans 'Courses' %}</h3>
-
-		<div id="timeline">
-			{% include page_template %}
-		</div>
-		
+                <h3>{% trans 'Courses' %}</h3>
+                <div id="timeline">
+                	{% include page_template %}
+                </div>
 	{% else %}
-		
-			<div id="timeline">
-				{% include page_template %}
-			</div>
-		
+               <div id="timeline">
+                   {% include page_template %}
+               </div>
 	{% endif %}
-	
 	<div id="loading" class="alert alert-primary" role="alert" style="display: none">
 		<center>
 			<span class="fa fa-spin fa-circle-o-notch"></span>
diff --git a/app/templates/home_student.html b/app/templates/home_student.html
index 52a6bc9..a785b32 100644
--- a/app/templates/home_student.html
+++ b/app/templates/home_student.html
@@ -18,7 +18,7 @@
 {% block sidebar %}
     <div class="panel panel-primary navigation">
         <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
+            <h4>{% trans 'Menu' %}</h4>
         </div>
         <div class="panel-body">
         	<ul class="nav nav-pills nav-stacked">
diff --git a/core/templates/base.html b/core/templates/base.html
index 792ee4e..3c55448 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -109,7 +109,7 @@
 								{% endblock %}
 			    				</div>
 
-			    			
+
 							</div>
 				    </div>
 		</div>
@@ -117,7 +117,7 @@
 	<script src="{% static 'js/main.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
 	{% block script_file %}
-		
+
 	{% endblock script_file %}
 </body>
 
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 3850a78..de69751 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -11,18 +11,18 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-            	<li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
+<div class="panel panel-primary navigation">
+    <div class="panel-heading">
+        <h4>{% trans 'Menu' %}</h4>
+    </div>
+    <div class="panel-body">
+        <ul class="nav nav-pills nav-stacked">
+        	<li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
+            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+            <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
+        </ul>
     </div>
+</div>
 
 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
 
--
libgit2 0.21.2