[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17455] design update
|
From: |
roger . kolseth |
|
Subject: |
[Fmsystem-commits] [17455] design update |
|
Date: |
Tue, 19 Dec 2017 13:12:50 -0500 (EST) |
Revision: 17455
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17455
Author: rogkol
Date: 2017-12-19 13:12:50 -0500 (Tue, 19 Dec 2017)
Log Message:
-----------
design update
Modified Paths:
--------------
trunk/bookingfrontend/templates/aalesund/search.xsl
Added Paths:
-----------
trunk/bookingfrontend/templates/aalesund/resource.xsl
trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
Added: trunk/bookingfrontend/templates/aalesund/resource.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/resource.xsl
(rev 0)
+++ trunk/bookingfrontend/templates/aalesund/resource.xsl 2017-12-19
18:12:50 UTC (rev 17455)
@@ -0,0 +1,139 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+ <div class="container">
+ <xsl:for-each select="pathway">
+ <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="{building_link}">
+ <xsl:value-of
select="building_name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="resource_name"/>
+ </li>
+ </ul>
+ </xsl:for-each>
+
+ <div>
+ <button
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">
+ <dl class="proplist-col main">
+ <xsl:if test="resource/description and
normalize-space(resource/description)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Description')" />
+ </dt>
+ <dd>
+ <xsl:value-of
disable-output-escaping="yes" select="resource/description"/>
+ </dd>
+ </xsl:if>
+ <xsl:if test="resource/activity_name
and normalize-space(resource/activity_name)">
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Activity')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="resource/activity_name"/>
+ </dd>
+ </xsl:if>
+ <dt>
+ <xsl:value-of
select="php:function('lang', 'Resource Type')" />
+ </dt>
+ <dd>
+ <xsl:value-of
select="php:function('lang', string(resource/type))"/>
+ </dd>
+ <h3>
+ <xsl:value-of
select="php:function('lang', 'Documents')" />
+ </h3>
+ <div id="documents_container"/>
+ </dl>
+ <div id="custom_fields"></div>
+ </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 id="images_container">
+ </div>
+ </dl>
+ <dl class="proplist-col images map">
+ <!--div id="images_container"></div-->
+ <xsl:if test="resource/building/street
and normalize-space(resource/building/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 resource_id = <xsl:value-of select="resource/id"/>;
+ var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'category', 'Activity')"/>;
+ var address = '<xsl:value-of
select="resource/building/street"/>, <xsl:value-of
select="resource/building/zip_code"/>, <xsl:value-of
select="resource/building/city"/>';
+
+ <![CDATA[
+ var documentsResourceURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_resource.index', sort:'name',
no_images:1, filter_owner_id:resource_id}, true);
+ var documentsResourceImagesURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_resource.index_images', sort:'name',
filter_owner_id:resource_id}, true);
+ var iurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&output=embed&geocode=&q=' +
address;
+ var linkurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&geocode=&q=' + address;
+ ]]>
+
+ var colDefsDocumentsResource = [{key: 'name', label:
lang['Name'], formatter: genericLink}];
+
+ createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource);
+ $(window).on('load', function(){
+ JqueryPortico.booking.inlineImages('images_container',
documentsResourceImagesURL);
+
+ // Load Google map
+ if( iurl.length > 0 ) {
+ $("#googlemapiframe").attr("src", iurl);
+ $("#googlemaplink").attr("href", linkurl);
+ }
+
+ });
+ <![CDATA[
+
+ $(document).ready(function () {
+
+ get_custom_fields();
+ });
+
+ get_custom_fields = function () {
+ var oArgs = {menuaction:
'bookingfrontend.uiresource.get_custom', resource_id: resource_id};
+ var requestUrl = phpGWLink('bookingfrontend/', oArgs);
+ requestUrl += "&phpgw_return_as=stripped_html";
+ var activity_id = $("#field_activity_id").val();
+ $.ajax({
+ type: 'POST',
+ data: {activity_id: activity_id},
+ dataType: 'html',
+ url: requestUrl,
+ success: function (data) {
+ if (data != null)
+ {
+ var custom_fields = data;
+
$("#custom_fields").html(custom_fields);
+ }
+ }
+ });
+ };
+ ]]>
+
+
+ </script>
+</xsl:template>
Added: trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
(rev 0)
+++ trunk/bookingfrontend/templates/aalesund/resource_schedule.xsl
2017-12-19 18:12:50 UTC (rev 17455)
@@ -0,0 +1,89 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+ <div class="content">
+ <xsl:for-each select="pathway">
+ <ul class="pathway">
+ <li>testtest
+ <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="{building_link}">
+ <xsl:value-of
select="building_name"/>
+ </a>
+ </li>
+ <li>
+ <a href="{resource_link}">
+ <xsl:value-of
select="resource_name"/>
+ </a>
+ </li>
+ <li>
+ <xsl:value-of select="lang_schedule"/>
+ </li>
+ </ul>
+ </xsl:for-each>
+
+
+ <button
onclick="window.location.href='{resource/application_link}'">
+ <xsl:value-of select="php:function('lang', 'New booking
application')" />
+ </button>
+
+ <xsl:call-template name="msgbox"/>
+ <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="{resource/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="resource/datasource_url" />';
+ schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link" />';
+ schedule.includeResource = false;
+ 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="resource/date" />';
+
+ var state = getUrlData("date") || initialRequest;
+ if (state) {
+ handleHistoryNavigation(state);
+ schedule.week = $.datepicker.iso8601Week(schedule.date);
+ $('#cal_container #numberWeek').text(schedule.week);
+ $('#cal_container #datepicker').datepicker("setDate",
parseISO8601(state));
+ }
+ });
+
+ </script>
+
+</xsl:template>
Modified: trunk/bookingfrontend/templates/aalesund/search.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/search.xsl 2017-12-19 18:12:28 UTC
(rev 17454)
+++ trunk/bookingfrontend/templates/aalesund/search.xsl 2017-12-19 18:12:50 UTC
(rev 17455)
@@ -71,7 +71,9 @@
<xsl:value-of select="building_id"/>
</xsl:attribute>
</input> -->
-
+
+ <p id="adv-search-toggler" class="adv-search-button
text-right text-primary">Avansert søk</p>
+
</div>
</div>
@@ -79,17 +81,10 @@
- <div class="container text-center text-primary">
- <h5>Avansert søk</h5>
- <div class="iconwrapper">
- <button type="button" id="adv-search-toggler" class="btn
btn-circle">
- <i class="ion-chevron-down"/>
- </button>
- </div>
- </div>
+
- <div class="container-fluid advance-search bg-light">
+ <div id="advance-search-container" class="container-fluid advance-search
bg-light">
<div class="container advance-search-padding">
<div class="row">
<div class="col-lg-4">
@@ -192,23 +187,21 @@
</div>
</div>
</div>
-
+
+ <button id="update-search-result" class="btn btn-primary">Oppdater
resultat</button>
+
</div>
- <div class="container" style="padding-bottom: 2px">
- <div id = "total_records_top"></div>
- </div>
+
- </div>
-
-
- <!-- GAMMEL KODE -->
-
+ </div>
<div class="container-fluid result">
<div class="container">
-
+ <div class="container" style="margin-top: 5px">
+ <div id = "total_records_top"></div>
+ </div>
<div id="result"></div>
</div>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17455] design update,
roger . kolseth <=