diff --git a/protected/humhub/modules/space/migrations/m200930_151638_add_summary.php b/protected/humhub/modules/space/migrations/m200930_151639_add_about.php similarity index 58% rename from protected/humhub/modules/space/migrations/m200930_151638_add_summary.php rename to protected/humhub/modules/space/migrations/m200930_151639_add_about.php index 12436ba236..c089506c02 100644 --- a/protected/humhub/modules/space/migrations/m200930_151638_add_summary.php +++ b/protected/humhub/modules/space/migrations/m200930_151639_add_about.php @@ -3,16 +3,16 @@ use yii\db\Migration; /** - * Class m200930_151638_add_summary + * Class m200930_151639_add_about */ -class m200930_151638_add_summary extends Migration +class m200930_151639_add_about extends Migration { /** * {@inheritdoc} */ public function safeUp() { - $this->addColumn('space', 'summary', 'text after description'); + $this->addColumn('space', 'about', 'text after description'); } /** @@ -20,7 +20,7 @@ class m200930_151638_add_summary extends Migration */ public function safeDown() { - echo "m200930_151638_add_summary cannot be reverted.\n"; + echo "m200930_151639_add_about cannot be reverted.\n"; return false; } @@ -32,7 +32,7 @@ class m200930_151638_add_summary extends Migration } public function down() { - echo "m200930_151638_add_summary cannot be reverted.\n"; + echo "m200930_151639_add_about cannot be reverted.\n"; return false; } */ diff --git a/protected/humhub/modules/space/models/Space.php b/protected/humhub/modules/space/models/Space.php index 1a3d9db3a3..c42c73a746 100644 --- a/protected/humhub/modules/space/models/Space.php +++ b/protected/humhub/modules/space/models/Space.php @@ -46,7 +46,7 @@ use Yii; * @property string $guid * @property string $name * @property string $description - * @property string $summary + * @property string $about * @property string $url * @property integer $join_policy * @property integer $visibility @@ -121,7 +121,8 @@ class Space extends ContentContainerActiveRecord implements Searchable $rules = [ [['join_policy', 'visibility', 'status', 'auto_add_new_members', 'default_content_visibility'], 'integer'], [['name'], 'required'], - [['description', 'summary', 'tags', 'color'], 'string'], + [['description', 'about', 'tags', 'color'], 'string'], + [['description'], 'string', 'max' => 100], [['join_policy'], 'in', 'range' => [0, 1, 2]], [['visibility'], 'in', 'range' => [0, 1, 2]], [['visibility'], 'checkVisibility'], @@ -132,7 +133,7 @@ class Space extends ContentContainerActiveRecord implements Searchable ]; if (Yii::$app->getModule('space')->useUniqueSpaceNames) { - $rules[] = [['name'], 'unique', 'targetClass' => static::class, 'when' => function($model) { + $rules[] = [['name'], 'unique', 'targetClass' => static::class, 'when' => function ($model) { return $model->isAttributeChanged('name'); }]; } @@ -147,7 +148,7 @@ class Space extends ContentContainerActiveRecord implements Searchable { $scenarios = parent::scenarios(); - $scenarios[static::SCENARIO_EDIT] = ['name', 'color', 'description', 'summary', 'tags', 'join_policy', 'visibility', 'default_content_visibility', 'url']; + $scenarios[static::SCENARIO_EDIT] = ['name', 'color', 'description', 'about', 'tags', 'join_policy', 'visibility', 'default_content_visibility', 'url']; $scenarios[static::SCENARIO_CREATE] = ['name', 'color', 'description', 'join_policy', 'visibility']; $scenarios[static::SCENARIO_SECURITY_SETTINGS] = ['default_content_visibility', 'join_policy', 'visibility']; @@ -164,7 +165,7 @@ class Space extends ContentContainerActiveRecord implements Searchable 'name' => Yii::t('SpaceModule.base', 'Name'), 'color' => Yii::t('SpaceModule.base', 'Color'), 'description' => Yii::t('SpaceModule.base', 'Description'), - 'summary' => Yii::t('SpaceModule.base', 'Summary'), + 'about' => Yii::t('SpaceModule.base', 'About'), 'join_policy' => Yii::t('SpaceModule.base', 'Join Policy'), 'visibility' => Yii::t('SpaceModule.base', 'Visibility'), 'status' => Yii::t('SpaceModule.base', 'Status'), @@ -178,12 +179,15 @@ class Space extends ContentContainerActiveRecord implements Searchable ]; } + public function attributeHints() { return [ 'visibility' => Yii::t('SpaceModule.manage', 'Choose the security level for this workspace to define the visibleness.'), 'join_policy' => Yii::t('SpaceModule.manage', 'Choose the kind of membership you want to provide for this workspace.'), - 'default_content_visibility' => Yii::t('SpaceModule.manage', 'Choose if new content should be public or private by default') + 'default_content_visibility' => Yii::t('SpaceModule.manage', 'Choose if new content should be public or private by default'), + 'description' => Yii::t('SpaceModule.base', 'Max. 100 characters.'), + 'about' => Yii::t('SpaceModule.base', 'Shown on About Page.'), ]; } @@ -516,7 +520,7 @@ class Space extends ContentContainerActiveRecord implements Searchable { $user = !$user && !Yii::$app->user->isGuest ? Yii::$app->user->getIdentity() : $user; - if(!$user) { + if (!$user) { return false; } diff --git a/protected/humhub/modules/space/modules/manage/views/default/index.php b/protected/humhub/modules/space/modules/manage/views/default/index.php index 86dc7d0f92..307ed5173c 100644 --- a/protected/humhub/modules/space/modules/manage/views/default/index.php +++ b/protected/humhub/modules/space/modules/manage/views/default/index.php @@ -28,7 +28,7 @@ use humhub\widgets\Button; $form, 'model' => $model]) ?> field($model, 'description')->textInput(); ?> - field($model, 'summary')->widget(RichTextField::class); ?> + field($model, 'about')->widget(RichTextField::class); ?> field($model, 'tags')->textInput(['maxlength' => 200]); ?> submit() ?> diff --git a/protected/humhub/modules/space/views/create/create.php b/protected/humhub/modules/space/views/create/create.php index 67fff5a690..a10d83cb7e 100644 --- a/protected/humhub/modules/space/views/create/create.php +++ b/protected/humhub/modules/space/views/create/create.php @@ -19,8 +19,7 @@ $animation = $model->hasErrors() ? 'shake' : 'fadeIn';
$form, 'model' => $model]) ?> - - field($model, 'description')->textarea(['placeholder' => Yii::t('SpaceModule.manage', 'space description'), 'rows' => '3']); ?> + field($model, 'description'); ?> diff --git a/protected/humhub/modules/space/views/space/about.php b/protected/humhub/modules/space/views/space/about.php index 42b193b09d..7e464fbb51 100644 --- a/protected/humhub/modules/space/views/space/about.php +++ b/protected/humhub/modules/space/views/space/about.php @@ -4,92 +4,104 @@ use humhub\modules\space\models\Space; use humhub\modules\space\widgets\AboutPageSidebar; use humhub\modules\content\widgets\richtext\RichText; use humhub\modules\user\widgets\Image; + +/** + * @var Space $space + * @var array $userGroups + */ ?>
- About Space') ?> + About this Space') ?>
- summary || $space->description):?> -
- Description') ?> -
- summary) ? $space->description : $space->summary) ?> -
-
-
- -
- Contact Persons') ?> - -
-
- () -
-
- $user, 'width' => 32, - 'htmlOptions' => ['style' => 'padding: 3px'], - 'imageOptions' => ['style' => 'border:1px solid ' . $this->theme->variable('success')] - ]); - } - ?> -
-
- - - -
-
- () -
-
- $user, 'width' => 32, - 'htmlOptions' => ['style' => 'padding: 3px'], - 'imageOptions' => ['style' => 'border:1px solid ' . $this->theme->variable('success')] - ]); - } - ?> -
-
- - - -
-
- () -
-
- $user, 'width' => 32, - 'htmlOptions' => ['style' => 'padding: 3px'], - 'imageOptions' => ['style' => 'border:1px solid ' . $this->theme->variable('success')] - ]); - } - ?> -
-
- -
-
-
- Security Settings'); ?> + about || $space->description): ?>
-
- - join_policy] ?> +
+ about) ? $space->description : $space->about) ?> +
+
+
+ + +
+ +
+ +
+

