Merge pull request #183 from lepdou/namespace

pull search bar to right

apollo-portal/src/main/resources/static/scripts/directive.js

@@ -70,7 +70,7 @@ directive_module.directive('apollonav', function ($compile, $window, AppService,
                         scope.copyedApps[--selectedAppIdx].selected = true;
                     }
                 } else if (event.keyCode == 13) {
-                    if (scope.shouldShowAppList){
+                    if (scope.shouldShowAppList && selectedAppIdx > -1){
                         select(scope.copyedApps[selectedAppIdx]);
                         event.preventDefault();
                     }else {

apollo-portal/src/main/resources/static/views/common/nav.html

@@ -9,7 +9,17 @@
         </style>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 
-            <form class="navbar-form navbar-left form-inline" role="search">
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
+                       aria-expanded="false">用户 <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="#">退出</a></li>
+                    </ul>
+                </li>
+            </ul>
+
+            <form class="navbar-form navbar-right form-inline" role="search">
                 <div class="form-group">
                     <input type="text" class="form-control search-input" placeholder="应用ID/应用名" style="width: 350px"
                            ng-model="searchKey" ng-change="changeSearchKey()" ng-focus="changeSearchKey()"
@@ -20,19 +30,10 @@
                              ng-click="selectApp(app)">{{app.appId}} / {{app.name}}
                         </div>
                     </div>
-
                 </div>
                 <button type="submit" class="btn btn-default" ng-click="jumpToConfigPage()">Go</button>
             </form>
-            <ul class="nav navbar-nav navbar-right">
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                       aria-expanded="false">用户 <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="#">退出</a></li>
-                    </ul>
-                </li>
-            </ul>
+
         </div>
     </div>
 </nav>