Merge pull request #967 from nconrad/features/issues

fix reloading of circular viewer and change genome meta data styling
PATRIC3 · May 6, 2020 · 24c23e6 · 24c23e6
2 parents b342295 + 5d8f9fc
commit 24c23e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/public/js/p3/resources/DataItemFormatter.css b/public/js/p3/resources/DataItemFormatter.css
@@ -43,7 +43,6 @@
 
 .DataItemValue {
     vertical-align: top;
-    word-break: break-all;
 }
 
 .DataItemSectionNotFound {

diff --git a/public/js/p3/widget/templates/TrackController.html b/public/js/p3/widget/templates/TrackController.html
@@ -25,10 +25,10 @@
       <option value="+">forward</option>
       <option value="-">reverse</option>
     </select>
-    <input required type="text" style="width:47%; margin-left:2px;" data-dojo-attach-event="onChange:validateCustomSelection" data-dojo-props="intermediateChanges:true,promptMessage:'Enter keywords. For examples, secretion, membrane, transposon',missingMessage:'Keyword must be provided. For examples, secretion, membrane, transposon OR transposase OR insertion OR mobile',trim:true,placeHolder:'Keyword'" data-dojo-type="dijit/form/ValidationTextBox" id="keyword" name="keyword" data-dojo-attach-point="keyword_box"/>
+    <input required type="text" style="width:47%; margin-left:2px;" data-dojo-attach-event="onChange:validateCustomSelection" data-dojo-props="intermediateChanges:true,promptMessage:'Enter keywords. For examples, secretion, membrane, transposon',missingMessage:'Keyword must be provided. For examples, secretion, membrane, transposon OR transposase OR insertion OR mobile',trim:true,placeHolder:'Keyword'" data-dojo-type="dijit/form/ValidationTextBox" name="keyword" data-dojo-attach-point="keyword_box"/>
     </td></tr>
     <tr><td>
-    <input type="text" style="width:85%; margin-left:2px;" data-dojo-attach-event="onChange:validateCustomSelection" data-dojo-props="intermediateChanges:true,promptMessage:'Enter track name to display. For examples, secretion, transposon. If not specified, the text from the Keyword field will be used as the track name to display',trim:true,placeHolder:'Enter custom track name'" data-dojo-type="dijit/form/ValidationTextBox" id="custom_trackname" name="custom_trackname" data-dojo-attach-point="custom_trackname_box"/>
+    <input type="text" style="width:85%; margin-left:2px;" data-dojo-attach-event="onChange:validateCustomSelection" data-dojo-props="intermediateChanges:true,promptMessage:'Enter track name to display. For examples, secretion, transposon. If not specified, the text from the Keyword field will be used as the track name to display',trim:true,placeHolder:'Enter custom track name'" data-dojo-type="dijit/form/ValidationTextBox" name="custom_trackname" data-dojo-attach-point="custom_trackname_box"/>
     <button style="margin-left:2px" data-dojo-type="dijit/form/Button"  data-dojo-attach-event="onClick:onAddCustomTrack" data-dojo-attach-point="customTrackButton" data-dojo-props="disabled:true">+</button>
 	</td></tr></table>
   </div>
@@ -46,10 +46,10 @@
       <option value="histogram">Histogram</option>
       <option value="heatmap">Heatmap</option>
     </select>
-    <input type="file" style="width:65%; margin-left:2px;" name="data_file" id="data_file" accept="text/plain" data-dojo-attach-event="onChange:validateUserFileSelection" data-dojo-attach-point="data_file_select"/>
+    <input type="file" style="width:65%; margin-left:2px;" name="data_file" accept="text/plain" data-dojo-attach-event="onChange:validateUserFileSelection" data-dojo-attach-point="data_file_select"/>
     </td></tr>
     <tr><td>
-    <input type="text" style="width:85%; margin-left:2px;" data-dojo-attach-event="onChange:validateCustomSelection" data-dojo-props="intermediateChanges:true,promptMessage:'Enter track name to display. For example, toxin genes. If not specified, [User track] will be used as the track name to display',trim:true,placeHolder:'Enter user track name'" data-dojo-type="dijit/form/ValidationTextBox" id="user_trackname" name="user_trackname" data-dojo-attach-point="user_trackname_box"/>
+    <input type="text" style="width:85%; margin-left:2px;" data-dojo-attach-event="onChange:validateCustomSelection" data-dojo-props="intermediateChanges:true,promptMessage:'Enter track name to display. For example, toxin genes. If not specified, [User track] will be used as the track name to display',trim:true,placeHolder:'Enter user track name'" data-dojo-type="dijit/form/ValidationTextBox" name="user_trackname" data-dojo-attach-point="user_trackname_box"/>
     <button style="margin-left:2px" data-dojo-type="dijit/form/Button"  data-dojo-attach-event="onClick:onAddUserFileTrack" data-dojo-attach-point="userFileButton" data-dojo-props="disabled:true">+</button>
     </td></tr></table>
   </div>