Download as
Browse Code »

Commit 146cafb53343e7d2949972f9b1e29a41e782e110

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

menu alter style #420

Showing 4 changed files with 26 additions and 13 deletions   Show diff stats
app/static/js/home.js
  Diff comments   View file @146cafb
... ... @@ -35,7 +35,17 @@ var loadItems = function() {
35 35 });
36 36 }, 1000)
37 37 };
38   -
  38 +$(".accordion").bind('click', function(){
  39 + var icon = $(this).find('span');
  40 + if(icon.hasClass("glyphicon-chevron-down")){
  41 + $(this).find('span').removeClass('glyphicon-chevron-down');
  42 + $(this).find('span').addClass('glyphicon-chevron-up');
  43 + }else{
  44 + $(this).find('span').removeClass('glyphicon-chevron-up');
  45 + $(this).find('span').addClass('glyphicon-chevron-down');
  46 + };
  47 +
  48 +});
39 49 $(document).ready(function(){
40 50 $(window).bind('scroll', loadOnScroll);
41 51 $.material.init();
... ...
app/templates/home.html
  Diff comments   View file @146cafb
... ... @@ -33,16 +33,16 @@
33 33 <div class="panel-heading">
34 34 <h4>{% trans 'Menu' %}</h4>
35 35 </div>
36   - <div class="panel-body">
  36 + <div class="panel-body menu-lateral">
37 37 <ul class="nav nav-pills nav-stacked">
38 38 <li>
39 39 <a href="#menu_courses" class="accordion" data-toggle="collapse">{% trans 'Courses' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
40 40 <div id="menu_courses" class="collapse">
41 41 <ul class="nav nav-pill nav-stacked accordion_list">
42   - <li><a href="{% url 'course:manage' %}"> {% trans 'My Courses' %} </a></li>
43   - <li><a href="{% url 'course:all_courses' %}"> {% trans 'All Courses' %} </a></li>
  42 + <li><a href="{% url 'course:manage' %}"><i class="fa fa-book" aria-hidden="true"></i> {% trans 'My Courses' %} </a></li>
  43 + <li><a href="{% url 'course:all_courses' %}"><i class="fa fa-globe" aria-hidden="true"></i> {% trans 'All Courses' %} </a></li>
44 44 {% if user|has_role:'system_admin' or user|has_role:'professor'%}
45   - <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
  45 + <li><a href="{% url 'course:manage_cat' %}"><i class="fa fa-list" aria-hidden="true"></i> {% trans 'List Category' %}</a></li>
46 46 <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
47 47 <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
48 48 {% endif %}
... ... @@ -58,8 +58,8 @@
58 58 <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
59 59 <div id="menu_users" class="collapse">
60 60 <ul class="nav nav-pill nav-stacked accordion_list">
61   - <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
62   - <li> <a href="{% url 'users:create' %}">{% trans 'Create User' %}</a></li>
  61 + <li> <a href="{% url 'users:manage' %}"><i class="fa fa-users" aria-hidden="true"></i> {% trans 'Manage Users' %}</a></li>
  62 + <li> <a href="{% url 'users:create' %}"><i class="fa fa-user-plus" aria-hidden="true"></i> {% trans 'Create User' %}</a></li>
63 63 </ul>
64 64 </div>
65 65 </li>
... ... @@ -67,9 +67,9 @@
67 67 <a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
68 68 <div id="menu_settings" class="collapse">
69 69 <ul class="nav nav-pill nav-stacked accordion_list">
70   - <li> <a href="{% url 'app:settings' page='system' %}">{% trans "System" %}</a></li>
71   - <li> <a href="{% url 'app:settings' page='mail_sender' %}">{% trans "Mail Sender" %}</a></li>
72   - <li> <a href="{% url 'app:settings' page='security' %}">{% trans "Security" %}</a></li>
  70 + <li> <a href="{% url 'app:settings' page='system' %}"><i class="fa fa-cog" aria-hidden="true"></i> {% trans "System" %}</a></li>
  71 + <li> <a href="{% url 'app:settings' page='mail_sender' %}"><i class="fa fa-envelope" aria-hidden="true"></i> {% trans "Mail Sender" %}</a></li>
  72 + <li> <a href="{% url 'app:settings' page='security' %}"><i class="fa fa-shield" aria-hidden="true"></i> {% trans "Security" %}</a></li>
73 73 </ul>
74 74 </div>
75 75 </li>
... ...
core/static/css/base/amadeus.css
  Diff comments   View file @146cafb
... ... @@ -294,10 +294,11 @@ a.alert_message:hover{color : grey}
294 294 /*====================== ========*/
295 295  
296 296 .accordion {
297   - background: #c0c0c0;
  297 + background: white;
298 298 }
299 299 .accordion_list {
300   - background: #e0e0e0;
  300 + padding-left: 4px;
  301 + background: #F5F5F5;
301 302 }
302 303  
303 304 body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {
... ...
core/templates/base.html
  Diff comments   View file @146cafb
... ... @@ -47,7 +47,7 @@
47 47  
48 48 <!--Javascript block for specific-app ones -->
49 49 <script src="{% static 'js/base/amadeus.js' %}"></script>
50   - <script src="{% static 'js/main.js' %}"></script>
  50 + <script src="{% static 'js/main.js' %}"></script>
51 51 {% block style %}
52 52 {% endblock %}
53 53 {% block javascript %}
... ... @@ -120,6 +120,8 @@
120 120 <div class="container-fluid">
121 121 <div class="row">
122 122 <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
  123 + {% block test %}
  124 + {% endblock %}
123 125 {% block sidebar %}
124 126 {% endblock %}
125 127 </div>
... ...