Commit 9bf9364f authored by Son Nguyen's avatar Son Nguyen
Browse files

Display the group subtab in filebrowser (Bug 1278428)



Remove the right border '|' of the last group tab

Change-Id: Ia3a78d6fedaff858879f1a51b4bc37174b0194b2
Signed-off-by: default avatarSon Nguyen <son.nguyen@catalyst.net.nz>
parent 12fe2696
......@@ -848,8 +848,12 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
if (data.changedowner && data.newtabs && data.newtabdata) {
self.tabdata = data.newtabdata;
$(self.id+'_ownertabs').innerHTML = data.newtabs;
if ($(self.id+'_ownersubtabs')) {
$(self.id+'_ownersubtabs').innerHTML = data.newsubtabs;
if (data.newsubtabs) {
$(self.id + '_ownersubtabs').innerHTML = data.newsubtabs;
removeElementClass(self.id + '_ownersubtabs', 'hidden')
}
else {
addElementClass(self.id + '_ownersubtabs', 'hidden');
}
if ($(self.id + '_upload_container')) {
if (data.newtabdata.upload) {
......
......@@ -30,9 +30,9 @@
{include file="artefact:file:form/ownertabs.tpl" tabs=$tabs prefix=$prefix querybase=$querybase}
</div>
<div id="artefactchooser-body">
{if $tabs.subtabs}
<div id="{$prefix}_ownersubtabs">{include file="artefact:file:form/ownersubtabs.tpl" tabs=$tabs prefix=$prefix querybase=$querybase}
</div>{/if}
<div id="{$prefix}_ownersubtabs" {if !$tabs.subtabs}class="hidden"{/if}>
{if $tabs.subtabs}{include file="artefact:file:form/ownersubtabs.tpl" tabs=$tabs prefix=$prefix querybase=$querybase}{/if}
</div>
{/if}
{if $config.upload}
......
{if $tabs.subtabs}
<ul class="artefactchooser-subtabs">
{foreach from=$tabs.subtabs item=displayname key=ownerid}
<li{if $tabs.ownerid == $ownerid} class="current"{/if}><a class="changeowner" href="{$querybase}owner={$tabs.owner}&ownerid={$ownerid}">{$displayname}</a></li>
{foreach from=$tabs.subtabs item=displayname key=ownerid name=subtab}
<li class="{if $tabs.ownerid == $ownerid}current{/if}{if !$dwoo.foreach.subtab.last} showrightborder{/if}"><a class="changeowner" href="{$querybase}owner={$tabs.owner}&ownerid={$ownerid}">{$displayname}</a></li>
{/foreach}
</ul>
{/if}
......@@ -158,7 +158,7 @@ ul.artefactchooser-tabs li.current a:active {
background: none;
}
/******************** Block config sub tabs ********************/
ul.artefactchooser-subtabs li {
ul.artefactchooser-subtabs li.showrightborder {
border-right: 1px solid #D1D1D1;
}
ul.artefactchooser-subtabs li.current a,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment