commit 129731f8cf637047bb59c74da4ed047ec44b797c
parent aad41f1eeadccce140a9caf90a8d3106be9df38a
Author: dankert <devnull@localhost>
Date: Thu, 1 Mar 2007 21:58:49 +0100
"page" erh?lt "menu", "if" erh?lt "equals"
Diffstat:
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/themes/default/include/elements.ini.php b/themes/default/include/elements.ini.php
@@ -13,10 +13,10 @@ focus = field:*
form = action,subaction,id,name:,target:_self,method:post,enctype:application/x-www-form-urlencoded
frame = file,name,scrolling
frameset = rows,columns
-frameset-page=
+frameset-page=menu
hidden = name:*,default
else =
-if = var,value,invert,not,empty,present,contains,true,false
+if = equals,value,invert,not,empty,present,contains,true,false
image = config,file,url,icon,align:left,type,elementtype
input = class:,default:,type:text,index,name:*,prefix,value,size:40,maxlength:256,onchange:
inputarea= name,rows:10,cols:40,value,index,onchange,prefix,class:,default
@@ -26,7 +26,7 @@ link = title:,config,target:_self,var,url,class:,action,subaction,id,var1,va
list = list:*,extract:false,key:list_key,value:list_value
logo = name:*
newline =
-page = class:main,title:var:cms_title
+page = class:main,title:var:cms_title,menu
password = name:*,default:,class:,size:40,maxlength:256
radio = readonly,name:*,value,default,prefix,suffix
raw =
diff --git a/themes/default/include/html/frameset-page.inc.php b/themes/default/include/html/frameset-page.inc.php
@@ -4,5 +4,14 @@
<head>
<title><?php echo $title ?> - <?php echo $cms_title ?></title>
<link rel="shortcut icon" href="<?php echo $image_dir.'favicon.ico' ?>" />
+ <link rel="top" title="Start" href="./" />
+ <link rel="author" title="Homepage" href="http://www.openrat.de" />
+
+ <?php if (is_array($windowMenu)) foreach( $windowMenu as $menu )
+ {
+ ?>
+ <link rel="section" href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" /><?php
+ }
+?>
<meta name="robots" content="noindex,nofollow" />
</head>
diff --git a/themes/default/include/html/if.inc.php b/themes/default/include/html/if.inc.php
@@ -21,11 +21,11 @@
}
// Inhalt-Vergleich mit Wertliste
elseif( isset($attr_contains) )
- $exec = in_array($$attr_var,explode(',',$attr_contains));
+ $exec = in_array($attr_value,explode(',',$attr_contains));
// Inhalt-Vergleich
- elseif( isset($attr_var) )
- $exec = $$attr_var == $attr_value;
+ elseif( isset($attr_equals)&& isset($attr_value) )
+ $exec = $attr_equals == $attr_value;
// Vergleich auf leer
elseif ( isset($attr_empty) )
@@ -80,7 +80,7 @@
unset($attr_invert);
unset($attr_not);
unset($attr_value);
- unset($attr_var);
+ unset($attr_equals);
$last_exec = $exec;
diff --git a/themes/default/include/html/page.inc.php b/themes/default/include/html/page.inc.php
@@ -7,6 +7,13 @@
<meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="robots" content="noindex,nofollow" />
+<?php if (is_array($windowMenu)) foreach( $windowMenu as $menu )
+ {
+ ?>
+ <link rel="section" href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" />
+<?php
+ }
+?>
<link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" />
<?php if($stylesheet!='default') { ?>
<link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" />