fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [15932] more on template


From: sigurdne
Subject: [Fmsystem-commits] [15932] more on template
Date: Tue, 1 Nov 2016 14:30:32 +0000 (UTC)

Revision: 15932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15932
Author:   sigurdne
Date:     2016-11-01 14:30:31 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
more on template

Modified Paths:
--------------
    trunk/bookingfrontend/js/bookingfrontend/search.js
    trunk/bookingfrontend/templates/base/search.xsl
    trunk/phpgwapi/templates/bookingfrontend/css/frontend.css
    trunk/phpgwapi/templates/bookingfrontend/footer.tpl
    trunk/phpgwapi/templates/bookingfrontend/head.inc.php
    trunk/phpgwapi/templates/bookingfrontend/head.tpl
    trunk/property/templates/base/condition_survey.xsl

Modified: trunk/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/search.js  2016-11-01 14:29:53 UTC 
(rev 15931)
+++ trunk/bookingfrontend/js/bookingfrontend/search.js  2016-11-01 14:30:31 UTC 
(rev 15932)
@@ -224,7 +224,7 @@
                                {
                                        $("#loading").dialog('close');
 //                         $('#loading').html("<p>Result Complete...</p>");
-                                       $("#no_result").hide();
+                                       $(".no_result").hide();
                                        $("#result").html(data);
                                        
$("#total_records_top").html($("#total_records").html());
 

Modified: trunk/bookingfrontend/templates/base/search.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/search.xsl     2016-11-01 14:29:53 UTC 
(rev 15931)
+++ trunk/bookingfrontend/templates/base/search.xsl     2016-11-01 14:30:31 UTC 
(rev 15932)
@@ -13,8 +13,8 @@
        <div class="content">
                <div class="pure-g">
                        <xsl:if test="not(search)">
-                               <div class="pure-u-1" id="no_result">
-                                       <div id="cloud">
+                               <div class="pure-u-1 no_result">
+                                       <div class="cloud">
                                                <xsl:value-of 
disable-output-escaping="yes" select="frontpagetext"/>
                                        </div>
                                </div>
@@ -194,8 +194,8 @@
                </div>
                <xsl:if test="not(search)">
                        <div class="pure-g">
-                               <div class="pure-u-1  pure-u-lg-1-1" 
id="no_result">
-                                       <div id="cloud">
+                               <div class="pure-u-1  pure-u-lg-1-1 no_result">
+                                       <div class="cloud">
                                                <div class="frontpagetext">
                                                </div>
                                        </div>

Modified: trunk/phpgwapi/templates/bookingfrontend/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/css/frontend.css   2016-11-01 
14:29:53 UTC (rev 15931)
+++ trunk/phpgwapi/templates/bookingfrontend/css/frontend.css   2016-11-01 
14:30:31 UTC (rev 15932)
@@ -439,4 +439,16 @@
         overflow: hidden;
     }
 
-}
\ No newline at end of file
+}
+
+.headroom {
+    will-change: transform;
+    transition: transform 200ms linear;
+}
+.headroom--pinned {
+    transform: translateY(0%);
+}
+.headroom--unpinned {
+    transform: translateY(-100%);
+}
+

Modified: trunk/phpgwapi/templates/bookingfrontend/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/footer.tpl 2016-11-01 14:29:53 UTC 
(rev 15931)
+++ trunk/phpgwapi/templates/bookingfrontend/footer.tpl 2016-11-01 14:30:31 UTC 
(rev 15932)
@@ -5,9 +5,8 @@
 <div class="footer l-box is-center">
        {footer_info}
 </div>
-</body>
 {javascript_end}
-<script>
+<script type="text/javascript">
        (function (window, document)
        {
                document.getElementById('toggle').addEventListener('click', 
function (e)
@@ -17,4 +16,5 @@
                });
        })(this, this.document);
 </script>
+</body>
 </html>

