diff --git a/CHANGELOG b/CHANGELOG index 682f5fc..5239fda 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,17 @@ Mumble-Django changelog ======================= +Version 0.7, 27 May 2009: +------------------------------ +* Added copyright information about the Icons in the channel viewer to + COPYRIGHT. +* Fixed bug that prevented various settings from being applied to Murmur. +* Fixed Python 2.4 incompatibility. +* Various minor bug fixes. +* Added setting users' textures. +* Added Mumble icon as favicon. +* Replaced YAML by a self-written template due to license problems. + Version 0.6, 02. May 2009: ------------------------------ * Re-Licensed the complete project under the GPL v2+, added License tags @@ -43,7 +54,6 @@ Version 0.3, 25 March 2009: Version 0.2, 24 March 2009: ------------------------------ - * Reorganized settings.py, so only one single line needs to be edited in order to configure everything. * Added a syncdb hook that looks for already configured Murmur instances @@ -53,7 +63,6 @@ Version 0.2, 24 March 2009: Version 0.1, 21 February 2009: ------------------------------ - * Set up a Django project that uses the Mumble application to make use easier for Django inexperienced users * First official Release diff --git a/COPYRIGHT b/COPYRIGHT index f5cd5ea..bb0d706 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -23,7 +23,6 @@ License: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - =============================================================================== @@ -77,25 +76,42 @@ General Public License for more details. =============================================================================== -The directory "htdocs/yaml" provides the base files needed for YAML, yet -another multicolumn layout, on which the layout of Mumble-Django is based. -It was downloaded from: - http://www.yaml.de +The images in the directory "htdocs/mumble" are displayed in the Channel +viewer. They were included in Mumble's source package, which can be obtained +from http://mumble.sf.net. Upstream Author: - Dirk Jesse + Martin Skilnand Copyright: - + + All rights reserved. License: - YAML has been licensed under a Creative Commons Attribution 2.0 License - (CC-A 2.0) since version 2.2. - The YAML framework is published under the Creative Commons Attribution - 2.0 License, which permits both private and commercial use. - - Condition: For the free use of the YAML framework, a backlink to the YAML - homepage (http://www.yaml.de) in a suitable place (e.g.: footer of the - website or in the imprint) is required. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + - Neither the name of the Mumble Developers nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + `AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/htdocs/css/my_layout.css b/htdocs/css/my_layout.css deleted file mode 100644 index 6ed84e0..0000000 --- a/htdocs/css/my_layout.css +++ /dev/null @@ -1,22 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS framework - * (en) central stylesheet - * (de) zentrales Stylesheet - * - * @creator YAML Builder V1.2b (http://builder.yaml.de) - * @file my_layout.css - * @-yaml-minver 3.1 - * - */ - -/* import core styles | Basis-Stylesheets einbinden */ -@import url(../yaml/core/base.css); - -/* import screen layout | Screen-Layout einbinden */ -@import url(../yaml/navigation/nav_shinybuttons.css); -@import url(screen/basemod.css); -@import url(screen/content.css); - -/* import print layout | Druck-Layout einbinden */ -@import url(../yaml/print/print_draft.css); diff --git a/htdocs/css/patches/patch_my_layout.css b/htdocs/css/patches/patch_my_layout.css deleted file mode 100644 index b99f062..0000000 --- a/htdocs/css/patches/patch_my_layout.css +++ /dev/null @@ -1,47 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS framework - * (en) IE patch stylesheet - * (de) IE-Anpassungs-Stylesheet - * - * @creator YAML Builder V1.2b (http://builder.yaml.de) - * @file patch_my_layout.css - * @-yaml-minver 3.1 - */ - -/* Layout independent adjustments | Layout-unabhängige Anpassungen */ -@import url(../../yaml/core/iehacks.css); - -/* Layout-dependent adjustments | Layout-abhängige Anpassungen */ -@media screen, projection -{ - /** - * Bugfix for IE 3-Pixel-Jog Bug - * - * @bugfix - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - - * html #col3 {height: 1%} - * html #col1 {margin-right: -3px} - * html #col3 {margin-left: 24%} - - /** - * min-width/max-width workaround for IE - * - * @workaround - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid no - */ - - * html .page_margins { - /* Fallback if JavaScript is disabled */ - width: auto; - - /* JS-Expression for min-/max-width simulation */ - width: expression((document.documentElement && document.documentElement.clientHeight) ? ((document.documentElement.clientWidth < 740) ? "740px" : ((document.documentElement.clientWidth > (90 * 16 * (parseInt(this.parentNode.currentStyle.fontSize) / 100))) ? "90em" : "auto" )) : ((document.body.clientWidth < 740) ? "740px" : ((document.body.clientWidth > (90 * 16 * (parseInt(this.parentNode.currentStyle.fontSize) / 100))) ? "90em" : "auto" ))); - } -} diff --git a/htdocs/css/screen/basemod.css b/htdocs/css/screen/basemod.css deleted file mode 100644 index 4fd166a..0000000 --- a/htdocs/css/screen/basemod.css +++ /dev/null @@ -1,127 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS framework - * (en) stylesheet for screen layout - * (de) Stylesheet für das Bildschirm-Layout - * - * @creator YAML Builder V1.2b (http://builder.yaml.de) - * @file basemod.css - * @-yaml-minver 3.1 - */ - -@media screen, projection -{ - /*-------------------------------------------------------------------------*/ - - /* (en) Marginal areas & page background */ - /* (de) Randbereiche & Seitenhintergrund */ - body { background: #3b69ad none; padding: 10px 0; } - - /* Layout Alignment | Layout-Ausrichtung */ - .page_margins { margin: 0 auto; } - - /* Layout Properties | Layout-Eigenschaften */ - .page_margins { width: auto; min-width: 740px; max-width: 90em; background: #fff; } - .page { padding: 10px 15px 10px 10px; } - #header { padding: 45px 2em 1em 20px; color: #000; background: #fff; } - #topnav { color: #aaa; background: transparent; } - #nav { overflow:hidden; } - div.hlist { } - #main { margin: 10px 0; background: #fff; } - #footer { padding: 10px 20px; color:#666; background: #f9f9f9; border-top: 5px #efefef solid; } - - /* (en) navigation: horizontal adjustment | (de) horizontale Ausrichtung */ - #nav ul { margin-left: 20px; } - - /*-------------------------------------------------------------------------*/ - - /** - * (en) Formatting content container - * (de) Formatierung der Inhalts-Container - * - */ - - #col1 { float: left; width: 40%} - #col1 { float: left } - #col2 { display:none} - #col3 { width: auto; margin: 0 0 0 40%; border-left: 1px #ddd dotted } - #col1_content { padding: 0 10px 0 20px } - #col3_content { padding: 0 20px 0 10px } - - /*-------------------------------------------------------------------------*/ - - .page_margins { - border: 0 none; - background-image: url(../../images/gfxborder/border_left.gif); - background-repeat:repeat-y; - background-position:left; - } - - .page { - border: 0 none; - margin: 0 0 0 5px; padding: 10px 15px 10px 10px; - background-image: url(../../images/gfxborder/border_right.gif); - background-repeat:repeat-y; - background-position:right; - } - - - #border-top { - overflow:hidden; - width: auto; - height: 20px; - font-size:0; - margin-bottom: -15px; - background-image: url(../../images/gfxborder/border_top.gif); - background-repeat:repeat-x; - background-position:top left; - } - - #border-bottom { - overflow:hidden; - width: auto; - height: 20px; - margin-top: -15px; - font-size:0; - background-image: url(../../images/gfxborder/border_bottom.gif); - background-repeat:repeat-x; - background-position:bottom left; - } - - #edge-tl { - float:left; - width: 20px; - height: 20px; - font-size:0; - background-image: url(../../images/gfxborder/corner_tl.gif); - background-position: top left; - } - - #edge-tr { - position:relative; /* IE Fix | z-index */ - float:right; - width: 20px; - height: 20px; - font-size:0; - background-image: url(../../images/gfxborder/corner_tr.gif); - background-position: top right; - } - - #edge-bl { - float:left; - width: 20px; - height: 20px; - background-image: url(../../images/gfxborder/corner_bl.gif); - background-position: bottom left; - } - - #edge-br { - position:relative; /* IE Fix | z-index */ - float:right; - width: 20px; - height: 20px; - background-image: url(../../images/gfxborder/corner_br.gif); - background-position: bottom right; - } - -} diff --git a/htdocs/css/screen/content.css b/htdocs/css/screen/content.css deleted file mode 100644 index 97bef3e..0000000 --- a/htdocs/css/screen/content.css +++ /dev/null @@ -1,225 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Uniform design of standard content elements - * (de) Einheitliche Standardformatierungen für die wichtigten Inhalts-Elemente - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - * @appdef yaml - */ - -@media all -{ - /** - * Fonts - * - * (en) global settings of font-families and font-sizes - * (de) Globale Einstellungen für Zeichensatz und Schriftgrößen - * - * @section content-global-settings - */ - - /* (en) reset font size for all elements to standard (16 Pixel) */ - /* (de) Alle Schriftgrößen auf Standardgröße (16 Pixel) zurücksetzen */ - html * { font-size: 100.01%; } - - /** - * (en) reset monospaced elements to font size 16px in all browsers - * (de) Schriftgröße von monospaced Elemente in allen Browsern auf 16 Pixel setzen - * - * @see: http://webkit.org/blog/67/strange-medium/ - */ - - textarea, pre, code, kbd, samp, var, tt { - font-family: Consolas, "Lucida Console", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier; - } - - /* (en) base layout gets standard font size 12px */ - /* (de) Basis-Layout erhält Standardschriftgröße von 12 Pixeln */ - body { - font-family: Arial, Helvetica, sans-serif; - font-size: 75.00%; - color: #444; - } - - /*--- Headings | Überschriften ------------------------------------------------------------------------*/ - - h1,h2,h3,h4,h5,h6 { - font-family: "Times New Roman", Times, serif; - font-weight:normal; - color:#222; - margin: 0 0 0.25em 0; - } - - h1 { font-size: 250%; } /* 30px */ - h2 { font-size: 200%; } /* 24px */ - h3 { font-size: 150%; } /* 18px */ - h4 { font-size: 133.33%; } /* 16px */ - h5 { font-size: 116.67%; } /* 14px */ - h6 { font-size: 116.67%; } /* 14px */ - - /* --- Lists | Listen -------------------------------------------------------------------------------- */ - - ul, ol, dl { line-height: 1.5em; margin: 0 0 1em 1em; } - ul li { list-style-type: disc; } - ul ul li { list-style-type: circle; } - - ol li { list-style-type: decimal; } - ol ol li { list-style-type: lower-latin; } - - li { margin-left: 0.8em; line-height: 1.5em; } - - dt { font-weight: bold; } - dd { margin: 0 0 1em 0.8em; } - - /* The above broke ExtJS's Tabs, so fix em */ - .x-tab-strip-wrap li { - list-style-type: none; - } - - /* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */ - - p { line-height: 1.5em; margin: 0 0 1em 0; } - - blockquote, cite,q { - font-family: Georgia, "Times New Roman", Times, serif; - font-style:italic; - } - blockquote { margin: 0 0 1em 1.6em; color: #666; } - - strong,b { font-weight: bold; } - em,i { font-style: italic; } - - pre, code, kbd, tt, samp, var { font-size: 100%; } - pre, code { color: #800; } - pre { line-height: 1.5em; margin: 0 0 1em 0; } - kbd, samp, var { color: #666; } - var { font-style: italic; } - - acronym, abbr { - border-bottom: 1px #aaa dotted; - font-variant: small-caps; - letter-spacing: .07em; - cursor: help; - } - - sub, sup { font-size: 91.6667%; } - - hr { - color: #fff; - background:transparent; - margin: 0 0 0.5em 0; - padding: 0 0 0.5em 0; - border:0; - border-bottom: 1px #eee solid; - } - - /*--- Links ----------------------------------------------------------------------------------------- */ - - a { color: #4D87C7; background:transparent; text-decoration:none; } - a:visited { color: #036; } - - a:focus, - a:hover, - a:active { color:#182E7A; text-decoration:underline; } - - /* --- images (with optional captions) | Bilder (mit optionaler Bildunterschrift) ------------------ */ - - p.icaption_left { float:left; display:inline; margin: 0 1em 0.15em 0; } - p.icaption_right { float:right; display:inline; margin: 0 0 0.15em 1em; } - - p.icaption_left img, - p.icaption_right img { padding:0; border: 1px #888 solid; } - - p.icaption_left strong, - p.icaption_right strong { display:block; overflow:hidden; margin-top: 2px; padding: 0.3em 0.5em; background: #eee; font-weight: normal; font-size: 91.667%; } - - /** - * ------------------------------------------------------------------------------------------------- # - * - * Generic Content Classes - * - * (en) standard classes for positioning and highlighting - * (de) Standardklassen zur Positionierung und Hervorhebung - * - * @section content-generic-classes - */ - - .highlight { color: #f60; } - .dimmed { color: #888; } - - .info { background: #f8f8f8; color: #666; padding: 10px; margin-bottom: 0.5em; font-size: 91.7%; } - - .note { background: #efe; color: #040; border: 2px #484 solid; padding: 10px; margin-bottom: 1em; } - .important { background: #ffe; color: #440; border: 2px #884 solid; padding: 10px; margin-bottom: 1em; } - .warning { background: #fee; color: #400; border: 2px #844 solid; padding: 10px; margin-bottom: 1em; } - - .float_left { float: left; display:inline; margin-right: 1em; margin-bottom: 0.15em; } - .float_right { float: right; display:inline; margin-left: 1em; margin-bottom: 0.15em; } - .center { display:block; text-align:center; margin: 0.5em auto; } - - /** - * ------------------------------------------------------------------------------------------------- # - * - * Tables | Tabellen - * - * (en) Generic classes for table-width and design definition - * (de) Generische Klassen für die Tabellenbreite und Gestaltungsvorschriften für Tabellen - * - * @section content-tables - */ - - table { width: auto; border-collapse:collapse; margin-bottom: 0.5em; border-top: 2px #888 solid; border-bottom: 2px #888 solid; } - table caption { font-variant:small-caps; } - table.full { width: 100%; } - table.fixed { table-layout:fixed; } - - th,td { padding: 0.5em; } - thead th { color: #000; border-bottom: 2px #800 solid; } - tbody th { background: #e0e0e0; color: #333; } - tbody th[scope="row"], tbody th.sub { background: #f0f0f0; } - - tbody th { border-bottom: 1px solid #fff; text-align: left; } - tbody td { border-bottom: 1px solid #eee; } - - tbody tr:hover th[scope="row"], - tbody tr:hover tbody th.sub { background: #f0e8e8; } - tbody tr:hover td { background: #fff8f8; } - - /** - * ------------------------------------------------------------------------------------------------- # - * - * Miscellaneous | Sonstiges - * - * @section content-misc - */ - input, textarea { - border: 1px solid #CCCCCC; - } - /** - * (en) Emphasizing external Hyperlinks via CSS - * (de) Hervorhebung externer Hyperlinks mit CSS - * - * @section content-external-links - * @app-yaml-default disabled - */ - - /* - #main a[href^="http://www.my-domain.com"], - #main a[href^="https://www.my-domain.com"] - { - padding-left: 12px; - background-image: url('your_image.gif'); - background-repeat: no-repeat; - background-position: 0 0.45em; - } - */ -} diff --git a/htdocs/images/bg_blue.png b/htdocs/images/bg_blue.png deleted file mode 100644 index 191735f..0000000 Binary files a/htdocs/images/bg_blue.png and /dev/null differ diff --git a/htdocs/images/bg_col_left.png b/htdocs/images/bg_col_left.png deleted file mode 100644 index 03fbc77..0000000 Binary files a/htdocs/images/bg_col_left.png and /dev/null differ diff --git a/htdocs/images/bg_col_right.png b/htdocs/images/bg_col_right.png deleted file mode 100644 index dca265c..0000000 Binary files a/htdocs/images/bg_col_right.png and /dev/null differ diff --git a/htdocs/images/gfxborder/border_bottom.gif b/htdocs/images/gfxborder/border_bottom.gif deleted file mode 100644 index b8961f8..0000000 Binary files a/htdocs/images/gfxborder/border_bottom.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/border_left.gif b/htdocs/images/gfxborder/border_left.gif deleted file mode 100644 index ebbb3b0..0000000 Binary files a/htdocs/images/gfxborder/border_left.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/border_right.gif b/htdocs/images/gfxborder/border_right.gif deleted file mode 100644 index 6d8259c..0000000 Binary files a/htdocs/images/gfxborder/border_right.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/border_top.gif b/htdocs/images/gfxborder/border_top.gif deleted file mode 100644 index fa99708..0000000 Binary files a/htdocs/images/gfxborder/border_top.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/corner_bl.gif b/htdocs/images/gfxborder/corner_bl.gif deleted file mode 100644 index 4f10b57..0000000 Binary files a/htdocs/images/gfxborder/corner_bl.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/corner_br.gif b/htdocs/images/gfxborder/corner_br.gif deleted file mode 100644 index 526f19f..0000000 Binary files a/htdocs/images/gfxborder/corner_br.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/corner_tl.gif b/htdocs/images/gfxborder/corner_tl.gif deleted file mode 100644 index ec927f5..0000000 Binary files a/htdocs/images/gfxborder/corner_tl.gif and /dev/null differ diff --git a/htdocs/images/gfxborder/corner_tr.gif b/htdocs/images/gfxborder/corner_tr.gif deleted file mode 100644 index 6e35935..0000000 Binary files a/htdocs/images/gfxborder/corner_tr.gif and /dev/null differ diff --git a/htdocs/style.css b/htdocs/style.css new file mode 100644 index 0000000..1d9d1c1 --- /dev/null +++ b/htdocs/style.css @@ -0,0 +1,15 @@ + +form input, form textarea { + background-color: lightgrey; + border: 1px solid darkgrey; + margin: 5px 0; + min-width: 330px; + padding: 2px; + padding-left: 3px; +} + +form input[type=submit] { + margin-left: 30px; + padding: 5px; + min-width: 150px; +} diff --git a/htdocs/templatestyle.css b/htdocs/templatestyle.css new file mode 100644 index 0000000..03069d4 --- /dev/null +++ b/htdocs/templatestyle.css @@ -0,0 +1,103 @@ +#content { + background-color: white; + width: 80%; + margin: 25px auto; + padding: 10px; + border: 2px solid grey; +} + +#headpanel { + position: relative; + padding: 45px 2em 1em 20px; +} + +#headlinks { + position:absolute; + right: 10px; + top: 10px; +} + +#navipanel { + background-color: lightgrey; + border-top: 1px solid black; + border-bottom: 1px solid black; + padding-left: 20px; + height: 25px; +} + +#navilinks { + display: inline; + list-style-type: none; +} + +#navilinks li { + display: inline; + padding: 0; + margin: 0; + float: left; +} + +#navilinks a, #navilinks b { + display: block; + padding: 0 5px; + font-size: 10pt; + font-weight: bold; + line-height: 25px; + width: auto; +} + +#navilinks a { + border-left: 1px solid white; + border-right: 1px solid #eeeeee; + color: black; + text-decoration: none; +} + +#navilinks b { + color: white; + background-color: #272727; +} + +#contentpanel { + padding: 45px 2em 1em 20px; +} + +#contentleft { + float:left; + width:40%; + border-right: 1px dotted grey; + margin-right: 5px; +} + +#contentright { + margin-left:40%; +} + +#footerpanel { + border-top: 5px solid #EFEFEF; + clear:both; + margin-top:10px; + padding-top: 5px; +} + +#headpanel h2 { + font-family: "Times New Roman",Times,serif; + font-weight: normal; + color: #222222; + margin-bottom: 1em; + font-size: 14pt; +} + +a { + text-decoration: none; + color: #4D87C7; +} + +a:visited { + color: #003366; +} + +a:focus, a:hover, a:active { + text-decoration: underline; + color: #182E7A; +} diff --git a/htdocs/yaml/add-ons/microformats/images/external_link.gif b/htdocs/yaml/add-ons/microformats/images/external_link.gif deleted file mode 100644 index 4b101ca..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/external_link.gif and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/hcalendar.png b/htdocs/yaml/add-ons/microformats/images/hcalendar.png deleted file mode 100644 index 5cf931a..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/hcalendar.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/hcard.png b/htdocs/yaml/add-ons/microformats/images/hcard.png deleted file mode 100644 index f102f51..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/hcard.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-geo.png b/htdocs/yaml/add-ons/microformats/images/icon-geo.png deleted file mode 100644 index daf497c..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-geo.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hatom.png b/htdocs/yaml/add-ons/microformats/images/icon-hatom.png deleted file mode 100644 index d7662e7..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hatom.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-haudio.png b/htdocs/yaml/add-ons/microformats/images/icon-haudio.png deleted file mode 100644 index d80b83a..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-haudio.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hcalendar-add.png b/htdocs/yaml/add-ons/microformats/images/icon-hcalendar-add.png deleted file mode 100644 index 8068a86..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hcalendar-add.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hcalendar-download.png b/htdocs/yaml/add-ons/microformats/images/icon-hcalendar-download.png deleted file mode 100644 index b3a6e31..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hcalendar-download.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hcalendar.png b/htdocs/yaml/add-ons/microformats/images/icon-hcalendar.png deleted file mode 100644 index cbbf7ba..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hcalendar.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hcard-add.png b/htdocs/yaml/add-ons/microformats/images/icon-hcard-add.png deleted file mode 100644 index 07d0de7..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hcard-add.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hcard-download.png b/htdocs/yaml/add-ons/microformats/images/icon-hcard-download.png deleted file mode 100644 index 42888ae..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hcard-download.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hcard.png b/htdocs/yaml/add-ons/microformats/images/icon-hcard.png deleted file mode 100644 index 11a186c..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hcard.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-hresume.png b/htdocs/yaml/add-ons/microformats/images/icon-hresume.png deleted file mode 100644 index 78820de..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-hresume.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-rel-tag.png b/htdocs/yaml/add-ons/microformats/images/icon-rel-tag.png deleted file mode 100644 index 3d380d2..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-rel-tag.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/icon-xfn.png b/htdocs/yaml/add-ons/microformats/images/icon-xfn.png deleted file mode 100644 index 8c48029..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/icon-xfn.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-colleague-met.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-colleague-met.png deleted file mode 100644 index c8ffa0f..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-colleague-met.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-colleague.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-colleague.png deleted file mode 100644 index d79e525..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-colleague.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-friend-met.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-friend-met.png deleted file mode 100644 index 477f751..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-friend-met.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-friend.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-friend.png deleted file mode 100644 index 60563f6..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-friend.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-me.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-me.png deleted file mode 100644 index 5073022..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-me.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-sweetheart-met.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-sweetheart-met.png deleted file mode 100644 index 6982fa4..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-sweetheart-met.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-sweetheart.png b/htdocs/yaml/add-ons/microformats/images/xfn/xfn-sweetheart.png deleted file mode 100644 index 04b7ec9..0000000 Binary files a/htdocs/yaml/add-ons/microformats/images/xfn/xfn-sweetheart.png and /dev/null differ diff --git a/htdocs/yaml/add-ons/microformats/microformats.css b/htdocs/yaml/add-ons/microformats/microformats.css deleted file mode 100644 index 05661bf..0000000 --- a/htdocs/yaml/add-ons/microformats/microformats.css +++ /dev/null @@ -1,147 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML-Addon: Microformats Support - * (de) YAML-Addon: Unterstützung für Microformate - * - * @note Many thanks to Michael Jendryschik (http://jendryschik.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* hCards + hCalendars */ - -.vcard, -.vevent { - border: 2px solid #e0e7b8 !important; - padding: 30px 5px 5px 5px !important; - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; - margin: 5px 0 !important; - /* small IE-Fix for background images */ - zoom:1; -} - -span.vcard, -span.vevent { - padding: 2px 1px 2px 70px !important; - margin: 0 2px 0 !important; -} - - -.vcard { background:#f8f8ec url(images/hcard.png) 5px 5px no-repeat !important; } -.vcard a { padding-left: 11px; background:url(images/external_link.gif) top left no-repeat; color: #679A06; } -.vcard .adr { display: block; margin: 0.5em 0; } -.vcard .email { font-family: Consolas, "Lucida Console", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier; } - -.vevent { background:#f8f8ec url(images/hcalendar.png) 5px 5px no-repeat !important; } -.vevent a { padding-left: 11px; background:url(images/external_link.gif) top left no-repeat; color: #679A06; } -.vevent p { margin-bottom:0.5em; } - -.vevent .description { display: block; margin-top: 1em; } -.vevent .location { display: block; color: #679A06; } -.vevent .summary { display: block; color: #679A06; font-weight: bold; } - -/* XFN relationship */ - -a.xfnRelationship { - padding-right: 26px; background: url(images/xfn/xfn-small.png) no-repeat right; -} - -a.xfnRelationship[rel~="colleague"], -a.xfnRelationship[rel~="co-worker"] -{ - padding-right: 21px; - background: url(images/xfn/xfn-colleague.png) no-repeat right; -} - -a.xfnRelationship[rel~="met"] -{ - padding-right: 32px; - background: url(images/icon-xfn.png) no-repeat right; -} - - -a.xfnRelationship[rel~="colleague"][rel~="met"], -a.xfnRelationship[rel~="co-worker"][rel~="met"] -{ - padding-right: 26px; - background: url(images/xfn/xfn-colleague-met.png) no-repeat right; -} - -a.xfnRelationship[rel~="friend"] -{ - padding-right: 21px; - background: url(images/xfn/xfn-friend.png) no-repeat right; -} - -a.xfnRelationship[rel~="friend"][rel~="met"] -{ - padding-right: 26px; - background: url(images/xfn/xfn-friend-met.png) no-repeat right; -} - -a.xfnRelationship[rel~="sweetheart"] -{ - padding-right: 21px; - background: url(images/xfn/xfn-sweetheart.png) no-repeat right; -} - -a.xfnRelationship[rel~="sweetheart"][rel~="met"] -{ - padding-right: 26px; - background: url(images/xfn/xfn-sweetheart-met.png) no-repeat right; -} - -a.xfnRelationship[rel~="child"] -{ - padding-right: 21px; - background: url(images/xfn/xfn-child.png) no-repeat right; -} - -a.xfnRelationship[rel~="parent"] -{ - padding-right: 21px; - background: url(images/xfn/xfn-parent.png) no-repeat right; -} - -a.xfnRelationship[rel~="spouse"] -{ - padding-right: 21px; - background: url(images/xfn//xfn-spouse.png) no-repeat right; -} - -a.xfnRelationship[rel~="me"] -{ - padding-right: 21px; - background: url(images/xfn/xfn-me.png) no-repeat right; -} - - -/* rel-tag */ - -a[rel~="tag"] -{ - padding-right: 32px; - background: url(images/icon-rel-tag.png) no-repeat right; -} - - -/* geo */ - -abbr[class~="geo"] -{ - padding-right: 32px; - background: url(images/icon-geo.png) no-repeat right; - border: none; - cursor: default; -} diff --git a/htdocs/yaml/add-ons/rtl-support/core/base-rtl.css b/htdocs/yaml/add-ons/rtl-support/core/base-rtl.css deleted file mode 100644 index 2e85ca4..0000000 --- a/htdocs/yaml/add-ons/rtl-support/core/base-rtl.css +++ /dev/null @@ -1,92 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML core RTL stylesheet - * (de) YAML Basis-RTL-Stylesheet - * - * Don't make any changes in this file! - * Your changes should be placed in any css-file in your own stylesheet folder. - * - * @note: Many thanks to Alexander Hass (http://www.yaml-fuer-drupal.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /** - * @section browser reset - * @see http://www.yaml.de/en/documentation/css-components/base-stylesheet.html - * - * Changing direction of text flow, paddings & margins ... - */ - - option { padding: 0 0.4em 0 0; } - - body { - text-align: right; - direction: rtl; - } - - ul, ol, dl { margin: 0 1em 1em 0; } - li { - margin-left: 0; - margin-right: 0.8em; - } - - dd { margin: 0 0.8em 1em 0; } - blockquote, cite { margin: 0 0.8em 1em 0; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section base layout | Basis Layout - * @see http://www.yaml.de/en/documentation/css-components/base-stylesheet.html - * - * Changing positions of #topnav container when paced within #header - */ - - #header #topnav { - left: 10px; - right: 0; - text-align: left; - } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) skip links cause large horizontal scrollbars in RTL mode in several browsers - * (de) skip links erzeugen große horziontale Scrollbalken in verschiedenen Browserin im RTL-Modus - * - * @workaround - * @affected Firefox, Safari, IE 5.x - IE7 - * @css-for all - * @valid yes - */ - - .skip, .hideme, .print, dfn { - left: 0; - } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section miscellaneous - * - * (en) CSS-class for ltr-content (left to right) within a rtl website - * (de) Eine CSS-Klasse für ltr-Inhalte (left to right) innerhalb einer rtl-Seite - */ - - .text-ltr { - direction: ltr; - text-align: left; - } -} diff --git a/htdocs/yaml/add-ons/rtl-support/core/iehacks-rtl.css b/htdocs/yaml/add-ons/rtl-support/core/iehacks-rtl.css deleted file mode 100644 index 3c2bea7..0000000 --- a/htdocs/yaml/add-ons/rtl-support/core/iehacks-rtl.css +++ /dev/null @@ -1,37 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML core RTL stylesheet - structure-independent bugfixes of IE/Win CSS-bugs - * (de) YAML Basis-RTL-Stylesheet - Strukturunabhängige Bugfixes von CSS-Bugs des IE/Win - * - * Don't make any changes in this file! - * Your changes should be added to a separate patch-file. - * - * @note: Many thanks to Alexander Hass (http://www.yaml-fuer-drupal.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /** - * (en) Workaround for misplaced floating navigation lists - * (de) Workaround behebt deplatzierte floatende Navigationselemente - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - #nav { direction:ltr; } - #nav * { direction:rtl; } -} diff --git a/htdocs/yaml/add-ons/rtl-support/core/slim_base-rtl.css b/htdocs/yaml/add-ons/rtl-support/core/slim_base-rtl.css deleted file mode 100644 index e1ba4c3..0000000 --- a/htdocs/yaml/add-ons/rtl-support/core/slim_base-rtl.css +++ /dev/null @@ -1,15 +0,0 @@ -@charset "UTF-8"; -/* "Yet Another Multicolumn Layout" v3.1 (c) by Alexander Hass, Dirk Jesse (http://www.yaml.de) -* $Revision: 343 $ $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ */ -@media all { -option{padding:0 .4em 0 0} -body{text-align:right;direction:rtl} -ul,ol,dl{margin:0 1em 1em 0} -li{margin-left:0;margin-right:.8em} -dd{margin:0 .8em 1em 0} -blockquote,cite{margin:0 .8em 1em 0} -#header #topnav{left:10px;right:auto;text-align:left} -.skip,.hideme,.print,dfn{left:0} -.text-ltr{direction:ltr;text-align:left} -} - diff --git a/htdocs/yaml/add-ons/rtl-support/core/slim_iehacks-rtl.css b/htdocs/yaml/add-ons/rtl-support/core/slim_iehacks-rtl.css deleted file mode 100644 index 771a25c..0000000 --- a/htdocs/yaml/add-ons/rtl-support/core/slim_iehacks-rtl.css +++ /dev/null @@ -1,8 +0,0 @@ -@charset "UTF-8"; -/* "Yet Another Multicolumn Layout" v3.1 (c) by Alexander Hass, Dirk Jesse (http://www.yaml.de) -* $Revision: 343 $ $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ */ -@media all -{ -#nav{direction:ltr} -#nav *{direction:rtl} -} \ No newline at end of file diff --git a/htdocs/yaml/add-ons/rtl-support/navigation/nav_shinybuttons-rtl.css b/htdocs/yaml/add-ons/rtl-support/navigation/nav_shinybuttons-rtl.css deleted file mode 100644 index cb6248e..0000000 --- a/htdocs/yaml/add-ons/rtl-support/navigation/nav_shinybuttons-rtl.css +++ /dev/null @@ -1,49 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) RTL Horizontal list navigation "Shiny Buttons" - * (de) RTL Horizontale Navigationsliste "Shiny Buttons" - * - * @note: Many thanks to Alexander Hass (http://www.yaml-fuer-drupal.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /** - * (en) Workaround disappearing list elements on hover - * (de) Workaround verhindert das Verschwinden der Listenelemente beim Hovern - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - .hlist * { direction:ltr !important; } - .hlist a, .hlist strong { direction:rtl !important; } - - /*------------------------------------------------------------------------------------------------------*/ - - .hlist ul { - position:relative; - float:right; - /* (en) Left margin of the first button */ - /* (de) Abstand des ersten Buttons vom linken Rand */ - margin-left: 0; /* Reset LTR */ - margin-right: 50px; - } - - .hlist ul li { - float: right; - } -} diff --git a/htdocs/yaml/add-ons/rtl-support/navigation/nav_slidingdoor-rtl.css b/htdocs/yaml/add-ons/rtl-support/navigation/nav_slidingdoor-rtl.css deleted file mode 100644 index 96d1423..0000000 --- a/htdocs/yaml/add-ons/rtl-support/navigation/nav_slidingdoor-rtl.css +++ /dev/null @@ -1,44 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) RTL Horizontal list navigation based on "Sliding Door II" from von "A List Apart" - * (de) RTL Horizontale Navigationsliste basierend auf "Sliding Door II" von "A List Apart" - * - * @note: Many thanks to Alexander Hass (http://www.yaml-fuer-drupal.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /** - * (en) Workaround disappearing list elements on hover - * (de) Workaround verhindert das Verschwinden der Listenelemente beim Hovern - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - .hlist * { direction:ltr !important; } - .hlist a, .hlist strong { direction:rtl !important; } - - /*------------------------------------------------------------------------------------------------------*/ - - .hlist ul { - padding: 0 50px 0 0; - } - - .hlist li { - float: right; - } -} diff --git a/htdocs/yaml/add-ons/rtl-support/navigation/nav_vlist-rtl.css b/htdocs/yaml/add-ons/rtl-support/navigation/nav_vlist-rtl.css deleted file mode 100644 index 1197cb2..0000000 --- a/htdocs/yaml/add-ons/rtl-support/navigation/nav_vlist-rtl.css +++ /dev/null @@ -1,62 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Vertical RTL list navigation "vlist" - * (de) Vertikale RTL-Navigationsliste "vlist" - * - * @note: Many thanks to Alexander Hass (http://www.yaml-fuer-drupal.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /* Menu Title */ - h6.vlist { - padding-left: 0px; - padding-right: 10%; - } - - .vlist { text-align: right; } - .vlist li { float:right; } - - /* Level 1 */ - .vlist a, - .vlist strong, - .vlist span { - padding-left: 0px; - padding-right: 10%; - } - - /* Level 2 */ - .vlist li ul li a, - .vlist li ul li strong, - .vlist li ul li span { - padding-left: 0px; - padding-right: 20%; - } - - /* Level 3 */ - .vlist li ul li ul li a, - .vlist li ul li ul li strong, - .vlist li ul li ul li span { - padding-left: 0px; - padding-right: 30%; - } - - /* Level 4 */ - .vlist li ul li ul li ul li a, - .vlist li ul li ul li ul li strong, - .vlist li ul li ul li ul li span { - padding-left: 0px; - padding-right: 40%; - } -} diff --git a/htdocs/yaml/central_draft.css b/htdocs/yaml/central_draft.css deleted file mode 100644 index 6cc2c1b..0000000 --- a/htdocs/yaml/central_draft.css +++ /dev/null @@ -1,27 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) draft for a central stylesheet - * (de) Vorlage für ein zentrales Stylesheets - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import core styles | Basis-Stylesheets einbinden */ -@import url(/yaml/core/base.css); - -/* import screen layout | Screen-Layout einbinden */ -/* @import url(/yaml/navigation/nav_shinybuttons.css); - @import url(/css/screen/basemod.css); - @import url(/css/screen/content.css); */ - -/* import print layout | Druck-Layout einbinden */ -/* @import url(/css/print/print_003.css); */ \ No newline at end of file diff --git a/htdocs/yaml/core/base.css b/htdocs/yaml/core/base.css deleted file mode 100644 index d8c5bbf..0000000 --- a/htdocs/yaml/core/base.css +++ /dev/null @@ -1,223 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML core stylesheet - * (de) YAML Basis-Stylesheet - * - * Don't make any changes in this file! - * Your changes should be placed in any css-file in your own stylesheet folder. - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - - /** - * @section browser reset - * @see http://www.yaml.de/en/documentation/css-components/base-stylesheet.html - */ - - /* (en) Global reset of paddings and margins for all HTML elements */ - /* (de) Globales Zurücksetzen der Innen- und Außenabstände für alle HTML-Elemente */ - * { margin:0; padding: 0; } - - /* (en) Correction: margin/padding reset caused too small select boxes. */ - /* (de) Korrektur: Das Zurücksetzen der Abstände verursacht zu kleine Selectboxen. */ - option { padding-left: 0.4em; } /* LTR */ - select { padding: 1px; } - - /** - * (en) Global fix of the Italics bugs in IE 5.x and IE 6 - * (de) Globale Korrektur des Italics Bugs des IE 5.x und IE 6 - * - * @bugfix - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - * html body * { overflow:visible; } - * html iframe, * html frame { overflow:auto; } - * html frameset { overflow:hidden; } - - /* (en) Forcing vertical scrollbars in Netscape, Firefox and Safari browsers */ - /* (de) Erzwingen vertikaler Scrollbalken in Netscape, Firefox und Safari Browsern */ - html { height: 100%; margin-bottom: 1px; } - body { - /* (en) Fix for rounding errors when scaling font sizes in older versions of Opera browser */ - /* (de) Beseitigung von Rundungsfehler beim Skalieren von Schriftgrößen in älteren Opera Versionen */ - font-size: 100.01%; - - /* (en) Standard values for colors and text alignment */ - /* (de) Vorgabe der Standardfarben und Textausrichtung */ - color: #000; - background: #fff; - text-align: left; /* LTR */ - } - - /* (en) Clear borders for
and elements */ - /* (de) Rahmen für
und Elemente löschen */ - fieldset, img { border: 0 solid; } - - /* (en) new standard values for lists, blockquote and cite */ - /* (de) Neue Standardwerte für Listen & Zitate */ - ul, ol, dl { margin: 0 0 1em 1em } /* LTR */ - li { - margin-left: 0.8em; /* LTR */ - line-height: 1.5em; - } - - dt { font-weight: bold; } - dd { margin: 0 0 1em 0.8em; } /* LTR */ - - blockquote { margin: 0 0 1em 0.8em; } /* LTR */ - - blockquote:before, blockquote:after, - q:before, q:after { content: ""; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section base layout | Basis Layout - * @see http://www.yaml.de/en/documentation/css-components/base-stylesheet.html - * - * |-------------------------------| - * | #header | - * |-------------------------------| - * | #col1 | #col3 | #col2 | - * | 200 px | flexible | 200px | - * |-------------------------------| - * | #footer | - * |-------------------------------| - */ - - #header { position:relative; } - - /* (en) Text Alignment for #topnav content */ - /* (de) Textausrichtung für #topnav Inhalte */ - #topnav { text-align: right; } /* LTR */ - - /* (en) Absolute positioning only within #header */ - /* (de) Absolute Positionierung erfolgt nur innerhalb von #header */ - #header #topnav { - position:absolute; - top: 10px; - right: 10px; /* LTR */ - } - - /* (en) Backup for correct positioning */ - /* (de) Absicherung korrekte Positionierung */ - #header, #nav, #main, #footer { clear:both; } - - /* (en/de) Standard: 200 Pixel */ - #col1 { float: left; width: 200px } - /* (en/de) Standard: 200 Pixel */ - #col2 { float:right; width: 200px } - /* (en) Standard: center column with flexible width */ - /* (de) Standard: Flexible mittlere Spalte */ - #col3 { width:auto; margin: 0 200px } - - /* (en) Preparation for absolute positioning within content columns */ - /* (de) Vorbereitung für absolute Positionierungen innerhalb der Inhaltsspalten */ - #col1_content, #col2_content, #col3_content { position:relative; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section clearing methods - * @see http://yaml.de/en/documentation/basics/general.html - */ - - /* (en) clearfix method for clearing floats */ - /* (de) Clearfix-Methode zum Clearen der Float-Umgebungen */ - .clearfix:after { - content: "."; - display: block; - font-size:0; - height: 0; - clear: both; - visibility: hidden; - } - - /* (en) essential for Safari browser !! */ - /* (de) Diese Angabe benötigt der Safari-Browser zwingend !! */ - .clearfix { display: block; } - - /* (en) overflow method for clearing floats */ - /* (de) Overflow-Methode zum Clearen der Float-Umgebungen */ - .floatbox { overflow:hidden; } - - /* (en) IE-Clearing: Only used in Internet Explorer, switched on in iehacks.css */ - /* (de) IE-Clearing: Benötigt nur der Internet Explorer und über iehacks.css zugeschaltet */ - #ie_clearing { display: none; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section subtemplates - * @see http://www.yaml.de/en/documentation/practice/subtemplates.html - */ - - .subcolumns { width: 100%; overflow:hidden; } - - /* (en) alternative class for optional support of old Mozilla/Netscape browers */ - /* (de) Alternative Klasse zur optionalen Unterstützung alter Mozilla/Netscape-Brower */ - .subcolumns_oldgecko { width: 100%; float:left; } - - .c50l, .c25l, .c33l, .c38l, .c66l, .c75l, .c62l {float: left; } - .c50r, .c25r, .c33r, .c38r, .c66r, .c75r, .c62r {float: right; margin-left: -5px; } - - .c25l, .c25r { width: 25%; } - .c33l, .c33r { width: 33.333%; } - .c50l, .c50r { width: 50%; } - .c66l, .c66r { width: 66.666%; } - .c75l, .c75r { width: 75%; } - .c38l, .c38r { width: 38.2%; } - .c62l, .c62r { width: 61.8%; } - - .subc { padding: 0 0.5em; } - .subcl { padding: 0 1em 0 0; } - .subcr { padding: 0 0 0 1em; } - - .equalize, .equalize .subcolumns { overflow:visible; display:table; table-layout:fixed; } - .equalize .c50l,.equalize .c25l,.equalize .c33l,.equalize .c38l,.equalize .c66l, - .equalize .c75l,.equalize .c62l,.equalize .c50r,.equalize .c25r,.equalize .c33r, - .equalize .c38r,.equalize .c66r,.equalize .c75r,.equalize .c62r { - display:table-cell; vertical-align:top; - float:none; margin:0; overflow:hidden; - } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section hidden elements | Versteckte Elemente - * @see http://www.yaml.de/en/documentation/basics/skip-links.html - * - * (en) skip links and hidden content - * (de) Skip-Links und versteckte Inhalte - */ - - /* (en) classes for invisible elements in the base layout */ - /* (de) Klassen für unsichtbare Elemente im Basislayout */ - .skip, .hideme, .print, dfn { - position: absolute; - left: -1000em; /* LTR */ - top: -1000em; - } - - /* (en) make skip links visible when using tab navigation */ - /* (de) Skip-Links für Tab-Navigation sichtbar schalten */ - .skip:focus, .skip:active { - position: static; - left: 0; - top:0; - } -} diff --git a/htdocs/yaml/core/iehacks.css b/htdocs/yaml/core/iehacks.css deleted file mode 100644 index 676bf7d..0000000 --- a/htdocs/yaml/core/iehacks.css +++ /dev/null @@ -1,365 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML core stylesheet - structure-independent bugfixes of IE/Win CSS-bugs - * (de) YAML Basis-Stylesheet - Strukturunabhängige Bugfixes von CSS-Bugs des IE/Win - * - * Don't make any changes in this file! - * Your changes should be added to a separate patch-file. - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - * @appdef yaml - */ - -@media all -{ - /** - * (en) Debugging: When you see a green background, IE is getting this stylesheet - * (de) Fehlersuche: Hintergrund leuchtet grün, wenn das Stylesheet korrekt geladen wurde - * - * @debug - * @app-yaml-default disabled - */ - - /* body { background: #0f0; background-image: none; } */ - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Forcing vertical scrollbars is not needed in IE (only for Firefox/Netscape/Safari) - * (de) Erzwingen vertikaler Scrollbalken im IE nicht benötigt (nur im Firefox/Netscape/Safari) - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - html { height: auto; margin-bottom:0; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Fixes IE5.x and IE6 overflow behavior of textarea and input elements elements - * (de) Korrigiert das fehlerhafte overflow-Verhalten von textarea und input-Elementen - * - * @workaround - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid no - */ - - * html textarea { overflow:scroll; overflow-x: hidden; } - * html input { overflow: hidden; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Stability fixes with 'position:relative' - * (de) Stabilitätsverbesserungen durch 'position:relative' - * - * @bugfix - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - body { position:relative; } /* Essential in IE7 for correct layout scaling ... */ - * html body { position:static; } /* ... but not for IE5.x and IE6 */ - #main { position: relative; } /* helpful for several problems in older IE versions*/ - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Clearfix Method for containing floats in IE - * (de) Clearfix-Anpassung für diverse IE-Versionen - * - * @workaround - * @see http://www.456bereastreet.com/archive/200603/new_clearing_method_needed_for_ie7/#comment28 - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - .clearfix { display: inline-block; } /* ... especial for IE7 */ - .clearfix { display: block; } /* ... für IE5,IE6,IE7 */ - * html .clearfix { height: 1%; } /* ... für IE5 + IE6/Win | hasLayout aktivieren */ - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Adjustment of .floatbox class for IE - * (de) Anpassung der .floatbox-Klasse für IE - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - .floatbox { width:100%; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Special class for oversized content element - * (de) Spezielle Klasse für übergroße Inhaltselemente - * - * @workaround - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - - .slidebox { - position:relative; - margin-right: -1000px; - height: 1%; - } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en): Bugfix for partially displayed column separators - * (de): Bugfix für unvollständige Darstellung der Spalteninhalte / Spaltentrenner - * - * @bugfix - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - - * html #col1, - * html #col2, - * html #col3 { position:relative; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Preventing several css bugs by forcing "hasLayout" - * (de) Vermeidung verschiedenster Bugs durch Erzwingen von "hasLayout" - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid no - */ - - body { height: 1%; } - #page_margins, #page, .page_margins, .page, #header, #nav, #main, #footer { zoom:1; } /* IE6 & IE7 */ - #page_margins, #page, .page_margins, .page { height: 1%; } /* IE 5.x */ - * html #header, * html #nav, * html #main, * html #footer { width: 100%; } /* IE 5.x & IE6 */ - * html #header, * html #nav, * html #main, * html #footer { wid\th: auto; } /* IE 6 */ - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Disappearing List-Background Bug - * @see http://www.positioniseverything.net/explorer/ie-listbug.html - * - * @bugfix - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - - * html ul, * html ol, * html dl { position: relative; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * List-Numbering Bug - * - * @bugfix - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - body ol li { display:list-item; } - - /** - * Form related bugfixes - * - * @bugfix - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid no - */ - fieldset, legend { position:relative; } - /* global fixes for YAML's form construction set */ - form.yform, - form.yform div, - form.yform div * { zoom:1; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * (en) Workaround for 'collapsing margin at #col3' when using CSS-property clear - * Left margin of #col3 collapses when using clear:both in 1-3-2 (or 2-3-1) layout and right column is the - * longest and left column is the shortest one. For IE6 and IE7 a special workaround was developed - * in YAML. - * - * (de) Workaround für 'kollabierenden Margin an #col3' bei Verwendung der CSS-Eigenschaft clear - * Der linke Margin von #col3 kollabiert bei der Verwendung von clear:both im 1-3-2 (oder 2-3-1) Layout - * wenn gleichzeitig die rechte Spalte die kürzeste und die rechte die Längste ist. Im IE6 und IE7 lässt - * sich der Bug durch eine speziell für YAML entwickelten Workaround umgehen. - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid no - */ - - html #ie_clearing { - /* (en) Only a small help for debugging */ - /* (de) Nur eine kleine Hilfe zur Fehlersuche */ - position:static; - - /* (en) Make container visible in IE */ - /* (de) Container sichtbar machen im IE */ - display:block; - - /* (en) No fix possible in IE5.x, normal clearing used instead */ - /* (de) Kein Fix im IE5.x möglich, daher normales Clearing */ - \clear:both; - - /* (en) forcing clearing-like behavior with a simple oversized container in IE6 & IE7*/ - /* (de) IE-Clearing mit 100%-DIV für IE6 bzw. übergroßem Container im IE7 */ - width: 100%; - font-size:0px; - margin: -2px 0 -1em 1px; - } - - * html #ie_clearing { margin: -2px 0 -1em 0; } - #col3_content {margin-bottom:-2px; } - - /* (en) avoid horizontal scrollbars in IE7 in borderless layouts because of negative margins */ - /* (de) Vermeidung horizontaler Scrollbalken bei randabfallenden Layouts im IE7 */ - html { margin-right: 1px; } - * html { margin-right: 0 } - - /* (en) Bugfix: Essential for IE7 */ - /* (de) Bugfix: Notwendig im IE7 */ - #col3 { position:relative; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * IE z-index-Fix - * brings #col1 and #col2 in front of #col3 - * - * @workaround - * @affected all IE - * @css-for all IE - * @valid yes - */ - - *+html #col3 { z-index: -1; } - * html #col1, * html #col2 { z-index: 1; } - * html #col3 { z-index:auto; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * IE/Win Guillotine Bug - * @see http://www.positioniseverything.net/explorer/guillotine.html - * - * @workaround - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - - * html body a, * html body a:hover { background-color: transparent; } - -} - -@media screen, projection -{ - /** - * (en) IE-Adjustments for content columns and subtemplates - * (de) IE-Anpassung für Spaltencontainer und Subtemplates - * - * Doubled Float-Margin Bug - * @see http://positioniseverything.net/explorer/doubled-margin.html - * - * @bugfix - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - #col1, #col2 { display:inline; } - - .c50l, .c25l, .c33l, .c38l, .c66l, .c75l, .c62l, - .c50r, .c25r, .c33r, .c38r, .c66r, .c75r, .c62r { display:inline; } - - /* Fix for: "Linking to anchors in elements within the containing block" Problem in IE5.x & IE 6.0 */ - * html .equalize, * html .equalize .subcolumns { overflow:visible; display:block; } - .equalize, .equalize .subcolumns { overflow:hidden; display:block; } - - /* transform CSS tables back into floats */ - .equalize .c25l,.equalize .c33l,.equalize .c38l,.equalize .c50l,.equalize .c66l,.equalize .c75l,.equalize .c62l { - float: left; display:inline; - padding-bottom: 32767px; - margin-bottom: -32767px; - } - .equalize .c25r,.equalize .c33r,.equalize .c38r,.equalize .c50r,.equalize .c66r,.equalize .c75r,.equalize .c62r { - float: right; margin-left: -5px; display:inline; - padding-bottom: 32767px; - margin-bottom: -32767px; - } - - .no-ie-padding .c25l,.no-ie-padding .c33l,.no-ie-padding .c38l,.no-ie-padding .c50l,.no-ie-padding .c66l,.no-ie-padding .c75l,.no-ie-padding .c62l, - .no-ie-padding .c25r,.no-ie-padding .c33r,.no-ie-padding .c38r,.no-ie-padding .c50r,.no-ie-padding .c66r,.no-ie-padding .c75r,.no-ie-padding .c62r { - padding-bottom: 0; - margin-bottom: 0; - } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Internet Explorer and the Expanding Box Problem - * @see http://www.positioniseverything.net/explorer/expandingboxbug.html - * - * @workaround - * @affected IE 5.x/Win, IE6 - * @css-for IE 5.x/Win, IE6 - * @valid yes - */ - - * html #col1_content, - * html #col2_content, - * html #col3_content { word-wrap: break-word; } - - /* trigger hasLayout to force containing content */ - .subc, .subcl, .subcr { height: 1%; } - - /* avoid growing widths */ - * html .subc, - * html .subcl, - * html .subcr { word-wrap: break-word; overflow:hidden; } -} - -@media print -{ - /** - * (en) Avoid unneeded page breaks of #col3 content in print layout. - * (de) Vermeiden von unnötigen Seitenumbrüchen beim Ausdruck der Spalte #col3. - * - * @bugfix - * @affected IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - #col3 { height: 1%; } -} diff --git a/htdocs/yaml/core/print_base.css b/htdocs/yaml/core/print_base.css deleted file mode 100644 index 81f4ab9..0000000 --- a/htdocs/yaml/core/print_base.css +++ /dev/null @@ -1,98 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML core stylesheet - print layout - * (de) YAML Core-Stylesheet - Druck Layout - * - * Don't make any changes in this file! - * Your changes should be added to 'print_xyz_draft.css' drafts from 'yaml/print/' folder. - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media print -{ - /** - * @section basic layout preparation - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - /* (en) change font size unit to [pt] - avoiding problems with [px] unit in Gecko based browsers */ - /* (de) Wechsel der der Schriftgrößen-Maßheinheit zu [pt] - Probleme mit Maßeinheit [px] in Gecko-basierten Browsern vermeiden */ - body { font-size: 10pt; } - - /* (en) Reset Scrollbar-Fix for FF in screenlayout */ - /* (de) Zurücksetzen des Scrollbar-Fix for FF aus dem Screenlayout */ - html { height: auto; margin-bottom: 0; } - - /* (en) Hide unneeded container of the screenlayout in print layout */ - /* (de) Für den Druck nicht benötigte Container des Layouts abschalten */ - #topnav, #nav, #search { display: none; } - - /* (en) Disable background graphics of links */ - /* (de) Abschalten evlt. vorhandener Hintergrundgrafiken zur Linkkennzeichnung */ - body a[href^="http:"], - body a[href^="https:"] { - padding-left: 0; - background-image: none; - } - - /** - * (en) overflow:hidden Bug in print layouts - * (de) overflow:hidden Bug in Drucklayouts - * - * @bugfix - * @since 3.0 - * @affected FF2.0, FF3.0, IE7 - * @css-for all browsers - * @valid yes - */ - - .floatbox, - .subcolumns, - .subcolums_oldgecko { overflow:visible; display: table; } - - /* (en) Linearising subtemplates */ - /* (de) Linearisierung der Subtemplates */ - .c25l, .c33l, .c38l, .c50l, .c62l, .c66l, .c75l, - .c25r, .c33r, .c38r, .c50r, .c62r, .c66r, .c75r { - width: 100%; margin:0; padding: 0; float:none !important; overflow:visible; display:table !important; - } - .subc, .subcl, .subcr { margin: 0; padding: 0; } - - /* (en) make .print class visible */ - /* (de) .print-Klasse sichtbar schalten */ - .print { position: static; left: 0; } - - /* (en) generic class to hide elements for print */ - /* (de) Allgemeine CSS Klasse, um beliebige Elemente in der Druckausgabe auszublenden */ - .noprint { display:none !important; } - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) Avoid page breaks right after headings */ - /* (de) Vermeidung von Seitenumbrüchen direkt nach einer Überschrift */ - h1,h2,h3,h4,h5,h6 { page-break-after:avoid; } - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) Preparation for optional column labels */ - /* (de) optionale Spaltenauszeichnung */ - - #col1_content:before, #col2_content:before, #col3_content:before { - content: ""; - color:#888; - background:inherit; - display:block; - font-weight:bold; - font-size:1.5em; - } -} diff --git a/htdocs/yaml/core/slim_base.css b/htdocs/yaml/core/slim_base.css deleted file mode 100644 index 716fa36..0000000 --- a/htdocs/yaml/core/slim_base.css +++ /dev/null @@ -1,50 +0,0 @@ -@charset "UTF-8"; -/* "Yet Another Multicolumn Layout" v3.1 (c) by Dirk Jesse (http://www.yaml.de) -* $Revision: 343 $ $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ */ -@media all { -*{margin:0;padding:0} -option{padding-left:.4em} -select{padding:1px} -* html body *{overflow:visible} -* html iframe,* html frame{overflow:auto} -* html frameset{overflow:hidden} -html{height:100%;margin-bottom:1px} -body{font-size:100.01%;color:#000;background:#fff;text-align:left} -fieldset,img{border:0 solid} -ul,ol,dl{margin:0 0 1em 1em} -li{margin-left:.8em;line-height:1.5em} -dt{font-weight:700} -dd{margin:0 0 1em .8em} -blockquote{margin:0 0 1em .8em} -blockquote:before,blockquote:after,q:before,q:after{content:""} -#header{position:relative} -#topnav{text-align:right} -#header #topnav{position:absolute;top:10px;right:10px} -#header,#nav,#main,#footer{clear:both} -#col1{float:left;width:200px} -#col2{float:right;width:200px} -#col3{width:auto;margin:0 200px} -#col1_content,#col2_content,#col3_content{position:relative} -.clearfix:after{content:".";display:block;font-size:0;height:0;clear:both;visibility:hidden} -.clearfix{display:block} -.floatbox{overflow:hidden} -#ie_clearing{display:none} -.subcolumns{width:100%;overflow:hidden} -.subcolumns_oldgecko{width:100%;float:left} -.c50l,.c25l,.c33l,.c38l,.c66l,.c75l,.c62l{float:left} -.c50r,.c25r,.c33r,.c38r,.c66r,.c75r,.c62r{float:right;margin-left:-5px} -.c25l,.c25r{width:25%} -.c33l,.c33r{width:33.333%} -.c50l,.c50r{width:50%} -.c66l,.c66r{width:66.666%} -.c75l,.c75r{width:75%} -.c38l,.c38r{width:38.2%} -.c62l,.c62r{width:61.8%} -.subc{padding:0 .5em} -.subcl{padding:0 1em 0 0} -.subcr{padding:0 0 0 1em} -.equalize,.equalize .subcolumns{overflow:visible;display:table;table-layout:fixed} -.equalize .c50l,.equalize .c25l,.equalize .c33l,.equalize .c38l,.equalize .c66l,.equalize .c75l,.equalize .c62l,.equalize .c50r,.equalize .c25r,.equalize .c33r,.equalize .c38r,.equalize .c66r,.equalize .c75r,.equalize .c62r{display:table-cell;vertical-align:top;float:none;margin:0;overflow:hidden} -.skip,.hideme,.print,dfn{position:absolute;left:-1000em;top:-1000em} -.skip:focus,.skip:active{position:static;left:0;top:0} -} diff --git a/htdocs/yaml/core/slim_iehacks.css b/htdocs/yaml/core/slim_iehacks.css deleted file mode 100644 index 86a8366..0000000 --- a/htdocs/yaml/core/slim_iehacks.css +++ /dev/null @@ -1,47 +0,0 @@ -@charset "UTF-8"; -/* "Yet Another Multicolumn Layout" v3.1 (c) by Dirk Jesse (http://www.yaml.de) -* $Revision: 343 $ $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ */ -@media all { -html{height:auto;margin-bottom:0;margin-right:1px} -* html textarea{overflow:scroll;overflow-x:hidden} -* html input{overflow:hidden} -body{position:relative;height:1%} -* html body{position:static} -#main{position:relative} -.clearfix{display:block} -* html .clearfix{height:1%} -.floatbox{width:100%} -.slidebox{position:relative;margin-right:-1000px;height:1%} -* html #col1,* html #col2,* html #col3{position:relative} -#page_margins,#page,.page_margins,.page,#header,#nav,#main,#footer{zoom:1} -#page_margins,#page,.page_margins,.page{height:1%} -* html #header,* html #nav,* html #main,* html #footer{width:100%;wid\th:auto} -* html ul,* html ol,* html dl{position:relative} -body ol li{display:list-item} -fieldset,legend{position:relative} -form.yform,form.yform div,form.yform div *{zoom:1} -html #ie_clearing{position:static;display:block;\clear:both;width:100%;font-size:0;margin:-2px 0 -1em 1px} -* html #ie_clearing{margin:-2px 0 -1em} -#col3_content{margin-bottom:-2px} -* html{margin-right:0} -#col3{position:relative} -*+html #col3 {z-index:-1} -* html #col1,* html #col2 {z-index:1} -* html #col3 {z-index:auto} -* html body a,* html body a:hover{background-color:transparent} -} -@media screen,projection { -#col1,#col2{display:inline} -.c50l,.c25l,.c33l,.c38l,.c66l,.c75l,.c62l,.c50r,.c25r,.c33r,.c38r,.c66r,.c75r,.c62r{display:inline} -* html .equalize,* html .equalize .subcolumns{overflow:visible;display:block} -.equalize,.equalize .subcolumns{overflow:hidden;display:block} -.equalize .c25l,.equalize .c33l,.equalize .c38l,.equalize .c50l,.equalize .c66l,.equalize .c75l,.equalize .c62l{float:left;display:inline;padding-bottom:32767px;margin-bottom:-32767px} -.equalize .c25r,.equalize .c33r,.equalize .c38r,.equalize .c50r,.equalize .c66r,.equalize .c75r,.equalize .c62r{float:right;margin-left:-5px;display:inline;padding-bottom:32767px;margin-bottom:-32767px} -.no-ie-padding .c25l,.no-ie-padding .c33l,.no-ie-padding .c38l,.no-ie-padding .c50l,.no-ie-padding .c66l,.no-ie-padding .c75l,.no-ie-padding .c62l,.no-ie-padding .c25r,.no-ie-padding .c33r,.no-ie-padding .c38r,.no-ie-padding .c50r,.no-ie-padding .c66r,.no-ie-padding .c75r,.no-ie-padding .c62r{padding-bottom:0;margin-bottom:0} -* html #col1_content,* html #col2_content,* html #col3_content{word-wrap:break-word} -.subc,.subcl,.subcr{height:1%} -* html .subc,* html .subcl,* html .subcr{word-wrap:break-word;overflow:hidden} -} -@media print { -#col3{height:1%} -} diff --git a/htdocs/yaml/core/slim_print_base.css b/htdocs/yaml/core/slim_print_base.css deleted file mode 100644 index 3d81691..0000000 --- a/htdocs/yaml/core/slim_print_base.css +++ /dev/null @@ -1,16 +0,0 @@ -@charset "UTF-8"; -/* "Yet Another Multicolumn Layout" v3.1 (c) by Dirk Jesse (http://www.yaml.de) -* $Revision: 343 $ $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ */ -@media print { -body{font-size:10pt} -html{height:auto;margin-bottom:0} -#topnav,#nav,#search{display:none} -body a[href^="http:"],body a[href^="https:"]{padding-left:0;background-image:none} -.floatbox,.subcolumns,.subcolums_oldgecko{overflow:visible;display:table} -.c25l,.c33l,.c38l,.c50l,.c62l,.c66l,.c75l,.c25r,.c33r,.c38r,.c50r,.c62r,.c66r,.c75r{width:100%;margin:0;padding:0;float:none!important;overflow:visible;display:table!important} -.subc,.subcl,.subcr{margin:0;padding:0} -.print{position:static;left:0} -.noprint{display:none!important} -h1,h2,h3,h4,h5,h6{page-break-after:avoid} -#col1_content:before,#col2_content:before,#col3_content:before{content:"";color:#888;background:inherit;display:block;font-weight:700;font-size:1.5em} -} diff --git a/htdocs/yaml/debug/debug.css b/htdocs/yaml/debug/debug.css deleted file mode 100644 index 67fd8aa..0000000 --- a/htdocs/yaml/debug/debug.css +++ /dev/null @@ -1,197 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) YAML debugging stylesheet - * (de) YAML Stylesheet zur Fehlersuche - * - * Don't make any changes in this file! - * Your changes should be placed in any css-file in your own stylesheet folder. - * - * @note: Many thanks to Tomas Caspers (http://www.tomascaspers.de/) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /*------------------------------------------------------------------------------------------------------*/ - - /** - * @section layout preparation for debugging - * @see http://www.yaml.de/en/documentation/practice/drafting-and-debugging.html - */ - - /* Adding debugging background */ - body { padding-top: 10px !important; background: transparent url("images/grid_pattern.png") top left no-repeat fixed !important; } - - /* CSS-Warning, if core stylesheet 'iehacks.css' is missing in the layout */ - *+html #ie_clearing { display:block; } /* IE7 */ - * html #ie_clearing { display:block; } /* IE 5.x & 6 */ - - #ie_clearing { - width: 500px; - font-size: 25px; - position:absolute; - top: -2px; - left:0px; - background: url("images/warning_iehacks.png") top left no-repeat; - } - - /** - * @section pixel grid - */ - - .bg_grid { - background-image:url("images/grid_pattern.png") !important; - background-repeat:no-repeat; - background-position:top left !important; - } - - /** - * @section transparency - */ - - .transOFF { -moz-opacity: 1.0; opacity: 1.0; filter: alpha(Opacity=100);} - .trans50, - .transON { -moz-opacity: 0.5; opacity: 0.5; filter: alpha(Opacity=50);} - .trans25 { -moz-opacity: 0.25; opacity: 0.25; filter: alpha(Opacity=25);} - .trans75 { -moz-opacity: 0.75; opacity: 0.75; filter: alpha(Opacity=75);} - - /** - * @section colors - */ - - .bg_red { background-color: #f00 !important;} - .bg_blue { background-color: #00f !important;} - .bg_green { background-color: #0f0 !important;} - - /** - * @visualize semantic structure - * - */ - - div[id] { padding: 0 !important; margin: 0 -1px; border: 1px #000 solid !important; } - div[class] { padding: 0 !important; margin: 0 -1px; border: 1px #000 solid !important; } - - div[id]:before, - div[class]:before { - display:block; - text-align:left; - color: #fff; - padding: 2px; - font: normal 11px "Lucida console", monospace; - } - - div[id]:before { - background: #800; - content: "[div id='"attr(id)"']"; - } - - div[class]:before { - background: #a44; - content: "[div class='"attr(class)"']"; - } - - div[id][class]:before { - background: #800; - content: "[div id='"attr(id)"' class='"attr(class)"']"; - } - - - div[class="floatbox"] { background: #f4f4f4; } - div[class="floatbox"]:before { - display:block; - color: #fff; - padding: 2px; - font: normal 11px "Lucida console", monospace; - background: #66a; - content: "[div class='"attr(class)"']"; - } - - div[class="subcolumns"] { background: #f8f8f8; color: #000 !important; } - div[class="subcolumns"]:before { - display:block; - color: #fff; - padding: 2px; - font: normal 11px "Lucida console", monospace; - background: #444; - content: "[div ."attr(class)"]"; - } - - div[class="subcolumns"] > div:before { - display:block; - color: #fff; - padding: 2px; - font: normal 11px "Lucida console", monospace; - background: #080; - content: "[div ."attr(class)"]"; - } - - div[class="subc"], div[class="subcl"], div[class="subcr"] { background: #eee; } - div[class="subc"]:before, div[class="subcl"]:before, div[class="subcr"]:before { - display:block; - color: #fff; - padding: 2px; - font: normal 11px "Lucida console", monospace; - background: #6a6; - content: "[div ."attr(class)"]"; - } - - h1:before { content: "[h1] "; } - h2:before { content: "[h2] "; } - h3:before { content: "[h3] "; } - h4:before { content: "[h4] "; } - h5:before { content: "[h5] "; } - h6:before { content: "[h6] "; } - - - /* make link attributes href,title visible on hover ... */ - a:hover { color: #fff !important; background: #337; text-align: left;} - a:hover:after { color: #fff; background: #333; content: " (href='" attr(href) "' title='"attr(title)"')"; text-align: left; } - - a[class="skip"] { } - - a[id="navigation"]:before, - a[id="content"]:before { font: normal 11px "Lucida console", monospace; content: "[skip anchor: "attr(id)"]"; padding: 2px !important; } - - a[id="content"]:hover, - a[id="navigation"]:hover { background: #ff0; color: #000; } - - a[id="content"]:hover:after, - a[id="navigation"]:hover:after { content: ""; background: inherit; color: #000; } - - img:after { font: normal 11px "Lucida console", monospace; content:" ( alt='" attr(alt)"' ) "; } - - address, blockquote, dl, fieldset, form, h1, h2, h3, h4, ol, p, pre, ul { - border: 1px dotted #888; - margin: 2px; - padding: 2px; - display: block; - } - - /* Highlighting empty elements */ - div:empty, span:empty, p:empty, a:empty, td:empty, th:empty, li:empty, - b:empty, i:empty, em:empty {padding: 2px 4px; background: yellow;} - - /* Highlighting inline-Styles */ - *[style] {outline: 3px solid #f0f;} - *[style]:after { font: normal 11px "Lucida console", monospace; background: #f0f; color: #000; height: auto; visibility:visible; content: "Element contains inline styles!" !important; } - - /** - * @visualize inline elements - * - */ - - abbr, acronym { background: #d9eaff; } - q, cite, dfn, kbd { background: #ffe3f6; } - /* :lang(de), :lang(en), :lang(fr), :lang(es) { background: #d9efaa !important; } */ - -} diff --git a/htdocs/yaml/debug/images/grid_pattern.png b/htdocs/yaml/debug/images/grid_pattern.png deleted file mode 100644 index 55e65e4..0000000 Binary files a/htdocs/yaml/debug/images/grid_pattern.png and /dev/null differ diff --git a/htdocs/yaml/debug/images/warning_iehacks.png b/htdocs/yaml/debug/images/warning_iehacks.png deleted file mode 100644 index b65c14b..0000000 Binary files a/htdocs/yaml/debug/images/warning_iehacks.png and /dev/null differ diff --git a/htdocs/yaml/markup_draft.html b/htdocs/yaml/markup_draft.html deleted file mode 100644 index ed3db5d..0000000 --- a/htdocs/yaml/markup_draft.html +++ /dev/null @@ -1,71 +0,0 @@ - - - -Your Page Title - - - - - - - - -
-
- - - - - -
- -
-
-
- - -
-
-
- - -
-
- -
- -
 
-
- -
- - - - -
-
- - diff --git a/htdocs/yaml/navigation/images/shiny_buttons/background.png b/htdocs/yaml/navigation/images/shiny_buttons/background.png deleted file mode 100644 index 2bad3bd..0000000 Binary files a/htdocs/yaml/navigation/images/shiny_buttons/background.png and /dev/null differ diff --git a/htdocs/yaml/navigation/images/shiny_buttons/background_active.png b/htdocs/yaml/navigation/images/shiny_buttons/background_active.png deleted file mode 100644 index 98ace26..0000000 Binary files a/htdocs/yaml/navigation/images/shiny_buttons/background_active.png and /dev/null differ diff --git a/htdocs/yaml/navigation/images/sliding_door/round/bg.gif b/htdocs/yaml/navigation/images/sliding_door/round/bg.gif deleted file mode 100644 index a2a4363..0000000 Binary files a/htdocs/yaml/navigation/images/sliding_door/round/bg.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/images/sliding_door/round/left.png b/htdocs/yaml/navigation/images/sliding_door/round/left.png deleted file mode 100644 index 329e919..0000000 Binary files a/htdocs/yaml/navigation/images/sliding_door/round/left.png and /dev/null differ diff --git a/htdocs/yaml/navigation/images/sliding_door/round/left_on.png b/htdocs/yaml/navigation/images/sliding_door/round/left_on.png deleted file mode 100644 index fed4c39..0000000 Binary files a/htdocs/yaml/navigation/images/sliding_door/round/left_on.png and /dev/null differ diff --git a/htdocs/yaml/navigation/images/sliding_door/round/right.png b/htdocs/yaml/navigation/images/sliding_door/round/right.png deleted file mode 100644 index f8c38de..0000000 Binary files a/htdocs/yaml/navigation/images/sliding_door/round/right.png and /dev/null differ diff --git a/htdocs/yaml/navigation/images/sliding_door/round/right_on.png b/htdocs/yaml/navigation/images/sliding_door/round/right_on.png deleted file mode 100644 index 5f62f76..0000000 Binary files a/htdocs/yaml/navigation/images/sliding_door/round/right_on.png and /dev/null differ diff --git a/htdocs/yaml/navigation/images/vlist/square/node.gif b/htdocs/yaml/navigation/images/vlist/square/node.gif deleted file mode 100644 index f580861..0000000 Binary files a/htdocs/yaml/navigation/images/vlist/square/node.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/images/vlist/square/node_minus.gif b/htdocs/yaml/navigation/images/vlist/square/node_minus.gif deleted file mode 100644 index e17953b..0000000 Binary files a/htdocs/yaml/navigation/images/vlist/square/node_minus.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/images/vlist/square/node_plus.gif b/htdocs/yaml/navigation/images/vlist/square/node_plus.gif deleted file mode 100644 index 7ed5e30..0000000 Binary files a/htdocs/yaml/navigation/images/vlist/square/node_plus.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/images/vlist/square/subnode.gif b/htdocs/yaml/navigation/images/vlist/square/subnode.gif deleted file mode 100644 index bb378f4..0000000 Binary files a/htdocs/yaml/navigation/images/vlist/square/subnode.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/images/vlist/square/subnode_minus.gif b/htdocs/yaml/navigation/images/vlist/square/subnode_minus.gif deleted file mode 100644 index 1f666ce..0000000 Binary files a/htdocs/yaml/navigation/images/vlist/square/subnode_minus.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/images/vlist/square/subnode_plus.gif b/htdocs/yaml/navigation/images/vlist/square/subnode_plus.gif deleted file mode 100644 index 536c0c9..0000000 Binary files a/htdocs/yaml/navigation/images/vlist/square/subnode_plus.gif and /dev/null differ diff --git a/htdocs/yaml/navigation/nav_shinybuttons.css b/htdocs/yaml/navigation/nav_shinybuttons.css deleted file mode 100644 index 85c8ffc..0000000 --- a/htdocs/yaml/navigation/nav_shinybuttons.css +++ /dev/null @@ -1,93 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Horizontal list navigation "Shiny Buttons" - * (de) Horizontale Navigationsliste "Shiny Buttons" - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - .hlist { - /* (en) containing floats in IE */ - /* (de) Einfassen der Floats im IE */ - width: 100%; - overflow: hidden; - /* (en) containing floats in all other browsers */ - /* (de) Einfassen der Floats in allen anderen Browsern */ - float: left; - display: inline; - /* (en|de) Bugfix: IE - collapsing horizontal margins */ - position:relative; - /* (en) Repeat the main color from the image */ - /* (de) Wiederholung der Hauptfarbe aus der Bilddatei */ - background: #c0c0c0 url("images/shiny_buttons/background.png") repeat-x center right; - border-top: 1px #333 solid; - border-bottom: 1px #333 solid; - line-height: 0; - } - - .hlist ul { - /* (en|de) Bugfix: IE - Doubled Float Margin Bug */ - display: inline; - float: left; /* LTR */ - /* (en) Left margin of the first button */ - /* (de) Abstand des ersten Buttons vom linken Rand */ - margin: 0 0 0 50px; /* LTR */ - padding: 0; - border-left: 1px #aaa solid; - border-right: 1px #fff solid; - } - - .hlist ul li { - border-left: 1px #fff solid; - border-right: 1px #aaa solid; - /* (en|de) Bugfix: IE - Doubled Float Margin Bug */ - display: inline; - float: left; /* LTR */ - font-size: 1.0em; - line-height: 1em; - list-style-type: none; - margin: 0; - padding: 0; - } - - .hlist ul li a, - .hlist ul li strong { - background: transparent; - color: #000; - display: block; - font-size: 1em; - font-weight: bold; - margin: 0; - padding: 0.5em 0.8em 0.5em 0.8em; - text-decoration: none; - width: auto; - } - - .hlist ul li a:focus, - .hlist ul li a:hover, - .hlist ul li a:active { background: #eee; color: #333; text-decoration: none; } - - .hlist ul li.active { - /* (en) Repeat the main color from the image */ - /* (de) Wiederholung der Hauptfarbe aus der Bilddatei */ - background: #272727 url("images/shiny_buttons/background_active.png") repeat-x center right; - border-left: 1px #444 solid; - border-right: 1px #888 solid; - } - - .hlist ul li.active strong, - .hlist ul li.active a:focus, - .hlist ul li.active a:hover, - .hlist ul li.active a:active { background: transparent; color: #fff; text-decoration: none; } -} diff --git a/htdocs/yaml/navigation/nav_slidingdoor.css b/htdocs/yaml/navigation/nav_slidingdoor.css deleted file mode 100644 index d31657a..0000000 --- a/htdocs/yaml/navigation/nav_slidingdoor.css +++ /dev/null @@ -1,118 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Horizontal list navigation based on "Sliding Door II" from von "A List Apart" - * (de) Horizontale Navigationsliste basierend auf "Sliding Door II" von "A List Apart" - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - .hlist { - /* (en) This image is mainly transparent */ - /* (de) Dieses Bild ist größtenteils transparent */ - background: transparent url("images/sliding_door/round/bg.gif") repeat-x bottom; - float: left; - width: 100%; - } - - .hlist ul { - line-height: 1em; - list-style: none; - margin: 0; - padding: 0 0 0 50px; /* LTR */ - white-space: nowrap; - } - - .hlist li { - /* (en) Repeat the main color from the image */ - /* (de) Wiederholung der Hauptfarbe aus der Bilddatei */ - list-style-type: none !important; - background: #e0ecf8 url("images/sliding_door/round/left.png") no-repeat top left; - border-bottom: 1px solid #000; - float: left; /* LTR */ - margin: 0; - padding: 0 0 0 3px; - } - - .hlist a, - .hlist strong { - /* (en) This image is mainly transparent */ - /* (de) Dieses Bild ist größtenteils transparent */ - background: transparent url("images/sliding_door/round/right.png") no-repeat top right; - color: #667; - display: block; - font-weight: normal; - padding: 5px 11px 3px 8px; - text-decoration: none; - text-transform: none; - - /** - * @bugfix - * @affected IE5.x, IE6 - * @css-for all browsers - * @valid yes - */ - width: auto; /* only IE 5.x */ - width/**/:/**/ .1em; /* only IE 6.0 */ - } - - .hlist a:link, - .hlist a:visited { background-color: transparent; color: #667; } - - /** - * @bugfix - * @affected IE5.x, IE6 - * @css-for all browsers - * @valid yes - */ - .hlist > ul a, - .hlist > ul strong { width: auto; } /* for other browsers */ - - .hlist ul li:focus, - .hlist ul li:hover, - .hlist ul li:active { - /* (en) Repeat the main color from the image */ - /* (de) Wiederholung der Hauptfarbe aus der Bilddatei */ - background-color: #c4d0dc; - background-position: 0 -150px; - } - - .hlist li:focus a, - .hlist li:hover a, - .hlist li:active a { background-position: 100% -150px; } - - .hlist a:focus, - .hlist a:hover, - .hlist a:active { background-color: transparent; color: #223; } - - .hlist li.active, - .hlist ul li.active:focus, - .hlist ul li.active:hover, - .hlist ul li.active:active { - /* (en) Repeat the main color from the image */ - /* (de) Wiederholung der Hauptfarbe aus der Bilddatei */ - background: white url("images/sliding_door/round/left_on.png") no-repeat top left; - border: 0 none; - } - - .hlist li.active strong { - /* (en) This image is mainly transparent */ - /* (de) Dieses Bild ist größtenteils transparent */ - background: transparent url("images/sliding_door/round/right_on.png") no-repeat top right; - color: #334; - font-weight: bold; - padding-bottom: 4px; - padding-top: 5px; - } - -} diff --git a/htdocs/yaml/navigation/nav_vlist.css b/htdocs/yaml/navigation/nav_vlist.css deleted file mode 100644 index 21e41c9..0000000 --- a/htdocs/yaml/navigation/nav_vlist.css +++ /dev/null @@ -1,123 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Vertical list navigation "vlist" - * (de) Vertikale Navigationsliste "vlist" - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /* title */ - h6.vlist { - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 100%; - width: 90%; - padding: 3px 0px 3px 10%; /* LTR */ - margin:0; - color: #444; - background-color: #fff; - border-top: 2px #ddd solid; - border-bottom: 4px #888 solid; - } - - .vlist { - width: 100%; - overflow: hidden; - margin: 0 0 1.5em 0; - list-style-type: none; - border-bottom: 2px #ddd solid; - } - - .vlist ul { - list-style-type: none; - margin:0; - padding: 0; - } - - .vlist li { - float:left; /* LTR */ - width: 100%; - margin:0; - padding: 0; - } - - .vlist a, - .vlist strong, - .vlist span { - display:block; - padding: 3px 0px 3px 10%; - text-decoration: none; - border-bottom: 1px #ddd solid; - } - - .vlist a, - .vlist a:visited { - color: #444; - } - - .vlist li span { - display:block; - font-weight: bold; - border-bottom: 1px #ddd solid; - } - - /* active list element */ - .vlist li.active { - color: #fff; - background-color:#800; - font-weight: bold; - } - - /* Level 1 */ - .vlist li a, - .vlist li strong, - .vlist li span { width: 90%; padding-left: 10%; } /* LTR */ - - .vlist li a:focus, - .vlist li a:hover, - .vlist li a:active { background-color:#a88; color: #fff; } - - /* Level 2 */ - .vlist li ul li a, - .vlist li ul li strong, - .vlist li ul li span { width: 80%; padding-left: 20%; } /* LTR */ - - .vlist li ul li a, - .vlist li ul li a:visited { background-color:#f8f8f8; color: #333; } - .vlist li ul li a:focus, - .vlist li ul li a:hover, - .vlist li ul li a:active { background-color:#a88; color: #fff; } - - /* Level 3 */ - .vlist li ul li ul li a, - .vlist li ul li ul li strong, - .vlist li ul li ul li span { width: 70%; padding-left: 30%; } /* LTR */ - - .vlist li ul li ul li a, - .vlist li ul li ul li a:visited{ background-color:#f0f0f0; color: #222; } - .vlist li ul li ul li a:focus, - .vlist li ul li ul li a:hover, - .vlist li ul li ul li a:active { background-color:#a88; color: #fff; } - - /* Level 4 */ - .vlist li ul li ul li ul li a, - .vlist li ul li ul li ul li strong, - .vlist li ul li ul li ul li span { width: 60%; padding-left: 40%; } /* LTR */ - - .vlist li ul li ul li ul li a, - .vlist li ul li ul li ul li a:visited { background-color:#e8e8e8; color: #111; } - .vlist li ul li ul li ul li a:focus, - .vlist li ul li ul li ul li a:hover, - .vlist li ul li ul li ul li a:active { background-color:#a88; color: #fff; } -} diff --git a/htdocs/yaml/patches/patch_layout_draft.css b/htdocs/yaml/patches/patch_layout_draft.css deleted file mode 100644 index 6c4585f..0000000 --- a/htdocs/yaml/patches/patch_layout_draft.css +++ /dev/null @@ -1,29 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Example of a patch stylesheet for the Internet Explorer - * (de) Beispiel für ein Anpassungs-Stylesheet für den Internet Explorer - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* Layout independent adjustments | Layout-unabhängige Anpassungen ----------------------------------- */ -@import url(/yaml/core/iehacks.css); - -/* Box model adjustments for vlist navigation | Box-Modell-Anpassungen für vlist-Navigation */ -/* @import url(/yaml/patches/patch_nav_vlist.css); */ - -/* Layout-dependent adjustments | Layout-abhängige Anpassungen --------------------------------------- */ -@media screen, projection -{ - /* add your adjustments here | Fügen Sie Ihre Anpassungen hier ein */ - -} diff --git a/htdocs/yaml/patches/patch_nav_vlist.css b/htdocs/yaml/patches/patch_nav_vlist.css deleted file mode 100644 index 8f11d7e..0000000 --- a/htdocs/yaml/patches/patch_nav_vlist.css +++ /dev/null @@ -1,60 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) IE adjustment stylesheet for YAML vlist navigation - * Import this file within the IE-patch-file if needed in your layout - * - * (de) IE Anpassungs-Stylesheet für YAML vlist-Navigation - * Einbindung ins Layout erfolgt über den Import innerhalb des IE-Anspassungs-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media screen, projection -{ - /** - * Box Model Bug - * (en) Adjustment of width values for list elements of the menu in IE 5.x/Win. - * Note: If IE6 is running in quirks mode, it also needs 100% values! - * - * (de) Korrektur der Breitenangaben der Listenelemente des Submenüs im IE 5.x/Win. - * Hinweis: Befindet sich der IE6 im Quirks Mode, so benötigt er ebenfalls 100%-Werte ! - * - * @bugfix - * @affected IE 5.x/Win (IE6 in Quirks-Mode) - * @css-for IE 5.x/Win, IE6 - * @valid no - */ - - - /* title */ - * html h6.vlist { width: 100%; w\idth: 90%; } - - /* level 1 */ - * html .vlist li a, - * html .vlist li strong, - * html .vlist li span { width: 100%; w\idth: 90%; } - - /* level 2 */ - * html .vlist li ul li a, - * html .vlist li ul li strong, - * html .vlist li ul li span { width: 100%; w\idth: 80%; } - - /* level 3 */ - * html .vlist li ul li ul li a, - * html .vlist li ul li ul li strong, - * html .vlist li ul li ul li span { width: 100%; w\idth: 70%; } - - /* level 4 */ - * html .vlist li ul li ul li ul li a, - * html .vlist li ul li ul li ul li strong, - * html .vlist li ul li ul li ul li span { width: 100%; w\idth: 60%; } -} diff --git a/htdocs/yaml/print/print_003_draft.css b/htdocs/yaml/print/print_003_draft.css deleted file mode 100644 index 059a2bf..0000000 --- a/htdocs/yaml/print/print_003_draft.css +++ /dev/null @@ -1,56 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1 { display:none; } - #col2 { display:none; } - #col3, #col3_content { width: 100%; margin:0; padding: 0; border:0; } - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/print/print_020_draft.css b/htdocs/yaml/print/print_020_draft.css deleted file mode 100644 index 903b9a1..0000000 --- a/htdocs/yaml/print/print_020_draft.css +++ /dev/null @@ -1,56 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1 { display:none; } - #col2, #col2_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col3 { display:none; } - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/print/print_023_draft.css b/htdocs/yaml/print/print_023_draft.css deleted file mode 100644 index 6f278a5..0000000 --- a/htdocs/yaml/print/print_023_draft.css +++ /dev/null @@ -1,62 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1 { display:none; } - #col2, #col2_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col3, #col3_content {width: 100%; margin:0; padding: 0; border:0; } - - /* Optional Column Labels | Optionale Spaltenauszeichnung - #col2_content:before { content:" [ left | middle | right column ]"; } - #col3_content:before { content:" [ left | middle | right column ]"; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} - diff --git a/htdocs/yaml/print/print_100_draft.css b/htdocs/yaml/print/print_100_draft.css deleted file mode 100644 index 82e006f..0000000 --- a/htdocs/yaml/print/print_100_draft.css +++ /dev/null @@ -1,56 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1, #col1_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col2 { display:none; } - #col3 { display:none; } - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/print/print_103_draft.css b/htdocs/yaml/print/print_103_draft.css deleted file mode 100644 index ffbaf78..0000000 --- a/htdocs/yaml/print/print_103_draft.css +++ /dev/null @@ -1,61 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1, #col1_content {float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col2 { display:none; } - #col3, #col3_content { width: 100%; margin:0; padding: 0; border:0; } - - /* Optional Column Labels | Optionale Spaltenauszeichnung - #col1_content:before { content:" [ left | middle | right column ]"; } - #col3_content:before { content:" [ left | middle | right column ]"; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/print/print_120_draft.css b/htdocs/yaml/print/print_120_draft.css deleted file mode 100644 index dbf60ea..0000000 --- a/htdocs/yaml/print/print_120_draft.css +++ /dev/null @@ -1,61 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1, #col1_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col2, #col2_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col3 { display:none; } - - /* Optional Column Labels | Optionale Spaltenauszeichnung - #col1_content:before { content:" [ left | middle | right column ]"; } - #col2_content:before { content:" [ left | middle | right column ]"; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/print/print_123_draft.css b/htdocs/yaml/print/print_123_draft.css deleted file mode 100644 index 6a6db85..0000000 --- a/htdocs/yaml/print/print_123_draft.css +++ /dev/null @@ -1,62 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /** - * @section column selection - * (en) individually switch on/off any content column for printing - * (de) (De)aktivierung der Contentspalten für den Ausdruck - * - * @see http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html - */ - - #col1, #col1_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col2, #col2_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; } - #col3, #col3_content { width: 100%; margin:0; padding: 0; border:0; } - - /* Optional Column Labels | Optionale Spaltenauszeichnung - #col1_content:before { content:" [ left | middle | right column ]"; } - #col2_content:before { content:" [ left | middle | right column ]"; } - #col3_content:before { content:" [ left | middle | right column ]"; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/print/print_draft.css b/htdocs/yaml/print/print_draft.css deleted file mode 100644 index 5c96bc2..0000000 --- a/htdocs/yaml/print/print_draft.css +++ /dev/null @@ -1,49 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) print stylesheet - * (de) Druck-Stylesheet - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 302 $ - * @lastmodified $Date: 2008-12-14 11:23:55 +0100 (So, 14. Dez 2008) $ - */ - -/* import print base styles | Basisformatierung für Drucklayout einbinden */ -@import url(../core/print_base.css); - -@media print -{ - /*------------------------------------------------------------------------------------------------------*/ - /* add your print styles here */ - - - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional output of acronyms and abbreviations*/ - /* (de) optionale Ausgabe von Auszeichnung von Abkürzungen */ - - /* - abbr[title]:after, acronym[title]:after { content: '(' attr(title) ')'; } - */ - - /*------------------------------------------------------------------------------------------------------*/ - - /* (en) optional URL output of hyperlinks in print layout */ - /* (de) optionale Ausgabe der URLs von Hyperlinks */ - /* - a[href]:after { - content:" "; - color:#444; - background:inherit; - font-style:italic; - } - */ -} diff --git a/htdocs/yaml/screen/basemod_draft.css b/htdocs/yaml/screen/basemod_draft.css deleted file mode 100644 index e1f0356..0000000 --- a/htdocs/yaml/screen/basemod_draft.css +++ /dev/null @@ -1,70 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Template for designing a screen layout - * (de) Gestaltungsvorlage für die Erstellung eines Screenlayouts - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media screen, projection -{ - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Design of the Basic Layout | Gestaltung des YAML Basis-Layouts - * - * @section layout-basics - */ - - /* Page margins and background | Randbereiche & Seitenhintergrund */ - body { } - - /* Layout: Width, Background, Border | Layout: Breite, Hintergrund, Rahmen */ - #page_margins { } - #page{ } - - /* Design of the Main Layout Elements | Gestaltung der Hauptelemente des Layouts */ - #header { } - #topnav { } - - #main { } - - #footer { } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Formatting of the Content Area | Formatierung der Inhaltsbereichs - * - * @section layout-main - */ - - #col1 { } - #col1_content { } - - #col2 { } - #col2_content { } - - #col3 { } - #col3_content { } - - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Design of Additional Layout Elements | Gestaltung weiterer Layoutelemente - * - * @section layout-misc - */ - - -} \ No newline at end of file diff --git a/htdocs/yaml/screen/content_default.css b/htdocs/yaml/screen/content_default.css deleted file mode 100644 index 47a7bdf..0000000 --- a/htdocs/yaml/screen/content_default.css +++ /dev/null @@ -1,218 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) Uniform design of standard content elements - * (de) Einheitliche Standardformatierungen für die wichtigten Inhalts-Elemente - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - * @appdef yaml - */ - -@media all -{ - /** - * Fonts - * - * (en) global settings of font-families and font-sizes - * (de) Globale Einstellungen für Zeichensatz und Schriftgrößen - * - * @section content-global-settings - */ - - /* (en) reset font size for all elements to standard (16 Pixel) */ - /* (de) Alle Schriftgrößen auf Standardgröße (16 Pixel) zurücksetzen */ - html * { font-size: 100.01%; } - - /** - * (en) reset monospaced elements to font size 16px in all browsers - * (de) Schriftgröße von monospaced Elemente in allen Browsern auf 16 Pixel setzen - * - * @see: http://webkit.org/blog/67/strange-medium/ - */ - - textarea, pre, code, kbd, samp, var, tt { - font-family: Consolas, "Lucida Console", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier; - } - - /* (en) base layout gets standard font size 12px */ - /* (de) Basis-Layout erhält Standardschriftgröße von 12 Pixeln */ - body { - font-family: Arial, Helvetica, sans-serif; - font-size: 75.00%; - color: #444; - } - - /*--- Headings | Überschriften ------------------------------------------------------------------------*/ - - h1,h2,h3,h4,h5,h6 { - font-family: "Times New Roman", Times, serif; - font-weight:normal; - color:#222; - margin: 0 0 0.25em 0; - } - - h1 { font-size: 250%; } /* 30px */ - h2 { font-size: 200%; } /* 24px */ - h3 { font-size: 150%; } /* 18px */ - h4 { font-size: 133.33%; } /* 16px */ - h5 { font-size: 116.67%; } /* 14px */ - h6 { font-size: 116.67%; } /* 14px */ - - /* --- Lists | Listen -------------------------------------------------------------------------------- */ - - ul, ol, dl { line-height: 1.5em; margin: 0 0 1em 1em; } - ul li { list-style-type: disc; } - ul ul li { list-style-type: circle; } - - ol li { list-style-type: decimal; } - ol ol li { list-style-type: lower-latin; } - - li { margin-left: 0.8em; line-height: 1.5em; } - - dt { font-weight: bold; } - dd { margin: 0 0 1em 0.8em; } - - /* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */ - - p { line-height: 1.5em; margin: 0 0 1em 0; } - - blockquote, cite,q { - font-family: Georgia, "Times New Roman", Times, serif; - font-style:italic; - } - blockquote { margin: 0 0 1em 1.6em; color: #666; } - - strong,b { font-weight: bold; } - em,i { font-style: italic; } - - pre, code, kbd, tt, samp, var { font-size: 100%; } - pre, code { color: #800; } - pre { line-height: 1.5em; margin: 0 0 1em 0; } - kbd, samp, var { color: #666; } - var { font-style: italic; } - - acronym, abbr { - border-bottom: 1px #aaa dotted; - font-variant: small-caps; - letter-spacing: .07em; - cursor: help; - } - - sub, sup { font-size: 91.6667%; } - - hr { - color: #fff; - background:transparent; - margin: 0 0 0.5em 0; - padding: 0 0 0.5em 0; - border:0; - border-bottom: 1px #eee solid; - } - - /*--- Links ----------------------------------------------------------------------------------------- */ - - a { color: #4D87C7; background:transparent; text-decoration:none; } - a:visited { color: #036; } - - a:focus, - a:hover, - a:active { color:#182E7A; text-decoration:underline; } - - /* --- images (with optional captions) | Bilder (mit optionaler Bildunterschrift) ------------------ */ - - p.icaption_left { float:left; display:inline; margin: 0 1em 0.15em 0; } - p.icaption_right { float:right; display:inline; margin: 0 0 0.15em 1em; } - - p.icaption_left img, - p.icaption_right img { padding:0; border: 1px #888 solid; } - - p.icaption_left strong, - p.icaption_right strong { display:block; overflow:hidden; margin-top: 2px; padding: 0.3em 0.5em; background: #eee; font-weight: normal; font-size: 91.667%; } - - /** - * ------------------------------------------------------------------------------------------------- # - * - * Generic Content Classes - * - * (en) standard classes for positioning and highlighting - * (de) Standardklassen zur Positionierung und Hervorhebung - * - * @section content-generic-classes - */ - - .highlight { color: #f60; } - .dimmed { color: #888; } - - .info { background: #f8f8f8; color: #666; padding: 10px; margin-bottom: 0.5em; font-size: 91.7%; } - - .note { background: #efe; color: #040; border: 2px #484 solid; padding: 10px; margin-bottom: 1em; } - .important { background: #ffe; color: #440; border: 2px #884 solid; padding: 10px; margin-bottom: 1em; } - .warning { background: #fee; color: #400; border: 2px #844 solid; padding: 10px; margin-bottom: 1em; } - - .float_left { float: left; display:inline; margin-right: 1em; margin-bottom: 0.15em; } - .float_right { float: right; display:inline; margin-left: 1em; margin-bottom: 0.15em; } - .center { display:block; text-align:center; margin: 0.5em auto; } - - /** - * ------------------------------------------------------------------------------------------------- # - * - * Tables | Tabellen - * - * (en) Generic classes for table-width and design definition - * (de) Generische Klassen für die Tabellenbreite und Gestaltungsvorschriften für Tabellen - * - * @section content-tables - */ - - table { width: auto; border-collapse:collapse; margin-bottom: 0.5em; border-top: 2px #888 solid; border-bottom: 2px #888 solid; } - table caption { font-variant:small-caps; } - table.full { width: 100%; } - table.fixed { table-layout:fixed; } - - th,td { padding: 0.5em; } - thead th { color: #000; border-bottom: 2px #800 solid; } - tbody th { background: #e0e0e0; color: #333; } - tbody th[scope="row"], tbody th.sub { background: #f0f0f0; } - - tbody th { border-bottom: 1px solid #fff; text-align: left; } - tbody td { border-bottom: 1px solid #eee; } - - tbody tr:hover th[scope="row"], - tbody tr:hover tbody th.sub { background: #f0e8e8; } - tbody tr:hover td { background: #fff8f8; } - - /** - * ------------------------------------------------------------------------------------------------- # - * - * Miscellaneous | Sonstiges - * - * @section content-misc - */ - - /** - * (en) Emphasizing external Hyperlinks via CSS - * (de) Hervorhebung externer Hyperlinks mit CSS - * - * @section content-external-links - * @app-yaml-default disabled - */ - - /* - #main a[href^="http://www.my-domain.com"], - #main a[href^="https://www.my-domain.com"] - { - padding-left: 12px; - background-image: url('your_image.gif'); - background-repeat: no-repeat; - background-position: 0 0.45em; - } - */ -} diff --git a/htdocs/yaml/screen/forms.css b/htdocs/yaml/screen/forms.css deleted file mode 100644 index 8503e0e..0000000 --- a/htdocs/yaml/screen/forms.css +++ /dev/null @@ -1,253 +0,0 @@ -@charset "UTF-8"; -/** - * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework - * - * (en) CSS-component for creating vertical forms - * (de) CSS-Baustein zur Erstellung von Formularen mit untereinander angeordneten Elementen - * - * @note Many thanks to Ansgar Hein (http://www.anatom5.de) for contribution - * - * @copyright Copyright 2005-2009, Dirk Jesse - * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/), - * YAML-C (http://www.yaml.de/en/license/license-conditions.html) - * @link http://www.yaml.de - * @package yaml - * @version 3.1 - * @revision $Revision: 343 $ - * @lastmodified $Date: 2009-01-19 23:41:32 +0100 (Mo, 19. Jan 2009) $ - */ - -@media all -{ - /** - * YAML Forms - visual styling - * - * (en) visual form styling area - * (de) Festlegung des optischen Erscheinungsbildes - */ - - form.yform { - background: #f4f4f4; - border: 1px #ddd solid; - margin: 0 0 1em 0; - padding: 10px; - } - - form.yform fieldset { - border: 1px #ddd solid; - background: #fafafa; - margin: 0 0 1em 0; - padding: 0.5em 1em; - } - - form.yform legend { - font-size: 125%; font-weight: normal; color: #000; - } - - form.yform label { - color: #666; - } - - form.yform .type-text input, - form.yform .type-text textarea, - form.yform .type-select select { - font-family: Arial, Helvetica, sans-serif; /* proportional fonts for all form elements */ - border: 1px solid #ddd; - } - - /* :hover and :focus status on form fields | Effekt zur Hervorhebung von Formularfeldern bei :hover oder :focus */ - form.yform div input:focus, - form.yform div select:focus, - form.yform div textarea:focus, - form.yform div input:hover, - form.yform div select:hover, - form.yform div textarea:hover, - form.yform div input:active, - form.yform div select:active, - form.yform div textarea:active { - border: 1px #a66 solid; - background: #fff; - } - - /* Styling of buttons | Gestaltung von Buttons */ - form.yform .type-button input { - border-top: 1px #ddd solid; - border-left: 1px #ddd solid; - border-right: 1px #444 solid; - border-bottom: 1px #444 solid; - color: #000; - background: #454545 url(images/button_gray.png) top left repeat-x; - padding: .5em 1.2em; - } - - form.yform .type-button input#reset { color: #300; background: #661717 url(images/button_red.png) top left repeat-x; } - form.yform .type-button input#submit { color: #330; background: #5e5607 url(images/button_yellow.png) top left repeat-x; } - - /* :hover and :focus status on buttons | Effekt zur Hervorhebung von Schaltern bei :hover oder :focus */ - form.yform div.type-button input:focus, - form.yform div.type-button input:hover, - form.yform div.type-button input:active { - border-top: 1px #444 solid; - border-left: 1px #444 solid; - border-right: 1px #ddd solid; - border-bottom: 1px #ddd solid; - color: #fff; - background: #555; - } - - form.yform div.type-button input#reset:focus, - form.yform div.type-button input#reset:hover, - form.yform div.type-button input#reset:active { - background: #800; color: #fff; - } - - form.yform div.type-button input#submit:focus, - form.yform div.type-button input#submit:hover, - form.yform div.type-button input#submit:active { - background: #880; color: #fff; - } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Vertical-Forms - technical base (standard) - * - * |-------------------------------| - * | fieldset | - * |-------------------------------| - * | label | - * | input / select / textarea | - * |-------------------------------| - * | /fieldset | - * |-------------------------------| - * - * (en) Styling of forms where both label and input/select/textarea are styled with display: block; - * (de) Formulargestaltung, bei der sowohl label als auch input/select/textarea mit display: block; gestaltet werden - * - * WARNING: This part contains several IE-stability-fixes. Don't edit this part if you are not sure, what you're doing! - */ - - /* General form styling | Allgemeine Formatierung des Formulars */ - form.yform { overflow: hidden; } - form.yform fieldset { overflow: hidden; } - form.yform legend { background: transparent; border: 0; } - form.yform label { display:block; cursor: pointer; } - form.yform .message { display: block; margin-bottom: 0.5em; color: #666; } - - /* Hiding of hidden fields (otherwise ugly spaces in Firefox) | Versteckte Felder wirklich verstecken (sonst ggf. häßliche Lücken im Firefox) */ - form.yform input[type=hidden] { display: none !important; } - - /* Highlight mandatory fields | Pflichtfeldkennzeichnung hervorheben */ - form.yform sup { color: #800; font-weight: bold; } - - /* styling containing DIV elements | Gestaltung der kapselnden DIV-Elemente */ - form.yform div.type-text, - form.yform div.type-select, - form.yform div.type-check, - form.yform div.type-button { - margin: 0.5em 0; - position: relative; - overflow: hidden; - } - - /* styling standard form elements with 'almost' equal flexible width | Gestaltung der einzelnen Formularelemente mit annähend gleicher Breite */ - form.yform .type-text input, - form.yform .type-text textarea { - display: block; - position: relative; - padding: 0.3em 0.3em; - width: 58.5%; - } - - form.yform .type-select select { - display: block; - position: relative; - padding: 0.3em 2px 0.3em 1px; - width: 60%; - cursor: pointer; - } - form.yform .type-select select optgroup { - font-style: normal; - font-weight: bold; - } - - form.yform .type-check input { cursor: pointer; } - form.yform .type-check label { display: inline; } - - /* Styling of buttons | Gestaltung von Buttons */ - form.yform .type-button input { - width: auto; - cursor: pointer; - } - - /* Styling of error-messages | Fehlermeldungen */ - form.yform div.error { - border: 1px #a00 dashed; - background: #faf4f4; - padding: 0.5em; - } - - form.yform div.error label { color: #000; font-weight:bold; } - form.yform div.error .message { color: #800; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Columnar forms display - technical base (optional) - * - * |-------------------------------------------| - * | fieldset | - * |-------------------------------------------| - * | | - * | label | input / select / textarea | - * | | - * |-------------------------------------------| - * | /fieldset | - * |-------------------------------------------| - * - * (en) Styling of forms where label floats left of form-elements - * (de) Formulargestaltung, bei der die label-Elemente nach links fließen - * - * WARNING: This part contains several IE-stability-fixes. Don't edit this part if you are not sure, what you're doing! - */ - - /* Columnar display | Spalten-Darstellung */ - .columnar .type-text label, - .columnar .type-select label { - float: left; - width: 30%; /* Can be fixed width too | Kann auch eine fixe Angabe sein */ - } - - /* Indent Checkbox fields to match label-width | Checkboxen um den gleichen Wert einrücken, wie die Breite der labels */ - .columnar div.type-check { padding-left: 30%; } - .columnar div.error .message { margin-left: 30%; } - - .columnar div.type-text input, - .columnar div.type-text textarea { width: 67.8%; } - .columnar div.type-select select { width: 69.4%; } - - /* width adjustments for IE 5.x & IE6 | Breitenanpassung für Internet Explorer 5.x und 6.0 */ - * html .columnar div.type-text input, - * html .columnar div.type-text textarea { width: 67.2%; } - * html .columnar div.type-select select { width: 68.8%; } - - /*------------------------------------------------------------------------------------------------------*/ - - /** - * Forms Fieldset/Legend-Bug in IE - * @see http://www.mattheerema.com/web-design/2006/04/getting-fieldset-backgrounds-and-legends-to-behave-in-ie/ - * - * @workaround - * @affected IE 5.x/Win, IE6, IE7 - * @css-for IE 5.x/Win, IE6, IE7 - * @valid yes - */ - - /* IE5.x & IE6 */ - * html form.yform legend { position:absolute; top: -.5em; left: .5em; } - * html form.yform fieldset { overflow:visible; height: 1%; margin-top:1.5em; padding-top:1.5em; } - - /* IE7 */ - *+html form.yform legend { position:absolute; top: -.5em; left: .5em; } - *+html form.yform fieldset { overflow:visible; height:1%; margin-top:1.5em; padding-top:1.5em; } -} diff --git a/htdocs/yaml/screen/images/button_gray.png b/htdocs/yaml/screen/images/button_gray.png deleted file mode 100644 index a36926e..0000000 Binary files a/htdocs/yaml/screen/images/button_gray.png and /dev/null differ diff --git a/htdocs/yaml/screen/images/button_red.png b/htdocs/yaml/screen/images/button_red.png deleted file mode 100644 index f26e985..0000000 Binary files a/htdocs/yaml/screen/images/button_red.png and /dev/null differ diff --git a/htdocs/yaml/screen/images/button_yellow.png b/htdocs/yaml/screen/images/button_yellow.png deleted file mode 100644 index f65ea9b..0000000 Binary files a/htdocs/yaml/screen/images/button_yellow.png and /dev/null differ diff --git a/pyweb/mumble/MumbleCtlDbus.py b/pyweb/mumble/MumbleCtlDbus.py index 80ed000..ef11743 100755 --- a/pyweb/mumble/MumbleCtlDbus.py +++ b/pyweb/mumble/MumbleCtlDbus.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- # mumble-django contributed by withgod@sourceforge.net +from PIL import Image +from struct import pack, unpack +from zlib import compress, decompress from mctl import MumbleCtlBase @@ -76,6 +79,46 @@ class MumbleCtlDbus(MumbleCtlBase): def setRegistration(self, srvid, mumbleid, name, email, password): return MumbleCtlDbus.converDbusTypeToNative(self._getDbusServerObject(srvid).setRegistration(dbus.Int32(mumbleid), dbus.String(name), dbus.String(email), dbus.String(password))) + def getTexture(self, srvid, mumbleid): + texture = self._getDbusServerObject(srvid).getTexture(dbus.Int32(mumbleid)); + + if len(texture) == 0: + raise ValueError( "No Texture has been set." ); + # this returns a list of bytes. + # first 4 bytes: Length of uncompressed string, rest: compressed data + orig_len = ( texture[0] << 24 ) | ( texture[1] << 16 ) | ( texture[2] << 8 ) | ( texture[3] ); + # convert rest to string and run decompress + bytestr = ""; + for byte in texture[4:]: + bytestr += pack( "B", int(byte) ); + decompressed = decompress( bytestr ); + # iterate over 4 byte chunks of the string + imgdata = ""; + for idx in range( 0, orig_len, 4 ): + # read 4 bytes = BGRA and convert to RGBA + bgra = unpack( "4B", decompressed[idx:idx+4] ); + imgdata += pack( "4B", bgra[2], bgra[1], bgra[0], bgra[3] ); + + # return an 600x60 RGBA image object created from the data + return Image.fromstring( "RGBA", ( 600, 60 ), imgdata); + + def setTexture(self, srvid, mumbleid, infile): + # open image, convert to RGBA, and resize to 600x60 + img = Image.open( infile ).convert( "RGBA" ).transform( ( 600, 60 ), Image.EXTENT, ( 0, 0, 600, 60 ) ); + # iterate over the list and pack everything into a string + bgrastring = ""; + for ent in list( img.getdata() ): + # ent is in RGBA format, but Murmur wants BGRA (ARGB inverse), so stuff needs + # to be reordered when passed to pack() + bgrastring += pack( "4B", ent[2], ent[1], ent[0], ent[3] ); + # compress using zlib + compressed = compress( bgrastring ); + # pack the original length in 4 byte big endian, and concat the compressed + # data to it to emulate qCompress(). + texture = pack( ">L", len(bgrastring) ) + compressed; + # finally call murmur and set the texture + self._getDbusServerObject(srvid).setTexture(dbus.Int32( mumbleid ), texture) + @staticmethod def converDbusTypeToNative(data): #i know dbus.* type is extends python native type. @@ -97,4 +140,6 @@ class MumbleCtlDbus(MumbleCtlBase): ret = unicode(data) elif data.__class__ is dbus.Int32 or data.__class__ is dbus.UInt32: ret = int(data) + elif data.__class__ is dbus.Byte: + ret = byte(data) return ret diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index d29bcb8..a1ac494 100755 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # mumble-django contributed by withgod@sourceforge.net +from PIL import Image +from struct import pack, unpack +from zlib import compress, decompress + from mctl import MumbleCtlBase import Ice @@ -160,6 +164,12 @@ class MumbleCtlIce(MumbleCtlBase): self._getIceServerObject(srvid).setACL(id, acls, groups, inherit) + + + def getTexture(self, srvid, mumbleid): + print self._getIceServerObject(srvid).getTexture(mumbleid) + #return Image.fromstring( "RGBA", ( 600, 60 ), self._getIceServerObject(srvid).getTexture(mumbleid)); + @staticmethod def setUnicodeFlag(data): ret = {} diff --git a/pyweb/mumble/forms.py b/pyweb/mumble/forms.py index 23c6327..4f7c740 100644 --- a/pyweb/mumble/forms.py +++ b/pyweb/mumble/forms.py @@ -14,7 +14,8 @@ * GNU General Public License for more details. """ -from django.forms import ModelForm +from django import forms +from django.forms import Form, ModelForm from models import * class MumbleForm( ModelForm ): @@ -28,3 +29,8 @@ class MumbleUserForm( ModelForm ): model = MumbleUser; fields = ( 'name', 'password' ); + +class MumbleTextureForm( Form ): + texturefile = forms.ImageField(); + + diff --git a/pyweb/mumble/mctl.py b/pyweb/mumble/mctl.py index 9762242..bef6362 100755 --- a/pyweb/mumble/mctl.py +++ b/pyweb/mumble/mctl.py @@ -74,6 +74,12 @@ class MumbleCtlBase (): def setACL(self, srvid, acl): pass + def getTexture(self, srvid, mumbleid): + pass + + def setTexture(self, srvid, mumbleid, infile): + pass + @staticmethod def newInstance(): # if dbus @@ -91,41 +97,6 @@ if __name__ == "__main__": x = int(sys.argv[1]) dbusCtl = MumbleCtlDbus() iceCtl = MumbleCtlIce() - ''' - print "--- Dbus test start" - #ctl = MumbleCtlBase.newInstance() - print dbusCtl - print dbusCtl.meta - print "booted server", dbusCtl.getBootedServers() - print "chans" - print dbusCtl.getChannels(x) - print "users" - print dbusCtl.getPlayers(x) - print "getACL", dbusCtl.getACL(x, 0) - print "getAllServers()" - print dbusCtl.getAllServers() - print "getDefaultConf()" - print dbusCtl.getDefaultConf() - print "getAllConf(x)" - print dbusCtl.getAllConf(x) - print "--Dbus end--" - print "--- Ice test start" - print iceCtl - print iceCtl.meta - print "booted server", iceCtl.getBootedServers() - print "chans" - print iceCtl.getChannels(x) - print "users" - print iceCtl.getPlayers(x) - print "getACL", iceCtl.getACL(x, 0) - print "getAllServers()" - print iceCtl.getAllServers() - print "getDefaultConf()" - print iceCtl.getDefaultConf() - print "getAllConf(x)" - print iceCtl.getAllConf(x) - print "--- Ice test end" - ''' print "equal test ---" print "getBootedServers [%s]" % (dbusCtl.getBootedServers() == iceCtl.getBootedServers()) @@ -136,8 +107,7 @@ if __name__ == "__main__": print "getDefaultConf [%s]" % (dbusCtl.getDefaultConf() == iceCtl.getDefaultConf()) print "getAllConf(x) [%s]" % (dbusCtl.getAllConf(x) == iceCtl.getAllConf(x)) print "getRegisteredPlayers(x) [%s]" % (dbusCtl.getRegisteredPlayers(x) == iceCtl.getRegisteredPlayers(x)) + print "getTexture(2, 30) [%s]" % (dbusCtl.getTexture(2, 30) == iceCtl.getTexture(2, 30)) - - #print iceCtl.getRegisteredPlayers(x) - #print iceCtl.getACL(x, 0) - + #print iceCtl.getTexture(2, 30).__class__ + #print dbusCtl.getTexture(2, 30).__class__ diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py index 525eed9..2f3b605 100755 --- a/pyweb/mumble/models.py +++ b/pyweb/mumble/models.py @@ -14,6 +14,10 @@ * GNU General Public License for more details. """ +from PIL import Image +from struct import pack, unpack +from zlib import compress, decompress + from django.contrib.auth.models import User from django.db import models @@ -119,7 +123,7 @@ class Mumble( models.Model ): def deleteServer( self ): # Unregister this player in Murmur via ctroller. - print MumbleCtlBase.newInstance() + #print MumbleCtlBase.newInstance() MumbleCtlBase.newInstance().deleteServer(self.srvid) @staticmethod @@ -198,16 +202,26 @@ class MumbleUser( models.Model ): ctl.setACL(self.server.srvid, acl); return value; + def getTexture( self ): + return MumbleCtlBase.newInstance().getTexture(self.server.srvid, self.mumbleid); + def setTexture( self, infile ): + MumbleCtlBase.newInstance().setTexture(self.server.srvid, self.mumbleid, infile) + @staticmethod def pre_delete_listener( **kwargs ): kwargs['instance'].unregister(); def unregister( self ): - # Unregister this player in Murmur via ctroller. - MumbleCtlBase.newInstance().unregisterPlayer(self.server.srvid, self.mumbleid) - + # Unregister this player in Murmur via dbus. + MumbleCtlBase.newInstance().unregisterPlayer(self.server.srvid, self.mumbleid) + def __setattr__( self, name, value ): + if name == 'server': + if self.id is not None and self.server != value: + raise AttributeError( "This field must not be updated once the Record has been saved." ); + + models.Model.__setattr__( self, name, value ); from django.db.models import signals diff --git a/pyweb/mumble/urls.py b/pyweb/mumble/urls.py index 6608d12..a2f4b19 100644 --- a/pyweb/mumble/urls.py +++ b/pyweb/mumble/urls.py @@ -17,7 +17,8 @@ from django.conf.urls.defaults import * urlpatterns = patterns( - '', - ( r'(?P\d+)', 'mumble.views.show' ), - ( r'$', 'mumble.views.mumbles' ), + 'mumble.views', + ( r'(?P\d+)/texture.png', 'showTexture' ), + ( r'(?P\d+)', 'show' ), + ( r'$', 'mumbles' ), ) diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py index 1ccf99c..67efbd5 100755 --- a/pyweb/mumble/views.py +++ b/pyweb/mumble/views.py @@ -14,9 +14,11 @@ * GNU General Public License for more details. """ +from StringIO import StringIO + from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404 from django.template import RequestContext -from django.http import HttpResponseRedirect +from django.http import Http404, HttpResponse, HttpResponseRedirect from django.core.urlresolvers import reverse from django.contrib.auth.decorators import login_required @@ -32,10 +34,15 @@ class Storage( object ): def mumbles( request ): - "Displays a list of all configured Mumble servers." + "Displays a list of all configured Mumble servers, or redirects if only one configured." + mumbles = get_list_or_404( Mumble ); + + if len(mumbles) == 1: + return HttpResponseRedirect( '/mumble/%d' % mumbles[0].id ); + return render_to_response( 'mumble/list.htm', - { 'MumbleObjects': get_list_or_404( Mumble ), + { 'MumbleObjects': mumbles, 'MumbleActive': True, }, context_instance = RequestContext(request) @@ -66,6 +73,7 @@ def show( request, server ): adminform = None; registered = False; + if request.user.is_authenticated(): if request.method == 'POST' and 'mode' in request.POST and request.POST['mode'] == 'reg': try: @@ -92,8 +100,18 @@ def show( request, server ): else: regform = MumbleUserForm( instance=user ); registered = True; + + if request.method == 'POST' and 'mode' in request.POST and request.POST['mode'] == 'texture' and registered: + textureform = MumbleTextureForm( request.POST, request.FILES ); + if textureform.is_valid(): + user.setTexture( request.FILES['texturefile'] ); + return HttpResponseRedirect( '/mumble/%d' % int(server) ); + else: + textureform = MumbleTextureForm(); + else: regform = None; + textureform = None; return render_to_response( 'mumble/mumble.htm', @@ -104,6 +122,7 @@ def show( request, server ): "CurrentUserIsAdmin": isAdmin, "AdminForm": adminform, "RegForm": regform, + "TextureForm": textureform, "Registered": registered, "DisplayTab": displayTab, 'MumbleActive': True, @@ -112,6 +131,20 @@ def show( request, server ): ); +def showTexture( request, server ): + if request.user.is_authenticated(): + srv = Mumble.objects.get( id=int(server) ); + user = MumbleUser.objects.get( server=srv, owner=request.user ); + try: + img = user.getTexture(); + except ValueError: + raise Http404(); + else: + buffer = StringIO(); + img.save( buffer, "PNG" ); + return HttpResponse( buffer.getvalue(), "image/png" ); + raise Http404(); + def showContent( server, user = None ): "Renders and returns the channel list for the given Server ID." from django.template import Context, loader @@ -168,5 +201,3 @@ def renderListItem( item, level ): Storage.s.append( ( level, item ) ); - - diff --git a/template/index.htm b/template/index.htm index 71dbeb5..dcfbc1e 100644 --- a/template/index.htm +++ b/template/index.htm @@ -1,94 +1,68 @@ - - - - Mumble Administration - - - - - - - - + + + Mumble Administration + - - {% block HeadTag %} - {% endblock %} - - -
-
-
-
-
-
-