mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-04-22 16:11:55 +02:00
Code Issues Projects Releases Wiki Activity

Changed deprecated title attribute access

Browse Source
This commit is contained in:
Lucas Bartholemy 2014-07-07 09:34:34 +02:00
parent 8d03361283
commit 60e2a94f58
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protected/modules_core/directory/widgets/views/memberStats.php
View File

@ -21,7 +21,7 @@
<img src="<?php echo $user->getProfileImage()->getUrl(); ?>" class="img-rounded tt img_margin"
height="40" width="40" alt="40x40" data-src="holder.js/40x40" style="width: 40px; height: 40px;"
data-toggle="tooltip" data-placement="top" title=""
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->title; ?>">
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->profile->title; ?>">
</a>
<?php endforeach; ?>
</div>

24
protected/modules_core/space/controllers/AdminController.php
View File

@ -110,7 +110,7 @@ class AdminController extends Controller
$this->adminOnly();
$membersPerPage = 10;
$workspace = $this->getSpace();
$space = $this->getSpace();
// User Role Management
if (isset($_POST['users'])) {
@ -128,10 +128,10 @@ class AdminController extends Controller
if ($user != null) {
// No changes on the Owner
if ($workspace->isOwner($user->id))
if ($space->isOwner($user->id))
continue;
$membership = SpaceMembership::model()->findByAttributes(array('user_id' => $user->id, 'space_id' => $workspace->id));
$membership = SpaceMembership::model()->findByAttributes(array('user_id' => $user->id, 'space_id' => $space->id));
if ($membership != null) {
$membership->invite_role = (isset($userSettings['inviteRole']) && $userSettings['inviteRole'] == 1) ? 1 : 0;
$membership->admin_role = (isset($userSettings['adminRole']) && $userSettings['adminRole'] == 1) ? 1 : 0;
@ -141,16 +141,16 @@ class AdminController extends Controller
}
// Change owner if changed
if ($workspace->isOwner()) {
$owner = $workspace->getOwner();
if ($space->isOwner()) {
$owner = $space->getOwner();
$newOwnerId = Yii::app()->request->getParam('ownerId');
if ($newOwnerId != $owner->id) {
if ($workspace->isMember($newOwnerId)) {
$workspace->setOwner($newOwnerId);
if ($space->isMember($newOwnerId)) {
$space->setOwner($newOwnerId);
// Redirect to current workspace
// Redirect to current space
$this->redirect($this->createUrl('admin/members', array('sguid' => $this->getSpace()->guid)));
}
}
@ -177,18 +177,18 @@ class AdminController extends Controller
}
//ToDo: Better Counting
$allMemberCount = count($workspace->memberships($criteria));
$allMemberCount = count($space->memberships($criteria));
$pages = new CPagination($allMemberCount);
$pages->setPageSize($membersPerPage);
$pages->applyLimit($criteria);
$members = $workspace->memberships($criteria);
$members = $space->memberships($criteria);
$invited_members = SpaceMembership::model()->findAllByAttributes(array('space_id' => $workspace->id, 'status' => SpaceMembership::STATUS_INVITED));
$invited_members = SpaceMembership::model()->findAllByAttributes(array('space_id' => $space->id, 'status' => SpaceMembership::STATUS_INVITED));
$this->render('members', array(
'workspace' => $workspace,
'space' => $space,
'members' => $members, // must be the same as $item_count
'invited_members' => $invited_members,
'item_count' => $allMemberCount,

30
protected/modules_core/space/views/admin/members.php
View File

@ -1,7 +1,7 @@
<?php
/**@var $this AdminController */
/**@var $workspace Space */
/**@var $space Space */
?>
@ -15,7 +15,7 @@
<br/><br/>
<?php echo CHtml::form($this->createUrl('//space/admin/members', array('sguid' => $workspace->guid)), 'GET'); ?>
<?php echo CHtml::form($this->createUrl('//space/admin/members', array('sguid' => $space->guid)), 'GET'); ?>
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6">
@ -36,7 +36,7 @@
</div>
<?php echo Chtml::endForm(); ?>
<?php echo CHtml::form($this->createUrl('//space/admin/members', array('sguid' => $workspace->guid)), 'post'); ?>
<?php echo CHtml::form($this->createUrl('//space/admin/members', array('sguid' => $space->guid)), 'post'); ?>
<?php if ($item_count > 0): ?>
<table class="table table-hover">
@ -85,11 +85,11 @@
<td>
<strong><?php echo CHtml::link($user->displayName, $user->getProfileUrl()); ?></strong>
<br/>
<?php echo $user->title; ?>
<?php echo $user->profile->title; ?>
</td>
<?php if (!$workspace->isOwner($user->id)) : ?>
<?php if (!$space->isOwner($user->id)) : ?>
<td style="vertical-align:middle">
<div class="checkbox">
<label>
@ -126,7 +126,7 @@
'buttonFalse' => Yii::t('SpaceModule.admin', 'No, cancel'),
'class' => 'btn btn-sm btn-danger',
'linkContent' => Yii::t('SpaceModule.admin', 'Remove'),
'linkHref' => $this->createUrl('//space/admin/adminRemoveMember', array('guid' => $workspace->guid, 'userGuid' => $user->guid, 'ajax' => 1))
'linkHref' => $this->createUrl('//space/admin/adminRemoveMember', array('guid' => $space->guid, 'userGuid' => $user->guid, 'ajax' => 1))
));
?>
@ -167,7 +167,7 @@
<?php $owner = $workspace->getOwner(); ?>
<?php $owner = $space->getOwner(); ?>
<?php if ($owner->id == Yii::app()->user->id): ?>
<p>
@ -184,7 +184,7 @@
<div class="col-md-5">
<select name="ownerId" class="form-control">
<?php foreach ($workspace->memberships as $membership) : ?>
<?php foreach ($space->memberships as $membership) : ?>
<?php if ($membership->user == null) continue; ?>
<option
value="<?php echo $membership->user->id; ?>" <?php if ($membership->user->id == $owner->id): ?> selected <?php endif; ?>><?php echo $membership->user->displayName; ?></option>
@ -211,7 +211,7 @@
</div>
</div>
<?php if (count($workspace->applicants) != 0) : ?>
<?php if (count($space->applicants) != 0) : ?>
<div class="panel panel-danger">
<div class="panel-heading">
<?php echo Yii::t('SpaceModule.admin', '<strong>Outstanding</strong> user requests'); ?>
@ -232,7 +232,7 @@
</tr>
</thead>
<tbody>
<?php foreach ($workspace->applicants as $membership) : ?>
<?php foreach ($space->applicants as $membership) : ?>
<?php $user = $membership->user; ?>
<tr>
<td width="40px">
@ -247,14 +247,14 @@
<td>
<strong><?php echo CHtml::link($user->displayName, $user->getProfileUrl()); ?></strong>
<br/>
<?php echo $user->title; ?>
<?php echo $user->profile->title; ?>
</td>
<td>
<?php echo CHtml::encode($membership->request_message); ?>
</td>
<td width="150px">
<?php echo CHtml::link(Yii::t('SpaceModule.admin', 'Accept'), $this->createUrl('//space/admin/adminMembersApproveApplicant', array('sguid' => $workspace->guid, 'userGuid' => $user->guid, 'approve' => true)), array('class' => "btn btn-sm btn-success")); ?>
<?php echo CHtml::link(Yii::t('SpaceModule.admin', 'Decline'), $this->createUrl('//space/admin/adminMembersRejectApplicant', array('sguid' => $workspace->guid, 'userGuid' => $user->guid, 'reject' => true)), array('class' => "btn btn-sm btn-danger")); ?>
<?php echo CHtml::link(Yii::t('SpaceModule.admin', 'Accept'), $this->createUrl('//space/admin/adminMembersApproveApplicant', array('sguid' => $space->guid, 'userGuid' => $user->guid, 'approve' => true)), array('class' => "btn btn-sm btn-success")); ?>
<?php echo CHtml::link(Yii::t('SpaceModule.admin', 'Decline'), $this->createUrl('//space/admin/adminMembersRejectApplicant', array('sguid' => $space->guid, 'userGuid' => $user->guid, 'reject' => true)), array('class' => "btn btn-sm btn-danger")); ?>
</td>
</tr>
<?php endforeach; ?>
@ -306,10 +306,10 @@
<td>
<strong><?php echo CHtml::link($user->displayName, $user->getProfileUrl()); ?></strong>
<br/>
<?php echo $user->title; ?>
<?php echo $user->profile->title; ?>
</td>
<td width="100px">
<?php echo CHtml::link(Yii::t('SpaceModule.admin', 'Revoke invitation'), $this->createUrl('//space/admin/adminMembersRejectApplicant', array('sguid' => $workspace->guid, 'userGuid' => $user->guid, 'reject' => true)), array('class' => "btn btn-sm btn-primary")); ?>
<?php echo CHtml::link(Yii::t('SpaceModule.admin', 'Revoke invitation'), $this->createUrl('//space/admin/adminMembersRejectApplicant', array('sguid' => $space->guid, 'userGuid' => $user->guid, 'reject' => true)), array('class' => "btn btn-sm btn-primary")); ?>
</td>
</tr>
<?php endforeach; ?>

4
protected/modules_core/space/widgets/views/spaceMembers.php
View File

@ -18,7 +18,7 @@
src="<?php echo $user->getProfileImage()->getUrl(); ?>" height="24" width="24"
alt="24x24" data-src="holder.js/24x24" style="width: 24px; height: 24px;"
data-toggle="tooltip" data-placement="top" title=""
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->title; ?>"/>
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->profile->title; ?>"/>
</a>
@ -65,7 +65,7 @@
<img src="<?php echo $user->getProfileImage()->getUrl(); ?>" class="img-rounded tt img_margin"
height="24" width="24" alt="24x24" data-src="holder.js/24x24"
style="width: 24px; height: 24px;" data-toggle="tooltip" data-placement="top" title=""
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->title; ?>">
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->profile->title; ?>">
</a>
<?php if ($space->isAdmin($user->id)) { ?>
<!-- output, if user is admin of this space -->

2
protected/modules_core/user/views/profile/header.php
View File

@ -39,7 +39,7 @@
<div class="img-profile-data">
<h1><?php echo $this->getUser()->displayName; ?></h1>
<h2><?php echo $this->getUser()->title; ?></h2>
<h2><?php echo $this->getUser()->profile->title; ?></h2>
</div>
<div class="image-upload-buttons" id="banner-image-upload-buttons">

2
themes/HumHub/views/directory/widgets/memberStats.php
View File

@ -21,7 +21,7 @@
<img src="<?php echo $user->getProfileImage()->getUrl(); ?>" class="img-rounded tt img_margin"
height="40" width="40" alt="40x40" data-src="holder.js/40x40" style="width: 40px; height: 40px;"
data-toggle="tooltip" data-placement="top" title=""
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->title; ?>">
data-original-title="<strong><?php echo $user->displayName; ?></strong><br><?php echo $user->profile->title; ?>">
</a>
<?php endforeach; ?>
</div>