commit a988a2de28758ef9cbb32c0a455997f6769493ac
parent 99017c6745782a275a7c1c79ce900b7f6c983c5a
Author: Jan Dankert <devnull@localhost>
Date: Mon, 15 Oct 2012 22:15:09 +0200
Fieldsets können auf- und zuklappbar sein.
Diffstat:
10 files changed, 62 insertions(+), 73 deletions(-)
diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php
@@ -644,7 +644,8 @@ textarea.editor
height:400px;
}
-label
+label,
+fieldset.open > legend
{
cursor: pointer;
}
@@ -667,14 +668,19 @@ fieldset
margin-bottom:20px;
margin-left:0px;
margin-right:0px;
+ padding:10px;
}
-fieldset legend
+fieldset > legend
{
margin-left:30px;
- /*
- padding-left:30px;
- */
+ font-weight:bold;
+}
+
+
+fieldset.open > div.invisible
+{
+ display:none;
}
@@ -1317,12 +1323,6 @@ body
}
-/* Formulare */
-
-fieldset
-{
- padding:10px;
-}
form div.line
{
@@ -1431,43 +1431,6 @@ input.hint
color:<?php echo $_GET['title_background_color']; ?>;
}
-/* Zwischen-Ueberschriften */
-fieldset
-{
- /*
- border:1px solid <?php echo $_GET['title_background_color']; ?>;
-
- border-bottom:0px;
- border-left:0px;
- border-right:0px;
- margin-top:5px;
- margin-bottom:0px;
- margin-left:0px;
- margin-right:0px;
- */
- /*
- margin:0px;
- margin-top:20px;
- margin-bottom:20px;
- padding:15px;
-
-
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- -khtml-border-radius:5px;
- border-radius:5px;
- -webkit-box-shadow: 3px 2px 5px <?php echo $_GET['title_background_color']; ?>;
- -moz-box-shadow: 3px 2px 5px <?php echo $_GET['title_background_color']; ?>;
- box-shadow: 3px 2px 5px <?php echo $_GET['title_background_color']; ?>;
- */
-}
-
-
-/* Legende */
-legend
-{
- font-weight:bold;
-}
diff --git a/themes/default/images/icon_folder_up.png b/themes/default/images/icon_folder_up.png
Binary files differ.
diff --git a/themes/default/include/elements.ini.php b/themes/default/include/elements.ini.php
@@ -5,17 +5,17 @@
output =
button = type:submit,src,class:ok,value:ok,text:button_ok
-column = width,style,class,colspan,rowspan,header:false,title,url,action,id,name
char = type:*
checkbox = default:false,readonly:false,name:*
+column = width,style,class,colspan,rowspan,header:false,title,url,action,id,name
date = date
dummy =
-group = title,icon
focus = field:*
form = action,subaction,id,name:,target:_self,method:post,enctype:application/x-www-form-urlencoded,type:
frame = file,name,scrolling
frameset = rows,columns
frameset-page=menu
+group = title,icon,open:false,class
hidden = name:*,default
header = name:,views,back:false
editor = name:*,type:*
diff --git a/themes/default/include/html/group-end.inc.php b/themes/default/include/html/group-end.inc.php
@@ -1 +1,4 @@
-</fieldset>-
\ No newline at end of file
+<!-- Ignore: --><fieldset><div>
+
+
+</div></fieldset>+
\ No newline at end of file
diff --git a/themes/default/include/html/group.inc.php b/themes/default/include/html/group.inc.php
@@ -1 +1,6 @@
-<fieldset><?php if(isset($attr_title)) { ?><legend><?php if(isset($attr_icon)) { ?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" align="left" border="0" /><?php } ?> <?php echo encodeHtml($attr_title) ?> </legend><?php } ?>-
\ No newline at end of file
+<?php
+?><fieldset class="<? echo $attr_open?'open':'' ?>"><?php if(isset($attr_title)) { ?><legend><?php if(isset($attr_icon)) { ?> <img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" align="left" border="0" /><?php } if($attr_open) { ?><img src="<?php echo $image_dir.'icon/menu.gif' ?>" align="left" border="0" /><?php } ?> <?php echo encodeHtml($attr_title) ?> </legend><?php } ?><div class="<?php echo $attr_open?'invisible':'' ?>">
+
+
+
+<!-- Ignored: --></div></fieldset>+
\ No newline at end of file
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -379,6 +379,10 @@ function loadView(jo, url )
$(this).closest('div.frame').find('div.command').css('visibility','visible').fadeIn('slow');
});
+ $(jo).find('fieldset.open').click( function() {
+ $(this).find('div').first().toggleClass('invisible');
+ });
+
});
}
diff --git a/themes/default/templates/configuration/show.tpl.src.xml b/themes/default/templates/configuration/show.tpl.src.xml
@@ -11,7 +11,7 @@
</row>
<list list="config" extract="true">
<row class="data">
- <column>
+ <column>
<text var="key"></text>
</column>
<column class="var:class">
diff --git a/themes/default/templates/login/license.tpl.src.xml b/themes/default/templates/login/license.tpl.src.xml
@@ -1,3 +1,7 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><header><link type="external" url="config:login/gpl/url" target="_top" class="copyright"><text key="GPL"></text></link><group></group><list list="software" extract="true"><link type="external" url="var:url"><text var="name"></text></link><text var="license"></text><newline></newline><newline></newline></list></header></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <header><link type="external" url="config:login/gpl/url" target="_top"
+ class="copyright"><text key="GPL"></text></link><group></group><list list="software"
+ extract="true"><link type="external" url="var:url"><text var="name"></text></link><text
+ var="license"></text><newline></newline><newline></newline></list></header>
+</output>+
\ No newline at end of file
diff --git a/themes/default/templates/login/login.tpl.src.xml b/themes/default/templates/login/login.tpl.src.xml
@@ -63,7 +63,7 @@
</if>
</group>
<!-- <if true="property:mustChangePassword"> -->
- <group title="message:USER_NEW_PASSWORD">
+ <group title="message:USER_NEW_PASSWORD" open="true">
<part class="line">
<part class="label">
<label for="password1">
@@ -106,7 +106,6 @@
</part>
<part class="input">
<selectbox name="dbid" list="dbids" default="var:actdbid"></selectbox>
- <hidden name="screenwidth" default="9999"></hidden>
</part>
</part>
</group>
diff --git a/themes/default/templates/template.xsd b/themes/default/templates/template.xsd
@@ -23,11 +23,11 @@
</xsd:complexType>
<xsd:complexType name="rowType">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element maxOccurs="unbounded" name="cell" type="cellType" />
+ <xsd:element maxOccurs="unbounded" name="column" type="columnType" />
</xsd:choice>
<xsd:attributeGroup ref="universal"></xsd:attributeGroup>
</xsd:complexType>
- <xsd:complexType name="cellType">
+ <xsd:complexType name="columnType">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element ref="part" maxOccurs="unbounded"
minOccurs="0">
@@ -38,7 +38,7 @@
<xsd:element ref="text" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
- <xsd:element ref="fieldset" maxOccurs="unbounded"
+ <xsd:element ref="group" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
<xsd:element ref="button" maxOccurs="unbounded"
@@ -100,10 +100,10 @@
<xsd:element name="button" type="xsd:string"></xsd:element>
- <xsd:element name="cell" type="cellType"></xsd:element>
+ <xsd:element name="column" type="columnType"></xsd:element>
- <xsd:element name="fieldset" type="fieldsetType"></xsd:element>
+ <xsd:element name="group" type="groupType"></xsd:element>
<xsd:element name="if" type="ifType"></xsd:element>
@@ -134,18 +134,22 @@
<xsd:element name="user" type="userType"></xsd:element>
- <xsd:complexType name="fieldsetType">
+ <xsd:complexType name="groupType">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0">
+ <xsd:element ref="part" maxOccurs="unbounded"
+ minOccurs="0">
</xsd:element>
- <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0">
+ <xsd:element ref="label" maxOccurs="unbounded"
+ minOccurs="0">
</xsd:element>
<xsd:element ref="selectbox" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
<xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"></xsd:element>
</xsd:choice>
+ <xsd:attribute name="icon" type="xsd:string"></xsd:attribute>
<xsd:attribute name="title" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="open" type="xsd:string"></xsd:attribute>
</xsd:complexType>
<xsd:complexType name="partType">
@@ -153,6 +157,7 @@
<xsd:element ref="text" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
+ <xsd:element name="password" type="inputType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
<xsd:element ref="checkbox" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
@@ -171,7 +176,7 @@
<xsd:element ref="input" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
- <xsd:element ref="fieldset" maxOccurs="unbounded"
+ <xsd:element ref="group" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
<xsd:element ref="image" maxOccurs="unbounded"
@@ -212,7 +217,8 @@
<xsd:complexType name="formType">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element ref="fieldset" maxOccurs="unbounded"
+ <xsd:element name="group" type="groupType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+ <xsd:element ref="group" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
<xsd:element ref="part" maxOccurs="unbounded"
@@ -243,6 +249,8 @@
<xsd:attribute name="maxlength" type="xsd:integer"></xsd:attribute>
<xsd:attribute name="readonly" type="xsd:string"></xsd:attribute>
<xsd:attribute name="class" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="default" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="hint" type="xsd:string"></xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
@@ -275,11 +283,12 @@
</xsd:element>
<xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
</xsd:choice>
- <xsd:attribute name="type" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="type" type="xsd:string" use="required"></xsd:attribute>
<xsd:attribute name="class" type="xsd:string"></xsd:attribute>
<xsd:attribute name="action" type="xsd:string"></xsd:attribute>
<xsd:attribute name="subaction" type="xsd:string"></xsd:attribute>
<xsd:attribute name="id" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="url" type="xsd:string"></xsd:attribute>
</xsd:complexType>
<xsd:element name="image" type="imageType"></xsd:element>
@@ -305,7 +314,7 @@
minOccurs="0">
</xsd:element>
<xsd:element ref="text"></xsd:element>
- <xsd:element ref="fieldset"></xsd:element>
+ <xsd:element ref="group"></xsd:element>
<xsd:element ref="link"></xsd:element>
<xsd:element ref="image"></xsd:element>
<xsd:element ref="if"></xsd:element>
@@ -313,6 +322,8 @@
<xsd:element ref="radiobox"></xsd:element>
<xsd:element ref="input"></xsd:element>
</xsd:choice>
+ <xsd:attribute name="greaterthan" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="value" type="xsd:string"></xsd:attribute>
<xsd:attribute name="true" type="xsd:string"></xsd:attribute>
<xsd:attribute name="false" type="xsd:string"></xsd:attribute>
<xsd:attribute name="empty" type="xsd:string"></xsd:attribute>
