[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7344] bkbooking: bugfixes
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [7344] bkbooking: bugfixes |
|
Date: |
Mon, 06 Jun 2011 06:52:29 +0000 |
Revision: 7344
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7344
Author: kjell
Date: 2011-06-06 06:52:29 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
bkbooking: bugfixes
Modified Paths:
--------------
trunk/booking/inc/class.uievent.inc.php
trunk/booking/templates/base/group_edit.xsl
trunk/booking/templates/base/organization_edit.xsl
trunk/bookingfrontend/setup/phpgw_no.lang
trunk/phpgwapi/templates/bkbooking/css/frontend.css
trunk/phpgwapi/templates/bkbooking/head.inc.php
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2011-06-05 21:47:18 UTC (rev
7343)
+++ trunk/booking/inc/class.uievent.inc.php 2011-06-06 06:52:29 UTC (rev
7344)
@@ -579,7 +579,7 @@
{
$comment_text_log = phpgw::get_var('mail', 'POST');
$this->send_mailnotification($event['contact_email'], lang('Event changed'),
$comment_text_log);
- $comment =
$comment_text_log.' Denne er sendt til '.$event['contact_email'];
+ $comment =
$comment_text_log.'. Denne er sendt til '.$event['contact_email'];
$this->add_comment($event,$comment);
}
@@ -616,7 +616,7 @@
}
else
{
-
$comment = $comment_text_log.' Denne er sendt til '.$mail_sendt_to;
+
$comment = $comment_text_log.'. Denne er sendt til '.$mail_sendt_to;
$this->add_comment($event,$comment);
}
Modified: trunk/booking/templates/base/group_edit.xsl
===================================================================
--- trunk/booking/templates/base/group_edit.xsl 2011-06-05 21:47:18 UTC (rev
7343)
+++ trunk/booking/templates/base/group_edit.xsl 2011-06-06 06:52:29 UTC (rev
7344)
@@ -77,6 +77,7 @@
</select>
</dd>
</xsl:if>
+ <xsl:if test="not(new_form) and (currentapp =
'booking')">
<dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
<dd>
<select id="field_show_in_portal"
name="show_in_portal">
@@ -94,6 +95,7 @@
</option>
</select>
</dd>
+ </xsl:if>
</dl>
<div style='clear:left; padding:0; margin:0'/>
Modified: trunk/booking/templates/base/organization_edit.xsl
===================================================================
--- trunk/booking/templates/base/organization_edit.xsl 2011-06-05 21:47:18 UTC
(rev 7343)
+++ trunk/booking/templates/base/organization_edit.xsl 2011-06-06 06:52:29 UTC
(rev 7344)
@@ -81,21 +81,6 @@
<input name="customer_number" type="text"
id="field_customer_number" readonly="true"
value="{organization/customer_number}"/>
</xsl:if>
</dd>
- <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
- <dd>
- <select name="activity_id" id="field_activity">
- <option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
- <xsl:for-each select="activities">
- <option>
- <xsl:if
test="../organization/activity_id = id">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:value-of
select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </dd>
<dt><label for="field_homepage"><xsl:value-of
select="php:function('lang', 'Homepage')" /></label></dt>
<dd>
<input id="field_homepage" name="homepage"
type="text">
@@ -114,6 +99,21 @@
<xsl:attribute name="value"><xsl:value-of
select="organization/email"/></xsl:attribute>
</input>
</dd>
+ <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
+ <dd>
+ <select name="activity_id" id="field_activity">
+ <option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if
test="../organization/activity_id = id">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:value-of
select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </dd>
<dt><label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
@@ -169,6 +169,7 @@
</select>
</dd>
</xsl:if>
+ <xsl:if test="not(new_form) and (currentapp =
'booking')">
<dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
<dd>
<select id="field_show_in_portal"
name="show_in_portal">
@@ -186,6 +187,7 @@
</option>
</select>
</dd>
+ </xsl:if>
</dl>
<div style='clear:left; padding:0; margin:0'/>
Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang 2011-06-05 21:47:18 UTC (rev
7343)
+++ trunk/bookingfrontend/setup/phpgw_no.lang 2011-06-06 06:52:29 UTC (rev
7344)
@@ -335,4 +335,4 @@
To cancel booking use this link bookingfrontend no For å slette
bookingen bruk lenken
To cancel allocation use this link bookingfrontend no For å slette
tildelingen bruk lenken
manual common no Veiledning lag og organisasjoner
-
+Cancel allocation bookingfrontend no Avbestill tildelinger
Modified: trunk/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/bkbooking/css/frontend.css 2011-06-05 21:47:18 UTC
(rev 7343)
+++ trunk/phpgwapi/templates/bkbooking/css/frontend.css 2011-06-06 06:52:29 UTC
(rev 7344)
@@ -328,7 +328,7 @@
height: 108px !important;
background: url(../images/newlayout/aktivby_logo.jpg) no-repeat !important;
background-position: bottom center !important;
-padding: 22px 0px 0px 400px !important;
+padding: 22px 0px 0px 100px !important;
}
#header-search{
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2011-06-05 21:47:18 UTC
(rev 7343)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2011-06-06 06:52:29 UTC
(rev 7344)
@@ -116,14 +116,10 @@
$bodoc = CreateObject('booking.bodocumentation');
- $test = $bodoc->so->getFrontendDoc();
+ $manual = $bodoc->so->getFrontendDoc();
$app = lang($app);
$tpl_vars = array
(
- 'manual_text' => lang('manual'),
- 'manual_url' => $test,
-# 'help_text' => lang('help'),
-# 'help_url' => '#',
'css' => $GLOBALS['phpgw']->common->get_css(),
'javascript' => $GLOBALS['phpgw']->common->get_javascript(),
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
@@ -136,6 +132,13 @@
'logofile' => $logofile_frontend,
'header_search_class' => (isset($_GET['menuaction']) &&
$_GET['menuaction'] == 'bookingfrontend.uisearch.index' ? 'hidden' : '')
);
+ if ($manual !== null)
+ {
+ $tpl_vars['manual_text'] = lang('manual');
+ $tpl_vars['manual_url'] = $test;
+# $tpl_vars['help_text'] = lang('help');
+# $tpl_vars['help_url'] = => '#';
+ }
$bouser = CreateObject('bookingfrontend.bouser');
if($bouser->is_logged_in())
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7344] bkbooking: bugfixes,
Kjell Arne Espedal <=