Bootstrap.

Add bootstrap via bower. s/status/statut in FR. change css of alerts (wip) put columns on search
lpanlab · Oct 3, 2014 · 41ceaeb · 41ceaeb
1 parent a43f7ed
commit 41ceaeb
Show file tree

Hide file tree

Showing 121 changed files with 20,634 additions and 383 deletions.
diff --git a/admin.php b/admin.php
@@ -71,7 +71,7 @@
     <ul>
     <li class='tabhandle' id='tab1'><?php echo ADMIN_MENU_TEAM;?></li>
         <li class='tabhandle' id='tab2'><?php echo ADMIN_MENU_USERS;?></li>
-        <li class='tabhandle' id='tab3'><?php echo ADMIN_MENU_STATUS;?></li>
+        <li class='tabhandle' id='tab3'><?php echo STATUS;?></li>
         <li class='tabhandle' id='tab4'><?php echo ADMIN_MENU_ITEMSTYPES;?></li>
         <li class='tabhandle' id='tab5'><?php echo ADMIN_MENU_EXPTPL;?></li>
         <li class='tabhandle' id='tab6'><?php echo ADMIN_MENU_CSV;?></li>

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "elabftw",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "homepage": "http://www.elabftw.net",
   "authors": [
     "Nicolas CARPi <nicolas.carpi@curie.fr>"
@@ -19,14 +19,14 @@
     "node_modules",
     "bower_components",
     "test",
-    "tests"
+    "tests",
+    "js"
   ],
   "dependencies": {
     "jquery": "~2.1.1",
     "jquery-ui": "~1.11.1",
     "colorwheel": "~1.0.0",
     "fancybox": "~2.1.5",
-    "jquery-pageslide": "*",
     "jquery.complexify.js": "*",
     "keymaster": "~1.6.2",
     "tinymce": "~4.1.3",

diff --git a/css/main.css b/css/main.css
@@ -39,6 +39,7 @@ ffc1b7 => light red
 
 
 /* Font is Lato */
+/* TODO put in local */
 @import url(https://fonts.googleapis.com/css?family=Lato);
 
 /* little shadow on top of the screen for no reasons */
@@ -138,13 +139,7 @@ hr {
     color: #dcdddc;
 }
 
-img {
-    border: none;
-    position: relative;
-    top: 3px;
-}
-
-/* COLUMNS */
+/* COLUMNS
 .three-columns {
     width: 60%;
 }
@@ -157,6 +152,7 @@ img {
 .column-left{ float: left; width: 20%; }
 .column-right{ float: right; width: 20%; }
 .column-center{ display: inline-block; width: 20%; }
+*/
 
 /* TITLES */
 h2 {
@@ -244,6 +240,7 @@ form#big_search input {
     border: none;
     border-radius: 20px;
     width:40%;
+    height:2em;
     padding: 10px 30px 10px 10px;
     margin: 13px 10px 0 0;
     transition:width 1s;
@@ -294,21 +291,9 @@ menu.border a:hover {
     -ms-transition-duration: 1500ms;
 }
 
-/* ERROR/INFO message box */
-.messagebox {
-    margin: 10px 0;
-    color: #343434;
-    border: 1px #24AEB9 solid;
-    border-radius: 5px;
-    padding: 0 10px;
-}
-
-.messagebox img:hover {
-    opacity: 0.6;
-}
-
 /* fix the links in the error/info messages */
-.messagebox a {
+/*
+.alert a {
     color: #343434;
     text-decoration:underline;
 }
@@ -321,6 +306,7 @@ menu.border a:hover {
     background-color: #ffc1b7;
     border-color: #dd1e00;
 }
+*/
 
 /* BUTTONS */
 .button {

diff --git a/inc/functions.php b/inc/functions.php
@@ -1022,19 +1022,19 @@ function display_message($type, $message)
 {
     if ($type === 'info') {
 
-        echo "<div class='infobox messagebox'>
-        <p>$message<span style='float:right'><img src='img/cross-blue.png' alt='hide' title='Hide message' /></span></p></div>";
+        echo "<div class='alert alert-success'>
+        <a href='#' class='close' data-dismiss='alert'>&times</a><p>$message</p></div>";
 
     } elseif ($type === 'info_nocross') {
-        echo "<div class='infobox messagebox'><p>$message</p></div>";
+        echo "<div class='alert alert-success'><p>$message</p></div>";
 
     } elseif ($type === 'error') {
 
-        echo "<div class='errorbox messagebox'>
-        <p>$message<span style='float:right'><img src='img/cross-red.png' alt='hide' title='Hide message' /></span></p></div>";
+        echo "<div class='alert alert-danger'>
+        <a href='#' class='close' data-dismiss='alert'>&times</a><p>$message</p></div>";
 
     } elseif ($type === 'error_nocross') {
-        echo "<div class='errorbox messagebox'><p>$message</p></div>";
+        echo "<div class='alert alert-danger'><p>$message</p></div>";
 
     }
 

diff --git a/inc/head.php b/inc/head.php
@@ -30,6 +30,8 @@
 <html>
 <head>
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="author" content="Nicolas CARPi" />
 <link rel="icon" type="image/ico" href="img/favicon.ico" />
 <?php
@@ -74,6 +76,8 @@
 
 echo "<title>".(isset($page_title)?$page_title:"Lab manager")." - eLab ".$ftw."</title>"?>
 <!-- CSS -->
+<!-- Bootstrap -->
+<link rel="stylesheet" media="all" href="js/bootstrap/dist/css/bootstrap.min.css">
 <link rel="stylesheet" media="all" href="css/main.css" />
 <link rel="stylesheet" media="all" href="js/jquery-ui/themes/smoothness/jquery-ui.min.css" />
 <link rel="stylesheet" media="all" href="css/tagcloud.css" />
@@ -90,6 +94,8 @@
 <script src='js/jquery.rating.min.js'></script>
 <!-- common stuff -->
 <script src="js/common.min.js"></script>
+<!-- bootstrap JS -->
+<script src="js/bootstrap/js/alert.js"></script>
 </head>
 
 <body>

diff --git a/js/bootstrap/.bower.json b/js/bootstrap/.bower.json
@@ -0,0 +1,48 @@
+{
+  "name": "bootstrap",
+  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
+  "version": "3.2.0",
+  "keywords": [
+    "css",
+    "js",
+    "less",
+    "mobile-first",
+    "responsive",
+    "front-end",
+    "framework",
+    "web"
+  ],
+  "homepage": "http://getbootstrap.com",
+  "main": [
+    "less/bootstrap.less",
+    "dist/css/bootstrap.css",
+    "dist/js/bootstrap.js",
+    "dist/fonts/glyphicons-halflings-regular.eot",
+    "dist/fonts/glyphicons-halflings-regular.svg",
+    "dist/fonts/glyphicons-halflings-regular.ttf",
+    "dist/fonts/glyphicons-halflings-regular.woff"
+  ],
+  "ignore": [
+    ".*",
+    "_config.yml",
+    "CNAME",
+    "composer.json",
+    "CONTRIBUTING.md",
+    "docs",
+    "js/tests",
+    "test-infra"
+  ],
+  "dependencies": {
+    "jquery": ">= 1.9.0"
+  },
+  "_release": "3.2.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "v3.2.0",
+    "commit": "c068162161154a4b85110ea1e7dd3d7897ce2b72"
+  },
+  "_source": "https://github.com/twbs/bootstrap.git",
+  "_target": "~3.2.0",
+  "_originalSource": "bootstrap",
+  "_direct": true
+}