mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-20 08:05:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev

Browse Source
This commit is contained in:
Lucas Bartholemy 2016-09-19 10:54:26 +02:00
commit fca23a3302
7 changed files with 384 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/all-5f84fd9cb4f93bb90cc038bed1ec4f2d.css Normal file
View File

File diff suppressed because one or more lines are too long

117
js/all-cbb2ffbc142aa643edde05905376dd29.js Normal file
View File

File diff suppressed because one or more lines are too long

9
package.json
View File

@ -1,12 +1,13 @@
{
"name": "humhub",
"devDependencies": {
"grunt": "^1.0.1",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-copy": "*",
"grunt-contrib-concat": "^1.0.0",
"grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-watch": "^1.0.0",
"grunt-contrib-copy": "*",
"grunt-contrib-cssmin": "^1.0.1",
"grunt-contrib-less": "^1.3.0"
"grunt-contrib-less": "^1.3.0",
"grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-watch": "^1.0.0"
}
}

4
protected/humhub/config/assets-dev.php Normal file
View File

@ -0,0 +1,4 @@
<?php
return [];

224
protected/humhub/config/assets-prod.php Normal file
View File

@ -0,0 +1,224 @@
<?php
/**
* This file is generated by the "yii asset" command.
* DO NOT MODIFY THIS FILE DIRECTLY.
* @version 2016-09-12 17:54:43
*/
return [
'all' => [
'class' => 'yii\\web\\AssetBundle',
'basePath' => '@webroot',
'baseUrl' => '@web',
'js' => [
'js/all-cbb2ffbc142aa643edde05905376dd29.js',
],
'css' => [
'css/all-5f84fd9cb4f93bb90cc038bed1ec4f2d.css',
],
],
'yii\\web\\JqueryAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'yii\\web\\YiiAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'yii\\web\\JqueryAsset',
'all',
],
],
'yii\\bootstrap\\BootstrapAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'yii\\bootstrap\\BootstrapPluginAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'yii\\web\\JqueryAsset',
'yii\\bootstrap\\BootstrapAsset',
'all',
],
],
'humhub\\assets\\BluebirdAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryTimeAgoAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryWidgetAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryColorAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryPlaceholderAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\FontAwesomeAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\BlueimpFileUploadAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'humhub\\assets\\JqueryWidgetAsset',
'all',
],
],
'humhub\\assets\\JqueryHighlightAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryCookieAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryAutosizeAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\JqueryPjaxAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\CaretJsAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\AtJsStyleAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\AtJsAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'humhub\\assets\\CaretJsAsset',
'humhub\\assets\\AtJsStyleAsset',
'all',
],
],
'humhub\\assets\\AnimateCssAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'all',
],
],
'humhub\\assets\\CoreApiAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'yii\\web\\YiiAsset',
'yii\\bootstrap\\BootstrapAsset',
'yii\\bootstrap\\BootstrapPluginAsset',
'humhub\\assets\\BluebirdAsset',
'all',
],
],
'humhub\\modules\\content\\assets\\ContentAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'humhub\\assets\\CoreApiAsset',
'all',
],
],
'humhub\\assets\\AppAsset' => [
'sourcePath' => null,
'js' => [],
'css' => [],
'depends' => [
'yii\\web\\YiiAsset',
'yii\\bootstrap\\BootstrapAsset',
'yii\\bootstrap\\BootstrapPluginAsset',
'humhub\\assets\\BluebirdAsset',
'humhub\\assets\\JqueryTimeAgoAsset',
'humhub\\assets\\JqueryWidgetAsset',
'humhub\\assets\\JqueryColorAsset',
'humhub\\assets\\JqueryPlaceholderAsset',
'humhub\\assets\\FontAwesomeAsset',
'humhub\\assets\\BlueimpFileUploadAsset',
'humhub\\assets\\JqueryHighlightAsset',
'humhub\\assets\\JqueryCookieAsset',
'humhub\\assets\\JqueryAutosizeAsset',
'humhub\\assets\\JqueryPjaxAsset',
'humhub\\assets\\AtJsAsset',
'humhub\\assets\\AnimateCssAsset',
'humhub\\assets\\CoreApiAsset',
'humhub\\modules\\content\\assets\\ContentAsset',
'all',
],
],
];

7
protected/humhub/docs/guide/dev-build.md
View File

@ -8,12 +8,15 @@ Build
> Note: Since symlinks are not supported in some virtual machine shared folders the update command should be called from the host
## Setup grunt dependencies
- npm update (in humhub root)
- npm install grunt --save-dev
## Assets
- Yii asset management http://www.yiiframework.com/doc-2.0/guide-structure-assets.html#combining-compressing-assets
- php yii asset humhub/config/assets.php humhub/config/assets-prod.php
### Grunt Tasks
- watch
- uglify

15
protected/humhub/tests/codeception/_support/AcceptanceTester.php
View File

@ -80,6 +80,21 @@ class AcceptanceTester extends \Codeception\Actor
$this->executeJS('$("'.$selector.'").click();');
}
public function jsFillField($selector, $value)
{
$this->executeJS('$("'.$selector.'").val("'.$value.'");');
}
public function jsShow($selector)
{
$this->executeJS('$("'.$selector.'").show();');
}
public function jsAttr($selector, $attr, $val)
{
$this->executeJS('$("'.$selector.'").attr("'.$attr.'", "'.$val.'");');
}
public function scrollToTop()
{
$this->executeJS('window.scrollTo(0,0);');