Привел оформление в соответствии с JQuery

ideals · May 19, 2016 · fa12a00 · fa12a00
1 parent a1808eb
commit fa12a00
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/angular/content.html b/angular/content.html
@@ -9,10 +9,14 @@ <h1> {{fullContent.header}} </h1>
     </div> 
   </div>
 
-  <div class="well" ng-hide="showContent">
+  <div class="well" ng-hide="showContent" id="loader">
     <div class="text-center"><img src="../loader.gif" /></div>
   </div>
 
+	<div class="text-center">
+	    <a class="btn btn-info btn-lg" href="/">К началу</a>
+	</div>
+
 </div>
 </div>
 
diff --git a/angular/index.html b/angular/index.html
@@ -7,18 +7,38 @@
     <script src="angular.min.js"></script>
     <script src="angular-ui-router.min.js"></script>
     <script src="app.js"></script>
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="../_assets/jquery-2.2.3.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="../_assets/bootstrap/js/bootstrap.min.js"></script>
+
   </head>
   <body>
 
   	<div ng-controller="mainMenu as mm">
 
-      <nav class="row">
-          <div class="collapse navbar-collapse" id="main-menu">
-            <ul class="nav navbar-nav">
-              <li ng-repeat="itemMenu in mm.listMenu" ui-sref-active="active">
-                <a ui-sref="mainState({url:itemMenu.url})">{{itemMenu.name}} </a>
-              </li>
-            </ul>
+      <nav class="navbar navbar-default">
+          <div class="container-fluid">
+              <!-- Brand and toggle get grouped for better mobile display -->
+              <div class="navbar-header">
+                  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-menu" aria-expanded="false" aria-controls="navbar">
+                      <span class="sr-only">Toggle navigation</span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                  </button>
+                  <a class="navbar-brand" href="">AngularJS</a>
+              </div>
+
+              <!-- Collect the nav links, forms, and other content for toggling -->
+              <div class="collapse navbar-collapse" id="main-menu">
+                  <ul class="nav navbar-nav">
+                    <li ng-repeat="itemMenu in mm.listMenu" ui-sref-active="active">
+                      <a ui-sref="mainState({url:itemMenu.url})">{{itemMenu.name}} </a>
+                    </li>
+                  </ul>
+              </div><!-- /.navbar-collapse -->
+          </div><!-- /.container-fluid -->
       </nav>
 
     <div ui-view></div>