Changeset 1483:c2d860471ac8

Timestamp:

08/20/13 08:25:24 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

More simple widgets page.

Files:

• locales/fr/plugins.po (modified) (1 diff)
• plugins/widgets/index.php (modified) (9 diffs)
• plugins/widgets/style.css (modified) (3 diffs)

locales/fr/plugins.po

@@ -1937 +1937 @@
 msgid "Blog settings"
 msgstr "Paramètres du blog"
+
+msgid "Move widgets from this list to one of the sidebars."
+msgstr "Déplacez des widgets de cette liste vers l'un des volets."

plugins/widgets/index.php

@@ -197 +197 @@
 echo
 '<form id="listWidgets" action="'.$p_url.'" method="post"  class="widgets">'.
-'<fieldset><legend>'.__('Available widgets').'</legend>'.
+'<h3>'.__('Available widgets').'</h3>'.
+__('Move widgets from this list to one of the sidebars.').
 '<div id="widgets">';
 
@@ -205 +206 @@
      '<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>'.
+     $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>'.
@@ -215 +216 @@
 echo
 '</div>'.
-'</fieldset>'.
 '<p><input type="submit" class="js-remove" name="append" value="'.__('Add widgets to sidebars').'" />'.
 $core->formNonce().'</p>'.
@@ -223 +223 @@
 # Nav sidebar
 echo
-'<div id="sidebarNav" class="widgets">'.
+'<div id="sidebarNav" class="widgets fieldset">'.
 sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav'],$j).
 '</div>';
@@ -229 +229 @@
 # Extra sidebar
 echo
-'<div id="sidebarExtra" class="widgets">'.
+'<div id="sidebarExtra" class="widgets fieldset">'.
 sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra'],$j).
 '</div>';
@@ -235 +235 @@
 # Custom sidebar
 echo
-'<div id="sidebarCustom" class="widgets">'.
+'<div id="sidebarCustom" class="widgets fieldset">'.
 sidebarWidgets('dndcustom',__('Custom sidebar'),$widgets_custom,'custom',$__default_widgets['custom'],$j).
 '</div>';
@@ -316 +316 @@
 function sidebarWidgets($id,$title,$widgets,$pr,$default_widgets,&$j)
 {
-     $res = '<fieldset><legend>'.$title.'</legend><div id="'.$id.'">';
+     $res = '<h3>'.$title.'</h3><div id="'.$id.'">';
      
      if (!($widgets instanceof dcWidgets))
@@ -335 +335 @@
           '<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>'.
+          $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').
@@ -346 +346 @@
      }
      
-     $res .= '</div></fieldset>';
+     $res .= '</div>';
      
      return $res;

plugins/widgets/style.css

@@ -1 +1 @@
 #listWidgets {
      float: left;
-     width: 33%;
+     width: 45%;
+     background: #eee;
+     padding: 1.5em 1%; 
+     border: 1px solid #ccc;
+     margin-left: 1.5em;
 }
-#listWidgets fieldset {
-     background: #eee;
+#widgets .widget-name {
+     background: #fff;
+     min-height: 3em;
 }
-#listWidgets #widgets p.widget-name {
-     background: #fff;
+#listWidgets h3 {
+     color: #333;
 }
 
 #sidebarsWidgets {
      float: left;
-     width: 65%;
-     margin-left: 1%;
+     width: 45%;
+     margin-left: 3%;
+     padding: 0 1%;
 }
-#sidebarNav {
-     float: left;
-     width: 50%;
-     margin-left: 0%;
-}
-#sidebarExtra {
-     float: left;
-     width: 49%;
-     margin-left: 1%;
-}
-#sidebarCustom {
-     float: left;
-     width: 100%;
-}
-
 #sidebarsControl {
      clear: left;
 }
+.widgets.fieldset {
+     margin-bottom: 2em;
+}
 
-#widgets, #dndnav, #dndextra {
+#widgets, #dndnav, #dndextra, #dndcustom {
      padding: 1em 0;
 }
 
-.widgets fieldset {
-     border: 1px solid #999;
-     background: #E4E0EC;
-}
-
-.widgets p.widget-name {
-     background: #f5f5f5;
+.widget-name {
+     background: #eef;
      color: #000;
      padding: 4px 6px;
@@ -53 +42 @@
      font-weight: bold;
 }
-.widgets p.widget-name img {
+.widget-name span {
+     display: block;
+     font-style: normal;
+     font-size: 1.1rem;
+}
+.widget-name img {
      cursor: pointer;
      margin-bottom: -1px;
@@ -63 +57 @@
      border-color: #666;
      padding: 4px 6px;
-     background: #fff;
+     background: #f5f5f5;
 }