Skip to content

Commit

Permalink
update publisher to organisation
Browse files Browse the repository at this point in the history
  • Loading branch information
notshi committed Apr 5, 2024
1 parent d9d1bc1 commit f90dcdc
Show file tree
Hide file tree
Showing 22 changed files with 167 additions and 162 deletions.
Binary file modified ctrack/art/dash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ctrack/art/discover.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions ctrack/changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Development Portal (2024-04-04 shi)
==============================
Update all 'publisher/s' to 'organisation/s'


Development Portal (2024-04-04 shi)
==============================
Update css for REF baseline alignment in SAVi
Expand Down
110 changes: 55 additions & 55 deletions ctrack/text/eng.txt

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ctrack/text/general.html
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@

#search_display_publisher trim=ends
<div class="search_query">
<div class="publisher">{search_text}</div><span><img src="{flava}search_publisher.png" alt="Publisher icon" width="13" height="13"/>{search_publisher_txt}</span>
<div class="publisher">{search_text}</div><span><img src="{flava}search_publisher.png" alt="Organisation icon" width="13" height="13"/>{search_publisher_txt}</span>
</div>

#search_display_sector_group trim=ends
Expand Down Expand Up @@ -691,15 +691,15 @@
</tr>
<tr>
<td>{search_participating_txt}</td>
<td>Organisations from <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a> - not an extensive list and includes only the existing list of IATI publishers.</td>
<td>Organisations from <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a> - not an extensive list and includes only the existing list of IATI Reporting Organisations.</td>
</tr>
<tr>
<td>{search_policy_txt}</td>
<td>Uses both <a href="http://reference.iatistandard.org/203/codelists/PolicyMarker/#codes" target="blank" rel="noopener noreferrer">IATI code</a> for the vocabulary to be used to define a policy or theme addressed by the activity and <a href="http://reference.iatistandard.org/203/codelists/PolicySignificance/">OECD DAC CRS code</a> indicating the significance of the policy marker for this activity.</td>
</tr>
<tr>
<td>{search_publisher_txt}</td>
<td>Publishers are from the <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a>. This <a href="http://reference.iatistandard.org/203/activity-standard/iati-activities/iati-activity/reporting-org/" target="blank" rel="noopener noreferrer">IATI element</a> is a list of reporting organisations issuing the report.</td>
<td>Organisations are from the <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a>. This <a href="http://reference.iatistandard.org/203/activity-standard/iati-activities/iati-activity/reporting-org/" target="blank" rel="noopener noreferrer">IATI element</a> is a list of reporting organisations issuing the report.</td>
</tr>
<tr>
<td>{search_recipient_txt}</td>
Expand Down
2 changes: 1 addition & 1 deletion ctrack/text/spa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ Herramientas & amp; actualizaciones
Últimos mensajes de noticias

#footer14_text
Dash - Estadísticas Publishers
Dash - Estadísticas Organizaciones

#footer15_text
Generator - Reproductores de su sitio web
Expand Down
18 changes: 9 additions & 9 deletions ctrack/text/view_dash.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
#dash_list_reporting_datas
#dash_list_reporting_data
<tr>
<td title="View Publisher on d-portal" class="ref"><a href="{mark_no_publisher}&publisher={reporting_ref}" target="_blank">{reporting}</a></td>
<td title="View Publisher dash profile" class="ref"><a href="#view=dash_quality&publisher={reporting_ref}">{reporting_ref}</a></td>
<td title="View Organisation on d-portal" class="ref"><a href="{mark_no_publisher}&publisher={reporting_ref}" target="_blank">{reporting}</a></td>
<td title="View Organisation dash profile" class="ref"><a href="#view=dash_quality&publisher={reporting_ref}">{reporting_ref}</a></td>
<td title="View Activities on dash"><a class="log_links" href="#view=dash_slugs&publisher={reporting_ref}">{count}</td>
</tr>

#dash_body
<div class="default">
<div class="left_block">
<div class="title_pub">Publishers statistics for d-portal.org</div>
<div class="title_pub">Organisation statistics for d-portal.org</div>
<table class="pub">
<tr>
<th>Publisher Name</th>
<th>Publisher ID</th>
<th>Org Name</th>
<th>Org ID</th>
<th>Activities</th>
</tr>
{dash_list_reporting_datas}
Expand All @@ -54,7 +54,7 @@
<div class="snap_wrap">
<table class="snap">
<tr>
<td class="snap_title">Total Publishers</td>
<td class="snap_title">Total Organisations</td>
<td class="snap_num">{dash_total_publishers}</td>
</tr>
<tr>
Expand All @@ -76,9 +76,9 @@
</table>
</div>
<div class="title_info">Info</div>
<div class="subtitle_info">Dash is an overview of the data populating d-portal.org with a focus primarily on publisher statistics and the quality of the data reported by them. By showing you when and where invalid data is reported, Dash will be able to explain the gaps that are reflected on the main site.
<p>Click on a <b class="pub_name">Publisher Name</b> to view their profile in d-portal.org</p>
<p>Click on a <b class="pub_id">Publisher ID</b> to view their statistics in Dash.</p>
<div class="subtitle_info">Dash is an overview of the data populating d-portal.org with a focus primarily on reporting organisation statistics and the quality of the data reported by them. By showing you when and where invalid data is reported, Dash will be able to explain the gaps that are reflected on the main site.
<p>Click on a <b class="pub_name">Org Name</b> to view their profile in d-portal.org</p>
<p>Click on a <b class="pub_id">Org ID</b> to view their statistics in Dash.</p>
<p>Click on the <b class="pub_logs">Number of Activities</b> to inspect the dataset.</p>
<p><i>Only activities with unique IDs are imported. Dash does not import duplicates.</i></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ctrack/text/view_dash_cronlog.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="title">Updates everyday GMT +0.</div>
<div class="title_snap">Last updated on {dash_last_updated}</div>
<div class="cron">{dash_cronlog}</div>
<a href="#view=dash" class="back_link dash">Back to publisher list</a>
<a href="#view=dash" class="back_link dash">Back to organisation list</a>
</div>
</div>

Expand Down
12 changes: 6 additions & 6 deletions ctrack/text/view_dash_quality.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
<div class="maxwrap">
<table class="name">
<tr>
<td>Publisher Name <span>Converted from ID</span></td>
<td>Org Name <span>Converted from ID</span></td>
<td>{dash_quality_pub_name}</td>
<td rowspan="2" class="visit">
<a href="/ctrack.html?&publisher={dash_quality_pub}#view=publisher" target="_blank" rel="noopener noreferrer">View on d-portal</a>
<a href="https://www.iatiregistry.org/publisher/{dash_quality_pub_slug}" target="_blank" rel="noopener noreferrer">View on IATI Registry</a>
</td>
</tr>
<tr>
<td>Publisher ID</td>
<td>Org ID</td>
<td>{dash_quality_pub}</td>
</tr>
</table>
Expand All @@ -46,12 +46,12 @@
<td class="act_total">
<div>{dash_quality_act_count}</div>
<div>Unique Activities</div>
<div>Total number of activities reported by this publisher</div>
<div>Total number of activities reported by this organisation</div>
</td>
<td class="act_country">
<div>{dash_quality_country_count}</div>
<div>Countries</div>
<div>Total number of recipient countries reported by this publisher</div>
<div>Total number of recipient countries reported by this organisation</div>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -92,7 +92,7 @@
<td class="act_dataset">
<div>{dash_quality_dataset_count}</div>
<div>IATI Datasets</div>
<div>Total number of datasets reported by this publisher</div>
<div>Total number of datasets reported by this organisation</div>
</td>
<td class="act_invalid">
<div>{dash_quality_country_total_invalid}</div>
Expand Down Expand Up @@ -156,7 +156,7 @@
</td>
</tr>
</table>
<a href="#view=dash" class="back_link dash">Back to publisher list</a>
<a href="#view=dash" class="back_link dash">Back to organisation list</a>
</div>
</div>

