Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --combined portal/static/css/smartfire.css
index 9f9a03a,e6d06d7..4627124
--- 1/portal/static/css/smartfire.css
--- 2/portal/static/css/smartfire.css
+++ b/portal/static/css/smartfire.css
@@@ -13,7 -13,7 +13,7 @@@ body 
  a, a:active, a:focus {
      outline: 0;
      text-decoration:none;
 -    color:#760073;
 +    color:#FF4400;
  }
  a:hover {
      color:#0D0049;
@@@ -82,6 -82,10 +82,10 @@@ span.version 
      font-size:8pt;
      color:#888888;
  }
+ input[type=checkbox] {
+   min-width:5px !important;
+   margin-left:0 !important;
+ }
  input[type=text], input[type=password], input[type=email], input[type=tel], input[type=number], select, option {
      min-width:260px;
      padding:6px;
@@@ -174,14 -178,14 +178,14 @@@ button.btn-danger:active 
  }
  button.btn-onelab, input.btn-onelab {
      border:0;
 -    border-bottom:3px solid #760073;
 -    background-color:#302562;
 +    border-bottom:3px solid #FFA315;
 +    background-color:#FFA315;
      color:white;
  }
  button.btn-onelab:hover, input.btn-onelab:hover {
      border:0;
 -    border-bottom:3px solid #760073;
 -    background-color:#302562;
 +    border-bottom:3px solid #FF7E00;
 +    background-color:#FF7E00;
      color:white;
  }
  button.btn-onelab:active, input.btn-onelab:active {
@@@ -378,43 -382,53 +382,53 @@@ div.container-resource, div.container-s
  div#slice-view {
      margin:0;
  }
- div.list-group-item {
-     border:0;
-     -moz-border-radius: 0;
-     border-radius: 0;
-     background-color:white;
-     font-weight:bold;
-     padding-left:0;
+ 
+ /* FACILITY/TESTBED filters */
+ div.sl-filter-facilities {
+     padding:0 5px;
  }
- a.list-group-item {
-     -moz-border-radius: 0;
-     border-radius: 0;
-     border:0;
-     background-color:white;
-     padding:3px 2px 3px 10px;
-     border-left:2pt white solid;
+ div.sl-filter-facilities h4 {
+     margin-bottom:15px;
+     
+ }
+ img.sl-image {
+     margin:0 5px 5px 0;
+     padding:0;
+     vertical-align:middle;
+ }
+ a.sl-facility {
+     color:gray;
+     text-decoration:none;
+ }
+ a.sl-facility:hover {
+     color:#342961;
  }
- a.list-group-item.active, a.list-group-item.active:hover, a.list-group-item.active:focus {
-     -moz-border-radius: 0;
-     border-radius: 0;
-     font-weight: bold;
+ a.sl-facility.active {
      color:black;
-     background-color:#F5F5F5;
-     border-left:2pt blue solid;
+     text-decoration:none;
  }
- 
- a.list-group-item:hover {
-     -moz-border-radius: 0;
-     border-radius: 0;
-     border-left:2pt blue solid;
- }
- a.list-group-item p.list-group-item-text {
-     -moz-border-radius: 0;
-     border-radius: 0;
-     font-size:9pt;
-     font-style:italic;
-     font-weight: normal;
-     color: black !important;
+ a.sl-facility::before {
+     content: " ";
+ }
+ div.sl-facilities {
+     border-bottom:#CCCCCC 1px solid;
+     padding-bottom:15px;
+     margin-bottom:15px;
+ }
+ div.sl-facilities:last-child {
+     border:0;
+ }
+ a.sl-testbed {
+     color:gray;
+     text-decoration:none;
+     margin-left:25px;
+     margin-bottom:5px;
+ }
+ a.sl-testbed:hover {
+     color:#342961;
+ }
+ a.sl-testbed.active {
+     color:black;
  }
  
  span.sl-resources {
@@@ -576,7 -590,7 +590,7 @@@ div.navigation li a 
      color:#0C0047;
  }
  div.navigation li a:hover, div.navigation li a.current {
 -    color:#760073;
 +    color:#FF4400;
      text-decoration:none;
  }
  
@@@ -715,7 -729,7 +729,7 @@@ div.home 
      line-height:1.2em;
      letter-spacing:0.3pt;
      min-height:500px;
 -    //background-image: url('../img/bg-experiment.png');
 +    background-image: url('../img/bg-smartfire.png');
      background-repeat:no-repeat;
      background-size:cover;
      background-position:center top;
@@@ -798,6 -812,7 +812,6 @@@ div.registration-form 
  div.slogan {
      text-align:center;
      color:white;
 -    padding-top:60px;
      text-shadow: 1px 1px #013540;
  }