# HG changeset patch # User cannam # Date 1253718593 0 # Node ID 4b4db9230e94537cb7bcb72189c22b8f11ba4430 # Parent bbcf0a2e0369b9fa51d10e14432bd2be5e6d8789 * wiki configuration and pages in svn diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/data/media/wiki/dokuwiki-128.png Binary file wiki/data/media/wiki/dokuwiki-128.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/data/pages/mtp1.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/data/pages/mtp1.txt Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,122 @@ +====== From Method to Plugin: Building a new plugin on OS/X with make ====== + +We're going to walk through the process of making, and compiling, a new Vamp plugin based on the skeleton files included with the Vamp plugin SDK. We will start by setting up a project in which we just get the skeleton plugin to compile without it doing any actual work, and then we'll add some substance to it afterwards. All work will be done using the terminal window and ''make'' (rather than, say, the Xcode IDE). Some familiarity with C++ will be necessary in the later steps. + +The focus here is on the practical details of what you need to put in a plugin and how to get it to build and run -- not on the real mathematical or signal-processing aspect. We will pick a very simple method (time-domain signal power, block by block) for this example. Please refer to the [[http://vamp-plugins.org/guide.pdf|Vamp plugin API programmer's guide]] for further reading, with information about returning more sophisticated features. + +**Before you begin:** Make sure you have the Xcode tools (the OS/X developer SDK) installed! You'll need it to compile anything. + +==== 1. Download and build the SDK ==== + +Download the Vamp plugin SDK version 2.1 from http://vamp-plugins.org/develop.html, save it into your home directory, open a terminal window, and unpack it. We'll also rename its directory from ''vamp-plugin-sdk-2.1'' to ''vamp-plugin-sdk'' for easier reference later on. + +mac:~ chris$ ls vamp* +vamp-plugin-sdk-2.1.tar.gz +mac:~ chris$ tar xvzf vamp-plugin-sdk-2.1.tar.gz + ... lots of output ... +mac:~ chris$ mv vamp-plugin-sdk-2.1 vamp-plugin-sdk +mac:~ chris$ + + +At this point you really ought to read the ''README'' file in the SDK directory, and the ''README.osx'' file in the SDK's ''build'' subdirectory. But for the tutorial we'll skip that and plunge in and build the SDK directly. + +We'll only build the SDK libraries and example plugins. We won't build the test host, because it requires an additional library (libsndfile). We'll download a pre-compiled binary of the test host later instead. (We could download pre-compiled library binaries too, but since we still need the SDK for the header files, we might as well compile it in place.) + + +mac:~ chris$ cd vamp-plugin-sdk +mac:~/vamp-plugin-sdk chris$ make -f build/Makefile.osx sdk + ... lots of output ... +mac:~/vamp-plugin-sdk chris$ make -f build/Makefile.osx plugins + ... lots of output ... +mac:~/vamp-plugin-sdk chris$ + + +==== 2. Copy the skeleton files to our new project home ==== + +We're going to build our plugin in a new directory called ''tutorial'' in our home directory. + + +mac:~/vamp-plugin-sdk chris$ cd +mac:~ chris$ mkdir tutorial +mac:~ chris$ cd tutorial +mac:~/tutorial chris$ + + +The starting point will be the set of skeleton files provided with the SDK. These consist of a valid "working" Vamp plugin that happens to do nothing at all. + + +mac:~/tutorial chris$ cp ../vamp-plugin-sdk/tutorial/* . +mac:~/tutorial chris$ ls +Makefile.skeleton MyPlugin.h vamp-plugin.list +MyPlugin.cpp plugins.cpp vamp-plugin.map +mac:~/tutorial chris$ + + +The skeleton plugin is contained in the files ''MyPlugin.cpp'' and ''MyPlugin.h''. These two files implement a single C++ class, called ''MyPlugin''. For the sake of brevity we'll leave these names unchanged, but you might prefer to change them! To do so, rename the two files and replace every occurrence of the text ''MyPlugin'' in both of them, and in ''plugins.cpp'', with your preferred plugin class name. + +The file ''plugins.cpp'' contains the entry point for the plugin library. A library can hold more than one plugin, and the job of ''plugins.cpp'' is to provide a single known public function (''vampGetPluginDescriptor'') which the host can use to find out what plugins are available in the library. The skeleton version of ''plugins.cpp'' just returns the single MyPlugin plugin class. + +Note that it makes absolutely no difference to the operation of the plugin what its class is called; MyPlugin is (in purely technical terms) as good a name as any. It also shouldn't matter if two different libraries happen to use the same class name. But if you have more than one plugin in the same library, they'll need to have different class names then! + +==== 3. Get the skeleton build working ==== + +The first thing we'll do with this skeleton project is build it into a "working" (although pointless) plugin. + +To build it we're going to use the tool ''make'', which takes a set of production rules described in a ''Makefile'' and uses them to turn source files into targets, in this case with the help of the C++ compiler. + +The skeleton project contains a file Makefile.skeleton which will be the basis of our Makefile. + +mac:~/tutorial chris$ cp Makefile.skeleton Makefile + +Now, open the Makefile in the text editor; we need to edit it to suit our new project. We haven't changed the names of any of the skeleton source files, so we don't need to edit those, but we do need to uncomment the lines that are specific to compiling on OS/X. These appear in the skeleton file as: + +## Uncomment these for an OS/X native build using command-line tools: + +# CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall -fPIC +# PLUGIN_EXT = .dylib +# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) +# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list + +Remove the ''#'' characters from the starts of the four lines in that block: + +## Uncomment these for an OS/X native build using command-line tools: + +CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall -fPIC +PLUGIN_EXT = .dylib +PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) +LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list + +Then, without changing anything else, save the file and run ''make''. + + +mac:~/tutorial chris$ +g++ -I../vamp-plugin-sdk -Wall -fPIC -c -o MyPlugin.o MyPlugin.cpp +g++ -I../vamp-plugin-sdk -Wall -fPIC -c -o plugins.o plugins.cpp +g++ -o myplugins.dylib MyPlugin.o plugins.o -dynamiclib -install_name myplugins.dylib ../vamp-plugin-sdk/libvamp-sdk.a -exported_symbols_list vamp-plugin.list +mac:~/tutorial chris$ + + +You should now have a plugin library file called ''myplugins.dylib'', as well as some ''.o'' files created during the build process. + +mac:~/tutorial chris$ ls +Makefile MyPlugin.o vamp-plugin.list +Makefile.skeleton myplugins.dylib vamp-plugin.map +MyPlugin.cpp plugins.cpp +MyPlugin.h plugins.o +mac:~/tutorial chris$ + + +This ''myplugins.dylib'' file is a valid and complete Vamp plugin library. It doesn't do anything worthwhile, but it can be loaded and "used" in any host. It defines a single Vamp plugin, whose identifier is "myplugin" (this is coded into the MyPlugin.cpp file, we'll be changing it later). + +==== 4. Check that the plugin works with some test programs ==== + +The next thing to do is gather some programs we can use to test our plugin, so that we can check it built correctly, and so that we'll be well placed to test it properly when it actually does something. + +The first one is the ''vamp-simple-host'' that is part of the Vamp SDK. This is the part of the SDK that we didn't build in step 1 (because of its dependency on libsndfile). Download it from the "pre-compiled library and host binaries" link at http://vamp-plugins.org/develop.html; the file you're downloading will be ''vamp-plugin-sdk-2.1-binaries-osx-universal.tar.gz''. + +==== 5. Do some actual calculations! ==== + +==== 6. Fill in descriptions and other metadata ==== + +==== 7. What else should we do? ==== + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/data/pages/playground/playground.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/data/pages/playground/playground.txt Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,1 @@ +====== PlayGround ====== diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/data/pages/start.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/data/pages/start.txt Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,9 @@ + + +====== Welcome to the Vamp plugins wiki! ====== + + +This is a public wiki, available for any kind of material related to [[http://vamp-plugins.org|Vamp audio analysis plugins]] and their use and development. + +If you have something you'd like to add, please, sign up and get editing! + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/data/pages/wiki/dokuwiki.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/data/pages/wiki/dokuwiki.txt Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,67 @@ +====== DokuWiki ====== + +[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a standards compliant, simple to use [[wp>Wiki]], mainly aimed at creating documentation of any kind. It is targeted at developer teams, workgroups and small companies. It has a simple but powerful [[wiki:syntax]] which makes sure the datafiles remain readable outside the Wiki and eases the creation of structured texts. All data is stored in plain text files -- no database is required. + +Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki. + +===== Download ===== + +DokuWiki is available at http://www.splitbrain.org/go/dokuwiki + + +===== Read More ===== + +All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]]. + +**About DokuWiki** + + * [[doku>features|A feature list]] :!: + * [[doku>users|Happy Users]] + * [[doku>press|Who wrote about it]] + * [[doku>blogroll|What Bloggers think]] + * [[http://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]] + +**Installing DokuWiki** + + * [[doku>requirements|System Requirements]] + * [[http://www.splitbrain.org/go/dokuwiki|Download DokuWiki]] :!: + * [[doku>changes|Change Log]] + * [[doku>Install|How to install or upgrade]] :!: + * [[doku>config|Configuration]] + +**Using DokuWiki** + + * [[doku>syntax|Wiki Syntax]] + * [[doku>manual|The manual]] :!: + * [[doku>FAQ|Frequently Asked Questions (FAQ)]] + * [[doku>glossary|Glossary]] + * [[http://search.dokuwiki.org|Search for DokuWiki help and documentation]] + +**Customizing DokuWiki** + + * [[doku>tips|Tips and Tricks]] + * [[doku>Template|How to create and use templates]] + * [[doku>plugins|Installing plugins]] + * [[doku>development|Development Resources]] + +**DokuWiki Feedback and Community** + + * [[doku>mailinglist|Join the mailing list]] :!: + * [[http://forum.dokuwiki.org|Check out the user forum]] + * [[doku>irc|Talk to other users in the IRC channel]] + * [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]] + * [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]] + * [[doku>thanks|Some humble thanks]] + + +===== Copyright ===== + +2004-2009 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) + +The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). + +The content published in the DokuWiki at http://www.dokuwiki.org/ is licensed under the [[http://creativecommons.org/licenses/by-nc-sa/2.0/|Creative Commons Attribution-NonCommercial-ShareAlike License]] Version 2.0. + +An exception is made for the content which distributed in the download tarball((files inside the ''data'' directory -- eg: ''dokuwiki.txt'', ''syntax.txt'', ''dokuwiki-128.png'')) which is, for compatibility reasons, licensed under the GNU General Public License Version 2 as well. + +Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]]. diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/data/pages/wiki/syntax.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/data/pages/wiki/syntax.txt Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,422 @@ +====== Formatting Syntax ====== + +[[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing the //Edit this page// button at the top or bottom of the page. If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too. + +===== Basic text formatting ===== + +DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these. + + DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. + Of course you can **__//''combine''//__** all these. + +You can use subscript and superscript, too. + + You can use subscript and superscript, too. + +You can mark something as deleted as well. + + You can mark something as deleted as well. + +**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line. + +This is some text with some linebreaks\\ Note that the +two backslashes are only recognized at the end of a line\\ +or followed by\\ a whitespace \\this happens without it. + + This is some text with some linebreaks\\ Note that the + two backslashes are only recognized at the end of a line\\ + or followed by\\ a whitespace \\this happens without it. + +You should use forced newlines only if really needed. + +===== Links ===== + +DokuWiki supports multiple ways of creating links. + +==== External ==== + +External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: are recognized, too. + + DokuWiki supports multiple ways of creating links. External links are recognized + automagically: http://www.google.com or simply www.google.com - You can set + link text as well: [[http://www.google.com|This Link points to google]]. Email + addresses like this one: are recognized, too. + +==== Internal ==== + +Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]]. + + Internal links are created by using square brackets. You can either just give + a [[pagename]] or use an additional [[pagename|link text]]. + +[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed. + +You can use [[some:namespaces]] by using a colon in the pagename. + + You can use [[some:namespaces]] by using a colon in the pagename. + +For details about namespaces see [[doku>namespaces]]. + +Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]]. + + This links to [[syntax#internal|this Section]]. + +Notes: + + * Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones. + * DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled. + * When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much. + +==== Interwiki ==== + +DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]]. + + DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. + For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]]. + + +==== Windows Shares ==== + +Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]]. + + Windows Shares like [[\\server\share|this]] are recognized, too. + +Notes: + + * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone"). + * For Mozilla and Firefox it can be enabled through the config option [[http://www.mozilla.org/quality/networking/docs/netprefs.html#file|security.checkloaduri]] but this is not recommended. + * See [[dokubug>151]] for more info. + +==== Image Links ==== + +You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this: + + [[http://www.php.net|{{wiki:dokuwiki-128.png}}]] + +[[http://www.php.net|{{wiki:dokuwiki-128.png}}]] + +Please note: The image formatting is the only formatting syntax accepted in link names. + +The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links). + +===== Footnotes ===== + +You can add footnotes ((This is a footnote)) by using double parentheses. + + You can add footnotes ((This is a footnote)) by using double parentheses. + +===== Sectioning ===== + +You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''~~NOTOC~~'' in the document. + +==== Headline Level 3 ==== +=== Headline Level 4 === +== Headline Level 5 == + + ==== Headline Level 3 ==== + === Headline Level 4 === + == Headline Level 5 == + +By using four or more dashes, you can make a horizontal line: + +---- + +===== Images and other files ===== + +You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them. + +Real size: {{wiki:dokuwiki-128.png}} + +Resize to given width: {{wiki:dokuwiki-128.png?50}} + +Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}} + +Resized external image: {{http://de3.php.net/images/php.gif?200x50}} + + Real size: {{wiki:dokuwiki-128.png}} + Resize to given width: {{wiki:dokuwiki-128.png?50}} + Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}} + Resized external image: {{http://de3.php.net/images/php.gif?200x50}} + + +By using left or right whitespaces you can choose the alignment. + +{{ wiki:dokuwiki-128.png}} + +{{wiki:dokuwiki-128.png }} + +{{ wiki:dokuwiki-128.png }} + + {{ wiki:dokuwiki-128.png}} + {{wiki:dokuwiki-128.png }} + {{ wiki:dokuwiki-128.png }} + +Of course, you can add a title (displayed as a tooltip by most browsers), too. + +{{ wiki:dokuwiki-128.png |This is the caption}} + + {{ wiki:dokuwiki-128.png |This is the caption}} + +If you specify a filename (external or internal) that is not an image (''gif, jpeg, png''), then it will be displayed as a link instead. + +For linking an image to another page see [[#Image Links]] above. + +===== Lists ===== + +Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones. + + * This is a list + * The second item + * You may have different levels + * Another item + + - The same list but ordered + - Another item + - Just use indention for deeper levels + - That's it + + + * This is a list + * The second item + * You may have different levels + * Another item + + - The same list but ordered + - Another item + - Just use indention for deeper levels + - That's it + + +===== Smileys ===== + +DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. More smileys can be placed in the ''smiley'' directory and configured in the ''conf/smileys.conf'' file. Here is an overview of Smileys included in DokuWiki. + + * 8-) %% 8-) %% + * 8-O %% 8-O %% + * :-( %% :-( %% + * :-) %% :-) %% + + * =) %% =) %% + * :-/ %% :-/ %% + * :-\ %% :-\ %% + * :-? %% :-? %% + * :-D %% :-D %% + * :-P %% :-P %% + * :-O %% :-O %% + * :-X %% :-X %% + * :-| %% :-| %% + * ;-) %% ;-) %% + * ^_^ %% ^_^ %% + * :?: %% :?: %% + * :!: %% :!: %% + * LOL %% LOL %% + * FIXME %% FIXME %% + * DELETEME %% DELETEME %% + +===== Typography ===== + +[[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters. + +-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) +"He thought 'It's a man's world'..." + + +-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) +"He thought 'It's a man's world'..." + + +Please note: These conversions can be turned off through a [[doku>config:typography|config option]] and a [[doku>entities|pattern file]]. + +===== Quoting ===== + +Some times you want to mark some text to show it's a reply or comment. You can use the following syntax: + + I think we should do it + + > No we shouldn't + + >> Well, I say we should + + > Really? + + >> Yes! + + >>> Then lets do it! + +I think we should do it + +> No we shouldn't + +>> Well, I say we should + +> Really? + +>> Yes! + +>>> Then lets do it! + +===== Tables ===== + +DokuWiki supports a simple syntax to create tables. + +^ Heading 1 ^ Heading 2 ^ Heading 3 ^ +| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 | +| Row 2 Col 1 | some colspan (note the double pipe) || +| Row 3 Col 1 | Row 2 Col 2 | Row 2 Col 3 | + +Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers. + + ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ + | Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 | + | Row 2 Col 1 | some colspan (note the double pipe) || + | Row 3 Col 1 | Row 2 Col 2 | Row 2 Col 3 | + +To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators! + +Vertical tableheaders are possible, too. + +| ^ Heading 1 ^ Heading 2 ^ +^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 | +^ Heading 4 | no colspan this time | | +^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | + +As you can see, it's the cell separator before a cell which decides about the formatting: + + | ^ Heading 1 ^ Heading 2 ^ + ^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 | + ^ Heading 4 | no colspan this time | | + ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | + +Note: Vertical spans (rowspan) are not possible. + +You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text. + +^ Table with alignment ^^^ +| right| center |left | +|left | right| center | +| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | + +This is how it looks in the source: + + ^ Table with alignment ^^^ + | right| center |left | + |left | right| center | + | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | + +===== Non-parsed Blocks ===== + +You can include non-parsed blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''code'' or ''file''. + + +This is preformatted code all spaces are preserved: like <-this + + + +This is pretty much the same, but you could use it to show that you quoted a file. + + +To let the parser ignore an area completely (ie. do no formatting on it), enclose the area either with ''nowiki'' tags or even simpler, with double percent signs ''%%''. + + +This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it. + + +See the source of this page to see how to use these blocks. + +===== Syntax Highlighting ===== + +[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code block in the previous section, but this time the name of the used language is inserted inside the tag. Eg. ''''. + + +/** + * The HelloWorldApp class implements an application that + * simply displays "Hello World!" to the standard output. + */ +class HelloWorldApp { + public static void main(String[] args) { + System.out.println("Hello World!"); //Display the string. + } +} + + +The following language strings are currently recognized: //abap, actionscript-french, actionscript, actionscript3, ada, apache, applescript, asm, asp, autoit, bash, basic4gl, blitzbasic, bnf, boo, c, c_mac, caddcl, cadlisp, cfdg, cfm, cil, cobol, cpp, cpp-qt, csharp, css, delphi, diff, div, dos, dot, d, eiffel, fortran, freebasic, genero, glsl, gml, gnuplot, groovy, gettext, haskell, html, idl, ini, inno, io, java5, java, javascript, kixtart, klonec, klonecpp, latex, lisp, lotusformulas, lotusscript, lua, m68k, matlab, mirc, mpasm, mxml, mysql, nsis, objc, ocaml-brief, ocaml, oobas, oracle8, pascal, perl, per, php-brief, php, pic16, plsql, povray, powershell, progress, python, qbasic, rails, reg, robots, ruby, sas, scala, scheme, sdlbasic, smalltalk, smarty, sql, tcl, text, thinbasic, tsql, typoscript, vbnet, vb, verilog, vhdl, visualfoxpro, winbatch, xml, xorg_conf, xpp, z80// + + +===== RSS/ATOM Feed Aggregation ===== +[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters: + +^ Parameter ^ Description ^ +| any number | will be used as maximum number items to show, defaults to 8 | +| reverse | display the last items in the feed first | +| author | show item authors names | +| date | show item dates | +| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped | +| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). | + +The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered. + +**Example:** + + {{rss>http://slashdot.org/index.rss 5 author date 1h }} + +{{rss>http://slashdot.org/index.rss 5 author date 1h }} + + +===== Embedding HTML and PHP ===== + +You can embed raw HTML or PHP code into your documents by using the ''html'' or ''php'' tags like this: + + +This is some inline HTML + + +

