fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [13860]


From: Nelson Guerra
Subject: [Fmsystem-commits] [13860]
Date: Tue, 08 Sep 2015 00:13:05 +0000

Revision: 13860
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13860
Author:   nelson224
Date:     2015-09-08 00:13:04 +0000 (Tue, 08 Sep 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/rental/templates/base/billing.xsl

Modified: branches/dev-syncromind/rental/templates/base/billing.xsl
===================================================================
--- branches/dev-syncromind/rental/templates/base/billing.xsl   2015-09-08 
00:12:36 UTC (rev 13859)
+++ branches/dev-syncromind/rental/templates/base/billing.xsl   2015-09-08 
00:13:04 UTC (rev 13860)
@@ -92,82 +92,155 @@
                        <div id="tab-content">
                                <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                                <div id="details">
-                                       <fieldset>
-                                               <input type="hidden" 
name="step" value="2"/>
-                                               <input type="hidden" 
name="contract_type" value="{contract_type}"/>
-                                               <input type="hidden" 
name="year" value="{year}"/>
-                                               <input type="hidden" 
name="month" value="{month}"/>
-                                               <input type="hidden" 
name="title" value="{title}"/>
-                                               <input type="hidden" 
name="use_existing" value="{use_existing}"/>
-                                               <input type="hidden" 
name="existing_billing" value="{existing_billing}"/>
-                                               <input type="hidden" 
name="billing_term" value="{billing_term}"/>
-                                               <input type="hidden" 
name="billing_term_selection" value="{billing_term_selection}"/>
-                                               <input type="hidden" 
name="export_format" value="{export_format}"/>
-                                               
-                                               <div>
-                                                       <dl>
-                                                               
<dt><xsl:value-of select="php:function('lang', 'contract_type')"/></dt>
-                                                               
<dd><xsl:value-of select="fields_of_responsibility_label"/></dd>
-                                                               
<dt><xsl:value-of select="php:function('lang', 'billing_start')"/></dt> 
-                                                               
<dd><xsl:value-of select="billing_start"/></dd>
-                                                               
<dt><xsl:value-of select="php:function('lang', 'year')"/></dt>
-                                                               
<dd><xsl:value-of select="year"/></dd>
-                                                               
<dt><xsl:value-of select="php:function('lang', 'Export format')"/></dt>
-                                                               
<dd><xsl:value-of select="export_format"/></dd>
-                                                               <xsl:if 
test="billing_term = 1">
-                                                                       
<dt><xsl:value-of select="php:function('lang', 'month')"/></dt>
-                                                                       
<dd><xsl:value-of select="month"/></dd>
-                                                               </xsl:if>
-                                                               
<dt><xsl:value-of select="php:function('lang', 'billing_term')"/></dt>
-                                                               
<dd><xsl:value-of select="billing_term_label"/></dd>                            
                                                                                
                                                                                
-                                                       </dl>                   
                                
-                                               </div>
-                                               <div>
-                                                       <div 
class="proplist-col">
-                                                               <input 
type="submit" class="pure-button pure-button-primary" name="previous" 
value="previous"/>
-                                                               <input 
type="submit" class="pure-button pure-button-primary" name="next" value="next"/>
-                                                       </div>                  
                                
-                                               </div>
-                                               <div id="user_messages">
-                                                       <h3>Meldinger</h3>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//errorMsgs!=''">
-                                                                       <div 
class="error">
-                                                                               
<xsl:for-each select="errorMsgs">
-                                                                               
        <p class="message"><xsl:value-of select="current()"/></p>
-                                                                               
</xsl:for-each>
-                                                                       </div>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="//warningMsgs!=''">
-                                                                       <div 
class="warning">
-                                                                               
<xsl:for-each select="warningMsgs">
-                                                                               
        <p class="message"><xsl:value-of select="current()"/></p>
-                                                                               
</xsl:for-each>
-                                                                       </div>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="//infoMsgs!=''">
-                                                                       <div 
class="info">
-                                                                               
<xsl:for-each select="infoMsgs">
-                                                                               
        <p class="message"><xsl:value-of select="current()"/></p>
-                                                                               
</xsl:for-each>
-                                                                       </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                               </div>
-                                               <div id="list_navigation">
-                                                       <h3>Kontrakter i 
kjøring</h3>
-                                                       <ul>
-                                                               <li><a 
href="#non_cycle"><xsl:value-of select="php:function('lang', 
'contracts_out_of_cycle')"/> (<xsl:value-of 
select="count(irregular_contracts)"/>)</a></li>
-                                                               <li><a 
href="#one_time"><xsl:value-of select="php:function('lang', 
'contracts_with_one_time')"/> (<xsl:value-of 
select="count(contracts_with_one_time)"/>)</a></li>
-                                                               <li><a 
href="#cycle"><xsl:value-of select="php:function('lang', 
'contracts_in_cycle')"/> (<xsl:value-of select="count(contracts)"/>)</a></li>
-                                                       </ul>
-                                                       
<h3>Kontraktsinformasjon</h3>
-                                                       <ul>
-                                                               <li><a 
href="#new"><xsl:value-of select="php:function('lang', 
'contracts_not_billed_before')"/> (<xsl:value-of 
select="count(not_billed_contracts)"/>)</a></li>
-                                                               <li><a 
href="#removed"><xsl:value-of select="php:function('lang', 
'contracts_removed')"/> (<xsl:value-of 
select="count(removed_contracts)"/>)</a></li>
-                                                       </ul>
-                                               </div>
-                                       </fieldset>
+                                       <input type="hidden" name="step" 
value="2"/>
+                                       <input type="hidden" 
name="contract_type" value="{contract_type}"/>
+                                       <input type="hidden" name="year" 
value="{year}"/>
+                                       <input type="hidden" name="month" 
value="{month}"/>
+                                       <input type="hidden" name="title" 
value="{title}"/>
+                                       <input type="hidden" 
name="use_existing" value="{use_existing}"/>
+                                       <input type="hidden" 
name="existing_billing" value="{existing_billing}"/>
+                                       <input type="hidden" 
name="billing_term" value="{billing_term}"/>
+                                       <input type="hidden" 
name="billing_term_selection" value="{billing_term_selection}"/>
+                                       <input type="hidden" 
name="export_format" value="{export_format}"/>
+
+                                       <div>
+                                               <dl>
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'contract_type')"/></dt>
+                                                       <dd><xsl:value-of 
select="fields_of_responsibility_label"/></dd>
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'billing_start')"/></dt> 
+                                                       <dd><xsl:value-of 
select="billing_start"/></dd>
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'year')"/></dt>
+                                                       <dd><xsl:value-of 
select="year"/></dd>
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'Export format')"/></dt>
+                                                       <dd><xsl:value-of 
select="export_format"/></dd>
+                                                       <xsl:if 
test="billing_term = 1">
+                                                               
<dt><xsl:value-of select="php:function('lang', 'month')"/></dt>
+                                                               
<dd><xsl:value-of select="month"/></dd>
+                                                       </xsl:if>
+                                                       <dt><xsl:value-of 
select="php:function('lang', 'billing_term')"/></dt>
+                                                       <dd><xsl:value-of 
select="billing_term_label"/></dd>                                              
                                                                                
                                                              
+                                               </dl>                           
                        
+                                       </div>
+                                       <div>
+                                               <div class="proplist-col">
+                                                       <input type="submit" 
class="pure-button pure-button-primary" name="previous" value="previous"/>
+                                                       <input type="submit" 
class="pure-button pure-button-primary" name="next" value="next"/>
+                                               </div>                          
                        
+                                       </div>
+                                       <div id="user_messages">
+                                               <h3>Meldinger</h3>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="//errorMsgs!=''">
+                                                               <div 
class="error">
+                                                                       
<xsl:for-each select="errorMsgs">
+                                                                               
<p class="message"><xsl:value-of select="current()"/></p>
+                                                                       
</xsl:for-each>
+                                                               </div>
+                                                       </xsl:when>
+                                                       <xsl:when 
test="//warningMsgs!=''">
+                                                               <div 
class="warning">
+                                                                       
<xsl:for-each select="warningMsgs">
+                                                                               
<p class="message"><xsl:value-of select="current()"/></p>
+                                                                       
</xsl:for-each>
+                                                               </div>
+                                                       </xsl:when>
+                                                       <xsl:when 
test="//infoMsgs!=''">
+                                                               <div 
class="info">
+                                                                       
<xsl:for-each select="infoMsgs">
+                                                                               
<p class="message"><xsl:value-of select="current()"/></p>
+                                                                       
</xsl:for-each>
+                                                               </div>
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                       </div>
+                                       <div id="list_navigation">
+                                               <h3>Kontrakter i kjøring</h3>
+                                               <ul>
+                                                       <li><a 
href="#non_cycle"><xsl:value-of select="php:function('lang', 
'contracts_out_of_cycle')"/> (<xsl:value-of 
select="count(irregular_contracts)"/>)</a></li>
+                                                       <li><a 
href="#one_time"><xsl:value-of select="php:function('lang', 
'contracts_with_one_time')"/> (<xsl:value-of 
select="count(contracts_with_one_time)"/>)</a></li>
+                                                       <li><a 
href="#cycle"><xsl:value-of select="php:function('lang', 
'contracts_in_cycle')"/> (<xsl:value-of select="count(contracts)"/>)</a></li>
+                                               </ul>
+                                               <h3>Kontraktsinformasjon</h3>
+                                               <ul>
+                                                       <li><a 
href="#new"><xsl:value-of select="php:function('lang', 
'contracts_not_billed_before')"/> (<xsl:value-of 
select="count(not_billed_contracts)"/>)</a></li>
+                                                       <li><a 
href="#removed"><xsl:value-of select="php:function('lang', 
'contracts_removed')"/> (<xsl:value-of 
select="count(removed_contracts)"/>)</a></li>
+                                               </ul>
+                                       </div>
+                                       <div>
+                                               <h2><xsl:value-of 
select="php:function('lang', 'contracts_out_of_cycle')"/> (<xsl:value-of 
select="count(irregular_contracts)"/>)</h2>
+                                               <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="data" select ='data' />
+                                                                       
<xsl:with-param name="config" select ='config' />
+                                                               
</xsl:call-template>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </div>
+                                       <div>
+                                               <h2><xsl:value-of 
select="php:function('lang', 'contracts_with_one_time')"/> (<xsl:value-of 
select="count(contracts_with_one_time)"/>)</h2>
+                                               <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="data" select ='data' />
+                                                                       
<xsl:with-param name="config" select ='config' />
+                                                               
</xsl:call-template>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </div>
+                                       <div>
+                                               <h2><xsl:value-of 
select="php:function('lang', 'contracts_in_cycle')"/> (<xsl:value-of 
select="count(contracts)"/>)</h2>
+                                               <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="data" select ='data' />
+                                                                       
<xsl:with-param name="config" select ='config' />
+                                                               
</xsl:call-template>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </div>
+                                       <div>
+                                               <h2><xsl:value-of 
select="php:function('lang', 'contracts_not_billed_before')"/> (<xsl:value-of 
select="count(not_billed_contracts)"/>)</h2>
+                                               <xsl:for-each 
select="datatable_def">
+                                                       <xsl:if test="container 
= 'datatable-container_3'">
+                                                               
<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="data" select ='data' />
+                                                                       
<xsl:with-param name="config" select ='config' />
+                                                               
</xsl:call-template>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </div>
+                                       <div>
+                                               <h2><xsl:value-of 
select="php:function('lang', 'contracts_removed')"/> (<xsl:value-of 
select="count(removed_contracts)"/>)</h2>
+                                               <xsl:for-each 
select="datatable_def">
+                                                       <xsl:if test="container 
= 'datatable-container_4'">
+                                                               
<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="data" select ='data' />
+                                                                       
<xsl:with-param name="config" select ='config' />
+                                                               
</xsl:call-template>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </div>                                  
        
                                </div>
                        </div>
                </form>




reply via email to

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