Changeset 995:ffd146bbe114

Timestamp:

11/12/12 14:33:46 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Every types of entries may be used to inserted an entry link in current edited post, fixes #1089

Files:

• admin/js/_posts_list.js (modified) (1 diff)
• admin/popup_posts.php (modified) (3 diffs)
• locales/fr/main.po (modified) (2 diffs)
• locales/fr/plugins.po (modified) (1 diff)

admin/js/_posts_list.js

@@ -69 +69 @@
 
 $(function() {
+     // Entry type switcher
+     $('#type').change(function() {
+          this.form.submit();
+     });
+
      $('#form-entries tr.line').each(function() {
           dotclear.postExpander(this);

admin/popup_posts.php

@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
+$query_string = '';
 $q = !empty($_GET['q']) ? $_GET['q'] : null;
 
 $page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
 $nb_per_page =  10;
+
+$post_types = $core->getPostTypes();
+foreach ($post_types as $k => $v) {
+     $type_combo[__($k)] = (string) $k;
+}
+$type = !empty($_POST['type']) ? $_POST['type'] : null;
+if (!$type && $q) {
+     // Cope with search form
+     $type = !empty($_GET['type']) ? $_GET['type'] : null;
+}
+if (!in_array($type, $type_combo)) {
+     $type = null;
+}
 
 $params = array();
@@ -29 +43 @@
 }
 
+if ($type) {
+     $params['post_type'] = $type;
+}
+
 dcPage::openPopup(__('Add a link to an entry'),
      dcPage::jsLoad('js/_posts_list.js').
@@ -35 +53 @@
 echo '<h2 class="page-title">'.__('Add a link to an entry').'</h2>';
 
+echo '<form action="popup_posts.php" method="post">'.
+     '<p><label for"type" class="classic">'.__('Entry type:').' '.form::combo('type',$type_combo,$type).'</label></p>'.
+     $core->formNonce().
+     '<noscript><div><input type="submit" value="'.__('Ok').'" /></div></noscript>'.
+     '</form>';
+
 echo '<form action="popup_posts.php" method="get">'.
-'<p><label for="q" class="classic">'.__('Search entry:').' '.form::field('q',30,255,html::escapeHTML($q)).'</label> '.
-' <input type="submit" value="'.__('Search').'" /></p>'.
-'</form>';
+     '<p><label for="q" class="classic">'.__('Search entry:').' '.form::field('q',30,255,html::escapeHTML($q)).'</label> '.
+     ' <input type="submit" value="'.__('Search').'" /></p>'.
+     form::hidden('type',html::escapeHTML($type)).
+     '</form>';
 
 try {

locales/fr/main.po

@@ -1532 +1532 @@
 
 msgid "Add a link to an entry"
-msgstr "Ajouter un lien vers un billet"
+msgstr "Ajouter un lien vers une entrée"
 
 msgid "Search entry:"
-msgstr "Rechercher un billet :"
+msgstr "Rechercher une entrée :"
+
+msgid "Entry type:"
+msgstr "Type d'entrées :"
+
+msgid "post"
+msgstr "billet"
 
 msgid "Search"
@@ -2319 +2325 @@
 
 msgid "Link to an entry"
-msgstr "Lien vers un billet"
+msgstr "Lien vers une entrée"
 
 msgid "Activate enhanced uploader"

locales/fr/plugins.po

@@ -1273 +1273 @@
 msgstr "Si coché cette page sera active mais non listée dans le widget Pages."
 
+msgid "page"
+msgstr "page"
+
 msgid "Pings"
 msgstr "Signalements"