From bd630b8e974d4279cb027db5f1e5c721d20e3e2f Mon Sep 17 00:00:00 2001
From: Matheus Lins <msl@cin.ufpe.br>
Date: Mon, 26 Sep 2016 08:53:46 -0300
Subject: [PATCH] updated template list courses

---
 app/templates/home.html                     |  3 +++
 app/templates/home_professor.html           | 21 +++++++++++++++++++--
 core/static/materialize/css/materialize.css | 90 ++++--------------------------------------------------------------------------------------
 courses/models.py                           |  2 +-
 courses/templates/course/index.html         | 75 +++++++++++++++++++++------------------------------------------------------
 courses/urls.py                             |  2 +-
 courses/views.py                            |  2 ++
 7 files changed, 51 insertions(+), 144 deletions(-)

diff --git a/app/templates/home.html b/app/templates/home.html
index b91b41d..76787a5 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -117,6 +117,9 @@
 		<div id="timeline">
 			{% include page_template %}
 		</div>
+		<a class="btn-floating btn-large waves-effect waves-light red" href="{% url 'course:create' %}">
+			<i class="fa fa-plus" aria-hidden="true"></i>
+		</a>
 	{% else %}
 		<ul class="timeline" style="-webkit-padding-start: 0px">
 			<div id="timeline">
diff --git a/app/templates/home_professor.html b/app/templates/home_professor.html
index 265de29..c2f40b0 100644
--- a/app/templates/home_professor.html
+++ b/app/templates/home_professor.html
@@ -30,6 +30,7 @@
 {% endblock %}
 
 {% block content %}
+
     <h3>{% trans 'Courses' %}</h3>
   	{% if courses|length > 0 %}
   		{% for course in courses %}
@@ -54,7 +55,23 @@
 {% endblock %}
 
 {% block rightbar %}
-	<div class="well well-lg goal">
-        {% trans 'Goals' %}
+    <div class="col-md-12">
+          <div><div class="panel panel-warning">
+    <div class="panel-heading">
+        <h3 class="panel-title">{% trans 'Pending Stuffs' %}</h3>
+    </div>
+    <div class="panel-body">
+
+    </div>
+</div></div>
+          <div><div class="panel panel-warning">
+    <div class="panel-heading">
+        <h3 class="panel-title">{% trans 'Goals' %}</h3>
     </div>
+    <div class="panel-body">
+
+    </div>
+</div></div>
+        </div>
+	
 {% endblock rightbar %}
diff --git a/core/static/materialize/css/materialize.css b/core/static/materialize/css/materialize.css
index 41466e6..e127fb9 100644
--- a/core/static/materialize/css/materialize.css
+++ b/core/static/materialize/css/materialize.css
@@ -1,91 +1,31 @@
-.z-depth-1, nav, .card-panel, .card, .toast, .btn, .btn-large, .btn-floating, .dropdown-content, .collapsible, .side-nav {
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-}
-
-.z-depth-1-half, .btn:hover, .btn-large:hover, .btn-floating:hover {
-  box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15);
-}
-nav ul a.btn, nav ul a.btn-large, nav ul a.btn-large, nav ul a.btn-flat, nav ul a.btn-floating {
-  margin-top: -2px;
-  margin-left: 15px;
-  margin-right: 15px;
-}
-.card .card-action a:not(.btn):not(.btn-large):not(.btn-floating) {
-  color: #ffab40;
-  margin-right: 20px;
-  transition: color .3s ease;
-  text-transform: uppercase;
-}
 
-.card .card-action a:not(.btn):not(.btn-large):not(.btn-floating):hover {
-  color: #ffd8a6;
-}
-
-.card .card-reveal {
-  padding: 20px;
-  position: absolute;
-  background-color: #fff;
-  width: 100%;
-  overflow-y: auto;
-  top: 100%;
-  height: 100%;
-  z-index: 3;
-  display: none;
-}
-
-.btn.disabled, .disabled.btn-large,
 .btn-floating.disabled,
