[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8282] bkbooking: nsf update minor fixes
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [8282] bkbooking: nsf update minor fixes |
|
Date: |
Tue, 13 Dec 2011 09:52:14 +0000 |
Revision: 8282
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8282
Author: kjell
Date: 2011-12-13 09:52:14 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
bkbooking: nsf update minor fixes
Modified Paths:
--------------
branches/dev-thomasez/booking/templates/base/application_new.xsl
branches/dev-thomasez/booking/templates/base/css/base.css
branches/dev-thomasez/bookingfrontend/inc/class.bosearch.inc.php
branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl
Modified: branches/dev-thomasez/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application_new.xsl
2011-12-13 09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/booking/templates/base/application_new.xsl
2011-12-13 09:52:14 UTC (rev 8282)
@@ -164,9 +164,8 @@
<dt><a href="#" id="add-date-link"><xsl:value-of
select="php:function('lang', 'Add another date')" /></a></dt>
</dl>
+ <div class="clr"/>
<dl class="form-col">
- </dl>
- <dl class="form-col">
<div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
<xsl:if test="config/application_who">
<p>
@@ -258,8 +257,10 @@
<xsl:attribute name="href"><xsl:value-of
select="application/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang',
'Cancel')" />
</a>
- <p style="width: 750px; margin-top: 10px;">Trykker du
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og
legge til ekstra opplysninger i saken.<br /><br />
- Trykker du <strong>Avbryt</strong> blir
søknaden ikke sendt eller lagret, og du går tilbake til kalenderen.</p>
+<!-- <p style="width: 750px; margin-top: 10px;">Trykker du
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og
legge til ekstra opplysninger i saken.<br /><br />-->
+<!-- Trykker du <strong>Avbryt</strong> blir
søknaden ikke sendt eller lagret, og du går tilbake til kalenderen.</p>-->
+
+<p style="width: 750px; margin-top: 10px;">Trykk <strong>SEND</strong> for å
lagre. En grønn melding bekrefter at alt er i orden. Du vil også få en
bekreftelse på e-post. En rød melding betyr at noe mangler. Trykker du
<strong>Avbryt</strong>, slettes søknaden.</p>
</div>
</form>
</div>
Modified: branches/dev-thomasez/booking/templates/base/css/base.css
===================================================================
--- branches/dev-thomasez/booking/templates/base/css/base.css 2011-12-13
09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/booking/templates/base/css/base.css 2011-12-13
09:52:14 UTC (rev 8282)
@@ -301,8 +301,12 @@
span.space {
padding-right: 8px;
}
+.details .description {
+ padding-top: 8px;
+}
.image_container {
- margin-top: 8px;
+ margin-top: 16px;
+ margin-bottom: 8px;
}
em {
font-style:italic;
@@ -341,4 +345,7 @@
color: #666;
width: 20em;
}
+.login {
+ display: none;
+}
Modified: branches/dev-thomasez/bookingfrontend/inc/class.bosearch.inc.php
===================================================================
--- branches/dev-thomasez/bookingfrontend/inc/class.bosearch.inc.php
2011-12-13 09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/bookingfrontend/inc/class.bosearch.inc.php
2011-12-13 09:52:14 UTC (rev 8282)
@@ -70,7 +70,7 @@
$res['type'] = "resource";
$res['link'] =
$GLOBALS['phpgw']->link('/bookingfrontend/', array('menuaction' =>
'bookingfrontend.uiresource.show', 'id' => $res['id']));
$res['img_container'] = "resource-" . $res['id'];
- $res['img_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/', array('menuaction' =>
'bookingfrontend.uidocument_resource.index_images', 'filter_owner_id' =>
$res['id'], 'phpgw_return_as' => 'json', 'results' => '1'));
+ $res['img_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/', array('menuaction' =>
'bookingfrontend.uidocument_resource.index_images', 'filter_owner_id' =>
$res['id'], 'phpgw_return_as' => 'json', 'results' => '3'));
}
}
$final_array = array_merge_recursive($bui_result,
$org_result, $res_result);
Modified: branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
2011-12-13 09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
2011-12-13 09:52:14 UTC (rev 8282)
@@ -36,7 +36,7 @@
if(['House','Campsite','Boat'].indexOf(val) >= 0) {
YAHOO.util.Dom.setStyle('extrafields',
'display', 'block');
}
- else if (['Equipment','Location'].indexOf(val) >= 0)
+ else if (['Equipment','Location',''].indexOf(val) >= 0)
{
YAHOO.util.Dom.setStyle('extrafields',
'display', 'none');
}
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2011-12-13 09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2011-12-13 09:52:14 UTC (rev 8282)
@@ -15,7 +15,7 @@
ul#metanav a, ul#sidebar a { color: #700; }
div#content {
margin: 0 2em;
- min-height: 500px;
+ min-height: 400px;
}
#header-search {
float: right;
@@ -66,7 +66,7 @@
}
form#search {
text-align: center;
- padding-top: 5em;
+ padding-top: 0em;
}
input#search {
font-size: 120%;
@@ -183,7 +183,7 @@
list-style-type: none;
padding-left: 0;
color: #888;
- margin: 3em 0;
+ margin: 1.5em 0;
font-size: 120%;
}
#cloud div { padding: .2em};
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
2011-12-13 09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
2011-12-13 09:52:14 UTC (rev 8282)
@@ -2,8 +2,8 @@
<div id="footer">
</div>
-<div id="footer_address">
-Norges speiderforbund | Besøksadresse: St. Olavs gate 25, 0166 Oslo |
Postadresse: Postboks 6910 St. Olavs plass, 0130 Oslo | 22 99 22 30 | <a
href="mailto:address@hidden";>mailto:address@hidden</a>
+<div id="footer_address" style="text-align: center;" >
+Norges speiderforbund | Postadresse: Postboks 6910 St. Olavs plass, 0130 Oslo
| 22 99 22 30 | <a href="http://www.speiding.no";>www.speiding.no</a> | <a
href="mailto:address@hidden";>address@hidden</a>
</div>
</body>
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl 2011-12-13
09:24:03 UTC (rev 8281)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl 2011-12-13
09:52:14 UTC (rev 8282)
@@ -33,7 +33,7 @@
<div id="wrapper">
<div id="header">
<div id="login-bar">
- <a href="{manual_url}">{manual_text}</a> <a
href="{help_url}">{help_text}</a> <a href="{login_url}">{login_text}</a>
+ <a href="{manual_url}">{manual_text}</a> <a
href="{help_url}">{help_text}</a> <a class="login"
href="{login_url}">{login_text}</a>
</div>
<a href="index.php?menuaction=bookingfrontend.uisearch.index"><div
id="logo"></div></a>
<div id="centerimage"></div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8282] bkbooking: nsf update minor fixes,
Kjell Arne Espedal <=