MoinMoin: attachment:SlideShow.patch of ReimarBauer

   1 diff -r f58386c66150 data/plugin/action/SlideShow.py
   2 --- a/data/plugin/action/SlideShow.py	Mon Apr 20 02:36:24 2009 +0200
   3 +++ b/data/plugin/action/SlideShow.py	Fri Sep 04 13:35:59 2009 +0200
   4 @@ -6,6 +6,8 @@
   5  time, along with a navigation aid.
   6  
   7  A slide show page uses headings level 1 to define slides::
   8 +##pragma date Sept 04 2009
   9 +##pragma Your Name
  10  
  11      General introduction or comments
  12  
  13 @@ -27,10 +29,11 @@
  14  @copyright: 2005 Jim Clark,
  15              2005 Nir Soffer,
  16              2008 MoinMoin:ThomasWaldmann
  17 +            2009 MoinMoin:ReimarBauer
  18  @license: GNU GPL, see COPYING for details.
  19  """
  20  
  21 -import re
  22 +import re, time
  23  
  24  from MoinMoin import wikiutil, i18n, error
  25  from MoinMoin.Page import Page
  26 @@ -101,6 +104,7 @@
  27      def __init__(self, request, name, **keywords):
  28          Page.__init__(self, request, name, **keywords)
  29          self._slideIndex = None
  30 +        self.counter = ''
  31  
  32      def __len__(self):
  33          """ Return the slide count """
  34 @@ -368,6 +372,15 @@
  35      item_first_slide = first_slide
  36      item_last_slide = last_slide
  37  
  38 +    def item_date(self):
  39 +        return wikiutil.escape(self.request.getPragma('date', defval=self.request.user.getFormattedDate(time.time())))
  40 +
  41 +    def item_author(self):
  42 +        return wikiutil.escape(self.request.getPragma('author', defval=self.request.user.name))
  43 +
  44 +    def item_counter(self):
  45 +        return "%d|%d" % (self.slideNumber, len(self.slideLinksRange()))
  46 +
  47  # This is quite stupid template, but it cleans most of the code from
  48  # html. With smarter templates, there will be no html in the action code.
  49  template = """
  50 @@ -439,6 +452,11 @@
  51              <li>%(navigation_end)s</li>
  52          </ul>
  53      </div>
  54 +    <div id="footer">
  55 +    <ul id="date">%(date)s</ul>
  56 +    <ul id="author">%(author)s</ul>
  57 +    <ul id="counter">%(counter)s</ul>
  58 +    </div>
  59  <!--
  60      <p><a href="http://validator.w3.org/check?uri=referer">
  61          Valid HTML 4.01</a>
  62 diff -r f58386c66150 htdocs/SlideShow/css/SlideShow.css
  63 --- a/htdocs/SlideShow/css/SlideShow.css	Mon Apr 20 02:36:24 2009 +0200
  64 +++ b/htdocs/SlideShow/css/SlideShow.css	Fri Sep 04 13:35:59 2009 +0200
  65 @@ -1,5 +1,5 @@
  66  /*
  67 - * Single page slide show styles 
  68 + * Single page slide show styles
  69   *
  70   * Copy SlideShow.css to your theme's css/ directory.
  71   *
  72 @@ -10,6 +10,8 @@
  73  li p {margin: 0;} /* Workaround for moin's bad list html */
  74  
  75  html {
  76 +    background-image:url(/moin_static184/common/background_1024x768.png);
  77 +    background-repeat:no-repeat;
  78      background-color: white;
  79      color: black;
  80      font-family: Arial, Lucida Grande, sans-serif;
  81 @@ -17,7 +19,7 @@
  82  }
  83  
  84  body {
  85 -    margin: 0; 
  86 +    margin: 1em;
  87      padding: 20px;
  88  }
  89  
  90 @@ -93,6 +95,46 @@
  91      color: #888;
  92  }
  93  
  94 +#date {
  95 +    position: absolute;
  96 +    bottom: 0em;
  97 +    left: 2em;
  98 +    right: 0;
  99 +    font-size: 12pt;
 100 +    clear: both;
 101 +    display: inline;
 102 +    margin: 0;
 103 +    padding: 0;
 104 +    color: #6C7680;
 105 +}
 106 +
 107 +#author {
 108 +    position: absolute;
 109 +    bottom: 0em;
 110 +    left: 2em;
 111 +    right: 0;
 112 +    text-align: center;
 113 +    font-size: 12pt;
 114 +    clear: both;
 115 +    display: inline;
 116 +    margin: 0;
 117 +    padding: 0;
 118 +    color: #6C7680;
 119 +}
 120 +
 121 +#counter {
 122 +    position: absolute;
 123 +    bottom: 0em;
 124 +    left: 2em;
 125 +    right: 0;
 126 +    text-align: right;
 127 +    font-size: 12pt;
 128 +    clear: both;
 129 +    display: inline;
 130 +    margin: 0;
 131 +    padding: 0;
 132 +    color: #6C7680;
 133 +}
 134  
 135  /* CSS for ParserBase */
 136