From ee2a548a63310e0607f97b5988d7199e0859ca64 Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Tue, 25 Oct 2016 12:50:45 -0300
Subject: [PATCH] modifying card course #205

---
 amadeus/staticfiles/css/base/amadeus.css  |  2 +-
 core/static/css/base/amadeus.css          | 16 +++++++++++++++-
 courses/templates/course/course_card.html | 38 +++++++++++++++++++++-----------------
 courses/templates/topic/index.html        |  2 +-
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/amadeus/staticfiles/css/base/amadeus.css b/amadeus/staticfiles/css/base/amadeus.css
index 6b48e5f..365eca7 100644
--- a/amadeus/staticfiles/css/base/amadeus.css
+++ b/amadeus/staticfiles/css/base/amadeus.css
@@ -320,4 +320,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain
 
 .notification-count {
     background-color: #FF0000;
-}
+}
\ No newline at end of file
diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 6ede867..b4d6990 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -394,4 +394,18 @@ ul, li {
     -webkit-animation-duration: 900ms;
     -webkit-animation-iteration-count: 3;
     -webkit-animation-timing-function: ease-in-out;
-}
\ No newline at end of file
+}
+/* Icon Topic */
+.divMoreActions {text-align: right; height: 39px; float: right;}
+.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;}
+.titleTopic {padding-top: 18px; padding-left: 0px;}
+.titleTopic-detail {padding-top: 8px;}
+.titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;}
+.dropdown-menu .pull-right {
+    right: 0;
+  }
+.moreAccordion{ padding-left: 0px; padding-right: 0px;}
+.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
\ No newline at end of file
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index 1fb31f1..6c8060d 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -4,25 +4,30 @@
 <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" role="tab" >
 		      <div class="row">
-		        <div class="col-xs-9 col-md-10 titleTopic">
-		          <a role="button" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}" class="collapsed">
-		          <h4 style="color:white">{{course.name}}</h4>
-		          </a>
+                                <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">
+                                        <button class="btn btn-default btn-sm"><i class="fa fa-chevron-circle-down fa-2x" aria-hidden="true"></i></button>
+                                    </div>
+                                </div>
+		        <div class="col-xs-9 col-md-4 titleTopic">
+                                    <a role="button" href="{% url 'course:view' course.slug %}">
+                                        <h4>{{course.name}}</h4>
+                                    </a>
 		        </div>
 		        {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-			        <div class="col-xs-4 col-md-2" id="divMoreActions">
-			            <div class="btn-group">
-			              <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-			                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
-			              </button>
-			              <ul class="dropdown-menu" aria-labelledby="moreActions">
-			                <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-			                <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remove' %}</a></li>
-			              </ul>
-			            </div>
-			        </div>
+		        <div class="col-xs-4 col-md-6 divMoreActions" >
+		            <div class="btn-group">
+		              <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+		               </button>
+		              <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+		                <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+		                <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+		              </ul>
+		            </div>
+		        </div>
 		        {% endif %}
 		      </div>
 		    </div>
@@ -36,7 +41,6 @@
 		            {{course.content}}
 		          </i>
 		        </p>
-				<a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>
 		      </div>
 		    </div>
 		</div>
diff --git a/courses/templates/topic/index.html b/courses/templates/topic/index.html
index 41f599c..c185886 100644
--- a/courses/templates/topic/index.html
+++ b/courses/templates/topic/index.html
@@ -47,7 +47,7 @@
       </div>
     </div>
     {% endif %}
-   
+
 {% endblock %}
 
 {% block content %}
--
libgit2 0.21.2