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