From da00b76805350a126eb95a268c5e6e18134a587b Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Tue, 24 Jan 2017 00:25:18 -0200
Subject: [PATCH] Adjusts subjects/webpages

---
 amadeus/static/css/themes/green.css   |  6 +++---
 subjects/templates/subjects/view.html | 18 ------------------
 webpage/templates/webpages/view.html  | 20 +++-----------------
 3 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css
index d639294..bbd057b 100644
--- a/amadeus/static/css/themes/green.css
+++ b/amadeus/static/css/themes/green.css
@@ -52,11 +52,11 @@ a, a:focus, a:hover {
 }
 
 .category-panel > .panel-heading {
-    background-color: #0277BD !important;
+    background-color: #015E96 !important;
 }
 
 .subject-panel > .panel-heading {
-    background-color: #039BE5 !important;
+    background-color: #0277BD !important;
 }
 
 .group-panel > .panel-heading {
@@ -73,7 +73,7 @@ a, a:focus, a:hover {
 }
 
 .topic-panel > .panel-heading {
-    background-color: #7BA5B9 !important;
+    background-color: #1d8fe0 !important;
 }
 
 .topic-panel > .category-panel-content, .topic-panel-invisible > .category-panel-content {
diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html
index bb50d47..5faa3a1 100644
--- a/subjects/templates/subjects/view.html
+++ b/subjects/templates/subjects/view.html
@@ -64,24 +64,6 @@
             </div>
         </div>
         <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
-            <div class="row">
-                <div class="col-md-6">
-                    {% if subject.professor.all|length > 0  %}
-                        <h4><b>{% trans "Professor(s) " %}: </b>
-                            {{ subject.professor.all|join:', ' }}
-                        </h4>
-                    {% else %}
-                        <h4> {% trans "It doesn't possess professors" %} </h4>
-                    {% endif %}
-                </div>
-                <div class="col-xs-6 col-md-3">
-                    <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p>
-                </div>
-                <div class="col-xs-6 col-md-3">
-                    <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p>
-                </div>
-            </div>
-
             <p>{{subject.description|safe}}</p>
 
             {% if has_subject_permissions %}
diff --git a/webpage/templates/webpages/view.html b/webpage/templates/webpages/view.html
index 4b70ce7..3f888ca 100644
--- a/webpage/templates/webpages/view.html
+++ b/webpage/templates/webpages/view.html
@@ -28,34 +28,20 @@
     {% subject_permissions request.user subject as has_subject_permissions %}
 
     {% if subject.visible %}
-		<div class="panel panel-info subject-panel">
+		<div class="panel panel-info topic-panel">
         	<div class="panel-heading">
 	{% elif has_subject_permissions %}
-		<div class="panel panel-info subject-panel-invisible">
+		<div class="panel panel-info topic-panel-invisible">
         	<div class="panel-heading panel-invisible">
     {% endif %}
     		<div class="row">
                 <div class="col-md-12 category-header">
                     <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
-                        <span>{{subject.name}}</span>
+                        <span>{{ webpage }}</span>
                     </h4>
 
                     <div class="col-md-5 pull-right category-card-items">
-                        {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
-                            <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
-                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
-                            </a>
-                            <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
-                                <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-                                <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
-                                <li><a href="{% url 'groups:index' subject.slug %}"><i class="fa fa-group fa-fw" aria-hidden="true"></i>{% trans 'Groups' %}</a></li>
-                                <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
-                            </ul>
-                        {% endif %}
                         <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
-                        <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
-                        <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
-                        <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
                     </div>
                 </div>
             </div>
--
libgit2 0.21.2