[Fmsystem-commits] [13059] more on invoice2

[Sigurd Nes]

Revision: 13059
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13059
Author:   sigurdne
Date:     2015-04-22 08:39:07 +0000 (Wed, 22 Apr 2015)
Log Message:
-----------
more on invoice2

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
    branches/dev-syncromind/property/templates/base/invoice2.xsl

Modified: branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php       
2015-04-22 08:38:39 UTC (rev 13058)
+++ branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php       
2015-04-22 08:39:07 UTC (rev 13059)
@@ -135,7 +135,7 @@
                        if($voucher_id)
                        {
                                $filename = "{$voucher_id}_split";
-                               $voucher = 
$this->bo->read_invoice_sub($voucher_id);
+                               $voucher = 
$this->bo->read_invoice_sub(array('voucher_id' => $voucher_id));
                                foreach($voucher as $line)
                                {
                                        $data[] = array
@@ -636,7 +636,7 @@
                                $voucher_id = phpgw::get_var('voucher_id');
                        }
                        $this->bo->allrows = true;
-                       $values = $this->bo->read_invoice_sub($voucher_id);
+                       $values = 
$this->bo->read_invoice_sub(array('voucher_id' => $voucher_id));
 
                        foreach($values as &$entry)
                        {
@@ -690,7 +690,7 @@
                public function get_first_line()
                {
                        $voucher_id =  phpgw::get_var('voucher_id', 'int');
-                       $voucher = $this->bo->read_invoice_sub($voucher_id);
+                       $voucher = 
$this->bo->read_invoice_sub(array('voucher_id' => $voucher_id));
                        $ret = array('line_id' => 0);
                        if($voucher)
                        {

Modified: branches/dev-syncromind/property/templates/base/invoice2.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/invoice2.xsl        
2015-04-22 08:38:39 UTC (rev 13058)
+++ branches/dev-syncromind/property/templates/base/invoice2.xsl        
2015-04-22 08:39:07 UTC (rev 13059)
@@ -28,7 +28,29 @@
        {
                background-color: #DDF0FF;
        }
+#navcontainer ul
+{
+margin: 0;
+padding: 0;
+list-style-type: none;
+text-align: right;
+}
 
+#navcontainer ul li { display: inline; }
+
+#navcontainer ul li a
+{
+text-decoration: none;
+padding: .2em 1em;
+color: #fff;
+background-color: #036;
+}
+
+#navcontainer ul li a:hover
+{
+color: #fff;
+background-color: #369;
+}
        </style>
 
        <xsl:call-template name="invoice" />
@@ -46,37 +68,37 @@
                <script type="text/javascript">
                        var email_base_url = <xsl:value-of 
select="//email_base_url"/>;
                </script>
-                       <!--div class="ui-layout-north">
-                               <div id="horizontal-menu">
-                                       <ul id="std-menu-items">
+                       <div class="ui-layout-north">
+                               <div id="navcontainer">
+                                       <ul>
                                                <li>
-                                                       <a href="#">Nes, 
Sigurd</a>
-                                                       <ul>
-                                                               <li>
-                                                                       <a 
href="{home_url}" class="icon icon-home">
-                                                                               
<xsl:value-of select="home_text"/>
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a 
href="{about_url}" class="icon icon-about">
-                                                                               
<xsl:value-of select="about_text"/>
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a 
href="{preferences_url}" class="icon icon-preferences">
-                                                                               
<xsl:value-of select="preferences_text"/>
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a 
href="{logout_url}" class="icon icon-logout">
-                                                                               
<xsl:value-of select="logout_text"/>
-                                                                       </a>
-                                                               </li>
-                                                       </ul>
+                                                       <a href="#">
+                                                               <xsl:value-of 
select="user_fullname"/>
+                                                       </a>
                                                </li>
+                                               <li>
+                                                       <a href="{home_url}" 
class="icon icon-home">
+                                                               <xsl:value-of 
select="home_text"/>
+                                                       </a>
+                                               </li>
+                                               <!--li>
+                                                       <a href="{about_url}" 
class="icon icon-about">
+                                                               <xsl:value-of 
select="about_text"/>
+                                                       </a>
+                                               </li>
+                                               <li>
+                                                       <a 
href="{preferences_url}" class="icon icon-preferences">
+                                                               <xsl:value-of 
select="preferences_text"/>
+                                                       </a>
+                                               </li-->
+                                               <li>
+                                                       <a href="{logout_url}" 
class="icon icon-logout">
+                                                               <xsl:value-of 
select="logout_text"/>
+                                                       </a>
+                                               </li>
                                        </ul>
                                </div>
-                       </div-->
+                       </div>
                        <div class="ui-layout-center">
                                <div class="header">
                                        <h2><xsl:value-of 
select="php:function('lang', 'invoice')"/></h2>