Changeset 683:b32debb0479b for plugins/widgets/index.php

Timestamp:

08/13/11 11:44:35 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Parents:

682:5c856b1a2962 (diff), 675:7845286256ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Remerge themes dans default

File:

• plugins/widgets/index.php (modified) (9 diffs)

plugins/widgets/index.php

@@ -14 +14 @@
 include dirname(__FILE__).'/_default_widgets.php';
 
-# Loading navigation and extra widgets
+# Loading navigation, extra widgets and custom widgets
 $widgets_nav = null;
 if ($core->blog->settings->widgets->widgets_nav) {
@@ -23 +23 @@
      $widgets_extra = dcWidgets::load($core->blog->settings->widgets->widgets_extra);
 }
+$widgets_custom = null;
+if ($core->blog->settings->widgets->widgets_custom) {
+     $widgets_custom = dcWidgets::load($core->blog->settings->widgets->widgets_custom);
+}
 
 $append_combo = array(
      '-' => 0,
      __('navigation') => 'nav',
-     __('extra') => 'extra'
+     __('extra') => 'extra',
+     __('custom') => 'custom'
 );
 
@@ -36 +41 @@
      $addw = array();
      foreach ($_POST['addw'] as $k => $v) {
-          if (($v == 'extra' || $v == 'nav') && $__widgets->{$k} !== null ) {
+          if (($v == 'extra' || $v == 'nav' || $v == 'custom') && $__widgets->{$k} !== null ) {
                $addw[$k] = $v;
           }
@@ -49 +54 @@
           if (!($widgets_extra instanceof dcWidgets)) {
                $widgets_extra = new dcWidgets();
+          }
+          if (!($widgets_custom instanceof dcWidgets)) {
+               $widgets_custom = new dcWidgets();
           }
           
@@ -60 +68 @@
                          $widgets_extra->append($__widgets->{$k});
                          break;
-                    
+                    case 'custom':
+                         $widgets_custom->append($__widgets->{$k});
+                         break;
                }
           }
@@ -68 +78 @@
                $core->blog->settings->widgets->put('widgets_nav',$widgets_nav->store());
                $core->blog->settings->widgets->put('widgets_extra',$widgets_extra->store());
+               $core->blog->settings->widgets->put('widgets_custom',$widgets_custom->store());
                $core->blog->triggerBlog();
                http::redirect($p_url);
@@ -101 +112 @@
                $_POST['w']['extra'] = array();
           }
+          if (!isset($_POST['w']['custom'])) {
+               $_POST['w']['custom'] = array();
+          }
           
           $widgets_nav = dcWidgets::loadArray($_POST['w']['nav'],$__widgets);
           $widgets_extra = dcWidgets::loadArray($_POST['w']['extra'],$__widgets);
+          $widgets_custom = dcWidgets::loadArray($_POST['w']['custom'],$__widgets);
           
           $core->blog->settings->addNamespace('widgets');
           $core->blog->settings->widgets->put('widgets_nav',$widgets_nav->store());
           $core->blog->settings->widgets->put('widgets_extra',$widgets_extra->store());
+          $core->blog->settings->widgets->put('widgets_custom',$widgets_custom->store());
           $core->blog->triggerBlog();
           
@@ -124 +140 @@
           $core->blog->settings->widgets->put('widgets_nav','');
           $core->blog->settings->widgets->put('widgets_extra','');
+          $core->blog->settings->widgets->put('widgets_custom','');
           $core->blog->triggerBlog();
           
@@ -204 +221 @@
 '</div>';
 
+# Custom sidebar
+echo
+'<div id="sidebarCustom" class="widgets">'.
+sidebarWidgets('dndcustom',__('Custom sidebar'),$widgets_custom,'custom',$__default_widgets['custom'],$j).
+'</div>';
+
 echo
 '<p id="sidebarsControl">'.