summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2016-02-01 10:01:27 +0100
committergebele <gebele@in-silico.ch>2016-02-01 10:01:27 +0100
commiteb266fdab537922a870b7b8b87775c0922356e98 (patch)
tree9f7bd75cabac4106467998b519635217a7639d24 /views
parent111811340b889f0ad964ef8083de7981cf50bb5f (diff)
changed theme for cross browser compatibility (FF, Chrome, IE, Safari). added filter row
Diffstat (limited to 'views')
-rw-r--r--views/layout.haml2
-rw-r--r--views/prediction.haml7
2 files changed, 6 insertions, 3 deletions
diff --git a/views/layout.haml b/views/layout.haml
index edf6e3e..23d251c 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -7,8 +7,10 @@
%title Nano Lazar Toxicity Predictions
%link{:rel=>'icon', :type=>'image/x-icon', :href=>'/images/favicon.ico'}
%link{:rel=>'stylesheet', :href=>"#{'/css/style.css'}"}
+ %link{:rel=>'stylesheet', :href=>"#{'/css/style2.css'}"}
%link{:rel=>'stylesheet', :href=>"#{'/css/bootstrap.min.css'}"}
%link{:rel=>'stylesheet', :href=>"#{'/css/theme.bootstrap.min.css'}"}
+ %link{:rel=>'stylesheet', :href=>"#{'/css/theme.default.min.css'}"}
%script{:src=>"/javascripts/jquery-1.11.2.min.js"}
%script{:src=>"/javascripts/jquery.tablesorter.min.js"}
%script{:src=>"/javascripts/jquery.tablesorter.widgets.js"}
diff --git a/views/prediction.haml b/views/prediction.haml
index 14fc75b..9385fa7 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -11,9 +11,9 @@
$(document).ready(function(){
$(".tablesorter").tablesorter({
debug: false,
- theme: "bootstrap",
+ //theme: "bootstrap",
headerTemplate: '{content} {icon}',
- widgets: ['uitheme', 'staticRow', 'scroller'],
+ widgets: ['filter', 'staticRow', 'scroller'],
widgetOptions: {
scroller_upAfterSort: true,
scroller_jumpToHeader: true,
@@ -75,9 +75,10 @@
- if v == nil
%p 0
- else
- %p= v.round(5)
+ %h5= v.round(5)
- if @prediction[:match]
- @prediction[:match].values[0]["tox"].each do |k,v|
+ %hr
%h5 Measurement
%p= k
%p= v.round(3)