mirror of
https://github.com/humhub/humhub.git
synced 2025-04-24 17:24:39 +02:00
Merge branch 'master' of github.com:humhub/humhub
This commit is contained in:
Lucas Bartholemy
commit
9120996397
@ -10,7 +10,7 @@
|
||||
*/
|
||||
?>
|
||||
|
||||
<div class="panel panel-default activities">
|
||||
<div class="panel panel-default panel-activities">
|
||||
<div class="panel-heading"><?php echo Yii::t('ActivityModule.base', 'Latest activities'); ?></div>
|
||||
<div id="activityStream">
|
||||
<div id="activityEmpty" style="display:none">
|
||||
|
||||
@ -36,7 +36,7 @@ $form = $this->beginWidget('CActiveForm', array(
|
||||
|
||||
<hr>
|
||||
<?php echo CHtml::submitButton(Yii::t('AdminModule.base', 'Send & save'), array('class' => 'btn btn-primary')); ?>
|
||||
<a href="<?php echo $this->createUrl('//admin/approval/'); ?>"
|
||||
<a href="<?php echo $this->createUrl('//admin/approval/'); ?>"
|
||||
class="btn btn-primary"><?php echo Yii::t('AdminModule.base', 'Cancel'); ?></a>
|
||||
|
||||
<?php $this->endWidget(); ?>
|
||||
|
||||
@ -34,6 +34,6 @@ $form = $this->beginWidget('CActiveForm', array(
|
||||
</script>
|
||||
<hr/>
|
||||
<?php echo CHtml::submitButton(Yii::t('SpaceModule.base', 'Send & decline'), array('class' => 'btn btn-danger')); ?>
|
||||
<a href="<?php echo $this->createUrl('//admin/approval/'); ?>" class="btn btn-primary"><?php echo Yii::t('AdminModule.base', 'Cancel'); ?></a>
|
||||
<a href="<?php echo $this->createUrl('//admin/approval/'); ?>" class="btn btn-primary"><?php echo Yii::t('AdminModule.base', 'Cancel'); ?></a>
|
||||
|
||||
<?php $this->endWidget(); ?>
|
||||
@ -17,27 +17,44 @@
|
||||
<ul class="dropdown-menu">
|
||||
<!--<li><a href="#"><i class="icon-check"></i> <?php echo Yii::t('WallModule.base', 'Show all'); ?></a></li>-->
|
||||
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_userinvoled"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Where I´m involved'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_mine"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Created by me'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_userinvoled"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Where I´m involved'); ?></a>
|
||||
</li>
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_mine"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Created by me'); ?></a></li>
|
||||
|
||||
<!-- post module related -->
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_files"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Content with attached files'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_posts_links"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Posts with links'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_model_posts"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Posts only'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_files"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Content with attached files'); ?>
|
||||
</a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_posts_links"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Posts with links'); ?></a>
|
||||
</li>
|
||||
<li><a href="#" class="wallFilter" id="filter_model_posts"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Posts only'); ?></a></li>
|
||||
<!-- /post module related -->
|
||||
|
||||
<li class="divider"></li>
|
||||
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_archived"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Include archived posts'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_visibility_public"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Only public posts'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_visibility_private"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Only private posts'); ?></a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_entry_archived"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Include archived posts'); ?>
|
||||
</a></li>
|
||||
<li><a href="#" class="wallFilter" id="filter_visibility_public"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Only public posts'); ?></a>
|
||||
</li>
|
||||
<li><a href="#" class="wallFilter" id="filter_visibility_private"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Only private posts'); ?></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><?php echo Yii::t('WallModule.base', 'Sorting'); ?> <b class="caret"></b></a>
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><?php echo Yii::t('WallModule.base', 'Sorting'); ?>
|
||||
<b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#" class="wallSorting" id="sorting_c"><i class="icon-check"></i> <?php echo Yii::t('WallModule.base', 'Creation time'); ?></a></li>
|
||||
<li><a href="#" class="wallSorting" id="sorting_u"><i class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Last update'); ?></a></li>
|
||||
<li><a href="#" class="wallSorting" id="sorting_c"><i
|
||||
class="icon-check"></i> <?php echo Yii::t('WallModule.base', 'Creation time'); ?></a></li>
|
||||
<li><a href="#" class="wallSorting" id="sorting_u"><i
|
||||
class="icon-check-empty"></i> <?php echo Yii::t('WallModule.base', 'Last update'); ?></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
@ -58,10 +75,19 @@
|
||||
</div>
|
||||
<?php elseif ($type == Wall::TYPE_USER): ?>
|
||||
|
||||
<div class="placeholder placeholder-empty-stream">
|
||||
<?php echo Yii::t('WallModule.base', '<b>There is still nothing happens</b><br>Be the first who post something...'); ?>
|
||||
</div>
|
||||
<?php elseif ($type == Wall::TYPE_SPACE): ?>
|
||||
<?php if ($this->contentContainer->id == Yii::app()->user->id) { ?>
|
||||
<div class="placeholder placeholder-empty-stream">
|
||||
<?php echo Yii::t('WallModule.base', '<b>Your profile stream is still empty</b><br>Get started and post something...'); ?>
|
||||
</div>
|
||||
<?php } else { ?>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<?php echo Yii::t('WallModule.base', '<b>This profile stream is still empty</b>'); ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php
|
||||
elseif ($type == Wall::TYPE_SPACE): ?>
|
||||
<div class="placeholder placeholder-empty-stream">
|
||||
<?php echo Yii::t('WallModule.base', '<b>This space is still empty!</b><br>Make the beginning and post something...'); ?>
|
||||
</div>
|
||||
@ -79,7 +105,8 @@
|
||||
<!-- DIV for an single wall entry -->
|
||||
<div class="s2_single">
|
||||
<div class="back_button_holder">
|
||||
<a href="#" class="singleBackLink btn btn-primary"><?php echo Yii::t('WallModule.base', 'Back to stream'); ?></a><br><br>
|
||||
<a href="#"
|
||||
class="singleBackLink btn btn-primary"><?php echo Yii::t('WallModule.base', 'Back to stream'); ?></a><br><br>
|
||||
</div>
|
||||
<div class="p_border"></div>
|
||||
|
||||
@ -92,21 +119,22 @@
|
||||
|
||||
<script>
|
||||
|
||||
$(document).ready(function() {
|
||||
$(document).ready(function () {
|
||||
|
||||
s = new Stream("#wallStream", "<?php echo $startUrl; ?>", "<?php echo $reloadUrl; ?>", "<?php echo $singleEntryUrl; ?>");
|
||||
<?php if (false): ?>s.markAsReadOnly();<?php endif; ?>
|
||||
<?php if (false): ?>s.markAsReadOnly();
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
<?php
|
||||
// if we should show a single wall entry (e.g. search)
|
||||
$wallEntryId = (int) Yii::app()->request->getParam('wallEntryId');
|
||||
?>
|
||||
<?php if ($wallEntryId) : ?>
|
||||
s.showItem(<?php echo $wallEntryId; ?>);
|
||||
<?php else: ?>
|
||||
s.showStream();
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
// if we should show a single wall entry (e.g. search)
|
||||
$wallEntryId = (int) Yii::app()->request->getParam('wallEntryId');
|
||||
?>
|
||||
<?php if ($wallEntryId) : ?>
|
||||
s.showItem(<?php echo $wallEntryId; ?>);
|
||||
<?php else: ?>
|
||||
s.showStream();
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
// Indicates this is the primary stream (not a module stream)
|
||||
|
||||
@ -38,7 +38,6 @@
|
||||
<?php foreach ($results as $result): ?>
|
||||
<?php echo $result; ?>
|
||||
<?php endforeach; ?>
|
||||
|
||||
</ul>
|
||||
<?php else: ?>
|
||||
|
||||
|
||||
@ -8,25 +8,22 @@
|
||||
?>
|
||||
|
||||
<!-- start: list-group navi for large devices -->
|
||||
<div class="list-group">
|
||||
<?php foreach ($this->getItemGroups() as $group) : ?>
|
||||
|
||||
<?php foreach ($this->getItemGroups() as $group) : ?>
|
||||
|
||||
<?php $items = $this->getItems($group['id']); ?>
|
||||
<?php if (count($items) == 0) continue; ?>
|
||||
<div class="list-group <?php echo $group['id']; ?>">
|
||||
<?php $items = $this->getItems($group['id']); ?>
|
||||
<?php if (count($items) == 0) continue; ?>
|
||||
|
||||
<?php if ($group['label'] != "") : ?>
|
||||
<span class="list-group-item"><h4><?php echo $group['label']; ?></h4></span>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php foreach ($items as $item) : ?>
|
||||
<a href="<?php echo $item['url']; ?>"
|
||||
class="list-group-item <?php if ($item['isActive']): ?>active<?php endif; ?>">
|
||||
<a href="<?php echo $item['url']; ?>" class="list-group-item <?php if ($item['isActive']): ?>active<?php endif; ?>">
|
||||
<?php echo $item['icon']; ?>
|
||||
<span><?php echo $item['label']; ?></span>
|
||||
</a>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<!-- end: list-group navi for large devices -->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user