Merge branch 'master' into fallback-link

Author: Bjwebb

prefix_finder/frontend/templates/list.html

@@ -7,7 +7,7 @@
 
     <div class="main-content single-content">
       <header class="single-content__header">
-        <a href="{{ org_list.url }}" class="button" target="_blank"><i class="material-icons">link</i></a>
+        <a href="{{ org_list.url }}" class="button" target="_blank"><i class="material-icons" title="Visit website for this list">launch</i></a>
         <h1>{{ org_list.name.en }} <span>({{ org_list.code }})</span></h1>
       </header>
 

prefix_finder/frontend/templates/results.html

@@ -56,9 +56,9 @@ <h4>Sectors</h4>
                 </div>
 
                 <footer class="card__controls">
-                  <a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons">link</i></a>
+                  <a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons" title="Visit the website for this list">launch</i></a>
                   <div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
-                  <a href="{% url "list" result.code %}" class="button"><i class="material-icons">zoom_out_map</i></a>
+                  <a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
                 </footer>
               </article>
             </div>
@@ -117,9 +117,9 @@ <h4>Sectors</h4>
                 </div>
 
                 <footer class="card__controls">
-                  <a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons">link</i></a>
+                  <a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons" title="Visit the website for this list">launch</i></a>
                   <div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
-                  <a href="{% url "list" result.code %}" class="button"><i class="material-icons">zoom_out_map</i></a>
+                  <a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
                 </footer>
               </article>
             </div>
@@ -176,9 +176,9 @@ <h4>Sectors</h4>
                 </div>
 
                 <footer class="card__controls">
-                  <a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons">link</i></a>
+                  <a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons" title="Visit the website for this list">launch</i></a>
                   <div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
-                  <a href="{% url "list" result.code %}" class="button"><i class="material-icons">zoom_out_map</i></a>
+                  <a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
                 </footer>
               </article>
             </div>

prefix_finder/frontend/views.py

@@ -562,7 +562,18 @@ def make_xml_codelist(use_branch="master"):
     root = ET.Element("codelist")
     meta = ET.SubElement(root, "metadata")
     ET.SubElement(ET.SubElement(meta, "name"),"narrative").text = "Organization Identifier Lists"
-    ET.SubElement(ET.SubElement(meta, "description"),"narrative").text = "Organization identifier lists and their code. These can be used as the prefix for an organization identifier. For general guidance about constructing Organization Identifiers, please see http://iatistandard.org/organization-identifiers/  This list was formerly maintained by the IATI Secretariat as the Organization Registration Agency codelist. This version is maintained by the Identify-Org project, of which IATI is a member. New code requests should be made via Identify-org.net"
+    ET.SubElement(ET.SubElement(meta, "description"),"narrative").text = """
+        Organization identifier lists and their code. These can be used as the
+        prefix for an organization identifier. For general guidance about
+        constructing Organization Identifiers, please see
+        http://iatistandard.org/202/guidance/how-to-publish/iati-organisation-identifiers/
+        
+        This list was formerly maintained by the IATI Secretariat as the
+        Organization Registration Agency codelist. This version is maintained
+        by the org-id.guide project, of which IATI is a member. New code
+        requests should be made via
+        http://docs.org-id.guide/en/latest/contribute/
+    """
     items = ET.SubElement(root, "codelist-items")
 
     for entry in org_id_dict[use_branch].values():