openrat-cms

commit 97dbf5aeda27778d1ef4870d6fd7d27bd6356b64
parent 375f64e9c5c1aa06d8d1a7ec43cf743c72d3b3c2
Author: dankert <dankert@laptop-jan>
Date:   Wed, 13 Mar 2013 20:53:37 +0100

Untermenü in den Views wird jetzt innerhalb der Views selbst rechts oben angezeigt.

Diffstat:
themes/default/css/openrat.css.php
 | 
12
++++++++++++
themes/default/include/html/header.inc.php
 | 
19
++++++-------------
themes/default/js/openrat.js
 | 
6
++++--

3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php
@@ -1435,6 +1435,18 @@ div.toolbar-icon:hover
 }
 
 
+div.headermenu
+{
+	margin:5px;
+	z-index: 3;
+	position: relative;
+	right: 0;
+	top: 0;
+}
+div.headermenu > div.toolbar-icon
+{
+	float:right;
+}
 
 
  /* Voreingestellte Schriftart */
diff --git a/themes/default/include/html/header.inc.php b/themes/default/include/html/header.inc.php
@@ -1,17 +1,11 @@
-<div class="header">
-  <?php if ($attr_back) { ?>
-  <a href="javascript:void(0);" onclick="javascript:refreshActualView(this);" class="back button">
-    <img src="<?php  echo $image_dir ?>icon/window/back.gif" />
-    <?php echo lang('BACK') ?>
-  </a>
-  <?php } ?><?php if(!empty($attr_views)) { ?>
-  <img src="<?php  echo $image_dir ?>icon/window/down.gif" />
+<?php if(!empty($attr_views)) { ?>
   <div class="headermenu">
     <?php foreach( explode(',',$attr_views) as $attr_tmp_view ) { ?>
-		<a href="javascript:void(0);" data-type="modal" data-method="<?php echo $attr_tmp_view ?>">
-		  <img src="<?php  echo $image_dir ?>icon/<?php echo $attr_tmp_view ?>.png" /><?php echo lang('MENU_'.$attr_tmp_view) ?>
+  	<div class="toolbar-icon clickable">
+    <a href="javascript:void(0);" data-type="dialog" 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) ?>" />
 		</a>
-    <?php } ?>
+  </div>
+		<?php } ?>
   </div>
 <?php } ?>
-</div>-
\ No newline at end of file
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -563,7 +563,9 @@ function registerViewEvents( viewEl )
 	$(viewEl).find('div.headermenu > a').each( function(idx,el)
 	{
 		// Jeden Untermenüpunkt zum Fenstermenü hinzufügen.
-		$(el).wrap('<div class="entry clickable modal perview" />').parent().appendTo( $(viewEl).closest('div.panel').find('div.header div.dropdown').first() );
+		
+		// Nein, Untermenüs erscheinen jetzt in der View selbst.
+		// $(el).wrap('<div class="entry clickable modal perview" />').parent().appendTo( $(viewEl).closest('div.panel').find('div.header div.dropdown').first() );
 	} );
 	
 	$(viewEl).find('div.header > a.back').each( function(idx,el)
@@ -571,7 +573,7 @@ function registerViewEvents( viewEl )
 		// Zurück-Knopf zum Fenstermenü hinzufügen.
 		$(el).removeClass('button').wrap('<div class="entry perview" />').parent().appendTo( $(viewEl).closest('div.panel').find('div.header div.dropdown').first() );
 	} );
-	$(viewEl).find('div.header').html('<!-- moved to window-menu -->');
+	//$(viewEl).find('div.header').html('<!-- moved to window-menu -->');
 	
 	$(viewEl).find('input,select,textarea').focus( function() {
 		$(this).closest('div.panel').find('div.command').css('visibility','visible').fadeIn('slow');