[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8155] Merge 8151:8154 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8155] Merge 8151:8154 from trunk |
|
Date: |
Mon, 21 Nov 2011 23:24:42 +0000 |
Revision: 8155
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8155
Author: sigurdne
Date: 2011-11-21 23:24:41 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Merge 8151:8154 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
branches/Version-1_0-branch/booking/templates/base/allocation.xsl
branches/Version-1_0-branch/booking/templates/base/booking.xsl
branches/Version-1_0-branch/booking/templates/base/building.xsl
branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
branches/Version-1_0-branch/booking/templates/base/group.xsl
branches/Version-1_0-branch/booking/templates/base/organization.xsl
branches/Version-1_0-branch/booking/templates/base/resource.xsl
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
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,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150
+
/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,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2011-11-21 23:24:41 UTC (rev 8155)
@@ -63,7 +63,7 @@
target_not_selected activitycalendarfrontend no Målgruppe må
velges!
district_not_selected activitycalendarfrontend no Distrikt må
velges!
org_helptext activitycalendarfrontend no Velg organisasjon
aktiviteten skal knyttes til i nedtrekksmenyen, du kan søke ved å skrive inn
navnet.<br/>Dersom din organisasjon ikke finnes, velg "Ny organisasjon" og fyll
ut feltene som vises under.
-group_helptext activitycalendarfrontend no Om aktiviteten skal
knyttes til en spesiell gruppe/lag velger du det her.<br/>Dersom gruppen/laget
ikke finnes, velg "Ny gruppe" og fyll ut feltene som vises under. Du trenger
ikke velge en gruppe.
+group_helptext activitycalendarfrontend no Dersom aktiviteten skal
registreres med andre kontaktpersoner og beskrivelse, kan du gjøre det ved å
velge «Ny gruppe» og fylle ut feltene under.<br/>Du kan også velge en
eksisterende gruppe/lag fra listen, eller ikke velge en gruppe/lag.<br/>Ønsker
du å redigere/endre eksisterende informasjonen om organisasjon eller
beskrivelse,<br/>vil du etter at du har valgt Lagre-knappen få opp et nytt
bilde hvor du du kan velge Rediger.
criteria_label activitycalendarfrontend no Valgkriterier/søkeord i
portalen
criteria_helptext activitycalendarfrontend no Feltene må
fylles ut for at aktiviteten skal komme frem i søk i portalen, koder for
kategori og målgruppe hentes fra booking.
what activitycalendarfrontend no HVA
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2011-11-21 20:25:58 UTC (rev 8154)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2011-11-21 23:24:41 UTC (rev 8155)
@@ -276,7 +276,6 @@
</dt>
<?php if($new_organization){?>
<input type="hidden"
name="organization_id" id="organization_id" value="new_org" />
- <div id="new_org_fields">
<dt><label
for="orgname">Organisasjonsnavn</label></dt>
<dd><input type="text"
name="orgname"/></dd>
<dt><label
for="orgno">Organisasjonsnummer</label></dt>
@@ -307,7 +306,6 @@
<input type="text"
name="postaddress"/></dd>
<dt><label
for="org_description">Beskrivelse</label></dt>
<dd><textarea rows="10"
cols="100" name="org_description"></textarea></dd>
- </div>
<hr/>
<b>Kontaktperson 1</b><br/>
<dt><label
for="contact1_name">Navn</label>
@@ -362,13 +360,6 @@
<dd><?php echo
isset($contact2)?$contact2->get_phone():''?></dd>
<dt><label
for="contact2_mail">E-post</label></dt>
<dd><?php echo
isset($contact2)?$contact2->get_email():''?></dd>
- <dt><label
for="contact2_address">Adresse</label></dt>
- <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
- <div
id="contact2_address_container"></div><br/>
- <label
for="contact2_number">Nummer</label>
- <input type="text"
name="org_contact2_number"/><br/>
- <label
for="contact2_postaddress">Postnummer og Sted</label>
- <input type="text"
name="org_contact2_postaddress"/></dd>
<hr/>
<?php }?>
<?php if(!$new_organization){?>
@@ -385,35 +376,35 @@
<?php }?>
</select>
</dd>
- <div id="new_group_fields" style="display:
none;">
- <dt><label
for="groupname">Gruppenavn</label></dt>
+ <span id="new_group_fields" style="display:
none;">
+ <dt><label
for="groupname">Navn</label></dt>
<dd><input type="text"
name="groupname"/><br/></dd>
- <dt><label
for="group_description">Beskrivelse</label></dt>
+ <dt><label
for="group_description">Beskrivelse av aktiviteten</label></dt>
<dd><textarea rows="10" cols="100"
name="group_description"></textarea></dd>
- <hr/>
- <dt>Kontaktperson 1</dt>
- <dt><label for="contact1_name">Navn</label></dt>
- <dd><input type="text"
name="group_contact1_name" value="<?php echo
isset($contact1)?$contact1->get_name():''?>"/></dd>
- <dt><label
for="contact1_phone">Telefon</label></dt>
- <dd><input type="text"
name="group_contact1_phone" value="<?php echo
isset($contact1)?$contact1->get_phone():''?>"/></dd>
- <dt><label
for="contact1_mail">E-post</label></dt>
- <dd><input type="text"
name="group_contact1_mail" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"/></dd>
- <dt>Kontaktperson 2</dt>
- <dt><label for="contact2_name">Navn</label></dt>
- <dd><input type="text"
name="group_contact2_name" value="<?php echo
isset($contact2)?$contact2->get_name():''?>"/></dd>
- <dt><label
for="contact2_phone">Telefon</label></dt>
- <dd><input type="text"
name="group_contact2_phone" value="<?php echo
isset($contact2)?$contact2->get_phone():''?>"/></dd>
- <dt><label
for="contact2_mail">E-post</label></dt>
- <dd><input type="text"
name="group_contact2_mail" value="<?php echo
isset($contact2)?$contact2->get_email():''?>"/></dd>
- <dt><label
for="contact2_address">Adresse</label></dt>
- <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()" />
- <div id="contact2_address_container"></div><br/>
- <label for="contact2_number">Nummer</label>
- <input type="text"
name="group_contact2_number"/><br/>
- <label for="contact2_postaddress">Postnummer og
Sted</label>
- <input type="text"
name="group_contact2_postaddress"/></dd>
- <hr/>
- </div>
+ <hr/>
+ <dt>Kontaktperson 1</dt>
+ <dt><label
for="contact1_name">Navn</label></dt>
+ <dd><input type="text"
name="group_contact1_name" value="<?php echo
isset($contact1)?$contact1->get_name():''?>"/></dd>
+ <dt><label
for="contact1_phone">Telefon</label></dt>
+ <dd><input type="text"
name="group_contact1_phone" value="<?php echo
isset($contact1)?$contact1->get_phone():''?>"/></dd>
+ <dt><label
for="contact1_mail">E-post</label></dt>
+ <dd><input type="text"
name="group_contact1_mail" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"/></dd>
+ <dt>Kontaktperson 2</dt>
+ <dt><label
for="contact2_name">Navn</label></dt>
+ <dd><input type="text"
name="group_contact2_name" value="<?php echo
isset($contact2)?$contact2->get_name():''?>"/></dd>
+ <dt><label
for="contact2_phone">Telefon</label></dt>
+ <dd><input type="text"
name="group_contact2_phone" value="<?php echo
isset($contact2)?$contact2->get_phone():''?>"/></dd>
+ <dt><label
for="contact2_mail">E-post</label></dt>
+ <dd><input type="text"
name="group_contact2_mail" value="<?php echo
isset($contact2)?$contact2->get_email():''?>"/></dd>
+ <dt><label
for="contact2_address">Adresse</label></dt>
+ <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()" />
+ <div
id="contact2_address_container"></div><br/>
+ <label
for="contact2_number">Nummer</label>
+ <input type="text"
name="group_contact2_number"/><br/>
+ <label
for="contact2_postaddress">Postnummer og Sted</label>
+ <input type="text"
name="group_contact2_postaddress"/></dd>
+ <hr/>
+ </span>
<?php }?>
<div class="form-buttons">
<input type="submit"
name="save_activity" value="<?php echo lang('save_activity') ?>"
onclick="return allOK();"/>
Modified: branches/Version-1_0-branch/booking/templates/base/allocation.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/allocation.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/allocation.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -7,7 +7,7 @@
<xsl:value-of select="php:function('lang', 'Allocations')"
/>
</a>
</li>
- <li><a href=""><xsl:value-of
select="allocation/organization_name"/></a></li>
+ <li><xsl:value-of select="allocation/organization_name"/></li>
</ul>
<xsl:call-template name="msgbox"/>
Modified: branches/Version-1_0-branch/booking/templates/base/booking.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/booking.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/booking.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -2,7 +2,7 @@
<div id="content">
<ul class="pathway">
<li><a href="{booking/bookings_link}"><xsl:value-of
select="php:function('lang', 'Bookings')" /></a></li>
- <li><a href="">#<xsl:value-of select="booking/id"/> (<xsl:value-of
select="booking/activity_name"/>)</a></li>
+ <li>#<xsl:value-of select="booking/id"/> (<xsl:value-of
select="booking/activity_name"/>)</li>
</ul>
<xsl:call-template name="msgbox"/>
Modified: branches/Version-1_0-branch/booking/templates/base/building.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/building.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/building.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -8,10 +8,8 @@
</a>
</li>
<li>
- <a>
- <xsl:attribute name="href"><xsl:value-of
select="building/building_link"/></xsl:attribute>
+
<xsl:value-of select="building/name"/>
- </a>
</li>
</ul>
Modified: branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/event_edit.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -2,7 +2,7 @@
<div id="content">
<ul class="pathway">
<li><xsl:value-of select="php:function('lang', 'Events')" /></li>
- <li><a href="">#<xsl:value-of select="event/id"/></a></li>
+ <li>#<xsl:value-of select="event/id"/></li>
</ul>
<xsl:call-template name="msgbox"/>
<xsl:call-template name="yui_booking_i18n"/>
Modified: branches/Version-1_0-branch/booking/templates/base/group.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/group.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/group.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -15,9 +15,7 @@
</li>
<li><xsl:value-of select="php:function('lang', 'Group')" /></li>
<li>
- <a href="">
<xsl:value-of select="group/name"/>
- </a>
</li>
</ul>
<xsl:call-template name="msgbox"/>
Modified: branches/Version-1_0-branch/booking/templates/base/organization.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/organization.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/organization.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -9,9 +9,7 @@
</a>
</li>
<li>
- <a href="">
<xsl:value-of select="organization/name"/>
- </a>
</li>
</ul>
<dl class="proplist-col">
Modified: branches/Version-1_0-branch/booking/templates/base/resource.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/resource.xsl
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/booking/templates/base/resource.xsl
2011-11-21 23:24:41 UTC (rev 8155)
@@ -15,9 +15,7 @@
</li>
<li><xsl:value-of select="php:function('lang', 'Resources')"
/></li>
<li>
- <a href="">
<xsl:value-of select="resource/name"/>
- </a>
</li>
</ul>
<xsl:call-template name="msgbox"/>
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-11-21 20:25:58 UTC (rev 8154)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2011-11-21 23:24:41 UTC (rev 8155)
@@ -458,7 +458,7 @@
&& $category['location_level'] > 0)
{
$access_location =
$this->bocommon->get_location_list(PHPGW_ACL_READ);
- $filtermethod = " $where {$entity_table}.loc1
IN ('" . implode("','", $access_location) . "')";
+ $filtermethod .= " $where {$entity_table}.loc1
IN ('" . implode("','", $access_location) . "')";
$where= 'AND';
}
@@ -480,7 +480,7 @@
}
else
{
- $filtermethod = " $where
$entity_table.user_id=$filter ";
+ $filtermethod .= " $where
$entity_table.user_id=$filter ";
$where= 'AND';
}
@@ -671,7 +671,7 @@
{
$cache_info = array();
}
-
+//_debug_array($_sql);die();
// if(!$cache_info)
{
$sql_cnt = "SELECT DISTINCT fm_bim_item.id " .
substr($_sql,strripos($_sql,'FROM'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8155] Merge 8151:8154 from trunk,
Sigurd Nes <=