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

Commit 251c1bd

Browse files
zachmullenzachmullen
committed
ENH: refs #0377. Add quota tab on community manage page
1 parent dfc705e commit 251c1bd

File tree

4 files changed

+40
-37
lines changed

4 files changed

+40
-37
lines changed

‎core/controllers/CommunityController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ function manageAction()
299299
$this->view->json['community']['message']['createGroup'] = $this->t('Create a group');
300300
$this->view->json['community']['message']['editGroup'] = $this->t('Edit a group');
301301

302-
$this->view->customTabs = Zend_Registry::get('notifier')->callback('CALLBACK_CORE_GET_COMMUNITY_MANAGE_TABS', array());
302+
$this->view->customTabs = Zend_Registry::get('notifier')->callback('CALLBACK_CORE_GET_COMMUNITY_MANAGE_TABS', array('community' => $communityDao));
303303
}//end manageAction
304304

305305

‎core/views/community/manage.phtml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
3939
<?php
4040
echo '<div style="float:right;margin-right:2px;" class="genericBigButton ">';
4141
echo "<a href='{$this->webroot}/community/{$this->communityDao->getKey()}'><img style='float:left;margin-right:2px;' alt='' src='{$this->coreWebroot}/public/images/icons/back.png'/>";
42-
echo $this->t('Back');
42+
echo $this->t('Back');
4343
echo "</a>";
4444
echo '</div>';
45-
45+
4646
?>
4747
</div>
4848
<div class="genericName"><?php echo $this->communityDao->getName();?></div>
@@ -56,11 +56,11 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
5656
<li><a href="#tabs-3"><?php echo $this->t('Files');?></a></li>
5757
<?php
5858
foreach($this->customTabs as $modules)
59-
{
60-
foreach($modules as $name => $url)
61-
{
62-
echo "<li><a href='{$url}?communityId={$this->communityDao->getKey()}'>{$name}</a></li>";
63-
}
59+
{
60+
foreach($modules as $name => $url)
61+
{
62+
echo "<li><a href='{$url}?communityId={$this->communityDao->getKey()}'>{$name}</a></li>";
63+
}
6464
}
6565
?>
6666
</ul>
@@ -90,19 +90,19 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
9090
</form>
9191

9292
</div>
93-
93+
9494
<div id="tabs-members">
9595
<td style="width: 50%;vertical-align: top;">
9696
<div class='communityMemberList'>
97-
<?php
97+
<?php
9898
$allgroups=$this->groups;
9999
$allgroups['admin']=$this->adminGroup;
100100
$allgroups['moderator']=$this->moderatorGroup;
101101
foreach($allgroups as $k => $group)
102102
{
103103
$allgroups[$k]->users = $group->getUsers();
104104
}
105-
105+
106106
$administratorIds = array();
107107
$moderatorsIds = array();
108108
foreach($allgroups['admin']->users as $user)
@@ -113,16 +113,16 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
113113
{
114114
$moderatorsIds[] = $user->getKey();
115115
}
116-
?>
117-
<h4><?php echo $this->t('Community\'s Members')?>:</h4>
116+
?>
117+
<h4><?php echo $this->t('Community\'s Members')?>:</h4>
118118
<?php
119119
echo "<div id='memberList'>";
120120
echo '<table cellpadding="0" cellspacing="0" border="0" class="display dataTable">';
121121
echo "<thead>
122122
<tr>
123123
<th>Name</th><th style='display:none'></th><th style='display:none'></th>
124124
</tr>
125-
</thead>";
125+
</thead>";
126126
foreach($this->members as $user)
127127
{
128128
echo "<tr>";
@@ -156,11 +156,11 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
156156
</div>
157157

158158
</div>
159-
159+
160160
<div id="tabs-2">
161161
<a href="javascript:;" id='createGroupLink'> <?php echo $this->t('Create a group')?></a>
162162
<div id="groupsList">
163-
<h4><?php echo $this->t('Groups')?>:</h4>
163+
<h4><?php echo $this->t('Groups')?>:</h4>
164164
<?php
165165
echo '<ul>';
166166
if(empty($this->groups))
@@ -190,7 +190,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
190190
<tr>
191191
<th>Name</th>
192192
</tr>
193-
</thead>";
193+
</thead>";
194194
foreach($group->users as $user)
195195
{
196196
echo "<tr>";
@@ -236,7 +236,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
236236
<?php
237237
$communityId = $this->communityDao->getKey();
238238
$node = MIDAS_MAXIMUM_FOLDER_NUMBERS_PER_LEVEL * $communityId;
239-
239+
240240
foreach($this->folders as $folder)
241241
{
242242
$folderId = $folder->getFolderId();
@@ -255,8 +255,8 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
255255
echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='$folderId' /></td>";
256256
echo "</tr>";
257257
$node++;
258-
}
259-
258+
}
259+
260260
foreach($this->items as $item)
261261
{
262262
echo "<tr id='node--$node' policy='{$item->policy}' privacy='{$item->getPrivacyStatus()}' class='' type='item' element='{$item->getItemId()}' >";
@@ -275,7 +275,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
275275
<div class="userPersonalData">
276276
<span class="userDataTitle">
277277
<?php echo 'Your personal data'?></span>
278-
<br/>
278+
<br/>
279279
<table id="browseTable" class="midasTree">
280280
<thead>
281281
<th class="thData"><?php echo $this->t('Name');?></th>
@@ -296,8 +296,8 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
296296
echo " <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";
297297
echo "</tr>";
298298
$node++;
299-
}
300-
299+
}
300+
301301
foreach($this->userPersonalItems as $item)
302302
{
303303
echo "<tr id='node--$node' policy='{$item->policy}' privacy='{$item->getPrivacyStatus()}' class='' type='item' element='{$item->getItemId()}' >";
@@ -310,28 +310,28 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
310310
}
311311
?>
312312
</tbody>
313-
</table>
313+
</table>
314314
</div>
315315
</div>
316316
</div>
317317
</div>
318318
<div class="viewSideBar">
319-
319+
320320
<?php
321321
if($this->isAdmin)
322322
{
323-
echo "
323+
echo "
324324
<div class='sideElementFirst genericAction'>
325325
<h1>Actions</h1>
326326
<ul>
327327
<li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/icons/folder_add.png'/> {$this->t('Create a top level Folder')}</a></li>
328328
<li><a href='javascript:;' id='communityDeleteLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/close.png'/> {$this->t('Delete Community')}</a></li>
329329
</ul>
330-
</div>";
330+
</div>";
331331
}
332332
?>
333333
<div class="sideElement<?php echo (!$this->isModerator&&!$this->isAdmin&&!$this->isMember)?'First':''?> genericCommunities">
334-
<h1><?php echo $this->t('Members')?></h1>
334+
<h1><?php echo $this->t('Members')?></h1>
335335
<ul>
336336
<?php
337337
$i=0;
@@ -344,7 +344,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
344344
</ul>
345345
</div>
346346
<div class="sideElement memberSelection" style="display:none;">
347-
<h1><?php echo $this->t('Selected')?></h1>
347+
<h1><?php echo $this->t('Selected')?></h1>
348348
<ul>
349349
<?php
350350
foreach($this->groups as $group)
@@ -357,22 +357,22 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
357357
</ul>
358358
</div>
359359
<div class="sideElement groupUsersSelection" style="display:none;">
360-
<h1><?php echo $this->t('Selected')?></h1>
360+
<h1><?php echo $this->t('Selected')?></h1>
361361
<ul>
362362
<li><a class='removeUserLink'><?php echo $this->t('Remove from group')?></a></li>
363363
</ul>
364364
</div>
365365
<div class="sideElementLast genericStats">
366-
<h1>Stats</h1>
367-
366+
<h1>Stats</h1>
367+
368368
<?php
369369
echo "<ul>";
370370
echo " <li>".count($this->members)." {$this->t("member")}".((count($this->members)>1)?'s':'')."</li>";
371371
echo "</ul>";
372372
?>
373373
</div>
374374

375-
375+
376376
<div class="sideElementFirst viewAction">
377377
<ul>
378378
<li>
@@ -381,7 +381,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
381381
</ul>
382382
</div>
383383
<div class="sideElementLast viewInfo">
384-
<h1>Info</h1>
384+
<h1>Info</h1>
385385
<img class="infoLoading" style="display:none;" alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif"/>
386386
<div class="ajaxInfoElement">
387387
</div>

‎modules/communityagreement/Notification.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function init()
4444
*
4545
* @return array
4646
*/
47-
public function getCommunityManageTabs()
47+
public function getCommunityManageTabs($args)
4848
{
4949
$fc = Zend_Controller_Front::getInstance();
5050
$moduleWebroot = $fc->getBaseUrl().'/communityagreement';

‎modules/sizequota/Notification.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,18 @@ class Sizequota_Notification extends MIDAS_Notification
2828
/** init notification process */
2929
public function init()
3030
{
31-
$this->addCallBack('CALLBACK_CORE_GET_MANAGE_COMMUNITY_TABS', 'getCommunityTab');
31+
$this->addCallBack('CALLBACK_CORE_GET_COMMUNITY_MANAGE_TABS', 'getCommunityTab');
3232
$this->addCallBack('CALLBACK_CORE_GET_USER_TABS', 'getUserTab');
3333
//$this->addCallBack('CALLBACK_CORE_VALIDATE_UPLOAD', 'validateUpload');
3434
}
3535

3636
/** Add a tab to the manage community page for size quota */
3737
public function getCommunityTab($args)
3838
{
39-
//TODO
39+
$community = $args['community'];
40+
$fc = Zend_Controller_Front::getInstance();
41+
$moduleWebroot = $fc->getBaseUrl().'/'.$this->moduleName;
42+
return array($this->t('Storage Quota') => $moduleWebroot.'/config/folder?folderId='.$community->getFolderId());
4043
}
4144

4245
/** Add a tab to the user's main page for size quota */

0 commit comments

Comments
 (0)