And this is some block HTML

+ + + + +This is some inline HTML + + +

And this is some block HTML

+ + + + +echo 'A logo generated by PHP:'; +echo 'PHP Logo !'; +echo '(generated inline HTML)'; + + +echo ''; +echo ''; +echo '
The same, but inside a block level element:PHP Logo !
'; + + + + +echo 'A logo generated by PHP:'; +echo 'PHP Logo !'; +echo '(inline HTML)'; + + +echo ''; +echo ''; +echo '
The same, but inside a block level element:PHP Logo !
'; + + +**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed. + +===== Control Macros ===== + +Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble: + +^ Macro ^ Description | +| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created | +| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call | + +===== Syntax Plugins ===== + +DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation: + +~~INFO:syntaxplugins~~ diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/design.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/design.css Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,797 @@ +/** + * Design elements for default Template + * + * @author Andreas Gohr + * @author Anika Henke + */ + +/* -------------- general elements --------------- */ + +* { padding: 0; margin: 0; } + +body { + font: 80% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; + background-color: __background__; + color: __text__; +} + +/* the document */ +div.dokuwiki div.page { + margin: 4px 2em 0 1em; + text-align: justify; +} + +div.dokuwiki table { + font-size: 100%; +} + +div.dokuwiki tr, +div.dokuwiki td, +div.dokuwiki th { +} + +div.dokuwiki img { + border: 0; +} + +div.dokuwiki p, +div.dokuwiki blockquote, +div.dokuwiki table, +div.dokuwiki pre { + margin: 0 0 1.0em 0; +} + +div.dokuwiki hr { + border: 0px; + border-top: 1px solid __border__; + text-align: center; + height: 0px; +} + +div.dokuwiki div.nothing { + text-align: center; + margin: 2em; +} + +/* ---------------- forms ------------------------ */ + +div.dokuwiki form { + border: none; + display: inline; +} + +div.dokuwiki label.block { + display: block; + text-align: right; + font-weight: bold; +} + +div.dokuwiki label.simple { + display: block; + text-align: left; + font-weight: normal; +} + +div.dokuwiki label.block input.edit { + width: 50%; +} + +div.dokuwiki fieldset { + width: 300px; + text-align: center; + border: 1px solid __border__; + padding: 0.5em; + margin: auto; +} + +div.dokuwiki textarea.edit { + font-family: monospace; + font-size: 14px; + color: __text__; + background-color: __background__; + border: 1px solid __border__; + padding: 0.3em 0 0 0.3em; + width: 100%; +} + +/* nice alphatransparency background except for IE <7 */ +html>body div.dokuwiki textarea.edit { + background: __background__ url(images/inputshadow.png) repeat-x top; +} + +div.dokuwiki input.edit, +div.dokuwiki select.edit { + font-size: 100%; + border: 1px solid __border__; + color: __text__; + background-color: __background__; + vertical-align: middle; + margin: 1px; + padding: 0.20em 0.3em; + display: inline; +} + +/* nice alphatransparency background except for IE <7 */ +html>body div.dokuwiki input.edit, +html>body div.dokuwiki select.edit { + background: __background__ url(images/inputshadow.png) repeat-x top; +} + +div.dokuwiki select.edit { + padding: 0.1em 0; +} + +div.dokuwiki input.missing { + font-size: 100%; + border: 1px solid __border__; + color: __text__; + background-color: #ffcccc; + vertical-align: middle; + margin: 1px; + padding: 0.20em 0.3em; + display: inline; +} + +/* disabled style - not understood by IE */ +div.dokuwiki textarea.edit[disabled], +div.dokuwiki textarea.edit[readonly], +div.dokuwiki input.edit[disabled], +div.dokuwiki input.edit[readonly], +div.dokuwiki select.edit[disabled] { + background-color: __background_neu__!important; + color: __text_neu__!important; +} + +/* edit form */ +div.dokuwiki div.toolbar, +div.dokuwiki div#wiki__editbar { + margin: 2px 0; + text-align: left; +} +div.dokuwiki div#size__ctl { + float: right; + width: 60px; + height: 2.7em; +} +div.dokuwiki #size__ctl img { + cursor: pointer; +} +div.dokuwiki div#wiki__editbar div.editButtons { + float: left; + padding: 0 1.0em 0.7em 0; +} +div.dokuwiki div#wiki__editbar div.summary { + float: left; +} +div.dokuwiki .nowrap { + white-space: nowrap; +} +div.dokuwiki div#draft__status { + float: right; + color: __text_alt__; +} + +div.dokuwiki div.license { + padding: 0.5em; + font-size: 90%; + text-align: center; +} + +div.dokuwiki form#dw__editform div.license { + clear: left; + font-size: 90%; +} + +/* --------- buttons ------------------- */ + +div.dokuwiki input.button, +div.dokuwiki button.button { + border: 1px solid __border__; + color: __text__; + background-color: __background__; + vertical-align: middle; + text-decoration: none; + font-size: 100%; + cursor: pointer; + margin: 1px; + padding: 0.125em 0.4em; +} + +/* nice alphatransparency background except for IE <7 */ +html>body div.dokuwiki input.button, +html>body div.dokuwiki button.button { + background: __background__ url(images/buttonshadow.png) repeat-x bottom; +} + +* html div.dokuwiki input.button, +* html div.dokuwiki button.button { + height: 1.8em; +} + +div.dokuwiki div.secedit input.button { + border: 1px solid __border__; + color: __text__; + background-color: __background__; + vertical-align: middle; + text-decoration: none; + margin: 0; + padding: 0; + font-size: 10px; + cursor: pointer; + float: right; + display: inline; +} + +/* ----------- page navigator ------------- */ + +div.dokuwiki div.pagenav { + margin: 1em 0 0 0; +} + +div.dokuwiki div.pagenav-prev { + text-align: right; + float: left; + width: 49% +} + +div.dokuwiki div.pagenav-next { + text-align: left; + float: right; + width: 49% +} + +/* --------------- Links ------------------ */ + +div.dokuwiki a:link, +div.dokuwiki a:visited { + color: __extern__; + text-decoration: none; +} +div.dokuwiki a:hover, +div.dokuwiki a:active { + color: __text__; + text-decoration: underline; +} + +div.dokuwiki h1 a, +div.dokuwiki h2 a, +div.dokuwiki h3 a, +div.dokuwiki h4 a, +div.dokuwiki h5 a, +div.dokuwiki a.nolink { + color: __text__ !important; + text-decoration: none !important; +} + +/* external link */ +div.dokuwiki a.urlextern { + background: transparent url(images/link_icon.gif) 0px 1px no-repeat; + padding: 1px 0px 1px 16px; +} + +/* windows share */ +div.dokuwiki a.windows { + background: transparent url(images/windows.gif) 0px 1px no-repeat; + padding: 1px 0px 1px 16px; +} + +/* interwiki link (icon are set by dokuwiki) */ +div.dokuwiki a.interwiki { +} + +/* link to some embedded media */ +div.dokuwiki a.media { +} + +div.dokuwiki a.urlextern:link, +div.dokuwiki a.windows:link, +div.dokuwiki a.interwiki:link { + color: __extern__; +} + +div.dokuwiki a.urlextern:visited, +div.dokuwiki a.windows:visited, +div.dokuwiki a.interwiki:visited { + color: purple; +} +div.dokuwiki a.urlextern:hover, +div.dokuwiki a.urlextern:active, +div.dokuwiki a.windows:hover, +div.dokuwiki a.windows:active, +div.dokuwiki a.interwiki:hover, +div.dokuwiki a.interwiki:active { + color: __text__; +} + +/* email link */ +div.dokuwiki a.mail { + background: transparent url(images/mail_icon.gif) 0px 1px no-repeat; + padding: 1px 0px 1px 16px; +} + +/* existing wikipage */ +div.dokuwiki a.wikilink1 { + color: __existing__ !important; +} + +/* not existing wikipage */ +div.dokuwiki a.wikilink2 { + color: __missing__ !important; + text-decoration: none !important; + border-bottom: dashed 1px __missing__ !important; +} + +/* ------------- Page elements ----------------- */ + +div.dokuwiki div.preview { + background-color: __background_neu__; + margin: 0 0 0 2em; + padding: 4px; + border: 1px dashed __text__; +} + +div.dokuwiki div.breadcrumbs { + background-color: __background_neu__; + color: __text_neu__; + font-size: 80%; + padding: 0 0 0 4px; +} + +div.dokuwiki span.user { + color: __text_other__; + font-size: 90%; +} + +div.dokuwiki li.minor { + color: __text_neu__; + font-style: italic; +} + +/* embedded images */ +div.dokuwiki img.media { + margin: 3px; +} + +div.dokuwiki img.medialeft { + border: 0; + float: left; + margin: 0 1.5em 0 0; +} + +div.dokuwiki img.mediaright { + border: 0; + float: right; + margin: 0 0 0 1.5em; +} + +div.dokuwiki img.mediacenter { + border: 0; + display: block; + margin: 0 auto; +} + +/* smileys */ +div.dokuwiki img.middle { + vertical-align: middle; +} + +div.dokuwiki acronym { + cursor: help; + border-bottom: 1px dotted __text__; +} + +/* general headline setup */ +div.dokuwiki h1, +div.dokuwiki h2, +div.dokuwiki h3, +div.dokuwiki h4, +div.dokuwiki h5 { + color: __text__; + background-color: inherit; + font-size: 100%; + font-weight: normal; + margin: 0 0 1em 0; + padding: 0.5em 0 0 0; + border-bottom: 1px solid __border__; + clear: left; +} + +/* special headlines */ +div.dokuwiki h1 {font-size: 160%; margin-left: 0px; font-weight: bold;} +div.dokuwiki h2 {font-size: 150%; margin-left: 20px;} +div.dokuwiki h3 {font-size: 140%; margin-left: 40px; border-bottom: none; font-weight: bold;} +div.dokuwiki h4 {font-size: 120%; margin-left: 60px; border-bottom: none; font-weight: bold;} +div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;} + +/* indent different sections */ +div.dokuwiki div.level1 {margin-left: 3px;} +div.dokuwiki div.level2 {margin-left: 23px;} +div.dokuwiki div.level3 {margin-left: 43px;} +div.dokuwiki div.level4 {margin-left: 63px;} +div.dokuwiki div.level5 {margin-left: 83px;} + +/* unordered lists */ +div.dokuwiki ul { + line-height: 1.5em; + list-style-type: square; + list-style-image: none; + margin: 0 0 1em 3.5em; + color: __text_alt__; +} + +/* ordered lists */ +div.dokuwiki ol { + line-height: 1.5em; + list-style-image: none; + margin: 0 0 1em 3.5em; + color: __text_alt__; + font-weight: bold; +} + +/* no gap in between nested lists */ +div.dokuwiki li ul { + margin-bottom: 0; +} +div.dokuwiki li ol { + margin-bottom: 0; +} + +/* the list items overriding the ul/ol definition */ +div.dokuwiki .li { + color: __text__; + font-weight: normal; +} + +div.dokuwiki ol {list-style-type: decimal} +div.dokuwiki ol ol {list-style-type: upper-roman} +div.dokuwiki ol ol ol {list-style-type: lower-alpha} +div.dokuwiki ol ol ol ol {list-style-type: lower-greek} + +div.dokuwiki li.open { + list-style-image: url(images/open.gif); + /*list-style-type: circle;*/ +} + +div.dokuwiki li.closed { + list-style-image: url(images/closed.gif); + /*list-style-type: disc;*/ +} + +div.dokuwiki blockquote { + border-left: 2px solid __border__; + padding-left: 3px; +} + +div.dokuwiki pre { + font-size: 120%; + padding: 0.5em; + border: 1px dashed __border__; + color: __text__; + overflow: auto; +} + +/* code blocks by indention */ +div.dokuwiki pre.pre { + background-color: __background_other__; +} + +/* code blocks by code tag */ +div.dokuwiki pre.code { + background-color: __background_other__; +} + +/* inline code words */ +div.dokuwiki code { + font-size: 120%; +} + +/* code blocks by file tag */ +div.dokuwiki pre.file { + background-color: __background_alt__; +} + +/* inline tables */ +div.dokuwiki table.inline { + background-color: __background__; + border-spacing: 0px; + border-collapse: collapse; +} + +div.dokuwiki table.inline th { + padding: 3px; + border: 1px solid __border__; + background-color: __background_alt__; +} + +div.dokuwiki table.inline td { + padding: 3px; + border: 1px solid __border__; +} + +/* ---------- table of contents ------------------- */ + +div.dokuwiki div.toc { + margin: 1.2em 0 0 2em; + float: right; + width: 200px; + font-size: 80%; + clear: both; +} + +div.dokuwiki div.tocheader { + border: 1px solid __border__; + background-color: __background_alt__; + text-align: left; + font-weight: bold; + padding: 3px; + margin-bottom: 2px; +} + +div.dokuwiki span.toc_open, +div.dokuwiki span.toc_close { + border: 0.4em solid __background_alt__; + float: right; + display: block; + margin: 0.4em 3px 0 0; +} + +div.dokuwiki span.toc_open span, +div.dokuwiki span.toc_close span { + display: none; +} + +div.dokuwiki span.toc_open { + margin-top: 0.4em; + border-top: 0.4em solid __text__; +} + +div.dokuwiki span.toc_close { + margin-top: 0; + border-bottom: 0.4em solid __text__; +} + +div.dokuwiki #toc__inside { + border: 1px solid __border__; + background-color: __background__; + text-align: left; + padding: 0.5em 0 0.7em 0; +} + +div.dokuwiki ul.toc { + list-style-type: none; + list-style-image: none; + line-height: 1.2em; + padding-left: 1em; + margin: 0; +} + +div.dokuwiki ul.toc li { + background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat; + padding-left: 0.4em; +} + +div.dokuwiki ul.toc li.clear { + background-image: none; + padding-left: 0.4em; +} + +div.dokuwiki a.toc:link, +div.dokuwiki a.toc:visited { + color: __extern__; +} + +div.dokuwiki a.toc:hover, +div.dokuwiki a.toc:active { + color: __text__; +} + +/* ---------------------------- Diff rendering --------------------------*/ +div.dokuwiki table.diff { + background-color: __background__; + width: 100%; +} +div.dokuwiki td.diff-blockheader { + font-weight: bold; +} +div.dokuwiki table.diff th { + border-bottom: 1px solid __border__; + font-size: 110%; + width: 50%; + font-weight: normal; + text-align: left; +} +div.dokuwiki table.diff th a { + font-weight: bold; +} +div.dokuwiki table.diff th span.user { + color: __text__; + font-size: 80%; +} +div.dokuwiki table.diff th span.sum { + font-size: 80%; + font-weight: bold; +} +div.dokuwiki table.diff th.minor { + font-style: italic; +} +div.dokuwiki table.diff td { + font-family: monospace; + font-size: 100%; +} +div.dokuwiki td.diff-addedline { + background-color: #ddffdd; +} +div.dokuwiki td.diff-deletedline { + background-color: #ffffbb; +} +div.dokuwiki td.diff-context { + background-color: __background_neu__; +} +div.dokuwiki table.diff td.diff-addedline strong, +div.dokuwiki table.diff td.diff-deletedline strong { + color: red; +} + +/* --------------------- footnotes -------------------------------- */ + +div.dokuwiki div.footnotes { + clear: both; + border-top: 1px solid __border__; + padding-left: 1em; + margin-top: 1em; +} + +div.dokuwiki div.fn { + font-size: 90%; +} + +div.dokuwiki a.fn_bot { + font-weight: bold; +} + +/* insitu-footnotes */ +div.insitu-footnote { + font-size: 80%; + line-height: 1.2em; + border: 1px solid __border__; + background-color: __background_other__; + text-align: left; + padding: 4px; + max-width: 40%; /* IE's width is handled in javascript */ +} + +/* overcome IE issue with one line code or file boxes which require h. scrolling */ +* html .insitu-footnote pre.code, +* html .insitu-footnote pre.file { + padding-bottom: 18px; +} + +/* --------------- search result formating --------------- */ +div.dokuwiki .search_result { + margin-bottom: 6px; + padding: 0 10px 0 30px; +} + +div.dokuwiki .search_snippet { + color: __text_other__; + font-size: 12px; + margin-left: 20px; +} + +div.dokuwiki .search_sep { + color: __text__; +} + +div.dokuwiki .search_hit { + color: __text__; + background-color: __highlight__; +} +div.dokuwiki strong.search_hit { + font-weight: normal; +} + +div.dokuwiki div.search_quickresult { + margin: 0 0 15px 30px; + padding: 0 10px 10px 0; + border-bottom: 1px dashed __border__; +} +div.dokuwiki div.search_quickresult h3 { + margin: 0 0 1.0em 0; + font-size: 1em; + font-weight: bold; +} + +div.dokuwiki ul.search_quickhits { + margin: 0 0 0.5em 1.0em; +} + +div.dokuwiki ul.search_quickhits li { + margin: 0 1.0em 0 1.0em; + float:left; + width: 30%; +} + +/* ------------------ Additional ---------------------- */ + +div.footerinc { + text-align: center; +} +.footerinc a img { + opacity: 0.5; + border: 0; +} + +.footerinc a:hover img { + opacity: 1; +} + +/* ---------- AJAX quicksearch ----------- */ + +div.dokuwiki div.ajax_qsearch { + position: absolute; + right: 237px;; + width: 200px; + opacity: 0.9; + display: none; + font-size: 80%; + line-height: 1.2em; + border: 1px solid __border__; + background-color: __background_other__; + text-align: left; + padding: 4px; +} + +/* --------- Toolbar -------------------- */ +button.toolbutton { + background-color: __background__; + padding: 0px; + margin: 0 1px 0 0; + border: 1px solid __border__; + cursor: pointer; +} + +/* nice alphatransparency background except for IE <7 */ +html>body button.toolbutton { + background: __background__ url(images/buttonshadow.png) repeat-x bottom; +} + +div.picker { + width: 250px; + border: 1px solid __border__; + background-color: __background_alt__; +} + +button.pickerbutton { + padding: 0px; + margin: 0 1px 1px 0; + border: 0; + background-color: transparent; + font-size: 80%; + cursor: pointer; +} + +/* --------------- Image Details ----------------- */ + +div.dokuwiki div.img_big { + float: left; + margin-right: 0.5em; +} + +div.dokuwiki dl.img_tags dt { + font-weight: bold; + background-color: __background_alt__; +} +div.dokuwiki dl.img_tags dd { + background-color: __background_neu__; +} + +div.dokuwiki div.imagemeta { + color: __text_neu__; + font-size: 70%; + line-height: 95%; +} + +div.dokuwiki div.imagemeta img.thumb { + float:left; + margin-right: 0.1em; +} diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/detail.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/detail.php Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,89 @@ + + */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); + +?> + + + + + + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + + +
+ + +
+ + +

