Changeset 1656:67be2ff67dce

Timestamp:

08/28/13 18:49:41 (12 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1604 - widgets

Parents:

1654:075b5fb7d713 (diff), 1655:8a7a3512a770 (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:

Fusion avec Ticket #1604

Files:

• admin/js/tool-man/cookies.js (deleted)
• admin/js/tool-man/coordinates.js (deleted)
• admin/js/tool-man/core.js (deleted)
• admin/js/tool-man/css.js (deleted)
• admin/js/tool-man/drag.js (deleted)
• admin/js/tool-man/dragsort.js (deleted)
• admin/js/tool-man/events.js (deleted)
• plugins/widgets/index.php (modified) (10 diffs)

plugins/widgets/index.php

@@ -165 +165 @@
   <?php echo file_get_contents(dirname(__FILE__).'/style.css'); ?>
   </style>
+     <script type="text/javascript" src="js/jquery/jquery-ui.custom.js"></script>
+  <script type="text/javascript" src="index.php?pf=widgets/widgets.js"></script>
   <?php 
      $core->auth->user_prefs->addWorkspace('accessibility'); 
@@ -172 +174 @@
   <script type="text/javascript" src="index.php?pf=widgets/dragdrop.js"></script>
   <?php endif; ?>
-  <script type="text/javascript" src="index.php?pf=widgets/widgets.js"></script>
   <script type="text/javascript">
   //<![CDATA[
@@ -194 +195 @@
 '<h3>'.__('Available widgets').'</h3>'.
 '<p>'.__('Move widgets from this list to one of the sidebars.').'</p>'.
-'<div id="widgets">';
+'<ul id="widgets">';
 
 $j = 0;
 foreach ($__widgets->elements(true) as $w) {
      echo
-     '<div>'.form::hidden(array('w[void][0][id]'),html::escapeHTML($w->id())).
-     '<p class="widget-name">'.form::field(array('w[void][0][order]'),2,3,0,'hideControl').' '.
-     $w->name().($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</p>'.
+     '<li>'.form::hidden(array('w[void][0][id]'),html::escapeHTML($w->id())).
+     '<p class="widget-name">'.form::field(array('w[void][0][order]'),2,3,0,'js-hide','',0,'title="'.__('order').'"').' '.$w->name().
+     ($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</p>'.
      '<p class="js-remove"><label class="classic">'.__('Append to:').'</label> '.
      form::combo(array('addw['.$w->id().']'),$append_combo).'</p>'.
      '<div class="widgetSettings">'.$w->formSettings('w[void][0]',$j).'</div>'.
-     '</div>';
+     '</li>';
      $j++;
 }
 
 echo
-'</div>'.
-'<p><input type="submit" class="js-remove" name="append" value="'.__('Add widgets to sidebars').'" />'.
-$core->formNonce().'</p>'.
+'</ul>'.
+$core->formNonce().
+'<p class="js-remove"><input type="submit" name="append" value="'.__('Add widgets to sidebars').'" /></p>'.
 '</form>';
 
@@ -220 +221 @@
 '<div id="sidebarNav" class="widgets fieldset">'.
 sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav'],$j).
-'</div>';
+'</div>'.
+'<ul class="sortable-delete"></ul>';
 
 # Extra sidebar
@@ -226 +228 @@
 '<div id="sidebarExtra" class="widgets fieldset">'.
 sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra'],$j).
-'</div>';
+'</div>'.
+'<ul class="sortable-delete"></ul>';
 
 # Custom sidebar
@@ -232 +235 @@
 '<div id="sidebarCustom" class="widgets fieldset">'.
 sidebarWidgets('dndcustom',__('Custom sidebar'),$widgets_custom,'custom',$__default_widgets['custom'],$j).
-'</div>';
+'</div>'.
+'<ul class="sortable-delete"></ul>';
 
 echo
@@ -311 +315 @@
 function sidebarWidgets($id,$title,$widgets,$pr,$default_widgets,&$j)
 {
-     $res = '<h3>'.$title.'</h3><div id="'.$id.'">';
+     $res = '<h3>'.$title.'</h3>';
      
      if (!($widgets instanceof dcWidgets))
@@ -320 +324 @@
      if ($widgets->isEmpty()) {
           $res .= '<p class="empty-widgets">'.__('No widget.').'</p>';
-     }
+     } else {
+          $res .= '<p class="empty-widgets" style="display: none;">'.__('No widget.').'</p>';
+     }
+     
+     $res .= '<ul id="'.$id.'" class="connected">';
      
      $i = 0;
@@ -328 +336 @@
           
           $res .=
-          '<div>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())).
-          '<p class="widget-name">'.form::field(array($iname.'[order]'),2,3,(string) $i,'js-hide','',0,'title="'.__('order').'"').' '.
-          $w->name().($w->desc() != '' ? ' <!-- <span class="form-note">'.__($w->desc()).'</span> -->' : '').'</p>'.
+          '<li>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())).
+          '<p class="widget-name">'.form::field(array($iname.'[order]'),2,3,(string) $i,'js-hide','',0,'title="'.__('order').'"').' '.$w->name().
+          ($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</p>'.
           '<p class="removeWidget js-remove"><label class="classic">'.
           form::checkbox(array($iname.'[_rem]'),'1',0).' '.__('Remove widget').
           '</label></p>'.
           '<div class="widgetSettings">'.$w->formSettings($iname,$j).'</div>'.
-          '</div>';
+          '</li>';
           
           $i++;
@@ -341 +349 @@
      }
      
-     $res .= '</div>';
+     $res .= '</ul>';
      
      return $res;