[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6583] bkbooking: bugfix css on allocation and minor
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [6583] bkbooking: bugfix css on allocation and minor changes to event |
Date: |
Fri, 12 Nov 2010 09:44:39 +0000 |
Revision: 6583
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6583
Author: kjell
Date: 2010-11-12 09:44:38 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
bkbooking: bugfix css on allocation and minor changes to event
Modified Paths:
--------------
trunk/booking/inc/class.uievent.inc.php
trunk/booking/templates/base/css/base.css
Added Paths:
-----------
trunk/booking/templates/base/images/info.png
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2010-11-11 22:23:04 UTC (rev
6582)
+++ trunk/booking/inc/class.uievent.inc.php 2010-11-12 09:44:38 UTC (rev
6583)
@@ -253,7 +253,7 @@
public function add()
{
$errors = array();
- $event = array('customer_internal' => 1);
+ $event = array('customer_internal' => 0);
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -326,8 +326,11 @@
}
}
}
+ if ($_POST['cost'] != 0 and
!$event['customer_organization_number'] and !$event['customer_ssn']) {
+ $errors['invoice_data'] = lang('There
is set a cost, but no invoice data is filled inn');
+ }
- if(!$errors['event'] && !$errors['time'])
+ if(!$errors['event'] && !$errors['time'] &&
!$errors['invoice_data'] && !$errors['resource_number'] &&
!$errors['organization_number'])
{
if (!$_POST['application_id'])
{
@@ -473,7 +476,11 @@
$event['customer_organization_number']
= $_POST['customer_organization_number'];
}
- if(!$errors['event'] and
!$errors['resource_number'] and !$errors['organization_number'])
+ if ($_POST['cost'] != 0 and
!$event['customer_organization_number'] and !$event['customer_ssn']) {
+ $errors['invoice_data'] = lang('There
is set a cost, but no invoice data is filled inn');
+ }
+
+ if(!$errors['event'] and
!$errors['resource_number'] and !$errors['organization_number'] and
!$errors['invoice_data'])
{
if (phpgw::get_var('mail', 'POST'))
{
Modified: trunk/booking/templates/base/css/base.css
===================================================================
--- trunk/booking/templates/base/css/base.css 2010-11-11 22:23:04 UTC (rev
6582)
+++ trunk/booking/templates/base/css/base.css 2010-11-12 09:44:38 UTC (rev
6583)
@@ -93,11 +93,17 @@
padding-bottom: 2em;
}
-/* ie fix. autocomplete dropdown is displayed behind some elements if the
z-index is not set */
div.autocomplete {
- z-index: 500;
position: relative;
}
+/* ie fix. autocomplete dropdown is displayed behind some elements if the
z-index is not set */
+div.autocomplete input {
+ z-index: 500;
+}
+/* ie fix. autocomplete dropdown is displayed behind some elements if the
z-index is not set */
+#building_container ul {
+ z-index: 1000;
+}
dl.form dt.heading, dl.form-col dt.heading, dl.form-2col dt.heading,
div.heading,
dl.proplist dt.heading, dl.proplist-col dt.heading {
@@ -274,3 +280,10 @@
.yui-skin-sam .yui-dt TABLE TD{
border: none !important;
}
+
+div.info:hover {
+ background-image: url(../images/info.png);
+ background-repeat: no-repeat;
+ background-position: 100% 0%;
+}
+
Added: trunk/booking/templates/base/images/info.png
===================================================================
(Binary files differ)
Property changes on: trunk/booking/templates/base/images/info.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6583] bkbooking: bugfix css on allocation and minor changes to event,
Kjell Arne Espedal <=