[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7371] Merge 7367:7370 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7371] Merge 7367:7370 from trunk |
|
Date: |
Tue, 14 Jun 2011 06:25:00 +0000 |
Revision: 7371
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7371
Author: sigurdne
Date: 2011-06-14 06:25:00 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Merge 7367:7370 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/templates/base/application.xsl
branches/Version-1_0-branch/booking/templates/base/application_new.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,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366
+
/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,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-06-14 05:25:25 UTC (rev 7370)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-06-14 06:25:00 UTC (rev 7371)
@@ -344,7 +344,7 @@
search_for activitycalendar no Søk etter
activity_type activitycalendar no Aktivitetstype
all activitycalendar no Alle
-not_internal activitycalendar no Ikke intern
+not_internal activitycalendar no Ekstern
organization_id activitycalendar no Organisasjon ID
arena_type activitycalendar no Arenatype
internal_arena_id activitycalendar no Intern arena ID
@@ -377,4 +377,5 @@
mail_body_state_3 activitycalendar no Ditt tips er publisert
i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_4 activitycalendar no Ditt tips er behandlet
og publisert i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
-send_mail activitycalendar no Send e-post
\ No newline at end of file
+send_mail activitycalendar no Send e-post
+marked_as activitycalendar no Status
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2011-06-14 05:25:25 UTC (rev 7370)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2011-06-14 06:25:00 UTC (rev 7371)
@@ -42,6 +42,11 @@
sortable: true
},
{
+ key: "office",
+ label: "<?php echo lang('office') ?>",
+ sortable: true
+ },
+ {
key: "category",
label: "<?php echo lang('category') ?>",
sortable: true
@@ -171,7 +176,7 @@
<option value="4" ><?php echo lang('processed')
?></option>
<option value="5" ><?php echo lang('rejected')
?></option>
</select>
- <label class="toolbar_element_label"
for="ctrl_toggle_activity_district"><?php echo lang('district') ?></label>
+ <label class="toolbar_element_label"
for="ctrl_toggle_activity_district"><?php echo lang('office') ?></label>
<?php
$districts =
activitycalendar_soactivity::get_instance()->select_district_list();
?>
Modified: branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-06-14 05:25:25 UTC (rev 7370)
+++ branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-06-14 06:25:00 UTC (rev 7371)
@@ -413,10 +413,10 @@
{
$from_date = $_POST['from_'];
$to_date = $_POST['to_'];
- $step++;
if ($_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on' )
{
+
echo"<pre>single:";print_r($step);echo"\n";print_r($from_date);echo"\n";print_r($allocation);exit;
$err = $this->bo->so->check_for_booking($id);
if ($err)
{
@@ -430,6 +430,7 @@
}
else
{
+ $step++;
if ($_POST['recurring'] == 'on') {
$repeat_until =
strtotime($_POST['repeat_until'])+60*60*24;
}
@@ -444,6 +445,7 @@
$i = 0;
// calculating valid and invalid dates
from the first booking's to-date to the repeat_until date is reached
// the form from step 1 should validate
and if we encounter any errors they are caused by double bookings.
+
while (($max_dato+($interval*$i)) <=
$repeat_until)
{
$fromdate = date('Y-m-d H:i',
strtotime($_POST['from_']) + ($interval*$i));
@@ -452,7 +454,15 @@
$allocation['to_'] = $todate;
$id = $this->bo->so->get_allocation_id($allocation);
- $err = $this->bo->so->check_for_booking($id);
+ if ($id)
+ {
+ $err =
$this->bo->so->check_for_booking($id);
+ }
+ else
+ {
+ $err = true;
+ }
+
if ($err)
{
$invalid_dates[$i]['from_'] = $fromdate;
@@ -464,7 +474,8 @@
$valid_dates[$i]['to_']
= $todate;
if ($step == 3)
{
- $stat = $this->bo->so->delete_allocation($id);
}
+ $stat = $this->bo->so->delete_allocation($id);
+ }
}
$i++;
}
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-06-14
05:25:25 UTC (rev 7370)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-06-14
06:25:00 UTC (rev 7371)
@@ -476,7 +476,7 @@
Recurring booking booking no Gjenta booking
Repeat until booking no Gjenta til
Bookings that can be created booking no Bookinger som kan lages
-Bookings and allocations booking no Bookinger og tildelinger
+Bookings and allocations booking no Kalender-ukeplan
Send warning to building responsible booking no Send e-post til
ansvarlig på bygget
Optional e-mail adress booking no Valgfri e-post adresse
Message about new event booking no Melding om nytt arrangement
@@ -518,3 +518,4 @@
Backend booking no Backend
Documentation booking no Dokumentasjon
Upload manual booking no Last opp dokumentasjon
+Are you sure you want to delete? booking no Er du sikker på at
søknad skal avvises?
Modified: branches/Version-1_0-branch/booking/templates/base/application.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/application.xsl
2011-06-14 05:25:25 UTC (rev 7370)
+++ branches/Version-1_0-branch/booking/templates/base/application.xsl
2011-06-14 06:25:00 UTC (rev 7371)
@@ -274,7 +274,7 @@
<dt>
<form method="POST">
<input type="hidden"
name="status" value="REJECTED"/>
- <input type="submit"
value="{php:function('lang', 'Reject application')}">
+ <input onclick="return
confirm('{php:function('lang', 'Are you sure you want to delete?')}')"
type="submit" value="{php:function('lang', 'Reject application')}">
<xsl:if
test="not(application/case_officer)">
<xsl:attribute name="disabled">disabled</xsl:attribute>
</xsl:if>
Modified: branches/Version-1_0-branch/booking/templates/base/application_new.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/application_new.xsl
2011-06-14 05:25:25 UTC (rev 7370)
+++ branches/Version-1_0-branch/booking/templates/base/application_new.xsl
2011-06-14 06:25:00 UTC (rev 7371)
@@ -16,7 +16,12 @@
<div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
<dt>
<label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
- <p>Velg en aktivitet fra listsen. Finner du
ikke eksakt din aktivitet, velger du hovedaktivitet, for eksempel idrett eller
kultur.</p>
+ <p>Informasjon om aktiviteten/arrangementet
+ Gi en kort beskrivelse av arrangementet
/aktiviteten.
+ For åpne arrangement, aktiviteter og trening i
regi av
+ organisasjoner og klubber vises denne
informasjonen på internett.
+ For faste aktiviteter oppgi intervall og til
dato,
+ f.eks. torsdager kl.19-20 frem til 23/6.</p>
</dt>
<dd>
<select name="activity_id" id="field_activity">
@@ -92,7 +97,7 @@
</dl>
<dl class="form-col">
<div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- <p>Velg fra dato og angi fra klokkeslett. Velg til dato
og angi klokkeslett. Dato velges fra kalender. Klokkeslett angis med
timer:minutter. Du kan søke om flere tider ved å velge Legg til dato.</p>
+ <p>Velg fra dato og angi fra klokkeslett. Velg til dato
og angi klokkeslett. Dato velges fra kalender. Klokkeslett angis med
timer:minutter. Du kan søke om flere tider ved å velge Legg til
dato. For søknad om fast tid i en gitt periode legg inn startdato og
klokkeslett for den første gangen her og oppgi intervall og
sluttdato i felt 1: "Informasjon om aktiviteten"</p>
<div id="dates-container">
<xsl:for-each select="application/dates">
<div class="date-container">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7371] Merge 7367:7370 from trunk,
Sigurd Nes <=