Skip to content

Commit

Permalink
Dev: Fix for fonts and fa in file uploader
Browse files Browse the repository at this point in the history
  • Loading branch information
@olleharstedt
olleharstedt committed Apr 18, 2016
1 parent a60f226 commit b6aeec5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion scripts/modaldialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show
display += '<td class="upload title">'+jsonobj[i].title+'</td>';
if (show_comment != 0)
display += '<td class="upload comment">'+jsonobj[i].comment+'</td>';
display +='<td class="upload edit">'+decodeURIComponent(jsonobj[i].name)+'</td><td>'+'<a class="btn btn-default fa fa-pencil" onclick="javascript:upload_'+fieldname+'();$(\'#upload_'+fieldname+'\').click();">&nbsp;'+uploadLang.editFile+'</a></td></tr>';
display +='<td class="upload edit">'+decodeURIComponent(jsonobj[i].name)+'</td><td>'+'<a class="btn btn-default" onclick="javascript:upload_'+fieldname+'();$(\'#upload_'+fieldname+'\').click();"><span class="fa fa-pencil"></span>&nbsp;'+uploadLang.editFile+'</a></td></tr>';
}
display += '</tbody></table>';

Expand Down
16 changes: 8 additions & 8 deletions scripts/uploader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function doFileUpload(){
previewblock += "<div class='form-group'><label class='control-label col-xs-4' for='"+fieldname+"_comment_"+i+"'>"+uploadLang.commentFld+"</label>"+"<div class='input-container'><input class='form-control' type='text' value='" + escapeHtml(json[i-1].comment) + "' id='"+fieldname+"_comment_"+i+"' /></div></div>";
}

previewblock += "<div class='form-group'><div class='col-xs-4'></div><div class='input-container'><a class='btn btn-danger fa fa-trash' onclick='deletefile(\""+fieldname+"\", "+i+")'>&nbsp;"+uploadLang.deleteFile+"</a></div></div>";
previewblock += "<div class='form-group'><div class='col-xs-4'></div><div class='input-container'><a class='btn btn-danger' onclick='deletefile(\""+fieldname+"\", "+i+")'><span class='fa fa-trash'></span>&nbsp;"+uploadLang.deleteFile+"</a></div></div>";
previewblock += "</fieldset></div>";
}

Expand Down Expand Up @@ -85,7 +85,7 @@ function doFileUpload(){
* do not upload the file and display an error message ! */
if (filecount >= maxfiles)
{
$('#notice').html('<p class="alert alert-danger fa fa-exclamation-circle">&nbsp;'+uploadLang.errorNoMoreFiles+'</p>');
$('#notice').html('<p class="alert alert-danger"><span class="fa fa-exclamation-circle"></span>&nbsp;'+uploadLang.errorNoMoreFiles+'</p>');
return false;
}

Expand All @@ -104,7 +104,7 @@ function doFileUpload(){
}
if (allowSubmit == false)
{
$('#notice').html('<p class="alert alert-danger fa fa-exclamation-circle">&nbsp;'+uploadLang.errorOnlyAllowed.replace('%s',$('#'+fieldname+'_allowed_filetypes').val())+'</p>');
$('#notice').html('<p class="alert alert-danger"><span class="fa fa-exclamation-circle"></span>&nbsp;'+uploadLang.errorOnlyAllowed.replace('%s',$('#'+fieldname+'_allowed_filetypes').val())+'</p>');
return false;
}

Expand Down Expand Up @@ -143,7 +143,7 @@ function doFileUpload(){

if (metadata.success)
{
$('#notice').html('<p class="alert alert-success fa fa-success">&nbsp;'+metadata.msg+'</p>');
$('#notice').html('<p class="alert alert-success"><span class="fa fa-success"></span>&nbsp;'+metadata.msg+'</p>');
if( $('#field'+fieldname+'_listfiles').length==0){
$("<ul id='field"+fieldname+"_listfiles' class='files-list' />").insertAfter("#uploadstatus");
}
Expand All @@ -168,7 +168,7 @@ function doFileUpload(){
{
previewblock += "<div class='form-group'><label class='control-label col-xs-4' for='"+fieldname+"_comment_"+count+"'>"+uploadLang.commentFld+"</label>"+"<div class='input-container'><input class='form-control' type='text' value='' id='"+fieldname+"_comment_"+count+"' /></div></div>";
}
previewblock += "<div class='form-group'><div class='col-xs-4'></div><div class='input-container'><a class='btn btn-danger fa fa-trash' onclick='deletefile(\""+fieldname+"\", "+count+")'>&nbsp;"+uploadLang.deleteFile+"</a></div></div>";
previewblock += "<div class='form-group'><div class='col-xs-4'></div><div class='input-container'><a class='btn btn-danger' onclick='deletefile(\""+fieldname+"\", "+count+")'><span class='fa fa-trash'></span>&nbsp;"+uploadLang.deleteFile+"</a></div></div>";
previewblock += "</fieldset></div>";
}

Expand Down Expand Up @@ -196,11 +196,11 @@ function doFileUpload(){
$('#uploadstatus').html(uploadLang.errorMaxReached);

if (filecount >= maxfiles)
$('#notice').html('<p class="alert alert-success fa fa-check">&nbsp;'+uploadLang.errorTooMuch+'</p>');
$('#notice').html('<p class="alert alert-success"><span class="fa fa-check"></span>&nbsp;'+uploadLang.errorTooMuch+'</p>');
}
else
{
$('#notice').html('<p class="alert alert-danger fa fa-exclamation-circle">&nbsp;'+metadata.msg+'</p>');
$('#notice').html('<p class="alert alert-danger"><span class="fa fa-exclamation-circle"></span>&nbsp;'+metadata.msg+'</p>');
}

}
Expand Down Expand Up @@ -295,7 +295,7 @@ function deletefile(fieldname, count) {
})
.done(function( msg )
{
$('#notice').html('<p class="alert alert-success fa fa-check">&nbsp;'+msg+'</p>');
$('#notice').html('<p class="alert alert-success"><span class="fa fa-check"></span>&nbsp;'+msg+'</p>');
setTimeout(function() {
$(".success").remove();
}, 5000);
Expand Down

0 comments on commit b6aeec5

Please sign in to comment.