From e2bfbd11bd28d393b2eee4eafb079d4017595c01 Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Thu, 18 Oct 2018 21:35:59 -0700 Subject: [PATCH 1/3] fixed areas for some dialogs --- client/apollo/js/View/Track/AnnotTrack.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/apollo/js/View/Track/AnnotTrack.js b/client/apollo/js/View/Track/AnnotTrack.js index 17e7bab2a2..2b08d9c3ab 100644 --- a/client/apollo/js/View/Track/AnnotTrack.js +++ b/client/apollo/js/View/Track/AnnotTrack.js @@ -5915,7 +5915,8 @@ define([ var track = this; var content = dojo.create("div", {className: "get_gff3"}); - var textArea = dojo.create("textarea", {className: "gff3_area", readonly: true}, content); + // var content = dojo.create("div", {className: "get_gff3", style:{ width:'1000px',color:'green'}}); + var textArea = dojo.create("textarea", {className: "gff3_area", readonly: true,rows:37,cols:145}, content); var fetchGff3 = function () { var features = '"features": ['; @@ -5966,7 +5967,8 @@ define([ }; fetchGff3(records); - this.openDialog("GFF3", content); + // this.openDialog("GFF3", content); + this.openDialog("GFF3", content,'950px','550px'); }, getSequence: function () { @@ -5978,7 +5980,8 @@ define([ var track = this; var content = dojo.create("div", {className: "get_sequence"}); - var textArea = dojo.create("textarea", {className: "sequence_area", readonly: true}, content); + var textArea = dojo.create("textarea", {className: "sequence_area", readonly: true, + rows:27,cols:145}, content); var form = dojo.create("form", {}, content); var peptideButtonDiv = dojo.create("div", {className: "first_button_div"}, form); var peptideButton = dojo.create("input", { @@ -6129,7 +6132,8 @@ define([ dojo.connect(genomicWithFlankButtonLabel, "onclick", null, callback); fetchSequence("peptide"); - this.openDialog("Sequence", content); + // this.openDialog("Sequence", content); + this.openDialog("Sequence", content,'950px','550px'); }, searchSequence: function () { From aa2bc6bc789b39e0bbf5c5b2d073d9cf90dbbe51 Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Thu, 18 Oct 2018 21:52:19 -0700 Subject: [PATCH 2/3] fixed history and build instructions --- client/apollo/css/get_history.css | 28 ++++++++++++++-------------- client/apollo/css/get_sequence.css | 14 +++++++------- docs/Apollo2Build.md | 5 +++-- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/client/apollo/css/get_history.css b/client/apollo/css/get_history.css index 7edfe6017d..e2cc1a053c 100644 --- a/client/apollo/css/get_history.css +++ b/client/apollo/css/get_history.css @@ -1,68 +1,68 @@ @CHARSET "UTF-8"; -.jbrowse .history_div { +.history_div { font-size: 9px; } -.jbrowse .history_table { +.history_table { font-size: 1.5em; /* max-width: 47em; */ } -.jbrowse .history_header_column { +.history_header_column { font-weight: bold; text-decoration: underline; } -.jbrowse .history_set{ +.history_set{ text-align: left; margin-right: auto; } -.jbrowse .history_column_operation { +.history_column_operation { width: 17em !important; } -.jbrowse .history_column_action{ +.history_column_action{ width: 5em !important; } -.jbrowse .history_column { +.history_column { width: 15em; display: inline-block; background-color: inherit; } -.jbrowse .history_row_selected { +.history_row_selected { background-color: #4169e1; color: white; } -.jbrowse .history_row:hover { +.history_row:hover { background-color: #000099; color: white; } -.jbrowse .history_row_current { +.history_row_current { background-color: #787878; color: white; } -.jbrowse .history_rows { +.history_rows { max-height: 10em; overflow-y: auto; } -.jbrowse .history_column_date { +.history_column_date { max-width: 10em; } -.jbrowse .history_preview { +.history_preview { width: 45em; height: 2em; padding-top: 3em; } -.jbrowse .revert_button.dijitButton .dijitButtonNode { +.revert_button.dijitButton .dijitButtonNode { padding: 0px; margin: 0px; } diff --git a/client/apollo/css/get_sequence.css b/client/apollo/css/get_sequence.css index d6efb6201d..f4597ce030 100644 --- a/client/apollo/css/get_sequence.css +++ b/client/apollo/css/get_sequence.css @@ -1,35 +1,35 @@ @CHARSET "UTF-8"; -.jbrowse .get_sequence { +.get_sequence { font-size:10px; } -.jbrowse .gff3_area{ +.gff3_area{ width: 50em; height: 20em; font-family: 'courier'; font-size: 1.0em; } -.jbrowse .sequence_area { +.sequence_area { width: 60em; height: 20em; font-family: 'courier'; font-size: 1.5em; } -.jbrowse .first_button_div { +.first_button_div { margin-top: 10px; } -.jbrowse .button_div { +.button_div { margin-top: 5px; } -.jbrowse .button_label { +.button_label { margin-left: 3px; } -.jbrowse .button_field { +.button_field { margin-left: 3px; } \ No newline at end of file diff --git a/docs/Apollo2Build.md b/docs/Apollo2Build.md index 3adac246f8..a0f33f0b3d 100644 --- a/docs/Apollo2Build.md +++ b/docs/Apollo2Build.md @@ -81,9 +81,10 @@ Updating the web-service doc can be done with `./apollo create-rest-doc` #### Running the code for the making client plugin changes -After starting the server run `./apollo watchman` which should automatically copy any files that have been modified from the [client directory](../client) to the running instance. +After starting the server you can run `./gradlew installJBrowseWebOnly` to update the client code to update the JS code. + +If for some reason this is not working then make sure that your network development tab, in your browser console, has disabled caching. You can also run the command `./gradlew copy-resources-dev` manually each time instead if the files don't seem to be getting copied. -If for some reason this is not working then make sure that your network development tab, in your browser console, has disabled caching. You can also run the command `gradle copy-resources-dev` manually each time instead if the files don't seem to be getting copied. #### Running the code for GWT changes From dbeb07a05f9c7bc1d0f9aa5d2413e1d778edb2ea Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Thu, 18 Oct 2018 22:00:00 -0700 Subject: [PATCH 3/3] ends up being just a CSS fix --- client/apollo/js/View/Track/AnnotTrack.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/client/apollo/js/View/Track/AnnotTrack.js b/client/apollo/js/View/Track/AnnotTrack.js index 2b08d9c3ab..17e7bab2a2 100644 --- a/client/apollo/js/View/Track/AnnotTrack.js +++ b/client/apollo/js/View/Track/AnnotTrack.js @@ -5915,8 +5915,7 @@ define([ var track = this; var content = dojo.create("div", {className: "get_gff3"}); - // var content = dojo.create("div", {className: "get_gff3", style:{ width:'1000px',color:'green'}}); - var textArea = dojo.create("textarea", {className: "gff3_area", readonly: true,rows:37,cols:145}, content); + var textArea = dojo.create("textarea", {className: "gff3_area", readonly: true}, content); var fetchGff3 = function () { var features = '"features": ['; @@ -5967,8 +5966,7 @@ define([ }; fetchGff3(records); - // this.openDialog("GFF3", content); - this.openDialog("GFF3", content,'950px','550px'); + this.openDialog("GFF3", content); }, getSequence: function () { @@ -5980,8 +5978,7 @@ define([ var track = this; var content = dojo.create("div", {className: "get_sequence"}); - var textArea = dojo.create("textarea", {className: "sequence_area", readonly: true, - rows:27,cols:145}, content); + var textArea = dojo.create("textarea", {className: "sequence_area", readonly: true}, content); var form = dojo.create("form", {}, content); var peptideButtonDiv = dojo.create("div", {className: "first_button_div"}, form); var peptideButton = dojo.create("input", { @@ -6132,8 +6129,7 @@ define([ dojo.connect(genomicWithFlankButtonLabel, "onclick", null, callback); fetchSequence("peptide"); - // this.openDialog("Sequence", content); - this.openDialog("Sequence", content,'950px','550px'); + this.openDialog("Sequence", content); }, searchSequence: function () {