Skip to content

Commit 970b7f0

Browse files
OsticoOstico
committed
Merge branch 'master' into develop
2 parents 971dbca + f1afc1a commit 970b7f0

7 files changed

Lines changed: 54 additions & 27 deletions

File tree

‎lib/View/unsupported_browser.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ <h3>2 - Learn more about MateCat</h3>
117117
<strong style="font-size:160%">This job has been archived.</strong><br /><br />
118118
<img src="/public/img/jobarchived.png" /><br />
119119
<p>MateCAT archives automatically jobs after ${job_archived} days of inactivity.</p>
120-
<p tal:condition="true:ownerIsMe">
120+
<p tal:condition="true:jobOwnerIsMe">
121121
<a id="reactivate-job" href="#" class="translated">Reactivate it</a>
122122

123123
</p>
124-
<p tal:condition="not:ownerIsMe">If you need to access it, please ask <a href="mailto:${owner_email}">${owner_email}</a> to reactivate it<br />
124+
<p tal:condition="not:jobOwnerIsMe">If you need to access it, please ask <a href="mailto:${owner_email}">${owner_email}</a> to reactivate it<br />
125125
If you continue to get this page, email us at <a href="mailto:support@matecat.com">support@matecat.com</a>.</p>
126126
</div>
127127

‎public/css/app.css‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ font-size: 18px;
11471147
}
11481148

