From 676dc2e377c017ec1945123165abd7e3358dad93 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 17 Jun 2013 10:41:56 -0500 Subject: [PATCH] no clickable headers for virtual fields, thanks Anthony --- VERSION | 2 +- applications/welcome/static/css/web2py_bootstrap.css | 1 + gluon/sqlhtml.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d9ca523b..d5c98a08 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.5.1-stable+timestamp.2013.06.17.09.15.51 +Version 2.5.1-stable+timestamp.2013.06.17.10.41.11 diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css index 91dfbcde..18165343 100644 --- a/applications/welcome/static/css/web2py_bootstrap.css +++ b/applications/welcome/static/css/web2py_bootstrap.css @@ -90,6 +90,7 @@ div.controls select +.error_wrapper {margin-left:5px;} .ie-lte7 div.error{color:#fff;} /* beautify brand */ +.navbar {margin-bottom:0} .navbar-inverse .brand{color:#c6cecc;} .navbar-inverse .brand b{display:inline-block;margin-top:-1px;} .navbar-inverse .brand b>span{font-size:22px;color:white} diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 42767c47..7fb0cdb7 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2232,7 +2232,7 @@ class SQLFORM(FORM): continue key = str(field) header = headers.get(str(field), field.label or key) - if sortable: + if sortable and not isinstance(field, Field.Virtual): if key == order: key, marker = '~' + order, sorter_icons[0] elif key == order[1:]: