Skip to content

Commit

Permalink
[Jenkins] - i18n; jslint
Browse files Browse the repository at this point in the history
  • Loading branch information
@avoinea
avoinea committed Sep 18, 2017
1 parent 8285f33 commit f4430da
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 37 deletions.
16 changes: 8 additions & 8 deletions eea/googlecharts/views/js/datatable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,10 +774,11 @@ function prepareForChart(options){
tmpDataView.setRows(tmp_sort);
}
else {
var sorted_items = [];
var i, j;
if (sgrid) {
var items = sgrid.getData().getItems();
var sorted_items = [];
for (var i = 0, l = items.length; i < l; i++) {
for (i = 0, l = items.length; i < l; i++) {
sorted_items.push(items[i].id);
}
tmpDataView.setRows(sorted_items);
Expand All @@ -790,7 +791,7 @@ function prepareForChart(options){
$(itemsToDisplay).each(function(row_index, row){
var value = row[sortBy];
if (objs[value]) {
objs[value].push(row_index)
objs[value].push(row_index);
}
else {
objs[value] = [row_index];
Expand All @@ -806,7 +807,7 @@ function prepareForChart(options){
}
// a must be equal to b
return 0;
}
};

vals.sort(compare);
if (!sortOrder) {
Expand All @@ -816,12 +817,11 @@ function prepareForChart(options){
// return sortOrder ? a - b : b - a;
// });

var sorted_items = [];
var value;
var obj_val;
var added_values = [];
var first_value;
for (var i = 0, l = vals.length; i < l; i++) {
for (i = 0, l = vals.length; i < l; i++) {
value = vals[i];
obj_val = objs[value];
if (obj_val.length === 1) {
Expand All @@ -831,12 +831,12 @@ function prepareForChart(options){
first_value = value;
if (added_values.indexOf(first_value) === -1) {
if (!sortOrder) {
for (var j = 0, jl = obj_val.length - 1; jl >= j; jl--) {
for (j = 0, jl = obj_val.length - 1; jl >= j; jl--) {
sorted_items.push(obj_val[jl]);
}
}
else {
for (var j = 0, jl = obj_val.length - 1; j <= jl; j++) {
for (j = 0, jl = obj_val.length - 1; j <= jl; j++) {
sorted_items.push(obj_val[j]);
}
}
Expand Down
2 changes: 1 addition & 1 deletion eea/googlecharts/views/js/embed_dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function drawDashboardEmbed(options){
/* #79934 check if dashboard should be resized as an embedded dashboard might contain small charts */
if (is_pdf_printing) {
var dashboard_area_width = window.parseInt(settings.dashboard_config.chartsBox.width, 10);
var dashboard_area_width = dashboard_area_width <= 100 ? 975 : dashboard_area_width;
dashboard_area_width = dashboard_area_width <= 100 ? 975 : dashboard_area_width;
var widgets_length = settings.dashboard_config.widgets.length - 1;
var count;
var obj = {};
Expand Down
8 changes: 4 additions & 4 deletions eea/googlecharts/views/zpt/charts.pt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<div class="left" style="float:left">
<tal:block tal:repeat="img tab/extra_images">
<img tal:condition="python: img['position']=='Top' and img['alignment']=='Left'"
tal:attributes="src img/img" alt="Googlechart QR" />
tal:attributes="src img/img" alt="Googlechart QR" i18n:attributes="alt"/>
</tal:block>
</div>
<div class="right" style="float:right">
<tal:block tal:repeat="img tab/extra_images">
<img tal:condition="python: img['position']=='Top' and img['alignment']=='Right'"
tal:attributes="src img/img" alt="Googlechart QR"/>
tal:attributes="src img/img" alt="Googlechart QR" i18n:attributes="alt"/>
</tal:block>
</div>
</div>
Expand All @@ -28,13 +28,13 @@
<div class="left" style="float:left">
<tal:block tal:repeat="img tab/extra_images">
<img tal:condition="python: img['position']=='Bottom' and img['alignment']=='Left'"
tal:attributes="src img/img" alt="Googlechart QR" />
tal:attributes="src img/img" alt="Googlechart QR" i18n:attributes="alt"/>
</tal:block>
</div>
<div class="right" style="float:right">
<tal:block tal:repeat="img tab/extra_images">
<img tal:condition="python: img['position']=='Bottom' and img['alignment']=='Right'"
tal:attributes="src img/img" alt="Googlechart QR" />
tal:attributes="src img/img" alt="Googlechart QR" i18n:attributes="alt"/>
</tal:block>
</div>
</div>
Expand Down
46 changes: 22 additions & 24 deletions eea/googlecharts/views/zpt/embed-chart.pt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
has_many python: has_provenances > 1 or has_provenances >= 1 and indicator;
outerhtmltag python:'ul' if has_many else 'div';
htmltag python: 'li' if has_many else 'span class=googlechart-provenance-definition'">
<p class="googlechart-datasource" tal:condition="python: has_provenances or indicator"><strong>Data sources:</strong></p>
<p class="googlechart-datasource" tal:condition="python: has_provenances or indicator"><strong i18n:translate="">Data sources:</strong></p>
<p tal:replace="structure string:<$outerhtmltag id='googlechart-provenance-definitions'>"></p>
<tal:provenance repeat="provenance provenances">
<li tal:replace="structure string:<$htmltag>"></li>
Expand All @@ -65,7 +65,7 @@
<!--? Indicator -->
<li tal:condition="indicator">
<tal:block tal:define="codes python:indicator.get_codes()">
<span>EEA &ndash; </span>
<span i18n:translate="">EEA &ndash; </span>
<a tal:attributes="href indicator/absolute_url; title indicator/Title"
tal:content="python:'Indicator ' + codes[-1] if codes else 'Indicator'" target="_blank">content</a>
</tal:block>
Expand Down Expand Up @@ -335,22 +335,20 @@
<div class="pull-right">
<!--? Save -->
<div class="pull-left googlechart-downloads">
<a href="#" class="open-dialog" data-dialog="#download-dialog"><span class="sprite sprite-save"></span>Save</a>
<a href="#" class="open-dialog" data-dialog="#download-dialog" i18n:translate=""><span class="sprite sprite-save" i18n:name="icon"></span>Save</a>
<div class="googlecharts-embed-dialog" id="download-dialog">
<p><strong>Original Data</strong></p>
<a tal:attributes="href string:${url}/download.csv">CSV</a>
<a tal:attributes="href string:${url}/download.tsv">TSV</a>
<p><strong>Image formats</strong></p>
<a tal:attributes="href string:${chart_id}.png/at_download/file" target="_top">PNG</a>
<a tal:attributes="href string:${chart_id}.svg/at_download/file" target="_top">SVG</a>
<p><strong i18n:translate="">Original Data</strong></p>
<a tal:attributes="href string:${url}/download.csv" i18n:translate="">CSV</a>
<a tal:attributes="href string:${url}/download.tsv" i18n:translate="">TSV</a>
<p><strong i18n:translate="">Image formats</strong></p>
<a tal:attributes="href string:${chart_id}.png/at_download/file" target="_top" i18n:translate="">PNG</a>
<a tal:attributes="href string:${chart_id}.svg/at_download/file" target="_top" i18n:translate="">SVG</a>

<p><strong>Formats suitable for machine-to-machine communication</strong></p>
<a tal:attributes="href string:${url}/download.json" target="_top">JSON</a>
<a tal:attributes="href string:${url}/download.exhibit" target="_top">Exhibit JSON</a>
<a tal:attributes="href string:${url}/download.xml" target="_top">XML</a>
<a tal:attributes="href string:${url}/download.schema.xml" target="_top">
XML with Schema
</a>
<p><strong i18n:translate="">Formats suitable for machine-to-machine communication</strong></p>
<a tal:attributes="href string:${url}/download.json" target="_top" i18n:translate="">JSON</a>
<a tal:attributes="href string:${url}/download.exhibit" target="_top" i18n:translate="">Exhibit JSON</a>
<a tal:attributes="href string:${url}/download.xml" target="_top" i18n:translate="">XML</a>
<a tal:attributes="href string:${url}/download.schema.xml" target="_top" i18n:translate="">XML with Schema</a>
</div>
</div>
<!--? /Save -->
Expand All @@ -359,21 +357,21 @@
<div class="pull-left">
<a class="go-to-original-link"
tal:attributes="href url"
i18n:translate="" target="_top"><span class="sprite sprite-explore"></span>Explore</a>
i18n:translate="" target="_top" i18n:translate=""><span class="sprite sprite-explore" i18n:name="icon"></span>Explore</a>
</div>
<!--? /Explore Data -->

<!--? Share -->
<div class="pull-left">
<a href="#" class="open-dialog" data-dialog="#share-dialog"><span class="sprite sprite-share"></span>Share</a>
<a href="#" class="open-dialog" data-dialog="#share-dialog" i18n:translate=""><span class="sprite sprite-share" i18n:name="icon"></span>Share</a>
<div class="googlecharts-embed-dialog" id="share-dialog">
<p><strong>Embed code:</strong></p>
<p><strong i18n:translate="">Embed code:</strong></p>
<textarea class="share-dialog-text" cols="69" rows="5"> </textarea>
<p><strong>Share:</strong></p>
<p><strong i18n:translate="">Share:</strong></p>
<div class="googlechart googlechart-social">
<a href="https://twitter.com/intent/tweet?url=" class="share-button share-button-twitter" target="_blank">Twitter</a>
<a href="https://www.facebook.com/sharer/sharer.php?u=" class="share-button share-button-facebook" target="_blank">Facebook</a>
<a href="https://plus.google.com/share?url=" class="share-button share-button-gplus" target="_blank">Google Plus</a>
<a href="https://twitter.com/intent/tweet?url=" class="share-button share-button-twitter" target="_blank" i18n:translate="">Twitter</a>
<a href="https://www.facebook.com/sharer/sharer.php?u=" class="share-button share-button-facebook" target="_blank" i18n:translate="">Facebook</a>
<a href="https://plus.google.com/share?url=" class="share-button share-button-gplus" target="_blank" i18n:translate="">Google Plus</a>

</div>
</div>
Expand All @@ -382,7 +380,7 @@

<!--? Enlarge -->
<div class="pull-left">
<a href="#" class="googlechart-enlarge" target="_top"><span class="sprite sprite-enlarge"></span>Enlarge</a>
<a href="#" class="googlechart-enlarge" target="_top" i18n:translate=""><span class="sprite sprite-enlarge" i18n:name="icon"></span>Enlarge</a>
</div>
<!--? Enlarge -->

Expand Down

0 comments on commit f4430da

Please sign in to comment.