[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17407] bookingfrontend: docs and pict on organizatio
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17407] bookingfrontend: docs and pict on organizations |
|
Date: |
Wed, 6 Dec 2017 14:55:28 -0500 (EST) |
Revision: 17407
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17407
Author: sigurdne
Date: 2017-12-06 14:55:26 -0500 (Wed, 06 Dec 2017)
Log Message:
-----------
bookingfrontend: docs and pict on organizations
Modified Paths:
--------------
trunk/bookingfrontend/templates/base/organization.xsl
Added Paths:
-----------
trunk/bookingfrontend/inc/class.uidocument_organization.inc.php
Added: trunk/bookingfrontend/inc/class.uidocument_organization.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uidocument_organization.inc.php
(rev 0)
+++ trunk/bookingfrontend/inc/class.uidocument_organization.inc.php
2017-12-06 19:55:26 UTC (rev 17407)
@@ -0,0 +1,20 @@
+<?php
+ phpgw::import_class('booking.uidocument_organization');
+
+ class bookingfrontend_uidocument_organization extends
booking_uidocument_organization
+ {
+
+ public $public_functions = array
+ (
+ 'download' => true,
+ 'index' => true,
+ 'index_images' => true,
+ );
+ protected $module;
+
+ public function __construct()
+ {
+ parent::__construct();
+ $this->module = "bookingfrontend";
+ }
+ }
\ No newline at end of file
Modified: trunk/bookingfrontend/templates/base/organization.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/organization.xsl 2017-12-06
19:30:56 UTC (rev 17406)
+++ trunk/bookingfrontend/templates/base/organization.xsl 2017-12-06
19:55:26 UTC (rev 17407)
@@ -29,94 +29,117 @@
</span>
</xsl:if>
- <xsl:if test="organization/description and
normalize-space(organization/description)">
- <dl class="proplist description">
- <dt>
- <xsl:value-of
select="php:function('lang', 'Description')" />
- </dt>
- <dd>
- <xsl:value-of
select="organization/description" disable-output-escaping="yes"/>
- </dd>
- </dl>
- </xsl:if>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2">
+ <xsl:if test="organization/description and
normalize-space(organization/description)">
+ <dl class="proplist description">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Description')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="organization/description" disable-output-escaping="yes"/>
+ </dd>
+ </dl>
+ </xsl:if>
- <h3>
- <xsl:value-of select="php:function('lang', 'Contact
information')" />
- </h3>
- <dl class="proplist contactinfo">
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Contact information')" />
+ </h3>
+ <dl class="proplist contactinfo">
- <xsl:if test="organization/homepage and
normalize-space(organization/homepage)">
- <dt>
- <xsl:value-of
select="php:function('lang', 'Homepage')" />
- </dt>
- <dd>
- <a target="blank"
href="{organization/homepage}">
- <xsl:value-of
select="organization/homepage" />
- </a>
- </dd>
- </xsl:if>
+ <xsl:if test="organization/homepage and
normalize-space(organization/homepage)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Homepage')" />
+ </dt>
+ <dd>
+ <a target="blank"
href="{organization/homepage}">
+ <xsl:value-of
select="organization/homepage" />
+ </a>
+ </dd>
+ </xsl:if>
- <xsl:if test="organization/email and
normalize-space(organization/email)">
- <dt>
- <xsl:value-of
select="php:function('lang', 'Email')" />
- </dt>
- <dd>
- <a href="mailto:{organization/email}";>
- <xsl:value-of
select="organization/email"/>
- </a>
- </dd>
- </xsl:if>
+ <xsl:if test="organization/email and
normalize-space(organization/email)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Email')" />
+ </dt>
+ <dd>
+ <a
href="mailto:{organization/email}";>
+ <xsl:value-of
select="organization/email"/>
+ </a>
+ </dd>
+ </xsl:if>
- <xsl:if test="organization/phone and
normalize-space(organization/phone)">
- <dt>
- <xsl:value-of
select="php:function('lang', 'Phone')" />
- </dt>
- <dd>
- <xsl:value-of
select="organization/phone"/>
- </dd>
- </xsl:if>
+ <xsl:if test="organization/phone and
normalize-space(organization/phone)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Phone')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="organization/phone"/>
+ </dd>
+ </xsl:if>
- <xsl:if test="organization/street and
normalize-space(organization/street)">
- <dt>
- <xsl:value-of
select="php:function('lang', 'Address')" />
- </dt>
- <dd>
- <xsl:value-of
select="organization/street"/>
- <br/>
- <xsl:value-of
select="organization/zip_code"/>
- <span> </span>
- <xsl:value-of
select="organization/city"/>
- <br/>
- <xsl:value-of
select="organization/district"/>
- </dd>
- </xsl:if>
+ <xsl:if test="organization/street and
normalize-space(organization/street)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Address')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="organization/street"/>
+ <br/>
+ <xsl:value-of
select="organization/zip_code"/>
+ <span> </span>
+ <xsl:value-of
select="organization/city"/>
+ <br/>
+ <xsl:value-of
select="organization/district"/>
+ </dd>
+ </xsl:if>
- </dl>
+ </dl>
- <h3>
- <xsl:value-of select="php:function('lang', 'Groups')" />
- </h3>
- <div id="groups_container"/>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Groups')" />
+ </h3>
+ <div id="groups_container"/>
- <a href="{organization/new_group_link}">
- <xsl:value-of select="php:function('lang', 'new
group')" />
- </a>
+ <a href="{organization/new_group_link}">
+ <xsl:value-of
select="php:function('lang', 'new group')" />
+ </a>
- <h3>
- <xsl:value-of select="php:function('lang',
'delegates')" />
- </h3>
- <div id="delegates_container"/>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'delegates')" />
+ </h3>
+ <div id="delegates_container"/>
- <a href="{organization/new_delegate_link}">
- <xsl:value-of select="php:function('lang', 'new
delegate')" />
- </a>
+ <a href="{organization/new_delegate_link}">
+ <xsl:value-of
select="php:function('lang', 'new delegate')" />
+ </a>
- <h3>
- <xsl:value-of select="php:function('lang', 'Used
buildings')" />
- </h3>
- <div id="buildings_used_by_container"/>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Used buildings')" />
+ </h3>
+ <div id="buildings_used_by_container"/>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Documents')" />
+ </h3>
+ <div id="documents_container"/>
+ </div>
+ <div class="pure-u-1 pure-u-lg-1-2">
+ <dl class="proplist-col images">
+ <div id="images_container"></div>
+ </dl>
+ <dl class="proplist-col images map">
+ <!--div id="images_container"></div-->
+ <xsl:if test="street and
normalize-space(street)">
+ <div class="gmap-container">
+ <iframe width="500"
height="300" frameborder="0" scrolling="no" marginheight="0" marginwidth="0"
id="googlemapiframe" src=""></iframe>
+ </div>
+ <small>
+ <a href=""
id="googlemaplink" style="color:#0000FF;text-align:left" target="_new">Vis
større kart</a>
+ </small>
+ </xsl:if>
+ </dl>
+ </div>
+ </div>
</div>
-
<script type="text/javascript">
var organization_id = <xsl:value-of select="organization/id"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Activity', 'Contact 1', 'Contact 2', 'email','phone', 'active')"/>;
@@ -125,6 +148,8 @@
var groupURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uigroup.index', sort:'name',
filter_organization_id: organization_id}, true);
var delegateURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidelegate.index', sort: 'name',
filter_organization_id: organization_id, filter_active:'-1'},true);
var buildingURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uibuilding.find_buildings_used_by', sort:'name',
organization_id: organization_id}, true);
+ var documentURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_organization.index', sort:'name',
no_images:1, filter_owner_id:organization_id}, true);
+ var document_organizationURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_organization.index_images',
sort:'name', filter_owner_id:organization_id}, true);
]]>
var rBuilding = [{n: 'ResultSet'},{n: 'Result'}];
@@ -145,10 +170,17 @@
];
var colDefsBuilding = [{key: 'name', label: lang['Name'],
formatter: genericLink}];
-
+ var colDefsDocument = [{key: 'description', label:
lang['Name'], formatter: genericLink}];
+
createTable('groups_container', groupURL, colDefsGroup);
createTable('delegates_container', delegateURL,
colDefsDelegate);
createTable('buildings_used_by_container', buildingURL,
colDefsBuilding, rBuilding);
+
+ createTable('documents_container', documentURL,
colDefsDocument);
+ $(window).on('load', function(){
+ // Load image
+ JqueryPortico.booking.inlineImages('images_container',
document_organizationURL);
+ });
</script>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17407] bookingfrontend: docs and pict on organizations,
sigurdne <=