[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17458] updated design
|
From: |
roger . kolseth |
|
Subject: |
[Fmsystem-commits] [17458] updated design |
|
Date: |
Wed, 20 Dec 2017 06:03:52 -0500 (EST) |
Revision: 17458
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17458
Author: rogkol
Date: 2017-12-20 06:03:52 -0500 (Wed, 20 Dec 2017)
Log Message:
-----------
updated design
Modified Paths:
--------------
trunk/bookingfrontend/templates/aalesund/application_new.xsl
trunk/bookingfrontend/templates/aalesund/building.xsl
trunk/bookingfrontend/templates/aalesund/resource.xsl
trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
Added Paths:
-----------
trunk/bookingfrontend/templates/aalesund/building_schedule.xsl
trunk/bookingfrontend/templates/aalesund/organization.xsl
Modified: trunk/bookingfrontend/templates/aalesund/application_new.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/application_new.xsl
2017-12-20 06:31:58 UTC (rev 17457)
+++ trunk/bookingfrontend/templates/aalesund/application_new.xsl
2017-12-20 11:03:52 UTC (rev 17458)
@@ -571,7 +571,7 @@
<div class="col-lg-12" style="margin-top: 2em">
- <input type="submit" class="btn btn-default">
+ <input type="submit" class="btn btn-main">
<xsl:attribute name="value">
<xsl:value-of select="php:function('lang',
'Send')"/>
</xsl:attribute>
Modified: trunk/bookingfrontend/templates/aalesund/building.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/building.xsl 2017-12-20
06:31:58 UTC (rev 17457)
+++ trunk/bookingfrontend/templates/aalesund/building.xsl 2017-12-20
11:03:52 UTC (rev 17458)
@@ -25,7 +25,7 @@
<xsl:if test="deactivate_calendar=0">
<div>
- <button class="btn btn-default btn-md"
onclick="window.location.href='{schedule_link}'">
+ <button class="btn btn-main btn-md"
onclick="window.location.href='{schedule_link}'">
<xsl:value-of select="php:function('lang', 'Building
schedule')" />
</button>
- Søk ledig tid/informasjon om hva som skjer
@@ -57,7 +57,7 @@
</h3>
<xsl:if test="deactivate_sendmessage=0">
<div>
- <button class="resource-button"
onclick="window.location.href='{message_link}'">
+ <button class="btn btn-main"
onclick="window.location.href='{message_link}'">
<xsl:value-of
select="php:function('lang', 'Send message')" />
</button>
- Meldig til saksbehandler for bygg
@@ -177,9 +177,9 @@
paginatorTableBuilding_users.limit = 10;
createPaginatorTable('building_users_container',
paginatorTableBuilding_users);
- createTable('resources_container', resourcesURL,
colDefsResources, rResources);
- createTable('documents_container', documentURL,
colDefsDocument);
- createTable('building_users_container', building_usersURL,
colDefsBuilding_users, rBuilding_users, '', paginatorTableBuilding_users);
+ createTable('resources_container', resourcesURL,
colDefsResources, rResources, 'table table-hover');
+ createTable('documents_container', documentURL,
colDefsDocument, '', 'table table-hover');
+ createTable('building_users_container', building_usersURL,
colDefsBuilding_users, rBuilding_users, 'table table-hover',
paginatorTableBuilding_users);
$(window).on('load', function(){
// Load image
Added: trunk/bookingfrontend/templates/aalesund/building_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/building_schedule.xsl
(rev 0)
+++ trunk/bookingfrontend/templates/aalesund/building_schedule.xsl
2017-12-20 11:03:52 UTC (rev 17458)
@@ -0,0 +1,90 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+ <div class="container">
+ <xsl:if test="backend != 'true'">
+ <ul class="pathway">
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
+ </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>
+ <li>
+ <xsl:value-of
select="php:function('lang', 'Schedule')"/>
+ </li>
+ </ul>
+
+ <xsl:call-template name="msgbox"/>
+
+ <xsl:if test="building/deactivate_application=0">
+ <button class="btn btn-main"
onclick="schedule.newApplicationForm();">
+ <xsl:value-of
select="php:function('lang', 'New booking application')" />
+ </button>
+ - Søk ledig tid
+ </xsl:if>
+ </xsl:if>
+ <ul id="week-selector">
+ <li>
+ <a id="btnPrevWeek" class="moveWeek"
onclick="schedule.prevWeek(); return false">
+ <xsl:value-of
select="php:function('lang', 'Previous week')"/>
+ </a>
+ </li>
+ <li id="cal_container">
+ <div>
+ <span>
+ <xsl:value-of
select="php:function('lang', 'Week')" />: </span>
+ <label id="numberWeek"></label>
+ <input type="text" id="datepicker" />
+ <img id="pickerImg"
src="{building/picker_img}" />
+ </div>
+ </li>
+ <li>
+ <a id="btnPrevWeek" class="moveWeek"
onclick="schedule.nextWeek(); return false">
+ <xsl:value-of
select="php:function('lang', 'Next week')"/>
+ </a>
+ </li>
+ </ul>
+ <div id="schedule_container"/>
+ </div>
+ <div id="dialog_schedule"></div>
+
+ <script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang',
'free')"/>;
+ schedule.createDialogSchedule(300);
+ $(window).on('load', function() {
+ schedule.setupWeekPicker('cal_container');
+ schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
+ schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
+ schedule.includeResource = true;
+ schedule.colFormatter = 'frontendScheduleDateColumn';
+ var handleHistoryNavigation = function (state) {
+ schedule.date = parseISO8601(state);
+ schedule.renderSchedule('schedule_container',
schedule.datasourceUrl, schedule.date, schedule.colFormatter,
schedule.includeResource);
+ };
+
+ var initialRequest = getUrlData("date") || '<xsl:value-of
select="building/date"/>';
+
+ var state = getUrlData("date") || initialRequest;
+ schedule.state = state;
+ if (state){
+ handleHistoryNavigation(state);
+ schedule.week = $.datepicker.iso8601Week(schedule.date);
+ $('#cal_container #numberWeek').text(schedule.week);
+ $("#cal_container #datepicker").datepicker("setDate",
parseISO8601(state));
+ }
+ });
+ <xsl:if test="backend = 'true'">
+ $('header').hide();
+ </xsl:if>
+ </script>
+</xsl:template>
Added: trunk/bookingfrontend/templates/aalesund/organization.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/organization.xsl
(rev 0)
+++ trunk/bookingfrontend/templates/aalesund/organization.xsl 2017-12-20
11:03:52 UTC (rev 17458)
@@ -0,0 +1,191 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+
+ <div class="container">
+ <ul class="pathway">
+ <li>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
+ </a>
+ </li>
+ <li>
+ <a href="{resource/building_link}">
+ <xsl:value-of
select="resource/building_name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="organization/name"/>
+ </li>
+ </ul>
+
+ <xsl:if test="organization/permission/write">
+ <span class="loggedin">
+ <button
onclick="window.location.href='{organization/edit_link}'">
+ <xsl:value-of
select="php:function('lang', 'edit')" />
+ </button>
+ </span>
+ </xsl:if>
+
+ <div class="row details-wrapper">
+
+ <div class="col-lg-7">
+ <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">
+
+ <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/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>
+
+ </dl>
+
+ <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>
+
+ <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>
+
+ <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="col-lg-5">
+ <dl class="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')"/>;
+
+ <![CDATA[
+ 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'}];
+
+ var colDefsGroup = [
+ {key: 'name', label: lang['Name'], formatter: genericLink},
+ {key: 'link', attrs: [{name: 'hidden'}]},
+ {key: 'activity_name', label: lang['Activity']},
+ {key: 'primary_contact_name', label: lang['Contact 1']},
+ {key: 'secondary_contact_name', label: lang['Contact 2']}
+ ];
+
+ var colDefsDelegate = [
+ {key: 'name', label: lang['Name'], formatter: genericLink},
+ {key: 'email', label: lang['email']},
+ {key: 'phone', label: lang['phone']},
+ {key: 'active', label: lang['active']}
+ ];
+
+ var colDefsBuilding = [{key: 'name', label: lang['Name'],
formatter: genericLink}];
+ var colDefsDocument = [{key: 'description', label:
lang['Name'], formatter: genericLink}];
+
+ createTable('groups_container', groupURL, colDefsGroup, '',
'table table-hover');
+ createTable('delegates_container', delegateURL,
colDefsDelegate, '', 'table table-hover');
+ createTable('buildings_used_by_container', buildingURL,
colDefsBuilding, rBuilding, 'table table-hover');
+
+ createTable('documents_container', documentURL,
colDefsDocument, '', 'table table-hover');
+ $(window).on('load', function(){
+ // Load image
+ JqueryPortico.booking.inlineImages('images_container',
document_organizationURL);
+ });
+
+ </script>
+
+</xsl:template>
+
+
+
Modified: trunk/bookingfrontend/templates/aalesund/resource.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/resource.xsl 2017-12-20
06:31:58 UTC (rev 17457)
+++ trunk/bookingfrontend/templates/aalesund/resource.xsl 2017-12-20
11:03:52 UTC (rev 17458)
@@ -23,13 +23,14 @@
</xsl:for-each>
<div>
- <button
onclick="window.location.href='{resource/schedule_link}'">
+ <button class="btn btn-main btn-md"
onclick="window.location.href='{resource/schedule_link}'">
<xsl:value-of select="php:function('lang',
'Resource schedule')" />
</button>
- Søk ledig tid/informasjon om hva som skjer
</div>
- <div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2">
+ <div class="row details-wrapper">
+
+ <div class="col-lg-7">
<dl class="proplist-col main">
<xsl:if test="resource/description and
normalize-space(resource/description)">
<dt>
@@ -62,12 +63,12 @@
</div>
<input type= "hidden" id="field_activity_id"
value="{resource/activity_id}"/>
- <div class="pure-u-1 pure-u-lg-1-2">
- <dl class="proplist-col images">
+ <div class="col-lg-5">
+ <dl class="images">
<div id="images_container">
</div>
</dl>
- <dl class="proplist-col images map">
+ <dl class="images map">
<!--div id="images_container"></div-->
<xsl:if test="resource/building/street
and normalize-space(resource/building/street)">
<div class="gmap-container">
@@ -95,7 +96,7 @@
var colDefsDocumentsResource = [{key: 'name', label:
lang['Name'], formatter: genericLink}];
- createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource);
+ createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource, '', 'table table-hover');
$(window).on('load', function(){
JqueryPortico.booking.inlineImages('images_container',
documentsResourceImagesURL);
Modified: trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
2017-12-20 06:31:58 UTC (rev 17457)
+++ trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
2017-12-20 11:03:52 UTC (rev 17458)
@@ -1,9 +1,9 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div class="content">
+ <div class="container">
<xsl:for-each select="pathway">
<ul class="pathway">
- <li>testtest
+ <li>
<a>
<xsl:attribute name="href">
<xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
@@ -28,7 +28,7 @@
</xsl:for-each>
- <button
onclick="window.location.href='{resource/application_link}'">
+ <button class="btn btn-main"
onclick="window.location.href='{resource/application_link}'">
<xsl:value-of select="php:function('lang', 'New booking
application')" />
</button>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17458] updated design,
roger . kolseth <=