Download as
Browse Code »

Commit e0d5e2f8d3e208c76f67074d23d72363852bd1a0

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

modifying menu student #205

Showing 4 changed files with 52 additions and 74 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @e0d5e2f
... ... @@ -31,11 +31,11 @@
31 31 // Configure the url we're about to hit
32 32 setTimeout(function (){
33 33 $.ajax({
34   - url: baseUrl,
  34 + url: baseUrl,
35 35 data: {'page': pageNum},
36 36 success: function(data) {
37 37 $("#loading").hide();
38   -
  38 +
39 39 $("#timeline").append(data);
40 40 },
41 41 complete: function(data, textStatus){
... ... @@ -46,7 +46,7 @@
46 46 }, 1000)
47 47 };
48 48  
49   - $(document).ready(function(){
  49 + $(document).ready(function(){
50 50 $(window).bind('scroll', loadOnScroll);
51 51 });
52 52 </script>
... ... @@ -62,70 +62,48 @@
62 62 {% endblock %}
63 63  
64 64 {% block sidebar %}
65   - <div class="panel panel-primary">
  65 + <div class="panel panel-primary navigation">
66 66 <div class="panel-heading">
67   - <img src="{{ user.image_url }}" id="img" class="img-rounded">
68   - <p></p>
69   - <div class="row">
70   - <div class="col-xs-3 col-md-3">
71   - <i class="fa fa-facebook-official fa-2x" aria-hidden="true"></i>
72   - </div>
73   - <div class="col-xs-3 col-md-3">
74   - <i class="fa fa-twitter fa-2x" aria-hidden="true"></i>
75   - </div>
76   - <div class="col-xs-3 col-md-3">
77   - <i class="fa fa-linkedin-square fa-2x" aria-hidden="true"></i>
78   - </div>
79   - <div class="col-xs-3 col-md-3">
80   - <i class="fa fa-google-plus-official fa-2x" aria-hidden="true"></i>
81   - </div>
82   - </div>
83   - </div>
84   - <div class="panel-body">
85   - <ul class="nav nav-pills nav-stacked">
86   - <li> <a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
87   - <li> <a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
88   - <li> <a href="#">{% trans 'Pending Tasks' %}</a></li>
89   - {% if user|has_role:'student' and not user.is_staff %}
90   - <li> <a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
91   - {% endif %}
92   - {% if user|has_role:'system_admin' %}
93   - <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
94   - {% endif %}
95   - {% if user|has_role:'system_admin' or user|has_role:'professor' %}
96   - <li>
97   - <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
98   -
99   - <div id="courses_list" class="collapse">
100   - <ul class="nav nav-pill nav-stacked accordion_list">
101   - {% for course in courses_list %}
102   - <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
103   - {% endfor %}
104   - </ul>
105   - </div>
106   - </li>
107   - {% endif %}
108   - </ul>
109   - </div>
110   - </div>
  67 + <h4>Menu</h4>
  68 + </div>
  69 + <div class="panel-body">
  70 + <ul class="nav nav-pills nav-stacked">
  71 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  72 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  73 + {% if user|has_role:'student' or not user.is_staff %}
  74 + <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
  75 + {% endif %}
  76 + {% if user|has_role:'system_admin' %}
  77 + <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
  78 + {% endif %}
  79 + {% if user|has_role:'system_admin' or user|has_role:'professor' %}
  80 + <li>
  81 + <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
  82 + <div id="courses_list" class="collapse">
  83 + <ul class="nav nav-pill nav-stacked accordion_list">
  84 + {% for course in courses_list %}
  85 + <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
  86 + {% endfor %}
  87 + </ul>
  88 + </div>
  89 + </li>
  90 + {% endif %}
  91 + </ul>
  92 + </div>
  93 + </div>
111 94 {% endblock %}
112 95  
113 96 {% block content %}
114 97 {% if user|has_role:'system_admin' %}
115   - <h3>{% trans 'Courses' %}</h3>
116   -
117   - <div id="timeline">
118   - {% include page_template %}
119   - </div>
120   -
  98 + <h3>{% trans 'Courses' %}</h3>
  99 + <div id="timeline">
  100 + {% include page_template %}
  101 + </div>
121 102 {% else %}
122   -
123   - <div id="timeline">
124   - {% include page_template %}
125   - </div>
126   -
  103 + <div id="timeline">
  104 + {% include page_template %}
  105 + </div>
127 106 {% endif %}
128   -
129 107 <div id="loading" class="alert alert-primary" role="alert" style="display: none">
130 108 <center>
131 109 <span class="fa fa-spin fa-circle-o-notch"></span>
... ...
app/templates/home_student.html
  Diff comments   View file @e0d5e2f
... ... @@ -18,7 +18,7 @@
18 18 {% block sidebar %}
19 19 <div class="panel panel-primary navigation">
20 20 <div class="panel-heading">
21   - <h5>{% trans 'Menu' %}</h5>
  21 + <h4>{% trans 'Menu' %}</h4>
22 22 </div>
23 23 <div class="panel-body">
24 24 <ul class="nav nav-pills nav-stacked">
... ...
core/templates/base.html
  Diff comments   View file @e0d5e2f
... ... @@ -109,7 +109,7 @@
109 109 {% endblock %}
110 110 </div>
111 111  
112   -
  112 +
113 113 </div>
114 114 </div>
115 115 </div>
... ... @@ -117,7 +117,7 @@
117 117 <script src="{% static 'js/main.js' %}"></script>
118 118 <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
119 119 {% block script_file %}
120   -
  120 +
121 121 {% endblock script_file %}
122 122 </body>
123 123  
... ...
courses/templates/course/index.html
  Diff comments   View file @e0d5e2f
... ... @@ -11,18 +11,18 @@
11 11 {% endblock %}
12 12  
13 13 {% block sidebar %}
14   - <div class="panel panel-primary navigation">
15   - <div class="panel-heading">
16   - <h5>{% trans 'Menu' %}</h5>
17   - </div>
18   - <div class="panel-body">
19   - <ul class="nav nav-pills nav-stacked">
20   - <li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
21   - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
22   - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
23   - </ul>
24   - </div>
  14 +<div class="panel panel-primary navigation">
  15 + <div class="panel-heading">
  16 + <h4>{% trans 'Menu' %}</h4>
  17 + </div>
  18 + <div class="panel-body">
  19 + <ul class="nav nav-pills nav-stacked">
  20 + <li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
  21 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  22 + <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
  23 + </ul>
25 24 </div>
  25 +</div>
26 26  
27 27 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
28 28  
... ...