commit dccb71a887eedaedf2f2813bfc9beec60574a211
parent a988a2de28758ef9cbb32c0a455997f6769493ac
Author: Jan Dankert <devnull@localhost>
Date: Mon, 15 Oct 2012 23:08:28 +0200
Konzept der modalen Ansicht verändert: Die div.bar-Elemente können selber modal werden (kann man ggf. woanders nochmal verwenden).
Diffstat:
9 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/config/config-default.php b/config/config-default.php
@@ -315,8 +315,7 @@ $conf['interface']['min_width']= 950;
$conf['interface']['redirect']=false;
$conf['interface']['human_date_format']=false;
$conf['interface']['style'] = array();
-$conf['interface']['style']['default']="default";
-$conf['interface']['style']['default']='system';
+$conf['interface']['style']['default']='modern';
$conf['interface']['config'] = array();
$conf['interface']['config']['file_manager_url']="";
$conf['interface']['config']['enable']=true;
@@ -795,13 +794,13 @@ $conf['security']['user']['show_mail']=true;
$conf['security']['user']['send_message']=true;
$conf['style'] = array();
-$conf['style']['default']=array();
-$conf['style']['default']['name']='Earl grey';
-$conf['style']['default']['title_background_color']='grey';
-$conf['style']['default']['title_text_color']='white';
-$conf['style']['default']['text_color'] ='black';
-$conf['style']['default']['background_color'] = '#d9d9d9';
-$conf['style']['default']['inactive_background_color'] = 'silver';
+$conf['style']['grey']=array();
+$conf['style']['grey']['name']='Earl grey';
+$conf['style']['grey']['title_background_color']='grey';
+$conf['style']['grey']['title_text_color']='white';
+$conf['style']['grey']['text_color'] ='black';
+$conf['style']['grey']['background_color'] = '#d9d9d9';
+$conf['style']['grey']['inactive_background_color'] = 'silver';
$conf['style']['system']=array();
$conf['style']['system']['name']='System colors';
@@ -812,7 +811,7 @@ $conf['style']['system']['background_color'] = 'Background';
$conf['style']['system']['inactive_background_color'] = 'WindowFrame';
$conf['style']['modern']=array();
-$conf['style']['modern']['name']='Modern Style';
+$conf['style']['modern']['name']='Blue sky';
$conf['style']['modern']['title_background_color']='#3F6194';
$conf['style']['modern']['title_text_color']='white';
$conf['style']['modern']['text_color'] ='black';
diff --git a/functions/common.inc.php b/functions/common.inc.php
@@ -152,7 +152,7 @@ function css_link( $name='default' )
// Falls Style-Konfiguration unbekannt, dann Fallback auf default.
if ( ! isset($conf['style'][$name]))
- $name = 'default';
+ $name = $conf['interface']['style']['default'];
return OR_THEMES_EXT_DIR.'default/css/openrat.css.php?'.encode_array($conf['style'][$name]);
diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php
@@ -1299,20 +1299,30 @@ div#filler
opacity: 0.5;
}
-div#workbench > div.bar.modaldialog
+div#workbench > div.bar.modal
{
- width:60%;
- position:absolute;
- top:0;
- left:0;
+
+ /*width:60%;*/
+ position:relative;
+ xtop:0;
+ xleft:0;
+
z-index: 101;
- opacity: 1;
+
+ border:1px solid <?php echo $_GET['text_color']; ?> !important;
+ /*
border:3px solid <?php echo $_GET['text_color']; ?> !important;
background-color:<?php echo $_GET['title_text_color']; ?> !important;
+ */
+ /*
+
margin:5% 20% !important;
- -webkit-box-shadow: 20px 20px 20px <?php echo $_GET['text_color']; ?>;
- -moz-box-shadow: 20px 20px 20px <?php echo $_GET['text_color']; ?>;
- box-shadow: 20px 20px 20px <?php echo $_GET['text_color']; ?>;
+ */
+
+ -webkit-box-shadow: 0px 0px 40px <?php echo $_GET['text_color']; ?>;
+ -moz-box-shadow: 0px 0px 40px <?php echo $_GET['text_color']; ?>;
+ box-shadow: 0px 0px 40px <?php echo $_GET['text_color']; ?>;
+
}
diff --git a/themes/default/images/icon/open.gif b/themes/default/images/icon/open.gif
Binary files differ.
diff --git a/themes/default/images/icon/password.png b/themes/default/images/icon/password.png
Binary files differ.
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -87,6 +87,7 @@ function refreshWorkbench()
// Modale Dialoge beenden
$('div.modaldialog').fadeOut(500);
+ $('div#workbench').removeClass('modal');
$('div#filler').fadeOut(500);
// Default-Inhalte der einzelnen Views laden.
@@ -149,14 +150,11 @@ function refreshWorkbench()
//$('ul.views').sortable();
// Modalen Dialog erzeugen.
- if ( $('div#modalbar li.action').size() > 0 )
+ if ( $('div#workbench div.frame.modal').size() > 0 )
{
+ $('div#workbench div.frame.modal').parent().addClass('modal');
$('div#filler').fadeTo(500,0.5);
- $('div#modalbar').addClass('modaldialog');
- }
- else
- {
- $('div#modalbar').fadeOut(0);
+ $('div#workbench').addClass('modal');
}
diff --git a/themes/default/layout/perspective/header.php b/themes/default/layout/perspective/header.php
@@ -9,7 +9,7 @@ function view_header( $name )
?>
-<div id="<?php echo $name ?>" data-action="<?php echo $v['action'] ?>" class="frame <?php echo ($v['refreshable']?' refreshable':'') ?>">
+<div id="<?php echo $name ?>" data-action="<?php echo $v['action'] ?>" class="frame<?php echo ($v['refreshable']?' refreshable':'') ?><?php echo (@$v['modal']?' modal':'') ?>">
<div class="window">
<div class="menu">
diff --git a/themes/default/layout/perspective/login.ini.php b/themes/default/layout/perspective/login.ini.php
@@ -5,7 +5,11 @@ views=
[content]
-views=
+views=login,openid,register
+action=login
+refreshable=false
+default=login
+modal=true
[side]
views=license
@@ -17,8 +21,8 @@ default=license
[bottom]
views=
-[modal]
-views=login,openid,register
-action=login
-refreshable=false
-default=login
+;[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,8 +39,4 @@ view_header('bottom');
?>
</div>
-<div class="bar" id="modalbar">
-<?php
-view_header('modal');
-?>
</div>
