Changeset 1669:5b0b6a8422f3 for plugins/widgets/index.php

Timestamp:

08/31/13 15:16:06 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Some enhancements on widgets page (with help from Franck Paul <3)

File:

• plugins/widgets/index.php (modified) (4 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
+          echo
+               dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+               dcPage::jsLoad('index.php?pf=widgets/widgets.js');
+  ?>
   <?php 
      $core->auth->user_prefs->addWorkspace('accessibility'); 
@@ -220 +223 @@
 echo
 '<div id="sidebarNav" class="widgets fieldset">'.
-sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav'],$j).
-'</div>'.
-'<ul class="sortable-delete"><li class="sortable-delete-placeholder">'.__('Drag here to delete').'</li></ul>';
+sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav'],$j);
+echo '</div>';
 
 # Extra sidebar
 echo
 '<div id="sidebarExtra" class="widgets fieldset">'.
-sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra'],$j).
-'</div>'.
-'<ul class="sortable-delete"><li class="sortable-delete-placeholder">'.__('Drag here to delete').'</li></ul>';
+sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra'],$j);
+echo '</div>';
 
 # Custom sidebar
 echo
 '<div id="sidebarCustom" class="widgets fieldset">'.
-sidebarWidgets('dndcustom',__('Custom sidebar'),$widgets_custom,'custom',$__default_widgets['custom'],$j).
-'</div>'.
-'<ul class="sortable-delete"><li class="sortable-delete-placeholder">'.__('Drag here to delete').'</li></ul>';
+sidebarWidgets('dndcustom',__('Custom sidebar'),$widgets_custom,'custom',$__default_widgets['custom'],$j);
+echo '</div>';
 
 echo
@@ -322 +322 @@
      }
      
-     if ($widgets->isEmpty()) {
-          $res .= '<p class="empty-widgets">'.__('No widget.').'</p>';
-     } else {
-          $res .= '<p class="empty-widgets" style="display: none;">'.__('No widget.').'</p>';
-     }
+     $res .= '<p class="empty-widgets" '.(!$widgets->isEmpty() ? 'style="display: none;"' : '').'>'.__('No widget.').'</p>';
      
      $res .= '<ul id="'.$id.'" class="connected">';
@@ -350 +346 @@
      
      $res .= '</ul>';
+
+     if ($i > 0) {
+          $res .= '<ul class="sortable-delete"><li class="sortable-delete-placeholder">'.
+               __('Drag widgets here to remove them from this sidebar.').'</li></ul>';
+     }
      
      return $res;