+ +
+ +
+ +
+

+ +

+ +

←

+ +
+ '.$lang['img_date'].':
'.strftime($conf['dformat'],$t).'
'; + + $t = tpl_img_getTag('File.Name'); + if($t) print '
'.$lang['img_fname'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit')); + if($t) print '
'.$lang['img_artist'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright')); + if($t) print '
'.$lang['img_copyr'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('File.Format'); + if($t) print '
'.$lang['img_format'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('File.NiceSize'); + if($t) print '
'.$lang['img_fsize'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag('Simple.Camera'); + if($t) print '
'.$lang['img_camera'].':
'.hsc($t).'
'; + + $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); + if($t) print '
'.$lang['img_keywords'].':
'.hsc($t).'
'; + + ?> +
+ +
+ + +
+
+ + + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/footer.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/footer.html Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,41 @@ + + +
+ + href="feed.php" title="Recent changes RSS feed">Recent changes RSS feed + + + href="" rel="license" title=""> + + + href="http://www.dokuwiki.org/donate" title="Donate">Donate + + href="http://www.php.net" title="Powered by PHP">Powered by PHP + + href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0">Valid XHTML 1.0 + + href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS">Valid CSS + + href="http://dokuwiki.org/" title="Driven by DokuWiki">Driven by DokuWiki + +'; +} +?> + + +
+ diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/UWEB.png Binary file wiki/lib/tpl/default/images/UWEB.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/UWEBshadow.png Binary file wiki/lib/tpl/default/images/UWEBshadow.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/bullet.gif Binary file wiki/lib/tpl/default/images/bullet.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-cc.gif Binary file wiki/lib/tpl/default/images/button-cc.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-css.png Binary file wiki/lib/tpl/default/images/button-css.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-donate.gif Binary file wiki/lib/tpl/default/images/button-donate.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-dw.png Binary file wiki/lib/tpl/default/images/button-dw.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-php.gif Binary file wiki/lib/tpl/default/images/button-php.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-rss.png Binary file wiki/lib/tpl/default/images/button-rss.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/button-xhtml.png Binary file wiki/lib/tpl/default/images/button-xhtml.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/buttonshadow.png Binary file wiki/lib/tpl/default/images/buttonshadow.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/closed.gif Binary file wiki/lib/tpl/default/images/closed.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/favicon.ico Binary file wiki/lib/tpl/default/images/favicon.ico has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/inputshadow.png Binary file wiki/lib/tpl/default/images/inputshadow.png has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/link_icon.gif Binary file wiki/lib/tpl/default/images/link_icon.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/mail_icon.gif Binary file wiki/lib/tpl/default/images/mail_icon.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/open.gif Binary file wiki/lib/tpl/default/images/open.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/tocdot2.gif Binary file wiki/lib/tpl/default/images/tocdot2.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/images/windows.gif Binary file wiki/lib/tpl/default/images/windows.gif has changed diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/layout.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/layout.css Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,83 @@ +/** + * Tableless Layout for default template + * + * @author Andreas Gohr + * @author moraes + */ + +/* -------------- top row --------------- */ +div.dokuwiki .header { + padding: 3px 0 0 2px; +} + +div.dokuwiki .pagename { + float: left; + font-size: 200%; + font-weight: bolder; + color: __background_alt__; + text-align: left; + vertical-align: middle; +} + +div.dokuwiki .pagename a { + color: __extern__ !important; + text-decoration: none !important; +} + +div.dokuwiki .logo { + float: right; + font-size: 220%; + font-weight: bolder; + text-align: right; + vertical-align: middle; + width: 476px; + height: 29px; + background: url(/images/vamp-title.png) no-repeat; +} + +div.dokuwiki .logo a { + display: none; + color: __background_alt__ !important; + text-decoration: none !important; + font-variant: small-caps; + letter-spacing: 2pt; +} + +/* --------------- top and bottom bar ---------------- */ +div.dokuwiki .bar { + border-top: 1px solid __border__; + border-bottom: 1px solid __border__; + background: __background_alt__; + padding: 0.1em 0.15em; + clear: both; +} + +div.dokuwiki .bar-left { + float: left; +} + +div.dokuwiki .bar-right { + float: right; + text-align: right; +} + +div.dokuwiki #bar__bottom { + margin-bottom:3px; +} + +/* ------------- File Metadata ----------------------- */ + +div.dokuwiki div.meta { + clear: both; + margin-top: 1em; + color: __text_alt__; + font-size: 70%; +} + +div.dokuwiki div.meta div.user { + float: left; +} + +div.dokuwiki div.meta div.doc { + text-align: right; +} diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/main.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/main.php Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,138 @@ + + */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); + +?> + + + + + + <?php tpl_pagetitle()?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + + + + + +
+ + +
+ +
+
+ [[]] +
+ + +
+
+ + + +
+
+ + +
+ +
+ +   +
+ +
+
+ + +
+ + +
+ + + +
+ +
+ + +
+ + + + +
+ + + +
+ +
 
