[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9171] property: alternative invoicehandling
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9171] property: alternative invoicehandling |
|
Date: |
Tue, 17 Apr 2012 21:09:35 +0000 |
Revision: 9171
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9171
Author: sigurdne
Date: 2012-04-17 21:09:34 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
property: alternative invoicehandling
Modified Paths:
--------------
trunk/property/inc/class.uiinvoice2.inc.php
trunk/property/templates/base/invoice2.xsl
Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2012-04-17 21:08:33 UTC (rev
9170)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2012-04-17 21:09:34 UTC (rev
9171)
@@ -129,7 +129,22 @@
$budget_responsible_list =
array_merge(array($default), $budget_responsible_list);
}
+
+ $user = $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] );
+
$data = array(
+ 'invoice_layout_config' =>
json_encode(execMethod('phpgwapi.template_portico.retrieve_local',
'invoice_layout_config')),
+ 'preferences_url' =>
$GLOBALS['phpgw']->link('/preferences/index.php'),
+ 'preferences_text' =>
lang('preferences'),
+ 'home_url' =>
$GLOBALS['phpgw']->link('/home.php'),
+ 'home_text' => lang('home'),
+ 'home_icon' => 'icon
icon-home',
+ 'about_url' =>
$GLOBALS['phpgw']->link('/about.php', array('app' =>
$GLOBALS['phpgw_info']['flags']['currentapp']) ),
+ 'about_text' => lang('about'),
+ 'logout_url' =>
$GLOBALS['phpgw']->link('/logout.php'),
+ 'logout_text' => lang('logout'),
+ 'user_fullname' => $user->__toString(),
+ 'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'filter_form'
=> array
(
'janitor_list'
=> array('options' => $janitor_list),
@@ -184,13 +199,18 @@
)
);
//_debug_array($data);die();
+
+
$GLOBALS['phpgw']->css->add_external_file('/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css');
+ phpgwapi_yui::load_widget('layout');
phpgwapi_yui::load_widget('paginator');
self::add_javascript('registration', 'yahoo',
'pending.index.js');
self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('property', 'portico',
'ajax_invoice.js');
+ self::add_javascript('property', 'yahoo',
'invoice2.index.js');
self::render_template_xsl(array('invoice2',
'common'), $data);
+ $GLOBALS['phpgw_info']['flags']['noframework']
= true;
}
}
@@ -408,6 +428,7 @@
$voucher[0]['image_url'] =
$_image_url;
}
$voucher_info['generic']['process_log'] =
$voucher[0]['process_log'];
+ // $voucher[0]['image_url'] =
'http://www.nettavisen.no/';
}
else
{
Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl 2012-04-17 21:08:33 UTC (rev
9170)
+++ trunk/property/templates/base/invoice2.xsl 2012-04-17 21:09:34 UTC (rev
9171)
@@ -36,6 +36,8 @@
#_budsjettansvarligid { width: 200px; }
</style>
+
+
<div class="yui-navset yui-navset-top" id="pending_for_approval_tabview">
<div class="identifier-header">
<h1><xsl:value-of select="php:function('lang',
'invoice')"/></h1>
@@ -50,14 +52,40 @@
<script type="text/javascript">
var lang = <xsl:value-of select="php:function('js_lang',
'edit')"/>;
</script>
+ <script type="text/javascript">
+ var invoice_layout_config = <xsl:value-of
select="invoice_layout_config"/>;
+ </script>
<!-- IMPORTANT!!! Loads YUI javascript -->
<xsl:call-template name="common"/>
<div class="yui-content">
- <table>
- <tr>
- <td>
+ <div id="invoice-layout">
+ <div class="layout-north">
+ <div class="body">
+ <h2 class="icon"><xsl:value-of
select="site_title"/></h2>
+ <div class="button-bar">
+ <a href="{home_url}"
class="icon icon-home">
+ <xsl:value-of
select="home_text"/>
+ </a>
+ <a href="{about_url}"
class="icon icon-about">
+ <xsl:value-of
select="about_text"/>
+ </a>
+ <a
href="{preferences_url}" class="icon icon-preferences">
+ <xsl:value-of
select="preferences_text"/>
+ </a>
+ <a href="{logout_url}"
class="icon icon-logout">
+ <xsl:value-of
select="logout_text"/>
+ </a>
+ </div>
+ </div>
+ </div>
+
+ <div class="layout-west">
+ <div class="header">
+ <h2>faktura</h2>
+ </div>
+ <div class="body">
<div id="voucher_details">
<xsl:call-template
name="yui_phpgw_i18n"/>
<table>
@@ -77,19 +105,33 @@
</table>
</form>
</div>
- </td>
- <td>
+ </div>
+ </div>
+ <div class="layout-center">
+ <div class="header">
+ <h2>Bilde</h2>
+ </div>
+ <div class="body">
<div id="image">
<xsl:choose>
<xsl:when
test="voucher_info/voucher/image_url != ''">
- <iframe
id="image_content" width="400" height="500" src =
"{voucher_info/voucher/image_url}" ><p>Your browser does not support
iframes.</p></iframe>
+ <iframe
id="image_content" width="100%" height="1000" src =
"{voucher_info/voucher/image_url}" ><p>Your browser does not support
iframes.</p></iframe>
</xsl:when>
<xsl:otherwise>
- <iframe
id="image_content" width="400" height="500" ><p>Your browser does not support
iframes.</p></iframe>
+ <iframe
id="image_content" width="100%" height="1000" ><p>Your browser does not support
iframes.</p></iframe>
</xsl:otherwise>
</xsl:choose>
</div>
+ </div>
+ </div>
+ </div>
+
+ <table>
+ <tr>
+ <td>
</td>
+ <td>
+ </td>
</tr>
</table>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9171] property: alternative invoicehandling,
Sigurd Nes <=