Download as
Browse Code »

Commit d36cc6791c6ce7260ddd48fc0e53edde9a0e720a

Authored by Filipe Medeiros
2 parents 377f4cba 19c5d918
Exists in master and in 2 other branches amadeus_univasf, refactoring

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Showing 2 changed files with 148 additions and 5 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @d36cc67
@@ -126,7 +126,6 @@ @@ -126,7 +126,6 @@
126 float: left; 126 float: left;
127 } 127 }
128 #btn-search { 128 #btn-search {
129 - margin-top: -5px;  
130 height: 30px; 129 height: 30px;
131 } 130 }
132 131
@@ -217,7 +216,6 @@ @@ -217,7 +216,6 @@
217 } 216 }
218 217
219 #btn-search { 218 #btn-search {
220 - margin-top: -10px;  
221 height: 50px; 219 height: 50px;
222 } 220 }
223 221
@@ -284,6 +282,26 @@ @@ -284,6 +282,26 @@
284 text-align: center; 282 text-align: center;
285 font-size: 1em; 283 font-size: 1em;
286 } 284 }
  285 +
  286 + .navbar-toggle{
  287 + float: left;
  288 + padding:10px;
  289 + }
  290 +
  291 + .btn{
  292 + padding: 0px 10px;
  293 + margin: 10px 1px;
  294 + font-size: 1.5em;
  295 + }
  296 +
  297 + .navbar .logo{
  298 + margin: auto;
  299 + text-align: center;
  300 + padding: 10px;
  301 + height: 50px;
  302 + width: 50px;
  303 + }
  304 +
287 } 305 }
288 @media(max-width:610px){ 306 @media(max-width:610px){
289 .outside-title{ 307 .outside-title{
amadeus/templates/base.html
  Diff comments   View file @d36cc67
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </head> 94 </head>
95 <body data-lang="{{ LANGUAGE_CODE }}"> 95 <body data-lang="{{ LANGUAGE_CODE }}">
96 {% block nav %} 96 {% block nav %}
97 - <div class="navbar navbar-default"> 97 + <div class="navbar navbar-default hidden-sm hidden-xs">
98 <div class="navbar-header"> 98 <div class="navbar-header">
99 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse"> 99 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
100 <span class="icon-bar"></span> 100 <span class="icon-bar"></span>
@@ -105,9 +105,8 @@ @@ -105,9 +105,8 @@
105 <img class="logo pull-left" src="{{ theme.small_logo_url }}" alt="Logo" /> 105 <img class="logo pull-left" src="{{ theme.small_logo_url }}" alt="Logo" />
106 <span class="pull-right project_name">{{ theme.title }}</span> 106 <span class="pull-right project_name">{{ theme.title }}</span>
107 </a> 107 </a>
108 -  
109 -  
110 </div> 108 </div>
  109 +
111 <div class="navbar-collapse collapse navbar-responsive-collapse"> 110 <div class="navbar-collapse collapse navbar-responsive-collapse">
112 <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"> 111 <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">
113 <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form"> 112 <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
@@ -207,6 +206,132 @@ @@ -207,6 +206,132 @@
207 </div> 206 </div>
208 </div> 207 </div>
209 208
  209 +
  210 + <div class="navbar navbar-default hidden-lg hidden-md">
  211 + <div class="navbar-header">
  212 + <div class="col-sm-4 col-xs-4">
  213 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
  214 + <span class="icon-bar"></span>
  215 + <span class="icon-bar"></span>
  216 + <span class="icon-bar"></span>
  217 + </button>
  218 + </div>
  219 + <div class="col-sm-4 col-xs-4">
  220 + <a class="" href="{% url 'subjects:home' %}">
  221 + <img class="logo img-responsive" src="{{ theme.small_logo_url }}" alt="Logo" />
  222 + </a>
  223 + </div>
  224 + <div class="col-sm-4 col-xs-4">
  225 + <button type="submit" class="btn btn-primary navbar-toggle pull-right" id="btn-search" data-toggle="collapse" data-target=".search-responsive-collapse">
  226 + <i class="fa fa-search" aria-hidden="true"></i>
  227 + </button>
  228 + </div>
  229 + </div>
  230 +
  231 + <div class="search-responsive-collapse collapse navbar">
  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 + <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
  234 + <div class="input-group">
  235 + <div class="form-group is-empty" >
  236 + <input type="text" class="form-control top-search" placeholder="{% trans 'Search for subjects and resources' %}" name="search">
  237 + </div>
  238 + <span class="input-group-btn input-group-sm">
  239 + <button type="submit" class="btn btn-primary" id="btn-search">
  240 + <i class="fa fa-search" aria-hidden="true"></i>
  241 + </button>
  242 + </span>
  243 + </div>
  244 + </form>
  245 + </div>
  246 + </div>
  247 +
  248 +
  249 + <div class="navbar-collapse collapse navbar-responsive-collapse">
  250 +
  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>
  279 + </li>
  280 + <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" />
  283 + <span class="visible-xs-inline">{{ user }}</span>
  284 + </a>
  285 + <ul class="dropdown-menu" role="menu">
  286 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  287 + <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>
  289 + <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>
  292 + </li>
  293 +
  294 + {% 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>
  329 + {% endif %}
  330 + </ul>
  331 + </div>
  332 + </div>
  333 +
  334 +
210 <script type="text/javascript"> 335 <script type="text/javascript">
211 $("#contrast_button" ).click(function() { 336 $("#contrast_button" ).click(function() {
212 if (Cookies.get('contrast_check')) { 337 if (Cookies.get('contrast_check')) {