- Timestamp:
- Feb 22, 2011, 3:45:25 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy
r1527 r1548 110 110 def matchvalue = (attrs['fuzzymatching']=="true") ? attrs['matchvalue'] : "" 111 111 def selected = (attrs['selected']) ? attrs['selected'] : "" 112 def fuzzyTreshold = attrs[ 'treshold' ] && attrs[ 'treshold' ].toString().isNumber() ? Float.valueOf( attrs[ 'treshold' ] ) : 0.1; 112 113 113 114 def domainfields = mc.entityclass.giveDomainFields().findAll { it.type == mc.templatefieldtype } … … 125 126 /*(mc.identifier) ? out << createPropertySelect(attrs['name'], prefcolumn, matchvalue, mc.index) : 126 127 out << createPropertySelect(attrs['name'], templatefields, matchvalue, mc.index)*/ 127 out << createPropertySelect(attrs['name'], templatefields, matchvalue, selected, mc.index) 128 129 out << createPropertySelect(attrs['name'], templatefields, matchvalue, selected, mc.index, fuzzyTreshold) 128 130 } 129 131 … … 137 139 * @return HTML select object 138 140 */ 139 def createPropertySelect(String name, options, matchvalue, selected, Integer columnIndex ) {141 def createPropertySelect(String name, options, matchvalue, selected, Integer columnIndex, float fuzzyTreshold = 0.1f) { 140 142 // Determine which field in the options list matches the best with the matchvalue 141 def mostsimilar = (matchvalue) ? ImporterService.mostSimilar(matchvalue, options ) : ""142 143 def mostsimilar = (matchvalue) ? ImporterService.mostSimilar(matchvalue, options, fuzzyTreshold) : "" 144 143 145 def res = "<select style=\"font-size:10px\" id=\"${name}.index.${columnIndex}\" name=\"${name}.index.${columnIndex}\">" 144 146 … … 150 152 // mostsimilar string passed as argument or selected value passed? 151 153 res += (mostsimilar.toString().toLowerCase() == f.name.toLowerCase() || selected.toLowerCase() == f.name.toLowerCase() ) ? 152 " selected >" :154 " selected='selected'>" : 153 155 ">" 154 156 -
trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy
r1545 r1548 186 186 187 187 def _publicationAddButton = { attrs, body -> 188 188 189 if( attrs.get( 'noForm', false ) ) { 190 // Only show the add button. The dialog that is created with this method otherwise, 191 // should be created somewhere outside the form. 192 } else { 193 out << publicationDialog( attrs, body ); 194 } 195 196 out << '<input type="button" onClick="openPublicationDialog(\'' + attrs.name + '\' );" value="Add Publication">'; 197 } 198 199 // Show the add publications dialog 200 def publicationDialog = { attrs, body -> 189 201 // Output the dialog for the publications 190 202 out << '<div id="' + attrs.name + '_dialog">'; … … 195 207 out << ' createPublicationDialog( "' + attrs.name + '" );' 196 208 out << '</script>'; 197 198 out << '<input type="button" onClick="openPublicationDialog(\'' + attrs.name + '\' );" value="Add Publication">'; 199 } 209 } 210 200 211 201 212 def ContactSelectElement = { attrs, body -> … … 421 432 422 433 def _userAddButton = { attrs, body -> 423 434 if( attrs.get( 'noForm', false ) ) { 435 // Only show the add button. The dialog that is created with this method otherwise, 436 // should be created somewhere outside the form. 437 } else { 438 out << userDialog( attrs, body ); 439 } 440 441 out << '<input type="button" onClick="openUserDialog(\'' + attrs.name + '\' );" value="Add User">'; 442 } 443 444 def userDialog = { attrs, body -> 424 445 // Output the dialog for the publications 425 446 out << '<div id="' + attrs.name + '_dialog">'; … … 430 451 out << ' createUserDialog( "' + attrs.name + '" );' 431 452 out << '</script>'; 432 433 out << '<input type="button" onClick="openUserDialog(\'' + attrs.name + '\' );" value="Add User">';434 453 } 435 454 -
trunk/grails-app/views/advancedQuery/assayresults.gsp
r1526 r1548 5 5 <title>Query results</title> 6 6 <link rel="stylesheet" href="<g:resource dir="css" file="advancedQuery.css" />" type="text/css"/> 7 <link rel="stylesheet" href="<g:resource dir="css" file="buttons.css" />" type="text/css"/> 7 8 <g:javascript src="advancedQueryResults.js" /> 8 9 </head> -
trunk/grails-app/views/advancedQuery/index.gsp
r1526 r1548 5 5 <title>Query database</title> 6 6 <link rel="stylesheet" href="<g:resource dir="css" file="advancedQuery.css" />" type="text/css"/> 7 <link rel="stylesheet" href="<g:resource dir="css" file="buttons.css" />" type="text/css"/> 7 8 <g:javascript src="advancedQuery.js" /> 8 9 <script type="text/javascript"> -
trunk/grails-app/views/advancedQuery/list.gsp
r1526 r1548 6 6 <title>Previous queries</title> 7 7 <link rel="stylesheet" href="<g:resource dir="css" file="advancedQuery.css" />" type="text/css"/> 8 <link rel="stylesheet" href="<g:resource dir="css" file="buttons.css" />" type="text/css"/> 8 9 <g:javascript src="advancedQueryResults.js" /> 9 10 <script type="text/javascript"> -
trunk/grails-app/views/advancedQuery/results.gsp
r1526 r1548 5 5 <title>Query results</title> 6 6 <link rel="stylesheet" href="<g:resource dir="css" file="advancedQuery.css" />" type="text/css"/> 7 <link rel="stylesheet" href="<g:resource dir="css" file="buttons.css" />" type="text/css"/> 7 8 <g:javascript src="advancedQueryResults.js" /> 8 9 </head> -
trunk/grails-app/views/advancedQuery/sampleresults.gsp
r1526 r1548 5 5 <title>Query results</title> 6 6 <link rel="stylesheet" href="<g:resource dir="css" file="advancedQuery.css" />" type="text/css"/> 7 <link rel="stylesheet" href="<g:resource dir="css" file="buttons.css" />" type="text/css"/> 7 8 <g:javascript src="advancedQueryResults.js" /> 8 9 </head> -
trunk/grails-app/views/advancedQuery/studyresults.gsp
r1526 r1548 5 5 <title>Query results</title> 6 6 <link rel="stylesheet" href="<g:resource dir="css" file="advancedQuery.css" />" type="text/css"/> 7 <link rel="stylesheet" href="<g:resource dir="css" file="buttons.css" />" type="text/css"/> 7 8 <g:javascript src="advancedQueryResults.js" /> 8 9 </head> -
trunk/web-app/css/advancedQuery.css
r1526 r1548 35 35 -khtml-opacity: 0.3; 36 36 } 37 38 /** Options buttons **/39 .options { margin-top: 8px; }40 .options.multiple { float: left; width: 300px; }41 42 .options a {43 font-size: 10px;44 font-weight: bold;45 margin-right: 10px;46 padding-top: 2px;47 padding-bottom: 2px;48 line-height: 20px;49 padding-left: 28px;50 }51 52 #content .options a.disabled { color: #aaa; cursor: default; }53 54 .options a.performAction {55 background: transparent url(../plugins/famfamfam-1.0.1/images/icons/brick_go.png) 5px 50% no-repeat;56 }57 .options a.excel {58 background-image: url(../plugins/famfamfam-1.0.1/images/icons/page_excel.png);59 }60 .options a.searchIn {61 background: transparent url(../plugins/famfamfam-1.0.1/images/icons/arrow_branch.png) 5px 50% no-repeat;62 }63 .options a.search {64 background: transparent url(../plugins/famfamfam-1.0.1/images/icons/arrow_undo.png) 5px 50% no-repeat;65 }66 .options a.discard {67 background: transparent url(../plugins/famfamfam-1.0.1/images/icons/basket_remove.png) 5px 50% no-repeat;68 }69 .options a.listPrevious {70 background: transparent url(../plugins/famfamfam-1.0.1/images/icons/basket.png) 5px 50% no-repeat;71 }72 .options a.combine {73 background: transparent url(../plugins/famfamfam-1.0.1/images/icons/arrow_join.png) 5px 50% no-repeat;74 } -
trunk/web-app/css/default_style.css
r1494 r1548 75 75 font-size: 1.2em; 76 76 background: url(../images/default_style/topnav/topnav_bg.gif) repeat-x; 77 z-index: 1005; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */77 z-index: 995; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */ 78 78 } 79 79 … … 83 83 padding: 0 15px 0 0; 84 84 position: relative; /*--Declare X and Y axis base--*/ 85 z-index: 1004; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */85 z-index: 994; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */ 86 86 } 87 87 … … 132 132 -webkit-border-bottom-right-radius: 5px; 133 133 border: 1px solid #111; 134 z-index: 1001; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */134 z-index: 991; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */ 135 135 } 136 136 … … 143 143 width: 170px; 144 144 position:relative; 145 z-index: 1000; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */145 z-index: 990; /** Important: keeps submenu's on top of other elements in IE7. See http://www.shawnpreisz.com/css/z-index-internet-explorer-7-ie7#comment-547 */ 146 146 } 147 147 -
trunk/web-app/js/advancedQueryResults.js
r1524 r1548 5 5 6 6 var oTable = paginatedTable.dataTable(); 7 var inputs = $('input ', oTable.fnGetNodes())7 var inputs = $('input[type=checkbox]', oTable.fnGetNodes()) 8 8 9 9 // If any of the inputs is checked, uncheck all. Otherwise, check all … … 31 31 32 32 var oTable = paginatedTable.dataTable(); 33 var inputs = $('input ', oTable.fnGetNodes())33 var inputs = $('input[type=checkbox]', oTable.fnGetNodes()) 34 34 35 35 // Is none checked, are all checked or are some checked … … 43 43 checkAll.attr( 'checked', numChecked > 0 ); 44 44 45 if( numChecked > 0 && numChecked < inputs.length - 1) {45 if( numChecked > 0 && numChecked < inputs.length ) { 46 46 checkAll.addClass( 'transparent' ); 47 47 } else {
Note: See TracChangeset
for help on using the changeset viewer.