mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-22 10:08:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160 from bergware/6.4-wip

Browse Source 
Minor style correction in Browse table
This commit is contained in:
tom mortensen
2017-09-02 10:43:35 -05:00
committed by GitHub
parent 090dfdd943 5e6fd754a1
commit 823db165e0
9 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/BootDevice.page
+1 -1
View File
@@ -1,6 +1,6 @@
Menu="Main:3"
Title="Boot Device"
Tag="bank"
Tag="paw"
---
<?PHP
/* Copyright 2005-2017, Lime Technology
plugins/dynamix/Browse.page
+1
View File
@@ -13,6 +13,7 @@ Tag="navicon"
* all copies or substantial portions of the Software.
*/
?>
<style>.loc{text-align:left;white-space:nowrap}</style>
<script>
$(function(){
$.get('/webGui/include/Browse.php',{dir:"<?=addslashes(htmlspecialchars($dir))?>",path:"<?=$path?>",user:<?=strpos($dir,'/mnt/user')===0?1:0?>},function(data){
plugins/dynamix/DisplaySettings.page
+3 -3
View File
@@ -64,7 +64,7 @@ $(function() {
// attach the drag-n-drop feature to the 'dropbox' element
dropbox.filedrop({
maxfiles:1,
maxfilesize:95, // KB
maxfilesize:512, // KB
data: {"csrf_token": "<?=$var['csrf_token']?>"},
url:'/webGui/include/FileUpload.php',
beforeEach:function(file) {
@@ -82,7 +82,7 @@ $(function() {
swal({title:"Too many files",text:"Please select one file only!",type:"error"});
break;
case 'FileTooLarge':
swal({title:"File too large",text:"Maximum file upload size is 95 kB (97,280 bytes)",type:"error"});
swal({title:"File too large",text:"Maximum file upload size is 512 kB (524,288 bytes)",type:"error"});
break;
}
},
@@ -220,7 +220,7 @@ Custom banner:
</span><em>Drag-n-drop a PNG file or click the image at the left.</em><input type="file" id="drop" accept=".png" style="display:none">
</div>
> Image will be scaled to 1270x90 pixels. The maximum image file upload size is 95 kB (97,280 bytes).
> Image will be scaled to 1920x90 pixels. The maximum image file upload size is 512 kB (524,288 bytes).
Show Dashboard apps:
: <select name="dashapps" size="1">
plugins/dynamix/UserEdit.page
+3 -3
View File
@@ -74,7 +74,7 @@ $(function(){
// attach the drag-n-drop feature to the 'dropbox' element
dropbox.filedrop({
maxfiles:1,
maxfilesize:95, // KB
maxfilesize:512, // KB
url:'/webGui/include/FileUpload.php',
data:{"csrf_token":"<?=$var['csrf_token']?>"},
beforeEach:function(file) {
@@ -92,7 +92,7 @@ $(function(){
swal({title:"Too many files",text:"Please select one file only!",type:"error"});
break;
case 'FileTooLarge':
swal({title:"File too large",text:"Maximum file upload size is 95 kB (97,280 bytes)",type:"error"});
swal({title:"File too large",text:"Maximum file upload size is 512 kB (524,288 bytes)",type:"error"});
break;
}
},
@@ -141,7 +141,7 @@ Custom image:
<?endif;?>
</span><em>Drag-n-drop a PNG file or click the image at the left.</em><input type="file" id="drop" accept=".png" style="display:none">
> The image will be scaled to 48x48 pixels in size. The maximum image file upload size is 95 kB (97,280 bytes).
> The image will be scaled to 48x48 pixels in size. The maximum image file upload size is 512 kB (524,288 bytes).
<?if ($name=="root"):?>
&nbsp;
plugins/dynamix/include/Browse.php
+2 -2
View File
@@ -79,7 +79,7 @@ foreach ($list as $row) {
echo "<td><a href=\"".htmlspecialchars("/$path?dir=".urlencode_path(trim_slash($dir.'/'.$row['name'])))."\">".htmlspecialchars($row['name'])."</a></td>";
echo "<td data='0'>&lt;DIR&gt;</td>";
echo "<td data='{$row['time']}'>".my_time($row['time'],"%F {$display['time']}")."</td>";
echo "<td>{$row['disk']}</td>";
echo "<td class='loc'>{$row['disk']}</td>";
echo "</tr>";
$dirs++;
} else {
@@ -90,7 +90,7 @@ foreach ($list as $row) {
echo "<td><a href=\"".htmlspecialchars(urlencode_path(trim_slash($dir.'/'.$row['name'])))."\" class=\"".($tag?:'none')."\">".htmlspecialchars($row['name'])."</a></td>";
echo "<td data='{$row['size']}' class='$tag'>".my_scale($row['size'],$unit)." $unit</td>";
echo "<td data='{$row['time']}' class='$tag'>".my_time($row['time'],"%F {$display['time']}")."</td>";
echo "<td class='$tag'>{$row['disk']}</td>";
echo "<td class='loc $tag'>{$row['disk']}</td>";
echo "</tr>";
$files++;
$total+=$row['size'];
plugins/dynamix/include/DiskList.php
+1 -1
View File
@@ -74,7 +74,7 @@ foreach ($disks as $name => $disk) {
switch ($disk['luksState']) {
case 0: $luks = ""; break;
case 1: $luks = "<i class='padlock green-text fa fa-lock' title='All files in share encrypted'></i>"; break;
case 2: $luks = "<i class='padlock orange-text fa fa-unlock-alt' title='Some files in share unencrypted'></i>"; break;
case 2: $luks = "<i class='padlock orange-text fa fa-lock' title='Some files in share unencrypted'></i>"; break;
default: $luks = ""; break;
}
echo "<tr>";
plugins/dynamix/include/ShareList.php
+1 -1
View File
@@ -78,7 +78,7 @@ foreach ($shares as $name => $share) {
switch ($share['luksStatus']) {
case 0: $luks = ""; break;
case 1: $luks = "<i class='padlock green-text fa fa-lock' title='All files in share encrypted'></i>"; break;
case 2: $luks = "<i class='padlock orange-text fa fa-unlock-alt' title='Some files in share unencrypted'></i>"; break;
case 2: $luks = "<i class='padlock orange-text fa fa-lock' title='Some files in share unencrypted'></i>"; break;
default: $luks = ""; break;
}
echo "<tr>";
plugins/dynamix/styles/default-azure.css
+2 -2
View File
@@ -43,11 +43,11 @@ select.slot{min-width:440px;max-width:440px}
input.narrow{width:166px}
input.trim{width:50px}
form+p{display:none}
#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#EDEAEF;background-repeat:no-repeat;background-position:center;border-bottom:#9794A0 1px solid}
#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#EDEAEF;background-size:100% 90px;border-bottom:#9794A0 1px solid}
#header .logo{float:left;margin-top:20px;margin-left:100px}
#header .logo img{margin:0 0 2px 1px}
#header .logo a{color:#5D6833;font-size:18px}
#header .block{margin:6px 5px 0 0;float:right;text-align:right;padding:2px 8px}
#header .block{margin:8px 10px 0 0;float:right;text-align:right;background-color:rgba(244,242,244,0.5);color:#373F49;border-radius:10px;padding:2px 8px}
#header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #5D6833}
#header .text-right{float:right;text-align:left;padding-left:5px;padding-right:20px}
#menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #EDEAEF}
plugins/dynamix/styles/default-gray.css
+2 -2
View File
@@ -43,11 +43,11 @@ select.slot{min-width:440px;max-width:440px}
input.narrow{width:166px}
input.trim{width:50px}
form+p{display:none}
#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#121510;background-repeat:no-repeat;background-position:center;border-bottom:#42453E 1px solid}
#header{position:fixed;top:0;left:0;width:100%;height:90px;z-index:100;margin:0;background-color:#121510;background-size:100% 90px;border-bottom:#42453E 1px solid}
#header .logo{float:left;margin-top:20px;margin-left:100px}
#header .logo img{margin:0 0 2px 1px}
#header .logo a{color:#5D6833;font-size:18px}
#header .block{margin:6px 5px 0 0;float:right;text-align:right;padding:2px 8px}
#header .block{margin:8px 10px 0 0;float:right;text-align:right;background-color:rgba(27,29,27,0.5);color:#99A5B2;border-radius:10px;padding:2px 8px}
#header .text-left{float:left;text-align:right;padding-right:5px;border-right:solid medium #5D6833}
#header .text-right{float:right;text-align:left;padding-left:5px;padding-right:20px}
#menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #121510}