mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-15 06:00:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:limetech/dynamix-6.2

Browse Source
This commit is contained in:
Eric Schultz
2016-03-16 17:14:28 -05:00
parent 91a1741b01 c664402a27
commit a68898f197
2 changed files with 112 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
plugins/dynamix.docker.manager/include/CreateDocker.php
View File

@@ -709,6 +709,8 @@ $showAdditionalInfo = '';
$('.advanced-switch').change(function () {
var status = $(this).is(':checked');
toggleRows('advanced,.hidden', status, 'basic');
$("#catSelect").dropdownchecklist("destroy");
$("#catSelect").dropdownchecklist({emptyText:'Select categories...', maxDropHeight:150, width:300, explicitClose:'...close'});
});
});
@@ -938,7 +940,7 @@ $showAdditionalInfo = '';
var index = $(el)[0].selectedIndex;
if (index == 0) {
// Path
mode.html("<dt>Mode</dt><dd><select name='Mode'><option value='rw'>Read/Write</option><option value='ro'>Read Only</option></select></dd>");
mode.html("<dt>Mode</dt><dd><select name='Mode'><option value='rw'>Read/Write</option><option value='rw,slave'>RW/Slave</option></option><option value='ro'>Read Only</option></select></dd>");
value.bind("click", function(){openFileBrowser(this,$(this).val(), 'sh', true, false);});
} else if (index == 1) {
// Port
@@ -1005,6 +1007,15 @@ $showAdditionalInfo = '';
target.val(reset);
}
}
function prepareCategory() {
var values = $.map($('#catSelect option') ,function(option) {
if ($(option).is(":selected")) {
return option.value;
}
});
$("input[name='contCategory']").val(values.join(" "));
}
</script>
<div id="docker_tabbed" style="display: inline; float: right; margin: -47px 0px;"></div>
<div id="dialogAddConfig" style="display: none"></div>
@@ -1114,7 +1125,48 @@ $showAdditionalInfo = '';
</tr>
<tr class="advanced">
<td>Categories:</td>
<td><input type="text" name="contCategory" class="textPath"></td>
<td>
<input type="hidden" name="contCategory">
<select id="catSelect" size="1" multiple="multiple" style="display:none" onchange="prepareCategory();">
<optgroup label="Categories">
<option value="Backup:">Backup</option>
<option value="Cloud:">Cloud</option>
<option value="Downloaders:">Downloaders</option>
<option value="HomeAutomation:">HomeAutomation</option>
<option value="Productivity:">Productivity</option>
<option value="Tools:">Tools</option>
<option value="Other:">Other</option>
</optgroup>
<optgroup label="MediaApp">
<option value="MediaApp:Video">MediaApp:Video</option>
<option value="MediaApp:Music">MediaApp:Music</option>
<option value="MediaApp:Books">MediaApp:Books</option>
<option value="MediaApp:Photos">MediaApp:Photos</option>
<option value="MediaApp:Other">MediaApp:Other</option>
</optgroup>
<optgroup label="MediaServer">
<option value="MediaServer:Video">MediaServer:Video</option>
<option value="MediaServer:Music">MediaServer:Music</option>
<option value="MediaServer:Books">MediaServer:Books</option>
<option value="MediaServer:Photos">MediaServer:Photos</option>
<option value="MediaServer:Other">MediaServer:Other</option>
</optgroup>
<optgroup label="Network">
<option value="Network:Web">Network:Web</option>
<option value="Network:DNS">Network:DNS</option>
<option value="Network:FTP">Network:FTP</option>
<option value="Network:Proxy">Network:Proxy</option>
<option value="Network:Voip">Network:Voip</option>
<option value="Network:Management">Network:Management</option>
<option value="Network:Other">Network:Other</option>
<option value="Network:Messenger">Network:Messenger</option>
</optgroup>
<optgroup label="Development Status">
<option value="Status:Stable">Status:Stable</option>
<option value="Status:Beta">Status:Beta</option>
</optgroup>
</select>
</td>
</tr>
<tr class="advanced">
<td>Support Thread:</td>
@@ -1352,6 +1404,12 @@ $showAdditionalInfo = '';
}
}
// Load the confCategory input into the s1 select
categories=$("input[name='contCategory']").val().split(" ");
for (var i = 0; i < categories.length; i++) {
$("#catSelect option[value='"+categories[i]+"']").prop("selected", true);
}
// Remove empty description
if (!Settings.Description.length) {
$('#canvas').find('#Overview:first').hide();
@@ -1380,6 +1438,8 @@ $showAdditionalInfo = '';
// Add switchButton
$('.switch-on-off').each(function(){var checked = $(this).is(":checked");$(this).switchButton({labels_placement: "right", checked:checked});});
$("#catSelect").dropdownchecklist({emptyText:'Select categories...', maxDropHeight:150, width:300, explicitClose:'...close'});
});
</script>
<?END:?>

52
plugins/dynamix.docker.manager/styles/style-black.css
View File

@@ -51,10 +51,58 @@ jQuery UI adaptation to unRAID's style
border-color:#6AB034;
box-shadow:inset 0 0 8px 4px #548C29,0 1px 0 0 #101010;
}
.ui-dialog .ui-button-text-only[disabled], .ui-dialog ..ui-dialog-titlebar-close[disabled]{
.ui-dialog .ui-button-text-only[disabled], .ui-dialog .ui-dialog-titlebar-close[disabled]{
color:#505050;
border-color:#181818;
background:linear-gradient(#202020,#101010);
background:-webkit-radial-gradient(#202020,#101010);
cursor:default;
}
}
.ui-dropdownchecklist,
.ui-dropdownchecklist-selector{
background:-webkit-radial-gradient(#505050,#303030);
background:linear-gradient(#505050,#303030);
border:none;
box-shadow:0 2px 0 #404040;
border-radius:4px;
outline:none;
cursor:pointer;
height:22px;
line-height:22px;
}
.ui-dropdownchecklist-group{
font-weight:normal;
font-style:italic;
padding:1px 9px 1px 8px;
}
.ui-dropdownchecklist-selector{
border:1px solid #404040;
display:inline-block;cursor:pointer;
padding:1px 9px 1px 8px;
}
.ui-dropdownchecklist-selector-wrapper{
vertical-align:middle;
font-size:0;
}
.ui-state-active{
background:linear-gradient(#303030,#101010);
background:-webkit-radial-gradient(#303030,#101010);
}
.ui-dropdownchecklist-dropcontainer{background:#000000;
border:1px solid #404040;
}
.ui-state-disabled{background:linear-gradient(#202020,#101010);
background:-webkit-radial-gradient(#202020,#101010);
}
.ui-dropdownchecklist-indent{
padding-left:7px;
}
.ui-dropdownchecklist-text{
color:#A0A0A0;
font-size:11px;
}
.ui-dropdownchecklist .ui-widget-content .ui-state-default{
background:#000000;
border:0px;
}