GreenVolume / humhub-themes-MadeHub

views/space/space/_layout-x.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
 				</nav>
 			</div>
 			<?php
-			echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
-				[\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
-				[\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
-				[\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
-			]]);
-			?>
+            echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
+                [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
+                [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
+                [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
+            ]]);
+            ?>
 		</div>
 	</div>
 	<div class="col-sm-8">

views/space/space/_layout.php

Indentation +6 added lines, -6 removed lines

@@ -23,12 +23,12 @@
 			</div>
 			<div class="col-md-3 layout-sidebar-container">
 				<?php
-				echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
-						[\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
-						[\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
-						[\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
-				]]);
-				?>
+                echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
+                        [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
+                        [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
+                        [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
+                ]]);
+                ?>
 			</div>
 		<?php endif; ?>
 	</div>

Braces +5 added lines, -2 removed lines

@@ -17,9 +17,12 @@
 			<div class="col-md-10 layout-content-container">
 				<?php echo $content; ?>
 			</div>
-		<?php else: ?>
+		<?php else {
+    : ?>
 			<div class="col-md-7 layout-content-container">
-				<?php echo $content; ?>
+				<?php echo $content;
+}
+?>
 			</div>
 			<div class="col-md-3 layout-sidebar-container">
 				<?php

views/space/widgets/spaceChooser.php

Indentation +16 added lines, -16 removed lines

@@ -12,19 +12,19 @@ 
 		<!-- start: Show space image and name if chosen -->
 		<?php if ($currentSpace) { ?>
 			<?php echo \humhub\modules\space\widgets\Image::widget([
-				'space' => $currentSpace,
-				'width' => 24,
-				'htmlOptions' => [
-					'class' => 'current-space-image',
-				]
-			]); ?>
+                'space' => $currentSpace,
+                'width' => 24,
+                'htmlOptions' => [
+                    'class' => 'current-space-image',
+                ]
+            ]); ?>
 		<?php } ?>
 
 		<?php
-		if (!$currentSpace) {
-			echo '<i class="material-icons">assignment_turned_in</i>';
-		}
-		?>
+        if (!$currentSpace) {
+            echo '<i class="material-icons">assignment_turned_in</i>';
+        }
+        ?>
 		<!-- end: Show space image and name if chosen -->
 	</a>
 	<ul class="dropdown-menu" id="space-menu-dropdownXXX">
@@ -52,12 +52,12 @@ 
 							<div class="media">
 								<!-- Show space image -->
 								<?php echo \humhub\modules\space\widgets\Image::widget([
-									'space' => $membership->space,
-									'width' => 24,
-									'htmlOptions' => [
-										'class' => 'pull-left',
-									]
-								]); ?>
+                                    'space' => $membership->space,
+                                    'width' => 24,
+                                    'htmlOptions' => [
+                                        'class' => 'pull-left',
+                                    ]
+                                ]); ?>
 								<div class="media-body">
 									<strong><?php echo Html::encode($membership->space->name); ?></strong>
 									<?php if ($newItems != 0): ?>

views/space/widgets/header.php

Indentation +8 added lines, -8 removed lines

@@ -67,10 +67,10 @@ 
                             class="fa fa-cloud-upload"></i></a>
                     <a id="banner-image-upload-edit-button"
                        style="<?php
-                       if (!$space->getProfileBannerImage()->hasImage()) {
-                           echo 'display: none;';
-                       }
-                       ?>"
+                        if (!$space->getProfileBannerImage()->hasImage()) {
+                            echo 'display: none;';
+                        }
+                        ?>"
                        href="<?php echo $space->createUrl('/space/manage/image/crop-banner'); ?>"
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
                             class="fa fa-edit"></i></a>
@@ -127,10 +127,10 @@ 
                             class="fa fa-cloud-upload"></i></a>
                     <a id="profile-image-upload-edit-button"
                        style="<?php
-                       if (!$space->getProfileImage()->hasImage()) {
-                           echo 'display: none;';
-                       }
-                       ?>"
+                        if (!$space->getProfileImage()->hasImage()) {
+                            echo 'display: none;';
+                        }
+                        ?>"
                        href="<?php echo $space->createUrl('/space/manage/image/crop'); ?>"
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
                             class="fa fa-edit"></i></a>

