Changeset 4238 for cats/SCHEMAcat/branches/urn.org.isocat.schemacat.site/site/index.html

Timestamp:

01/09/14 16:02:25 (10 years ago)

Author:

andmor

Message:

Branch for migration to Bootstrap 3

Location:

cats/SCHEMAcat/branches/urn.org.isocat.schemacat.site

Files:

• . (copied) (copied from cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site)
• site/index.html (modified) (6 diffs)

cats/SCHEMAcat/branches/urn.org.isocat.schemacat.site/site/index.html

@@ -11 +11 @@
 
         <!-- Le styles -->
-        <link href="./lib/bootstrap-2.3.2/css/bootstrap.min.css" rel="stylesheet" />
-        <link href="./lib/bootstrap-2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet" />
+        <link href="./lib/bootstrap-3.0.3/css/bootstrap.css" rel="stylesheet" />
+       <!-- <link href="./lib/bootstrap-2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet" />-->
         <link href="./lib/animate_css/animate.min.css" rel="stylesheet" />
-        <link href="./styles/SCHEMAcat.min.css" rel="stylesheet" />
+        <link href="./styles/SCHEMAcat.css" rel="stylesheet" />
         <link href="./lib/pretify/prettify-bootstrap-light.css" type="text/css" rel="stylesheet" />
 
@@ -22 +22 @@
             <div data-ng-controller="TopMenuCtrl">
                 <div class="navbar navbar-inverse navbar-fixed-top">
-                    <div class="navbar-inner">
-                        <div class="container-fluid">
-                            <button type="button" class="btn btn-navbar" data-ng-click="toggleTopMenu()">
-                                <span class="icon-bar"></span>
-                                <span class="icon-bar"></span>
-                                <span class="icon-bar"></span>
-                            </button>
-                            <a class="brand" href="/schemacat/site/">SCHEMAcat</a>
-                            <div class="nav-collapse" data-collapse="topMenuCollapsed">
-                                <ul class="nav">
-                                    <li class="divider-vertical"></li>
+                    <div>
+                        <div>
+                            <div class="navbar-header">
+                                <button type="button" class="btn btn-default navbar-toggle" data-ng-click="toggleTopMenu()">
+                                    <span class="icon-bar"></span>
+                                    <span class="icon-bar"></span>
+                                    <span class="icon-bar"></span>
+                                </button>
+                                <a class="navbar-brand" href="/schemacat/site/">SCHEMAcat</a>
+                            </div>
+                            <div class="collapse navbar-collapse" data-collapse="topMenuCollapsed">
+                                <ul class="nav navbar-nav">
+                                    <li class="divider"></li>
                                     <li data-ng-class="{ active: isActive('/workspace')}">
-                                        <a href="#/workspace/page/1/?schemaIndex=0&amp;{{animationsUrlPart()}}&amp;{{topMenuExpandedUrlPart()}}"><i class="icon-home icon-white"><!--i--></i> Home</a>
+                                        <a href="#/workspace/page/1/?schemaIndex=0&amp;{{animationsUrlPart()}}&amp;{{topMenuExpandedUrlPart()}}"><i class="glyphicon glyphicon-home glyphicon-white"><!--i--></i> Home</a>
                                     </li>
                                     <li data-ng-class="{ active: isActive('/about')}">
@@ -44 +46 @@
                                 </ul>
                                 <div class="pull-right">
-                                    <ul class="nav pull-right">
+                                    <ul class="nav navbar-nav">
                                         <li class="dropdown" title="userMenu">
-                                            <a class="cursor-pointer dropdown-toggle"><i class="icon-user icon-white"><!--i--></i> <span data-ng-bind="displayName"/> <span class="caret"></span> </a>
+                                            <a class="cursor-pointer dropdown-toggle"><i class="glyphicon glyphicon-user"><!--i--></i> <span data-ng-bind="displayName"/> <span class="caret"></span> </a>
                                                 <ul class="dropdown-menu">
                                                     <li>
-                                                        <!--<a class="cursor-pointer" data-ng-click="loginClick()">-->
-                                                        <a href="{{shibURL}}"><!-- uncomment first one for development -->
+                                                        <a class="cursor-pointer" data-ng-click="loginClick()">
+                                                        <!-- <a href="{{shibURL}}"> --><!-- uncomment first one for development -->
                                                             <span>Login as a different user...</span>
                                                         </a>
@@ -62 +64 @@
                                         </li>
                                         <li class="dropdown" title="settings">
-                                            <a class="cursor-pointer dropdown-toggle"><i class="icon-wrench icon-white"><!--i--></i> <span class="caret"></span> </a>
+                                            <a class="cursor-pointer dropdown-toggle"><i class="glyphicon glyphicon-wrench"><!--i--></i> <span class="caret"></span> </a>
                                             <ul class="dropdown-menu">
                                                 <li>
                                                     <a class="cursor-pointer" data-ng-click="updateAnimationStatus()" >
-                                                        <i class="icon icon-ok" data-ng-if="animationsChecked"><!--i--></i>
+                                                        <i class="glyphicon glyphicon-ok" data-ng-if="animationsChecked"><!--i--></i>
                                                         <span>animations</span>
                                                     </a>
@@ -86 +88 @@
         </div>
         <div id="footer">
-            <div class="container-fluid">
+            <div style="padding:0 15px;">
                 <p>&#169; The Language Archive 2013</p>
             </div>
@@ -95 +97 @@
         <!-- Placed at the end of the document so the pages load faster -->
         <!--<script src="./lib/jQuery/1.10.2/jquery-1.10.2.min.js"></script>-->
-        <script src="./lib/AngularJS-1.2.5/angular.min.js"></script>
-        <script src="./lib/AngularJS-1.2.5/angular-resource.min.js"></script>
-        <script src="./lib/AngularJS-1.2.5/angular-route.min.js"></script>
-        <script src="./lib/UI-bootstrap/ui-bootstrap-tpls-0.7.0.min.js"></script>
+        <script src="./lib/AngularJS-1.2.7/angular.min.js"></script>
+        <script src="./lib/AngularJS-1.2.7/angular-resource.min.js"></script>
+        <script src="./lib/AngularJS-1.2.7/angular-route.min.js"></script>
+        <script src="./lib/UI-bootstrap/ui-bootstrap-tpls-0.9.0.min.js"></script>
         <script src="./lib/pretify/prettify.js"></script>
         <script src="./scripts/modules.min.js"></script>