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
bf59a521
Commit
bf59a521
authored
Jan 23, 2014
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
subwidgets should be rendered in the same view
parent
8473dda3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
6 deletions
+15
-6
ButtonDropdown.php
extensions/bootstrap/ButtonDropdown.php
+3
-0
ButtonGroup.php
extensions/bootstrap/ButtonGroup.php
+2
-1
Nav.php
extensions/bootstrap/Nav.php
+1
-0
Tabs.php
extensions/bootstrap/Tabs.php
+1
-1
BaseListView.php
framework/widgets/BaseListView.php
+8
-4
No files found.
extensions/bootstrap/ButtonDropdown.php
View file @
bf59a521
...
...
@@ -87,6 +87,7 @@ class ButtonDropdown extends Widget
'label'
=>
'<span class="caret"></span>'
,
'encodeLabel'
=>
false
,
'options'
=>
$this
->
options
,
'view'
=>
$this
->
getView
(),
]);
}
else
{
$label
.=
' <span class="caret"></span>'
;
...
...
@@ -103,6 +104,7 @@ class ButtonDropdown extends Widget
'label'
=>
$label
,
'options'
=>
$options
,
'encodeLabel'
=>
false
,
'view'
=>
$this
->
getView
(),
])
.
"
\n
"
.
$splitButton
;
}
...
...
@@ -114,6 +116,7 @@ class ButtonDropdown extends Widget
{
$config
=
$this
->
dropdown
;
$config
[
'clientOptions'
]
=
false
;
$config
[
'view'
]
=
$this
->
getView
();
return
Dropdown
::
widget
(
$config
);
}
}
extensions/bootstrap/ButtonGroup.php
View file @
bf59a521
...
...
@@ -86,7 +86,8 @@ class ButtonGroup extends Widget
$buttons
[]
=
Button
::
widget
([
'label'
=>
$label
,
'options'
=>
$options
,
'encodeLabel'
=>
$this
->
encodeLabels
'encodeLabel'
=>
$this
->
encodeLabels
,
'view'
=>
$this
->
getView
()
]);
}
else
{
$buttons
[]
=
$button
;
...
...
extensions/bootstrap/Nav.php
View file @
bf59a521
...
...
@@ -171,6 +171,7 @@ class Nav extends Widget
'items'
=>
$items
,
'encodeLabels'
=>
$this
->
encodeLabels
,
'clientOptions'
=>
false
,
'view'
=>
$this
->
getView
(),
]);
}
}
...
...
extensions/bootstrap/Tabs.php
View file @
bf59a521
...
...
@@ -134,7 +134,7 @@ class Tabs extends Widget
}
$header
=
Html
::
a
(
$label
,
"#"
,
[
'class'
=>
'dropdown-toggle'
,
'data-toggle'
=>
'dropdown'
])
.
"
\n
"
.
Dropdown
::
widget
([
'items'
=>
$item
[
'items'
],
'clientOptions'
=>
false
]);
.
Dropdown
::
widget
([
'items'
=>
$item
[
'items'
],
'clientOptions'
=>
false
,
'view'
=>
$this
->
getView
()
]);
}
elseif
(
isset
(
$item
[
'content'
]))
{
$options
=
array_merge
(
$this
->
itemOptions
,
ArrayHelper
::
getValue
(
$item
,
'options'
,
[]));
$options
[
'id'
]
=
ArrayHelper
::
getValue
(
$options
,
'id'
,
$this
->
options
[
'id'
]
.
'-tab'
.
$n
);
...
...
framework/widgets/BaseListView.php
View file @
bf59a521
...
...
@@ -193,8 +193,10 @@ abstract class BaseListView extends Widget
}
/** @var LinkPager $class */
$class
=
ArrayHelper
::
remove
(
$this
->
pager
,
'class'
,
LinkPager
::
className
());
$this
->
pager
[
'pagination'
]
=
$pagination
;
return
$class
::
widget
(
$this
->
pager
);
$pager
=
$this
->
pager
;
$pager
[
'pagination'
]
=
$pagination
;
$pager
[
'view'
]
=
$this
->
getView
();
return
$class
::
widget
(
$pager
);
}
/**
...
...
@@ -209,7 +211,9 @@ abstract class BaseListView extends Widget
}
/** @var LinkSorter $class */
$class
=
ArrayHelper
::
remove
(
$this
->
sorter
,
'class'
,
LinkSorter
::
className
());
$this
->
sorter
[
'sort'
]
=
$sort
;
return
$class
::
widget
(
$this
->
sorter
);
$sorter
=
$this
->
sorter
;
$sorter
[
'sort'
]
=
$sort
;
$sorter
[
'view'
]
=
$this
->
getView
();
return
$class
::
widget
(
$sorter
);
}
}
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