Download as
Browse Code »

Commit c1bfb395ff14da342147f419a8a35cf6de274751

Authored by Julio Toscano
Committed by GitHub
2 parents a225b178 60c91582
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge pull request #216 from amadeusproject/alter_front_end 

overhaul base #205
Showing 2 changed files with 74 additions and 103 deletions   Show diff stats
core/templates/base.html
  Diff comments   View file @c1bfb39
... ... @@ -47,71 +47,54 @@
47 47 {% endblock %}
48 48 </head>
49 49 <body>
  50 + {% block nav %}
  51 + <div class="navbar navbar-default">
  52 + <div class="navbar-header">
  53 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
  54 + <span class="icon-bar"></span>
  55 + <span class="icon-bar"></span>
  56 + <span class="icon-bar"></span>
  57 + </button>
  58 + <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo"/></a>
  59 + </div>
  60 + <div class="navbar-collapse collapse navbar-responsive-collapse">
  61 + <ul class="nav navbar-nav navbar-right notifications">
  62 + <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
  63 + <a class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
  64 + <ul id="notification-dropdown" class="dropdown-menu">
  65 + <li class="dropdown-header">Notifications</li>
  66 + {% include "notifications.html" %}
  67 +
  68 + <li>
  69 + <a onclick="getNotifications(5)">
  70 + <div id="notification-see-more" class="list-group-item">
  71 + <div class="row-content">
  72 + <p class="list-group-item-text">See More</p>
  73 + </div>
  74 + </a>
  75 + </li>
  76 + </ul>
  77 + </li>
  78 +
  79 + <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>
  80 + <li > <a class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
  81 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
  82 + </ul>
  83 + </div>
  84 + </div>
  85 + {% endblock %}
50 86 <div class="container-fluid">
51   - {% block nav %}
52   - <div class="row">
53   - <div class="navbar navbar-default">
54   - <div class="navbar-header">
55   - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
56   - <span class="icon-bar"></span>
57   - <span class="icon-bar"></span>
58   - <span class="icon-bar"></span>
59   - </button>
60   - <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo"/></a>
61   - </div>
62   - <div class="navbar-collapse collapse navbar-responsive-collapse">
63   - <ul class="nav navbar-nav navbar-right notifications">
64   - <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
65   - <a class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
66   - <ul id="notification-dropdown" class="dropdown-menu">
67   - <li class="dropdown-header">Notifications</li>
68   - {% include "notifications.html" %}
69   -
70   - <li>
71   - <a onclick="getNotifications(5)">
72   - <div id="notification-see-more" class="list-group-item">
73   - <div class="row-content">
74   - <p class="list-group-item-text">See More</p>
75   - </div>
76   - </a>
77   - </li>
78   - </ul>
79   - </li>
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>
82   - <li > <a class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
83   - <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
84   - </ul>
85   - </div>
86   - </div>
87   - </div>
88   - {% endblock %}
89   -
90 87 <div class="row">
91   - <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
92   - {% block sidebar %}
93   -
94   - {% endblock %}
95   - </div>
96   -
97   - <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
98   - {% block breadcrumbs %}
99   -
100   - {% endblock %}
101   -
102   - {% block render_breadcrumbs %}
103   -
104   - {% endblock %}
105   - <div class="row">
106   - <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
107   - {% block content %}
108   -
109   - {% endblock %}
110   - </div>
111   -
112   -
113   - </div>
114   - </div>
  88 + <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
  89 + {% block sidebar %}{% endblock %}
  90 + </div>
  91 + <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  92 + {% block breadcrumbs %}{% endblock %}
  93 + {% block render_breadcrumbs %}{% endblock %}
  94 + </div>
  95 + <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  96 + {% block content %}{% endblock %}
  97 + </div>
115 98 </div>
116 99 </div>
117 100 <script src="{% static 'js/main.js' %}"></script>
... ...
courses/templates/course/index.html
  Diff comments   View file @c1bfb39
... ... @@ -11,47 +11,35 @@
11 11 {% endblock %}
12 12  
13 13 {% block sidebar %}
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>
24   - </div>
25   -</div>
26   -
27   -{% if user|has_role:'professor' or user|has_role:'system_admin' %}
28   -
29 14 <div class="panel panel-primary navigation">
30   - <div class="panel-heading">
31   - <h3 class="panel-title">Actions</h3>
32   - </div>
33   - <div class="panel-body">
34   - <ul class="nav nav-pills nav-stacked">
35   - <li><a href="javascript:void(0)">Replicate Course</a></li>
36   - <li><a href="{% url 'course:create' %}">Create Course</a></li>
37   - </ul>
38   - </div>
39   - </div>
40   -
41   - <div class="panel panel-primary navigation">
42   - <div class="panel-heading">
43   - <h3 class="panel-title">Category</h3>
44   - </div>
45   - <div class="panel-body">
46   - <ul class="nav nav-pills nav-stacked">
47   - <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
48   - <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
49   - </ul>
50   - </div>
51   - </div>
52   -
53   -{% endif %}
54   -
  15 + <div class="panel-heading">
  16 + <h4>Menu</h4>
  17 + </div>
  18 + <div class="panel-body">
  19 + <ul class="nav nav-pills nav-stacked">
  20 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  21 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  22 + {% if user|has_role:'student' or not user.is_staff %}
  23 + <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
  24 + {% endif %}
  25 + {% if user|has_role:'system_admin' %}
  26 + <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
  27 + {% endif %}
  28 + {% if user|has_role:'system_admin' or user|has_role:'professor' %}
  29 + <li>
  30 + <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
  31 + <div id="courses_list" class="collapse">
  32 + <ul class="nav nav-pill nav-stacked accordion_list">
  33 + {% for course in courses_list %}
  34 + <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
  35 + {% endfor %}
  36 + </ul>
  37 + </div>
  38 + </li>
  39 + {% endif %}
  40 + </ul>
  41 + </div>
  42 + </div>
55 43 {% endblock %}
56 44  
57 45 {% block content %}
... ...