Merge branch 'master' into release_prepare

igemsoftware · Oct 22, 2014 · bbf7013 · bbf7013
2 parents 3c0fe9e + f2a0fe0
commit bbf7013
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,8 @@ the prebuilt package of FLAME on the [releases page](https://github.com/igemsoft
 
 ### Manually build & install
 
-If you prefer the hacker-way, you can build FLAME manually.
+If you prefer the hacker-way, you can build FLAME manually. You can build FLAME on Linux, MacOS and Windows
+with a proper build toolchain.
 
 1. Build dependencies
 (the development packages of them are required. E.g. `boost-devel`, `libev-devel` and `python-devel` on openSUSE)

diff --git a/server/static/css/simulation.css b/server/static/css/simulation.css
@@ -266,10 +266,21 @@ body {
     margin: 0;
 }
 
+.adjust_button {
+  width: 15%;
+  margin: 3px 0 3px 0;
+  padding: 0;
+  outline: none;
+  background-color: transparent;
+  border: none;
+}
+
 .left.arrow.icon, .right.arrow.icon {
     display: block;
-    width: 15%;
-    margin: 3px 0 3px 0;
+    width: 100%;
+    color: white;
+    margin: 0;
+    font-size: 16px;
 }
 
 .left.arrow.icon:hover, .right.arrow.icon:hover {

diff --git a/server/static/js/shape.js b/server/static/js/shape.js
@@ -51,10 +51,10 @@ $(document).ready(function() {
     });
 
     $("#change").find("[name='device']").click(function() {
-        $("#slider").show();
         $(this).parent().children().removeClass("active");
         $(this).addClass("active");
         $(".shape").shape('set next side', '.device.side').shape('flip right');
+        $("#slider").show();
     });
     $("#change").find("[name='parts']").click(function() {
         $("#slider").hide();
@@ -63,13 +63,14 @@ $(document).ready(function() {
         $(".shape").shape('set next side', '.parts.side').shape('flip right');
     });
     $("#change").find("[name='vector']").click(function() {
-        $("#slider").show();
         $(this).parent().children().removeClass("active");
         $(this).addClass("active");
         $(".shape").shape('set next side', '.vector.side').shape('flip right');
+        $("#slider").show();
     });
     $("#change").find("[name='dna']").click(function() {
         $("#slider").hide();
+        $("#information").hide();
         $(this).parent().children().removeClass("active");
         $(this).addClass("active");
         $(".shape").shape('set next side', '.dna.side').shape('flip right');

diff --git a/server/static/js/simulation-ctrl.js b/server/static/js/simulation-ctrl.js
@@ -243,11 +243,11 @@ function SetCircuits () {
       '<tr class="adjust_line">' +
         '<td class="main_parts"><div class="mid_line"></div></td>' +
         '<td class="adjust_part">' +
-          '<i class="left arrow icon"></i>' +
+          '<button class="adjust_button"><i class="left arrow icon"></i></button>' +
           '<input name="RIPS" class="adjust_input" type="range" min="0" max="53" step="1" value="' +
             recordAdjustValues[curCircuit]['circuitRBS'][curLogic][m] + '"/>' +
-            '<output for="RIPS"></output>' +
-          '<i class="right arrow icon"></i>' +
+          '<output for="RIPS"></output>' +
+          '<button class="adjust_button"><i class="right arrow icon"></i><buttpn>' +
         '</td>' +
       '</tr>'
     );
@@ -345,13 +345,13 @@ $(AdjustRBS = function() {
 $(SelectRBS = function() {
   ShowOutput();
   $('.left.arrow.icon').unbind('click').bind('click', function() {
-    var input = $(this).parent().find('input[type=range]');
+    var input = $(this).parent().parent().find('input[type=range]');
     if (input.val() > 0) {
       input.val(parseInt(input.val()) -1).change().mouseup();
     }
   });
   $('.right.arrow.icon').unbind('click').bind('click', function() {
-    var input = $(this).parent().find('input[type=range]');
+    var input = $(this).parent().parent().find('input[type=range]');
     if (input.val() < 53) {
       input.val(parseInt(input.val()) +1).change().mouseup();
     }

diff --git a/server/templates/experiment.html b/server/templates/experiment.html
@@ -37,7 +37,7 @@
         to 20 μL with dH2O.Salt conditions for double digestion. Useful enzyme combinations for digesting 
         BioBrick parts with their optimal buffer and what the digestion produces. All five reactions are 
         optimal at 37°C<br /><br /></p>
-        <table id="mytable" class="table table-bordered table-hover" style="" align="center">
+        <table id="mytable" class="ui table table-bordered table-hover" style="" align="center">
             <caption><b>Table 1</b></caption>
             <tr>
                 <th colspan="2"><b>Restriction enzymes</b></th>