Changeset 1669:5b0b6a8422f3 for plugins/widgets

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)

Location:

plugins/widgets

Files:

• index.php (modified) (4 diffs)
• style.css (modified) (5 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;

plugins/widgets/style.css

@@ -24 +24 @@
 }
 .widgets.fieldset.if-drag {
-     margin-bottom: 0;
-     border-radius: 6px 6px 0 0;
-    border-bottom: 1px dashed #FF0000;
+     padding-bottom: 0;
+     border-radius: .5em;
 }
 #dndnav, #dndextra, #dndcustom {
@@ -34 +33 @@
 #dndnav > li,
 #dndextra > li,
-#dndcustom > li,
-.sortable-delete > li {
-     padding: O;
+#dndcustom > li {
+     padding: 0;
      border: 1px solid #999;
      margin-bottom: 1em;
@@ -46 +44 @@
 .sortable-delete > li.ui-sortable-placeholder {
      border: 1px dashed #999;
-     height: 2rem;
-     padding: 3px;
+     height: 2em;
+     padding: .3em;
 }
-
+.sortable-delete > li.ui-sortable-placeholder {
+     border-width: 2px;
+     border-color: red;
+}
 .sortable-delete {
      display: none;
 }
 .sortable-delete.if-drag {
-    border: 1px solid #999999;
-    border-top: 0;
-    border-radius: 0 0 6px 6px;
-    color: #000000;
+    border: 1px dotted #999;
+    color: #000;
     font-weight: bold;
-    list-style: none outside none;
-    margin: 0 0 2em;
-    min-height: 25px;
-    padding: 4px;
+    list-style-type: none;
+    margin: 0 0 1em;
+    padding: .5em 1em;
     display: block;
+    background: #fafafa;
 }
 .sortable-delete > li {
@@ -70 +69 @@
 .sortable-delete > li.sortable-delete-placeholder {
     border: 0 none;
-    color: #FF0000;
-    font-size: 1rem;
-    font-weight: normal;
+    color: #aaa;
+    font-size: 1em;
+    font-weight: bold;
     text-align: center;
 }
-
 .widget-name {
      background: #eef;
@@ -91 +89 @@
 .widget-name a.aexpand:visited {
     border: 0 none;
-    color: #000000;
+    color: #000;
     text-decoration: none;
 }