-.btn-large.disabled,
-.btn:disabled,
-.btn-large:disabled,
-.btn-large:disabled,
-.btn-floating:disabled,
-.btn[disabled],
-[disabled].btn-large,
-.btn-large[disabled],
-.btn-floating[disabled] {
+ {
   background-color: #DFDFDF !important;
   box-shadow: none;
   color: #9F9F9F !important;
   cursor: default;
 }
 
-.btn.disabled *, .disabled.btn-large *,
 .btn-floating.disabled *,
-.btn-large.disabled *,
-.btn:disabled *, .btn-large:disabled *,
-.btn-large:disabled *,
 .btn-floating:disabled *,
-.btn[disabled] *, [disabled].btn-large *,
-.btn-large[disabled] *,
 .btn-floating[disabled] * {
   pointer-events: none;
 }
 
-.btn.disabled:hover, .disabled.btn-large:hover,
 .btn-floating.disabled:hover,
-.btn-large.disabled:hover,
-.btn:disabled:hover,
-.btn-large:disabled:hover,
-.btn-large:disabled:hover,
 .btn-floating:disabled:hover,
-.btn[disabled]:hover,
-[disabled].btn-large:hover,
-.btn-large[disabled]:hover,
 .btn-floating[disabled]:hover {
   background-color: #DFDFDF !important;
   color: #9F9F9F !important;
 }
 
-.btn i, .btn-large i,
-.btn-floating i,
-.btn-large i,
-.btn-flat i {
+.btn-floating i{
   font-size: 1.3rem;
   line-height: inherit;
 }
 
-.btn, .btn-large {
+/*.btn, .btn-large {
   text-decoration: none;
   color: #fff;
   background-color: #26a69a;
@@ -93,11 +33,7 @@ nav ul a.btn, nav ul a.btn-large, nav ul a.btn-large, nav ul a.btn-flat, nav ul 
   letter-spacing: .5px;
   transition: .2s ease-out;
   cursor: pointer;
-}
-
-.btn:hover, .btn-large:hover {
-  background-color: #2bbbad;
-}
+}*/
 
 .btn-floating {
   display: inline-block;
@@ -151,22 +87,4 @@ button.btn-floating {
 .fixed-action-btn ul a.btn-floating {
   opacity: 0;
 }
-.side-nav a.btn, .side-nav a.btn-large, .side-nav a.btn-large, .side-nav a.btn-flat, .side-nav a.btn-floating {
-  margin: 10px 15px;
-}
-
-.side-nav a.btn, .side-nav a.btn-large, .side-nav a.btn-large, .side-nav a.btn-floating {
-  color: #fff;
-}
 
-.side-nav a.btn-flat {
-  color: #343434;
-}
-
-.side-nav a.btn:hover, .side-nav a.btn-large:hover, .side-nav a.btn-large:hover {
-  background-color: #2bbbad;
-}
-
-.side-nav a.btn-floating:hover {
-  background-color: #26a69a;
-}
diff --git a/courses/models.py b/courses/models.py
index 79e1767..dffc676 100644
--- a/courses/models.py
+++ b/courses/models.py
@@ -31,7 +31,7 @@ class Course(models.Model):
 	end_date = models.DateField(_('End of Course Date'))
 	image = models.ImageField(verbose_name = _('Image'), blank = True, upload_to = 'courses/')
 	category = models.ForeignKey(Category, verbose_name = _('Category'))
-	professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='courses')
+	professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='courses_professors')
 	students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='courses_student')
 
 	class Meta:
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 3725f4e..f701fb8 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -11,31 +11,17 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'course:manage' %}" class="list-group-item active">
-	    	{% trans 'Courses' %}
-	  	</a>
-	  	<a href="{% url 'course:create' %}" class="list-group-item">
-	    	{% trans 'Create Course' %}
-	  	</a>
-	</div>
-
-	<hr />
-
-	{% if categories|length > 0 %}
-
-		<h4>{% trans 'Categories:' %} </h4>
-
-		<ul class="categories">
-			{% for category in categories %}
-				<li>
-					<a href="{% url 'course:filter' category.slug %}">
-						{{ category }}
-					</a>
-				</li>
-			{% endfor %}
-		</ul>
-	{% endif %}
+	<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 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
+            </ul>
+        </div>
+    </div>
 {% endblock %}
 
 {% block content %}
@@ -49,7 +35,16 @@
 			</div>
 		{% endfor %}
 	{% endif %}
-
+	<div class="col-md-12">
+		<div class="input-group">
+  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
+    <span class="input-group-btn input-group-sm">
+      <button type="button" class="btn btn-fab btn-fab-mini">
+        <i class="material-icons">search</i>
+      </button>
+    </span>
+</div>
+	</div>
 	{% if courses|length > 0 %}
 		{% for course in courses %}
 			<div class="col-md-12">
@@ -89,34 +84,6 @@
 				  </div>
 				</div>            
     		</div>
-			<div class="row">
-		  		<div class="col-md-10">
-					<div class="row">
-			  				<!--<div class="col-md-12">
-							<div class="pull-right">
-								<a href="{% url 'course:view' course.slug %}" class="btn btn-sm btn-info">
-									<span class="glyphicon glyphicon-eye-open"></span>
-								</a>
-								
-							</div>
-							<h4>
-								<a href="{% url 'course:view' course.slug %}">
-									{{ course }}
-								</a>
-							</h4>
-							
-							<small>
-								<em>{{ course.objectivies|linebreaks }}</em>
-							</small>
-			  			</div>
-			  		<div class="col-md-12">
-			  				<strong>{% trans 'Subscribe Period:' %} </strong> <em>de</em> <u>{{ course.init_register_date }}</u> <em>até</em> <u>{{ course.end_register_date }}</u>
-			  				<br />
-							<strong>{% trans 'Period:' %} </strong> <em>de</em> <u>{{ course.init_date }}</u> <em>até</em> <u>{{ course.end_date }}</u>
-			  			</div> -->
-					</div>
-		  		</div>
-			</div>
 
     	{% endfor %}
 
diff --git a/courses/urls.py b/courses/urls.py
index cca15f0..20f34cc 100644
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -9,7 +9,7 @@ urlpatterns = [
 	url(r'^(?P<slug>[\w_-]+)/$', views.CourseView.as_view(), name='view'),
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteCourseView.as_view(), name='delete'),
 	url(r'^category/(?P<slug>[\w_-]+)/$', views.FilteredView.as_view(), name='filter'),
-	url(r'^categories/view/view/$', views.IndexCatView.as_view(), name='manage_cat'),
+	url(r'^categories/view/$', views.IndexCatView.as_view(), name='manage_cat'),
 	url(r'^categories/create/$', views.CreateCatView.as_view(), name="create_cat"),
 	url(r'^categories/edit/(?P<slug>[\w_-]+)/$', views.UpdateCatView.as_view(), name='update_cat'),
 	url(r'^categories/(?P<slug>[\w_-]+)/$', views.ViewCat.as_view(), name='view_cat'),
diff --git a/courses/views.py b/courses/views.py
index ea1025b..66ef475 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -30,6 +30,8 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	def get_context_data(self, **kwargs):
 		context = super(IndexView, self).get_context_data(**kwargs)
 		context['categories'] = Category.objects.all()
+
+		# context['professors'] = Course.objects.all().select_related('professors__name')
 		# super.createNotification(users= User.obejcts.all(), message="testando a notificacao em login")
 		return context
 
--
libgit2 0.21.2