From 3c5cd50a4738df6470d164d0c13c343f15de0b40 Mon Sep 17 00:00:00 2001
From: ARvind Tiwari <tiwariav@gmail.com>
Date: Tue, 25 Jul 2017 18:26:56 +0530
Subject: [PATCH] commented markup removed from navbar

---
 hosting/templates/hosting/base_short.html     | 61 +++++++------------
 .../hosting/includes/_navbar_transparent.html | 61 +++++++------------
 2 files changed, 42 insertions(+), 80 deletions(-)

diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index b5e19238..21aa93db 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -68,52 +68,33 @@
                 <!-- Collect the nav links, forms, and other content for toggling -->
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <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>
-                                <a href="{% url 'hosting:virtual_machines' %}">
-                                    <i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%}
+                                <a href="{% url 'hosting:ssh_keys' %}">
+                                    <i class="fa fa-key"></i> {% trans "Keys"%}
                                 </a>
                             </li>
                             <li>
-                                <a href="{% url 'hosting:orders' %}">
-                                    <i class="fa fa-credit-card"></i> {% trans "My Orders"%}
+                                <a href="{% url 'hosting:notifications' %}">
+                                    <i class="fa fa-bell"></i> {% trans "Notifications "%}
                                 </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>
-                                    <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>  -->
+                            <li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li>
+                          </ul>
+                        </li>
                     </ul>
                 </div>
                 {% endif %}
diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html
index d3befe60..01d39e52 100644
--- a/hosting/templates/hosting/includes/_navbar_transparent.html
+++ b/hosting/templates/hosting/includes/_navbar_transparent.html
@@ -1,6 +1,5 @@
 {% load static i18n %}
 
-
 <nav class="navbar navbar-default  navbar-fixed-top topnav navbar-transparent" role="navigation">
     <div class="container topnav">
         <!-- 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>
         </div>
         {% if request.user.is_authenticated %}
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav navbar-right">
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <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"%}
@@ -28,43 +27,25 @@
                         </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>
-                            <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>
+                        <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>
+                                <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>
-        </div>
+                </ul>
+            </div>
         {% endif %}
         <!-- /.navbar-collapse -->
     </div>