Added "Assigned By" field

svn path=/; revision=358

diff --git a/planteome/paw/forms/Annotation.wiki b/planteome/paw/forms/Annotation.wiki
index b9c677db094568828a42ac4c078288fd0b45359d..7d7ac0b8f420e8c8d7f3728259e274da2465d518 100644 (file)
--- a/planteome/paw/forms/Annotation.wiki
+++ b/planteome/paw/forms/Annotation.wiki
@@ -153,6 +153,7 @@ __NOTOC__
             |? has_Aspect
             |? has_Evidence_Code
             |? has_Evidence
+            |? is_Assigned_By
         }}
         | Add ontological associations for this annotation.<br>{{#formlink:form=Ontological_References|link text=Add|link type=button|query string=Ontological_References[Annotation Page]={{PAGENAME}}&super_page={{PAGENAME}} }}
       }}

diff --git a/planteome/paw/forms/Ontological_References.wiki b/planteome/paw/forms/Ontological_References.wiki
index eef09a014c3b2d3b84c3ab0de823964ae95777ec..9ce0479f3a70a9e51663f18e20ae4d922376a0a7 100644 (file)
--- a/planteome/paw/forms/Ontological_References.wiki
+++ b/planteome/paw/forms/Ontological_References.wiki
@@ -24,6 +24,7 @@ __NOTOC__
 <br><br>'''Evidence Code:'''<br>
 {{{field|Evidence Code|list}}}
 <br><br>'''Evidence:''' {{{field|Evidence|}}}
+<br><br>'''Assigned By:''' {{{field|Assigned By|}}}
 {{{end template}}}
 
 === Gene Ontology ===
@@ -32,6 +33,7 @@ __NOTOC__
 <br><br>'''Evidence Code:'''<br>
 {{{field|Evidence Code|list}}}
 <br><br>'''Evidence:''' {{{field|Evidence|}}}
+<br><br>'''Assigned By:''' {{{field|Assigned By|}}}
 {{{end template}}}
 
 === Other Ontologies ===
@@ -43,6 +45,7 @@ __NOTOC__
 <br><br>'''Evidence Code:'''<br>
 {{{field|Evidence Code|list}}}
 <br><br>'''Evidence:''' {{{field|Evidence|}}}
+<br><br>'''Assigned By:''' {{{field|Assigned By|}}}
 {{{end template}}}
 
 {{{standard input|summary}}}

diff --git a/planteome/paw/templates/Annotation.wiki b/planteome/paw/templates/Annotation.wiki
index f6d4f548c067311724d10c8d9d68f927fb8a0e6b..34a74f8fd05be74c720ba7ee1c203f949f520021 100644 (file)
--- a/planteome/paw/templates/Annotation.wiki
+++ b/planteome/paw/templates/Annotation.wiki
@@ -100,6 +100,7 @@ Edit the page to see the template text.
         |? has_Aspect
         |? has_Evidence_Code
         |? has_Evidence
+        |? is_Assigned_By
     }}
     | There are no ontological associations available for this gene annotation.
 }}
@@ -118,8 +119,8 @@ Edit the page to see the template text.
 
 = Literature =
 
