git.oblomov.eu Git - ikiwiki/blob - doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change

   1 [[!meta author="""joey"""]]
   2
   3 [[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&amp;do=goto"""]]
   4
   5 [[!meta title="""change to ikiwiki/directive/more todo/selective_more_directive on ikiwiki"""]]
   6
   7 [[!meta permalink="http://ikiwiki.info/recentchanges/#change-ec6c1269d251c78d2eef68cb789de6cfc6272464"]]
   8
   9 <div id="change-ec6c1269d251c78d2eef68cb789de6cfc6272464" class="metadata">
  10 <span class="desc"><br />Changed pages:</span>
  11 <span class="pagelinks">
  12
  13 <a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/directive/more.mdwn;h=bda1427f39b6d3e688dc589b4ffd82aa3b09dc19;hp=50655191001371b9c34d4c305c118676b7e4f80e;hb=ec6c1269d251c78d2eef68cb789de6cfc6272464;hpb=021676e489f9b79a50338635ad654f31eb5575fe" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=ikiwiki%2Fdirective%2Fmore&amp;do=goto" rel="nofollow">ikiwiki/directive/more</a>
  14
  15
  16 <a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/selective_more_directive.mdwn;h=2a9998205f31460539e9c608dd3c740374bb503e;hp=24e6ab568a7e8aa4f2acc2a113bd554ef62dc2c9;hb=ec6c1269d251c78d2eef68cb789de6cfc6272464;hpb=021676e489f9b79a50338635ad654f31eb5575fe" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fselective_more_directive&amp;do=goto" rel="nofollow">todo/selective more directive</a>
  17
  18
  19 </span>
  20 <span class="desc"><br />Changed by:</span>
  21 <span class="committer">
  22
  23 <a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&amp;do=goto" rel="nofollow">joey</a>
  24
  25 </span>
  26 <span class="desc"><br />Commit type:</span>
  27 <span class="committype">git</span>
  28 <span class="desc"><br />Date:</span>
  29 <span class="changedate"><span class="relativedate" title="Tue, 16 Nov 2010 19:00:04 +0000">19:00:04 11/16/10</span></span>
  30 <span class="desc"><br /></span>
  31 </div>
  32
  33 <span class="revert">
  34 <a href="http://ikiwiki.info/ikiwiki.cgi?rev=ec6c1269d251c78d2eef68cb789de6cfc6272464&amp;do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
  35 </span>
  36
  37 <div class="changelog">
  38
  39
  40 more: Add pages parameter to limit where the more is displayed. (thanks, dark)<br />
  41
  42
  43 </div>
  44
  45 <div class="diff">
  46 <pre>
  47 diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
  48 index 80e339a..6880e36 100644
  49 --- a/IkiWiki/Plugin/more.pm
  50 +++ b/IkiWiki/Plugin/more.pm
  51 @@ -26,7 +26,10 @@ sub preprocess (@) {
  52
  53         $params{linktext} = $linktext unless defined $params{linktext};
  54
  55 -       if ($params{page} ne $params{destpage}) {
  56 +       if ($params{page} ne $params{destpage} &amp;&amp;
  57 +           (! exists $params{pages} ||
  58 +            pagespec_match($params{destpage}, $params{pages},
  59 +                    location =&gt; $params{page}))) {
  60                 return &quot;\n&quot;.
  61                         htmllink($params{page}, $params{destpage}, $params{page},
  62                                 linktext =&gt; $params{linktext},
  63 diff --git a/debian/changelog b/debian/changelog
  64 index 91ff096..faabf19 100644
  65 --- a/debian/changelog
  66 +++ b/debian/changelog
  67 @@ -1,6 +1,8 @@
  68  ikiwiki (3.20101113) UNRELEASED; urgency=low
  69
  70    * websetup: Fix encoding problem when restoring old setup file.
  71 +  * more: Add pages parameter to limit where the more is displayed.
  72 +    (thanks, dark)
  73
  74   -- Joey Hess &lt;joeyh@debian.org&gt;  Tue, 16 Nov 2010 14:23:47 -0400
  75
  76 diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn
  77 index 5065519..bda1427 100644
  78 --- a/doc/ikiwiki/directive/more.mdwn
  79 +++ b/doc/ikiwiki/directive/more.mdwn
  80 @@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this:
  81
  82  If the `linktext` parameter is omitted it defaults to just &quot;more&quot;.
  83
  84 +An optional `pages` parameter can be used to specify a
  85 +&#91;&#91;ikiwiki/PageSpec&#93;&#93;, and then the &quot;more&quot; link will only be displayed
  86 +when the page is inlined into a page matching that PageSpec, and otherwise
  87 +the full content shown.
  88 +
  89  Note that you can accomplish something similar using a &#91;&#91;toggle&#93;&#93; instead.
  90
  91  &#91;&#91;!meta robots=&quot;noindex, follow&quot;&#93;&#93;
  92 diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn
  93 index 24e6ab5..2a99982 100644
  94 --- a/doc/todo/selective_more_directive.mdwn
  95 +++ b/doc/todo/selective_more_directive.mdwn
  96 @@ -24,3 +24,5 @@ I can now call it as
  97  I&#39;m not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page.
  98
  99  -- &#91;&#91;dark&#93;&#93;
 100 +
 101 +&gt; Me neither, but nor do I see a better way, so &#91;&#91;applied|done&#93;&#93;. --&#91;&#91;Joey&#93;&#93;
 102
 103 </pre>
 104 </div>
 105
 106 <!-- ec6c1269d251c78d2eef68cb789de6cfc6272464 -->