11491149
#sign-in-o {
1150-
padding: 10px 10px 5px;
1150+
padding: 5px 10px 10px;
11511151
margin: 0 auto;
11521152
width: 200px;
11531153
text-align: center;
@@ -4043,10 +4043,7 @@ box-shadow: 0 1px 2px #ccc;
40434043
.topmenu-drop input {
40444044
font-weight: normal;
40454045
border: 0;
4046-
<<<<<<< HEAD
40474046
padding: 5px 10px!important;
4048-
=======
4049-
>>>>>>> ab6f35f5d7c689159bd77b594f68f7dbde7fbeaf
40504047
font-size: 17px!important;
40514048
text-align: center;
40524049
width: 130px!important;
@@ -4061,13 +4058,9 @@ box-shadow: 0 1px 2px #ccc;
40614058
.topmenu-drop input.translated, .topmenu-drop input.approved {
40624059
width: auto!important;
40634060
border-radius: 2px 0 0 2px;
4064-
<<<<<<< HEAD
4065-
text-transform: uppercase;
4066-
=======
40674061
padding: 0 18px!important;
40684062
text-transform: uppercase;
40694063
margin: 0!important
4070-
>>>>>>> ab6f35f5d7c689159bd77b594f68f7dbde7fbeaf
40714064
}
40724065

40734066

@@ -4093,6 +4086,12 @@ box-shadow: 0 1px 2px #ccc;
40934086
left: -131px;
40944087
width: 162px;
40954088
}
4089+
4090+
4091+
.justdone .header-menu .wrapper-dropdown-5 .dropdown{
4092+
left: -226px;
4093+
width: 258px;
4094+
}
40964095
.header-menu .wrapper-dropdown-5 .dropdown[data-download='false'] li.downloadTranslation,
40974096
.header-menu .wrapper-dropdown-5 .dropdown[data-download='true'] li.previewLink
40984097
{

‎public/js/app.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/cat.js‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9695,7 +9695,7 @@ $.extend(UI, {
96959695
// script per fare apparire e scomparire la riga con l'upload della tmx
96969696

96979697

9698-
$('body').on('click', 'tr.mine a.canceladdtmx, #inactivetm tr.new .action .addtmxfile', function() {
9698+
$('body').on('click', 'tr.mine a.canceladdtmx, tr.ownergroup a.canceladdtmx, #inactivetm tr.new .action .addtmxfile', function() {
96999699
$(this).parents('tr').find('.action .addtmx').removeClass('disabled');
97009700
$(this).parents('td.uploadfile').remove();
97019701

@@ -9778,7 +9778,7 @@ $.extend(UI, {
97789778
// $(".clicked td.action").append('progressbar');
97799779

97809780
// script per appendere le tmx fra quelle attive e inattive, preso da qui: https://stackoverflow.com/questions/24355817/move-table-rows-that-are-selected-to-another-table-javscript
9781-
}).on('click', 'tr.mine .uploadfile .addtmxfile:not(.disabled)', function() {
9781+
}).on('click', 'tr.mine .uploadfile .addtmxfile:not(.disabled), tr.ownergroup .uploadfile .addtmxfile:not(.disabled)', function() {
97829782
$(this).addClass('disabled');
97839783
$(this).parents('.uploadfile').find('.error').text('').hide();
97849784

@@ -9871,7 +9871,7 @@ $.extend(UI, {
98719871
UI.useTM(this);
98729872
}).on('change', '#new-tm-read, #new-tm-write', function() {
98739873
UI.checkTMgrants();
9874-
}).on('change', 'tr.mine td.uploadfile input[type="file"]', function() {
9874+
}).on('change', 'tr.mine td.uploadfile input[type="file"], tr.ownergroup td.uploadfile input[type="file"]', function() {
98759875
if(this.files[0].size > config.maxTMXFileSize) {
98769876
numMb = config.maxTMXFileSize/(1024*1024);
98779877
APP.alert('File too big.<br/>The maximuxm allowed size is ' + numMb + 'Mb.');
@@ -10284,7 +10284,16 @@ $.extend(UI, {
1028410284
} else {
1028510285
$(table).find('tr.uploadpanel .uploadfile').addClass('uploading');
1028610286
}
10287-
var trClass = (existing)? 'mine' : 'uploadpanel';
10287+
if(existing) {
10288+
if($(el).parents('tr').hasClass('mine')) {
10289+
trClass = 'mine';
10290+
} else {
10291+
trClass = 'ownergroup';
10292+
}
10293+
} else {
10294+
trClass = 'uploadpanel';
10295+
}
10296+
// var trClass = (existing)? 'mine' : 'uploadpanel';
1028810297
form = $(table).find('tr.' + trClass + ' .add-TM-Form')[0];
1028910298
path = $(el).parents('.uploadfile').find('input[type="file"]').val();
1029010299
file = path.split('\\')[path.split('\\').length-1];
@@ -10372,7 +10381,6 @@ $.extend(UI, {
1037210381
iframe.setAttribute("height", "0");
1037310382
iframe.setAttribute("border", "0");
1037410383
iframe.setAttribute("style", "width: 0; height: 0; border: none;");
10375-
1037610384
// Add to document...
1037710385
document.body.appendChild(iframe);
1037810386
// form.parentNode.appendChild(iframe);
@@ -10404,7 +10412,13 @@ $.extend(UI, {
1040410412
if (iframeId.addEventListener) iframeId.addEventListener("load", eventHandler, true);
1040510413
if (iframeId.attachEvent) iframeId.attachEvent("onload", eventHandler);
1040610414
existing = ($(form).hasClass('existing'))? true : false;
10407-
TMKey = (existing)? $(form).parents('.mine').find('.privatekey').first().text() : $('#new-tm-key').val();
10415+
if(existing) {
10416+
TR = $(form).parents('tr');
10417+
TMKey = TR.find('.privatekey').first().text();
10418+
} else {
10419+
TMKey = $('#new-tm-key').val();
10420+
}
10421+
// TMKey = (existing)? $(form).parents('.mine').find('.privatekey').first().text() : $('#new-tm-key').val();
1040810422

1040910423
// Set properties of form...
1041010424
form.setAttribute("target", "upload_iframe");

‎public/js/cat.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/lib/cookiebanner.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
position: 'bottom',
238238
message: default_text,
239239
linkmsg: default_link,
240-
moreinfo: 'http://aboutcookies.org',
240+
moreinfo: 'http://www.matecat.com/terms#cookies',
241241
effect: null,
242242
fontSize: '14px',
243243
fontFamily: 'arial, sans-serif',

‎public/js/tm.js‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ $.extend(UI, {
155155
// script per fare apparire e scomparire la riga con l'upload della tmx
156156

157157

158-
$('body').on('click', 'tr.mine a.canceladdtmx, #inactivetm tr.new .action .addtmxfile', function() {
158+
$('body').on('click', 'tr.mine a.canceladdtmx, tr.ownergroup a.canceladdtmx, #inactivetm tr.new .action .addtmxfile', function() {
159159
$(this).parents('tr').find('.action .addtmx').removeClass('disabled');
160160
$(this).parents('td.uploadfile').remove();
161161

@@ -238,7 +238,7 @@ $.extend(UI, {
238238
// $(".clicked td.action").append('progressbar');
239239

240240
// script per appendere le tmx fra quelle attive e inattive, preso da qui: https://stackoverflow.com/questions/24355817/move-table-rows-that-are-selected-to-another-table-javscript
241-
}).on('click', 'tr.mine .uploadfile .addtmxfile:not(.disabled)', function() {
241+
}).on('click', 'tr.mine .uploadfile .addtmxfile:not(.disabled), tr.ownergroup .uploadfile .addtmxfile:not(.disabled)', function() {
242242
$(this).addClass('disabled');
243243
$(this).parents('.uploadfile').find('.error').text('').hide();
244244

@@ -331,7 +331,7 @@ $.extend(UI, {
331331
UI.useTM(this);
332332
}).on('change', '#new-tm-read, #new-tm-write', function() {
333333
UI.checkTMgrants();
334-
}).on('change', 'tr.mine td.uploadfile input[type="file"]', function() {
334+
}).on('change', 'tr.mine td.uploadfile input[type="file"], tr.ownergroup td.uploadfile input[type="file"]', function() {
335335
if(this.files[0].size > config.maxTMXFileSize) {
336336
numMb = config.maxTMXFileSize/(1024*1024);
337337
APP.alert('File too big.<br/>The maximuxm allowed size is ' + numMb + 'Mb.');
@@ -744,7 +744,16 @@ $.extend(UI, {
744744
} else {
745745
$(table).find('tr.uploadpanel .uploadfile').addClass('uploading');
746746
}
747-
var trClass = (existing)? 'mine' : 'uploadpanel';
747+
if(existing) {
748+
if($(el).parents('tr').hasClass('mine')) {
749+
trClass = 'mine';
750+
} else {
751+
trClass = 'ownergroup';
752+
}
753+
} else {
754+
trClass = 'uploadpanel';
755+
}
756+
// var trClass = (existing)? 'mine' : 'uploadpanel';
748757
form = $(table).find('tr.' + trClass + ' .add-TM-Form')[0];
749758
path = $(el).parents('.uploadfile').find('input[type="file"]').val();
750759
file = path.split('\\')[path.split('\\').length-1];
@@ -832,7 +841,6 @@ $.extend(UI, {
832841
iframe.setAttribute("height", "0");
833842
iframe.setAttribute("border", "0");
834843
iframe.setAttribute("style", "width: 0; height: 0; border: none;");
835-
836844
// Add to document...
837845
document.body.appendChild(iframe);
838846
// form.parentNode.appendChild(iframe);
@@ -864,7 +872,13 @@ $.extend(UI, {
864872
if (iframeId.addEventListener) iframeId.addEventListener("load", eventHandler, true);
865873
if (iframeId.attachEvent) iframeId.attachEvent("onload", eventHandler);
866874
existing = ($(form).hasClass('existing'))? true : false;
867-
TMKey = (existing)? $(form).parents('.mine').find('.privatekey').first().text() : $('#new-tm-key').val();
875+
if(existing) {
876+
TR = $(form).parents('tr');
877+
TMKey = TR.find('.privatekey').first().text();
878+
} else {
879+
TMKey = $('#new-tm-key').val();
880+
}
881+
// TMKey = (existing)? $(form).parents('.mine').find('.privatekey').first().text() : $('#new-tm-key').val();
868882

869883
// Set properties of form...
870884
form.setAttribute("target", "upload_iframe");

0 commit comments

Comments
 (0)