Download as
Browse Code »

Commit 3990d8bdc3a2bc1320f728529393a2772c9ec0bb

Authored by Filipe Medeiros
1 parent 55f2f9df
Exists in master and in 2 other branches amadeus_univasf, refactoring

Responsive top menu

Showing 2 changed files with 30 additions and 20 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @3990d8b
... ... @@ -323,6 +323,7 @@
323 323 width: 100%!important;
324 324 position: absolute;
325 325 z-index: 5;
  326 +
326 327 }
327 328  
328 329 .help-block span{
... ... @@ -361,6 +362,6 @@
361 362  
362 363 @media(min-width: 500px) {
363 364 .dropdown-menu{
364   - margin-left: 100px;
  365 + margin-left: 130px;
365 366 }
366 367 }
... ...
amadeus/templates/base.html
  Diff comments   View file @3990d8b
... ... @@ -228,7 +228,7 @@
228 228 </div>
229 229 </div>
230 230  
231   - <div class="search-responsive-collapse collapse navbar">
  231 + <div class="search-responsive-collapse collapse navbar" style="margin-top:60px;">
232 232 <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center">
233 233 <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
234 234 <div class="input-group">
... ... @@ -256,35 +256,44 @@
256 256 <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
257 257 <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
258 258 <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
  259 + <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
259 260  
260 261 {% if user.is_staff %}
261   - <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
262   - <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
263   - <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
264   -
265   - <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
266   - <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
267   - <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
268   - <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li>
  262 + <li id="staff-menu" class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
  263 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">
  264 + {% trans 'Settings' %}
  265 + </a>
  266 + <ul class="dropdown-menu" role="menu">
  267 + <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
  268 + <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
  269 + <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
  270 + <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
  271 + <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
  272 + <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
  273 + <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li>
  274 + </ul>
  275 + </li>
269 276 {% endif %}
270   - <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
271 277  
272   - <li>
273   - <a href="{% url 'themes:contrast' %}" id="top_contrast_button" style="width:40px;">
274   - <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
  278 + <li class="dropdown language-selector-on-header" title data-original-title="{% trans 'Language Selector' %}" style="width:auto; text-align:center;">
  279 + <a href="{% url 'themes:contrast' %}" id="top_contrast_button" style="width:40px; display:inline-block">
  280 + <i style="font-size:15px;" class="glyphicon glyphicon-adjust"></i>
275 281 </a>
276   - </li>
277   - <li>
278   - {% get_available_languages as LANGUAGES %}
279   - {% get_language_info_list for LANGUAGES as languages %}
280   -
  282 +
  283 + <a href="#" class="dropdown no-title" data-toggle="dropdown" data-close-others="true" style="display:inline-block; margin-left:10px;">
  284 + [{{LANGUAGE_CODE}}]
  285 + </a>
  286 + <ul class="dropdown-menu">
  287 + {% get_available_languages as LANGUAGES %}
  288 + {% get_language_info_list for LANGUAGES as languages %}
281 289 {% for language in languages %}
282 290 <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
283 291 <a class="language-item" value-lang="{{language.code}}">
284 292 <span>{{language.code}}</span>
285 293 </a>
286 294 </li>
287   - {% endfor %}
  295 + {% endfor %}
  296 + </ul>
288 297 </li>
289 298  
290 299 </ul>
... ...