+

+
+ $user, 'width' => 40, + 'htmlOptions' => ['style' => 'padding: 3px'], + 'imageOptions' => ['style' => 'border:1px solid ' . $this->theme->variable('success')] + ]); + } + ?> +
+
+ +
+ +
+ +
+ +
+

+
+
+ $user, 'width' => 40, + 'htmlOptions' => ['style' => 'padding: 3px'], + 'imageOptions' => ['style' => 'border:1px solid ' . $this->theme->variable('success')] + ]); + } + ?> +
+
+ -
- - visibility] ?>
+ + +
+

+
+ $user, 'width' => 40, + 'htmlOptions' => ['style' => 'padding: 3px'], + 'imageOptions' => ['style' => 'border:1px solid ' . $this->theme->variable('success')] + ]); + } + ?> +
+
+
+ + +
+ +
+
+

+

join_policy] ?>

+
+
+
+

+

visibility] ?>

+
+
+ +
diff --git a/protected/humhub/modules/space/widgets/views/myMembership.php b/protected/humhub/modules/space/widgets/views/myMembership.php index ad775a33f4..55de827caa 100644 --- a/protected/humhub/modules/space/widgets/views/myMembership.php +++ b/protected/humhub/modules/space/widgets/views/myMembership.php @@ -11,12 +11,10 @@ use humhub\widgets\PanelMenu;
'space-my-membership-panel']); ?> -
My Membership Info'); ?>
+
About my membership'); ?>
-
:
-
: -
-
-
:
+ +

:

+

: