From 3b7e693d9baa3198b97ebe5678a3cf9f6a56097b Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Tue, 25 Oct 2016 16:56:19 -0300
Subject: [PATCH] modifying home subject and card topic #205

---
 core/static/css/base/amadeus.css                 |   5 ++---
 courses/templates/course/view.html               |   2 +-
 courses/templates/subject/form_view_teacher.html | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------
 courses/templates/subject/index.html             |  43 +++++++++++++++++++++++++++++++------------
 4 files changed, 177 insertions(+), 153 deletions(-)

diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 61b1dde..c122c5d 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -408,8 +408,7 @@ ul, li {
 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
 .cards-content{ padding-left: 0px; padding-right: 0px; }
 .cards-detail{margin-left: 4%;}
-.cards-detail .panel .panel-heading{background-color:#81D4FA;}
+.cards-detail .panel .panel-heading{/*background-color:;*/}
 .cards-detail .panel .panel-heading h4{color:black;}
-.subject{ padding-top: 0px; padding-bottom: 0px; }
-.course{padding-top: 0px; padding-bottom: 0px;}
+.course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
 .course-detail{padding-top: 10px; padding-bottom: 10px;}
\ No newline at end of file
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index 1f48513..6825163 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -124,7 +124,7 @@
 <div class="cards-detail">
     {% if request.GET.category == 'all' or none or request.GET.category == '' %}
       {% for subject in subjects %}
-        <div class="panel panel-info panel_{{ subject.id }}">
+        <div class="panel panel-default panel_{{ subject.id }}">
           <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle">
             <div class="row">
                 <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index fdffa4c..32848dd 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -6,165 +6,171 @@
         <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
         <script type = "text/javascript" src="{% static 'links.js' %}"></script>
     {% endblock %}
-
-    <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
-            <div class="group"><div class="panel panel-default">
-      <div class="panel-heading headingOne ui-sortable-handle" role="tab">
-        <div class="row">
-          <div class="col-xs-9 col-md-10 titleTopic">
-            <a role="button" data-toggle="collapse" data-parent=".accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="" aria-selected="false" tabindex="-1">
-            {{topic}}
-            </a>
+<div class="cards-detail">
+  <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
+    <div class="group"><div class="panel panel-default">
+      <div class="panel-heading topic ui-sortable-handle" role="tab">
+      <div class="row">
+        <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.slug}}">
+          <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
+        </div>
+        <div class="col-xs-9 col-md-9 titleTopic">
+          <a role="button">
+            <h4>{{topic}}</h4>
+          </a>
+        </div>
+        <div class="col-xs-3 col-md-2 divMoreActions">
+          <div class="btn-group">
+            <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
+              <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
+            </button>
           </div>
-          <div class="col-xs-3 col-md-2 divMoreActions">
-            <div class="btn-group">
-              <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
-                <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
-              </button>
-            </div>
-            <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>
-              {% professor_subject topic.subject user as dropdown_topic %}
-              {% if dropdown_topic %}
-                  <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-                  <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-                    <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
-                    <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
-                  </ul>
-              {% endif %}
-            </div>
+          <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>
+            {% professor_subject topic.subject user as dropdown_topic %}
+            {% if dropdown_topic %}
+                <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
+                  <li><a href="javascript:void(0)" class="edit_card"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
+                  <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
+                </ul>
+            {% endif %}
           </div>
         </div>
       </div>
-      <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">
-        <div class="panel-body">
-          <div class="presentation">
-            <p>
-              <i>
-                {{topic.description|linebreaks}}
-              </i>
-            </p>
-            <div class="row">
-              <div class="col-xs-6 col-md-6">
-                <div class="resource_inline">
-                  <h4>Material</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                        <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
-                        <li>
-                            <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
-                                {% trans "Create a file" %}
-                                <div class="ripple-container">
-                                    <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                    </div>
-                                </div>
-                            </a>
-                        </li>
-                    </ul>
-                  </div>
-                </div>
-                <ul id="list-materials">
-                    {% list_topic_file request topic %}
-                    {% list_topic_link request topic%}
-                  
-                </ul>
+    </div>
+    <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
+      <div class="panel-body">
+        <div class="presentation">
+          <p>
+            <i>
+              {{topic.description|linebreaks}}
+            </i>
+          </p>
+          <div class="row">
+            <div class="col-xs-6 col-md-6">
+              <div class="resource_inline">
+                <h4>Material</h4>
               </div>
-              <div class="col-xs-4 col-md-4">
-                <div class="resource_inline">
-                  <h4>Activities</h4>
+              <div class="resource_inline">
+                <div class="dropdown">
+                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
+                  <ul class="dropdown-menu" aria-labelledby="dLabel">
+                      <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                      <li>
+                          <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
+                              {% trans "Create a file" %}
+                              <div class="ripple-container">
+                                  <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
+                                  </div>
+                              </div>
+                          </a>
+                      </li>
+                  </ul>
                 </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
