Changeset 2496:e33dcbc18e36 for plugins/pages/list.php

Timestamp:

10/27/13 09:52:46 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2495:dc8c7974ff0b (diff), 2494:b168f47c7f9c (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:

Merge 2.6 commits to the current 2.7-dev

Files:

• plugins/pages/list.php (modified) (2 diffs)
• plugins/pages/list.php (modified) (1 diff)

plugins/pages/list.php

@@ -55 +55 @@
   <title><?php echo __('Pages'); ?></title>
   <?php
-     echo dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+     echo
+          dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+          dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
           dcPage::jsLoad('index.php?pf=pages/list.js').
           '<script type="text/javascript">'.
@@ -89 +91 @@
      $post_list->display($page,$nb_per_page,
      '<form action="plugin.php" method="post" id="form-entries">'.
-     
+
      '%s'.
-     
+
      '<div class="two-cols">'.
      '<p class="col checkboxes-helpers"></p>'.
-     
+
      '<p class="col right"><label for="action" class="classic">'.__('Selected pages action:').'</label> '.
      form::combo('action',$pages_actions_page->getCombo()).

plugins/pages/list.php

@@ -99 +99 @@
      '<p class="col right"><label for="action" class="classic">'.__('Selected pages action:').'</label> '.
      form::combo('action',$pages_actions_page->getCombo()).
-     '<input type="submit" value="'.__('ok').'" /></p>'.
+     '<input type="submit" value="'.__('ok').'" />'.
      form::hidden(array('post_type'),'page').
      form::hidden(array('p'),'pages').
      form::hidden(array('act'),'list').
-     '</div>'.
      $core->formNonce().
+     '</p></div>'.
      '<p class="clear form-note hidden-if-js">'.
      __('To rearrange pages order, change number at the begining of the line, then click on “Save pages order” button.').'</p>'.
      '<p class="clear form-note hidden-if-no-js">'.
      __('To rearrange pages order, move items by drag and drop, then click on “Save pages order” button.').'</p>'.
-     '<input type="submit" value="'.__('Save pages order').'" name="reorder" class="clear"/>'.
+     '<p><input type="submit" value="'.__('Save pages order').'" name="reorder" class="clear" /></p>'.
      '</form>');
 }