Changeset 3147

Timestamp:

08/01/13 01:30:24 (10 years ago)

Author:

brol

Message:

version 1.4.2

Location:

plugins/templateWidget/trunk

Files:

• Settings.php (added)
• SettingsList.php (added)
• WidgetAdmin.php (added)
• WidgetBuilder.php (added)
• _admin.php (modified) (1 diff)
• _define.php (modified) (1 diff)
• _public.php (modified) (7 diffs)
• default-templates/categories.tree.widget.html (deleted)
• default-templates/demo.widget.html (modified) (2 diffs)
• inc (deleted)
• index.php (modified) (1 diff)

plugins/templateWidget/trunk/_admin.php

@@ -24 +24 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-require_once(dirname(__FILE__).'/inc/class.WidgetAdmin.php');
+require_once(dirname(__FILE__).'/WidgetAdmin.php');
 $core->addBehavior('initWidgets',array('templateWidgetAdmin','InitWidgets'));
 

plugins/templateWidget/trunk/_define.php

@@ -28 +28 @@
      /* Description*/         "Define widgets using template file only",
      /* Author */             "Olivier Azeau",
-     /* Version */            '1.4a',
+     /* Version */            '1.4.2',
      /* Permissions */        null
 );

plugins/templateWidget/trunk/_public.php

@@ -24 +24 @@
 if (!defined('DC_RC_PATH')) { return; }
 
+require_once(dirname(__FILE__).'/WidgetAdmin.php');
+$core->addBehavior('initWidgets',array('templateWidgetAdmin','InitWidgets'));
+
 $core->tpl->addBlock('WidgetName',array('templateWidgetBlocksAndValues','Name'));
 $core->tpl->addBlock('WidgetDescription',array('templateWidgetBlocksAndValues','Description'));
@@ -33 +36 @@
 
 $core->tpl->addValue('WidgetText',array('templateWidgetBlocksAndValues','Text'));
-$core->tpl->addBlock('WidgetTextIf',array('templateWidgetBlocksAndValues','TextIf'));
-$core->tpl->addBlock('WidgetTextLike',array('templateWidgetBlocksAndValues','TextLike'));
-$core->tpl->addValue('WidgetTextMatch',array('templateWidgetBlocksAndValues','TextMatch'));
-$core->tpl->addBlock('WidgetTextNotLike',array('templateWidgetBlocksAndValues','TextNotLike'));
 $core->tpl->addBlock('WidgetCheckboxIf',array('templateWidgetBlocksAndValues','CheckboxIf'));
 $core->tpl->addBlock('WidgetComboIf',array('templateWidgetBlocksAndValues','ComboIf'));