Expand Down
20 changes: 10 additions & 10 deletions ctrack/text/view_generator.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#generator_crs_error
<div class="reminder_wrap top">
Please select <b>ONE</b> recipient and <b>NO</b> publisher to generate content here <p>- or choose a different View.</p>
Please select <b>ONE</b> recipient and <b>NO</b> organisation to generate content here <p>- or choose a different View.</p>
</div>
#generator
<div id="generator" class="generator">
Expand All @@ -19,7 +19,7 @@
<div class="instruct_side">1</div><div class="instruct_more">
<div class="instruct_rel">
<span class="drop_arrow"></span>
<span class="opt">PUBLISHER</span>
<span class="opt">ORG</span>
<select multiple id="generator_publisher" class="chosen">
<option value></option>
{generator_options_publisher}
Expand Down Expand Up @@ -80,22 +80,22 @@
<a href="" class="view" onclick="$('#generator_view').val('publisher_countries').trigger('chosen:updated').trigger('change');return false;" >
<img src="ctrack/art/generator/countriesall.png" width="260"/>
<span class="imgtxt">Recipients (table)</span>
<span class="overtxt">Publisher data</span>
<span class="overtxt">Organisation data</span>
</a><a href="" class="view mid" onclick="$('#generator_view').val('publisher_countries_top').trigger('chosen:updated').trigger('change');return false;" >
<img src="ctrack/art/generator/crsdonortop.png" width="260"/>
<span class="imgtxt">Top Recipients (graph)</span>
<span class="overtxt">Publisher data</span>
<span class="overtxt">Organisation data</span>
</a><a href="" class="view" onclick="$('#generator_view').val('publisher_sectors').trigger('chosen:updated').trigger('change');return false;" >
<img src="ctrack/art/generator/countriesall.png" width="260"/>
<span class="imgtxt">Sectors (table)</span>
<span class="overtxt">Publisher data</span>
<span class="overtxt">Organisation data</span>
</a>
</div>
<div class="view_links">
<a href="" class="view" onclick="$('#generator_view').val('publisher_sectors_top').trigger('chosen:updated').trigger('change');return false;" >
<img src="ctrack/art/generator/crssectortop.png" width="260"/>
<span class="imgtxt">Top Sectors (graph)</span>
<span class="overtxt">Publisher data</span>
<span class="overtxt">Organisation data</span>
</a><a href="" class="view mid" onclick="$('#generator_view').val('map').trigger('chosen:updated').trigger('change');return false;" >
<img src="ctrack/art/generator/map.png" width="260"/>
<span class="imgtxt">Map (only shows precise locations of activities)</span>
Expand Down Expand Up @@ -182,7 +182,7 @@
<div class="instruct_col first">
<div class="instruct_num">1</div>
<div class="instruct_text">Pick your data</div>
<div class="instruct_sub">Choose <b>Publisher</b>(s) &amp;/or <b>Recipient</b>(s) data to display.</div>
<div class="instruct_sub">Choose <b>Organisation</b>(s) &amp;/or <b>Recipient</b>(s) data to display.</div>
</div><div class="instruct_col">
<div class="instruct_num">2</div>
<div class="instruct_text">Choose a View</div>
Expand All @@ -202,8 +202,8 @@
#reminder
<div class="reminder_wrap">
<p><b>Are you creating widgets for a company's internal website?</b> Use the <a href="https://d-portal.org/ctrack.html#view=generator">secured version Generator</a> instead.</p>
<p>Compare multiple datasets by choosing multiple RECIPIENTS and/or PUBLISHERS.</p>
<p>Picking both PUBLISHER and RECIPIENT data at the same time will limit the data in your generated content.</p>
<p>Compare multiple datasets by choosing multiple RECIPIENTS and/or ORGANISATIONS.</p>
<p>Picking both ORGANISATION and RECIPIENT data at the same time will limit the data in your generated content.</p>
<p>The SIZE option allows you to generate a variety of blog-friendly sized content.</p>
<p>Empty tables are due to no data found.
<p><b>Data populating the tables can be quite large.</b> <i>Please wait until the spinner disappears for your widget to appear.</i></p>
Expand Down Expand Up @@ -245,7 +245,7 @@
.instruct_fix {background-color:#333; color:#ccc; padding:15px 0; text-align:center;}
.instruct_fix span {color:#4CA0FF; font-weight:bold;}
.chosen-container {min-width:250px; max-width:500px;}
.reminder_wrap {margin:0 auto; margin-top:60px; background-color:rgba(21,21,21,0.7); width:880px; padding:20px 40px 40px 40px; color:#ccc; font-size:0.9em; line-height:1.2em; margin-bottom:200px;}
.reminder_wrap {margin:0 auto; margin-top:60px; background-color:rgba(21,21,21,0.7); width:880px; padding:20px 40px 40px 40px; color:#ccc; font-size:0.9em; line-height:1.2em; padding-bottom:80px;}
.reminder_wrap.top {background-color:#2573CD; font-size:1.4em; color:#FFF; padding:30px 40px; margin-bottom:0;}
.reminder_wrap p {padding-top:25px; color:#ccc; display:list-item; list-style-position:inside; list-style-type:circle; font-size:16px;}
.reminder_wrap p:last-of-type {display:block;}
Expand Down
12 changes: 6 additions & 6 deletions ctrack/text/view_search.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
</select>
</div><div class="search_wrap">
<div class="search_label">
<img src="{flava}search_publisher.png" alt="Publisher icon" width="13" height="13"/>{search_publisher_txt}
<img src="{flava}search_publisher.png" alt="Organisation icon" width="13" height="13"/>{search_publisher_txt}
</div>
<select aria-label="Select a publisher from this dropdown" id="view_search_select_publisher" class="chosen" multiple>
<select aria-label="Select an organisation from this dropdown" id="view_search_select_publisher" class="chosen" multiple>
<option value></option>
{search_options_publisher}
</select>
Expand Down Expand Up @@ -380,7 +380,7 @@
</tr>
<tr>
<td>{search_participating_txt}</td>
<td>Organisations from <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a> - not an extensive list and includes only the existing list of IATI publishers.</td>
<td>Organisations from <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a> - not an extensive list and includes only the existing list of IATI Reporting Organisations.</td>
</tr>
<tr>
<td>{search_planned_disbursement_type_txt}</td>
Expand All @@ -392,7 +392,7 @@
</tr>
<tr>
<td>{search_publisher_txt}</td>
<td>Publishers are from the <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a>. This <a href="http://reference.iatistandard.org/203/activity-standard/iati-activities/iati-activity/reporting-org/" target="blank" rel="noopener noreferrer">IATI element</a> is a list of reporting organisations issuing the report.</td>
<td>Organisations are from the <a href="https://iatiregistry.org/publisher" target="blank" rel="noopener noreferrer">IATI Registry</a>. This <a href="http://reference.iatistandard.org/203/activity-standard/iati-activities/iati-activity/reporting-org/" target="blank" rel="noopener noreferrer">IATI element</a> is a list of reporting organisations issuing the report.</td>
</tr>
<tr>
<td>{search_recipient_txt}</td>
Expand Down Expand Up @@ -522,9 +522,9 @@
</select>
</div><div class="search_wrap">
<div class="search_label">
<img src="{flava}search_publisher.png" alt="Publisher icon" width="13" height="13"/>{search_publisher_txt}
<img src="{flava}search_publisher.png" alt="Organisation icon" width="13" height="13"/>{search_publisher_txt}
</div>
<select aria-label="Select a publisher from this dropdown" id="view_search_select_publisher" class="chosen" multiple>
<select aria-label="Select an organisation from this dropdown" id="view_search_select_publisher" class="chosen" multiple>
<option value></option>
{search_options_publisher}
</select>
Expand Down
2 changes: 1 addition & 1 deletion dflat/js/savi.css
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ table.budget.act_trans td.date {padding-right:0; width:110px;}
.result_indi_ref {border-bottom:1px dotted #666; font-size:11px; line-height:11px; padding:5px 0 0 0;}
.result_indi_ref div {padding-bottom:3px;}
.result_indi_ref:last-of-type {border:0; padding-bottom:0;}
.result_indi_ref .ref {display:inline-block; font-size:9px; min-width:35px; vertical-align:top;}
.result_indi_ref .ref {display:inline-block; font-size:9px; min-width:35px; vertical-align:baseline;}
.result_indi_ref .type {font-family:monospace; font-size:9px; margin:0;}
.result_period_time {background-color:#253860; line-height:17px; margin-bottom:4px; max-width:155px; min-height:17px; text-align:center;}
.result_indicator .wrap_document {margin:0 0 10px 0;}
Expand Down
2 changes: 1 addition & 1 deletion dflat/js/savi.html
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@

#^/trans-ref
<div>
<span title="An internal reference linking this transaction back to the publisher’s financial management system" class="ref">
<span title="An internal reference linking this transaction back to the organisation’s financial management system" class="ref">
REF <span>{_it.@ref||}</span>
</span>
</div>
Expand Down
Loading

0 comments on commit f90dcdc

Please sign in to comment.