Changeset 2287:7a307319dfa0

Timestamp:

10/05/13 22:26:00 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Children:

2288:2685c7d01ec3, 2404:26ab8fe42321

Message:

A touch of javascript, confirm deletion on plugins and themes, disable search on words shorter than 2 chars, and help text.

Files:

• admin/js/_blog_theme.js (modified) (2 diffs)
• admin/js/_plugins.js (modified) (1 diff)
• inc/admin/lib.moduleslist.php (modified) (3 diffs)

admin/js/_blog_theme.js

@@ -1 +1 @@
 $(function() {
+     // expend theme info
      $('.module-sshot').not('.current-theme .module-sshot').each(function(){
           var bar = $('<div>').addClass('bloc-toggler');
@@ -11 +12 @@
           }));
      });
+
+     // confirm module deletion
+     $('div.module-actions form input[type=submit][name=delete]').click(function() {
+          var module_id = $('input[name=module]',$(this).parent()).val();
+          return window.confirm(dotclear.msg.confirm_delete_theme.replace('%s',module_id));
+     });
+
+     // dirty short search blocker
+     $('div.modules-search form input[type=submit]').click(function(){
+          var mlen = $('input[name=m_search]',$(this).parent()).val();
+          if (mlen.length > 2){return true;}else{return false;}
+     });
 });

admin/js/_plugins.js

@@ -150 +150 @@
 
 $(function() {
-        $('table.modules.expandable tr:not(.line)').each(function() {
-                dotclear.modulesExpander(this,$('table.modules.expandable tr.line'));
-        });
-        $('table.modules.expandable tr.line').each(function() {
-                dotclear.moduleExpander(this);
-        });
+/*
+     // expand all modules lines
+     $('table.modules.expandable tr:not(.line)').each(function() {
+          dotclear.modulesExpander(this,$('table.modules.expandable tr.line'));
+     });
+*/
+     // expand a module line
+     $('table.modules.expandable tr.line').each(function() {
+          dotclear.moduleExpander(this);
+     });
+
+     // confirm module deletion
+     $('div.module-actions form input[type=submit][name=delete]').click(function() {
+          var module_id = $('input[name=module]',$(this).parent()).val();
+          return window.confirm(dotclear.msg.confirm_delete_plugin.replace('%s',module_id));
+     });
 });

inc/admin/lib.moduleslist.php

@@ -257 +257 @@
 
           echo 
+          '<div class="modules-search">'.
           '<form action="'.$this->getURL().'" method="get" class="fieldset">'.
           '<p><label for="m_search" class="classic">'.__('Search in repository:').'&nbsp;</label><br />'.
           form::field(array('m_search','m_search'), 30, 255, html::escapeHTML($query)).
           '<input type="submit" value="'.__('Search').'" /> ';
-          if ($query) { echo ' <a href="'.$this->getURL().'" class="button">'.__('Reset search').'</a>'; }
-          echo '</p>'.
+
+          if ($query) { 
+               echo 
+               ' <a href="'.$this->getURL().'" class="button">'.__('Reset search').'</a>';
+          }
+
+          echo 
+          '</p>'.
+          '<p class="form-note">'.
+          __('Search is allowed on multiple terms longer than 2 chars, terms must be separated by space.').
+          '</p>'.
           '</form>';
 
@@ -273 +283 @@
                '</p>';
           }
+          echo '</div>';
+
           return $this;
      }
@@ -451 +463 @@
                     'details'                => '',
                     'sshot'             => '',
-                    'score'                  => 0
+                    'score'                  => 0,
+                    'type'                   => null
                ),
                # Module's values