Changeset 665:315ff9eb4199

Timestamp:

07/31/11 10:34:58 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

themes

Message:

Ajout d'un bandeau de widgets supplémentaire (custom)

Location:

plugins/widgets

Files:

• _default_widgets.php (modified) (1 diff)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• index.php (modified) (10 diffs)
• style.css (modified) (1 diff)
• widgets.js (modified) (4 diffs)

plugins/widgets/_default_widgets.php

@@ -79 +79 @@
 # Default widgets
 global $__default_widgets;
-$__default_widgets = array('nav'=> new dcWidgets(), 'extra'=> new dcWidgets());
+$__default_widgets = array('nav'=> new dcWidgets(), 'extra'=> new dcWidgets(), 'custom'=> new dcWidgets());
 
 $__default_widgets['nav']->append($__widgets->search);

plugins/widgets/_define.php

@@ -15 +15 @@
      /* Name */               "Widgets",
      /* Description*/         "Widgets for your blog sidebars",
-     /* Author */             "Olivier Meunier",
-     /* Version */            '2',
+     /* Author */             "Olivier Meunier & Dotclear Team",
+     /* Version */            '3',
      array(
           'permissions' =>    'admin',

plugins/widgets/_install.php

@@ -31 +31 @@
      $settings->widgets->put('widgets_extra','','string','Extra widgets',false);
 }
+if ($settings->widgets->widgets_custom != null) {
+     $settings->widgets->put('widgets_custom',dcWidgets::load($settings->widgets->widgets_custom)->store());
+} else {
+     $settings->widgets->put('widgets_custom','','string','Custom widgets',false);
+}
 $core->setVersion('widgets',$version);
 return true;

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();
           
@@ -187 +204 @@
 '</div>'.
 '</fieldset>'.
-'<p><input type="submit" class="js-remove" name="append" value="'.__('add widgets to sidebars').'" />'.
+'<p><input type="submit" class="js-remove" name="append" value="'.__('Add widgets to sidebars').'" />'.
 $core->formNonce().'</p>'.
 '</form>';
@@ -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">'.
 $core->formNonce().
-'<input type="submit" name="wup" value="'.__('update sidebars').'" /> '.
-'<input type="submit" class="reset" name="wreset" value="'.__('reset sidebars').'" /></p>'.
+'<input type="submit" name="wup" value="'.__('Update sidebars').'" /> '.
+'<input type="submit" class="reset" name="wreset" value="'.__('Reset sidebars').'" /></p>'.
 '</form>';
 

plugins/widgets/style.css

@@ -18 +18 @@
      width: 49%;
      margin-left: 1%;
+}
+#sidebarCustom {
+     float: left;
+     width: 100%;
 }
 

plugins/widgets/widgets.js

@@ -10 +10 @@
      var w_nav = document.getElementById('dndnav');
      var w_ext = document.getElementById('dndextra');
+     var w_custom = document.getElementById('dndcustom');
      
      w_nav.className = 'hideControls';
      w_ext.className = 'hideControls';
+     w_custom.className = 'hideControls';
      
      removeElements(document.getElementById('listWidgets'),'input');
@@ -18 +20 @@
      removeElements(w_nav,'p');
      removeElements(w_ext,'p');
+     removeElements(w_custom,'p');
      hideElements(w_nav,'input');
      hideElements(w_ext,'input');
+     hideElements(w_custom,'input');
      
      configControls(w_nav);
      configControls(w_ext);
+     configControls(w_custom);
      
      dragdrop.makeListContainer(widgets,'div',setHandle);
@@ -30 +35 @@
      dragdrop.makeListContainer(w_ext,'div',setHandle);
      w_ext.onDragEnd = extraDragEnd;
+     dragdrop.makeListContainer(w_custom,'div',setHandle);
+     w_custom.onDragEnd = customDragEnd;
      
      // Helper to remove some elements
@@ -61 +68 @@
      function extraDragEnd() {
           formControls(this.parentNode,'extra');
+          configControls(this.parentNode);
+          removeEmptyMsg(this.parentNode);
+     }
+     function customDragEnd() {
+          formControls(this.parentNode,'custom');
           configControls(this.parentNode);
           removeEmptyMsg(this.parentNode);