Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pombase/canto
base: d42ed00c75
...
head fork: pombase/canto
compare: ba2533ed3f
  • 6 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
6 lib/PomCur.pm
@@ -72,11 +72,13 @@ __PACKAGE__->setup();
__PACKAGE__->deny_access_unless(
'/',
sub {
- my $c = shift;
+ my ($c, $action) = @_;
+
return $c->user_exists() || $c->config()->{public_mode} ||
- !$access_control_enabled;
+ !$access_control_enabled || $action eq 'front';
},
);
+__PACKAGE__->allow_access('/default');
__PACKAGE__->allow_access('/end');
__PACKAGE__->allow_access('/account');
__PACKAGE__->allow_access('/login');
View
3  lib/PomCur/Controller/Root.pm
@@ -28,6 +28,7 @@ sub default :Path
my $st = $c->stash;
$st->{title} = "Page not found";
+ $st->{show_title} = 0;
$st->{template} = 'not_found_404.mhtml';
$c->response->status(404);
}
@@ -156,7 +157,7 @@ sub _do_local_and_docs
$c->stash()->{error} =
{ title => "No such page",
text => "$page_name doesn't exist" };
- $c->forward($c->config()->{home_path});
+ $c->forward('/default');
$c->detach();
}
}
View
1  pomcur_local.yaml
@@ -22,6 +22,7 @@ instance_organism:
taxonid: 4896
instance_front_mhtml: /docs/pombase_instance_front.mhtml
+instance_index_mhtml: /docs/pombase_index.mhtml
extra_css: /static/css/test_style.css
front_page_title: 'Welcome to Canto the PomBase community curation tool'
View
42 root/docs/canto_introduction.mhtml
@@ -1,42 +0,0 @@
-<!-- PAGE_TITLE: Introduction to Canto -->
-
-<p>
-When you start curating a paper, you will first be asked to supply the
-genes from your publication. You can then annotate your genes with any of
-these data types:
-</p>
-<dl>
-% for my $an_type (@annotation_type_list) {
- <li>
- <h4><% $an_type->{display_name} %></h4>
- <div><% $an_type->{help_text} // '' %></div>
- </li>
-% }
-</dl>
-<p>
-At present, gene names and product descriptions cannot be changed using Canto.
-Existing annotations also cannot be altered or deleted.
-If you have new gene names or updated product descriptions, or if you notice
-any errors in existing annotations, please put them in the comment box that
-you will see when you submit your annotations.
-</p>
-<p>
-Once you have begun curating, the information will be preserved at a stable URL, so
-you do not need to complete the curation in one session. You can use the
-'Contact curators' link at any point if you get stuck, or have any questions.
-</p>
-<p>
-Please note that you should only curate information supported by
-experiments supported in the paper you are curating. If you want to
-capture other information not directly shown in a particular paper,
-please <& /contact.mhtml, link_text => 'contact us directly' &>.
-</p>
-<p>
-If you have a large gene list with only one or two types of data (e.g. a
-phenotype screen), you may want to supply the data as spreadsheet rather than
-via Canto. Please <& /contact.mhtml, link_text => 'contact us directly' &> for format details.
-</p>
-
-<%init>
-my @annotation_type_list = @{$c->config()->{annotation_type_list}};
-</%init>
View
21 root/docs/index.mhtml
@@ -87,24 +87,11 @@ for the curators (this is optional).
</div>
</div>
-<h3>
-Notes
-</h3>
-<ol>
- <li>At present, gene names and product descriptions cannot be changed using
- Canto. Existing annotations also cannot be altered or deleted. If you have
- new gene names or updated product descriptions, or if you notice any errors
- in existing annotations, please put them in a comment when you submit your
- annotations.
- </li>
- <li>
- If you have a large gene list with only one or two types of data (e.g. a
- phenotype screen), you may want to supply the data as spreadsheet rather
- than via Canto. Please <& /contact.mhtml, link_text => 'contact us
- directly' &> for format details.
- </li>
-</ol>
+% if (defined $config->{instance_index_mhtml}) {
+<& $config->{instance_index_mhtml} &>
+% }
<%init>
+my $config = $c->config();
my @annotation_type_list = @{$c->config()->{annotation_type_list}};
</%init>
View
2  root/docs/instance_front.mhtml
@@ -16,7 +16,7 @@ and protein modifications. See the <a href="<% $c->uri_for('/docs/index') %>">he
<div class="span5">
<h3>First time curator?</h3>
<div>
-<a href="<% $c->uri_for('/docs/canto_introduction') %>" class="btn visit">Visit ...</a>
+<a href="<% $c->uri_for('/docs/') %>" class="btn visit">Visit ...</a>
<p>
Find out about community curation and the types of data that can be curating
by viewing our help pages:
View
18 root/docs/pombase_index.mhtml
@@ -0,0 +1,18 @@
+<h3>
+Notes
+</h3>
+<ol>
+ <li>At present, gene names and product descriptions cannot be changed using
+ Canto. Existing annotations also cannot be altered or deleted. If you have
+ new gene names or updated product descriptions, or if you notice any errors
+ in existing annotations, please put them in a comment when you submit your
+ annotations.
+ </li>
+ <li>
+ If you have a large gene list with only one or two types of data (e.g. a
+ phenotype screen), you may want to supply the data as spreadsheet rather
+ than via Canto. Please <& /contact.mhtml, link_text => 'contact us
+ directly' &> for format details.
+ </li>
+</ol>
+
View
2  root/docs/pombase_instance_front.mhtml
@@ -4,8 +4,6 @@
More about community curation
</h3>
<p>
-Once you have found your paper, you can curate GO, phenotypes, interactions
-and protein modifications. See the help pages for more information.
By curating your papers here, you will make your work more visible to the
community. Your data will be available in PomBase and shared with
other public databases. Read more about the motivation, background, and

No commit comments for this range

Something went wrong with that request. Please try again.