+ + + +
+ +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+ + + + + + +   +
+
+
+ +
+ + + +
+ + +
+ + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/media.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/media.css Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,205 @@ +/** + * The CSS in here cotrols the appearance of the media manager + */ + +#media__manager { + height: 100%; + overflow: hidden; +} + +#media__left { + width: 30%; + border-right: solid 1px __border__; + + height: 100%; + overflow: auto; + position: absolute; + left: 0; +} + +#media__right { + width: 69.7%; + + height: 100%; + overflow: auto; + position: absolute; + right: 0; +} + +#media__manager h1 { + margin: 0; + padding: 0; + margin-bottom: 0.5em; +} + +/* --- Tree formatting --- */ + +#media__tree img { + float:left; + padding: 0.5em 0.3em 0 0; +} + +#media__tree ul { + list-style-type: none; + list-style-image: none; + margin-left: 1.5em; +} + +#media__tree li { + clear: left; + list-style-type: none; + list-style-image: none; +} +*+html #media__tree li, +* html #media__tree li { + border: 1px solid __background__; +}/* I don't understand this, but this fixes a style bug in IE; +it's dirty, so any "real" fixes are welcome */ + +/* --- options --- */ + +#media__opts { + padding-left: 1em; + margin-bottom: 0.5em; +} + +#media__opts input { + float: left; + display: block; + margin-top: 4px; + position: absolute; +} +*+html #media__opts input, +* html #media__opts input { + position: static; +} + +#media__opts label { + display: block; + float: left; + margin-left: 20px; + margin-bottom: 4px; +} +*+html #media__opts label, +* html #media__opts label { + margin-left: 10px; +} + +#media__opts br { + clear: left; +} + +/* --- file list --- */ + +#media__content img.load { + margin: 1em auto; +} + +#media__content #scroll__here { + border: 1px dashed __border__; +} + +#media__content .odd { + background-color: __background_other__; + padding: 0.4em; +} + +#media__content .even { + padding: 0.4em; +} + +#media__content a.mediafile { + margin-right: 1.5em; + font-weight: bold; +} + +#media__content div.detail { + padding: 0.3em 0 0.3em 2em; +} + +#media__content div.detail div.thumb { + float: left; + width: 130px; + text-align: center; + margin-right: 0.4em; +} + + +#media__content img.btn { + vertical-align: text-bottom; +} + +#media__content div.example { + color: __text_neu__; + margin-left: 1em; +} + +/* --- upload form --- */ + +#media__content div.upload { + font-size: 90%; + padding: 0 0.5em 0.5em 0.5em; +} + +#media__content form#dw__upload, +#media__content div#dw__flashupload { + display: block; + border-bottom: solid 1px __border__; + padding: 0 0.5em 1em 0.5em; +} +#media__content form#dw__upload fieldset { + padding: 0; + margin: 0; + border: none; + width: auto; +} +#media__content form#dw__upload p { + text-align: left; + padding: 0.25em 0; + margin: 0; + line-height: 1.0em; +} +#media__content form#dw__upload label.check { + float: none; + width: auto; + margin-left: 11.5em; +} + +/* --- meta edit form --- */ + +#media__content form.meta { + display: block; + padding: 0 0 1em 0; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + margin-left: 1em; + clear: left; +} + +#media__content form.meta .edit { + font: 100% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; + float: left; + width: 70%; + padding-right: 0; + padding-left: 0.2em; + margin: 2px; +} + +#media__content form.meta textarea.edit { + height: 8em; +} + +#media__content form.meta div.metafield { + clear: left; +} + +#media__content form.meta div.buttons { + clear: left; + margin-left: 20%; + padding-left: 1em; +} diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/mediamanager.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/mediamanager.php Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,44 @@ + + + */ +?> + + + + + <?php echo hsc($lang['mediaselect'])?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + +
+
+ +