Braces +5 added lines, -2 removed lines

@@ -102,8 +102,11 @@
                    data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'>
                        <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
                 </a>
-            <?php else : ?>
-                <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
+            <?php else {
+    : ?>
+                <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]);
+}
+?>
             <?php endif; ?>
 
             <!-- check if the current user is the profile owner and can change the images -->

views/space/widgets/requestMembership.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                         'success' => 'function(html){
 				jQuery("#lightbox_requestWorkspace").replaceWith(html);
 			}',
-                    ), array('class' => 'input_button', 'id' => 'requestSubmit'.uniqid()));
+                    ), array('class' => 'input_button', 'id' => 'requestSubmit' . uniqid()));
                     ?>
 
                     <?php echo CHtml::link(Yii::t('SpaceModule.widgets_views_requestMembership', 'Cancel'), '#', array('onclick'=>'RequestWorkspacebox.close()', 'class' => 'button', 'style' => 'color: #fff;')); ?>

views/space/widgets/spaceNameColorInput.php

Spacing +5 added lines, -5 removed lines

@@ -5,11 +5,11 @@ 
     $this->registerCssFile('@web/resources/space/colorpicker/css/bootstrap-colorpicker.min.css', ['position'=>  yii\web\View::POS_BEGIN, 'depends' => [\yii\bootstrap\BootstrapPluginAsset::className()]]);
     
     $ts = time();
-    $inputId = $ts.'space-color-picker-edit';
-    $containerId = $ts.'space-color-chooser-edit';
-    $addonClass = $ts.'input-group-addon';
+    $inputId = $ts . 'space-color-picker-edit';
+    $containerId = $ts . 'space-color-chooser-edit';
+    $addonClass = $ts . 'input-group-addon';
     
-    if($model->color == null) {
+    if ($model->color == null) {
         $model->color = '#d1d1d1';
     }
 ?>
@@ -25,7 +25,7 @@ 
             {input}
         </div>
         {error}{hint}'
-        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45 ]) ?>
+        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45]) ?>
 </div>
 <script type="text/javascript">
     // prevent enter key and simulate ajax button submit click

views/space/widgets/header-.php

Indentation +77 added lines, -77 removed lines

@@ -4,9 +4,9 @@ 
 use yii\helpers\Url;
 use yii\helpers\Html;
 if ($space->isAdmin()) {
-	$this->registerJsFile('@web/resources/space/spaceHeaderImageUpload.js');
-	$this->registerJsVar('profileImageUploaderUrl', $space->createUrl('/space/manage/image/upload'));
-	$this->registerJsVar('profileHeaderUploaderUrl', $space->createUrl('/space/manage/image/banner-upload'));
+    $this->registerJsFile('@web/resources/space/spaceHeaderImageUpload.js');
+    $this->registerJsVar('profileImageUploaderUrl', $space->createUrl('/space/manage/image/upload'));
+    $this->registerJsVar('profileHeaderUploaderUrl', $space->createUrl('/space/manage/image/banner-upload'));
 }
 ?>
 
@@ -47,28 +47,28 @@ 
 							class="fa fa-cloud-upload"></i></a>
 					<a id="profile-image-upload-edit-button"
 					   style="<?php
-					   if (!$space->getProfileImage()->hasImage()) {
-						   echo 'display: none;';
-					   }
-					   ?>"
+                        if (!$space->getProfileImage()->hasImage()) {
+                            echo 'display: none;';
+                        }
+                        ?>"
 					   href="<?php echo $space->createUrl('/space/manage/image/crop'); ?>"
 					   class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
 							class="fa fa-edit"></i></a>
 						<?php
