updated about link and created an annotate button

GMOD · Apr 15, 2020 · 47f469f · 47f469f
1 parent 5e2bc0a
commit 47f469f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/client/apollo/js/View/Dialog/Help.js b/client/apollo/js/View/Dialog/Help.js
@@ -48,7 +48,7 @@ return declare( null, {
                 + '<dd><ul>'
                 + '<li><a href="http://genomearchitect.readthedocs.io/en/latest/" target="_blank">Apollo Documentation</a></li>'
                 + '<li><a href="https://github.com/gmod/apollo" target="_blank">Apollo Source</a></li>'
-                + '<li><a href="../about.jsp" target="_blank">About Apollo</a></li>'
+                + '<li><a href="../about" target="_blank">About Apollo</a></li>'
                 + '</ul></dd>'
                 + '</div>'
                 + '<div style="float: right; width:49%; margin-top: 10px;"><a href="http://genomearchitect.org" target="_blank"><img src="plugins/WebApollo/img/ApolloLogo_100x36.png"/></a></div>'

diff --git a/client/apollo/js/main.js b/client/apollo/js/main.js
@@ -719,7 +719,7 @@ return declare( [JBPlugin, HelpMixin],
             id: 'about_apollo',
             label: 'About Apollo',
             onClick: function() {
-              window.open("../about.jsp",'help_window').focus();
+              window.open("../about",'help_window').focus();
             }
         })
       );

diff --git a/grails-app/conf/UrlMappings.groovy b/grails-app/conf/UrlMappings.groovy
@@ -20,10 +20,9 @@ class UrlMappings {
         "/"(redirect: '/annotator/index')
         "500"(view: '/error')
         "/menu"(view: '/menu')
-        "/version.jsp"(controller: 'annotator', view: "version")
         "/${clientToken}/version.jsp"(controller: 'annotator', view: "version")
-        "/about.jsp"(controller: 'annotator', view: "about")
-        "/${clientToken}/about.jsp"(controller: 'annotator', view: "about")
+        "/about"(controller: 'annotator', view: "about")
+        "/${clientToken}/about"(controller: 'annotator', view: "about")
 
         "/track/nclist/${organismString}/${trackName}/${sequence}:${fmin}..${fmax}.json"(controller: "track", action: "nclist")
         "/track/nclist/${organismString}/${trackName}/?loc=${sequence}:${fmin}..${fmax}"(controller: "track", action: "nclist")

diff --git a/grails-app/views/annotator/about.gsp b/grails-app/views/annotator/about.gsp
@@ -19,6 +19,18 @@
         margin-left: 2em;
         font-size: larger;
     }
+        .big-annotator-button{
+            margin-left: 50px;
+            margin-top: 20px;
+            padding: 20px;
+            font-size: 50px;
+            background-color: #396494;
+            border: solid black 5px ;
+            border-radius: 10px;
+            width: 280px;
+            color: white !important;
+            font-weight: bolder;
+        }
 
     </style>
 </head>
@@ -36,6 +48,12 @@
 
 </nav>
 
+<div class="big-annotator-button">
+    <a href="../annotator/" target="_blank" style="color: white;">
+        Annotate
+    </a>
+</div>
+
 <div id="list-track" class="content scaffold-list" role="main">
     <h2>Apollo Genome Annotation Editor</h2>
     <ul>

diff --git a/src/gwt/org/bbop/apollo/gwt/client/LoginDialog.ui.xml b/src/gwt/org/bbop/apollo/gwt/client/LoginDialog.ui.xml
@@ -39,6 +39,10 @@
       <b:Anchor text="Browse public genomes" href="../jbrowse/"/>
     </b:Row>
 
+      <b:Row styleName="{style.spacer}">
+          <b:Anchor text="About Apollo" href="../about/" target="_blank"/>
+      </b:Row>
+
     <b:Row styleName="{style.spacer}">
       <b:Column size="MD_1"><b:html.Div ui:field="errorHtml"/></b:Column>
       <b:Column size="MD_9"><b:html.Paragraph ui:field="errorText"/></b:Column>