[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6823] Merge 6820:6822 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6823] Merge 6820:6822 from trunk |
|
Date: |
Fri, 21 Jan 2011 10:39:14 +0000 |
Revision: 6823
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6823
Author: sigurdne
Date: 2011-01-21 10:39:14 +0000 (Fri, 21 Jan 2011)
Log Message:
-----------
Merge 6820:6822 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-1_0-branch/booking/js/booking/schedule.js
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/invoice.xsl
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822
Modified: branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-01-21 10:31:42 UTC (rev 6822)
+++ branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-01-21 10:39:14 UTC (rev 6823)
@@ -146,7 +146,6 @@
$allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']."
".$_POST['from_'])-60*60*24*7);
$allocation['to_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday']." ".$_POST['to_'])-60*60*24*7);
}
-
$_POST['from_'] = $allocation['from_'];
$_POST['to_'] = $allocation['to_'];
@@ -156,7 +155,6 @@
{
$step++;
}
-
if (!$errors && $_POST['outseason'] != 'on' )
{
try {
@@ -222,7 +220,7 @@
array_set_default($allocation, 'building_name',
phpgw::get_var('building_name', 'GET'));
array_set_default($allocation, 'from_',
phpgw::get_var('from_', 'GET'));
array_set_default($allocation, 'to_',
phpgw::get_var('to_', 'GET'));
- $weekday =
strtolower(strftime("%A",strtotime($allocation['from_'][0])));
+ $weekday = phpgw::get_var('weekday', 'GET');
}
$this->flash_form_errors($errors);
Modified: branches/Version-1_0-branch/booking/js/booking/schedule.js
===================================================================
--- branches/Version-1_0-branch/booking/js/booking/schedule.js 2011-01-21
10:31:42 UTC (rev 6822)
+++ branches/Version-1_0-branch/booking/js/booking/schedule.js 2011-01-21
10:39:14 UTC (rev 6823)
@@ -201,7 +201,16 @@
_to = _to ? '%20' + _to: '';
var url = YAHOO.booking.newApplicationUrl;
var state = date.getFullYear() + '-' + (date.getMonth()+1) + '-' +
date.getDate();
- url += '&from_[]=' + state + _from + '&to_[]=' + state + _to +
'&resource=' + resource;
+ var day = date.getDay();
+ var weekday=new Array(7);
+ weekday[0]="sunday";
+ weekday[1]="monday";
+ weekday[2]="tuesday";
+ weekday[3]="wednesday";
+ weekday[4]="thursday";
+ weekday[5]="friday";
+ weekday[6]="saturday";
+ url += '&from_[]=' + state + _from + '&to_[]=' + state + _to +
'&resource=' + resource + '&weekday=' + weekday[day];
window.location.href = url;
}
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-01-21
10:31:42 UTC (rev 6822)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-01-21
10:39:14 UTC (rev 6823)
@@ -464,7 +464,7 @@
Confirm e-mail address booking no Bekreft e-postadressen
The e-mail addresses you entered do not match booking no E-postadressene
er ikke like
Lengt of shortname is to long, max 11 characters long booking no
Kortnavn er for langt, maks 11 tegn
-The organization number is wrong or not present booking no Det er
ikke registrert et organisjonsnummer på denne organisasjonen
+The organization number is wrong or not present booking no Det er
ikke registrert fakturainformasjon på denne organisasjonen
The resource number is wrong or not present booking no Det er ikke
registert et ressursnummer på denne organisasjonen
Recurring allocation booking no Gjenta tildelingen
weekday booking no Ukedag
Modified: branches/Version-1_0-branch/property/templates/base/invoice.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/invoice.xsl
2011-01-21 10:31:42 UTC (rev 6822)
+++ branches/Version-1_0-branch/property/templates/base/invoice.xsl
2011-01-21 10:39:14 UTC (rev 6823)
@@ -1183,7 +1183,7 @@
</xsl:when>
</xsl:choose>
<form name="form" method="post" action="{form_action}">
- <table cellpadding="0" cellspacing="0" width="100%">
+ <table cellpadding="0" cellspacing="0" width="100%" >
<xsl:choose>
<xsl:when test="msgbox_data != ''">
<tr>
@@ -1201,7 +1201,7 @@
<td class="th_text" align = "left"
valign="top" style="white-space: nowrap;">
<xsl:value-of
select="php:function('lang', 'approve')" />
</td>
- <td class="th_text" valign="top">
+ <td class="th_text" valign="top" align="left">
<select name="values[approve]" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'grant')" />
@@ -1218,7 +1218,7 @@
<td class="th_text" align = "left"
valign="top" style="white-space: nowrap;">
<xsl:value-of
select="php:function('lang', 'voucher process code')" />
</td>
- <td class="th_text" valign="top">
+ <td align="left" class="th_text" valign="top">
<select
name="values[process_code]" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'voucher process code')" />
@@ -1234,7 +1234,7 @@
<td class="th_text" align = "left"
valign="top" style="white-space: nowrap;">
<xsl:value-of
select="php:function('lang', 'order id')" />
</td>
- <td class="th_text" valign="top">
+ <td align="left" class="th_text"
valign="top">
<input type="text"
name="values[order_id]" value="{order_id}">
<xsl:attribute
name="size">
<xsl:text>20</xsl:text>
@@ -1249,7 +1249,7 @@
<td class="th_text" align = "left"
valign="top" style="white-space: nowrap;">
<xsl:value-of
select="php:function('lang', 'voucher process log')" />
</td>
- <td>
+ <td align="left">
<textarea cols="60" rows="10"
name="values[process_log]" wrap="virtual">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'voucher process log')" />
@@ -1279,7 +1279,7 @@
<td class="th_text" align = "left"
valign="top" style="white-space: nowrap;">
<xsl:value-of
select="php:function('lang', 'amount')" />
</td>
- <td class="th_text" valign="top">
+ <td align="left" class="th_text"
valign="top">
<input type="text"
name="values[split_amount]">
<xsl:attribute
name="size">
<xsl:text>20</xsl:text>
Modified:
branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
2011-01-21 10:31:42 UTC (rev 6822)
+++ branches/Version-1_0-branch/property/templates/base/project_group_form.xsl
2011-01-21 10:39:14 UTC (rev 6823)
@@ -14,11 +14,11 @@
</script>
<tr>
- <td valign="top">
+ <td align="left" valign="top">
<a href="javascript:project_group_lookup()"
title="{lang_select_project_group_help}" ><xsl:value-of
select="lang_project_group"/>
</a>
</td>
- <td>
+ <td align="left" >
<input size="9" type="text"
name="project_group" value="{value_project_group}">
<xsl:attribute name="title">
<xsl:value-of
select="lang_select_project_group_help"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6823] Merge 6820:6822 from trunk,
Sigurd Nes <=