-						echo humhub\widgets\ModalConfirm::widget(array(
-							'uniqueID' => 'modal_profileimagedelete',
-							'linkOutput' => 'a',
-							'title' => Yii::t('SpaceModule.widgets_views_deleteImage', '<strong>Confirm</strong> image deleting'),
-							'message' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Do you really want to delete your profile image?'),
-							'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Delete'),
-							'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Cancel'),
-							'linkContent' => '<i class="fa fa-times"></i>',
-							'cssClass' => 'btn btn-danger btn-sm',
-							'style' => $space->getProfileImage()->hasImage() ? '' : 'display: none;',
-							'linkHref' => $space->createUrl("/space/manage/image/delete", array('type' => 'profile')),
-							'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
-						));
-						?>
+                        echo humhub\widgets\ModalConfirm::widget(array(
+                            'uniqueID' => 'modal_profileimagedelete',
+                            'linkOutput' => 'a',
+                            'title' => Yii::t('SpaceModule.widgets_views_deleteImage', '<strong>Confirm</strong> image deleting'),
+                            'message' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Do you really want to delete your profile image?'),
+                            'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Delete'),
+                            'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Cancel'),
+                            'linkContent' => '<i class="fa fa-times"></i>',
+                            'cssClass' => 'btn btn-danger btn-sm',
+                            'style' => $space->getProfileImage()->hasImage() ? '' : 'display: none;',
+                            'linkHref' => $space->createUrl("/space/manage/image/delete", array('type' => 'profile')),
+                            'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
+                        ));
+                        ?>
 				</div>
 			<?php endif; ?>
 
@@ -97,22 +97,22 @@ 
 			</div>
 					<div  class="row no-margin p-v-sm b-b">
 						<?php
-						echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
-								[\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
-								[\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
-								[\humhub\modules\space\widgets\FollowButton::className(), [
-										'space' => $space,
-										'followOptions' => ['class' => 'btn btn-primary'],
-										'unfollowOptions' => ['class' => 'btn btn-info']],
-									['sortOrder' => 30]]
-						]]);
-						?>
+                        echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
+                                [\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
+                                [\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
+                                [\humhub\modules\space\widgets\FollowButton::className(), [
+                                        'space' => $space,
+                                        'followOptions' => ['class' => 'btn btn-primary'],
+                                        'unfollowOptions' => ['class' => 'btn btn-info']],
+                                    ['sortOrder' => 30]]
+                        ]]);
+                        ?>
 						<?=
-						humhub\modules\space\widgets\HeaderControlsMenu::widget([
-							'space' => $space,
-							'template' => '@humhub/widgets/views/dropdownNavigation'
-						]);
-						?>
+                        humhub\modules\space\widgets\HeaderControlsMenu::widget([
+                            'space' => $space,
+                            'template' => '@humhub/widgets/views/dropdownNavigation'
+                        ]);
+                        ?>
 					</div>
 
 
@@ -129,15 +129,15 @@ 
 				</form>
 
 				<?php
-				// set standard padding for banner progressbar
-				$padding = '90px 350px';
+                // set standard padding for banner progressbar
+                $padding = '90px 350px';
 
-				// if the default banner image is displaying
-				if (!$space->getProfileBannerImage()->hasImage()) {
-					// change padding to the lower image height
-					$padding = '50px 350px';
-				}
-				?>
+                // if the default banner image is displaying
+                if (!$space->getProfileBannerImage()->hasImage()) {
+                    // change padding to the lower image height
+                    $padding = '50px 350px';
+                }
+                ?>
 
 				<div class="image-upload-loader" id="banner-image-upload-loader" style="padding: <?php echo $padding ?>;">
 					<div class="progress image-upload-progess-bar" id="banner-image-upload-bar">
@@ -155,29 +155,29 @@ 
 						<i class="fa fa-cloud-upload"></i>
 					</a>
 					<a id="banner-image-upload-edit-button" style="<?php
-					   if (!$space->getProfileBannerImage()->hasImage()) {
-						   echo 'display: none;';
-					   }
-					   ?>"
+                        if (!$space->getProfileBannerImage()->hasImage()) {
+                            echo 'display: none;';
+                        }
+                        ?>"
 					   href="<?php echo $space->createUrl('/space/manage/image/crop-banner'); ?>"
 					   class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static">
 					   <i class="fa fa-edit"></i>
 					</a>
 						<?php
