Download as
Browse Code »

Commit 037a8733986459150ce27b199e0ac00c88723aa3

Authored by juliotoscano
1 parent ee2a548a
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modifying menus #205

Showing 9 changed files with 14 additions and 17 deletions   Show diff stats
amadeus/staticfiles/css/base/amadeus.css
  Diff comments   View file @037a873
@@ -18,9 +18,6 @@ @@ -18,9 +18,6 @@
18 padding-bottom: 1%; 18 padding-bottom: 1%;
19 width: 15%; 19 width: 15%;
20 } 20 }
21 -.navigation{  
22 - margin: 10% 10% 5% 5%;  
23 -}  
24 .breadcrumb{ 21 .breadcrumb{
25 margin-bottom: 5px; 22 margin-bottom: 5px;
26 } 23 }
app/templates/home.html
  Diff comments   View file @037a873
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 {% endblock %} 64 {% endblock %}
65 65
66 {% block sidebar %} 66 {% block sidebar %}
67 - <div class="panel panel-primary navigation"> 67 + <div class="panel panel-primary">
68 <div class="panel-heading"> 68 <div class="panel-heading">
69 <h4>Menu</h4> 69 <h4>Menu</h4>
70 </div> 70 </div>
app/templates/home_professor.html
  Diff comments   View file @037a873
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 {% endblock %} 15 {% endblock %}
16 16
17 {% block sidebar %} 17 {% block sidebar %}
18 - <div class="panel panel-primary navigation"> 18 + <div class="panel panel-primary">
19 <div class="panel-heading"> 19 <div class="panel-heading">
20 <h5>{% trans 'Menu' %}</h5> 20 <h5>{% trans 'Menu' %}</h5>
21 </div> 21 </div>
app/templates/home_student.html
  Diff comments   View file @037a873
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 16
17 17
18 {% block sidebar %} 18 {% block sidebar %}
19 - <div class="panel panel-primary navigation"> 19 + <div class="panel panel-primary">
20 <div class="panel-heading"> 20 <div class="panel-heading">
21 <h4>{% trans 'Menu' %}</h4> 21 <h4>{% trans 'Menu' %}</h4>
22 </div> 22 </div>
core/static/css/base/amadeus.css
  Diff comments   View file @037a873
@@ -400,7 +400,7 @@ ul, li { @@ -400,7 +400,7 @@ ul, li {
400 .divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;} 400 .divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}
401 .headingOne {padding-top: 0px; padding-bottom: 50px;} 401 .headingOne {padding-top: 0px; padding-bottom: 50px;}
402 .headingTwo {padding-top: 0px; padding-bottom: 50px;} 402 .headingTwo {padding-top: 0px; padding-bottom: 50px;}
403 -.panel-heading{cursor:move;} 403 +.course{padding-top: 0px; padding-bottom: 0px; cursor:move; }
404 .titleTopic {padding-top: 18px; padding-left: 0px;} 404 .titleTopic {padding-top: 18px; padding-left: 0px;}
405 .titleTopic-detail {padding-top: 8px;} 405 .titleTopic-detail {padding-top: 8px;}
406 .titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;} 406 .titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;}
core/templates/guest.html
  Diff comments   View file @037a873
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 80
81 <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> 81 <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>
82 <li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li> 82 <li > <a class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
83 - 83 +
84 </ul> 84 </ul>
85 </div> 85 </div>
86 </div> 86 </div>
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 90
91 <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2"> 91 <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
92 {% block sidebar %} 92 {% block sidebar %}
93 - <div class="panel panel-primary navigation"> 93 + <div class="panel panel-primary">
94 <div class="panel-heading"> 94 <div class="panel-heading">
95 <h4>Menu</h4> 95 <h4>Menu</h4>
96 </div> 96 </div>
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 </form> 119 </form>
120 </div> 120 </div>
121 121
122 - <div class="col-md-12"> 122 + <div class="col-md-10">
123 <div class="btn-group btn-group-justified btn-group-raised"> 123 <div class="btn-group btn-group-justified btn-group-raised">
124 <a href="?category=all" class="btn btn-raised btn-info">Todos</a> 124 <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
125 {% for category in categories %} 125 {% for category in categories %}
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 {% block render_breadcrumbs %}{% endblock %} 132 {% block render_breadcrumbs %}{% endblock %}
133 <div> 133 <div>
134 </div> 134 </div>
135 - <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12"> 135 + <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
136 {% block content %} 136 {% block content %}
137 {% for course in courses %} 137 {% for course in courses %}
138 <div class="panel panel-info panel_{{ course.id }}"> 138 <div class="panel panel-info panel_{{ course.id }}">
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 <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> 142 <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>
143 {% endif %} 143 {% endif %}
144 </div> 144 </div>
145 - 145 +
146 <div class="panel-body"> 146 <div class="panel-body">
147 <p><b>Course Name: </b>{{course.name}}</p> 147 <p><b>Course Name: </b>{{course.name}}</p>
148 <p><b>Begining: </b>{{course.init_date}}</p> 148 <p><b>Begining: </b>{{course.init_date}}</p>
courses/templates/course/course_card.html
  Diff comments   View file @037a873
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion-{{course.slug}}" role="tablist" aria-multiselectable="false"> 4 <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion-{{course.slug}}" role="tablist" aria-multiselectable="false">
5 <div class="group"> 5 <div class="group">
6 <div class="panel panel-info"> 6 <div class="panel panel-info">
7 - <div class="panel-heading" role="tab" > 7 + <div class="panel-heading course" role="tab" >
8 <div class="row"> 8 <div class="row">
9 <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}}"> 9 <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}}">
10 <div class="btn-group"> 10 <div class="btn-group">
courses/templates/course/index.html
  Diff comments   View file @037a873
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 {% endblock %} 11 {% endblock %}
12 12
13 {% block sidebar %} 13 {% block sidebar %}
14 - <div class="panel panel-primary navigation"> 14 + <div class="panel panel-primary">
15 <div class="panel-heading"> 15 <div class="panel-heading">
16 <h4>Menu</h4> 16 <h4>Menu</h4>
17 </div> 17 </div>
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 </div> 83 </div>
84 </form> 84 </form>
85 </div> 85 </div>
86 - 86 +
87 87
88 </fieldset> 88 </fieldset>
89 <div class="col-md-12"> 89 <div class="col-md-12">
courses/templates/topic/index.html
  Diff comments   View file @037a873
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 19
20 {% block sidebar %} 20 {% block sidebar %}
21 21
22 - <div class="panel panel-primary navigation"> 22 + <div class="panel panel-primary">
23 <div class="panel-heading"> 23 <div class="panel-heading">
24 <h5>{% trans 'Menu' %}</h5> 24 <h5>{% trans 'Menu' %}</h5>
25 </div> 25 </div>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </div> 32 </div>
33 33
34 {% if user|has_role:'professor' %} 34 {% if user|has_role:'professor' %}
35 - <div class="panel panel-primary navigation"> 35 + <div class="panel panel-primary ">
36 <div class="panel-heading"> 36 <div class="panel-heading">
37 <h3 class="panel-title">Actions</h3> 37 <h3 class="panel-title">Actions</h3>
38 </div> 38 </div>