Commit 17b20949c1045bd38affc74fb2c00a70c7900989
1 parent
f6597671
Exists in
master
and in
2 other branches
Responsive top menu guideline
Showing
2 changed files
with
32 additions
and
64 deletions
Show diff stats
amadeus/static/css/base/amadeus_responsive.css
amadeus/templates/base.html
@@ -249,37 +249,11 @@ | @@ -249,37 +249,11 @@ | ||
249 | <div class="navbar-collapse collapse navbar-responsive-collapse"> | 249 | <div class="navbar-collapse collapse navbar-responsive-collapse"> |
250 | 250 | ||
251 | <ul class="nav navbar-nav navbar-right notifications"> | 251 | <ul class="nav navbar-nav navbar-right notifications"> |
252 | - <li class="dropdown language-selector-on-header" title data-original-title="{% trans 'Language Selector' %}" style="width:40px;"> | ||
253 | - <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true"> | ||
254 | - <i class="fa fa-cog hidden-xs" aria-hidden="true"></i> | ||
255 | - <span class="visible-xs-inline">{% trans 'Language Selector' %}</span> | ||
256 | - {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %} | ||
257 | - <img src="{% static image_static %}" /> | ||
258 | - {% endwith %} | ||
259 | - </a> | ||
260 | - <a href="#" class="dropdown-toggle no-title" data-toggle="dropdown" style="padding-left:0px;padding-right:0px;font-size:14px;text-align:center" data-close-others="true"> | ||
261 | - <span>[{{LANGUAGE_CODE}}]</span> | ||
262 | - </a> | ||
263 | - <ul class="dropdown-menu"> | ||
264 | - {% get_available_languages as LANGUAGES %} | ||
265 | - {% get_language_info_list for LANGUAGES as languages %} | ||
266 | - {% for language in languages %} | ||
267 | - <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}> | ||
268 | - <a class="language-item" value-lang="{{language.code}}"> | ||
269 | - <span>{{language.code}}</span> | ||
270 | - </a> | ||
271 | - </li> | ||
272 | - {% endfor %} | ||
273 | - </ul> | ||
274 | - </li> | ||
275 | - <li style="width:40px;"> | ||
276 | - <a href="{% url 'themes:contrast' %}" id="contrast_button"> | ||
277 | - <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i> | ||
278 | - </a> | 252 | + <li> |
253 | + <img src="{{ user.image_url }}" style="width:50px;height:50px; margin:10px;"/> | ||
279 | </li> | 254 | </li> |
280 | <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}"> | 255 | <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}"> |
281 | - <a href="" data-toggle="dropdown" class="dropdown-toggle profile"> | ||
282 | - <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" /> | 256 | + <a href="" data-toggle="dropdown" class="dropdown-toggle profile" style="content:none;"> |
283 | <span class="visible-xs-inline">{{ user }}</span> | 257 | <span class="visible-xs-inline">{{ user }}</span> |
284 | </a> | 258 | </a> |
285 | <ul class="dropdown-menu" role="menu"> | 259 | <ul class="dropdown-menu" role="menu"> |
@@ -287,46 +261,35 @@ | @@ -287,46 +261,35 @@ | ||
287 | <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li> | 261 | <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li> |
288 | <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li> | 262 | <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li> |
289 | <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li> | 263 | <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li> |
290 | - <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li> | ||
291 | </ul> | 264 | </ul> |
292 | </li> | 265 | </li> |
293 | 266 | ||
294 | {% if user.is_staff %} | 267 | {% if user.is_staff %} |
295 | - <li id="staff-menu" style="width:40px;" class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}"> | ||
296 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> | ||
297 | - <i class="fa fa-cog hidden-xs" style="position:relative;right:150%;"aria-hidden="true"></i> | ||
298 | - <span class="visible-xs-inline">{% trans 'Settings' %}</span> | ||
299 | - </a> | ||
300 | - <ul class="dropdown-menu" role="menu"> | ||
301 | - <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> | ||
302 | - <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li> | ||
303 | - <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li> | ||
304 | - <li class="dropdown-accordion" data-accordion="#system_accordion"> | ||
305 | - <div class="panel-group" id="system_accordion"> | ||
306 | - <div class="panel panel-default"> | ||
307 | - <div class="panel-heading"> | ||
308 | - <a href="#system_menu" data-toggle="collapse" data-parent="#system_accordion"> | ||
309 | - <h4 class="panel-title"> | ||
310 | - {% trans 'System' %} | ||
311 | - </h4> | ||
312 | - </a> | ||
313 | - </div> | ||
314 | - <div class="panel-collapse collapse" id="system_menu"> | ||
315 | - <div class="panel-body"> | ||
316 | - <ul class="submenu"> | ||
317 | - <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li> | ||
318 | - <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li> | ||
319 | - <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li> | ||
320 | - <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li> | ||
321 | - </ul> | ||
322 | - </div> | ||
323 | - </div> | ||
324 | - </div> | ||
325 | - </div> | ||
326 | - </li> | ||
327 | - </ul> | ||
328 | - </li> | 268 | + <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> |
269 | + <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li> | ||
270 | + <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li> | ||
271 | + | ||
272 | + <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li> | ||
329 | {% endif %} | 273 | {% endif %} |
274 | + <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li> | ||
275 | + | ||
276 | + <li style="width:40px;"> | ||
277 | + <a href="{% url 'themes:contrast' %}" id="contrast_button"> | ||
278 | + <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i> | ||
279 | + </a> | ||
280 | + </li> | ||
281 | + <li> | ||
282 | + {% get_available_languages as LANGUAGES %} | ||
283 | + {% get_language_info_list for LANGUAGES as languages %} | ||
284 | + {% for language in languages %} | ||
285 | + <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}> | ||
286 | + <a class="language-item" value-lang="{{language.code}}"> | ||
287 | + <span>{{language.code}}</span> | ||
288 | + </a> | ||
289 | + </li> | ||
290 | + {% endfor %} | ||
291 | + </li> | ||
292 | + | ||
330 | </ul> | 293 | </ul> |
331 | </div> | 294 | </div> |
332 | </div> | 295 | </div> |