[Fmsystem-commits] [13966] Syncromind: Merge 13964:13965 from trunk

[Sigurd Nes]

Revision: 13966
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13966
Author:   sigurdne
Date:     2015-09-18 09:17:26 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Syncromind: Merge 13964:13965 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/property/templates/base/admin_entity.xsl
    
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh

Modified: branches/dev-syncromind/property/templates/base/admin_entity.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/admin_entity.xsl    
2015-09-18 09:15:28 UTC (rev 13965)
+++ branches/dev-syncromind/property/templates/base/admin_entity.xsl    
2015-09-18 09:17:26 UTC (rev 13966)
@@ -2135,21 +2135,36 @@
 
 <!-- New template-->
 <xsl:template xmlns:php="http://php.net/xsl"; name="choice">
+       <xsl:variable name="lang_id">
+               <xsl:value-of select="php:function('lang', 'id')"/>
+       </xsl:variable>
+       <xsl:variable name="lang_value">
+               <xsl:value-of select="php:function('lang', 'value')"/>
+       </xsl:variable>
+       <xsl:variable name="lang_sorting">
+               <xsl:value-of select="php:function('lang', 'sorting')"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_value">
+               <xsl:value-of select="php:function('lang', 'delete value')"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_title">
+                       <xsl:value-of select="php:function('lang', 'delete this 
value from the list of multiple choice')"/>
+       </xsl:variable>
        <table class="pure-table pure-table-bordered">
                <xsl:choose>
                        <xsl:when test="value_choice!=''">
                                <tr class="th">
                                        <td class="th_text" width="5%" 
align="left">
-                                               <xsl:value-of 
select="php:function('lang', 'id')"/>
+                                               <xsl:value-of 
select="$lang_id"/>
                                        </td>
                                        <td class="th_text" width="85%" 
align="left">
-                                               <xsl:value-of 
select="php:function('lang', 'value')"/>
+                                               <xsl:value-of 
select="$lang_value"/>
                                        </td>
                                        <td class="th_text" width="85%" 
align="left">
-                                               <xsl:value-of 
select="php:function('lang', 'order')"/>
+                                               <xsl:value-of 
select="$lang_sorting"/>
                                        </td>
                                        <td class="th_text" width="15%" 
align="center">
-                                               <xsl:value-of 
select="php:function('lang', 'delete value')"/>
+                                               <xsl:value-of 
select="$lang_delete_value"/>
                                        </td>
                                </tr>
                                <xsl:for-each select="value_choice">
@@ -2173,21 +2188,21 @@
                                                <td align="left">
                                                        <input type="textbox" 
name="values[edit_choice][{id}]" value="{value}" size="15">
                                                                <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'value')"/>
+                                                                       
<xsl:value-of select="$lang_value"/>
                                                                </xsl:attribute>
                                                        </input>
                                                </td>
                                                <td align="center">
                                                        <input type="textbox" 
name="values[order_choice][{id}]" value="{order}" size="4">
                                                                <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'order')"/>
+                                                                       
<xsl:value-of select="$lang_sorting"/>
                                                                </xsl:attribute>
                                                        </input>
                                                </td>
                                                <td align="center">
                                                        <input type="checkbox" 
name="values[delete_choice][]" value="{id}">
                                                                <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'delete this value from the list of 
multiple choice')"/>
+                                                                       
<xsl:value-of select="$lang_delete_title"/>
                                                                </xsl:attribute>
                                                        </input>
                                                </td>

Modified: 
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh
===================================================================
--- 
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh  
    2015-09-18 09:15:28 UTC (rev 13965)
+++ 
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh  
    2015-09-18 09:17:26 UTC (rev 13966)
@@ -269,7 +269,7 @@
 make install
 
 
-
+#export ORACLE_HOME=/opt/instantclient_12_1/ &&\
 #export LDFLAGS=-lstdc++ &&\
 #./configure \
 # --with-sybase-ct=/usr/local/freetds\
@@ -305,4 +305,4 @@
 # --enable-zip \
 # --with-oci8=instantclient,/opt/instantclient_12_1/ --with-pdo-oci
 
-# vim: set expandtab :
\ No newline at end of file
+# vim: set expandtab :