+ + +
+ + +
+ +
+ +
+
+ + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/print.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/print.css Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,238 @@ + +body { + font: 10pt "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; + background-color: White; + color: Black; +} + +table { + font-size: 100%; + padding:0; + margin:0; +} + +tr,td,th {padding:0; margin:0;} + +img {border:0} + +a { + color:#000000; + text-decoration:none; + background: none !important; +} + + +div.meta { + clear:both; + margin-top: 1em; + font-size:70%; + text-align:right; +} + + +div.notify, +div.info, +div.success, +div.error, +div.breadcrumbs, +div.secedit { + display:none; +} + +/* --------------------- Text formating -------------------------------- */ + +/* external link */ +a.urlextern:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* interwiki link */ +a.interwiki:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* email link */ +a.mail:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* existing wikilink */ +a.wikilink1 {text-decoration:underline } + +/* the document */ +div.page { + text-align: justify; +} + +/* general headline setup */ +h1, h2, h3, h4, h5 { + color: Black; + background-color: transparent; + font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; + font-size: 100%; + font-weight: normal; + margin-left: 0; + margin-right: 0; + margin-top: 0; + margin-bottom: 1em; + padding-left: 0; + padding-right: 0; + padding-top: 0.5em; + padding-bottom: 0; + border-bottom: 1px solid #000000; + clear:left; +} + +/* special headlines */ +h1 {font-size: 160%; font-weight: bold;} +h2 {font-size: 150%; } +h3 {font-size: 140%; border-bottom: none; } +h4 {font-size: 120%; border-bottom: none; } +h5 {font-size: 100%; border-bottom: none; } + +/* embedded images */ +img.media { + margin: 3px; +} + +img.medialeft { + border: 0; + float: left; + margin: 0 1.5em 0 0; +} + +img.mediaright { + border: 0; + float: right; + margin: 0 0 0 1.5em; +} + +/* unordered lists */ +ul { + line-height: 1.5em; + list-style-type: square; + margin: 0 0 1em 3.5em; + padding: 0; +} + +/* ordered lists */ +ol { + line-height: 1.5em; + margin: 0 0 1em 3.5em; + padding: 0; + font-weight: normal; +} + +div.dokuwiki li ul { + margin-bottom: 0; +} +div.dokuwiki li ol { + margin-bottom: 0; +} + +div.dokuwiki ol {list-style-type: decimal} +div.dokuwiki ol ol {list-style-type: upper-roman} +div.dokuwiki ol ol ol {list-style-type: lower-alpha} +div.dokuwiki ol ol ol ol {list-style-type: lower-greek} + +/* the list items overriding the ol definition */ +span.li { + font-weight: normal; +} + +/* code blocks by indention */ +pre.pre { + font-size: 8pt; + padding: 0.5em; + border: 1px dashed #000000; + color: Black; + overflow: visible; +} + +/* code blocks by code tag */ +pre.code { + font-size: 8pt; + padding: 0.5em; + border: 1px dashed #000000; + color: Black; + overflow: visible; +} + +/* inline code words */ +code { + font-size: 120%; +} + +/* code blocks by file tag */ +pre.file { + font-size: 8pt; + padding: 0.5em; + border: 1px dotted #000000; + color: Black; + overflow: visible; +} + +/* footnotes */ +div.footnotes{ + clear:both; + border-top: 1px solid #000000; + padding-left: 1em; + margin-top: 1em; +} + +div.fn{ + font-size:90%; +} + +a.fn_top{ + vertical-align:super; + font-size:80%; +} + +a.fn_bot{ + vertical-align:super; + font-size:80%; + font-weight:bold; +} + +acronym{ + border: 0; +} + +/* ---------- inline tables ------------------- */ + +table.inline { + font-size: 80%; + background-color: #ffffff; + border-spacing: 0px; + border-collapse: collapse; +} + +table.inline th { + padding: 3px; + border: 1px solid #000000; + border-bottom: 2px solid #000000; +} + +table.inline td { + padding: 3px; + border: 1px solid #000000; +} + +.leftalign{ + text-align: left; +} + +.centeralign{ + text-align: center; +} + +.rightalign{ + text-align: right; +} + +.toc, .footerinc, .header, .bar, .user {display:none} + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/rtl.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/rtl.css Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,119 @@ +/** + * Layout and dedsign corrections for right-to-left languages + * + * @author Andreas Gohr + * @author Dotan Kamber + */ + +.bar-left { + float: right; + text-align: right; +} + +.bar-right { + float: left; + text-align: left; +} + +.pagename { + float: right; + text-align: right; +} + +.logo { + float: left; + text-align: left; +} + +label { + text-align: left; +} + +label.simple { + text-align: right; +} + +div.meta div.user { + float: right +} + +div.meta div.doc { + text-align: left; +} + +/* ------------------ Design corrections --------------------------------- */ + +div.dokuwiki ul, +div.dokuwiki ol { + margin: 0.5em 1.5em 0.5em 0; +} + +div.dokuwiki a.urlextern, +div.dokuwiki a.interwiki, +div.dokuwiki a.windows, +div.dokuwiki a.mail, +div.dokuwiki a.mail.JSnocheck { + /* should work but doesn't - so we just disable icons here*/ + /* + background-position: right 1px; + padding-right: 16px; + */ + background-image: none !important; + padding: 0px 0px 0px 0px; +} + +div.dokuwiki div.secedit input.button { + float: left; +} + +/* headlines */ +div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 { + clear: right; +} + +/* special headlines */ +div.dokuwiki h1 {margin-left: 0px; margin-right: 0px;} +div.dokuwiki h2 {margin-left: 0px; margin-right: 20px;} +div.dokuwiki h3 {margin-left: 0px; margin-right: 40px;} +div.dokuwiki h4 {margin-left: 0px; margin-right: 60px;} +div.dokuwiki h5 {margin-left: 0px; margin-right: 80px;} + +/* indent different sections */ +div.dokuwiki div.level1 {margin-left: 0px; margin-right: 3px;} +div.dokuwiki div.level2 {margin-left: 0px; margin-right: 23px;} +div.dokuwiki div.level3 {margin-left: 0px; margin-right: 43px;} +div.dokuwiki div.level4 {margin-left: 0px; margin-right: 63px;} +div.dokuwiki div.level5 {margin-left: 0px; margin-right: 83px;} + +/* TOC control */ +div.dokuwiki div.toc { + float: left; +} + +div.dokuwiki div.tocheader { + text-align: right; +} + +div.dokuwiki #toc__inside { + text-align: right; +} + +div.dokuwiki ul.toc { + padding: 0; + padding-right: 1em; +} + +div.dokuwiki ul.toc li { + background-position: right 0.6em; + padding-right:0.4em; + direction: rtl; +} + +div.dokuwiki ul.toc li.clear { + padding-right:0.4em; +} + +div.dokuwiki pre { + text-align: left; +} + diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/style.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/style.ini Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,65 @@ +; Please see http://www.php.net/manual/en/function.parse-ini-file.php +; for limitations of the ini format used here + +; Define the stylesheets your template uses here. The second value +; defines for which output media the style should be loaded. Currently +; print, screen and rtl are supported. rtl styles are loaded additionally +; to screen styles if a right-to-left language is selected (eg. hebrew) +[stylesheets] +layout.css = screen +design.css = screen +style.css = screen + +media.css = screen + +rtl.css = rtl +print.css = print + +; This section is used to configure some placeholder values used in +; the stylesheets. Changing this file is the simplest method to +; give your wiki a new look. +[replacements] + +;-------------------------------------------------------------------------- +;------ guaranteed dokuwiki color placeholders that every plugin can use +; main text and background colors +__text__ = "#000" +__background__ = "#fff" +; alternative text and background colors +__text_alt__ = "#444" +__background_alt__ = "#efcab0" +; neutral text and background colors +__text_neu__ = "#666" +__background_neu__ = "#f5f5f5" +; border color +__border__ = "#ef6a35" +;-------------------------------------------------------------------------- + +; other text and background colors +__text_other__ = "#ccc" +__background_other__ = "#f7f9fa" + +; these are used for links +__extern__ = "#ef6a35" +__existing__ = "#ef6a35" +__missing__ = "#f30" + +; highlighting search snippets +__highlight__ = "#ff9" + + +;-------------------------------------------------------------------------- +;------ for keeping old templates and plugins compatible to the old pattern +; (to be deleted at the next or after next release) +__white__ = "#fff" +__lightgray__ = "#f5f5f5" +__mediumgray__ = "#ccc" +__darkgray__ = "#666" +__black__ = "#000" + +; these are the shades of orange +__lighter__ = "#efcab0" +__light__ = "#efbfad" +__medium__ = "#ef8961" +__dark__ = "#ef6a35" +__darker__ = "#ef5011" diff -r bbcf0a2e0369 -r 4b4db9230e94 wiki/lib/tpl/default/style.ini.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wiki/lib/tpl/default/style.ini.orig Wed Sep 23 15:09:53 2009 +0000 @@ -0,0 +1,65 @@ +; Please see http://www.php.net/manual/en/function.parse-ini-file.php +; for limitations of the ini format used here + +; Define the stylesheets your template uses here. The second value +; defines for which output media the style should be loaded. Currently +; print, screen and rtl are supported. rtl styles are loaded additionally +; to screen styles if a right-to-left language is selected (eg. hebrew) +[stylesheets] +layout.css = screen +design.css = screen +style.css = screen + +media.css = screen + +rtl.css = rtl +print.css = print + +; This section is used to configure some placeholder values used in +; the stylesheets. Changing this file is the simplest method to +; give your wiki a new look. +[replacements] + +;-------------------------------------------------------------------------- +;------ guaranteed dokuwiki color placeholders that every plugin can use +; main text and background colors +__text__ = "#000" +__background__ = "#fff" +; alternative text and background colors +__text_alt__ = "#638c9c" +__background_alt__ = "#dee7ec" +; neutral text and background colors +__text_neu__ = "#666" +__background_neu__ = "#f5f5f5" +; border color +__border__ = "#8cacbb" +;-------------------------------------------------------------------------- + +; other text and background colors +__text_other__ = "#ccc" +__background_other__ = "#f7f9fa" + +; these are used for links +__extern__ = "#436976" +__existing__ = "#090" +__missing__ = "#f30" + +; highlighting search snippets +__highlight__ = "#ff9" + + +;-------------------------------------------------------------------------- +;------ for keeping old templates and plugins compatible to the old pattern +; (to be deleted at the next or after next release) +__white__ = "#fff" +__lightgray__ = "#f5f5f5" +__mediumgray__ = "#ccc" +__darkgray__ = "#666" +__black__ = "#000" + +; these are the shades of blue +__lighter__ = "#f7f9fa" +__light__ = "#eef3f8" +__medium__ = "#dee7ec" +__dark__ = "#8cacbb" +__darker__ = "#638c9c"