Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit da9b9ba

Browse files
committed
ENH: Refs #0299. Keep community/user action list consistent when a folder or item is clicked.
1 parent c0a6e84 commit da9b9ba

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

core/public/js/community/community.manage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ $(document).ready(function() {
8686
var ajaxSelectRequest='';
8787
function callbackSelect(node)
8888
{
89-
$('div.genericAction').hide();
89+
$('div.genericAction').show();
9090
$('div.genericCommunities').hide();
9191
$('div.genericStats').hide();
9292
$('div.viewInfo').show();

core/public/js/community/community.view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
var ajaxSelectRequest='';
2929
function callbackSelect(node)
3030
{
31-
$('div.genericAction').hide();
31+
$('div.genericAction').show();
3232
$('div.genericCommunities').hide();
3333
$('div.genericStats').hide();
3434
$('div.viewInfo').show();

core/public/js/user/user.userpage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
var ajaxSelectRequest='';
2525
function callbackSelect(node)
2626
{
27-
$('div.genericAction').hide();
27+
$('div.genericAction').show();
2828
$('div.genericCommunities').hide();
2929
$('div.genericStats').hide();
3030
$('div.biographyBlock').hide();

core/views/community/manage.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
275275
<h1>Actions</h1>
276276
<ul>
277277
<li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/FileTree/directory.png'/> {$this->t('Create top level Folder')}</a></li>
278-
<li><a href='javascript:;' id='communityDeleteLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/close.png'/> {$this->t('Delete')}</a></li>
278+
<li><a href='javascript:;' id='communityDeleteLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/close.png'/> {$this->t('Delete Community')}</a></li>
279279
</ul>
280280
</div>";
281281
}
@@ -324,7 +324,6 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
324324

325325

326326
<div class="sideElementFirst viewAction">
327-
<h1>Actions</h1>
328327
<ul>
329328
<li>
330329

core/views/community/view.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ foreach($this->customCSSs as $Uris)
216216
</div>
217217

218218
<div class="sideElementFirst viewAction">
219-
<h1>Actions</h1>
220219
<ul>
221220
<li>
222221

core/views/user/manage.phtml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,17 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
8585

8686
<div class="viewSideBar">
8787

88-
<div class="sideElementFirst viewAction">
89-
<h1>Actions</h1>
88+
<div class="sideElementFirst">
89+
<h1>Actions</h1>
9090
<ul>
9191
<?php
9292
echo "<li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/FileTree/directory.png'/> {$this->t('Create top level Folder')}</a></li>";
9393
?>
9494
</ul>
9595
</div>
96+
<div class="sideElementFirst viewAction">
97+
<ul/>
98+
</div>
9699
<div class="sideElement viewSelected" >
97100
<h1><?php echo $this->t('Selected')?></h1>
98101
<span></span>

core/views/user/userpage.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
206206

207207

208208
<div class="sideElementFirst viewAction">
209-
<h1>Actions</h1>
210209
<ul>
211210
<li>
212211

0 commit comments

Comments
 (0)