Modified: trunk/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.inc.php       2016-11-01 
14:29:53 UTC (rev 15931)
+++ trunk/phpgwapi/templates/bookingfrontend/head.inc.php       2016-11-01 
14:30:31 UTC (rev 15932)
@@ -41,7 +41,6 @@
        $GLOBALS['phpgw']->template->set_block('head', 'stylesheet', 
'stylesheets');
        $GLOBALS['phpgw']->template->set_block('head', 'javascript', 
'javascripts');
 
-       $javascripts = array();
 
        phpgwapi_jquery::load_widget('core');
 
@@ -65,10 +64,14 @@
                }
        }
 
+       $javascripts = array();
        //FIXME: To consider...
        /*
        $javascripts[] = "/phpgwapi/templates/stavanger/js/minid.js";
 */
+//     $javascripts[] = 
"/phpgwapi/templates/bookingfrontend/js/headroom.min.js";
+//     $javascripts[] = 
"/phpgwapi/templates/bookingfrontend/js/jQuery.headroom.js";
+
        foreach ( $javascripts as $javascript )
        {
                if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )

Modified: trunk/phpgwapi/templates/bookingfrontend/head.tpl
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.tpl   2016-11-01 14:29:53 UTC 
(rev 15931)
+++ trunk/phpgwapi/templates/bookingfrontend/head.tpl   2016-11-01 14:30:31 UTC 
(rev 15932)
@@ -36,7 +36,6 @@
                        {win_on_events}
                        //-->
                </script>
-       <div class="header">
        </head>
        <body>
                <div class="home-menu custom-menu-wrapper">
@@ -53,8 +52,8 @@
                                </ul>
                        </div>
                </div>
-               <span id="change"></span>
 
                <div id="content-wrapper">
+                       <!-- END head -->
 
 

Modified: trunk/property/templates/base/condition_survey.xsl
===================================================================
--- trunk/property/templates/base/condition_survey.xsl  2016-11-01 14:29:53 UTC 
(rev 15931)
+++ trunk/property/templates/base/condition_survey.xsl  2016-11-01 14:30:31 UTC 
(rev 15932)
@@ -2,264 +2,332 @@
 
 <!-- add / edit -->
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
+       <div class="content">
+               <xsl:call-template name="jquery_phpgw_i18n"/>
 
-       <div id="survey_edit_tabview">
+               <div id="survey_edit_tabview">
 
-               <h1>
-                       <xsl:value-of select="php:function('lang', 'condition 
survey')" />
-               </h1>
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 
'condition survey')" />
+                       </h1>
 
 
-               <xsl:variable name="action_url">
-                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uicondition_survey.save')" />
-               </xsl:variable>
+                       <xsl:variable name="action_url">
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:property.uicondition_survey.save')" />
+                       </xsl:variable>
 
-               <xsl:value-of select="validator"/>
+                       <xsl:value-of select="validator"/>
                
-               <form name="form" class="pure-form pure-form-aligned" id="form" 
action="{$action_url}" method="post" ENCTYPE="multipart/form-data">
+                       <form name="form" class="pure-form pure-form-aligned" 
id="form" action="{$action_url}" method="post" ENCTYPE="multipart/form-data">
                             
-                       <dl>
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
-                                               <dt>
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </dt>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </dl>
+                               <dl>
+                                       <xsl:choose>
+                                               <xsl:when test="msgbox_data != 
''">
+                                                       <dt>
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </dt>
+                                               </xsl:when>
+                                       </xsl:choose>
+                               </dl>
                                
-                       <div id="tab-content">
+                               <div id="tab-content">
                                        
-                               <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
+                                       <xsl:value-of 
disable-output-escaping="yes" select="tabs"/>
 
-                               <div id="generic">
+                                       <div id="generic">
 
-                                       <fieldset>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="survey/id!=''">
-                                                               <div 
class="pure-control-group">
-                                                                       <label>
-                                                                               
<xsl:value-of select="php:function('lang', 'id')" />
-                                                                       </label>
-                                                                       
<xsl:value-of select="survey/id"/>
-                                                                       <input 
type="hidden" name="id" value="{survey/id}"/>
+                                               <fieldset>
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="survey/id!=''">
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'id')" />
+                                                                               
</label>
+                                                                               
<xsl:value-of select="survey/id"/>
+                                                                               
<input type="hidden" name="id" value="{survey/id}"/>
 
-                                                               </div>
-                                                       </xsl:when>
-                                               </xsl:choose>
+                                                                       </div>
+                                                               </xsl:when>
+                                                       </xsl:choose>
 
-                                               <xsl:choose>
-                                                       <xsl:when 
test="location_data2!=''">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="location_data2!=''">
+                                                                       
<xsl:choose>
+                                                                               
<xsl:when test="editable = 1">
+                                                                               
        <xsl:call-template name="location_form2"/>
+                                                                               
</xsl:when>
+                                                                               
<xsl:otherwise>
+                                                                               
        <xsl:call-template name="location_view2"/>
+                                                                               
</xsl:otherwise>
+                                                                       
</xsl:choose>
+                                                               </xsl:when>
+                                                       </xsl:choose>
+
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="name">
+                                                                       
<xsl:value-of select="php:function('lang', 'name')" />
+                                                               </label>
                                                                <xsl:choose>
                                                                        
<xsl:when test="editable = 1">
-                                                                               
<xsl:call-template name="location_form2"/>
+                                                                               
<input id="title" name='values[title]' type="text" value="{survey/title}">
+                                                                               
        <xsl:attribute name="data-validation">
+                                                                               
                <xsl:text>required</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="data-validation-error-msg">
+                                                                               
                <xsl:value-of select="php:function('lang', 'Please enter a 
title !')"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
                                                                        
</xsl:when>
                                                                        
<xsl:otherwise>
-                                                                               
<xsl:call-template name="location_view2"/>
+                                                                               
<xsl:value-of select="survey/title" />
                                                                        
</xsl:otherwise>
                                                                </xsl:choose>
-                                                       </xsl:when>
-                                               </xsl:choose>
+                                                       </div>
 
-                                               <div class="pure-control-group">
-                                                       <label for="name">
-                                                               <xsl:value-of 
select="php:function('lang', 'name')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <input 
id="title" name='values[title]' type="text" value="{survey/title}">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a title !')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="survey/title" />
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
-
-                                               <div class="pure-control-group" 
>
-                                                       <label for="name">
-                                                               <xsl:value-of 
select="php:function('lang', 'description')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       
<textarea id="descr" rows="6" style="width:40%; resize:none;" 
name="values[descr]">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a description 
!')"/>
-                                                                               
</xsl:attribute>
+                                                       <div 
class="pure-control-group" >
+                                                               <label 
for="name">
+                                                                       
<xsl:value-of select="php:function('lang', 'description')" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<textarea id="descr" rows="6" style="width:40%; resize:none;" 
name="values[descr]">
+                                                                               
        <xsl:attribute name="data-validation">
+                                                                               
                <xsl:text>required</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="data-validation-error-msg">
+                                                                               
                <xsl:value-of select="php:function('lang', 'Please enter a 
description !')"/>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:value-of select="survey/descr" disable-output-escaping="yes"/>
+                                                                               
</textarea>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
                                                                                
<xsl:value-of select="survey/descr" disable-output-escaping="yes"/>
-                                                                       
</textarea>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="survey/descr" disable-output-escaping="yes"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
 
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="category">
+                                                                       
<xsl:value-of select="php:function('lang', 'category')" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<select id="cat_id" name="values[cat_id]">
+                                                                               
        <xsl:attribute name="data-validation">
+                                                                               
                <xsl:text>required</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="data-validation-error-msg">
+                                                                               
                <xsl:value-of select="php:function('lang', 'Please enter a 
category !')"/>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:apply-templates select="categories/options"/>
+                                                                               
</select>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:for-each select="categories/options">
+                                                                               
        <xsl:if test="selected = 'selected' or selected = 1">
+                                                                               
                <xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                               
        </xsl:if>
+                                                                               
</xsl:for-each>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
+                        
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="multiplier">
+                                                                       
<xsl:value-of select="php:function('lang', 'multiplier')" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<input id="multiplier" name='values[multiplier]' type="text" 
value="{survey/multiplier}">
+                                                                               
        <xsl:attribute name="data-validation">
+                                                                               
                <xsl:text>number</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="data-validation-allowing">
+                                                                               
                <xsl:text>float</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="data-validation-error-msg">
+                                                                               
                <xsl:value-of select="php:function('lang', 'Please enter a 
multiplier !')"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:value-of select="survey/multiplier"/>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
+
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="date">
+                                                                       
<xsl:value-of select="php:function('lang', 'date')" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<input id="report_date" name='values[report_date]' type="text" 
value="{survey/report_date}"
+                                                                               
           data-validation="date" data-validation-format="dd/mm/yyyy"/>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:value-of select="survey/report_date"/>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
+
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="status">
+                                                                       
<xsl:value-of select="php:function('lang', 'status')" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<select id="status_id" name="values[status_id]">
+                                                                               
        <xsl:attribute name="data-validation">
+                                                                               
                <xsl:text>required</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:attribute name="data-validation-error-msg">
+                                                                               
                <xsl:value-of select="php:function('lang', 'Please enter a 
status !')"/>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:apply-templates select="status_list/options"/>
+                                                                               
</select>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:for-each select="status_list/options">
+                                                                               
        <xsl:if test="selected = 'selected' or selected = 1">
+                                                                               
                <xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                               
        </xsl:if>
+                                                                               
</xsl:for-each>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
+
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="coordinator">
+                                                                       
<xsl:value-of select="lang_coordinator" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<!--div class="autocomplete"-->
+                                                                               
<input type="hidden" id="coordinator_id" name="values[coordinator_id]"  
value="{survey/coordinator_id}"/>
+                                                                               
<input type="text" id="coordinator_name" name="values[coordinator_name]" 
value="{survey/coordinator_name}">
+                                                                               
</input>
+                                                                               
<div id="coordinator_container"/>
+                                                                               
<!--/div-->
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:value-of select="survey/coordinator_name" />
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
+
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor">
+                                                                       
<xsl:value-of select="php:function('lang', 'vendor')" />
+                                                               </label>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="editable = 1">
+                                                                               
<!--div class="autocomplete"-->
+                                                                               
<input type="hidden" id="vendor_id" name="values[vendor_id]"  
value="{survey/vendor_id}"/>
+                                                                               
<input type="text" id="vendor_name" name="values[vendor_name]" 
value="{survey/vendor_name}">
+                                                                               
</input>
+                                                                               
<div id="vendor_container"/>
+                                                                               
<!--/div-->
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<xsl:value-of select="survey/vendor_name" />
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </div>
+
+
+                                               </fieldset>
+                                       </div>
+
+                                       <div id="documents">
+                                               <script type="text/javascript">
+                                  
+                                                       var survey_id = 
'<xsl:value-of select='survey/id'/>';
+                                                       var multi_upload_parans 
= <xsl:value-of select="multi_upload_parans"/>;
+                                       
+                                                       
this.show_related_requests = function()
+                                                       {
+                                                       var oArgs = 
{menuaction:'property.uirequest.index', nonavbar:1, 
condition_survey_id:survey_id};
+                                                       var requestUrl = 
phpGWLink('index.php', oArgs);
+                                                       
TINY.box.show({iframe:requestUrl, 
boxid:'frameless',width:screen.width*.9,height:screen.height*.5,fixed:false,maskid:'darkmask',maskopacity:40,
 mask:true, animate:true, close: true});
+                                                       }
+                                               </script>
+
                                                <div class="pure-control-group">
-                                                       <label for="category">
-                                                               <xsl:value-of 
select="php:function('lang', 'category')" />
+
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'files')"/>
                                                        </label>
+                                                       <!--div 
style="clear:both;" id="datatable-container_0"></div-->
+                                                       <xsl:for-each 
select="datatable_def">
+                                                               <xsl:if 
test="container = 'datatable-container_0'">
+                                                                       
<xsl:call-template name="table_setup">
+                                                                               
<xsl:with-param name="container" select ='container'/>
+                                                                               
<xsl:with-param name="requestUrl" select ='requestUrl' />
+                                                                               
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+                                                                               
<xsl:with-param name="tabletools" select ='tabletools' />
+                                                                               
<xsl:with-param name="config" select ='config' />
+                                                                       
</xsl:call-template>
+                                                               </xsl:if>
+                                                       </xsl:for-each>
                                                        <xsl:choose>
                                                                <xsl:when 
test="editable = 1">
-                                                                       <select 
id="cat_id" name="values[cat_id]">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a category 
!')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:apply-templates select="categories/options"/>
-                                                                       
</select>
+                                                                       
<xsl:call-template name="file_upload"/>
                                                                </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:for-each select="categories/options">
-                                                                               
<xsl:if test="selected = 'selected' or selected = 1">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="name"/>
-                                                                               
</xsl:if>
-                                                                       
</xsl:for-each>
-                                                               </xsl:otherwise>
                                                        </xsl:choose>
                                                </div>
-                        
+                                       </div>
+                                       <div id="request">
                                                <div class="pure-control-group">
-                                                       <label for="multiplier">
-                                                               <xsl:value-of 
select="php:function('lang', 'multiplier')" />
+                                                       <label>
+                                                               <a 
href="javascript:show_related_requests();">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'details')"/>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:value-of select="php:function('lang', 'details')"/>
+                                                               </a>
                                                        </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <input 
id="multiplier" name='values[multiplier]' type="text" 
value="{survey/multiplier}">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>number</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-allowing">
-                                                                               
        <xsl:text>float</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a multiplier 
!')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="survey/multiplier"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
                                                </div>
-
                                                <div class="pure-control-group">
-                                                       <label for="date">
-                                                               <xsl:value-of 
select="php:function('lang', 'date')" />
+                                                       <label>
+                                                               <xsl:variable 
name="lang_new_request">
+                                                                       
<xsl:value-of select="php:function('lang', 'new record')" />
+                                                               </xsl:variable>
+                                                               <a 
href="javascript:document.load_new_request_form.submit();">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="$lang_new_request"/>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:value-of select="$lang_new_request"/>
+                                                               </a>
                                                        </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <input 
id="report_date" name='values[report_date]' type="text" 
value="{survey/report_date}"
-                                                                               
   data-validation="date" data-validation-format="dd/mm/yyyy"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="survey/report_date"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
                                                </div>
-
                                                <div class="pure-control-group">
-                                                       <label for="status">
-                                                               <xsl:value-of 
select="php:function('lang', 'status')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <select 
id="status_id" name="values[status_id]">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a status !')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:apply-templates select="status_list/options"/>
-                                                                       
</select>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:for-each select="status_list/options">
-                                                                               
<xsl:if test="selected = 'selected' or selected = 1">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="name"/>
-                                                                               
</xsl:if>
-                                                                       
</xsl:for-each>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
 
-                                               <div class="pure-control-group">
-                                                       <label 
for="coordinator">
-                                                               <xsl:value-of 
select="lang_coordinator" />
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'request')"/>
                                                        </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <!--div 
class="autocomplete"-->
-                                                                       <input 
type="hidden" id="coordinator_id" name="values[coordinator_id]"  
value="{survey/coordinator_id}"/>
-                                                                       <input 
type="text" id="coordinator_name" name="values[coordinator_name]" 
value="{survey/coordinator_name}">
-                                                                       </input>
-                                                                       <div 
id="coordinator_container"/>
-                                                                       
<!--/div-->
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="survey/coordinator_name" />
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
                                                </div>
-
+                                               <xsl:for-each 
select="datatable_def">
+                                                       <xsl:if test="container 
= 'datatable-container_1'">
+                                                               
<xsl:call-template name="table_setup">
+                                                                       
<xsl:with-param name="container" select ='container'/>
+                                                                       
<xsl:with-param name="requestUrl" select ='requestUrl' />
+                                                                       
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+                                                                       
<xsl:with-param name="tabletools" select ='tabletools' />
+                                                                       
<xsl:with-param name="config" select ='config' />
+                                                               
</xsl:call-template>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </div>
+                                       <div id="summation">
                                                <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'vendor')" />
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'summation')"/>
                                                        </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <!--div 
class="autocomplete"-->
-                                                                       <input 
type="hidden" id="vendor_id" name="values[vendor_id]"  
value="{survey/vendor_id}"/>
-                                                                       <input 
type="text" id="vendor_name" name="values[vendor_name]" 
value="{survey/vendor_name}">
-                                                                       </input>
-                                                                       <div 
id="vendor_container"/>
-                                                                       
<!--/div-->
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="survey/vendor_name" />
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
                                                </div>
-
-
-                                       </fieldset>
-                               </div>
-
-                               <div id="documents">
-                                       <script type="text/javascript">
-                                  
-                                               var survey_id = '<xsl:value-of 
select='survey/id'/>';
-                                               var multi_upload_parans = 
<xsl:value-of select="multi_upload_parans"/>;
-                                       
-                                               this.show_related_requests = 
function()
-                                               {
-                                               var oArgs = 
{menuaction:'property.uirequest.index', nonavbar:1, 
condition_survey_id:survey_id};
-                                               var requestUrl = 
phpGWLink('index.php', oArgs);
-                                               
TINY.box.show({iframe:requestUrl, 
boxid:'frameless',width:screen.width*.9,height:screen.height*.5,fixed:false,maskid:'darkmask',maskopacity:40,
 mask:true, animate:true, close: true});
-                                               }
-                                       </script>
-
-                                       <div class="pure-control-group">
-
-                                               <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'files')"/>
-                                               </label>
-                                               <!--div style="clear:both;" 
id="datatable-container_0"></div-->
+                                               <!--div style="clear:both;" 
id="datatable-container_2"></div-->
                                                <xsl:for-each 
select="datatable_def">
-                                                       <xsl:if test="container 
= 'datatable-container_0'">
+                                                       <xsl:if test="container 
= 'datatable-container_2'">
                                                                
<xsl:call-template name="table_setup">
                                                                        
<xsl:with-param name="container" select ='container'/>
                                                                        
<xsl:with-param name="requestUrl" select ='requestUrl' />
@@ -269,157 +337,91 @@
                                                                
</xsl:call-template>
                                                        </xsl:if>
                                                </xsl:for-each>
+
+                                       </div>
+                                       <div id="import">
                                                <xsl:choose>
                                                        <xsl:when 
test="editable = 1">
-                                                               
<xsl:call-template name="file_upload"/>
+                                                               <div 
class="pure-control-group">
+                                                                       <label>
+                                                                               
<xsl:value-of select="php:function('lang', 'upload file')"/>
+                                                                       </label>
+                                                                       <input 
type="file" name="import_file" size="40">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Select file to upload')"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </div>
                                                        </xsl:when>
                                                </xsl:choose>
                                        </div>
                                </div>
-                               <div id="request">
-                                       <div class="pure-control-group">
-                                               <label>
-                                                       <a 
href="javascript:show_related_requests();">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'details')"/>
-                                                               </xsl:attribute>
-                                                               <xsl:value-of 
select="php:function('lang', 'details')"/>
-                                                       </a>
-                                               </label>
-                                       </div>
-                                       <div class="pure-control-group">
-                                               <label>
-                                                       <xsl:variable 
name="lang_new_request">
-                                                               <xsl:value-of 
select="php:function('lang', 'new record')" />
-                                                       </xsl:variable>
-                                                       <a 
href="javascript:document.load_new_request_form.submit();">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="$lang_new_request"/>
-                                                               </xsl:attribute>
-                                                               <xsl:value-of 
select="$lang_new_request"/>
-                                                       </a>
-                                               </label>
-                                       </div>
-                                       <div class="pure-control-group">
-
-                                               <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'request')"/>
-                                               </label>
-                                       </div>
-                                       <xsl:for-each select="datatable_def">
-                                               <xsl:if test="container = 
'datatable-container_1'">
-                                                       <xsl:call-template 
name="table_setup">
-                                                               <xsl:with-param 
name="container" select ='container'/>
-                                                               <xsl:with-param 
name="requestUrl" select ='requestUrl' />
-                                                               <xsl:with-param 
name="ColumnDefs" select ='ColumnDefs' />
-                                                               <xsl:with-param 
name="tabletools" select ='tabletools' />
-                                                               <xsl:with-param 
name="config" select ='config' />
-                                                       </xsl:call-template>
-                                               </xsl:if>
-                                       </xsl:for-each>
-                               </div>
-                               <div id="summation">
-                                       <div class="pure-control-group">
-                                               <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'summation')"/>
-                                               </label>
-                                       </div>
-                                       <!--div style="clear:both;" 
id="datatable-container_2"></div-->
-                                       <xsl:for-each select="datatable_def">
-                                               <xsl:if test="container = 
'datatable-container_2'">
-                                                       <xsl:call-template 
name="table_setup">
-                                                               <xsl:with-param 
name="container" select ='container'/>
-                                                               <xsl:with-param 
name="requestUrl" select ='requestUrl' />
-                                                               <xsl:with-param 
name="ColumnDefs" select ='ColumnDefs' />
-                                                               <xsl:with-param 
name="tabletools" select ='tabletools' />
-                                                               <xsl:with-param 
name="config" select ='config' />
-                                                       </xsl:call-template>
-                                               </xsl:if>
-                                       </xsl:for-each>
-
-                               </div>
-                               <div id="import">
+                               <div class="form-buttons">
+                                       <xsl:variable name="lang_cancel">
+                                               <xsl:value-of 
select="php:function('lang', 'cancel')" />
+                                       </xsl:variable>
                                        <xsl:choose>
                                                <xsl:when test="editable = 1">
-                                                       <div 
class="pure-control-group">
-                                                               <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'upload file')"/>
-                                                               </label>
-                                                               <input 
type="file" name="import_file" size="40">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'Select file to upload')"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </div>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="php:function('lang', 'save')" />
+                                                       </xsl:variable>
+                                                       <input type="submit" 
class="pure-button pure-button-primary" name="save_project" 
value="{$lang_save}" title = "{$lang_save}" />
+                                                       <input 
class="pure-button pure-button-primary" type="button" name="cancelButton" id 
='cancelButton' value="{$lang_cancel}" title = "{$lang_cancel}" 
onClick="document.cancel_form.submit();"/>
                                                </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:variable 
name="lang_edit">
+                                                               <xsl:value-of 
select="php:function('lang', 'edit')" />
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_new_survey">
+                                                               <xsl:value-of 
select="php:function('lang', 'new')" />
+                                                       </xsl:variable>
+                                                       <input type="button" 
class="pure-button pure-button-primary" name="edit_survey" value="{$lang_edit}" 
title = "{$lang_edit}"  onClick="document.load_edit_form.submit();"/>
+                                                       <input type="button" 
class="pure-button pure-button-primary" name="new_survey" 
value="{$lang_new_survey}" title = "{$lang_new_survey}" 
onClick="document.new_form.submit();"/>
+                                                       <input 
class="pure-button pure-button-primary" type="button" name="cancelButton" id 
='cancelButton' value="{$lang_cancel}" title = "{$lang_cancel}" 
onClick="document.cancel_form.submit();"/>
+                                               </xsl:otherwise>
                                        </xsl:choose>
                                </div>