-                      <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
+              </div>
+              <ul id="list-materials">
+                  {% list_topic_file request topic %}
+                  {% list_topic_link request topic%}
 
-                    </ul>
-                  </div>
+              </ul>
+            </div>
+            <div class="col-xs-4 col-md-4">
+              <div class="resource_inline">
+                <h4>Activities</h4>
+              </div>
+              <div class="resource_inline">
+                <div class="dropdown">
+                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
+                  <ul class="dropdown-menu" aria-labelledby="dLabel">
+                    <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
+                    <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
+
+                  </ul>
                 </div>
-                <ul>
-                   
-                    <div class="foruns_list">
-                        {% list_topic_foruns request topic %}
-                    </div>
-                </ul>
               </div>
-              {% list_topic_poll request topic %}
+              <ul>
+
+                  <div class="foruns_list">
+                      {% list_topic_foruns request topic %}
+                  </div>
+              </ul>
             </div>
+            {% list_topic_poll request topic %}
           </div>
-          <div class="editation" style="display: none">
-            <div class="form-group">
-              <label class="control-label" for="focusedInput2">Name Topic</label>
-              <input type="text" class="form-control" value="Topic 1">
-            </div>
-            <div class="form-group is-empty">
-              <label class="control-label" for="focusedInput2">Description</label>
-              <textarea class="form-control" rows="3" id="textArea"></textarea>
-            </div>
-            <div class="row">
-              <div class=" col-xs-6 col-md-4">
-                <div class="resource_inline">
-                  <h4>Material</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
-                      <li>
-                        <a href="#">
-                            {% trans "Create a file" %}
-                            <div class="ripple-container">
-                                <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                </div>
-                            </div>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                <ul id="list-materials-edit">
-                    {% list_topic_link_edit request topic%}
-                    {% list_topic_file_edit request topic %}
-                </ul>
+        </div>
+        <div class="editation" style="display: none">
+          <div class="form-group">
+            <label class="control-label" for="focusedInput2">Name Topic</label>
+            <input type="text" class="form-control" value="Topic 1">
+          </div>
+          <div class="form-group is-empty">
+            <label class="control-label" for="focusedInput2">Description</label>
+            <textarea class="form-control" rows="3" id="textArea"></textarea>
+          </div>
+          <div class="row">
+            <div class=" col-xs-6 col-md-4">
+              <div class="resource_inline">
+                <h4>Material</h4>
               </div>
-              <div class="col-xs-4 col-md-offset-1 col-md-4">
-                <div class="resource_inline">
-                  <h4>Activities</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li>Qualquer coisa</li>
-                    </ul>
-                  </div>
+              <div class="resource_inline">
+                <div class="dropdown">
+                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
+                  <ul class="dropdown-menu" aria-labelledby="dLabel">
+                    <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">Create a Link</a></li>
+                    <li>
+                      <a href="#">
+                          {% trans "Create a file" %}
+                          <div class="ripple-container">
+                              <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
+                              </div>
+                          </div>
+                      </a>
+                    </li>
+                  </ul>
                 </div>
-                <ul>
-                  <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i>  <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
-                 
-                  <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i>  <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
-
-                </ul>
               </div>
+              <ul id="list-materials-edit">
+                  {% list_topic_link_edit request topic%}
+                  {% list_topic_file_edit request topic %}
+              </ul>
             </div>
-            <div class="form-group">
-              <div class="col-md-10">
-                <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
-                <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
+            <div class="col-xs-4 col-md-offset-1 col-md-4">
+              <div class="resource_inline">
+                <h4>Activities</h4>
               </div>
+              <div class="resource_inline">
+                <div class="dropdown">
+                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
+                  <ul class="dropdown-menu" aria-labelledby="dLabel">
+                    <li>Qualquer coisa</li>
+                  </ul>
+                </div>
+              </div>
+              <ul>
+                <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i>  <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
+
+                <li class="icon_edit_remove"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i>  <i class="fa fa-trash fa-lg" aria-hidden="true"></i></li>
+
+              </ul>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-md-10">
+              <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
+              <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
             </div>
           </div>
         </div>
       </div>
+    </div>
+    </div>
 
     </div>
+
+
     <!-- MODAL REMOVE TOPIC -->
     <div class="modal" id="removeTopic">
       <div class="modal-dialog">
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index 58c252a..a985f61 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -17,27 +17,46 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="panel panel-primary">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-        	<ul class="nav nav-pills nav-stacked">
-              	<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">
+    <div class="panel-heading">
+        <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>
+                <li><a href="{% url 'core:guest' %}">{% trans 'All 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 %}
   	<div class="panel panel-info">
-    	<div class="panel-heading">
+    	<div class="panel-heading course-detail">
 			<div class="row">
 	      		<div class="col-md-10 col-sm-10">
-	        		<h3>{{subject}}</h3>
+	        		 <h4>{{subject}}</h4>
 	      		</div>
 				{% professor_subject subject user as subject_professor%}
 	      		{% if subject_professor %}
--
libgit2 0.21.2