-{{#if: {{#ask:[[Category:Publications]][[Is Associated With Annotations::~*{{PAGENAME}}* ]] OR [[Category:Reference Publications]][[Is Associated With Annotations::~*{{PAGENAME}}* ]] }}
-    | {{#ask:[[Category:Publications]][[Is Associated With Annotations::~*{{PAGENAME}}* ]] OR [[Category:Reference Publications]][[Is Associated With Annotations::~*{{PAGENAME}}* ]]
+{{#if: {{#ask:[[Category:Publications]][[Is Associated With Annotations::{{PAGENAME}} ]] OR [[Category:Reference Publications]][[Is Associated With Annotations::{{PAGENAME}} ]] }}
+    | {{#ask:[[Category:Publications]][[Is Associated With Annotations::{{PAGENAME}} ]] OR [[Category:Reference Publications]][[Is Associated With Annotations::{{PAGENAME}} ]]
         |? has First Author
         |? has Publication Title
         |? has Journal Name

diff --git a/planteome/paw/templates/Gene_Ontology_Reference_Repeater.wiki b/planteome/paw/templates/Gene_Ontology_Reference_Repeater.wiki
index 019da7aa3be385c27cb0b656e97880a1efb99250..f657db6857efb61f137c651167d31f84abb26a9a 100644 (file)
--- a/planteome/paw/templates/Gene_Ontology_Reference_Repeater.wiki
+++ b/planteome/paw/templates/Gene_Ontology_Reference_Repeater.wiki
@@ -8,6 +8,7 @@ It should be called in the following format:
 |Aspect=
 |Evidence Code=
 |Evidence=
+|Assigned By=
 }}
 </pre>
 Edit the page to see the template text.
@@ -23,6 +24,7 @@ Edit the page to see the template text.
 |has_Aspect={{#external_value:term_aspect}}
 |has_Evidence_Code#list={{{Evidence Code|}}}
 |has_Evidence#list={{{Evidence|}}}
+|is_Assigned_By={{{Assigned By|}}}
 }}
 {| class="wikitable"
 ! Ontology
@@ -51,6 +53,9 @@ Edit the page to see the template text.
 |-
 ! Evidence
 | {{#arraymap:{{{Evidence|}}}|,|x|[[Has Evidence::x]]}}
+|-
+! Assigned By
+| [[Is Assigned By::{{{Assigned By|}}}]]
 |}
 </includeonly>
 

diff --git a/planteome/paw/templates/Ontological_Reference_Repeater.wiki b/planteome/paw/templates/Ontological_Reference_Repeater.wiki
index 44672e91313ec6c14b0796e57570488d0f3fc6d4..508742df248f48698a3728e5f217cf6422491719 100644 (file)
--- a/planteome/paw/templates/Ontological_Reference_Repeater.wiki
+++ b/planteome/paw/templates/Ontological_Reference_Repeater.wiki
@@ -9,6 +9,7 @@ It should be called in the following format:
 |Aspect=
 |Evidence Code=
 |Evidence=
+|Assigned By=
 }}
 </pre>
 Edit the page to see the template text.
@@ -19,6 +20,7 @@ Edit the page to see the template text.
 |has_Aspect={{{Aspect|}}}
 |has_Evidence_Code#list={{{Evidence Code|}}}
 |has_Evidence#list={{{Evidence|}}}
+|is_Assigned_By={{{Assigned By|}}}
 }}
 {| class="wikitable"
 ! Ontology
@@ -38,6 +40,9 @@ Edit the page to see the template text.
 |-
 ! Evidence
 | {{#arraymap:{{{Evidence|}}}|,|x|[[Has Evidence::x]]}}
+|-
+! Assigned By
+| [[Is Assigned By::{{{Assigned By|}}}]]
 |}
 </includeonly>
 

diff --git a/planteome/paw/templates/Plant_Ontology_Reference_Repeater.wiki b/planteome/paw/templates/Plant_Ontology_Reference_Repeater.wiki
index ecfda58616e72db24635b7967bd6962171fc320c..e475be467bce65e16489c392f42a64ab8af053fb 100644 (file)
--- a/planteome/paw/templates/Plant_Ontology_Reference_Repeater.wiki
+++ b/planteome/paw/templates/Plant_Ontology_Reference_Repeater.wiki
@@ -8,6 +8,7 @@ It should be called in the following format:
 |Aspect=
 |Evidence Code=
 |Evidence=
+|Assigned By=
 }}
 </pre>
 Edit the page to see the template text.
@@ -23,6 +24,7 @@ Edit the page to see the template text.
 |has_Aspect={{#external_value:term_aspect}}
 |has_Evidence_Code#list={{{Evidence Code|}}}
 |has_Evidence#list={{{Evidence|}}}
+|is_Assigned_By={{{Assigned By|}}}
 }}
 [[Has Term Search Type::{{{Term Search Type|}}}]]
 {| class="wikitable"
@@ -52,6 +54,9 @@ Edit the page to see the template text.
 |-
 ! Evidence
 | {{#arraymap:{{{Evidence|}}}|,|x|[[Has Evidence::x]]}}
+|-
+! Assigned By
+| [[Is Assigned By::{{{Assigned By|}}}]]
 |}
 </includeonly>