Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/php-test-master.yml

This file was deleted.

10 changes: 4 additions & 6 deletions assets/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace acmeCorp\humhub\modules\exampleBasic\assets;

use yii\web\AssetBundle;
use humhub\components\assets\AssetBundle;

class Assets extends AssetBundle
{
Expand All @@ -14,11 +14,9 @@ class Assets extends AssetBundle
/**
* @inheritdoc
*/
public $publishOptions = [
// TIPP: Change forceCopy to true when testing your js in order to rebuild
// this assets on every request (otherwise they will be cached)
'forceCopy' => false,
];
// TIP: Change forceCopy to true when testing your js in order to rebuild
// this assets on every request (otherwise they will be cached)
public $forceCopy = false;

/**
* @inheritdoc
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

1.1.0 (Unreleased)
----------------------
- Enh #12: Migration to Bootstrap 5 for HumHub 1.18

1.0.2 (Unreleased)
----------------------
- Enh #5: Add `requirements.php`
Expand Down
4 changes: 2 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "A very basic module example",
"keywords": [
],
"version": "1.0.2",
"version": "1.1.0",
"humhub": {
"minVersion": "1.2"
"minVersion": "1.18"
},
"screenshots": ["resources/screen1.jpg"]
}
3 changes: 1 addition & 2 deletions tests/codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ settings:
backup_globals: true
paths:
tests: codeception
log: codeception/_output
output: codeception/_output
data: codeception/_data
helpers: codeception/_support
envs: ../../../humhub/tests/config/env
config:
# the entry script URL (with host info) for functional and acceptance tests
# PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
test_entry_url: http://localhost:8080/index-test.php

4 changes: 2 additions & 2 deletions tests/codeception/acceptance.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.

class_name: AcceptanceTester
actor: AcceptanceTester
modules:
enabled:
- WebDriver
Expand All @@ -19,4 +19,4 @@ modules:
url: 'http://localhost:8080/'
browser: chrome
restart: true
port: 4444
port: 4444
4 changes: 2 additions & 2 deletions tests/codeception/functional.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# (tip: better to use with frameworks).

# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
class_name: FunctionalTester
actor: FunctionalTester
modules:
enabled:
- Filesystem
Expand All @@ -15,4 +15,4 @@ modules:
- tests\codeception\_support\HumHubHelper
config:
Yii2:
configFile: 'codeception/config/functional.php'
configFile: 'codeception/config/functional.php'
2 changes: 1 addition & 1 deletion tests/codeception/unit.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# suite for unit (internal) tests.
# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.

class_name: UnitTester
actor: UnitTester
modules:
enabled:
- tests\codeception\_support\CodeHelper
Expand Down
28 changes: 10 additions & 18 deletions views/index/index.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?php

/* @var $this \humhub\modules\ui\view\components\View */
/* @var $this View */

use acmeCorp\humhub\modules\exampleBasic\assets\Assets;
use humhub\widgets\Button;
use humhub\components\View;
use humhub\widgets\bootstrap\Alert;
use humhub\widgets\bootstrap\Button;

// Register our module assets, this could also be done within the controller
Assets::register($this);
Expand All @@ -21,7 +23,7 @@

<div class="container">
<div class="row">
<div class="col-md-8">
<div class="col-lg-8">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Example-basic</strong> <?= Yii::t('ExampleBasicModule.base', 'overview') ?></div>
Expand Down Expand Up @@ -303,27 +305,19 @@
<div class="panel-heading">Panel-Heading: Bootstrap Elements</div>
<div class="panel-body">

<div class="alert alert-warning">
Warning Alert
</div>
<?= Alert::warning('Warning Alert') ?>

<div class="alert alert-info">
Info Alert
</div>
<?= Alert::info('Info Alert') ?>

<div class="alert alert-success">
Success Alert
</div>
<?= Alert::success('Success Alert') ?>

<div class="alert alert-danger">
Danger Alert
</div>
<?= Alert::danger('Danger Alert')->closeButton(false) ?>

</div>
</div>
</div>

<div class="col-md-4">
<div class="col-lg-4">
<div class="panel panel-default">
<div class="panel-heading"><strong>Example</strong> basic</div>
<div class="panel-body">
Expand All @@ -335,5 +329,3 @@

</div>
</div>


6 changes: 3 additions & 3 deletions views/layouts/default.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
/* @var $this \humhub\modules\ui\view\components\View */
/* @var $this \humhub\components\View */
/* @var $content string */

?>
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="col-lg-12">
<div class="panel panel-default">
<?= $content ?>
</div>
</div>
</div>
</div>
</div>