openrat-cms

commit 35c7843de89c2a2bec74fefd97c09d38a099785f
parent 439c84dd9e57a475baec6955be244af16e402cd7
Author: Jan Dankert <devnull@localhost>
Date:   Thu, 20 Sep 2012 23:35:12 +0200

Modale Dialoge, Fenster-Kontextmenü.

Diffstat:
themes/default/css/layout.css
 | 
35
++++++++++++++++++++++++-----------
themes/default/css/user/default.css
 | 
2
+-
themes/default/js/openrat.js
 | 
16
++++++++++++++++
themes/default/layout/index.php
 | 
3
---
themes/default/layout/perspective/header.php
 | 
16
+++++++++++++++-
themes/default/layout/perspective/login.ini.php
 | 
6
++++++
themes/default/layout/perspective/normal.php
 | 
5
+++++

7 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/themes/default/css/layout.css b/themes/default/css/layout.css
@@ -265,22 +265,33 @@ div.dropdown
 	z-index:2;
 	display:none;
 	position: absolute;
-	padding:10px;
+	padding:5px 0px;
 }
 
+div.dropdownalignright
+{
+	right:0;
+}
 
 div.dropdown > a
 {
 	display:block;
 }
-div.dropdown part.entry:hover
+div.dropdown div.entry:hover,
+div.dropdown div.entry:hover > a
 {
 	background-color:silver;
 }
+div.dropdown div.entry
+{
+	padding:2px 5px;
+}
+
 
 /*Dropdown anzeigen!!!*/
 div#title div:hover div.dropdown,
-div.window div.header:hover div.dropdown
+div.window div.header:hover div.dropdown,
+div.icon:hover > div.dropdown
 {
 	display:block;
 }
@@ -703,7 +714,8 @@ ul.tree ul
 	margin-left:18px;
 }
 
-div.entry.selected
+div.entry.selected,
+div.dropdown > div.entry:hover
 {
 	/*border:1px solid black;*/
 	background-color:silver;
@@ -1251,17 +1263,18 @@ div#filler
 	opacity: 0.5;
 }
 
-div#modaldialog
+div.modaldialog
 {
 	xxxxdisplay: block;
 	position:absolute;
-	z-index: 198;
+	z-index: 101;
 	top: 0;
 	left: 0;
 	opacity: 1;
-	margin:10%;
-	height:60%;
-	width:80%;
-	border:5px solid black;
-	background-color:white;
+	xxxxmargin:10%;
+	xxxxheight:60% !important;
+	width:60% !important;
+	border:5px solid black !important;
+	background-color:white !important;
+	margin:0px auto !important;
 } 
\ No newline at end of file
diff --git a/themes/default/css/user/default.css b/themes/default/css/user/default.css
@@ -310,7 +310,7 @@ div.dropdown a
 /*   D r o p d o w n  -  M e n u e s  */
 div.dropdown
 {
-	/* Schatten */	
+	/* Schatten */
 	-webkit-box-shadow: 3px 2px 10px gray;
     -moz-box-shadow: 3px 2px 10px gray;
     box-shadow: 3px 2px 10px gray;
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -84,6 +84,10 @@ function refreshWorkbench()
 
 		// View-Größe initial berechnen.
 		resizeWorkbench();
+		
+		// Modale Dialoge beenden
+		$('div.modaldialog').fadeOut(500);
+		$('div#filler').fadeOut(500);
 
 		// Default-Inhalte der einzelnen Views laden.
 		$(this).fadeIn(750).find('li.active').each( function() {
@@ -143,6 +147,18 @@ function refreshWorkbench()
 		
 		// geht nicht zusammen mit draggable...
 		//$('ul.views').sortable();
+
+		// Modalen Dialog erzeugen.
+		if	( $('div#modalbar li.action').size() > 0 )
+		{
+			$('div#filler').fadeTo(500,0.5);
+			$('div#modalbar').addClass('modaldialog');
+		}
+		else
+		{
+			$('div#modalbar').fadeOut(0);
+		}
+		
 		
 
 	});
diff --git a/themes/default/layout/index.php b/themes/default/layout/index.php
@@ -129,9 +129,6 @@ document.writeln("</div>");
 <div id="filler">
 </div>
 
-<div id="modaldialog" class="xinvisible">
-Test test test test
-</div>
 
 </body>
 </html>
diff --git a/themes/default/layout/perspective/header.php b/themes/default/layout/perspective/header.php
@@ -46,7 +46,21 @@ function view_header( $name )
 		?>
 </ul>
 <div class="icons">
-<div class="icon"><a href="javascript:void(0);" class="fullscreen" onClick="javascript:fullscreen( this );"><img class="icon" src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /></a></div>
+<div class="icon">
+
+<?php if (true || !empty($viewlist)) { /* Fenster-Menü anzeigen (sofern Views vorhanden) */ ?>
+<img class="icon" src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/menu.gif' ?>" />
+<div class="dropdown dropdownalignright">
+<div class="entry"><a href="javascript:void(0);" class="fullscreen" onClick="javascript:fullscreen( this );"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /><?php echo langHtml('window_fullscreen') ?></a></div>
+<?php 
+          if ( true || @$conf['help']['enabled'] )
+          	{
+             ?><div class="entry"><a href="<?php echo @$conf['help']['url'].@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php
+          	}
+          	?>
+</div>
+<?php } ?>
+</div>
 </div>
 </div>
  
diff --git a/themes/default/layout/perspective/login.ini.php b/themes/default/layout/perspective/login.ini.php
@@ -19,3 +19,9 @@ default=license
 
 [bottom]
 views=
+
+[modal]
+views=login,openid,register
+action=login
+refreshable=false
+default=login
diff --git a/themes/default/layout/perspective/normal.php b/themes/default/layout/perspective/normal.php
@@ -39,3 +39,8 @@ view_header('bottom');
 ?>
 </div>
 
+<div class="bar" id="modalbar">
+<?php 
+view_header('modal');
+?>
+</div>