------------------------------------------------------------
revno: 948
committer: Roger Martin <rg1...@gmail.com>
branch nick: aikiframework
timestamp: Tue 2011-11-22 22:10:19 +0100
message:
css of inherent widget is included
modified:
src/libs/widgets.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'src/libs/widgets.php'
--- src/libs/widgets.php 2011-11-11 20:22:06 +0000
+++ src/libs/widgets.php 2011-11-22 21:10:19 +0000
@@ -472,7 +472,7 @@
$this->parsDBpars($no_loop_bottom_part, $widget_value);
// now widget is complete other parser can aplied.
- $widgetContents = $aiki->php->parser($widgetContents);
+ $widgetContents = $aiki->AikiScript->parser($widgetContents);
$widgetContents = $this->inline_widgets($widgetContents);
$widgetContents = $this->inherent_widgets($widgetContents);
$widgetContents = $aiki->SqlMarkup->sql($widgetContents);
@@ -525,7 +525,7 @@
$processed_widget = $aiki->AikiArray->displayArrayEditor($processed_widget);
$processed_widget = $aiki->Forms->displayForms($processed_widget);
$processed_widget = $aiki->input->requests($processed_widget);
- $processed_widget = $aiki->php->parser($processed_widget);
+ $processed_widget = $aiki->AikiScript->parser($processed_widget);
$processed_widget = $this->parse_translate_widget($processed_widget);
$processed_widget = $this->parse_translate_aiki_core($processed_widget);
@@ -1196,7 +1196,16 @@
$widget_data = $db->get_row(
"SELECT * FROM aiki_widgets WHERE id='{$widget_id}' LIMIT 1");
+
+ // widget css is added
+ if ( trim($widget_data->css) <> "" &&
+ !in_array( $widget_data->id, $this->widgets_css)) {
+ $this->widgets_css[]= $widget_data->id ;
+ }
$widget_html = $this->createWidgetContent($widget_data, $normal_select);
+
+
+
// if the same widget appears two times..it will be replaced.
$widget = str_replace($matches[0][$i], $widget_html, $widget);
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : aikiframework-devel@lists.launchpad.net
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
