Skip to content

Commit

Permalink
change to Easyui 1.10.15
Browse files Browse the repository at this point in the history
  • Loading branch information
sheillendra committed Apr 8, 2023
1 parent 5ffb7f6 commit 5c96763
Show file tree
Hide file tree
Showing 1,037 changed files with 28,788 additions and 22,934 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ to the require section of your composer.json file.
USAGE
---

in bootstrap.php add line :
```
Yii::setAlias('@sheillendra/jeasyui', dirname(__DIR__) . '/extensions/sheillendra/yii2-jeasyui/src');
```
this test use advanced template, so bootstrap.php place in common/config


in config.php change view components like this :

```
Expand Down
2 changes: 1 addition & 1 deletion src/assets/FontAwesomeAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class FontAwesomeAsset extends AssetBundle {
public $depends = [];
public $publishOptions = [
'only' => [
'css/fontawesome.min.css', 'webfonts/*'
'css/*'
]
];
}
15 changes: 8 additions & 7 deletions src/assets/JEasyUIAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* since : v.0.0.1
* author : sheillendra
* date : 2014-10-04
* website : www.anjani.id
* website : www.anjani.co.id
*/

namespace sheillendra\jeasyui\assets;
Expand All @@ -14,8 +14,7 @@
use yii\web\AssetBundle;

class JEasyUIAsset extends AssetBundle {

public $sourcePath = '@sheillendra/jeasyui/assets/jquery-easyui-1.7.5';
public $sourcePath = '@sheillendra/jeasyui/assets/jquery-easyui-1.10.15';
public $css = [
'themes/default/easyui.css',
'themes/icon.css',
Expand All @@ -37,14 +36,16 @@ class JEasyUIAsset extends AssetBundle {
];

public function init() {
$themeCookies = filter_input(INPUT_COOKIE, 'jeasyui-theme', FILTER_SANITIZE_STRING);
$themeCookies = filter_input(INPUT_COOKIE, 'jeasyui-theme');
$themes = ['black', 'bootstrap', 'default', 'gray', 'material', 'metro',
'metro-blue', 'metro-gray', 'metro-green', 'metro-orange',
'metro-red', 'ui-cupertino', 'ui-dark-hive', 'ui-pepper-grinder',
'ui-sunny'
//'metro-blue', 'metro-gray', 'metro-green', 'metro-orange', 'metro-red',
//'ui-cupertino', 'ui-dark-hive', 'ui-pepper-grinder','ui-sunny'
'material-blue', 'material-teal'
];
if ($themeCookies && in_array($themeCookies, $themes)) {
$this->css[0] = "themes/$themeCookies/easyui.css";
} else {
$this->css[0] = "themes/default/easyui.css";
}
parent::init();
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/JEasyUIMobileAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* since : v.0.0.2
* author : sheillendra
* date : 2017-05-28
* website : www.bjuta.com
* website : www.anjani.co.id
*/

namespace sheillendra\jeasyui\assets;
Expand Down
7 changes: 5 additions & 2 deletions src/assets/YiiEasyUIAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
*/
class YiiEasyUIAsset extends AssetBundle {

public $sourcePath = '@sheillendra/jeasyui/assets/dist';
//public $sourcePath = '@sheillendra/jeasyui/assets/dist';
public $basePath = '@webroot/dist/jeasyui';
public $baseUrl = '@web/dist/jeasyui';
public $css = [
'css/yii.easyui.css',
'css/icon.css'
];
public $js = [
'js/yii.easyui.min.js'
//'js/yii.easyui.min.js'
'js/yii.easyui.js'
];
public $depends = [
'yii\web\YiiAsset',
Expand Down
9 changes: 7 additions & 2 deletions src/assets/YiiEasyUILoginAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@

class YiiEasyUILoginAsset extends AssetBundle {

public $sourcePath = '@sheillendra/jeasyui/assets/dist';
//public $sourcePath = '@sheillendra/jeasyui/assets/dist';
public $basePath = '@webroot/dist/jeasyui';
public $baseUrl = '@web/dist/jeasyui';
public $css = ['css/yii.easyui-login.css'];
public $js = ['js/yii.easyui-login.min.js'];
public $js = [
//'js/yii.easyui-login.min.js'
'js/yii.easyui-login.js'
];
public $depends = [
'yii\web\YiiAsset',
'sheillendra\jeasyui\assets\JEasyUIAsset'
Expand Down
3 changes: 2 additions & 1 deletion src/assets/YiiEasyUIMobileAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
*/
class YiiEasyUIMobileAsset extends AssetBundle {

public $sourcePath = '@sheillendra/jeasyui/assets/dist/v2.0.0-alpha.3';
public $sourcePath = '@sheillendra/jeasyui/assets/dist';
//public $sourcePath = '@sheillendra/jeasyui/assets/dist/v2.0.0-alpha.3';
public $css = [
'css/yii.easyui-mobile.css',
'css/icon.css'
Expand Down
2 changes: 1 addition & 1 deletion src/assets/YiiEasyUIMobileLoginAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class YiiEasyUIMobileLoginAsset extends AssetBundle {

public $sourcePath = '@sheillendra/jeasyui/assets/dist/v2.0.0-alpha.3';
public $sourcePath = '@sheillendra/jeasyui/assets/dist';
public $css = ['css/yii.easyui-mobile-login.css'];
public $js = ['js/yii.easyui-mobile-login.min.js'];
public $depends = [
Expand Down
10 changes: 1 addition & 9 deletions src/assets/dist/css/yii.easyui-login.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,4 @@ body {
#login-header {
text-align: center;
line-height: 0;
}

.panel-body,
.l-btn-text,
.textbox .textbox-prompt,
.textbox .textbox-text
{
font-size: 12px;
}
}
22 changes: 2 additions & 20 deletions src/assets/dist/css/yii.easyui.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,30 +79,12 @@ body {
.logo {
float: left;
margin-left: 5px;
font-size: 16px;
font-size: 18px;
height: 38px;
line-height: 38px;
}

.logo img {
height: 28px;
margin-top: 5px;
margin-right: 5px;
}

.logo .title {
float: right;
}

#north-right-nav {
height: 38px;
line-height: 38px;
}

.panel-body,
.l-btn-text,
.textbox .textbox-prompt,
.textbox .textbox-text
{
font-size: 12px;
}
}
Binary file removed src/assets/dist/favicon.ico
Binary file not shown.
Loading

0 comments on commit 5c96763

Please sign in to comment.