@@ -52 +51 @@
 {
   // widget display only consists in displaying the corresponding template file
-  public static function WidgetCore(&$widget)
+  public static function WidgetCore($widget)
   {
     global $core, $_ctx;
     $_ctx->widget = $widget;
-    $core->tpl->setPath(
-      $core->tpl->getPath(),
-      path::real(dirname(__FILE__).'/default-templates')
-    );
-          $core->callBehavior('publicTemplateWidgetBeforeLoad',$core->tpl,$widget);
+    $core->tpl->setPath(array_merge($core->tpl->getPath(),array(dirname(__FILE__).'/default-templates')));
     $code = $core->tpl->getData($widget->id().'.widget.html');
     $_ctx->widget = null;
@@ -115 +110 @@
     return '<?php print html::escapeHTML($_ctx->widget->'.$attr['name'].'); ?>'.CRLF;
   }
-   
-  // Widget text field : testing text value
-  public static function TextIf($attr,$content) {
-          return
-          '<?php if ($_ctx->widget->'.$attr['name'].' == "'.addslashes($attr['value']).'") : ?>'.CRLF.
-               $content.
-          '<?php endif; ?>'.CRLF;
-  }
-   
-  // Widget text field : matching text value against pattern
-  public static function TextLike($attr,$content) {
-          return
-          '<?php if( preg_match( "'.addslashes($attr['pattern']).'", $_ctx->widget->'.$attr['name'].', $widgetTextMatches ) ) : ?>'.CRLF.
-          '<?php $_ctx->widgetTextMatches=$widgetTextMatches; ?>'.CRLF.
-               $content.
-          '<?php endif; ?>'.CRLF;
-  }
   
-  // Widget text field : displaying part of matched pattern
-  public static function TextMatch($attr) {
-    return '<?php print html::escapeHTML($_ctx->widgetTextMatches['.$attr['index'].']); ?>'.CRLF;
-  }
-   
-  // Widget text field : matching text value against pattern
-  public static function TextNotLike($attr,$content) {
-          return
-          '<?php if( !preg_match( "'.addslashes($attr['pattern']).'", $_ctx->widget->'.$attr['name'].' ) ) : ?>'.CRLF.
-               $content.
-          '<?php endif; ?>'.CRLF;
-  }
- 
   // Widget checkbox field
   public static function CheckboxIf($attr,$content) {
@@ -181 +146 @@
 class templateWidgetBehaviors
 {
-  public static function loadVisitorCookie(&$core)
+  public static function loadVisitorCookie($core)
   {
     global $_ctx;
@@ -188 +153 @@
     if (empty($_COOKIE['comment_info']))
       return;
-    $visitorInfos = split("\n",$_COOKIE['comment_info']);
+    $visitorInfos = explode("\n",$_COOKIE['comment_info']);
           $_ctx->comment_preview = new ArrayObject();
     $_ctx->comment_preview['name'] = @$_ctx->comment_preview['name'] ? $_ctx->comment_preview['name'] : $visitorInfos[0];
@@ -200 +165 @@
 }
 
-
 ?>

plugins/templateWidget/trunk/default-templates/demo.widget.html

@@ -4 +4 @@
 <div>
 <h2>{{tpl:WidgetText name="title" title="Title:" default="Default Title" order="1"}}</h2>
-<tpl:WidgetTextLike name="subtitle" title="Subtitle:" order="2" pattern="/---+/">
-<hr/>
-</tpl:WidgetTextLike>
-<tpl:WidgetTextLike name="subtitle" pattern="/bold:(.+)/">
-<b>{{tpl:WidgetTextMatch index="1"}}</b>
-</tpl:WidgetTextLike>
-<tpl:WidgetTextNotLike name="subtitle" pattern="/(---+|bold:(.+))/">
-{{tpl:WidgetText name="subtitle"}}
-</tpl:WidgetTextNotLike>
 
 <tpl:WidgetDefineBlock name="DemoBlock">
 {{tpl:WidgetText name="desc" title="Description:" default="Blah blah..." type="textarea" order="5"}}
-{{tpl:WidgetCombo name="choice" title="Choose:" default="blue" options="red:green:blue" order="6"}}
+{{tpl:WidgetCombo name="choice" title="Choose:" default="blue" options="red:green:blue" order="4"}}
 <tpl:WidgetComboIf name="choice" value="green">
 --This is green
@@ -22 +13 @@
 </tpl:WidgetDefineBlock>
 
-<tpl:WidgetCheckboxIf name="checkme" value="1" title="Check me" default="0" order="3">
+<tpl:WidgetCheckboxIf name="checkme" value="1" title="Check me" default="0" order="2">
 <h3>CheckMe is checked !</h3>
 {{tpl:WidgetUseBlock name="DemoBlock"}}
 </tpl:WidgetCheckboxIf>
 <tpl:WidgetCheckboxIf name="checkme" value="0">
-<h3>CheckMe is not checked! Please Check it!</h3>
+<h3>CheckMe is not checked ! Please Check it !</h3>
 </tpl:WidgetCheckboxIf>
 
-<tpl:WidgetCheckboxIf name="uncheckme" value="0" title="Uncheck me" default="1" order="4">
-<h3>UncheckMe is not checked!</h3>
+<tpl:WidgetCheckboxIf name="uncheckme" value="0" title="Uncheck me" default="1" order="3">
+<h3>UncheckMe is not checked !</h3>
 {{tpl:WidgetUseBlock name="DemoBlock"}}
 </tpl:WidgetCheckboxIf>
 <tpl:WidgetCheckboxIf name="uncheckme" value="1">
-<h3>UncheckMe is checked! Please Uncheck it!</h3>
+<h3>UncheckMe is checked ! Please Uncheck it !</h3>
 </tpl:WidgetCheckboxIf>
 

plugins/templateWidget/trunk/index.php

@@ -26 +26 @@
 dcPage::check('usage,contentadmin');
 
-require_once(dirname(__FILE__).'/inc/class.Settings.php');
+require_once(dirname(__FILE__).'/Settings.php');
 
 try