-						echo humhub\widgets\ModalConfirm::widget(array(
-							'uniqueID' => 'modal_bannerimagedelete',
-							'linkOutput' => 'a',
-							'title' => Yii::t('SpaceModule.widgets_views_deleteBanner', '<strong>Confirm</strong> image deleting'),
-							'message' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Do you really want to delete your title image?'),
-							'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Delete'),
-							'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Cancel'),
-							'linkContent' => '<i class="fa fa-times"></i>',
-							'cssClass' => 'btn btn-danger btn-sm',
-							'style' => $space->getProfileBannerImage()->hasImage() ? '' : 'display: none;',
-							'linkHref' => $space->createUrl("/space/manage/image/delete", ['type' => 'banner']),
-							'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
-						));
-						?>
+                        echo humhub\widgets\ModalConfirm::widget(array(
+                            'uniqueID' => 'modal_bannerimagedelete',
+                            'linkOutput' => 'a',
+                            'title' => Yii::t('SpaceModule.widgets_views_deleteBanner', '<strong>Confirm</strong> image deleting'),
+                            'message' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Do you really want to delete your title image?'),
+                            'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Delete'),
+                            'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Cancel'),
+                            'linkContent' => '<i class="fa fa-times"></i>',
+                            'cssClass' => 'btn btn-danger btn-sm',
+                            'style' => $space->getProfileBannerImage()->hasImage() ? '' : 'display: none;',
+                            'linkHref' => $space->createUrl("/space/manage/image/delete", ['type' => 'banner']),
+                            'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
+                        ));
+                        ?>
 				</div>
 
 			<?php } ?>
@@ -201,22 +201,22 @@ 
 
 					<div class="controls controls-header pull-right">
 						<?php
-						echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
-								[\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
-								[\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
-								[\humhub\modules\space\widgets\FollowButton::className(), [
-										'space' => $space,
-										'followOptions' => ['class' => 'btn btn-primary'],
-										'unfollowOptions' => ['class' => 'btn btn-info']],
-									['sortOrder' => 30]]
-						]]);
-						?>
+                        echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
+                                [\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
+                                [\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
+                                [\humhub\modules\space\widgets\FollowButton::className(), [
+                                        'space' => $space,
+                                        'followOptions' => ['class' => 'btn btn-primary'],
+                                        'unfollowOptions' => ['class' => 'btn btn-info']],
+                                    ['sortOrder' => 30]]
+                        ]]);
+                        ?>
 						<?=
-						humhub\modules\space\widgets\HeaderControlsMenu::widget([
-							'space' => $space,
-							'template' => '@humhub/widgets/views/dropdownNavigation'
-						]);
-						?>
+                        humhub\modules\space\widgets\HeaderControlsMenu::widget([
+                            'space' => $space,
+                            'template' => '@humhub/widgets/views/dropdownNavigation'
+                        ]);
+                        ?>
 					</div>
 				</div>
 			</div>

Braces +5 added lines, -2 removed lines

@@ -22,8 +22,11 @@
 				   data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'>
 					   <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]); ?>
 				</a>
-			<?php else : ?>
-				<?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]); ?>
+			<?php else {
+    : ?>
+				<?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]);
+}
+?>
 			<?php endif; ?>
 
 			<!-- check if the current user is the profile owner and can change the images -->

views/space/widgets/inviteButton.php

Spacing +1 added lines, -1 removed lines

@@ -2,4 +2,4 @@
 
 use yii\helpers\Html;
 
-echo Html::a('<i class="fa fa-plus"></i> '. Yii::t('SpaceModule.widgets_views_inviteButton', 'Invite'), $space->createUrl('/space/membership/invite'), array('class' => 'btn btn-primary', 'data-target' => '#globalModal'));
+echo Html::a('<i class="fa fa-plus"></i> ' . Yii::t('SpaceModule.widgets_views_inviteButton', 'Invite'), $space->createUrl('/space/membership/invite'), array('class' => 'btn btn-primary', 'data-target' => '#globalModal'));

views/space/membership/statusInvite.php

Braces +9 added lines, -6 removed lines

@@ -7,12 +7,15 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             <h4 class="modal-title" id="myModalLabel"><?php
-                if ($status == Membership::STATUS_INVITED)
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
-                if ($status == Membership::STATUS_MEMBER)
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
-                if (!$status)
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
+                if ($status == Membership::STATUS_INVITED) {
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
+                }
+                if ($status == Membership::STATUS_MEMBER) {
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
+                }
+                if (!$status) {
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
+                }
                 ?></h4>
         </div>
         <div class="modal-body text-center">