commit 3ed373180dc1d700d91a814f9c3be86b19c8875d
parent dfd7713d80799d2d124458b97ac0177630938b9b
Author: Jan Dankert <devnull@localhost>
Date: Tue, 18 Sep 2012 01:55:59 +0200
Layout etwas verändert: Rahmen um div.bar.
Diffstat:
5 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/themes/default/css/layout.css b/themes/default/css/layout.css
@@ -499,14 +499,6 @@ table.main
}
-/* Eingabefelder */
-div.window input.text,
-div.window textarea
-{
- border:2px solid;
- padding:2px;
-}
-
div.window input.checkbox,
div.window input.radio
@@ -1018,6 +1010,14 @@ body
div#workbench > div.bar
{
float:left;
+
+ border:1px solid gray;
+ margin:3px;
+ padding:0px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ -khtml-border-radius:5px;
+ border-radius:5px;
}
div#workbench > div.bar
diff --git a/themes/default/css/user/default.css b/themes/default/css/user/default.css
@@ -68,26 +68,40 @@ div.inputholder
border:1px solid grey;
margin:0px;
padding:4px;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- -khtml-border-radius:5px;
- border-radius:5px;
+ -moz-border-radius:3px;
+ -webkit-border-radius:3px;
+ -khtml-border-radius:3px;
+ border-radius:3px;
}
-input
+input,
+textarea,
+select
{
border:0px;
border-bottom:1px solid silver;
padding:2px;
margin:0px;
+ background-color:white;
}
+
input.error,
-.error
+textarea.error,
+select.error
{
- border-bottom:1px dotted red !important;
+ border-bottom:1px dotted black !important;
}
+div.inputholder.error
+{
+ border:1px solid red !important;
+}
+
+input.hint
+{
+ color:grey;
+}
/* Zwischen-Ueberschriften */
fieldset
diff --git a/themes/default/include/html/password.inc.php b/themes/default/include/html/password.inc.php
@@ -1 +1 @@
-<input type="password" name="<?php echo $attr_name ?>" id="id_<?php echo $attr_name ?>" size="<?php echo $attr_size ?>" maxlength="<?php echo $attr_maxlength ?>" class="<?php echo $attr_class ?>" value="<?php if (count($errors)==0) echo isset($$attr_name)?$$attr_name:$attr_default ?>" <?php if (in_array($attr_name,$errors)) echo 'style="border:2px dashed red;"' ?> />-
\ No newline at end of file
+<div class="inputholder"><input type="password" name="<?php echo $attr_name ?>" id="id_<?php echo $attr_name ?>" size="<?php echo $attr_size ?>" maxlength="<?php echo $attr_maxlength ?>" class="<?php echo $attr_class ?>" value="<?php if (count($errors)==0) echo isset($$attr_name)?$$attr_name:$attr_default ?>" <?php if (in_array($attr_name,$errors)) echo 'style="border:2px dashed red;"' ?> /></div>+
\ No newline at end of file
diff --git a/themes/default/include/html/selectbox.inc.php b/themes/default/include/html/selectbox.inc.php
@@ -14,7 +14,7 @@ if ( $attr_addempty!==FALSE )
else
$attr_tmp_list = array(''=>'- '.lang($attr_addempty).' -')+$attr_tmp_list;
}
-?><select<?php if ($attr_readonly) echo ' disabled="disabled"' ?> id="id_<?php echo $attr_name ?>" name="<?php echo $attr_name; if ($attr_multiple) echo '[]'; ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php
+?><div class="inputholder"><select<?php if ($attr_readonly) echo ' disabled="disabled"' ?> id="id_<?php echo $attr_name ?>" name="<?php echo $attr_name; if ($attr_multiple) echo '[]'; ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php
if (count($$attr_list)<=1) echo ' disabled="disabled"';
if ($attr_multiple) echo ' multiple="multiple"';
if (in_array($attr_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
@@ -51,7 +51,7 @@ echo ' size="'.intval($attr_size).'"';
echo '>'.$box_value.'</option>';
}
-?></select><?php
+?></select></div><?php
if (count($$attr_list)==0) echo '<input type="hidden" name="'.$attr_name.'" value="" />';
if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />';
}
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -331,6 +331,9 @@ function loadView(jo, url )
};
//$(jo).find('.htmleditor').wymeditor(wymSettings);
resizeWorkbench();
+
+ $(jo).find('input[data-hint]').orHint();
+
});
}
@@ -349,6 +352,8 @@ function registerHeaderEvents()
$('div.search input').orSearch( { dropdown:'div.search div.dropdown' } );
+ /*
+ *
// V e r l a u f
$('div#header div.history').hover( function(){
$('div#header div.history div.dropdown').html('');
@@ -364,9 +369,8 @@ function registerHeaderEvents()
} } );
$('div#header div.history div.dropdown').fadeIn();
});
-
-
-
+ */
+
/*
$base = defined('OR_BASE_URL')?slashify(OR_BASE_URL).'editor/editor/':'./editor/editor/';
@@ -1000,13 +1004,13 @@ function resizeWorkbench()
// OpenRat-spezifische Ermittlung der einzelnen DIV-Größen
var titleBarHeight = 80; // Title:35px
- var viewBorder = 37; // Padding 2x6px, View-Kopf:20px
+ var viewBorder = 40; // Padding 2x6px, View-Kopf:20px
var singleHeight = viewportHeight - titleBarHeight - viewBorder;
var upperHeight = Math.ceil((viewportHeight - titleBarHeight - viewBorder)*(2/3));
var lowerHeight = viewportHeight - upperHeight - titleBarHeight - (2*viewBorder);
var outerWidth = Math.ceil((viewportWidth)*(1/4));
- var innerWidth = viewportWidth-(3*6)-(2*outerWidth);
+ var innerWidth = viewportWidth-(3*20)-(2*outerWidth);
$('div#workbench > div#navigationbar > div.frame > div.window').css('width',outerWidth+'px');
$('div#workbench > div#contentbar > div.frame > div.window').css('width',innerWidth+'px');
$('div#workbench > div#sidebar > div.frame > div.window').css('width',outerWidth+'px');
