openrat-cms

commit 3565ac64ee51900e6d5175965d4d6f6cf4612a72
parent 7b66d4c79ace6506c4763873c8d3a25276b8cfa5
Author: dankert <devnull@localhost>
Date:   Wed, 26 Jan 2011 22:21:52 +0100

Tabellenfreie Darstellung von Hinweisen.

Diffstat:
themes/default/css/user/blue.css
 | 
36
++++++++++++++++++------------------
themes/default/include/html/window.inc.php
 | 
95
+++++++++++++++++++++++--------------------------------------------------------

2 files changed, 45 insertions(+), 86 deletions(-)
diff --git a/themes/default/css/user/blue.css b/themes/default/css/user/blue.css
@@ -85,14 +85,14 @@ div#tree > table.tree
 
 
 /* Menü-Knöpfe */
-body > div > a.action,
-body > div > a.action_active,
-body > div > a.help,
-body > div > div.noaction,
-body > div > form > a.action,
-body > div > form > a.action_active,
-body > div > form > a.help,
-body > div > form > div.noaction
+div.menu > a.action,
+div.menu > a.action_active,
+div.menu > a.help,
+div.menu > div.noaction,
+div.menu > form > a.action,
+div.menu > form > a.action_active,
+div.menu > form > a.help,
+div.menu > form > div.noaction
 {
 	x-height:20px;
 	margin:9px;
@@ -514,15 +514,9 @@ input.searchbutton
 
 fieldset
 {
-	border-top:1px solid black;
-	border-bottom:0px;
-	border-left:0px;
-	border-right:0px;
-	margin-top:5px;
-	margin-bottom:0px;
-	margin-left:0px;
-	margin-right:0px;
-	padding:0px;
+	border:1px solid grey;
+	margin:10px;
+	padding:15px;
 }
 
 
@@ -531,10 +525,16 @@ fieldset
 
 legend
 {
-	font-weight:bold;
+	font-weight:italic;
 }
 
 
+label
+{
+	width:30%;
+	float:left;
+}
+
 
 
 /* Notizen */
diff --git a/themes/default/include/html/window.inc.php b/themes/default/include/html/window.inc.php
@@ -1,53 +1,44 @@
 <div class="breadcrumb">
-		<?php 
-#IF-ATTR icon#
-	$icon=$attr_icon;
-#ELSE#
-	$icon=$actionName;
-#END-IF#
-	$icon=$actionName;
-	
-		echo '<img src="'.$image_dir.'icon_'.$icon.IMG_ICON_EXT.'" align="left" border="0">';
+		<?php $icon=$actionName; ?>
+		<img src="<?php echo $image_dir.'icon_'.$icon.IMG_ICON_EXT ?>" align="left" />
 		
-		if ($this->isEditable()) { ?>
+		<?php if ($this->isEditable()) { ?>
   <?php if ($this->isEditMode()) { 
   ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId()                       ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php }
    elseif (readonly()) {
   ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else {
   ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php }
-  ?><?php }
+  ?><?php } ?>
   
-		echo '<span class="path">'.langHtml($actionName).'</span>&nbsp;<strong>&rarr;</strong>&nbsp;';
+		<span class="path"><?php echo langHtml($actionName) ?></span>&nbsp;<strong>&rarr;</strong>&nbsp;
+		<?php
 //		if	( !empty($attr_icon) )
 //			echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">';
 		if	( !isset($path) || !is_array($path) )
 			$path = array();
 		foreach( $path as $pathElement)
 		{
-			extract($pathElement);
-			echo '<a href="'.$url.'" title="'.$title.'" class="path">'.(!empty($key)?langHtml($key):$name).'</a>';
-			echo '&nbsp;&rarr;&nbsp;';
-		}
-		echo '<span class="title">'.langHtml($windowTitle).'</span>';
-		
+			extract($pathElement); ?>
+			<a href="<?php echo $url ?>" title="<?php echo $title ?>" class="path"><?php echo (!empty($key)?langHtml($key):$name) ?></a>
+			&nbsp;&rarr;&nbsp;
+		<?php } ?>
+		<span class="title"><?php echo langHtml($windowTitle) ?></span>
+		<?php
 		if	( isset($notice_status))
 		{
 			?><img src="<?php echo $image_dir.'notice_'.$notice_status.IMG_ICON_EXT ?>" align="right" /><?php
 		}
-		
-		
 		?>
+	</div>
+
 		
-</div>
-<?php ?>		<!--<td class="menu" style="align:right;">
+		<?php ?>		<!--<td class="menu" style="align:right;">
     <?php if (isset($windowIcons)) foreach( $windowIcons as $icon )
           {
           	?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.langHtml($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php
           }
      ?>
     </td>-->
-  </tr>
-
 
 
 
@@ -56,24 +47,10 @@
 
 
 
+<div class="menu">
 <?php
-	$coloumn_widths=array();
-	
-#IF-ATTR widths#
-	$coldumn_widths = explode(',',$attr_widths);
-#END-IF#
-#IF-ATTR rowclasses#
-	$row_classes   = explode(',',$attr_rowclasses);
-	$row_class_idx = 999;
-#END-IF#
-#IF-ATTR columnclasses#
-	$column_classes = explode(',',$attr_columnclasses);
-#END-IF#
-	$row_idx    = 0;
-	$column_idx = 0;
 
-	    if	( !isset($windowMenu) || !is_array($windowMenu) )
-			$windowMenu = array();
+	if	( !isset($windowMenu) || !is_array($windowMenu) ) $windowMenu = array();
     foreach( $windowMenu as $menu )
           {
           	$tmp_text = langHtml($menu['text']);
@@ -99,46 +76,29 @@
 	
 	
 	
-		global $image_dir;
-		echo '<br/><br/>';
-		echo '<table class="x-main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">';
 		?>
+</div>
 		
 
-<?php if (isset($notices) && count($notices)>0 )
-      { ?>
-
-  <tr>
-    <td align="center" class="notice">
+<!-- Hinweis-Meldungen -->
 
+<?php 		global $image_dir; 
+      if (isset($notices) && count($notices)>0 )
+      { ?>
+    	<dl class="notice">
   <?php foreach( $notices as $notice_idx=>$notice ) { ?>
-    	<br><table class="notice">
     
   <?php if ($notice['name']!='') { ?>
-  <tr>
-    <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>
-    </th>
-  </tr>
+    <dt><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?></dt>
 <?php } ?>
-  <tr class="<?php echo $notice['status'] ?>">
+  <dd class="<?php echo $notice['status'] ?>">
     <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td>
     <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?>
     <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?>
     </td>
-  </tr>
+  </dd>
   
-    </table>
   <?php } ?>
+    </dl>
   
-    </td>
-  </tr>
-  <tr>
-  <td colspan="2"><fieldset></fieldset></td>
-  </tr>
-
 <?php } ?>
-
-</table>
-
-
-      -
\ No newline at end of file