commented markup removed from navbar
This commit is contained in:
		
					parent
					
						
							
								eb1b3b6eb5
							
						
					
				
			
			
				commit
				
					
						3c5cd50a47
					
				
			
		
					 2 changed files with 42 additions and 80 deletions
				
			
		|  | @ -68,52 +68,33 @@ | ||||||
|                 <!-- Collect the nav links, forms, and other content for toggling --> |                 <!-- Collect the nav links, forms, and other content for toggling --> | ||||||
|                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> |                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||||||
|                     <ul class="nav navbar-nav navbar-right"> |                     <ul class="nav navbar-nav navbar-right"> | ||||||
|  |                         <li> | ||||||
|  |                             <a href="{% url 'hosting:virtual_machines' %}"> | ||||||
|  |                                 <i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%} | ||||||
|  |                             </a> | ||||||
|  |                         </li> | ||||||
|  |                         <li> | ||||||
|  |                             <a href="{% url 'hosting:orders' %}"> | ||||||
|  |                                 <i class="fa fa-credit-card"></i> {% trans "My Orders"%} | ||||||
|  |                             </a> | ||||||
|  |                         </li> | ||||||
|  |                         <li class="dropdown"> | ||||||
|  |                           <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#"> | ||||||
|  |                             <i class="glyphicon glyphicon-user"></i> {{request.user.name}} <span class="caret"></span></a> | ||||||
|  |                           <ul id="g-account-menu" class="dropdown-menu" role="menu"> | ||||||
|                             <li> |                             <li> | ||||||
|                                 <a href="{% url 'hosting:virtual_machines' %}"> |                                 <a href="{% url 'hosting:ssh_keys' %}"> | ||||||
|                                     <i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%} |                                     <i class="fa fa-key"></i> {% trans "Keys"%} | ||||||
|                                 </a> |                                 </a> | ||||||
|                             </li> |                             </li> | ||||||
|                             <li> |                             <li> | ||||||
|                                 <a href="{% url 'hosting:orders' %}"> |                                 <a href="{% url 'hosting:notifications' %}"> | ||||||
|                                     <i class="fa fa-credit-card"></i> {% trans "My Orders"%} |                                     <i class="fa fa-bell"></i> {% trans "Notifications "%} | ||||||
|                                 </a> |                                 </a> | ||||||
|                             </li> |                             </li> | ||||||
|                             <li class="dropdown"> |                             <li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li> | ||||||
|                               <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#"> |                           </ul> | ||||||
|                                 <i class="glyphicon glyphicon-user"></i> {{request.user.name}} <span class="caret"></span></a> |                         </li> | ||||||
|                               <ul id="g-account-menu" class="dropdown-menu" role="menu"> |  | ||||||
|                                 <li> |  | ||||||
|                                     <a href="{% url 'hosting:ssh_keys' %}"> |  | ||||||
|                                         <i class="fa fa-key"></i> {% trans "Keys"%} |  | ||||||
|                                     </a> |  | ||||||
|                                 </li> |  | ||||||
|                                 <li> |  | ||||||
|                                     <a href="{% url 'hosting:notifications' %}"> |  | ||||||
|                                         <i class="fa fa-bell"></i> {% trans "Notifications "%} |  | ||||||
|                                     </a> |  | ||||||
|                                 </li> |  | ||||||
|                                 <li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li> |  | ||||||
|                               </ul> |  | ||||||
|                             </li> |  | ||||||
|                             <!-- |  | ||||||
|                             <li> |  | ||||||
|                                 <a href="{{ request.session.hosting_url}}#how">{% trans "How it works"%}</a> |  | ||||||
|                             </li> |  | ||||||
|                             <li> |  | ||||||
|                                 <a href="{{ request.session.hosting_url }}#your">{% trans "Your infrastructure"%}</a> |  | ||||||
|                             </li> |  | ||||||
|                            <li> |  | ||||||
|                                 <a href="{{ request.session.hosting_url }}#our">{% trans "Our inftrastructure"%}</a> |  | ||||||
|                             </li> |  | ||||||
|                             <li> |  | ||||||
|                                 <a href="{{ request.session.hosting_url }}#price">{% trans "Pricing" %}</a> |  | ||||||
|                             </li> |  | ||||||
|                             <li> |  | ||||||
|                                 <a href="{{ request.session.hosting_url }}#contact">{% trans "Contact"%}</a> |  | ||||||
|                             </li> |  | ||||||
|                             <li> |  | ||||||
|                                 <a href="{% url 'hosting:login' %}?next={{request.current_path}}">{% trans "Login"%}</a> |  | ||||||
|                             </li>  --> |  | ||||||
|                     </ul> |                     </ul> | ||||||
|                 </div> |                 </div> | ||||||
|                 {% endif %} |                 {% endif %} | ||||||
|  |  | ||||||
|  | @ -1,6 +1,5 @@ | ||||||
| {% load static i18n %} | {% load static i18n %} | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| <nav class="navbar navbar-default  navbar-fixed-top topnav navbar-transparent" role="navigation"> | <nav class="navbar navbar-default  navbar-fixed-top topnav navbar-transparent" role="navigation"> | ||||||
|     <div class="container topnav"> |     <div class="container topnav"> | ||||||
|         <!-- Brand and toggle get grouped for better mobile display --> |         <!-- Brand and toggle get grouped for better mobile display --> | ||||||
|  | @ -14,9 +13,9 @@ | ||||||
|             <a id="logoWhite" class="navbar-brand topnav" href="{% if site_url %}{{site_url}}{% else %}{{ request.session.hosting_url}}{% endif %}"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a> |             <a id="logoWhite" class="navbar-brand topnav" href="{% if site_url %}{{site_url}}{% else %}{{ request.session.hosting_url}}{% endif %}"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a> | ||||||
|         </div> |         </div> | ||||||
|         {% if request.user.is_authenticated %} |         {% if request.user.is_authenticated %} | ||||||
|         <!-- Collect the nav links, forms, and other content for toggling --> |             <!-- Collect the nav links, forms, and other content for toggling --> | ||||||
|         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> |             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||||||
|             <ul class="nav navbar-nav navbar-right"> |                 <ul class="nav navbar-nav navbar-right"> | ||||||
|                     <li> |                     <li> | ||||||
|                         <a href="{% url 'hosting:virtual_machines' %}"> |                         <a href="{% url 'hosting:virtual_machines' %}"> | ||||||
|                             <i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%} |                             <i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%} | ||||||
|  | @ -28,43 +27,25 @@ | ||||||
|                         </a> |                         </a> | ||||||
|                     </li> |                     </li> | ||||||
|                     <li class="dropdown"> |                     <li class="dropdown"> | ||||||
|                       <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#"> |                         <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#"> | ||||||
|                         <i class="glyphicon glyphicon-user"></i> {{request.user.name}} <span class="caret"></span></a> |                             <i class="glyphicon glyphicon-user"></i> {{request.user.name}} <span class="caret"></span> | ||||||
|                       <ul id="g-account-menu" class="dropdown-menu" role="menu"> |                         </a> | ||||||
|                         <li> |                         <ul id="g-account-menu" class="dropdown-menu" role="menu"> | ||||||
|                             <a href="{% url 'hosting:ssh_keys' %}"> |                             <li> | ||||||
|                                 <i class="fa fa-key"></i> {% trans "Keys"%} |                                 <a href="{% url 'hosting:ssh_keys' %}"> | ||||||
|                             </a> |                                     <i class="fa fa-key"></i> {% trans "Keys"%} | ||||||
|                         </li> |                                 </a> | ||||||
|                         <li> |                             </li> | ||||||
|                             <a href="{% url 'hosting:notifications' %}"> |                             <li> | ||||||
|                                 <i class="fa fa-bell"></i> {% trans "Notifications "%} |                                 <a href="{% url 'hosting:notifications' %}"> | ||||||
|                             </a> |                                     <i class="fa fa-bell"></i> {% trans "Notifications "%} | ||||||
|                         </li> |                                 </a> | ||||||
|                         <li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li> |                             </li> | ||||||
|                       </ul> |                             <li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li> | ||||||
|  |                         </ul> | ||||||
|                     </li> |                     </li> | ||||||
|                     <!-- |                 </ul> | ||||||
|                     <li> |             </div> | ||||||
|                         <a href="{{ request.session.hosting_url}}#how">{% trans "How it works"%}</a> |  | ||||||
|                     </li> |  | ||||||
|                     <li> |  | ||||||
|                         <a href="{{ request.session.hosting_url }}#your">{% trans "Your infrastructure"%}</a> |  | ||||||
|                     </li> |  | ||||||
|                    <li> |  | ||||||
|                         <a href="{{ request.session.hosting_url }}#our">{% trans "Our inftrastructure"%}</a> |  | ||||||
|                     </li> |  | ||||||
|                     <li> |  | ||||||
|                         <a href="{{ request.session.hosting_url }}#price">{% trans "Pricing" %}</a> |  | ||||||
|                     </li> |  | ||||||
|                     <li> |  | ||||||
|                         <a href="{{ request.session.hosting_url }}#contact">{% trans "Contact"%}</a> |  | ||||||
|                     </li> |  | ||||||
|                     <li> |  | ||||||
|                         <a href="{% url 'hosting:login' %}?next={{request.current_path}}">{% trans "Login"%}</a> |  | ||||||
|                     </li>  --> |  | ||||||
|             </ul> |  | ||||||
|         </div> |  | ||||||
|         {% endif %} |         {% endif %} | ||||||
|         <!-- /.navbar-collapse --> |         <!-- /.navbar-collapse --> | ||||||
|     </div> |     </div> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue