fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [14344]


From: Nelson Guerra
Subject: [Fmsystem-commits] [14344]
Date: Fri, 13 Nov 2015 00:13:31 +0000

Revision: 14344
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14344
Author:   nelson224
Date:     2015-11-13 00:13:30 +0000 (Fri, 13 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/frontend/templates/base/contract.xsl

Modified: branches/dev-syncromind/frontend/templates/base/contract.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/contract.xsl        
2015-11-13 00:12:59 UTC (rev 14343)
+++ branches/dev-syncromind/frontend/templates/base/contract.xsl        
2015-11-13 00:13:30 UTC (rev 14344)
@@ -1,182 +1,192 @@
 <xsl:template match="contract_data" xmlns:php="http://php.net/xsl";>
        <!-- <xsl:copy-of select="."/> -->
-       <div id="tab-content">
-               <xsl:value-of disable-output-escaping="yes" select="tabs" />
-               <xsl:variable name="location_id"><xsl:value-of 
select="location_id"/></xsl:variable>
-               <div id="{$location_id}">
-               <div>
-               <div id="contract_selector">
-                                  <img 
src="frontend/templates/base/images/16x16/page_white_stack.png" 
class="list_image"/>
-                                  <form action="{form_url}" method="post">
-                                               <select name="contract_filter" 
onchange="this.form.submit()">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//contract_filter = 'active'">
-                                                                       <option 
value="active" selected="selected"><xsl:value-of select="php:function('lang', 
'active')"/></option>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <option 
value="active"><xsl:value-of select="php:function('lang', 'active')"/></option>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//contract_filter = 'not_active'">
-                                                                       <option 
value="not_active" selected="selected"><xsl:value-of 
select="php:function('lang', 'not_active')"/></option>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <option 
value="not_active"><xsl:value-of select="php:function('lang', 
'not_active')"/></option>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//contract_filter = 'all'">
-                                                                       <option 
value="all" selected="selected"><xsl:value-of select="php:function('lang', 
'all')"/></option>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <option 
value="all"><xsl:value-of select="php:function('lang', 'all')"/></option>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </select>
-                                       </form>
-                                   <xsl:choose>
-                                               <xsl:when 
test="not(normalize-space(select)) and (count(select) &lt;= 1)">
-                                                        <em 
style="margin-left: 1em; float: left;"><xsl:value-of 
select="php:function('lang', 'no_contracts')"/></em>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                    <form action="{form_url}" 
method="post">
-                                                               <xsl:for-each 
select="select">
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="id = //selected_contract">
-                                                                               
        <input name="contract_id" type="radio" value="{id}" checked="" 
onclick="this.form.submit();" style="margin-left: 1em;"></input> 
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise> 
-                                                                               
        <input name="contract_id" type="radio" value="{id}" onclick     
="this.form.submit();" style="margin-left: 1em;"></input>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                                       <label 
style="margin-right: 1em; padding-left: 5px;"> <xsl:value-of 
select="old_contract_id"/> (<xsl:value-of select="contract_status"/>)</label>
-                                                               </xsl:for-each>
-                                                         </form>
-                                                </xsl:otherwise>
-                                             </xsl:choose>
-                               </div>
-                       </div>
-                       <div>
-                               <div id="contract_details">
-                                        <xsl:choose>
-                                               <xsl:when 
test="not(normalize-space(contract))">
-                                                        <!-- <xsl:value-of 
select="php:function('lang', 'no_contract_details')"/>:  -->
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:for-each 
select="contract">
-                                                               <div 
id="contract_essentials">
-                                                                               
<ul>
-                                                                               
        <li><em><img src="frontend/templates/base/images/16x16/page_white.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'old_contract_id')"/>: <xsl:value-of select="old_contract_id"/></li>
-                                                                               
<li><em><img src="frontend/templates/base/images/16x16/page_white.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'contract_type')"/>: <xsl:value-of select="type"/></li>
-                                                                               
<li><em><img src="frontend/templates/base/images/16x16/timeline_marker.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'contract_status')"/>: <xsl:value-of select="contract_status"/></li>
-                                                                               
<li><em><img src="frontend/templates/base/images/16x16/resultset_first.png"  
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'date_start')"/>: <xsl:value-of select="date_start"/></li>
-                                                                               
<li><em><img src="frontend/templates/base/images/16x16/resultset_last.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'date_end')"/>: 
-                                                                               
        <xsl:choose>
-                                                                               
                        <xsl:when test="date_end != ''">
-                                                                               
                                <xsl:value-of select="date_end"/>
-                                                                               
                        </xsl:when>
-                                                                               
                        <xsl:otherwise >
-                                                                               
                                <xsl:value-of select="php:function('lang', 
'no_end_date')"/>
-                                                                               
                        </xsl:otherwise>
-                                                                               
                </xsl:choose>
-                                                                               
        </li>
-                                                                       <!-- 
</ul>
-                                                               </div>
-                                                                       <div 
id="contract_price_and_area" style="block:right;">
-                                                                               
<ul> -->
-                                                                               
        <li><em><img src="frontend/templates/base/images/16x16/shading.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'rented_area')"/>: <xsl:value-of select="rented_area"/></li>    
-                                                                               
        <li><em><img src="frontend/templates/base/images/16x16/coins.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'total_price')"/>: <xsl:value-of select="total_price"/></li>      
-                                                                               
        <li><em><img 
src="frontend/templates/base/images/16x16/page_white_edit.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'service_id')"/>: <xsl:value-of select="service_id"/></li>      
-                                                                               
        <li><em><img 
src="frontend/templates/base/images/16x16/page_white_edit.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'responsibility_id')"/>: <xsl:value-of select="responsibility_id"/></li>        
-                                                                               
</ul>
-                                                                       </div>
-                                                                       
-                                                                       <div 
id="contract_parts">
-                                                                               
<ul>
+       <table cellpadding="2" cellspacing="2" width="95%" align="center">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="3">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
+       </table>
+       <div class="pure-form pure-form-aligned">
+               <div id="tab-content">
+                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
+                       <xsl:variable name="location_id"><xsl:value-of 
select="location_id"/></xsl:variable>
+                       <div id="{$location_id}">
+                               <div class="pure-g">
+                                       <div class="pure-u-1">
+                                           <img 
src="frontend/templates/base/images/16x16/page_white_stack.png" 
class="list_image"/>
+                                           <form action="{form_url}" 
method="post">
+                                                       <select 
name="contract_filter" onchange="this.form.submit()">
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="//contract_filter = 'active'">
+                                                                               
<option value="active" selected="selected"><xsl:value-of 
select="php:function('lang', 'active')"/></option>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<option value="active"><xsl:value-of select="php:function('lang', 
'active')"/></option>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="//contract_filter = 'not_active'">
+                                                                               
<option value="not_active" selected="selected"><xsl:value-of 
select="php:function('lang', 'not_active')"/></option>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<option value="not_active"><xsl:value-of select="php:function('lang', 
'not_active')"/></option>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="//contract_filter = 'all'">
+                                                                               
<option value="all" selected="selected"><xsl:value-of 
select="php:function('lang', 'all')"/></option>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<option value="all"><xsl:value-of select="php:function('lang', 
'all')"/></option>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
+                                                       </select>
+                                               </form>
+                                       </div>
+                                       <xsl:choose>
+                                               <xsl:when 
test="not(normalize-space(select)) and (count(select) &lt;= 1)">
+                                                       <div class="pure-u-1">
+                                                               <em 
style="margin-left: 1em; float: left;"><xsl:value-of 
select="php:function('lang', 'no_contracts')"/></em>
+                                                       </div>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <div class="pure-u-1">
+                                                               <form 
action="{form_url}" method="post">
+                                                                       
<xsl:for-each select="select">
+                                                                               
<xsl:choose>
+                                                                               
        <xsl:when test="id = //selected_contract">
+                                                                               
                <input name="contract_id" type="radio" value="{id}" checked="" 
onclick="this.form.submit();" style="margin-left: 1em;"></input> 
+                                                                               
        </xsl:when>
+                                                                               
        <xsl:otherwise> 
+                                                                               
                <input name="contract_id" type="radio" value="{id}" onclick     
="this.form.submit();" style="margin-left: 1em;"></input>
+                                                                               
        </xsl:otherwise>
+                                                                               
</xsl:choose>
+                                                                               
<label style="margin-right: 1em; padding-left: 5px;"> <xsl:value-of 
select="old_contract_id"/> (<xsl:value-of select="contract_status"/>)</label>
+                                                                       
</xsl:for-each>
+                                                               </form>
+                                                       </div>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </div>
+
+                               <div class="pure-g">
+                                       <xsl:choose>
+                                               <xsl:when 
test="not(normalize-space(contract))">
+                                                        <!-- <xsl:value-of 
select="php:function('lang', 'no_contract_details')"/>:  -->
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:for-each 
select="contract">
+                                                               <div 
class="pure-u-1 pure-u-md-1-2">
+                                                                       <ul>
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/page_white.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'old_contract_id')"/>: <xsl:value-of select="old_contract_id"/></li>
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/page_white.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'contract_type')"/>: <xsl:value-of select="type"/></li>
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/timeline_marker.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'contract_status')"/>: <xsl:value-of select="contract_status"/></li>
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/resultset_first.png"  
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'date_start')"/>: <xsl:value-of select="date_start"/></li>
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/resultset_last.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'date_end')"/>: 
+                                                                               
        <xsl:choose>
+                                                                               
                <xsl:when test="date_end != ''">
+                                                                               
                        <xsl:value-of select="date_end"/>
+                                                                               
                </xsl:when>
+                                                                               
                <xsl:otherwise >
+                                                                               
                        <xsl:value-of select="php:function('lang', 
'no_end_date')"/>
+                                                                               
                </xsl:otherwise>
+                                                                               
        </xsl:choose>
+                                                                               
</li>
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/shading.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'rented_area')"/>: <xsl:value-of select="rented_area"/></li>    
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/coins.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'total_price')"/>: <xsl:value-of select="total_price"/></li>      
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/page_white_edit.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'service_id')"/>: <xsl:value-of select="service_id"/></li>      
+                                                                               
<li><em><img src="frontend/templates/base/images/16x16/page_white_edit.png" 
class="list_image"/></em><xsl:value-of select="php:function('lang', 
'responsibility_id')"/>: <xsl:value-of select="responsibility_id"/></li>        
+                                                                       </ul>
+                                                               </div>
+
+                                                               <div 
class="pure-u-1 pure-u-md-1-2">
+                                                                       <ul>
                                                                                
<li style="border-style: none none solid none; border-width: 1px; border-color: 
grey; margin-bottom: 5px; padding-bottom: 5px;" >
                                                                                
        <img src="frontend/templates/base/images/16x16/group.png" 
class="list_image" />
                                                                                
        <em>Kontraktsparter</em>
                                                                                
</li>
                                                                                
<xsl:for-each select="../party">
-                                                                               
                <li style="margin-bottom: 5px;"><em><img 
src="frontend/templates/base/images/16x16/user_gray.png" class="list_image" 
/></em><xsl:value-of select="name"/><br/>
-                                                                               
                        <ul style="margin-left: 2em;">
-                                                                               
                                <xsl:choose>
-                                                                               
                                        <xsl:when 
test="normalize-space(address)">
-                                                                               
                                                <li><xsl:value-of 
select="address"/></li>
-                                                                               
                                        </xsl:when>
-                                                                               
                                        <xsl:when 
test="normalize-space(address1)">
-                                                                               
                                                <li><xsl:value-of 
select="address1"/><br/>
-                                                                               
                                                <xsl:value-of 
select="address2"/><br/>
-                                                                               
                                                <xsl:value-of 
select="postal_code"/>&nbsp;
-                                                                               
                                                <xsl:value-of 
select="place"/></li>
-                                                                               
                                        </xsl:when>
-                                                                               
                                        <xsl:when 
test="normalize-space(department)">
-                                                                               
                                                <li><xsl:value-of 
select="department"/></li>
-                                                                               
                                        </xsl:when>
-                                                                               
                                </xsl:choose>
-                                                                               
                        </ul>
-                                                                               
                </li>
+                                                                               
        <li style="margin-bottom: 5px;"><em><img 
src="frontend/templates/base/images/16x16/user_gray.png" class="list_image" 
/></em><xsl:value-of select="name"/><br/>
+                                                                               
                <ul style="margin-left: 2em;">
+                                                                               
                        <xsl:choose>
+                                                                               
                                <xsl:when test="normalize-space(address)">
+                                                                               
                                        <li><xsl:value-of 
select="address"/></li>
+                                                                               
                                </xsl:when>
+                                                                               
                                <xsl:when test="normalize-space(address1)">
+                                                                               
                                        <li><xsl:value-of 
select="address1"/><br/>
+                                                                               
                                        <xsl:value-of select="address2"/><br/>
+                                                                               
                                        <xsl:value-of 
select="postal_code"/>&nbsp;
+                                                                               
                                        <xsl:value-of select="place"/></li>
+                                                                               
                                </xsl:when>
+                                                                               
                                <xsl:when test="normalize-space(department)">
+                                                                               
                                        <li><xsl:value-of 
select="department"/></li>
+                                                                               
                                </xsl:when>
+                                                                               
                        </xsl:choose>
+                                                                               
                </ul>
+                                                                               
        </li>
                                                                                
</xsl:for-each>
-                                                                               
<!-- </ul>
-                                                                       </div>
-                                                                       <div 
id="composites">
-                                                                               
<ul> -->
+
                                                                                
<li style="border-style: none none solid none; border-width: 1px; border-color: 
grey; margin-bottom: 5px; margin-top: 2em; padding-bottom: 5px;" >
                                                                                
        <img src="frontend/templates/base/images/16x16/layers.png" 
class="list_image" />
                                                                                
        <em>Leieobjekt</em>
                                                                                
</li>
                                                                                
<xsl:for-each select="../composite">
-                                                                               
                <li><img 
src="frontend/templates/base/images/16x16/application_home.png" 
class="list_image" /> <xsl:value-of select="name" /></li>
-                                                                               
                <li>
-                                                                               
                        <dl style="padding-left: 1em;">
-                                                                               
                                <dt style="float: left;"><img 
src="frontend/templates/base/images/16x16/house.png" class="list_image" /></dt>
-                                                                               
                                <dd><br/>
-                                                                               
                                        <xsl:if test="normalize-space(address)">
-                                                                               
                                                <xsl:value-of select="address" 
disable-output-escaping="yes"/>
-                                                                               
                                        </xsl:if>
-                                                                               
                                </dd>
-                                                                               
                        </dl>
-                                                                               
                </li>
-                                                                               
</xsl:for-each>
-                                                                               
</ul>
-                                                                       </div>
-                                                                       <div 
id="comment">
-                                                                               
<ul>
-                                                                               
        <xsl:choose>
-                                                                               
                <xsl:when test="publish_comment = 1">
-                                                                               
                        <li style="border-style: none none solid none; 
border-width: 1px; border-color: grey; margin-bottom: 5px; padding-bottom: 5px; 
margin-right: 1em;" >
-                                                                               
                                <img 
src="frontend/templates/base/images/16x16/comment.png" class="list_image" />
-                                                                               
                                <em><xsl:value-of select="php:function('lang', 
'comment')"/></em>
-                                                                               
                        </li>
-                                                                               
                        <li style="margin-bottom: 10px;">
-                                                                               
                                <xsl:value-of select="comment" 
disable-output-escaping="yes"/>
-                                                                               
                        </li>
-                                                                               
                </xsl:when>
-                                                                               
        </xsl:choose>
-                                                                               
        <li style="border-style: none none solid none; border-width: 1px; 
border-color: grey; padding-bottom: 5px; margin-right: 1em;">
-                                                                               
                <img 
src="frontend/templates/base/images/16x16/comment_edit.png" class="list_image" 
/>
-                                                                               
                <xsl:value-of select="php:function('lang', 
'send_contract_message')"/>
-                                                                               
        </li>
+                                                                               
        <li><img 
src="frontend/templates/base/images/16x16/application_home.png" 
class="list_image" /> <xsl:value-of select="name" /></li>
                                                                                
        <li>
-                                                                               
                <xsl:variable name="btn_send"><xsl:value-of 
select="php:function('lang', 'btn_send')"/></xsl:variable>
-                                                                               
                <form action="{form_url}" method="post">
-                                                                               
                <input type="hidden" name="contract_id" 
value="{//selected_contract}"/>
-                                                                               
                <br/>
-                                                                               
                <textarea name="contract_message" cols="80" rows="5">
-                                                                               
                </textarea><br/>
-                                                                               
                <input type="submit" name="send" value="{$btn_send}"/>
-                                                                               
        </form>
+                                                                               
                <dl style="padding-left: 1em;">
+                                                                               
                        <dt style="float: left;"><img 
src="frontend/templates/base/images/16x16/house.png" class="list_image" /></dt>
+                                                                               
                        <dd><br/>
+                                                                               
                                <xsl:if test="normalize-space(address)">
+                                                                               
                                        <xsl:value-of select="address" 
disable-output-escaping="yes"/>
+                                                                               
                                </xsl:if>
+                                                                               
                        </dd>
+                                                                               
                </dl>
                                                                                
        </li>
-                                                                               
</ul>
-                                                                       </div>
-                                                               </xsl:for-each>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
+                                                                               
</xsl:for-each>
+                                                                       </ul>
+                                                               </div>
+
+                                                               <div 
class="pure-u-1 pure-u-md-1-2">
+                                                                       <ul>
+                                                                               
<xsl:choose>
+                                                                               
        <xsl:when test="publish_comment = 1">
+                                                                               
                <li style="border-style: none none solid none; border-width: 
1px; border-color: grey; margin-bottom: 5px; padding-bottom: 5px; margin-right: 
1em;" >
+                                                                               
                        <img 
src="frontend/templates/base/images/16x16/comment.png" class="list_image" />
+                                                                               
                        <em><xsl:value-of select="php:function('lang', 
'comment')"/></em>
+                                                                               
                </li>
+                                                                               
                <li style="margin-bottom: 10px;">
+                                                                               
                        <xsl:value-of select="comment" 
disable-output-escaping="yes"/>
+                                                                               
                </li>
+                                                                               
        </xsl:when>
+                                                                               
</xsl:choose>
+                                                                               
<li style="border-style: none none solid none; border-width: 1px; border-color: 
grey; padding-bottom: 5px; margin-right: 1em;">
+                                                                               
        <img src="frontend/templates/base/images/16x16/comment_edit.png" 
class="list_image" />
+                                                                               
        <xsl:value-of select="php:function('lang', 'send_contract_message')"/>
+                                                                               
</li>
+                                                                               
<li>
+                                                                               
        <xsl:variable name="btn_send"><xsl:value-of 
select="php:function('lang', 'btn_send')"/></xsl:variable>
+                                                                               
        <form action="{form_url}" method="post">
+                                                                               
                <input type="hidden" name="contract_id" 
value="{//selected_contract}"/>
+                                                                               
                <br/>
+                                                                               
                <textarea name="contract_message" cols="80" rows="5">
+                                                                               
                </textarea><br/>
+                                                                               
                <input type="submit" class="pure-button pure-button-active" 
name="send" value="{$btn_send}"/>
+                                                                               
        </form>
+                                                                               
</li>
+                                                                       </ul>
+                                                               </div>
+                                                       </xsl:for-each>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
                                </div>
-               </div>
-       </div>
-    </div>
+                       </div>
+               </div>
+       </div>
 </xsl:template>
 
 <xsl:template match="contract">




reply via email to

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