Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ulf Gebhardt 2016-02-04 00:35:48 +01:00
commit 061b3f076a
2 changed files with 4 additions and 1 deletions

View File

@ -67,3 +67,6 @@ function files_menu(){
$('#menu_folder_sys').parent().addClass('active');}
}
function saimod_sys_files_tooltip(elementId, pictureId, pictureCategory) {
$( "#elementId" ).tooltip({ content: '<img src="http://www.mojotrollz.eu/web/test/mojotrollz/api.php?call=files&cat'+pictureCategory+'=&id='+pictureId+'.gif" />' });
}

View File

@ -2,7 +2,7 @@
<td>${name}</td>
<td>${extension}</td>
<td>
<a href="${url}" target="_blank">${url}</a>
<a href="${url}" target="_blank" id="tooltip_${cat}_${i}" onmouseover="saimod_sys_files_tooltip('tooltip_${cat}_${i}',${name},${cat})">${url}</a>
</td>
<td>
<button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></button>