diff --git a/organizations/admin/classes/domain/Organization.php b/organizations/admin/classes/domain/Organization.php index 1d2f6b6c2..87e2918ad 100644 --- a/organizations/admin/classes/domain/Organization.php +++ b/organizations/admin/classes/domain/Organization.php @@ -337,7 +337,7 @@ public function getIssues($archivedOnly=false) { public function getExportableIssues($archivedOnly=false){ $orgDB = $this->db->config->database->name; $resourceDB = $this->db->config->settings->resourcesDatabaseName; - $query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ') + $query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT('=HYPERLINK(\"mailto:',sc.emailAddress,'\",\"',COALESCE(sc.name,sc.emailAddress),'\")') SEPARATOR ', ') FROM `{$resourceDB}`.IssueContact sic LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID WHERE sic.issueID=i.issueID) AS `contacts`, diff --git a/organizations/ajax_forms.php b/organizations/ajax_forms.php index 191e017eb..e795fa3f1 100644 --- a/organizations/ajax_forms.php +++ b/organizations/ajax_forms.php @@ -606,7 +606,12 @@ contactID}\">{$contact->name}"; + $contactname = ($contact->name); + if (!empty($contactname)) { + echo " "; + } else { + echo " "; + } } ?> diff --git a/organizations/ajax_htmldata.php b/organizations/ajax_htmldata.php index 21dee84ee..84e7fab1a 100644 --- a/organizations/ajax_htmldata.php +++ b/organizations/ajax_htmldata.php @@ -48,7 +48,11 @@ function generateIssueHTML($issue,$associatedEntities=null) { if ($contacts) { $html .= ""; } diff --git a/organizations/css/style.css b/organizations/css/style.css index d9678cc73..519eb86e2 100644 --- a/organizations/css/style.css +++ b/organizations/css/style.css @@ -2054,12 +2054,12 @@ table.titleTable { padding-left: 8px; } -/*--- Add space before and after each downtime definition ---*/ +/*--- Add space before and after each issue and downtime definition ---*/ dt:first-child { padding-top: .5em; } -div.downtime { +div.downtime, div.issue { padding-bottom: 1em; } diff --git a/resources/admin/classes/domain/Organization.php b/resources/admin/classes/domain/Organization.php index c62ea134f..e193858d8 100644 --- a/resources/admin/classes/domain/Organization.php +++ b/resources/admin/classes/domain/Organization.php @@ -108,7 +108,7 @@ public function getExportableIssues($archivedOnly=false) { $orgField = 'shortName'; } - $query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ') + $query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT('=HYPERLINK(\"mailto:',sc.emailAddress,'\",\"',COALESCE(sc.name,sc.emailAddress),'\")') SEPARATOR ', ') FROM IssueContact sic LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID WHERE sic.issueID=i.issueID) AS `contacts`, diff --git a/resources/admin/classes/domain/Resource.php b/resources/admin/classes/domain/Resource.php index 1e75f6548..ab78b6e65 100644 --- a/resources/admin/classes/domain/Resource.php +++ b/resources/admin/classes/domain/Resource.php @@ -395,7 +395,7 @@ public function getExportableIssues($archivedOnly=false){ $contactsDB = $this->db->config->database->name; } - $query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ') + $query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT('=HYPERLINK(\"mailto:',sc.emailAddress,'\",\"',COALESCE(sc.name,sc.emailAddress),'\")') SEPARATOR ', ') FROM IssueContact sic LEFT JOIN `{$contactsDB}`.Contact sc ON sc.contactID=sic.contactID WHERE sic.issueID=i.issueID) AS `contacts`, diff --git a/resources/ajax_forms/getNewIssueForm.php b/resources/ajax_forms/getNewIssueForm.php index f9b518622..c739539db 100644 --- a/resources/ajax_forms/getNewIssueForm.php +++ b/resources/ajax_forms/getNewIssueForm.php @@ -42,7 +42,11 @@ {$contact['name']}"; + if (!empty($contact['name'])) { + echo " "; + } else { + echo " "; + } } ?> diff --git a/resources/ajax_htmldata/getIssuesList.php b/resources/ajax_htmldata/getIssuesList.php index d6e1f04c1..6ef8c8093 100644 --- a/resources/ajax_htmldata/getIssuesList.php +++ b/resources/ajax_htmldata/getIssuesList.php @@ -39,7 +39,11 @@ function generateIssueHTML($issue,$associatedEntities=null) { if ($contacts) { $html .= ""; } diff --git a/resources/css/style.css b/resources/css/style.css index fb27e8c95..4d33ac05e 100755 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -3317,12 +3317,12 @@ input#archiveInd { vertical-align: 3px; } -/*--- Add space before and after each downtime definition ---*/ +/*--- Add space before and after each issue and downtime definition ---*/ dt:first-child { padding-top: .5em; } -div.downtime { +div.downtime, div.issue { padding-bottom: 1em; } diff --git a/usage/layouts.ini b/usage/layouts.ini index 997b943b1..fdce3cc62 100755 --- a/usage/layouts.ini +++ b/usage/layouts.ini @@ -233,9 +233,8 @@ columnToCheck[5] = "Proprietary_ID" columnToCheck[6] = "Print_ISSN" columnToCheck[7] = "Online_ISSN" columnToCheck[8] = "URI" -columnToCheck[9] = "YOP" -columnToCheck[10] = "Metric_Type" -columnToCheck[11] = "Reporting_Period_Total" +columnToCheck[9] = "Metric_Type" +columnToCheck[10] = "Reporting_Period_Total" columns[] = title columns[] = publisher columns[] = publisherID @@ -245,7 +244,6 @@ columns[] = pi columns[] = issn columns[] = eissn columns[] = uri -columns[] = yop columns[] = activityType columns[] = ytd @@ -259,10 +257,9 @@ columnToCheck[5] = "Proprietary_ID" columnToCheck[6] = "Print_ISSN" columnToCheck[7] = "Online_ISSN" columnToCheck[8] = "URI" -columnToCheck[9] = "YOP" -columnToCheck[10] = "Access_Type" -columnToCheck[11] = "Metric_Type" -columnToCheck[12] = "Reporting_Period_Total" +columnToCheck[9] = "Access_Type" +columnToCheck[10] = "Metric_Type" +columnToCheck[11] = "Reporting_Period_Total" columns[] = title columns[] = publisher columns[] = publisherID @@ -272,7 +269,6 @@ columns[] = pi columns[] = issn columns[] = eissn columns[] = uri -columns[] = yop columns[] = accessType columns[] = activityType columns[] = ytd @@ -334,12 +330,11 @@ columnToCheck[26] = "Component_Print_ISSN" columnToCheck[27] = "Component_Online_ISSN" columnToCheck[28] = "Component_URI" columnToCheck[29] = "Data_Type" -columnToCheck[30] = "Section_Type" -columnToCheck[31] = "YOP" -columnToCheck[32] = "Access_Type" -columnToCheck[33] = "Access_Method" -columnToCheck[34] = "Metric_Type" -columnToCheck[35] = "Reporting_Period_Total" +columnToCheck[30] = "YOP" +columnToCheck[31] = "Access_Type" +columnToCheck[32] = "Access_Method" +columnToCheck[33] = "Metric_Type" +columnToCheck[34] = "Reporting_Period_Total" columns[] = title columns[] = publisher columns[] = publisherID @@ -370,7 +365,6 @@ columns[] = componentIssn columns[] = componentEissn columns[] = componentUri columns[] = dataType -columns[] = sectionType columns[] = yop columns[] = accessType columns[] = accessMethod @@ -387,21 +381,18 @@ columnToCheck[5] = "Publication_Date" columnToCheck[6] = "Article_Version" columnToCheck[7] = "DOI" columnToCheck[8] = "Proprietary_ID" -columnToCheck[9] = "ISBN" -columnToCheck[10] = "Print_ISSN" -columnToCheck[11] = "Online_ISSN" -columnToCheck[12] = "URI" -columnToCheck[13] = "Parent_Title" -columnToCheck[14] = "Parent_Data_Type" -columnToCheck[15] = "Parent_DOI" -columnToCheck[16] = "Parent_Proprietary_ID" -columnToCheck[17] = "Parent_ISBN" -columnToCheck[18] = "Parent_Print_ISSN" -columnToCheck[19] = "Parent_Online_ISSN" -columnToCheck[20] = "Parent_URI" -columnToCheck[21] = "YOP" -columnToCheck[22] = "Metric_Type" -columnToCheck[23] = "Reporting_Period_Total" +columnToCheck[9] = "Print_ISSN" +columnToCheck[10] = "Online_ISSN" +columnToCheck[11] = "URI" +columnToCheck[12] = "Parent_Title" +columnToCheck[13] = "Parent_DOI" +columnToCheck[14] = "Parent_Proprietary_ID" +columnToCheck[15] = "Parent_Print_ISSN" +columnToCheck[16] = "Parent_Online_ISSN" +columnToCheck[17] = "Parent_URI" +columnToCheck[18] = "Access_Type" +columnToCheck[19] = "Metric_Type" +columnToCheck[20] = "Reporting_Period_Total" columns[] = title columns[] = publisher columns[] = publisherID @@ -411,19 +402,16 @@ columns[] = publicationDate columns[] = articleVersion columns[] = doi columns[] = pi -columns[] = isbn columns[] = issn columns[] = eissn columns[] = uri columns[] = parentTitle -columns[] = parentDataType columns[] = parentDoi columns[] = parentPi -columns[] = parentIsbn columns[] = parentIssn columns[] = parentEissn columns[] = parentUri -columns[] = yop +columns[] = accessType columns[] = activityType columns[] = ytd @@ -435,9 +423,8 @@ columnToCheck[3] = "Platform" columnToCheck[4] = "DOI" columnToCheck[5] = "Proprietary_ID" columnToCheck[6] = "URI" -columnToCheck[7] = "YOP" -columnToCheck[8] = "Metric_Type" -columnToCheck[9] = "Reporting_Period_Total" +columnToCheck[7] = "Metric_Type" +columnToCheck[8] = "Reporting_Period_Total" columns[] = title columns[] = publisher columns[] = publisherID @@ -445,6 +432,5 @@ columns[] = platform columns[] = doi columns[] = pi columns[] = uri -columns[] = yop columns[] = activityType columns[] = ytd