Commit 86514cee132a04227bfb3b376fad9f9e00347072

Authored by Filipe Medeiros
1 parent bb709fe9

Responsive top menu guideline

amadeus/static/css/base/amadeus_responsive.css
@@ -119,7 +119,12 @@ @@ -119,7 +119,12 @@
119 } 119 }
120 120
121 .navbar-header{ 121 .navbar-header{
122 - width: 100% !important; 122 + width: 100%;
  123 + position: fixed;
  124 + top: 0px;
  125 + z-index: 999;
  126 + height: 50px;
  127 + background: #009C8A;
123 } 128 }
124 129
125 .navbar .navbar-brand{ 130 .navbar .navbar-brand{
amadeus/static/css/themes/contrast.css
@@ -305,6 +305,10 @@ fieldset[disabled][disabled] .input-group-btn .btn { @@ -305,6 +305,10 @@ fieldset[disabled][disabled] .input-group-btn .btn {
305 background: #FFF333 !important; 305 background: #FFF333 !important;
306 color: #000000 !important; } 306 color: #000000 !important; }
307 307
  308 +.navbar-header{
  309 + background: #FFF333 !important;
  310 + color: #000000 !important; }
  311 +}
308 .navbar-nav li.settings_menu_active { 312 .navbar-nav li.settings_menu_active {
309 background: #FFF333; } 313 background: #FFF333; }
310 314
amadeus/templates/base.html
@@ -248,45 +248,42 @@ @@ -248,45 +248,42 @@
248 248
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">  
252 - <li> 251 + <ul class="nav navbar-nav navbar-right notifications" style="margin-top: 50px;">
  252 + <li style="width: auto; text-align: center;">
253 <img src="{{ user.image_url }}" style="width:50px;height:50px; margin:10px;"/> 253 <img src="{{ user.image_url }}" style="width:50px;height:50px; margin:10px;"/>
254 </li> 254 </li>
255 - <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">  
256 - <a href="" data-toggle="dropdown" class="dropdown-toggle profile" style="content:none;">  
257 - <span class="visible-xs-inline">{{ user }}</span>  
258 - </a>  
259 - <ul class="dropdown-menu" role="menu">  
260 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
261 - <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>  
262 - <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>  
263 - <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>  
264 - </ul>  
265 - </li> 255 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  256 + <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
  257 + <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
  258 + <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
266 259
267 {% if user.is_staff %} 260 {% if user.is_staff %}
268 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> 261 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
269 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li> 262 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
270 <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li> 263 <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
271 264
  265 + <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
  266 + <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
272 <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</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>
273 {% endif %} 269 {% endif %}
274 <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li> 270 <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
275 271
276 - <li style="width:40px;">  
277 - <a href="{% url 'themes:contrast' %}" id="contrast_button"> 272 + <li>
  273 + <a href="{% url 'themes:contrast' %}" id="top_contrast_button" style="width:40px;">
278 <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i> 274 <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
279 </a> 275 </a>
280 </li> 276 </li>
281 <li> 277 <li>
282 {% get_available_languages as LANGUAGES %} 278 {% get_available_languages as LANGUAGES %}
283 {% get_language_info_list for LANGUAGES as languages %} 279 {% 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> 280 +
  281 + {% for language in languages %}
  282 + <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
  283 + <a class="language-item" value-lang="{{language.code}}">
  284 + <span>{{language.code}}</span>
  285 + </a>
  286 + </li>
290 {% endfor %} 287 {% endfor %}
291 </li> 288 </li>
292 289
@@ -308,6 +305,20 @@ @@ -308,6 +305,20 @@
308 305
309 }); 306 });
310 </script> 307 </script>
  308 +
  309 + <script type="text/javascript">
  310 + $("#top_contrast_button" ).click(function() {
  311 + if (Cookies.get('contrast_check')) {
  312 + Cookies.remove('contrast_check')
  313 + //location.reload()
  314 + }
  315 + else {
  316 + Cookies.set('contrast_check','contrast')
  317 + //location.reload()
  318 + }
  319 +
  320 + });
  321 + </script>
311 {% endblock %} 322 {% endblock %}
312 323
313 <div class="container-fluid"> 324 <div class="container-fluid">