openrat-cms

commit fd77d1dac2c870b71ca8331ae397fd1ef0cfabc8
parent 4d4d455e19e55d02c8233a673e0b073596405bec
Author: Jan Dankert <devnull@localhost>
Date:   Mon,  6 Nov 2017 22:33:47 +0100

Aufgeräumt...

Diffstat:
themes/default/include/html/header.inc.php
 | 
2
+-
themes/default/include/html/window-end.inc.php
 | 
26
--------------------------
themes/default/include/html/window.inc.php
 | 
112
-------------------------------------------------------------------------------
themes/default/templates/folder/edit.tpl.src.xml
 | 
2
+-

4 files changed, 2 insertions(+), 140 deletions(-)
diff --git a/themes/default/include/html/header.inc.php b/themes/default/include/html/header.inc.php
@@ -3,7 +3,7 @@
     <?php foreach( explode(',',$attr_views) as $attr_tmp_view ) { ?>
   	<div class="toolbar-icon clickable">
     <a href="javascript:void(0);" data-type="dialog" data-name="<?php echo lang('MENU_'.$attr_tmp_view) ?>" data-method="<?php echo $attr_tmp_view ?>">
-		  <img src="<?php  echo $image_dir ?>icon/<?php echo $attr_tmp_view ?>.png" title="<?php echo lang('MENU_'.$attr_tmp_view) ?>" />
+		  <img src="<?php  echo $image_dir ?>icon/<?php echo $attr_tmp_view ?>.png" title="<?php echo lang('MENU_'.$attr_tmp_view.'_DESC') ?>" /> <?php echo lang('MENU_'.$attr_tmp_view) ?>
 		</a>
   </div>
 		<?php } ?>
diff --git a/themes/default/include/html/window-end.inc.php b/themes/default/include/html/window-end.inc.php
@@ -1,25 +0,0 @@
-<?php if (false) { ?>
-</div>
-</div>
-
-<div class="bottom">
-
-	<div class="status">
-	</div>
-	<div class="command">
-	<input type="button" value="<?php echo lang('OK') ?>" onclick="formSubmit( $(this),'<?php echo $view ?>');" />
-	<input type="cancel" value="<?php echo lang('CANCEL') ?>" />
-	</div>
-
-</div>
-
-</div>
-
-<?php if ($showDuration)
-      { ?>
-<br/>
-<center><small>&nbsp;
-<?php $dur = time()-START_TIME;
-      echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center>
-<?php } ?>
-<?php } ?>-
\ No newline at end of file
diff --git a/themes/default/include/html/window.inc.php b/themes/default/include/html/window.inc.php
@@ -1,111 +0,0 @@
-<?php if (false) { ?>
-<div class="window">
-
-<div class="title">
-		<?php $icon=$actionName; ?>
-		<img src="<?php echo $image_dir.'icon_'.$icon.IMG_ICON_EXT ?>" align="left" />
-		
-		<?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 } ?>
-  
-		<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); ?>
-			<a javascript:void(0);" onclick="javascript:loadViewByName('<?php echo $view ?>','<?php echo $url ?>'); return false; " 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
-		}
-		?>
-
-		
-		<?php ?>		
-    <?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
-          }
-     ?>
-    
-
-</div>
-
-<ul class="menu">
-<?php
-
-	if	( !isset($windowMenu) || !is_array($windowMenu) ) $windowMenu = array();
-    foreach( $windowMenu as $menu )
-          {
-          	$tmp_text = langHtml($menu['text']);
-          	$tmp_key  = strtoupper(langHtml($menu['key' ]));
-			$tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key));
-			if	( $tmp_pos !== false )
-				$tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1);
-
-			$liClass  = (isset($menu['url'])?'':'no').'action'.($this->subActionName==$menu['subaction']?' active':'');
-			$icon_url = $image_dir.'icon/'.$menu['subaction'].'.png';
-			
-			?><li class="<?php echo $liClass?>"><?php
-          	if	( isset($menu['url']) )
-          	{
-          		$link_url = Html::url($actionName,$menu['subaction'],$this->getRequestId() );
-          		?><a href="javascript:void(0);" onclick="javascript:loadSubaction(this,'<?php echo $actionName ?>','<?php echo $menu['subaction'] ?>','<?php echo $this->getRequestId() ?>'); return false; " accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>"><img src="<?php echo $icon_url ?>" /><?php echo $tmp_text ?></a><?php
-          	}
-          	else
-          	{
-          		?><span><img src="<?php echo $icon_url ?>" /><?php echo $tmp_text ?></span><?php
-          	}
-          }
-          	?></li><?php
-          if ( /* Deaktiviert */ false && @$conf['help']['enabled'] )
-          	{
-             ?><a class="help" href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo $image_dir.'icon/help.png' ?>" /><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php
-          	}
-          	?><?php
-	
-	
-	
-		?>
-</ul>
-		
-
-<!-- Hinweis-Meldungen -->
-
-<?php 		global $image_dir; 
-      if (isset($notices) && count($notices)>0 )
-      { ?>
-    	<dl class="notice">
-  <?php foreach( $notices as $notice_idx=>$notice ) { ?>
-    
-  <?php if ($notice['name']!='') { ?>
-    <dt><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?></dt>
-<?php } ?>
-  <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>
-  </dd>
-  
-  <?php } ?>
-    </dl>
-  
-<?php } ?>
-
-<div class="content"><div class="filler">
-
-<?php } ?>-
\ No newline at end of file
diff --git a/themes/default/templates/folder/edit.tpl.src.xml b/themes/default/templates/folder/edit.tpl.src.xml
@@ -8,7 +8,7 @@
 					<!-- 
 					<text key="SELECT"></text>
 				 -->
-					<checkbox name="checkall" class="checkall" />
+					<checkbox name="checkall" />
 				</column>
 				<column class="help">
 					<text key="GLOBAL_TYPE"></text>