Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
4609a94d
Commit
4609a94d
authored
Jan 09, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed error-block HTML class and related styles and used Bootstrap3 standard…
Removed error-block HTML class and related styles and used Bootstrap3 standard practice about errors instead
parent
abcd2486
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
47 deletions
+2
-47
site.css
apps/advanced/backend/web/css/site.css
+0
-11
site.css
apps/advanced/frontend/web/css/site.css
+0
-11
site.css
apps/basic/web/css/site.css
+0
-11
main.css
extensions/yii/gii/assets/main.css
+0
-11
CHANGELOG.md
framework/CHANGELOG.md
+0
-1
ActiveField.php
framework/yii/widgets/ActiveField.php
+2
-2
No files found.
apps/advanced/backend/web/css/site.css
View file @
4609a94d
...
@@ -70,17 +70,6 @@ a.desc:after {
...
@@ -70,17 +70,6 @@ a.desc:after {
color
:
#999
;
color
:
#999
;
}
}
.error-block
{
display
:
none
;
margin-top
:
5px
;
margin-bottom
:
10px
;
color
:
#a94442
;
}
.has-error
.error-block
{
display
:
block
;
}
.error-summary
{
.error-summary
{
color
:
#a94442
;
color
:
#a94442
;
background
:
#fdf7f7
;
background
:
#fdf7f7
;
...
...
apps/advanced/frontend/web/css/site.css
View file @
4609a94d
...
@@ -70,17 +70,6 @@ a.desc:after {
...
@@ -70,17 +70,6 @@ a.desc:after {
color
:
#999
;
color
:
#999
;
}
}
.error-block
{
display
:
none
;
margin-top
:
5px
;
margin-bottom
:
10px
;
color
:
#a94442
;
}
.has-error
.error-block
{
display
:
block
;
}
.error-summary
{
.error-summary
{
color
:
#a94442
;
color
:
#a94442
;
background
:
#fdf7f7
;
background
:
#fdf7f7
;
...
...
apps/basic/web/css/site.css
View file @
4609a94d
...
@@ -70,17 +70,6 @@ a.desc:after {
...
@@ -70,17 +70,6 @@ a.desc:after {
color
:
#999
;
color
:
#999
;
}
}
.error-block
{
display
:
none
;
margin-top
:
5px
;
margin-bottom
:
10px
;
color
:
#a94442
;
}
.has-error
.error-block
{
display
:
block
;
}
.error-summary
{
.error-summary
{
color
:
#a94442
;
color
:
#a94442
;
background
:
#fdf7f7
;
background
:
#fdf7f7
;
...
...
extensions/yii/gii/assets/main.css
View file @
4609a94d
...
@@ -41,17 +41,6 @@ body {
...
@@ -41,17 +41,6 @@ body {
display
:
none
;
display
:
none
;
}
}
.error-block
{
display
:
none
;
margin-top
:
5px
;
margin-bottom
:
10px
;
color
:
#a94442
;
}
.has-error
.error-block
{
display
:
block
;
}
.error-summary
{
.error-summary
{
color
:
#a94442
;
color
:
#a94442
;
background
:
#fdf7f7
;
background
:
#fdf7f7
;
...
...
framework/CHANGELOG.md
View file @
4609a94d
...
@@ -65,7 +65,6 @@ Yii Framework 2 Change Log
...
@@ -65,7 +65,6 @@ Yii Framework 2 Change Log
-
Chg #1586:
`QueryBuilder::buildLikeCondition()`
will now escape special characters and use percentage characters by default (qiangxue)
-
Chg #1586:
`QueryBuilder::buildLikeCondition()`
will now escape special characters and use percentage characters by default (qiangxue)
-
Chg #1610:
`Html::activeCheckboxList()`
and
`Html::activeRadioList()`
will submit an empty string if no checkbox/radio is selected (qiangxue)
-
Chg #1610:
`Html::activeCheckboxList()`
and
`Html::activeRadioList()`
will submit an empty string if no checkbox/radio is selected (qiangxue)
-
Chg #1643: Added default value for
`Captcha::options`
(qiangxue)
-
Chg #1643: Added default value for
`Captcha::options`
(qiangxue)
-
Chg #1647: Changed the default CSS class of error block to be
`error-block`
(qiangxue)
-
Chg #1796: Removed
`yii\base\Controller::getActionParams()`
(samdark)
-
Chg #1796: Removed
`yii\base\Controller::getActionParams()`
(samdark)
-
Chg #1835:
`CheckboxColumn`
now renders checkboxes whose values are the corresponding data key values (qiangxue)
-
Chg #1835:
`CheckboxColumn`
now renders checkboxes whose values are the corresponding data key values (qiangxue)
-
Chg #1821: Changed default values for yii
\d
b
\C
onnection username and password to null (cebe)
-
Chg #1821: Changed default values for yii
\d
b
\C
onnection username and password to null (cebe)
...
...
framework/yii/widgets/ActiveField.php
View file @
4609a94d
...
@@ -57,7 +57,7 @@ class ActiveField extends Component
...
@@ -57,7 +57,7 @@ class ActiveField extends Component
*
*
* - tag: the tag name of the container element. Defaults to "div".
* - tag: the tag name of the container element. Defaults to "div".
*/
*/
public
$errorOptions
=
[
'class'
=>
'
error
-block'
];
public
$errorOptions
=
[
'class'
=>
'
help
-block'
];
/**
/**
* @var array the default options for the label tags. The parameter passed to [[label()]] will be
* @var array the default options for the label tags. The parameter passed to [[label()]] will be
* merged with this property when rendering the label tag.
* merged with this property when rendering the label tag.
...
@@ -647,7 +647,7 @@ class ActiveField extends Component
...
@@ -647,7 +647,7 @@ class ActiveField extends Component
if
(
isset
(
$this
->
errorOptions
[
'class'
]))
{
if
(
isset
(
$this
->
errorOptions
[
'class'
]))
{
$options
[
'error'
]
=
'.'
.
implode
(
'.'
,
preg_split
(
'/\s+/'
,
$this
->
errorOptions
[
'class'
],
-
1
,
PREG_SPLIT_NO_EMPTY
));
$options
[
'error'
]
=
'.'
.
implode
(
'.'
,
preg_split
(
'/\s+/'
,
$this
->
errorOptions
[
'class'
],
-
1
,
PREG_SPLIT_NO_EMPTY
));
}
else
{
}
else
{
$options
[
'error'
]
=
isset
(
$this
->
errorOptions
[
'tag'
])
?
$this
->
errorOptions
[
'tag'
]
:
'
div
'
;
$options
[
'error'
]
=
isset
(
$this
->
errorOptions
[
'tag'
])
?
$this
->
errorOptions
[
'tag'
]
:
'
span
'
;
}
}
return
$options
;
return
$options
;
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment