From 037a8733986459150ce27b199e0ac00c88723aa3 Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Tue, 25 Oct 2016 14:34:46 -0300
Subject: [PATCH] modifying menus #205

---
 amadeus/staticfiles/css/base/amadeus.css  |  3 ---
 app/templates/home.html                   |  2 +-
 app/templates/home_professor.html         |  2 +-
 app/templates/home_student.html           |  2 +-
 core/static/css/base/amadeus.css          |  2 +-
 core/templates/guest.html                 | 10 +++++-----
 courses/templates/course/course_card.html |  2 +-
 courses/templates/course/index.html       |  4 ++--
 courses/templates/topic/index.html        |  4 ++--
 9 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/amadeus/staticfiles/css/base/amadeus.css b/amadeus/staticfiles/css/base/amadeus.css
index 365eca7..34b0c4f 100644
--- a/amadeus/staticfiles/css/base/amadeus.css
+++ b/amadeus/staticfiles/css/base/amadeus.css
@@ -18,9 +18,6 @@
     padding-bottom: 1%;
     width: 15%;
 }
-.navigation{
-    margin: 10% 10% 5% 5%;
-}
 .breadcrumb{
     margin-bottom: 5px;
 }
diff --git a/app/templates/home.html b/app/templates/home.html
index da580ef..3f99b45 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -64,7 +64,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h4>Menu</h4>
         </div>
diff --git a/app/templates/home_professor.html b/app/templates/home_professor.html
index 3de2f06..14a4f35 100644
--- a/app/templates/home_professor.html
+++ b/app/templates/home_professor.html
@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h5>{% trans 'Menu' %}</h5>
         </div>
diff --git a/app/templates/home_student.html b/app/templates/home_student.html
index b5d0b15..a374f8d 100644
--- a/app/templates/home_student.html
+++ b/app/templates/home_student.html
@@ -16,7 +16,7 @@
 
 
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h4>{% trans 'Menu' %}</h4>
         </div>
diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index b4d6990..08ffbad 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -400,7 +400,7 @@ ul, li {
 .divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}
 .headingOne {padding-top: 0px; padding-bottom: 50px;}
 .headingTwo {padding-top: 0px; padding-bottom: 50px;}
-.panel-heading{cursor:move;}
+.course{padding-top: 0px; padding-bottom: 0px; cursor:move; }
 .titleTopic {padding-top: 18px; padding-left: 0px;}
 .titleTopic-detail {padding-top: 8px;}
 .titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;}
diff --git a/core/templates/guest.html b/core/templates/guest.html
index a01abcf..1e137eb 100644
--- a/core/templates/guest.html
+++ b/core/templates/guest.html
@@ -80,7 +80,7 @@
 
              			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
              			<li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
-             			
+
            		</ul>
          		</div>
    	</div>
@@ -90,7 +90,7 @@
 
     		<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
     			{% block sidebar %}
-    				<div class="panel panel-primary navigation">
+    				<div class="panel panel-primary">
 				        <div class="panel-heading">
 				            <h4>Menu</h4>
 				        </div>
@@ -119,7 +119,7 @@
 						</form>
 					</div>
 
-				<div class="col-md-12">
+				<div class="col-md-10">
 					<div class="btn-group btn-group-justified btn-group-raised">
 						<a href="?category=all" class="btn btn-raised btn-info">Todos</a>
 						{% for category in categories %}
@@ -132,7 +132,7 @@
 				{% block render_breadcrumbs %}{% endblock %}
 			<div>
 			</div>
-			<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+			<div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
 				{% block content %}
 					{% for course in courses %}
 						<div class="panel panel-info panel_{{ course.id }}">
@@ -142,7 +142,7 @@
 				                    <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')" class="btn btn-sm btn-primary btn-raised pull-right" style="margin-top:-4px">{% trans 'Subscribe' %}</a>
 				                {% endif %}
 					  		</div>
-					       
+
 						  	<div class="panel-body">
 						    	<p><b>Course Name: </b>{{course.name}}</p>
 						    	<p><b>Begining: </b>{{course.init_date}}</p>
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index 6c8060d..51bdce4 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -4,7 +4,7 @@
 <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion-{{course.slug}}" role="tablist" aria-multiselectable="false">
     <div class="group">
 		<div class="panel panel-info">
-		    <div class="panel-heading" role="tab" >
+		    <div class="panel-heading course" role="tab" >
 		      <div class="row">
                                 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}">
                                     <div class="btn-group">
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index b29eb4b..15908dc 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h4>Menu</h4>
         </div>
@@ -83,7 +83,7 @@
 		</div>
 	</form>
 </div>
-	
+
 
 </fieldset>
 	<div class="col-md-12">
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index c185886..5f60991 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -19,7 +19,7 @@
 
 {% block sidebar %}
 
-    <div class="panel panel-primary navigation">
+    <div class="panel panel-primary">
         <div class="panel-heading">
             <h5>{% trans 'Menu' %}</h5>
         </div>
@@ -32,7 +32,7 @@
     </div>
 
     {% if user|has_role:'professor' %}
-      <div class="panel panel-primary navigation">
+      <div class="panel panel-primary ">
       <div class="panel-heading">
           <h3 class="panel-title">Actions</h3>
       </div>
--
libgit2 0.21.2