-                       </div>
-                       <div class="proplist-col">
-                               <xsl:variable name="lang_cancel">
-                                       <xsl:value-of 
select="php:function('lang', 'cancel')" />
-                               </xsl:variable>
-                               <xsl:choose>
-                                       <xsl:when test="editable = 1">
-                                               <xsl:variable name="lang_save">
-                                                       <xsl:value-of 
select="php:function('lang', 'save')" />
-                                               </xsl:variable>
-                                               <input type="submit" 
class="pure-button pure-button-primary" name="save_project" 
value="{$lang_save}" title = "{$lang_save}" />
-                                               <input class="pure-button 
pure-button-primary" type="button" name="cancelButton" id ='cancelButton' 
value="{$lang_cancel}" title = "{$lang_cancel}" 
onClick="document.cancel_form.submit();"/>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:variable name="lang_edit">
-                                                       <xsl:value-of 
select="php:function('lang', 'edit')" />
-                                               </xsl:variable>
-                                               <xsl:variable 
name="lang_new_survey">
-                                                       <xsl:value-of 
select="php:function('lang', 'new')" />
-                                               </xsl:variable>
-                                               <input type="button" 
class="pure-button pure-button-primary" name="edit_survey" value="{$lang_edit}" 
title = "{$lang_edit}"  onClick="document.load_edit_form.submit();"/>
-                                               <input type="button" 
class="pure-button pure-button-primary" name="new_survey" 
value="{$lang_new_survey}" title = "{$lang_new_survey}" 
onClick="document.new_form.submit();"/>
-                                               <input class="pure-button 
pure-button-primary" type="button" name="cancelButton" id ='cancelButton' 
value="{$lang_cancel}" title = "{$lang_cancel}" 
onClick="document.cancel_form.submit();"/>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </div>
-               </form>
-       </div>
+                       </form>
+               </div>
 
-       <xsl:variable name="cancel_url">
-               <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uicondition_survey.index')" />
-       </xsl:variable>
+               <xsl:variable name="cancel_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uicondition_survey.index')" />
+               </xsl:variable>
 
-       <form name="cancel_form" id="cancel_form" action="{$cancel_url}" 
method="post">
-       </form>
-       <xsl:variable name="new_url">
-               <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uicondition_survey.add')" />
-       </xsl:variable>
-       <form name="new_form" id="new_form" action="{$new_url}" method="post">
-       </form>
+               <form name="cancel_form" id="cancel_form" 
action="{$cancel_url}" method="post">
+               </form>
+               <xsl:variable name="new_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uicondition_survey.add')" />
+               </xsl:variable>
+               <form name="new_form" id="new_form" action="{$new_url}" 
method="post">
+               </form>
 
-       <xsl:variable name="edit_params">
-               <xsl:text>menuaction:property.uicondition_survey.edit, 
id:</xsl:text>
-               <xsl:value-of select="survey/id" />
-       </xsl:variable>
-       <xsl:variable name="edit_url">
-               <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $edit_params )" />
-       </xsl:variable>
+               <xsl:variable name="edit_params">
+                       <xsl:text>menuaction:property.uicondition_survey.edit, 
id:</xsl:text>
+                       <xsl:value-of select="survey/id" />
+               </xsl:variable>
+               <xsl:variable name="edit_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $edit_params )" />
+               </xsl:variable>
 
-       <form name="load_edit_form" id="load_edit_form" action="{$edit_url}" 
method="post">
-       </form>
+               <form name="load_edit_form" id="load_edit_form" 
action="{$edit_url}" method="post">
+               </form>
 
 
-       <xsl:variable name="new_request_params">
-               <xsl:text>menuaction:property.uirequest.edit, 
location_code:</xsl:text>
-               <xsl:value-of select="survey/location_code" />
-               <xsl:text>,origin:.project.condition_survey, 
origin_id:</xsl:text>
-               <xsl:value-of select="survey/id" />
-       </xsl:variable>
+               <xsl:variable name="new_request_params">
+                       <xsl:text>menuaction:property.uirequest.edit, 
location_code:</xsl:text>
+                       <xsl:value-of select="survey/location_code" />
+                       <xsl:text>,origin:.project.condition_survey, 
origin_id:</xsl:text>
+                       <xsl:value-of select="survey/id" />
+               </xsl:variable>
 
-       <xsl:variable name="new_request_url">
-               <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $new_request_params )" />
-       </xsl:variable>
+               <xsl:variable name="new_request_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $new_request_params )" />
+               </xsl:variable>
 
-       <form name="load_new_request_form" id="load_new_request_form" 
action="{$new_request_url}" method="post">
-       </form>
+               <form name="load_new_request_form" id="load_new_request_form" 
action="{$new_request_url}" method="post">
+               </form>
+       </div>
 
 </xsl:template>
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]